9 files changed, 15 insertions, 21 deletions
diff --git a/include/djinterop/album_art.hpp b/include/djinterop/album_art.hpp
index 7619b18..ea5f489 100644
--- a/include/djinterop/album_art.hpp
+++ b/include/djinterop/album_art.hpp
@@ -23,15 +23,9 @@
 #error This library needs at least a C++11 compliant compiler
 #endif
 
-#include <chrono>
-#include <cstdint>
-#include <memory>
-#include <stdexcept>
 #include <string>
 #include <vector>
 
-#include <djinterop/database.hpp>
-
 namespace djinterop
 {
 // Artwork for tracks
diff --git a/include/djinterop/crate.hpp b/include/djinterop/crate.hpp
index fc7045b..261888b 100644
--- a/include/djinterop/crate.hpp
+++ b/include/djinterop/crate.hpp
@@ -24,16 +24,12 @@
 #endif
 
 #include <memory>
-#include <stdexcept>
 #include <string>
-#include <unordered_set>
 #include <vector>
 
 #include <boost/optional.hpp>
 #include <boost/utility/string_view.hpp>
 
-#include <djinterop/semantic_version.hpp>
-
 namespace djinterop
 {
 class database;
diff --git a/include/djinterop/enginelibrary.hpp b/include/djinterop/enginelibrary.hpp
index 6da6166..2f4f9c5 100644
--- a/include/djinterop/enginelibrary.hpp
+++ b/include/djinterop/enginelibrary.hpp
@@ -23,12 +23,13 @@
 #error This library needs at least a C++11 compliant compiler
 #endif
 
-#include <djinterop/performance_data.hpp>
+#include <djinterop/pad_color.hpp>
 #include <djinterop/semantic_version.hpp>
 
 namespace djinterop
 {
 class database;
+struct beatgrid_marker;
 
 namespace enginelibrary
 {
diff --git a/include/djinterop/performance_data.hpp b/include/djinterop/performance_data.hpp
index a8f8f33..320cc16 100644
--- a/include/djinterop/performance_data.hpp
+++ b/include/djinterop/performance_data.hpp
@@ -23,14 +23,9 @@
 #error This library needs at least a C++11 compliant compiler
 #endif
 
-#include <chrono>
 #include <cstdint>
-#include <memory>
-#include <stdexcept>
 #include <string>
-#include <vector>
 
-#include <djinterop/musical_key.hpp>
 #include <djinterop/pad_color.hpp>
 
 namespace djinterop
diff --git a/src/djinterop/enginelibrary/performance_data_format.cpp b/src/djinterop/enginelibrary/performance_data_format.cpp
index e6c6b06..950e807 100644
--- a/src/djinterop/enginelibrary/performance_data_format.cpp
+++ b/src/djinterop/enginelibrary/performance_data_format.cpp
@@ -23,6 +23,7 @@
 
 #include <djinterop/enginelibrary/encode_decode_utils.hpp>
 #include <djinterop/enginelibrary/performance_data_format.hpp>
+#include <djinterop/musical_key.hpp>
 
 typedef std::vector<char>::size_type data_size_t;
 
diff --git a/src/djinterop/enginelibrary/performance_data_format.hpp b/src/djinterop/enginelibrary/performance_data_format.hpp
index edf9510..d6f8288 100644
--- a/src/djinterop/enginelibrary/performance_data_format.hpp
+++ b/src/djinterop/enginelibrary/performance_data_format.hpp
@@ -26,6 +26,8 @@
 
 namespace djinterop
 {
+enum class musical_key;
+
 namespace enginelibrary
 {
 struct beat_data
diff --git a/src/djinterop/impl/database_impl.hpp b/src/djinterop/impl/database_impl.hpp
index f8a01dd..b5d21ca 100644
--- a/src/djinterop/impl/database_impl.hpp
+++ b/src/djinterop/impl/database_impl.hpp
@@ -23,11 +23,12 @@
 #include <boost/optional.hpp>
 #include <boost/utility/string_view.hpp>
 
-#include <djinterop/crate.hpp>
-#include <djinterop/track.hpp>
-
 namespace djinterop
 {
+class crate;
+class semantic_version;
+class track;
+
 class database_impl
 {
 public:
diff --git a/src/djinterop/impl/track_impl.hpp b/src/djinterop/impl/track_impl.hpp
index e59a314..cb010cc 100644
--- a/src/djinterop/impl/track_impl.hpp
+++ b/src/djinterop/impl/track_impl.hpp
@@ -17,19 +17,21 @@
 
 #pragma once
 
+#include <chrono>
 #include <string>
 #include <vector>
 
 #include <boost/optional.hpp>
 #include <boost/utility/string_view.hpp>
 
-#include <djinterop/impl/database_impl.hpp>
 #include <djinterop/performance_data.hpp>
 
 namespace djinterop
 {
 class database;
-class database_impl;
+class track;
+class track_import_info;
+enum class musical_key;
 
 class track_impl
 {
diff --git a/src/djinterop/track.cpp b/src/djinterop/track.cpp
index 1f518fc..b974736 100644
--- a/src/djinterop/track.cpp
+++ b/src/djinterop/track.cpp
@@ -26,10 +26,12 @@
 #include <boost/optional.hpp>
 #include <boost/optional/optional_io.hpp>
 
+#include <djinterop/crate.hpp>
 #include <djinterop/database.hpp>
 #include <djinterop/impl/database_impl.hpp>
 #include <djinterop/impl/track_impl.hpp>
 #include <djinterop/impl/util.hpp>
+#include <djinterop/track.hpp>
 
 using std::chrono::duration_cast;
 using std::chrono::milliseconds;