diff --git a/src/libtomahawk/database/databasecommand_alltracks.h b/src/libtomahawk/database/databasecommand_alltracks.h
index c03ebbb53..bbf653f6b 100644
--- a/src/libtomahawk/database/databasecommand_alltracks.h
+++ b/src/libtomahawk/database/databasecommand_alltracks.h
@@ -26,6 +26,8 @@
 #include "collection.h"
 #include "typedefs.h"
 #include "query.h"
+#include "artist.h"
+#include "album.h"
 
 #include "dllmacro.h"
 
diff --git a/src/libtomahawk/database/databasecommand_resolve.h b/src/libtomahawk/database/databasecommand_resolve.h
index 52b8fbe18..80cbe5d88 100644
--- a/src/libtomahawk/database/databasecommand_resolve.h
+++ b/src/libtomahawk/database/databasecommand_resolve.h
@@ -22,6 +22,8 @@
 #include "databasecommand.h"
 #include "databaseimpl.h"
 #include "result.h"
+#include "artist.h"
+#include "album.h"
 
 #include <QVariant>
 
diff --git a/src/libtomahawk/database/databaseresolver.h b/src/libtomahawk/database/databaseresolver.h
index ae7b8fc50..fd27180f5 100644
--- a/src/libtomahawk/database/databaseresolver.h
+++ b/src/libtomahawk/database/databaseresolver.h
@@ -21,6 +21,8 @@
 
 #include "resolver.h"
 #include "result.h"
+#include "artist.h"
+#include "album.h"
 
 #include "dllmacro.h"
 
diff --git a/src/libtomahawk/playlist/albumitem.h b/src/libtomahawk/playlist/albumitem.h
index 8b7cb7774..1a0455d06 100644
--- a/src/libtomahawk/playlist/albumitem.h
+++ b/src/libtomahawk/playlist/albumitem.h
@@ -24,6 +24,7 @@
 #include <QPersistentModelIndex>
 #include <QPixmap>
 
+#include "artist.h"
 #include "album.h"
 
 #include "dllmacro.h"
diff --git a/src/libtomahawk/playlist/queueproxymodelplaylistinterface.h b/src/libtomahawk/playlist/queueproxymodelplaylistinterface.h
index 85c9101c6..142764d9c 100644
--- a/src/libtomahawk/playlist/queueproxymodelplaylistinterface.h
+++ b/src/libtomahawk/playlist/queueproxymodelplaylistinterface.h
@@ -21,6 +21,7 @@
 
 #include "playlistproxymodelplaylistinterface.h"
 
+#include "result.h"
 #include "dllmacro.h"
 
 class QueueProxyModel;