4 files changed, 6 insertions, 4 deletions
diff --git a/src/library/dao/autodjcratesdao.cpp b/src/library/dao/autodjcratesdao.cpp
index 58809c2baa..9ca5b4284b 100644
--- a/src/library/dao/autodjcratesdao.cpp
+++ b/src/library/dao/autodjcratesdao.cpp
@@ -14,6 +14,7 @@
 #include "library/trackcollection.h"
 #include "mixer/playerinfo.h"
 #include "mixer/playermanager.h"
+#include "track/track.h"
 
 #define AUTODJCRATESTABLE_TRACKID "track_id"
 #define AUTODJCRATESTABLE_CRATEREFS "craterefs"
diff --git a/src/library/dao/autodjcratesdao.h b/src/library/dao/autodjcratesdao.h
index 2aeb73096a..35e45678ff 100644
--- a/src/library/dao/autodjcratesdao.h
+++ b/src/library/dao/autodjcratesdao.h
@@ -3,9 +3,10 @@
 #include <QObject>
 #include <QSqlDatabase>
 
-#include "preferences/usersettings.h"
 #include "library/crate/crateid.h"
-#include "track/track.h"
+#include "preferences/usersettings.h"
+#include "track/track_decl.h"
+#include "track/trackid.h"
 #include "util/class.h"
 
 class TrackCollection;
diff --git a/src/library/dao/cuedao.cpp b/src/library/dao/cuedao.cpp
index 2cba410bcd..f8c8740f6d 100644
--- a/src/library/dao/cuedao.cpp
+++ b/src/library/dao/cuedao.cpp
@@ -8,7 +8,6 @@
 #include <QtSql>
 
 #include "library/queryutil.h"
-#include "track/cue.h"
 #include "track/track.h"
 #include "util/assert.h"
 #include "util/color/rgbcolor.h"
diff --git a/src/library/dao/cuedao.h b/src/library/dao/cuedao.h
index d38d63820a..68a0a66816 100644
--- a/src/library/dao/cuedao.h
+++ b/src/library/dao/cuedao.h
@@ -2,8 +2,9 @@
 
 #include <QSqlDatabase>
 
-#include "track/track.h"
 #include "library/dao/dao.h"
+#include "track/cue.h"
+#include "track/trackid.h"
 
 #define CUE_TABLE "cues"