diff --git a/src/libtomahawk/Artist.h b/src/libtomahawk/Artist.h
index 825240c8f..4903889c7 100644
--- a/src/libtomahawk/Artist.h
+++ b/src/libtomahawk/Artist.h
@@ -27,6 +27,7 @@
 
 #include <QFuture>
 
+#include "TrackData.h"
 #include "Typedefs.h"
 #include "DllMacro.h"
 #include "Query.h"
diff --git a/src/libtomahawk/PlaylistEntry.cpp b/src/libtomahawk/PlaylistEntry.cpp
index 47877d177..46e6054b7 100644
--- a/src/libtomahawk/PlaylistEntry.cpp
+++ b/src/libtomahawk/PlaylistEntry.cpp
@@ -20,9 +20,11 @@
 
 #include "PlaylistEntry.h"
 
-#include "Source.h"
 #include "utils/Logger.h"
 
+#include "Result.h"
+#include "Source.h"
+
 using namespace Tomahawk;
 
 
diff --git a/src/libtomahawk/Query.h b/src/libtomahawk/Query.h
index e471d9ade..05bc12564 100644
--- a/src/libtomahawk/Query.h
+++ b/src/libtomahawk/Query.h
@@ -26,8 +26,6 @@
 #include <QVariant>
 
 #include "Typedefs.h"
-#include "Result.h"
-#include "Track.h"
 #include "infosystem/InfoSystem.h"
 
 #include "DllMacro.h"
diff --git a/src/libtomahawk/SourcePlaylistInterface.cpp b/src/libtomahawk/SourcePlaylistInterface.cpp
index 810869048..34d745326 100644
--- a/src/libtomahawk/SourcePlaylistInterface.cpp
+++ b/src/libtomahawk/SourcePlaylistInterface.cpp
@@ -19,12 +19,13 @@
 
 #include "SourcePlaylistInterface.h"
 
-#include "Source.h"
-#include "Pipeline.h"
 #include "audio/AudioEngine.h"
-
 #include "utils/Logger.h"
 
+#include "Pipeline.h"
+#include "Result.h"
+#include "Source.h"
+
 using namespace Tomahawk;
 
 
diff --git a/src/libtomahawk/database/DatabaseCommand_DeleteInboxEntry.cpp b/src/libtomahawk/database/DatabaseCommand_DeleteInboxEntry.cpp
index 8867957b3..c5c42536e 100644
--- a/src/libtomahawk/database/DatabaseCommand_DeleteInboxEntry.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_DeleteInboxEntry.cpp
@@ -19,6 +19,7 @@
 #include "DatabaseCommand_DeleteInboxEntry.h"
 #include "DatabaseImpl.h"
 #include "Query.h"
+#include "Track.h"
 
 
 DatabaseCommand_DeleteInboxEntry::DatabaseCommand_DeleteInboxEntry( const Tomahawk::query_ptr& query,
diff --git a/src/libtomahawk/database/DatabaseCommand_LoadInboxEntries.cpp b/src/libtomahawk/database/DatabaseCommand_LoadInboxEntries.cpp
index 04d67cfbf..0d226444f 100644
--- a/src/libtomahawk/database/DatabaseCommand_LoadInboxEntries.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_LoadInboxEntries.cpp
@@ -23,6 +23,8 @@
 #include "Query.h"
 #include "SourceList.h"
 #include "TomahawkSqlQuery.h"
+#include "Track.h"
+#include "TrackData.h"
 
 
 DatabaseCommand_LoadInboxEntries::DatabaseCommand_LoadInboxEntries( QObject* parent )
diff --git a/src/libtomahawk/database/DatabaseCommand_ModifyInboxEntry.cpp b/src/libtomahawk/database/DatabaseCommand_ModifyInboxEntry.cpp
index 5055e7183..386eb8511 100644
--- a/src/libtomahawk/database/DatabaseCommand_ModifyInboxEntry.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_ModifyInboxEntry.cpp
@@ -19,6 +19,7 @@
 #include "DatabaseCommand_ModifyInboxEntry.h"
 #include "DatabaseImpl.h"
 #include "Query.h"
+#include "Track.h"
 
 
 DatabaseCommand_ModifyInboxEntry::DatabaseCommand_ModifyInboxEntry( const Tomahawk::query_ptr& query,
diff --git a/src/libtomahawk/jobview/InboxJobItem.cpp b/src/libtomahawk/jobview/InboxJobItem.cpp
index e3b042141..0193175a2 100644
--- a/src/libtomahawk/jobview/InboxJobItem.cpp
+++ b/src/libtomahawk/jobview/InboxJobItem.cpp
@@ -20,10 +20,12 @@
 
 #include "InboxJobItem.h"
 
-#include "Query.h"
+#include "audio/AudioEngine.h"
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
-#include "audio/AudioEngine.h"
+
+#include "Query.h"
+#include "TrackData.h"
 
 #include <QTimer>
 
diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp
index 54801067b..d6a6559e6 100644
--- a/src/libtomahawk/utils/TomahawkUtils.cpp
+++ b/src/libtomahawk/utils/TomahawkUtils.cpp
@@ -21,14 +21,15 @@
 
 #include "utils/TomahawkUtils.h"
 
-#include "Query.h"
-#include "TomahawkVersion.h"
 #include "config.h"
-#include "TomahawkSettings.h"
 
-#include "Source.h"
 #include "BinaryExtractWorker.h"
+#include "Query.h"
 #include "SharedTimeLine.h"
+#include "Source.h"
+#include "TomahawkSettings.h"
+#include "TomahawkVersion.h"
+#include "Track.h"
 
 #ifdef LIBLASTFM_FOUND
     #include <lastfm/ws.h>