From 85ef6dfdb8d81a5efb571f9ea59a03ea36285a31 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Sat, 3 Nov 2012 02:37:20 +0100
Subject: [PATCH] Reorder includes in the app

---
 src/AclRegistryImpl.cpp                |  5 ++--
 src/AclRegistryImpl.h                  | 12 ++++----
 src/AudioControls.cpp                  | 10 +++----
 src/AudioControls.h                    |  8 +++---
 src/CMakeLists.txt                     |  2 +-
 src/DiagnosticsDialog.cpp              | 16 +++++------
 src/LoadXSPFDialog.cpp                 |  3 +-
 src/ResolverConfigDelegate.cpp         |  5 ++--
 src/Scrobbler.cpp                      | 21 +++++++-------
 src/SettingsDialog.cpp                 | 30 ++++++++++----------
 src/SettingsDialog.h                   | 10 +++----
 src/SocialWidget.cpp                   | 15 +++++-----
 src/SocialWidget.h                     |  6 ++--
 src/TomahawkApp.cpp                    | 35 ++++++++++++-----------
 src/TomahawkApp.h                      | 24 ++++++++--------
 src/TomahawkTrayIcon.cpp               |  7 ++---
 src/TomahawkTrayIcon.h                 |  8 +++---
 src/TomahawkWindow.cpp                 | 39 +++++++++++++-------------
 src/TomahawkWindow.h                   | 11 ++++----
 src/sourcetree/AnimationHelper.cpp     |  2 +-
 src/sourcetree/SourceDelegate.cpp      | 11 ++++----
 src/sourcetree/SourceDelegate.h        |  4 +--
 src/sourcetree/SourceTreeView.cpp      | 22 +++++++--------
 src/sourcetree/SourceTreeView.h        |  4 +--
 src/sourcetree/SourcesModel.cpp        | 10 +++----
 src/sourcetree/SourcesModel.h          |  5 ++--
 src/sourcetree/SourcesProxyModel.cpp   |  5 ++--
 src/sourcetree/SourcesProxyModel.h     |  2 +-
 src/sourcetree/items/CategoryItems.cpp |  5 ++--
 src/sourcetree/items/LovedTracksItem.h |  4 +--
 src/sourcetree/items/PlaylistItems.cpp |  6 ++--
 src/sourcetree/items/SourceTreeItem.h  |  4 +--
 src/web/Api_v1.cpp                     |  6 ++--
 src/widgets/AccountsPopupWidget.cpp    |  8 +++---
 src/widgets/ContainedMenuButton.cpp    |  2 +-
 src/widgets/ContainedMenuButton.h      |  4 +--
 36 files changed, 186 insertions(+), 185 deletions(-)

diff --git a/src/AclRegistryImpl.cpp b/src/AclRegistryImpl.cpp
index e20585930..3c2ba2f7b 100644
--- a/src/AclRegistryImpl.cpp
+++ b/src/AclRegistryImpl.cpp
@@ -19,8 +19,6 @@
 
 #include "AclRegistryImpl.h"
 
-#include <QThread>
-#include <QVariant>
 
 #include "TomahawkSettings.h"
 #include "TomahawkApp.h"
@@ -36,6 +34,9 @@
 
 #include "utils/Logger.h"
 
+#include <QThread>
+#include <QVariant>
+
 
 ACLRegistryImpl::ACLRegistryImpl( QObject* parent )
     : ACLRegistry( parent )
diff --git a/src/AclRegistryImpl.h b/src/AclRegistryImpl.h
index 3641fb8bc..85b617bac 100644
--- a/src/AclRegistryImpl.h
+++ b/src/AclRegistryImpl.h
@@ -20,6 +20,10 @@
 #ifndef TOMAHAWK_ACLREGISTRYIMPL_H
 #define TOMAHAWK_ACLREGISTRYIMPL_H
 
+#include "AclRegistry.h"
+#include "HeadlessCheck.h"
+#include "DllMacro.h"
+
 #include <QObject>
 #include <QString>
 #include <QHash>
@@ -30,10 +34,6 @@
 #include <QStringList>
 #include <QUuid>
 
-#include "AclRegistry.h"
-#include "HeadlessCheck.h"
-#include "DllMacro.h"
-
 class ACLJobItem;
 
 class ACLRegistryImpl : public ACLRegistry
@@ -59,11 +59,11 @@ public slots:
      **/
     virtual ACLRegistry::ACL isAuthorizedUser( const QString &dbid, const QString &username, ACLRegistry::ACL globalType = ACLRegistry::NotFound, bool skipEmission = false );
     virtual void wipeEntries();
-    
+
 protected:
     virtual void load();
     virtual void save();
-    
+
 #ifndef ENABLE_HEADLESS
     void getUserDecision( ACLRegistry::User user, const QString &username );
 
diff --git a/src/AudioControls.cpp b/src/AudioControls.cpp
index 275ed8bf6..e22017efe 100644
--- a/src/AudioControls.cpp
+++ b/src/AudioControls.cpp
@@ -20,11 +20,6 @@
 #include "AudioControls.h"
 #include "ui_AudioControls.h"
 
-#include <QtNetwork/QNetworkReply>
-#include <QtGui/QDropEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QDesktopServices>
-
 #include "audio/AudioEngine.h"
 #include "playlist/PlaylistView.h"
 #include "database/Database.h"
@@ -38,6 +33,11 @@
 #include "ViewManager.h"
 #include "Source.h"
 
+#include <QNetworkReply>
+#include <QDropEvent>
+#include <QMouseEvent>
+#include <QDesktopServices>
+
 const static int ALLOWED_MAX_DIVERSION = 300;
 
 using namespace Tomahawk;
diff --git a/src/AudioControls.h b/src/AudioControls.h
index 35a0aa998..ba0207b88 100644
--- a/src/AudioControls.h
+++ b/src/AudioControls.h
@@ -20,14 +20,14 @@
 #ifndef AUDIOCONTROLS_H
 #define AUDIOCONTROLS_H
 
-#include <QtGui/QWidget>
-#include <QtCore/QTimer>
-#include <QtCore/QTimeLine>
-
 #include "Result.h"
 #include "PlaylistInterface.h"
 #include "Query.h"
 
+#include <QWidget>
+#include <QTimer>
+#include <QTimeLine>
+
 class QDropEvent;
 class QDragEnterEvent;
 class QDragMoveEvent;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 88e83cc63..b5fb4554f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -73,7 +73,7 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
      TomahawkWindow.cpp
      LoadXSPFDialog.cpp
      SocialWidget.cpp
-     
+
      widgets/ContainedMenuButton.cpp
      widgets/AccountListWidget.cpp
      widgets/AccountModelFactoryProxy.cpp
diff --git a/src/DiagnosticsDialog.cpp b/src/DiagnosticsDialog.cpp
index 9e63ccce6..eedf4f191 100644
--- a/src/DiagnosticsDialog.cpp
+++ b/src/DiagnosticsDialog.cpp
@@ -23,6 +23,14 @@
 #include "config.h"
 #include "TomahawkVersion.h"
 
+#include "SourceList.h"
+
+#include "accounts/AccountManager.h"
+#include "network/Servent.h"
+#include "sip/SipHandler.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+
 #include <QLabel>
 #include <QTextEdit>
 #include <QDialogButtonBox>
@@ -31,14 +39,6 @@
 #include <QClipboard>
 #include <QDebug>
 
-#include "accounts/AccountManager.h"
-#include "network/Servent.h"
-#include "SourceList.h"
-
-#include "sip/SipHandler.h"
-#include "utils/TomahawkUtilsGui.h"
-#include "utils/Logger.h"
-
 
 DiagnosticsDialog::DiagnosticsDialog( QWidget *parent )
     : QDialog( parent )
diff --git a/src/LoadXSPFDialog.cpp b/src/LoadXSPFDialog.cpp
index eaa2e16b1..dcac669db 100644
--- a/src/LoadXSPFDialog.cpp
+++ b/src/LoadXSPFDialog.cpp
@@ -17,10 +17,11 @@
  */
 
 #include "LoadXSPFDialog.h"
+#include "ui_LoadXSPFDialog.h"
+
 #include "TomahawkSettings.h"
 #include "Source.h"
 
-#include "ui_LoadXSPFDialog.h"
 #include <QFileDialog>
 
 LoadXSPFDialog::LoadXSPFDialog( QWidget* parent, Qt::WindowFlags f )
diff --git a/src/ResolverConfigDelegate.cpp b/src/ResolverConfigDelegate.cpp
index 70236cf02..a40a5812d 100644
--- a/src/ResolverConfigDelegate.cpp
+++ b/src/ResolverConfigDelegate.cpp
@@ -18,15 +18,14 @@
 
 #include "ResolverConfigDelegate.h"
 
-// #include "resolversmodel.h"
 #include "ExternalResolverGui.h"
 
+#include "utils/Logger.h"
+
 #include <QApplication>
 #include <QPainter>
 #include <QMouseEvent>
 
-#include "utils/Logger.h"
-
 #define PADDING 4
 #define ICONSIZE 24
 
diff --git a/src/Scrobbler.cpp b/src/Scrobbler.cpp
index 6e1b77bc3..c119c89be 100644
--- a/src/Scrobbler.cpp
+++ b/src/Scrobbler.cpp
@@ -19,20 +19,21 @@
 
 #include "Scrobbler.h"
 
+#include "Artist.h"
+#include "Album.h"
+#include "Source.h"
+#include "Typedefs.h"
+#include "TomahawkSettings.h"
+
+#include "audio/AudioEngine.h"
+#include "infosystem/InfoSystem.h"
+
+#include "utils/Logger.h"
+
 #include <QDir>
 #include <QSettings>
 #include <QCryptographicHash>
 
-#include "Artist.h"
-#include "Album.h"
-#include "Typedefs.h"
-#include "audio/AudioEngine.h"
-#include "TomahawkSettings.h"
-#include "infosystem/InfoSystem.h"
-#include "Source.h"
-
-#include "utils/Logger.h"
-
 static QString s_scInfoIdentifier = QString( "SCROBBLER" );
 
 
diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp
index a217da567..720b55cea 100644
--- a/src/SettingsDialog.cpp
+++ b/src/SettingsDialog.cpp
@@ -20,16 +20,12 @@
  */
 
 #include "SettingsDialog.h"
-#include "config.h"
+#include "ui_ProxyDialog.h"
+#include "ui_Settings_Accounts.h"
+#include "ui_Settings_Collection.h"
+#include "ui_Settings_Advanced.h"
 
-#include <QtGui/QDesktopServices>
-#include <QtGui/QFileDialog>
-#include <QtGui/QMessageBox>
-#include <QtNetwork/QNetworkConfiguration>
-#include <QtNetwork/QNetworkProxy>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QSizeGrip>
-#include <QtGui/QToolBar>
+#include "config.h"
 
 #include "AtticaManager.h"
 #include "AclRegistry.h"
@@ -48,18 +44,22 @@
 #include "accounts/AccountModel.h"
 #include "accounts/Account.h"
 #include "accounts/AccountManager.h"
-#include <accounts/AccountModelFilterProxy.h>
-#include <accounts/ResolverAccount.h>
+#include "accounts/AccountModelFilterProxy.h"
+#include "accounts/ResolverAccount.h"
 #include "utils/Logger.h"
 #include "accounts/AccountFactoryWrapper.h"
 #include "accounts/spotify/SpotifyAccount.h"
 #include "thirdparty/Qocoa/qtoolbartabdialog.h"
 #include "thirdparty/Qocoa/qbutton.h"
 
-#include "ui_ProxyDialog.h"
-#include "ui_Settings_Accounts.h"
-#include "ui_Settings_Collection.h"
-#include "ui_Settings_Advanced.h"
+#include <QDesktopServices>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QNetworkConfiguration>
+#include <QNetworkProxy>
+#include <QVBoxLayout>
+#include <QSizeGrip>
+#include <QToolBar>
 
 using namespace Tomahawk;
 using namespace Accounts;
diff --git a/src/SettingsDialog.h b/src/SettingsDialog.h
index 885997fde..8826af8e4 100644
--- a/src/SettingsDialog.h
+++ b/src/SettingsDialog.h
@@ -22,12 +22,10 @@
 #ifndef SETTINGSDIALOG_H
 #define SETTINGSDIALOG_H
 
-#include <QtGui/QDialog>
-#include <QtCore/QModelIndex>
-#include <QtGui/QActionGroup>
-#include <QtGui/QToolBar>
-
-#include "config.h"
+#include <QDialog>
+#include <QModelIndex>
+#include <QActionGroup>
+#include <QToolBar>
 
 class AnimatedSpinner;
 class QListWidgetItem;
diff --git a/src/SocialWidget.cpp b/src/SocialWidget.cpp
index 39f73f938..fb1cc5ece 100644
--- a/src/SocialWidget.cpp
+++ b/src/SocialWidget.cpp
@@ -20,15 +20,16 @@
 #include "SocialWidget.h"
 #include "ui_SocialWidget.h"
 
+#include "GlobalActionManager.h"
+#include "Source.h"
+
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+
 #include <QPainter>
 #include <QDialog>
 #include <QPropertyAnimation>
 
-#include "GlobalActionManager.h"
-#include "utils/TomahawkUtilsGui.h"
-#include "utils/Logger.h"
-#include "Source.h"
-
 #define ARROW_HEIGHT 6
 
 
@@ -67,7 +68,7 @@ SocialWidget::SocialWidget( QWidget* parent )
     ui->buttonBox->button( QDialogButtonBox::Cancel )->setIcon( QIcon( RESPATH "images/cancel.png" ) );
 
     ui->textEdit->setStyleSheet( "border: 1px solid " + TomahawkUtils::Colors::BORDER_LINE.name() );
-    
+
     m_parent->installEventFilter( this );
 
     connect( ui->buttonBox, SIGNAL( accepted() ), SLOT( accept() ) );
@@ -202,7 +203,7 @@ void
 SocialWidget::accept()
 {
     tDebug() << "Sharing social link!";
-    
+
     QVariantMap shareInfo;
     Tomahawk::InfoSystem::InfoStringHash trackInfo;
 
diff --git a/src/SocialWidget.h b/src/SocialWidget.h
index 63f5bef15..876ec3efc 100644
--- a/src/SocialWidget.h
+++ b/src/SocialWidget.h
@@ -20,12 +20,12 @@
 #ifndef SOCIALWIDGET_H
 #define SOCIALWIDGET_H
 
+#include "Query.h"
+
 #include <QWidget>
 #include <QAbstractItemView>
 #include <QTimer>
 
-#include "Query.h"
-
 namespace Ui
 {
     class SocialWidget;
@@ -64,7 +64,7 @@ private slots:
     void accept();
     void onChanged();
     void onShortLinkReady( const QUrl& longUrl, const QUrl& shortUrl, const QVariant& callbackObj );
-    
+
     void onGeometryUpdate();
 
 private:
diff --git a/src/TomahawkApp.cpp b/src/TomahawkApp.cpp
index f55a13b98..474b5cdb1 100644
--- a/src/TomahawkApp.cpp
+++ b/src/TomahawkApp.cpp
@@ -21,18 +21,6 @@
 #include "TomahawkApp.h"
 
 #include "TomahawkVersion.h"
-
-#include <iostream>
-
-#include <QtCore/QPluginLoader>
-#include <QtCore/QDir>
-#include <QtCore/QMetaType>
-#include <QtCore/QTime>
-#include <QtNetwork/QNetworkReply>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QTranslator>
-
 #include "AclRegistryImpl.h"
 #include "Album.h"
 #include "Artist.h"
@@ -71,8 +59,6 @@
 #include "accounts/spotify/SpotifyPlaylistUpdater.h"
 #include "utils/TomahawkCache.h"
 
-#include "config.h"
-
 #ifndef ENABLE_HEADLESS
     #include "resolvers/QtScriptResolver.h"
     #include "resolvers/ScriptResolver.h"
@@ -81,9 +67,14 @@
     #include "TomahawkWindow.h"
     #include "SettingsDialog.h"
     #include "ActionCollection.h"
-    #include <QtGui/QMessageBox>
     #include "widgets/HeaderLabel.h"
-    #include <TomahawkSettingsGui.h>
+    #include "TomahawkSettingsGui.h"
+#endif
+
+#include "config.h"
+
+#ifndef ENABLE_HEADLESS
+    #include <QMessageBox>
 #endif
 
 #ifdef Q_WS_MAC
@@ -93,6 +84,18 @@
 #include <sys/sysctl.h>
 #endif
 
+#include <QPluginLoader>
+#include <QDir>
+#include <QMetaType>
+#include <QTime>
+#include <QNetworkReply>
+#include <QFile>
+#include <QFileInfo>
+#include <QTranslator>
+
+#include <iostream>
+
+
 const char* enApiSecret = "BNvTzfthHr/d1eNhHLvL1Jo=";
 
 void
diff --git a/src/TomahawkApp.h b/src/TomahawkApp.h
index 74cfffc11..28247d79d 100644
--- a/src/TomahawkApp.h
+++ b/src/TomahawkApp.h
@@ -23,23 +23,23 @@
 
 #define APP TomahawkApp::instance()
 
-#include "HeadlessCheck.h"
-#include "config.h"
-
-#include <QtCore/QRegExp>
-#include <QtCore/QFile>
-#include <QtCore/QSettings>
-#include <QtCore/QDir>
-#include <QtCore/QPersistentModelIndex>
-
-#include "QxtHttpServerConnector"
-#include "QxtHttpSessionManager"
-
 #include "mac/TomahawkApp_Mac.h" // for PlatforInterface
 #include "Typedefs.h"
 #include "utils/TomahawkUtils.h"
 #include "thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h"
 
+#include "HeadlessCheck.h"
+#include "config.h"
+
+#include "QxtHttpServerConnector"
+#include "QxtHttpSessionManager"
+
+#include <QRegExp>
+#include <QFile>
+#include <QSettings>
+#include <QDir>
+#include <QPersistentModelIndex>
+
 class AudioEngine;
 class Database;
 class ScanManager;
diff --git a/src/TomahawkTrayIcon.cpp b/src/TomahawkTrayIcon.cpp
index edcf2483c..36a416187 100644
--- a/src/TomahawkTrayIcon.cpp
+++ b/src/TomahawkTrayIcon.cpp
@@ -19,21 +19,18 @@
 
 #include "TomahawkTrayIcon.h"
 
-#include <QtGui/QWheelEvent>
-
 #include "Artist.h"
-
 #include "audio/AudioEngine.h"
 #include "TomahawkApp.h"
 #include "TomahawkWindow.h"
 #include "Query.h"
 #include "Source.h"
 #include "Collection.h"
-
+#include "ActionCollection.h"
 #include "utils/Logger.h"
 #include "utils/TomahawkUtilsGui.h"
-#include <ActionCollection.h>
 
+#include <QWheelEvent>
 
 TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
     : QSystemTrayIcon( parent )
diff --git a/src/TomahawkTrayIcon.h b/src/TomahawkTrayIcon.h
index 31984492b..15aee17cd 100644
--- a/src/TomahawkTrayIcon.h
+++ b/src/TomahawkTrayIcon.h
@@ -20,9 +20,9 @@
 #ifndef TOMAHAWK_TRAYICON_H
 #define TOMAHAWK_TRAYICON_H
 
-#include <QtGui/QSystemTrayIcon>
-#include <QtCore/QTimer>
-#include <QtGui/QMenu>
+#include <QSystemTrayIcon>
+#include <QTimer>
+#include <QMenu>
 
 #include "Result.h"
 
@@ -48,7 +48,7 @@ private slots:
     void onPlay();
     void onStop();
     void onResume();
-    
+
     void onSocialActionsLoaded();
     void onStopContinueAfterTrackChanged();
     void stopContinueAfterTrackActionTriggered();
diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp
index 6fa6dda60..a886eddfd 100644
--- a/src/TomahawkWindow.cpp
+++ b/src/TomahawkWindow.cpp
@@ -22,24 +22,6 @@
 #include "TomahawkWindow.h"
 #include "ui_TomahawkWindow.h"
 
-#include "config.h"
-
-#include <QAction>
-#include <QCloseEvent>
-#include <QDesktopServices>
-#include <QShowEvent>
-#include <QHideEvent>
-#include <QInputDialog>
-#include <QPixmap>
-#include <QPropertyAnimation>
-#include <QLineEdit>
-#include <QMessageBox>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QTimer>
-#include <QToolBar>
-#include <QToolButton>
-
 #include "accounts/AccountManager.h"
 #include "sourcetree/SourceTreeView.h"
 #include "network/Servent.h"
@@ -77,6 +59,25 @@
 #include "TomahawkApp.h"
 #include "LoadXSPFDialog.h"
 #include "widgets/ContainedMenuButton.h"
+#include "utils/Logger.h"
+
+#include "config.h"
+
+#include <QAction>
+#include <QCloseEvent>
+#include <QDesktopServices>
+#include <QShowEvent>
+#include <QHideEvent>
+#include <QInputDialog>
+#include <QPixmap>
+#include <QPropertyAnimation>
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QTimer>
+#include <QToolBar>
+#include <QToolButton>
 
 #if defined( Q_WS_WIN ) && defined( WITH_QtSparkle )
     #include <qtsparkle/Updater>
@@ -85,8 +86,6 @@
     #endif
 #endif
 
-#include "utils/Logger.h"
-
 using namespace Tomahawk;
 using namespace Accounts;
 
diff --git a/src/TomahawkWindow.h b/src/TomahawkWindow.h
index 9ffe83fd8..99969c30b 100644
--- a/src/TomahawkWindow.h
+++ b/src/TomahawkWindow.h
@@ -22,6 +22,12 @@
 #ifndef TOMAHAWKWINDOW_H
 #define TOMAHAWKWINDOW_H
 
+#include "Result.h"
+#include "audio/AudioEngine.h"
+#include "utils/XspfLoader.h"
+
+#include "config.h"
+
 #include <QMainWindow>
 #include <QVariantMap>
 #include <QPushButton>
@@ -29,11 +35,6 @@
 #include <QStackedWidget>
 #include <QToolButton>
 
-#include "config.h"
-#include "Result.h"
-#include "audio/AudioEngine.h"
-#include "utils/XspfLoader.h"
-
 #ifdef Q_OS_WIN
     #include <shobjidl.h>
 #endif
diff --git a/src/sourcetree/AnimationHelper.cpp b/src/sourcetree/AnimationHelper.cpp
index f84ad3998..b761580df 100644
--- a/src/sourcetree/AnimationHelper.cpp
+++ b/src/sourcetree/AnimationHelper.cpp
@@ -19,7 +19,7 @@
 
 #include "AnimationHelper.h"
 
-#include "QDebug"
+#include <QDebug>
 
 AnimationHelper::AnimationHelper( const QModelIndex& index, QObject *parent )
     :QObject( parent )
diff --git a/src/sourcetree/SourceDelegate.cpp b/src/sourcetree/SourceDelegate.cpp
index 198f65de1..3569c0582 100644
--- a/src/sourcetree/SourceDelegate.cpp
+++ b/src/sourcetree/SourceDelegate.cpp
@@ -31,12 +31,13 @@
 #include "AnimationHelper.h"
 #include "Source.h"
 #include "TomahawkSettings.h"
+#include "audio/AudioEngine.h"
+#include "ActionCollection.h"
+
+#include <QApplication>
+#include <QPainter>
+#include <QMouseEvent>
 
-#include <QtGui/QApplication>
-#include <QtGui/QPainter>
-#include <QtGui/QMouseEvent>
-#include <audio/AudioEngine.h>
-#include <ActionCollection.h>
 
 #define TREEVIEW_INDENT_ADD 12
 
diff --git a/src/sourcetree/SourceDelegate.h b/src/sourcetree/SourceDelegate.h
index d58829f0e..d1ad7f582 100644
--- a/src/sourcetree/SourceDelegate.h
+++ b/src/sourcetree/SourceDelegate.h
@@ -25,8 +25,8 @@
 #include "SourceTreeView.h"
 #include "items/SourceTreeItem.h"
 
-#include <QtGui/QStyledItemDelegate>
-#include <QtCore/QPropertyAnimation>
+#include <QStyledItemDelegate>
+#include <QPropertyAnimation>
 
 class AnimationHelper;
 
diff --git a/src/sourcetree/SourceTreeView.cpp b/src/sourcetree/SourceTreeView.cpp
index cfb3bb0f9..146f173f5 100644
--- a/src/sourcetree/SourceTreeView.cpp
+++ b/src/sourcetree/SourceTreeView.cpp
@@ -20,17 +20,6 @@
 
 #include "SourceTreeView.h"
 
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QContextMenuEvent>
-#include <QtGui/QDragEnterEvent>
-#include <QtGui/QHeaderView>
-#include <QtGui/QPainter>
-#include <QtGui/QStyledItemDelegate>
-#include <QtGui/QFileDialog>
-#include <QtGui/QMessageBox>
-#include <QtCore/QSize>
-
 #include "ActionCollection.h"
 #include "Playlist.h"
 #include "ViewManager.h"
@@ -54,6 +43,17 @@
 #include "utils/Closure.h"
 #include "widgets/SourceTreePopupDialog.h"
 
+#include <QAction>
+#include <QApplication>
+#include <QContextMenuEvent>
+#include <QDragEnterEvent>
+#include <QHeaderView>
+#include <QPainter>
+#include <QStyledItemDelegate>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QSize>
+
 using namespace Tomahawk;
 
 
diff --git a/src/sourcetree/SourceTreeView.h b/src/sourcetree/SourceTreeView.h
index 83d330ee9..699b9fdf5 100644
--- a/src/sourcetree/SourceTreeView.h
+++ b/src/sourcetree/SourceTreeView.h
@@ -23,8 +23,8 @@
 #include "Typedefs.h"
 #include "SourcePlaylistInterface.h"
 
-#include <QtGui/QTreeView>
-#include <QtGui/QMenu>
+#include <QTreeView>
+#include <QMenu>
 
 class SourceTreePopupDialog;
 class CollectionModel;
diff --git a/src/sourcetree/SourcesModel.cpp b/src/sourcetree/SourcesModel.cpp
index c800a13e1..4f2b4891d 100644
--- a/src/sourcetree/SourcesModel.cpp
+++ b/src/sourcetree/SourcesModel.cpp
@@ -20,11 +20,6 @@
 
 #include "sourcetree/SourcesModel.h"
 
-#include <boost/bind.hpp>
-
-#include <QMimeData>
-#include <QSize>
-
 #include "sourcetree/items/SourceTreeItem.h"
 #include "sourcetree/items/SourceItem.h"
 #include "sourcetree/items/GroupItem.h"
@@ -45,6 +40,11 @@
 #include "playlist/PlaylistView.h"
 #include "playlist/dynamic/widgets/DynamicWidget.h"
 
+#include <QMimeData>
+#include <QSize>
+
+#include <boost/bind.hpp>
+
 using namespace Tomahawk;
 
 
diff --git a/src/sourcetree/SourcesModel.h b/src/sourcetree/SourcesModel.h
index eea811d14..314c03295 100644
--- a/src/sourcetree/SourcesModel.h
+++ b/src/sourcetree/SourcesModel.h
@@ -22,12 +22,11 @@
 #ifndef SOURCESMODEL_H
 #define SOURCESMODEL_H
 
-#include <QModelIndex>
-#include <QStringList>
-
 #include "Typedefs.h"
 #include "Source.h"
 
+#include <QModelIndex>
+#include <QStringList>
 #include <QList>
 #include <QAction>
 
diff --git a/src/sourcetree/SourcesProxyModel.cpp b/src/sourcetree/SourcesProxyModel.cpp
index e54733791..e50488983 100644
--- a/src/sourcetree/SourcesProxyModel.cpp
+++ b/src/sourcetree/SourcesProxyModel.cpp
@@ -20,14 +20,13 @@
 
 #include "SourcesProxyModel.h"
 
-#include <QtGui/QTreeView>
-
 #include "SourceList.h"
 #include "SourcesModel.h"
 #include "sourcetree/items/SourceItem.h"
 
 #include "utils/Logger.h"
 
+#include <QTreeView>
 
 SourcesProxyModel::SourcesProxyModel( SourcesModel* model, QObject* parent )
     : QSortFilterProxyModel( parent )
@@ -67,7 +66,7 @@ SourcesProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourcePar
 
     if ( item && item->type() != SourcesModel::Divider && item->parent()->parent() == 0 && !item->children().count() )
         return false;
-   
+
     if ( !m_filtered )
         return true;
 
diff --git a/src/sourcetree/SourcesProxyModel.h b/src/sourcetree/SourcesProxyModel.h
index c2531d2b2..947ab1389 100644
--- a/src/sourcetree/SourcesProxyModel.h
+++ b/src/sourcetree/SourcesProxyModel.h
@@ -20,7 +20,7 @@
 #ifndef SOURCESPROXYMODEL_H
 #define SOURCESPROXYMODEL_H
 
-#include <QtGui/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
 
 class SourcesModel;
 
diff --git a/src/sourcetree/items/CategoryItems.cpp b/src/sourcetree/items/CategoryItems.cpp
index 943d626f6..1956ea0af 100644
--- a/src/sourcetree/items/CategoryItems.cpp
+++ b/src/sourcetree/items/CategoryItems.cpp
@@ -19,7 +19,6 @@
 
 #include "CategoryItems.h"
 
-#include <QMimeData>
 
 #include "TomahawkApp.h"
 #include "ViewManager.h"
@@ -29,12 +28,14 @@
 #include "utils/TomahawkUtils.h"
 #include "widgets/NewPlaylistWidget.h"
 #include "TomahawkWindow.h"
-#include <playlist/dynamic/GeneratorInterface.h>
+#include "playlist/dynamic/GeneratorInterface.h"
 #include "utils/Logger.h"
 #include "DropJob.h"
 
 #include <echonest/Playlist.h>
 
+#include <QMimeData>
+
 using namespace Tomahawk;
 
 
diff --git a/src/sourcetree/items/LovedTracksItem.h b/src/sourcetree/items/LovedTracksItem.h
index 81dae6016..815fea1b8 100644
--- a/src/sourcetree/items/LovedTracksItem.h
+++ b/src/sourcetree/items/LovedTracksItem.h
@@ -21,8 +21,8 @@
 
 #include "SourceTreeItem.h"
 
-#include <QtCore/QString>
-#include <QtGui/QIcon>
+#include <QString>
+#include <QIcon>
 
 
 class LovedTracksItem : public SourceTreeItem
diff --git a/src/sourcetree/items/PlaylistItems.cpp b/src/sourcetree/items/PlaylistItems.cpp
index b31b32354..978db3f2d 100644
--- a/src/sourcetree/items/PlaylistItems.cpp
+++ b/src/sourcetree/items/PlaylistItems.cpp
@@ -19,9 +19,6 @@
 
 #include "PlaylistItems.h"
 
-#include <QMimeData>
-#include <QPainter>
-
 #include "Query.h"
 #include "ViewManager.h"
 #include "playlist/dynamic/GeneratorInterface.h"
@@ -34,6 +31,9 @@
 #include "Source.h"
 #include "audio/AudioEngine.h"
 
+#include <QMimeData>
+#include <QPainter>
+
 using namespace Tomahawk;
 
 
diff --git a/src/sourcetree/items/SourceTreeItem.h b/src/sourcetree/items/SourceTreeItem.h
index 628322458..b89fa6430 100644
--- a/src/sourcetree/items/SourceTreeItem.h
+++ b/src/sourcetree/items/SourceTreeItem.h
@@ -19,11 +19,11 @@
 #ifndef SOURCETREEITEM_H
 #define SOURCETREEITEM_H
 
-#include <QIcon>
-
 #include "Typedefs.h"
 #include "SourcesModel.h"
 
+#include <QIcon>
+
 class QMimeData;
 
 class SourceTreeItem : public QObject
diff --git a/src/web/Api_v1.cpp b/src/web/Api_v1.cpp
index 060ea0e1b..a70146be0 100644
--- a/src/web/Api_v1.cpp
+++ b/src/web/Api_v1.cpp
@@ -20,8 +20,6 @@
 
 #include "Api_v1.h"
 
-#include <QHash>
-
 #include "utils/Logger.h"
 
 #include "utils/TomahawkUtils.h"
@@ -32,6 +30,8 @@
 #include "Pipeline.h"
 #include "Source.h"
 
+#include <QHash>
+
 using namespace Tomahawk;
 
 
@@ -239,7 +239,7 @@ Api_v1::statResult( const QString& clientToken, const QString& name, bool valid
     Q_ASSERT( m_storedEvent );
     if ( !m_storedEvent )
         return;
-    
+
     QVariantMap m;
     m.insert( "name", "playdar" );
     m.insert( "version", "0.1.1" ); // TODO (needs to be >=0.1.1 for JS to work)
diff --git a/src/widgets/AccountsPopupWidget.cpp b/src/widgets/AccountsPopupWidget.cpp
index 43a68b2e0..650e10d4d 100644
--- a/src/widgets/AccountsPopupWidget.cpp
+++ b/src/widgets/AccountsPopupWidget.cpp
@@ -21,15 +21,15 @@
 
 #include "utils/TomahawkUtilsGui.h"
 
+#ifdef QT_MAC_USE_COCOA
+#include "widgets/SourceTreePopupDialog_mac.h"
+#endif
+
 #include <QDebug>
 #include <QPainter>
 #include <QPaintEvent>
 #include <QVBoxLayout>
 
-#ifdef QT_MAC_USE_COCOA
-#include "widgets/SourceTreePopupDialog_mac.h"
-#endif
-
 AccountsPopupWidget::AccountsPopupWidget( QWidget* parent )
     : QWidget( parent )
     , m_widget( 0 )
diff --git a/src/widgets/ContainedMenuButton.cpp b/src/widgets/ContainedMenuButton.cpp
index be9ea8b5c..308b72fdd 100644
--- a/src/widgets/ContainedMenuButton.cpp
+++ b/src/widgets/ContainedMenuButton.cpp
@@ -18,7 +18,7 @@
 
 #include "ContainedMenuButton.h"
 
-#include <QtGui/QMouseEvent>
+#include <QMouseEvent>
 
 ContainedMenuButton::ContainedMenuButton( QWidget *parent )
     : QToolButton( parent )
diff --git a/src/widgets/ContainedMenuButton.h b/src/widgets/ContainedMenuButton.h
index 19ee64433..5a62b7d23 100644
--- a/src/widgets/ContainedMenuButton.h
+++ b/src/widgets/ContainedMenuButton.h
@@ -19,8 +19,8 @@
 #ifndef CONTAINEDMENUBUTTON_H
 #define CONTAINEDMENUBUTTON_H
 
-#include <QtGui/QMenu>
-#include <QtGui/QToolButton>
+#include <QMenu>
+#include <QToolButton>
 
 /**
  * @brief The ContainedMenuButton class defines a modified QToolButton that pops