diff --git a/src/GUI.cpp b/src/GUI.cpp
index 7744e18d6..0536ea1f4 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -22,20 +22,13 @@
 #include <QTime>
 #include <QMessageBox>
 #include <QDesktopWidget>
-#include <QTemporaryFile>
-#include <QTextStream>
-#include <QInputDialog>
 #include <QTimer>
-#include <QPainter>
-#include <QToolTip>
-#include <QStandardItemModel>
-#include <QModelIndex>
-#include <QHeaderView>
-#include <QScrollBar>
-#include <QSettings>
+//#include <QSettings>
 #include <QDesktopServices>
 #include <QCompleter>
-
+#include <QTcpServer>
+#include <QTcpSocket>
+#include <QCloseEvent>
 #include <boost/format.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/filesystem/exception.hpp>
diff --git a/src/GUI.h b/src/GUI.h
index 3fbec025a..6d29f1fb3 100644
--- a/src/GUI.h
+++ b/src/GUI.h
@@ -23,11 +23,8 @@
 #define GUI_H
 
 #include <QMainWindow>
-#include <QHash>
 #include <QProcess>
 #include <QTcpServer>
-#include <QTcpSocket>
-#include <QCloseEvent>
 #include <QSystemTrayIcon>
 
 #include <libtorrent/entry.hpp>
@@ -55,6 +52,8 @@ class DLListDelegate;
 class SearchListDelegate;
 class downloadThread;
 class downloadFromURL;
+class QTcpSocket;
+class QCloseEvent;
 
 using namespace libtorrent;
 namespace fs = boost::filesystem;
diff --git a/src/bittorrent.h b/src/bittorrent.h
index e0e130ab7..6e70319d4 100644
--- a/src/bittorrent.h
+++ b/src/bittorrent.h
@@ -21,9 +21,6 @@
 #ifndef __BITTORRENT_H__
 #define __BITTORRENT_H__
 
-#include <QHash>
-#include <QString>
-#include <QStringList>
 #include <QTimer>
 
 #include <libtorrent/entry.hpp>
diff --git a/src/main.cpp b/src/main.cpp
index c049ee300..f33562188 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,6 +26,8 @@
 #include <QSplashScreen>
 #include <QTcpSocket>
 #include <QSettings>
+#include <QTcpServer>
+#include <QTcpSocket>
 
 #ifdef Q_WS_WIN
   #include <QWindowsXPStyle>