diff --git a/src/libtomahawk/network/Connection.cpp b/src/libtomahawk/network/Connection.cpp
index 4e9cc4140..5a74ea648 100644
--- a/src/libtomahawk/network/Connection.cpp
+++ b/src/libtomahawk/network/Connection.cpp
@@ -20,13 +20,15 @@
 
 #include "Connection_p.h"
 
-#include "QTcpSocketExtra.h"
 #include "network/Servent.h"
 #include "utils/Logger.h"
+
+#include "AclRegistry.h"
+#include "QTcpSocketExtra.h"
 #include "Source.h"
 
-#include <QtCore/QTime>
-#include <QtCore/QThread>
+#include <QTime>
+#include <QThread>
 
 #define PROTOVER "4" // must match remote peer, or we can't talk.
 
diff --git a/src/libtomahawk/network/Servent.cpp b/src/libtomahawk/network/Servent.cpp
index 801aaae90..3d6d13b7c 100644
--- a/src/libtomahawk/network/Servent.cpp
+++ b/src/libtomahawk/network/Servent.cpp
@@ -21,37 +21,38 @@
 
 #include "Servent_p.h"
 
-#include "Result.h"
-#include "Source.h"
-#include "BufferIoDevice.h"
-#include "Connection.h"
-#include "ControlConnection.h"
-#include "QTcpSocketExtra.h"
+#include "accounts/AccountManager.h"
 #include "database/Database.h"
 #include "database/DatabaseImpl.h"
 #include "network/ConnectionManager.h"
 #include "network/DbSyncConnection.h"
-#include "StreamConnection.h"
-#include "SourceList.h"
 #include "sip/SipInfo.h"
 #include "sip/PeerInfo.h"
 #include "sip/SipPlugin.h"
-#include "PortFwdThread.h"
-#include "TomahawkSettings.h"
 #include "utils/Closure.h"
 #include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
-#include "accounts/AccountManager.h"
 
+#include "AclRegistry.h"
+#include "BufferIoDevice.h"
+#include "Connection.h"
+#include "ControlConnection.h"
+#include "PortFwdThread.h"
+#include "QTcpSocketExtra.h"
+#include "Result.h"
+#include "Source.h"
+#include "SourceList.h"
+#include "StreamConnection.h"
+#include "TomahawkSettings.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QMutexLocker>
-#include <QtNetwork/QNetworkInterface>
-#include <QtCore/QFile>
-#include <QtCore/QThread>
-#include <QtNetwork/QNetworkProxy>
-#include <QtNetwork/QNetworkRequest>
-#include <QtNetwork/QNetworkReply>
+#include <QCoreApplication>
+#include <QMutexLocker>
+#include <QNetworkInterface>
+#include <QFile>
+#include <QThread>
+#include <QNetworkProxy>
+#include <QNetworkRequest>
+#include <QNetworkReply>
 
 #include <boost/bind.hpp>
 
diff --git a/src/libtomahawk/network/Servent.h b/src/libtomahawk/network/Servent.h
index e713b5d1b..895dbba5d 100644
--- a/src/libtomahawk/network/Servent.h
+++ b/src/libtomahawk/network/Servent.h
@@ -25,18 +25,13 @@
 // time before new connection terminate if it could not be established
 #define CONNECT_TIMEOUT 10000
 
-#include <QtCore/QObject>
-#include <QtCore/QMap>
-#include <QtCore/QMutex>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QTimer>
-#include <QtCore/QPointer>
-#include <QtNetwork/QTcpServer>
-#include <QtNetwork/QHostInfo>
+#include <QObject>
+#include <QMap>
+#include <QSharedPointer>
+#include <QTcpServer>
 
 #include "Typedefs.h"
 #include "Msg.h"
-#include "AclRegistry.h"
 
 #include "DllMacro.h"
 
diff --git a/src/libtomahawk/network/Servent_p.h b/src/libtomahawk/network/Servent_p.h
index 60ecc1231..8ac9b9b78 100644
--- a/src/libtomahawk/network/Servent_p.h
+++ b/src/libtomahawk/network/Servent_p.h
@@ -24,6 +24,8 @@
 
 #include "Servent.h"
 
+#include <QMutex>
+
 #include <qjson/parser.h>
 #include <qjson/serializer.h>
 #include <qjson/qobjecthelper.h>