From 74941e8aa468d5dcdfaca3957db4e9f424b496da Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Sat, 5 Jan 2013 07:33:00 +0100
Subject: [PATCH] qt5: fix/rearrange includes

---
 .../generic/charts/ChartsPlugin.cpp            | 17 +++++++++--------
 .../generic/discogs/DiscogsPlugin.cpp          |  8 +++++---
 .../generic/musicbrainz/MusicBrainzPlugin.cpp  |  6 +++---
 .../generic/musixmatch/MusixMatchPlugin.cpp    |  6 +++---
 .../generic/newreleases/NewReleasesPlugin.cpp  | 13 +++++++------
 src/infoplugins/generic/rovi/RoviPlugin.cpp    |  7 ++++---
 src/libtomahawk/ActionCollection.h             |  4 ++--
 src/libtomahawk/AtticaManager.cpp              | 12 ++++++------
 src/libtomahawk/ContextMenu.h                  |  4 ++--
 src/libtomahawk/ExternalResolverGui.cpp        | 11 +++++------
 src/libtomahawk/GlobalActionManager.cpp        | 16 ++++++++--------
 src/libtomahawk/LatchManager.cpp               |  3 ++-
 src/libtomahawk/Result.h                       |  8 ++++----
 src/libtomahawk/SourceList.cpp                 |  1 +
 src/libtomahawk/TomahawkSettings.cpp           |  1 +
 src/libtomahawk/Typedefs.h                     |  2 +-
 src/libtomahawk/accounts/Account.h             | 17 ++++++++---------
 .../accounts/spotify/SpotifyAccount.h          |  4 ++--
 .../filemetadata/MetadataEditor.cpp            | 14 ++++++++------
 src/libtomahawk/filemetadata/MetadataEditor.h  |  6 +++---
 src/libtomahawk/filemetadata/MusicScanner.h    | 17 +++++++++--------
 src/libtomahawk/infosystem/InfoSystem.h        |  8 ++++----
 src/libtomahawk/network/MsgProcessor.cpp       |  1 +
 src/libtomahawk/playlist/GridView.cpp          | 12 +++++++-----
 src/libtomahawk/playlist/PlayableProxyModel.h  |  2 +-
 src/libtomahawk/playlist/TrackView.cpp         | 11 ++++++-----
 src/libtomahawk/playlist/TrackView.h           |  8 ++++----
 src/libtomahawk/playlist/TreeProxyModel.cpp    |  3 +--
 src/libtomahawk/playlist/TreeView.cpp          | 12 +++++++-----
 src/libtomahawk/playlist/TreeView.h            |  6 +++---
 .../playlist/dynamic/DynamicControl.h          | 10 ++++++----
 .../dynamic/widgets/CollapsibleControls.h      |  2 +-
 src/libtomahawk/resolvers/QtScriptResolver.cpp | 16 ++++++++--------
 src/libtomahawk/resolvers/QtScriptResolver.h   | 10 +++++-----
 src/libtomahawk/resolvers/ScriptResolver.h     |  8 ++++----
 src/libtomahawk/utils/AnimatedSpinner.cpp      | 18 ++++++++----------
 src/libtomahawk/utils/AnimatedSpinner.h        |  8 ++++----
 src/libtomahawk/utils/RdioParser.cpp           | 18 +++++++++---------
 src/libtomahawk/utils/SoundcloudParser.cpp     |  8 ++++----
 src/libtomahawk/utils/TomahawkUtils.cpp        |  4 ++--
 src/libtomahawk/utils/WidgetDragFilter.cpp     |  5 ++---
 src/libtomahawk/widgets/BasicHeader.cpp        | 14 +++++++-------
 src/libtomahawk/widgets/BasicHeader.h          |  2 +-
 src/libtomahawk/widgets/ImageButton.cpp        | 13 ++++++-------
 src/libtomahawk/widgets/ImageButton.h          |  8 ++++----
 src/libtomahawk/widgets/NewPlaylistWidget.h    |  6 +++---
 src/libtomahawk/widgets/NewReleasesWidget.h    |  8 ++++----
 src/libtomahawk/widgets/QueryLabel.cpp         | 14 ++++++++------
 src/libtomahawk/widgets/SeekSlider.h           |  4 ++--
 src/libtomahawk/widgets/WhatsHotWidget.h       |  8 ++++----
 .../widgets/infowidgets/AlbumInfoWidget.h      |  4 ++--
 src/sourcetree/SourceDelegate.cpp              |  9 +++++----
 52 files changed, 226 insertions(+), 211 deletions(-)

diff --git a/src/infoplugins/generic/charts/ChartsPlugin.cpp b/src/infoplugins/generic/charts/ChartsPlugin.cpp
index 4d7e2c73c..0e87efd98 100644
--- a/src/infoplugins/generic/charts/ChartsPlugin.cpp
+++ b/src/infoplugins/generic/charts/ChartsPlugin.cpp
@@ -21,12 +21,6 @@
 
 #include "ChartsPlugin.h"
 
-#include <QDir>
-#include <QSettings>
-#include <QNetworkConfiguration>
-#include <QNetworkReply>
-#include <QtPlugin>
-
 #include "Album.h"
 #include "CountryUtils.h"
 #include "Typedefs.h"
@@ -37,11 +31,18 @@
 #include "utils/TomahawkCache.h"
 #include "Source.h"
 
-#define CHART_URL "http://charts.tomahawk-player.org/"
-//#define CHART_URL "http://localhost:8080/"
 #include <qjson/parser.h>
 #include <qjson/serializer.h>
 
+#include <QDir>
+#include <QSettings>
+#include <QNetworkConfiguration>
+#include <QNetworkReply>
+#include <QtPlugin>
+
+#define CHART_URL "http://charts.tomahawk-player.org/"
+//#define CHART_URL "http://localhost:8080/"
+
 namespace Tomahawk
 {
 
diff --git a/src/infoplugins/generic/discogs/DiscogsPlugin.cpp b/src/infoplugins/generic/discogs/DiscogsPlugin.cpp
index 7f252a222..405895f15 100644
--- a/src/infoplugins/generic/discogs/DiscogsPlugin.cpp
+++ b/src/infoplugins/generic/discogs/DiscogsPlugin.cpp
@@ -18,15 +18,17 @@
 
 #include "DiscogsPlugin.h"
 
-#include <QNetworkReply>
-#include <QDomDocument>
-#include <QtPlugin>
 
 #include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 #include "utils/Closure.h"
+
 #include <parser.h>
 
+#include <QNetworkReply>
+#include <QDomDocument>
+#include <QtPlugin>
+
 using namespace Tomahawk::InfoSystem;
 
 
diff --git a/src/infoplugins/generic/musicbrainz/MusicBrainzPlugin.cpp b/src/infoplugins/generic/musicbrainz/MusicBrainzPlugin.cpp
index d000bb7f2..062950730 100644
--- a/src/infoplugins/generic/musicbrainz/MusicBrainzPlugin.cpp
+++ b/src/infoplugins/generic/musicbrainz/MusicBrainzPlugin.cpp
@@ -19,13 +19,13 @@
 
 #include "MusicBrainzPlugin.h"
 
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
 #include <QNetworkReply>
 #include <QDomDocument>
 #include <QtPlugin>
 
-#include "utils/TomahawkUtils.h"
-#include "utils/Logger.h"
-
 using namespace Tomahawk::InfoSystem;
 
 
diff --git a/src/infoplugins/generic/musixmatch/MusixMatchPlugin.cpp b/src/infoplugins/generic/musixmatch/MusixMatchPlugin.cpp
index effc43956..ec255752b 100644
--- a/src/infoplugins/generic/musixmatch/MusixMatchPlugin.cpp
+++ b/src/infoplugins/generic/musixmatch/MusixMatchPlugin.cpp
@@ -19,13 +19,13 @@
 
 #include "MusixMatchPlugin.h"
 
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
 #include <QNetworkReply>
 #include <QDomDocument>
 #include <QtPlugin>
 
-#include "utils/TomahawkUtils.h"
-#include "utils/Logger.h"
-
 using namespace Tomahawk::InfoSystem;
 
 
diff --git a/src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp b/src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp
index 1d32805f6..32cfb5a21 100644
--- a/src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp
+++ b/src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp
@@ -21,12 +21,6 @@
 
 #include "NewReleasesPlugin.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QSettings>
-#include <QtNetwork/QNetworkConfiguration>
-#include <QtNetwork/QNetworkReply>
-#include <QtPlugin>
-
 #include "Album.h"
 #include "CountryUtils.h"
 #include "Typedefs.h"
@@ -36,9 +30,16 @@
 #include "utils/Logger.h"
 #include "utils/TomahawkCache.h"
 #include "Source.h"
+
 #include <qjson/parser.h>
 #include <qjson/serializer.h>
 
+#include <QDir>
+#include <QSettings>
+#include <QNetworkConfiguration>
+#include <QNetworkReply>
+#include <QtPlugin>
+
 #define CHART_URL "http://charts.tomahawk-player.org/"
 //#define CHART_URL "http://localhost:8080/"
 
diff --git a/src/infoplugins/generic/rovi/RoviPlugin.cpp b/src/infoplugins/generic/rovi/RoviPlugin.cpp
index 8e39030a0..e5c74d191 100644
--- a/src/infoplugins/generic/rovi/RoviPlugin.cpp
+++ b/src/infoplugins/generic/rovi/RoviPlugin.cpp
@@ -19,13 +19,14 @@
 
 #include "RoviPlugin.h"
 
+#include "utils/Logger.h"
+
+#include <parser.h>
+
 #include <QDateTime>
 #include <QNetworkReply>
 #include <QtPlugin>
 
-#include <parser.h>
-#include "utils/Logger.h"
-
 using namespace Tomahawk::InfoSystem;
 
 
diff --git a/src/libtomahawk/ActionCollection.h b/src/libtomahawk/ActionCollection.h
index 0de8f25cd..5f0be10b2 100644
--- a/src/libtomahawk/ActionCollection.h
+++ b/src/libtomahawk/ActionCollection.h
@@ -23,8 +23,8 @@
 
 #include "DllMacro.h"
 
-#include <QtGui/QAction>
-#include <QtGui/QMenuBar>
+#include <QAction>
+#include <QMenuBar>
 
 class DLLEXPORT ActionCollection : public QObject
 {
diff --git a/src/libtomahawk/AtticaManager.cpp b/src/libtomahawk/AtticaManager.cpp
index 5eac071d5..ea000074f 100644
--- a/src/libtomahawk/AtticaManager.cpp
+++ b/src/libtomahawk/AtticaManager.cpp
@@ -24,6 +24,12 @@
 #include "Source.h"
 #include "config.h"
 
+#include "utils/Logger.h"
+#include "accounts/ResolverAccount.h"
+#include "accounts/AccountManager.h"
+#include "utils/BinaryInstallerHelper.h"
+#include "utils/Closure.h"
+
 #include <attica/downloaditem.h>
 
 #include <QCoreApplication>
@@ -35,12 +41,6 @@
 #include <QDomElement>
 #include <QDomNode>
 
-#include "utils/Logger.h"
-#include "accounts/ResolverAccount.h"
-#include "accounts/AccountManager.h"
-#include "utils/BinaryInstallerHelper.h"
-#include "utils/Closure.h"
-
 using namespace Attica;
 
 AtticaManager* AtticaManager::s_instance = 0;
diff --git a/src/libtomahawk/ContextMenu.h b/src/libtomahawk/ContextMenu.h
index f12fef5b3..6844f04ee 100644
--- a/src/libtomahawk/ContextMenu.h
+++ b/src/libtomahawk/ContextMenu.h
@@ -20,8 +20,8 @@
 #ifndef CONTEXTMENU_H
 #define CONTEXTMENU_H
 
-#include <QtCore/QSignalMapper>
-#include <QtGui/QMenu>
+#include <QSignalMapper>
+#include <QMenu>
 
 #include "Typedefs.h"
 #include "DllMacro.h"
diff --git a/src/libtomahawk/ExternalResolverGui.cpp b/src/libtomahawk/ExternalResolverGui.cpp
index c0d38fa31..4b986e413 100644
--- a/src/libtomahawk/ExternalResolverGui.cpp
+++ b/src/libtomahawk/ExternalResolverGui.cpp
@@ -19,16 +19,15 @@
 #include "ExternalResolverGui.h"
 
 
+#include "Source.h"
+#include "utils/Logger.h"
+
 #include <QMetaProperty>
 #include <QBuffer>
 #include <QDir>
-
-#include <QtGui/QIcon>
-#include <QtGui/QWidget>
+#include <QIcon>
+#include <QWidget>
 #include <QUiLoader>
-#include "utils/Logger.h"
-
-#include "Source.h"
 
 Tomahawk::ExternalResolverGui::ExternalResolverGui(const QString& filePath)
     : Tomahawk::ExternalResolver(filePath)
diff --git a/src/libtomahawk/GlobalActionManager.cpp b/src/libtomahawk/GlobalActionManager.cpp
index 7443f091c..a23bf9a63 100644
--- a/src/libtomahawk/GlobalActionManager.cpp
+++ b/src/libtomahawk/GlobalActionManager.cpp
@@ -46,17 +46,17 @@
     #include "playlist/PlaylistView.h"
     #include "widgets/SearchWidget.h"
 
-    #include <QtGui/QApplication>
-    #include <QtGui/QClipboard>
+    #include <QApplication>
+    #include <QClipboard>
 #endif
 
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QNetworkConfiguration>
-#include <QtNetwork/QNetworkProxy>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkConfiguration>
+#include <QNetworkProxy>
 
-#include <QtCore/QMimeData>
-#include <QtCore/QUrl>
+#include <QMimeData>
+#include <QUrl>
 
 
 GlobalActionManager* GlobalActionManager::s_instance = 0;
diff --git a/src/libtomahawk/LatchManager.cpp b/src/libtomahawk/LatchManager.cpp
index a329c39c6..fa8e61227 100644
--- a/src/libtomahawk/LatchManager.cpp
+++ b/src/libtomahawk/LatchManager.cpp
@@ -23,11 +23,12 @@
 #include "audio/AudioEngine.h"
 #include "database/Database.h"
 
-#include <QtGui/QAction>
 #include "SourceList.h"
 #include "database/DatabaseCommand_SocialAction.h"
 #include "SourcePlaylistInterface.h"
 
+#include <QAction>
+
 using namespace Tomahawk;
 
 LatchManager::LatchManager( QObject* parent )
diff --git a/src/libtomahawk/Result.h b/src/libtomahawk/Result.h
index 18c96632b..f230a9b9b 100644
--- a/src/libtomahawk/Result.h
+++ b/src/libtomahawk/Result.h
@@ -20,10 +20,10 @@
 #ifndef RESULT_H
 #define RESULT_H
 
-#include <QtCore/QObject>
-#include <QtGui/QPixmap>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QVariant>
+#include <QObject>
+#include <QPixmap>
+#include <QPointer>
+#include <QVariant>
 #include <QMutex>
 
 #include "utils/TomahawkUtils.h"
diff --git a/src/libtomahawk/SourceList.cpp b/src/libtomahawk/SourceList.cpp
index 9fa1d50bf..5284397b1 100644
--- a/src/libtomahawk/SourceList.cpp
+++ b/src/libtomahawk/SourceList.cpp
@@ -23,6 +23,7 @@
 #include "database/DatabaseCommand_LoadAllSources.h"
 #include "network/RemoteCollection.h"
 #include "network/ControlConnection.h"
+#include "infosystem/InfoSystemCache.h"
 
 #include "utils/Logger.h"
 
diff --git a/src/libtomahawk/TomahawkSettings.cpp b/src/libtomahawk/TomahawkSettings.cpp
index ad3f9e855..ef86d81db 100644
--- a/src/libtomahawk/TomahawkSettings.cpp
+++ b/src/libtomahawk/TomahawkSettings.cpp
@@ -32,6 +32,7 @@
 #include "database/DatabaseCommand_UpdateSearchIndex.h"
 #include "database/Database.h"
 #include "playlist/PlaylistUpdaterInterface.h"
+#include "infosystem/InfoSystemCache.h"
 
 using namespace Tomahawk;
 
diff --git a/src/libtomahawk/Typedefs.h b/src/libtomahawk/Typedefs.h
index ebccd41fb..988f6d10d 100644
--- a/src/libtomahawk/Typedefs.h
+++ b/src/libtomahawk/Typedefs.h
@@ -30,7 +30,7 @@
 
 //template <typename T> class QSharedPointer;
 
-class QNetworkReply;
+#include <QNetworkReply>
 
 namespace Tomahawk
 {
diff --git a/src/libtomahawk/accounts/Account.h b/src/libtomahawk/accounts/Account.h
index cb61cdf74..e7ddec24a 100644
--- a/src/libtomahawk/accounts/Account.h
+++ b/src/libtomahawk/accounts/Account.h
@@ -20,18 +20,17 @@
 #ifndef ACCOUNT_H
 #define ACCOUNT_H
 
-#include <QtCore/QObject>
-#include <QtCore/QVariantMap>
-#include <QtGui/QWidget>
-#include <QtGui/QIcon>
-#include <QtCore/QString>
-#include <QtCore/QUuid>
-#include <QMutex>
-
 #include "Typedefs.h"
 #include "DllMacro.h"
 
-// #include "libtomahawk/infosystem/InfoSystem.h"
+#include <QObject>
+#include <QVariantMap>
+#include <QWidget>
+#include <QIcon>
+#include <QString>
+#include <QUuid>
+#include <QMutex>
+
 
 class SipPlugin;
 
diff --git a/src/libtomahawk/accounts/spotify/SpotifyAccount.h b/src/libtomahawk/accounts/spotify/SpotifyAccount.h
index 0e2f7041a..bb29d3b5a 100644
--- a/src/libtomahawk/accounts/spotify/SpotifyAccount.h
+++ b/src/libtomahawk/accounts/spotify/SpotifyAccount.h
@@ -28,8 +28,8 @@
 #include "utils/SmartPointerList.h"
 #include "DllMacro.h"
 
-class QAction;
-class QAction;
+#include <QAction>
+
 class SpotifyPlaylistUpdater;
 class QTimer;
 
diff --git a/src/libtomahawk/filemetadata/MetadataEditor.cpp b/src/libtomahawk/filemetadata/MetadataEditor.cpp
index da463e4e4..55a14d805 100644
--- a/src/libtomahawk/filemetadata/MetadataEditor.cpp
+++ b/src/libtomahawk/filemetadata/MetadataEditor.cpp
@@ -20,11 +20,6 @@
 #include "MetadataEditor.h"
 #include "ui_MetadataEditor.h"
 
-#include <QtGui/QDialog>
-#include <QtGui/QDialogButtonBox>
-#include <QtCore/QFileInfo>
-#include <QtCore/QFile>
-
 #include "Source.h"
 #include "Result.h"
 #include "Artist.h"
@@ -34,12 +29,19 @@
 #include "PlaylistInterface.h"
 #include "AlbumPlaylistInterface.h"
 
-#include "taglib/fileref.h"
 #include "filemetadata/taghandlers/tag.h"
 #include "utils/TomahawkUtils.h"
 #include "utils/Closure.h"
 #include "utils/Logger.h"
 
+#include "taglib/fileref.h"
+
+
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QFileInfo>
+#include <QFile>
+
 
 MetadataEditor::MetadataEditor( const Tomahawk::query_ptr& query, const Tomahawk::playlistinterface_ptr& interface, QWidget* parent )
     : QDialog( parent )
diff --git a/src/libtomahawk/filemetadata/MetadataEditor.h b/src/libtomahawk/filemetadata/MetadataEditor.h
index aa3948cec..780204888 100644
--- a/src/libtomahawk/filemetadata/MetadataEditor.h
+++ b/src/libtomahawk/filemetadata/MetadataEditor.h
@@ -20,9 +20,9 @@
 #ifndef METADATAEDITOR_H
 #define METADATAEDITOR_H
 
-#include <QtGui/QDialog>
-#include <QtGui/QLineEdit>
-#include <QtGui/QSpinBox>
+#include <QDialog>
+#include <QLineEdit>
+#include <QSpinBox>
 
 #include "ui_MetadataEditor.h"
 #include "Query.h"
diff --git a/src/libtomahawk/filemetadata/MusicScanner.h b/src/libtomahawk/filemetadata/MusicScanner.h
index 029d52852..06601e5bc 100644
--- a/src/libtomahawk/filemetadata/MusicScanner.h
+++ b/src/libtomahawk/filemetadata/MusicScanner.h
@@ -29,14 +29,15 @@
 #include <taglib/fileref.h>
 #include <taglib/tag.h>
 
-#include <QtCore/QVariantMap>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QString>
-#include <QtCore/QDateTime>
-#include <QtCore/QTimer>
-#include <QtCore/QMutex>
-#include <QtCore/QMutexLocker>
+#include <QVariantMap>
+#include <QDir>
+#include <QFileInfo>
+#include <QString>
+#include <QDateTime>
+#include <QTimer>
+#include <QMutex>
+#include <QMutexLocker>
+#include <QPointer>
 #include <database/Database.h>
 
 // descend dir tree comparing dir mtimes to last known mtime
diff --git a/src/libtomahawk/infosystem/InfoSystem.h b/src/libtomahawk/infosystem/InfoSystem.h
index 08fa9cf7b..381ac3e1f 100644
--- a/src/libtomahawk/infosystem/InfoSystem.h
+++ b/src/libtomahawk/infosystem/InfoSystem.h
@@ -20,6 +20,10 @@
 #ifndef TOMAHAWK_INFOSYSTEM_H
 #define TOMAHAWK_INFOSYSTEM_H
 
+#include "DllMacro.h"
+#include "utils/TomahawkUtils.h"
+#include "Typedefs.h"
+
 #include <QtCore/QCryptographicHash>
 #include <QtCore/QObject>
 #include <QtCore/QtDebug>
@@ -32,10 +36,6 @@
 #include <QtCore/QThread>
 #include <QtCore/QStringList>
 
-#include "DllMacro.h"
-#include "utils/TomahawkUtils.h"
-#include "Typedefs.h"
-
 class QNetworkAccessManager;
 
 namespace Tomahawk {
diff --git a/src/libtomahawk/network/MsgProcessor.cpp b/src/libtomahawk/network/MsgProcessor.cpp
index 37f787c38..6409108cd 100644
--- a/src/libtomahawk/network/MsgProcessor.cpp
+++ b/src/libtomahawk/network/MsgProcessor.cpp
@@ -21,6 +21,7 @@
 #include "network/Servent.h"
 #include "utils/Logger.h"
 
+#include <QThread>
 
 MsgProcessor::MsgProcessor( quint32 mode, quint32 t ) :
     QObject(), m_mode( mode ), m_threshold( t ), m_totmsgsize( 0 )
diff --git a/src/libtomahawk/playlist/GridView.cpp b/src/libtomahawk/playlist/GridView.cpp
index eff32c234..da3810be6 100644
--- a/src/libtomahawk/playlist/GridView.cpp
+++ b/src/libtomahawk/playlist/GridView.cpp
@@ -19,11 +19,6 @@
 
 #include "GridView.h"
 
-#include <QKeyEvent>
-#include <QPainter>
-#include <QScrollBar>
-#include <qmath.h>
-
 #include "audio/AudioEngine.h"
 #include "context/ContextWidget.h"
 #include "TomahawkSettings.h"
@@ -41,6 +36,13 @@
 #include "utils/AnimatedSpinner.h"
 #include "utils/TomahawkUtilsGui.h"
 
+#include <QHeaderView>
+#include <QKeyEvent>
+#include <QPainter>
+#include <QScrollBar>
+#include <QDrag>
+#include <qmath.h>
+
 #define SCROLL_TIMEOUT 280
 
 using namespace Tomahawk;
diff --git a/src/libtomahawk/playlist/PlayableProxyModel.h b/src/libtomahawk/playlist/PlayableProxyModel.h
index cec45783e..bb8b8924a 100644
--- a/src/libtomahawk/playlist/PlayableProxyModel.h
+++ b/src/libtomahawk/playlist/PlayableProxyModel.h
@@ -20,7 +20,7 @@
 #ifndef TRACKPROXYMODEL_H
 #define TRACKPROXYMODEL_H
 
-#include <QtGui/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
 
 #include "PlaylistInterface.h"
 #include "playlist/PlayableModel.h"
diff --git a/src/libtomahawk/playlist/TrackView.cpp b/src/libtomahawk/playlist/TrackView.cpp
index d4c68c50f..cd1d9b255 100644
--- a/src/libtomahawk/playlist/TrackView.cpp
+++ b/src/libtomahawk/playlist/TrackView.cpp
@@ -19,11 +19,6 @@
 
 #include "TrackView.h"
 
-#include <QKeyEvent>
-#include <QPainter>
-#include <QScrollBar>
-#include <QStyleOptionViewItem>
-
 #include "ViewHeader.h"
 #include "ViewManager.h"
 #include "PlayableModel.h"
@@ -42,6 +37,12 @@
 #include "utils/AnimatedSpinner.h"
 #include "utils/Logger.h"
 
+
+#include <QKeyEvent>
+#include <QPainter>
+#include <QScrollBar>
+#include <QDrag>
+
 #define SCROLL_TIMEOUT 280
 
 using namespace Tomahawk;
diff --git a/src/libtomahawk/playlist/TrackView.h b/src/libtomahawk/playlist/TrackView.h
index 7dc488e7a..f0f5371bd 100644
--- a/src/libtomahawk/playlist/TrackView.h
+++ b/src/libtomahawk/playlist/TrackView.h
@@ -20,16 +20,16 @@
 #ifndef TRACKVIEW_H
 #define TRACKVIEW_H
 
-#include <QtGui/QTreeView>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtCore/QTimer>
-
 #include "ContextMenu.h"
 #include "PlaylistItemDelegate.h"
 #include "ViewPage.h"
 
 #include "DllMacro.h"
 
+#include <QTreeView>
+#include <QSortFilterProxyModel>
+#include <QTimer>
+
 class QAction;
 class AnimatedSpinner;
 class ViewHeader;
diff --git a/src/libtomahawk/playlist/TreeProxyModel.cpp b/src/libtomahawk/playlist/TreeProxyModel.cpp
index ecbc1aa92..d620faaa5 100644
--- a/src/libtomahawk/playlist/TreeProxyModel.cpp
+++ b/src/libtomahawk/playlist/TreeProxyModel.cpp
@@ -19,8 +19,6 @@
 
 #include "TreeProxyModel.h"
 
-#include <QtGui/QListView>
-
 #include "TreeProxyModelPlaylistInterface.h"
 #include "Source.h"
 #include "Query.h"
@@ -30,6 +28,7 @@
 #include "PlayableItem.h"
 #include "utils/Logger.h"
 
+#include <QListView>
 
 TreeProxyModel::TreeProxyModel( QObject* parent )
     : PlayableProxyModel( parent )
diff --git a/src/libtomahawk/playlist/TreeView.cpp b/src/libtomahawk/playlist/TreeView.cpp
index a9ef89a71..53c7572ab 100644
--- a/src/libtomahawk/playlist/TreeView.cpp
+++ b/src/libtomahawk/playlist/TreeView.cpp
@@ -19,11 +19,6 @@
 
 #include "TreeView.h"
 
-#include <QHeaderView>
-#include <QKeyEvent>
-#include <QPainter>
-#include <QScrollBar>
-
 #include "audio/AudioEngine.h"
 #include "context/ContextWidget.h"
 #include "utils/AnimatedSpinner.h"
@@ -40,6 +35,13 @@
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 
+#include <QHeaderView>
+#include <QKeyEvent>
+#include <QPainter>
+#include <QScrollBar>
+#include <QDrag>
+#include <QMimeData>
+
 #define SCROLL_TIMEOUT 280
 
 using namespace Tomahawk;
diff --git a/src/libtomahawk/playlist/TreeView.h b/src/libtomahawk/playlist/TreeView.h
index 33fc77c2a..288d6dab1 100644
--- a/src/libtomahawk/playlist/TreeView.h
+++ b/src/libtomahawk/playlist/TreeView.h
@@ -20,9 +20,9 @@
 #ifndef TREEVIEW_H
 #define TREEVIEW_H
 
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QTreeView>
-#include <QtCore/QTimer>
+#include <QSortFilterProxyModel>
+#include <QTreeView>
+#include <QTimer>
 
 #include "TreeProxyModel.h"
 #include "ViewPage.h"
diff --git a/src/libtomahawk/playlist/dynamic/DynamicControl.h b/src/libtomahawk/playlist/dynamic/DynamicControl.h
index f776d4242..a5812eb73 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicControl.h
+++ b/src/libtomahawk/playlist/dynamic/DynamicControl.h
@@ -20,12 +20,14 @@
 #ifndef DYNAMIC_PLAYLIST_CONTROL
 #define DYNAMIC_PLAYLIST_CONTROL
 
-#include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
-#include <QStringList>
-#include <QtGui/QWidget>
 #include "Typedefs.h"
 
+
+#include <QObject>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QWidget>
+
 namespace Tomahawk
 {
 
diff --git a/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h b/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h
index ff8981b98..2b1a19e22 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h
+++ b/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h
@@ -22,7 +22,7 @@
 
 #include "Typedefs.h"
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class QPaintEvent;
 class QHBoxLayout;
diff --git a/src/libtomahawk/resolvers/QtScriptResolver.cpp b/src/libtomahawk/resolvers/QtScriptResolver.cpp
index 51f8fd517..08931a738 100644
--- a/src/libtomahawk/resolvers/QtScriptResolver.cpp
+++ b/src/libtomahawk/resolvers/QtScriptResolver.cpp
@@ -19,14 +19,6 @@
 
 #include "QtScriptResolver.h"
 
-#include <QtGui/QMessageBox>
-#include <QtNetwork/QNetworkRequest>
-#include <QtNetwork/QNetworkReply>
-#include <QtCore/QMetaProperty>
-#include <QtCore/QCryptographicHash>
-
-#include <boost/bind.hpp>
-
 #include "Artist.h"
 #include "Album.h"
 #include "config.h"
@@ -40,6 +32,14 @@
 
 #include "config.h"
 
+#include <QMessageBox>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QMetaProperty>
+#include <QCryptographicHash>
+
+#include <boost/bind.hpp>
+
 // FIXME: bloody hack, remove this for 0.3
 // this one adds new functionality to old resolvers
 #define RESOLVER_LEGACY_CODE "var resolver = Tomahawk.resolver.instance ? Tomahawk.resolver.instance : TomahawkResolver;"
diff --git a/src/libtomahawk/resolvers/QtScriptResolver.h b/src/libtomahawk/resolvers/QtScriptResolver.h
index 78cc2b9ce..29d85bf11 100644
--- a/src/libtomahawk/resolvers/QtScriptResolver.h
+++ b/src/libtomahawk/resolvers/QtScriptResolver.h
@@ -25,11 +25,11 @@
 #include "utils/TomahawkUtils.h"
 #include "config.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QThread>
-#include <QtWebKit/QWebPage>
-#include <QtWebKit/QWebFrame>
+#include <QDir>
+#include <QFile>
+#include <QThread>
+#include <QWebPage>
+#include <QWebFrame>
 
 #ifdef QCA2_FOUND
 #include <QtCrypto>
diff --git a/src/libtomahawk/resolvers/ScriptResolver.h b/src/libtomahawk/resolvers/ScriptResolver.h
index b975768a5..8663dcef4 100644
--- a/src/libtomahawk/resolvers/ScriptResolver.h
+++ b/src/libtomahawk/resolvers/ScriptResolver.h
@@ -20,15 +20,15 @@
 #ifndef SCRIPTRESOLVER_H
 #define SCRIPTRESOLVER_H
 
-#include <QProcess>
+#include "Query.h"
+#include "ExternalResolverGui.h"
+#include "DllMacro.h"
 
 #include <qjson/parser.h>
 #include <qjson/serializer.h>
 #include <qjson/qobjecthelper.h>
 
-#include "Query.h"
-#include "ExternalResolverGui.h"
-#include "DllMacro.h"
+#include <QProcess>
 
 class QWidget;
 
diff --git a/src/libtomahawk/utils/AnimatedSpinner.cpp b/src/libtomahawk/utils/AnimatedSpinner.cpp
index 41ede8954..6b7166fba 100644
--- a/src/libtomahawk/utils/AnimatedSpinner.cpp
+++ b/src/libtomahawk/utils/AnimatedSpinner.cpp
@@ -17,19 +17,17 @@
 
 #include "AnimatedSpinner.h"
 
-#include <QtCore/QPoint>
+#include "utils/Logger.h"
+
+#include <QPoint>
 #include <QTimeLine>
 #include <QDebug>
 #include <QDateTime>
-
-#include <QtGui/QApplication>
-#include <QtGui/QHideEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QShowEvent>
-
-#include "utils/Logger.h"
-
+#include <QApplication>
+#include <QHideEvent>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QShowEvent>
 
 AnimatedSpinner::AnimatedSpinner( QWidget* parent )
     : QWidget( parent )
diff --git a/src/libtomahawk/utils/AnimatedSpinner.h b/src/libtomahawk/utils/AnimatedSpinner.h
index 00b2544fd..96146030a 100644
--- a/src/libtomahawk/utils/AnimatedSpinner.h
+++ b/src/libtomahawk/utils/AnimatedSpinner.h
@@ -20,11 +20,11 @@
 
 #include "DllMacro.h"
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
-#include <QtCore/QSize>
-#include <QtGui/QColor>
-#include <QtGui/QPixmap>
+#include <QSize>
+#include <QColor>
+#include <QPixmap>
 #include <QPainter>
 #include <QAbstractItemView>
 
diff --git a/src/libtomahawk/utils/RdioParser.cpp b/src/libtomahawk/utils/RdioParser.cpp
index d1c93cc7b..3ef5899e6 100644
--- a/src/libtomahawk/utils/RdioParser.cpp
+++ b/src/libtomahawk/utils/RdioParser.cpp
@@ -19,15 +19,6 @@
 
 #include "RdioParser.h"
 
-#include <QDateTime>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QUrl>
-#include <QStringList>
-
-#include <QtCore/QCryptographicHash>
-
-#include <qjson/parser.h>
-
 #include "ShortenedLinkParser.h"
 #include "config.h"
 #include "DropJob.h"
@@ -41,6 +32,15 @@
 #include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
+
+#include <qjson/parser.h>
+
+#include <QDateTime>
+#include <QNetworkAccessManager>
+#include <QUrl>
+#include <QStringList>
+#include <QCryptographicHash>
+
 using namespace Tomahawk;
 
 QPixmap* RdioParser::s_pixmap = 0;
diff --git a/src/libtomahawk/utils/SoundcloudParser.cpp b/src/libtomahawk/utils/SoundcloudParser.cpp
index 22f58a83b..8bcc337d7 100644
--- a/src/libtomahawk/utils/SoundcloudParser.cpp
+++ b/src/libtomahawk/utils/SoundcloudParser.cpp
@@ -18,10 +18,6 @@
 
 #include "SoundcloudParser.h"
 
-#include <QtNetwork/QNetworkAccessManager>
-
-#include <qjson/parser.h>
-
 #include "Query.h"
 #include "SourceList.h"
 #include "DropJobNotifier.h"
@@ -33,6 +29,10 @@
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 
+#include <qjson/parser.h>
+
+#include <QNetworkAccessManager>
+
 using namespace Tomahawk;
 
 
diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp
index c6a7bc586..53e18aa41 100644
--- a/src/libtomahawk/utils/TomahawkUtils.cpp
+++ b/src/libtomahawk/utils/TomahawkUtils.cpp
@@ -32,8 +32,8 @@
     #include <lastfm/ws.h>
 #endif
 
-#include <quazip.h>
-#include <quazipfile.h>
+#include <quazip/quazip.h>
+#include <quazip/quazipfile.h>
 
 #include <QNetworkConfiguration>
 #include <QNetworkAccessManager>
diff --git a/src/libtomahawk/utils/WidgetDragFilter.cpp b/src/libtomahawk/utils/WidgetDragFilter.cpp
index 7a540e5b7..11541fd64 100644
--- a/src/libtomahawk/utils/WidgetDragFilter.cpp
+++ b/src/libtomahawk/utils/WidgetDragFilter.cpp
@@ -18,13 +18,12 @@
 
 #include "WidgetDragFilter.h"
 
+#include "utils/Logger.h"
+
 #include <QMouseEvent>
 #include <QApplication>
 #include <QMenuBar>
 
-#include "utils/Logger.h"
-
-
 WidgetDragFilter::WidgetDragFilter( QObject* parent )
     : QObject( parent )
     , m_dragStarted( false )
diff --git a/src/libtomahawk/widgets/BasicHeader.cpp b/src/libtomahawk/widgets/BasicHeader.cpp
index 664aa13e8..2ac67f406 100644
--- a/src/libtomahawk/widgets/BasicHeader.cpp
+++ b/src/libtomahawk/widgets/BasicHeader.cpp
@@ -19,16 +19,16 @@
 
 #include "BasicHeader.h"
 
-#include <QtGui/QLabel>
-#include <QtGui/QPixmap>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QBoxLayout>
-#include <QGraphicsDropShadowEffect>
-
 #include "utils/TomahawkUtilsGui.h"
 #include "ElidedLabel.h"
 
+#include <QLabel>
+#include <QPixmap>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QBoxLayout>
+#include <QGraphicsDropShadowEffect>
+
 using namespace Tomahawk;
 
 QPixmap* BasicHeader::s_tiledHeader = 0;
diff --git a/src/libtomahawk/widgets/BasicHeader.h b/src/libtomahawk/widgets/BasicHeader.h
index 4b8d59349..48f3281ff 100644
--- a/src/libtomahawk/widgets/BasicHeader.h
+++ b/src/libtomahawk/widgets/BasicHeader.h
@@ -20,7 +20,7 @@
 #ifndef BASICHEADER_H
 #define BASICHEADER_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "DllMacro.h"
 
diff --git a/src/libtomahawk/widgets/ImageButton.cpp b/src/libtomahawk/widgets/ImageButton.cpp
index 933043dfd..eda2ba967 100644
--- a/src/libtomahawk/widgets/ImageButton.cpp
+++ b/src/libtomahawk/widgets/ImageButton.cpp
@@ -19,15 +19,14 @@
 
 #include "ImageButton.h"
 
-#include <QtGui/QPainter>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QLayout>
-#include <QtGui/QPixmap>
-#include <QtGui/QIcon>
-#include <QtCore/QString>
-
 #include "utils/Logger.h"
 
+#include <QPainter>
+#include <QPaintEvent>
+#include <QLayout>
+#include <QPixmap>
+#include <QIcon>
+#include <QString>
 
 ImageButton::ImageButton( QWidget* parent )
     : QAbstractButton( parent )
diff --git a/src/libtomahawk/widgets/ImageButton.h b/src/libtomahawk/widgets/ImageButton.h
index d47384f18..41ecd69be 100644
--- a/src/libtomahawk/widgets/ImageButton.h
+++ b/src/libtomahawk/widgets/ImageButton.h
@@ -20,12 +20,12 @@
 #ifndef IMAGE_BUTTON_H
 #define IMAGE_BUTTON_H
 
-#include <QtGui/QAbstractButton>
-#include <QtGui/QIcon>
-#include <QtCore/QMap>
-
 #include "DllMacro.h"
 
+#include <QAbstractButton>
+#include <QIcon>
+#include <QMap>
+
 class DLLEXPORT ImageButton : public QAbstractButton
 {
 Q_OBJECT
diff --git a/src/libtomahawk/widgets/NewPlaylistWidget.h b/src/libtomahawk/widgets/NewPlaylistWidget.h
index 62fd033e9..03520d411 100644
--- a/src/libtomahawk/widgets/NewPlaylistWidget.h
+++ b/src/libtomahawk/widgets/NewPlaylistWidget.h
@@ -20,14 +20,14 @@
 #ifndef NEWPLAYLISTWIDGET_H
 #define NEWPLAYLISTWIDGET_H
 
-#include <QtGui/QWidget>
-#include <QtCore/QTimer>
-
 #include "PlaylistInterface.h"
 #include "ViewPage.h"
 
 #include "DllMacro.h"
 
+#include <QWidget>
+#include <QTimer>
+
 class QPushButton;
 class PlaylistModel;
 
diff --git a/src/libtomahawk/widgets/NewReleasesWidget.h b/src/libtomahawk/widgets/NewReleasesWidget.h
index ffd8ce44a..3cd0c8674 100644
--- a/src/libtomahawk/widgets/NewReleasesWidget.h
+++ b/src/libtomahawk/widgets/NewReleasesWidget.h
@@ -22,16 +22,16 @@
 #ifndef NEWRELEASESWIDGET_H
 #define NEWRELEASESWIDGET_H
 
-#include <QtGui/QWidget>
-#include <QtGui/QListWidgetItem>
-#include <QtGui/QStyledItemDelegate>
-
 #include "PlaylistInterface.h"
 #include "infosystem/InfoSystem.h"
 #include "ViewPage.h"
 
 #include "DllMacro.h"
 
+#include <QWidget>
+#include <QListWidgetItem>
+#include <QStyledItemDelegate>
+
 class QSortFilterProxyModel;
 class QStandardItemModel;
 class QStandardItem;
diff --git a/src/libtomahawk/widgets/QueryLabel.cpp b/src/libtomahawk/widgets/QueryLabel.cpp
index efa6cede4..04b6fab28 100644
--- a/src/libtomahawk/widgets/QueryLabel.cpp
+++ b/src/libtomahawk/widgets/QueryLabel.cpp
@@ -18,12 +18,6 @@
 
 #include "QueryLabel.h"
 
-#include <QApplication>
-#include <QEvent>
-#include <QFontMetrics>
-#include <QMouseEvent>
-#include <QPainter>
-
 #include "Artist.h"
 #include "Album.h"
 #include "Query.h"
@@ -33,6 +27,14 @@
 #include "ViewManager.h"
 #include "Source.h"
 
+#include <QApplication>
+#include <QEvent>
+#include <QFontMetrics>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QDrag>
+#include <QMimeData>
+
 #define BOXMARGIN 2
 #define DASH "  -  "
 
diff --git a/src/libtomahawk/widgets/SeekSlider.h b/src/libtomahawk/widgets/SeekSlider.h
index 93e661650..637124d21 100644
--- a/src/libtomahawk/widgets/SeekSlider.h
+++ b/src/libtomahawk/widgets/SeekSlider.h
@@ -20,10 +20,10 @@
 #ifndef SEEKSLIDER_H
 #define SEEKSLIDER_H
 
-#include <QtGui/QSlider>
-
 #include "DllMacro.h"
 
+#include <QSlider>
+
 class QTimeLine;
 
 class DLLEXPORT SeekSlider : public QSlider
diff --git a/src/libtomahawk/widgets/WhatsHotWidget.h b/src/libtomahawk/widgets/WhatsHotWidget.h
index d42b34f10..3c6c6e197 100644
--- a/src/libtomahawk/widgets/WhatsHotWidget.h
+++ b/src/libtomahawk/widgets/WhatsHotWidget.h
@@ -21,16 +21,16 @@
 #ifndef WHATSHOTWIDGET_H
 #define WHATSHOTWIDGET_H
 
-#include <QtGui/QWidget>
-#include <QtGui/QListWidgetItem>
-#include <QtGui/QStyledItemDelegate>
-
 #include "PlaylistInterface.h"
 #include "infosystem/InfoSystem.h"
 #include "ViewPage.h"
 
 #include "DllMacro.h"
 
+#include <QWidget>
+#include <QListWidgetItem>
+#include <QStyledItemDelegate>
+
 class QSortFilterProxyModel;
 class QStandardItemModel;
 class QStandardItem;
diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h
index ac96ed578..7909bfe8f 100644
--- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h
+++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h
@@ -30,8 +30,6 @@
 #ifndef ALBUMINFOWIDGET_H
 #define ALBUMINFOWIDGET_H
 
-#include <QtGui/QWidget>
-
 #include "PlaylistInterface.h"
 #include "ViewPage.h"
 #include "infosystem/InfoSystem.h"
@@ -39,6 +37,8 @@
 #include "DllMacro.h"
 #include "Typedefs.h"
 
+#include <QWidget>
+
 class PlayableModel;
 class TreeModel;
 class MetaAlbumInfoInterface;
diff --git a/src/sourcetree/SourceDelegate.cpp b/src/sourcetree/SourceDelegate.cpp
index 0f5286b74..04a363290 100644
--- a/src/sourcetree/SourceDelegate.cpp
+++ b/src/sourcetree/SourceDelegate.cpp
@@ -21,10 +21,6 @@
 
 #include "SourceDelegate.h"
 
-#include <QApplication>
-#include <QPainter>
-#include <QMouseEvent>
-
 #include "items/SourceTreeItem.h"
 #include "items/SourceItem.h"
 #include "items/PlaylistItems.h"
@@ -38,9 +34,14 @@
 #include "ActionCollection.h"
 #include "ViewManager.h"
 #include "ContextMenu.h"
+
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 
+#include <QMimeData>
+#include <QPainter>
+#include <QMouseEvent>
+#include <QApplication>
 
 #define TREEVIEW_INDENT_ADD 12