diff --git a/src/libtomahawk/DropJob.cpp b/src/libtomahawk/DropJob.cpp
index ce4dd3553..0611697da 100644
--- a/src/libtomahawk/DropJob.cpp
+++ b/src/libtomahawk/DropJob.cpp
@@ -22,10 +22,9 @@
 #include "DropJob.h"
 #include <QFileInfo>
 
-#include "Artist.h"
-#include "Album.h"
-#include "Source.h"
-
+#include "jobview/JobStatusView.h"
+#include "jobview/JobStatusModel.h"
+#include "jobview/ErrorStatusMessage.h"
 #include "utils/SpotifyParser.h"
 #include "utils/ItunesParser.h"
 #include "utils/ItunesLoader.h"
@@ -36,12 +35,14 @@
 #include "utils/ExfmParser.h"
 #include "utils/Logger.h"
 #include "utils/TomahawkUtils.h"
-#include "GlobalActionManager.h"
 #include "utils/XspfLoader.h"
-#include "jobview/JobStatusView.h"
-#include "jobview/JobStatusModel.h"
-#include "jobview/ErrorStatusMessage.h"
+
+#include "Artist.h"
+#include "Album.h"
+#include "GlobalActionManager.h"
 #include "Pipeline.h"
+#include "Result.h"
+#include "Source.h"
 
 #ifdef QCA2_FOUND
 #include "utils/GroovesharkParser.h"
diff --git a/src/libtomahawk/Pipeline.cpp b/src/libtomahawk/Pipeline.cpp
index 5e4776438..2f4326203 100644
--- a/src/libtomahawk/Pipeline.cpp
+++ b/src/libtomahawk/Pipeline.cpp
@@ -20,16 +20,18 @@
 
 #include <QMutexLocker>
 
-#include "FuncTimeout.h"
 #include "database/Database.h"
 #include "resolvers/ExternalResolver.h"
 #include "resolvers/ScriptResolver.h"
 #include "resolvers/JSResolver.h"
-#include "Source.h"
-#include "SourceList.h"
 #include "utils/ResultUrlChecker.h"
 #include "utils/Logger.h"
 
+#include "FuncTimeout.h"
+#include "Result.h"
+#include "Source.h"
+#include "SourceList.h"
+
 #include <boost/bind.hpp>
 
 #define DEFAULT_CONCURRENT_QUERIES 4
diff --git a/src/libtomahawk/Playlist.h b/src/libtomahawk/Playlist.h
index 3fe6fcede..a800dd69a 100644
--- a/src/libtomahawk/Playlist.h
+++ b/src/libtomahawk/Playlist.h
@@ -28,7 +28,6 @@
 #include <QQueue>
 
 #include "Typedefs.h"
-#include "Result.h"
 #include "PlaylistEntry.h"
 #include "PlaylistInterface.h"
 #include "playlist/PlaylistUpdaterInterface.h"
diff --git a/src/libtomahawk/Query.cpp b/src/libtomahawk/Query.cpp
index 98bac5dff..bf0bcd0d4 100644
--- a/src/libtomahawk/Query.cpp
+++ b/src/libtomahawk/Query.cpp
@@ -21,6 +21,8 @@
 
 #include <QtAlgorithms>
 
+#include "audio/AudioEngine.h"
+#include "collection/Collection.h"
 #include "database/Database.h"
 #include "database/DatabaseImpl.h"
 #include "database/DatabaseCommand_LogPlayback.h"
@@ -28,12 +30,12 @@
 #include "database/DatabaseCommand_LoadSocialActions.h"
 #include "database/DatabaseCommand_SocialAction.h"
 #include "database/DatabaseCommand_TrackStats.h"
-#include "Album.h"
-#include "collection/Collection.h"
-#include "Pipeline.h"
 #include "resolvers/Resolver.h"
+
+#include "Album.h"
+#include "Pipeline.h"
+#include "Result.h"
 #include "SourceList.h"
-#include "audio/AudioEngine.h"
 
 #include "utils/Logger.h"
 
diff --git a/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp b/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp
index 8c273f5b9..acae31b8d 100644
--- a/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp
@@ -21,12 +21,14 @@
 
 #include <QSqlQuery>
 
-#include "DatabaseImpl.h"
-#include "Artist.h"
-#include "Album.h"
-#include "SourceList.h"
 #include "utils/Logger.h"
 
+#include "Album.h"
+#include "Artist.h"
+#include "DatabaseImpl.h"
+#include "Result.h"
+#include "SourceList.h"
+
 
 void
 DatabaseCommand_AllTracks::exec( DatabaseImpl* dbi )
diff --git a/src/libtomahawk/jobview/PipelineStatusItem.cpp b/src/libtomahawk/jobview/PipelineStatusItem.cpp
index c4692e75f..e823a8a65 100644
--- a/src/libtomahawk/jobview/PipelineStatusItem.cpp
+++ b/src/libtomahawk/jobview/PipelineStatusItem.cpp
@@ -21,8 +21,10 @@
 #include "PipelineStatusItem.h"
 
 #include "utils/TomahawkUtilsGui.h"
+
 #include "Pipeline.h"
 #include "Source.h"
+#include "Track.h"
 
 #ifndef ENABLE_HEADLESS
 #include "JobStatusModel.h"
diff --git a/src/libtomahawk/jobview/TransferStatusItem.cpp b/src/libtomahawk/jobview/TransferStatusItem.cpp
index 0fe8a1e6b..76a07feb3 100644
--- a/src/libtomahawk/jobview/TransferStatusItem.cpp
+++ b/src/libtomahawk/jobview/TransferStatusItem.cpp
@@ -18,23 +18,19 @@
 
 #include "TransferStatusItem.h"
 
-
-#include "JobStatusView.h"
-#include "JobStatusModel.h"
 #include "network/StreamConnection.h"
 #include "network/Servent.h"
 #include "utils/TomahawkUtils.h"
-#include "Result.h"
-#include "Source.h"
-#include "Artist.h"
-#include "network/StreamConnection.h"
-#include "network/Servent.h"
 #include "utils/TomahawkUtilsGui.h"
 
+#include "Artist.h"
+#include "Result.h"
+#include "Source.h"
+#include "Track.h"
 
 #ifndef ENABLE_HEADLESS
-#include "JobStatusModel.h"
-#include "JobStatusView.h"
+    #include "JobStatusModel.h"
+    #include "JobStatusView.h"
 #endif
 
 TransferStatusItem::TransferStatusItem( TransferStatusManager* p, StreamConnection* sc )
diff --git a/src/libtomahawk/playlist/PlayableItem.cpp b/src/libtomahawk/playlist/PlayableItem.cpp
index af7562446..465575d4c 100644
--- a/src/libtomahawk/playlist/PlayableItem.cpp
+++ b/src/libtomahawk/playlist/PlayableItem.cpp
@@ -18,12 +18,14 @@
 
 #include "PlayableItem.h"
 
+#include "utils/Logger.h"
 #include "utils/TomahawkUtils.h"
+
 #include "Artist.h"
 #include "Album.h"
 #include "Query.h"
+#include "Result.h"
 #include "Source.h"
-#include "utils/Logger.h"
 
 using namespace Tomahawk;
 
diff --git a/src/libtomahawk/playlist/PlayableModel.cpp b/src/libtomahawk/playlist/PlayableModel.cpp
index 211a79a41..e6b27596d 100644
--- a/src/libtomahawk/playlist/PlayableModel.cpp
+++ b/src/libtomahawk/playlist/PlayableModel.cpp
@@ -20,20 +20,22 @@
 
 #include "PlayableModel.h"
 
-#include <QDateTime>
-#include <QMimeData>
-#include <QTreeView>
+#include "audio/AudioEngine.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
 
 #include "Artist.h"
 #include "Album.h"
 #include "Pipeline.h"
 #include "PlayableItem.h"
 #include "PlayableProxyModel.h"
+#include "Result.h"
 #include "Source.h"
 #include "Typedefs.h"
-#include "audio/AudioEngine.h"
-#include "utils/TomahawkUtils.h"
-#include "utils/Logger.h"
+
+#include <QDateTime>
+#include <QMimeData>
+#include <QTreeView>
 
 using namespace Tomahawk;
 
diff --git a/src/libtomahawk/playlist/PlayableProxyModel.cpp b/src/libtomahawk/playlist/PlayableProxyModel.cpp
index 4f51539ee..af1d291fe 100644
--- a/src/libtomahawk/playlist/PlayableProxyModel.cpp
+++ b/src/libtomahawk/playlist/PlayableProxyModel.cpp
@@ -19,16 +19,17 @@
 
 #include "PlayableProxyModel.h"
 
-#include <QTreeView>
-
-#include "PlayableProxyModelPlaylistInterface.h"
-#include "Artist.h"
-#include "Album.h"
-#include "Query.h"
-#include "Source.h"
-#include "PlayableItem.h"
 #include "utils/Logger.h"
 
+#include "Artist.h"
+#include "Album.h"
+#include "PlayableItem.h"
+#include "PlayableProxyModelPlaylistInterface.h"
+#include "Query.h"
+#include "Result.h"
+#include "Source.h"
+
+#include <QTreeView>
 
 PlayableProxyModel::PlayableProxyModel( QObject* parent )
     : QSortFilterProxyModel( parent )
diff --git a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp
index 0bc6a110e..2e87f1891 100644
--- a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp
+++ b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp
@@ -19,14 +19,16 @@
 
 #include "PlayableProxyModelPlaylistInterface.h"
 
-#include "PlayableProxyModel.h"
-#include "Artist.h"
-#include "Album.h"
-#include "Query.h"
-#include "PlayableItem.h"
-#include "Source.h"
 #include "utils/Logger.h"
 
+#include "Album.h"
+#include "Artist.h"
+#include "PlayableItem.h"
+#include "PlayableProxyModel.h"
+#include "Query.h"
+#include "Result.h"
+#include "Source.h"
+
 using namespace Tomahawk;
 
 
diff --git a/src/libtomahawk/playlist/QueueProxyModel.cpp b/src/libtomahawk/playlist/QueueProxyModel.cpp
index 66463f299..8aed6f092 100644
--- a/src/libtomahawk/playlist/QueueProxyModel.cpp
+++ b/src/libtomahawk/playlist/QueueProxyModel.cpp
@@ -21,11 +21,13 @@
 
 #include "audio/AudioEngine.h"
 #include "playlist/TrackView.h"
-#include "PlayableItem.h"
-#include "ViewManager.h"
-#include "Source.h"
 #include "utils/Logger.h"
 
+#include "PlayableItem.h"
+#include "Result.h"
+#include "Source.h"
+#include "ViewManager.h"
+
 using namespace Tomahawk;
 
 
diff --git a/src/libtomahawk/resolvers/JSResolver.cpp b/src/libtomahawk/resolvers/JSResolver.cpp
index f01c64af6..9ea63cdf4 100644
--- a/src/libtomahawk/resolvers/JSResolver.cpp
+++ b/src/libtomahawk/resolvers/JSResolver.cpp
@@ -20,27 +20,23 @@
 
 #include "JSResolver.h"
 
+#include "accounts/AccountConfigWidget.h"
+#include "network/Servent.h"
+#include "jobview/JobStatusView.h"
+#include "jobview/JobStatusModel.h"
+#include "jobview/ErrorStatusMessage.h"
+#include "utils/TomahawkUtilsGui.h"
+
 #include "Artist.h"
 #include "Album.h"
 #include "config.h"
 #include "Pipeline.h"
+#include "Result.h"
 #include "ScriptCollection.h"
 #include "SourceList.h"
 #include "TomahawkSettings.h"
 #include "TomahawkVersion.h"
 
-#include "accounts/AccountConfigWidget.h"
-
-#include "network/Servent.h"
-
-#include "jobview/JobStatusView.h"
-#include "jobview/JobStatusModel.h"
-#include "jobview/ErrorStatusMessage.h"
-
-#include "utils/TomahawkUtilsGui.h"
-
-#include "config.h"
-
 #include <QImageReader>
 #include <QMessageBox>
 #include <QNetworkRequest>
diff --git a/src/libtomahawk/resolvers/ScriptResolver.cpp b/src/libtomahawk/resolvers/ScriptResolver.cpp
index 3f2247090..7449888ce 100644
--- a/src/libtomahawk/resolvers/ScriptResolver.cpp
+++ b/src/libtomahawk/resolvers/ScriptResolver.cpp
@@ -23,6 +23,7 @@
 #include "Artist.h"
 #include "Album.h"
 #include "Pipeline.h"
+#include "Result.h"
 #include "ScriptCollection.h"
 #include "SourceList.h"
 
diff --git a/src/tomahawk/web/Api_v1.cpp b/src/tomahawk/web/Api_v1.cpp
index 090565937..f23106ed3 100644
--- a/src/tomahawk/web/Api_v1.cpp
+++ b/src/tomahawk/web/Api_v1.cpp
@@ -21,22 +21,21 @@
 
 #include "Api_v1.h"
 
-#include "utils/Logger.h"
-
-#include "utils/TomahawkUtils.h"
 #include "database/Database.h"
 #include "database/DatabaseCommand_AddClientAuth.h"
 #include "database/DatabaseCommand_ClientAuthValid.h"
 #include "network/Servent.h"
+#include "utils/Logger.h"
+#include "utils/TomahawkUtils.h"
+
 #include "Pipeline.h"
+#include "Result.h"
 #include "Source.h"
 
 #include <boost/bind.hpp>
 
 #include <QHash>
 
-
-
 using namespace Tomahawk;
 using namespace TomahawkUtils;