diff --git a/src/libtomahawk/aclsystem.cpp b/src/libtomahawk/aclsystem.cpp
index c31247332..ca0c8b434 100644
--- a/src/libtomahawk/aclsystem.cpp
+++ b/src/libtomahawk/aclsystem.cpp
@@ -21,7 +21,7 @@
 #include <QMutexLocker>
 #include <QVariant>
 
-#include <tomahawksettings.h>
+#include "tomahawksettings.h"
 
 #include "utils/logger.h"
 
diff --git a/src/libtomahawk/database/databasecommand_allalbums.h b/src/libtomahawk/database/databasecommand_allalbums.h
index c75c6c2b1..655be1484 100644
--- a/src/libtomahawk/database/databasecommand_allalbums.h
+++ b/src/libtomahawk/database/databasecommand_allalbums.h
@@ -22,9 +22,11 @@
 #include <QObject>
 #include <QVariantMap>
 
+#include "album.h"
+#include "artist.h"
+#include "collection.h"
 #include "typedefs.h"
 #include "databasecommand.h"
-#include "album.h"
 
 #include "dllmacro.h"
 
diff --git a/src/libtomahawk/database/databasecommand_allartists.h b/src/libtomahawk/database/databasecommand_allartists.h
index a021a78a1..d6142aabd 100644
--- a/src/libtomahawk/database/databasecommand_allartists.h
+++ b/src/libtomahawk/database/databasecommand_allartists.h
@@ -22,6 +22,7 @@
 #include <QObject>
 #include <QVariantMap>
 
+#include "artist.h"
 #include "typedefs.h"
 #include "databasecommand.h"
 
diff --git a/src/libtomahawk/playlist.h b/src/libtomahawk/playlist.h
index 06785ecbb..23831332b 100644
--- a/src/libtomahawk/playlist.h
+++ b/src/libtomahawk/playlist.h
@@ -28,6 +28,7 @@
 #include "typedefs.h"
 #include "result.h"
 #include "playlistinterface.h"
+#include "query.h"
 
 #include "dllmacro.h"
 
diff --git a/src/libtomahawk/viewmanager.h b/src/libtomahawk/viewmanager.h
index edcba014c..e5c238e86 100644
--- a/src/libtomahawk/viewmanager.h
+++ b/src/libtomahawk/viewmanager.h
@@ -23,6 +23,7 @@
 #include <QHash>
 #include <QStackedWidget>
 
+#include "artist.h"
 #include "collection.h"
 #include "playlistinterface.h"
 #include "playlist/queueview.h"