replace #include "track/track.h" by "track_decl.h" in all header files

128 files changed, 278 insertions, 235 deletions

diff --git a/src/analyzer/analyzer.h b/src/analyzer/analyzer.h
index 85d460b8a5..2704717aa5 100644
--- a/src/analyzer/analyzer.h
+++ b/src/analyzer/analyzer.h
@@ -11,7 +11,7 @@
  *   -- Adam
  */
 
-#include "track/track.h"
+#include "track/track_decl.h"
 
 class Analyzer {
   public:
diff --git a/src/analyzer/analyzerkey.cpp b/src/analyzer/analyzerkey.cpp
index acd446acde..38e3bc2c89 100644
--- a/src/analyzer/analyzerkey.cpp
+++ b/src/analyzer/analyzerkey.cpp
@@ -10,6 +10,7 @@
 #include "analyzer/plugins/analyzerqueenmarykey.h"
 #include "proto/keys.pb.h"
 #include "track/keyfactory.h"
+#include "track/track.h"
 
 // static
 QList<mixxx::AnalyzerPluginInfo> AnalyzerKey::availablePlugins() {
diff --git a/src/analyzer/analyzerkey.h b/src/analyzer/analyzerkey.h
index bf2391969c..52ba45b88b 100644
--- a/src/analyzer/analyzerkey.h
+++ b/src/analyzer/analyzerkey.h
@@ -9,7 +9,7 @@
 #include "analyzer/plugins/analyzerplugin.h"
 #include "preferences/keydetectionsettings.h"
 #include "preferences/usersettings.h"
-#include "track/track.h"
+#include "track/track_decl.h"
 #include "util/memory.h"
 
 class AnalyzerKey : public Analyzer {
diff --git a/src/analyzer/analyzersilence.cpp b/src/analyzer/analyzersilence.cpp
index f529b4322a..c07cde2e53 100644
--- a/src/analyzer/analyzersilence.cpp
+++ b/src/analyzer/analyzersilence.cpp
@@ -2,6 +2,7 @@
 
 #include "analyzer/constants.h"
 #include "engine/engine.h"
+#include "track/track.h"
 
 namespace {
 
diff --git a/src/analyzer/analyzerthread.cpp b/src/analyzer/analyzerthread.cpp
index ee29761525..d4b905fff1 100644
--- a/src/analyzer/analyzerthread.cpp
+++ b/src/analyzer/analyzerthread.cpp
@@ -9,14 +9,11 @@
 #include "analyzer/analyzersilence.h"
 #include "analyzer/analyzerwaveform.h"
 #include "analyzer/constants.h"
-
-#include "library/dao/analysisdao.h"
-
 #include "engine/engine.h"
-
+#include "library/dao/analysisdao.h"
 #include "sources/audiosourcestereoproxy.h"