DetachedSong, db/LightSong, SongFilter: move to src/song/

8 files changed, 11 insertions, 11 deletions

diff --git a/src/queue/Playlist.cxx b/src/queue/Playlist.cxx
index cb1de5171..f2d6c9672 100644
--- a/src/queue/Playlist.cxx
+++ b/src/queue/Playlist.cxx
@@ -22,7 +22,7 @@
 #include "Listener.hxx"
 #include "PlaylistError.hxx"
 #include "player/Control.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "SingleMode.hxx"
 #include "Log.hxx"
 
diff --git a/src/queue/PlaylistControl.cxx b/src/queue/PlaylistControl.cxx
index 79bb87e41..fb869c864 100644
--- a/src/queue/PlaylistControl.cxx
+++ b/src/queue/PlaylistControl.cxx
@@ -26,7 +26,7 @@
 #include "Playlist.hxx"
 #include "PlaylistError.hxx"
 #include "player/Control.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "Log.hxx"
 
 void
diff --git a/src/queue/PlaylistEdit.cxx b/src/queue/PlaylistEdit.cxx
index 24ee1faab..810ced0dc 100644
--- a/src/queue/PlaylistEdit.cxx
+++ b/src/queue/PlaylistEdit.cxx
@@ -28,7 +28,7 @@
 #include "Listener.hxx"
 #include "PlaylistError.hxx"
 #include "player/Control.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "SongLoader.hxx"
 
 #include <memory>
diff --git a/src/queue/PlaylistTag.cxx b/src/queue/PlaylistTag.cxx
index 2bbc61a7e..f36f4a374 100644
--- a/src/queue/PlaylistTag.cxx
+++ b/src/queue/PlaylistTag.cxx
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "Playlist.hxx"
 #include "PlaylistError.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "tag/Tag.hxx"
 #include "tag/Builder.hxx"
 
diff --git a/src/queue/PlaylistUpdate.cxx b/src/queue/PlaylistUpdate.cxx
index 84e1e1b71..2461376bb 100644
--- a/src/queue/PlaylistUpdate.cxx
+++ b/src/queue/PlaylistUpdate.cxx
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "Playlist.hxx"
 #include "db/Interface.hxx"
-#include "db/LightSong.hxx"
-#include "DetachedSong.hxx"
+#include "song/LightSong.hxx"
+#include "song/DetachedSong.hxx"
 
 static bool
 UpdatePlaylistSong(const Database &db, DetachedSong &song)
diff --git a/src/queue/Queue.cxx b/src/queue/Queue.cxx
index bae64a1e6..8251646ca 100644
--- a/src/queue/Queue.cxx
+++ b/src/queue/Queue.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "Queue.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 
 Queue::Queue(unsigned _max_length) noexcept
 	:max_length(_max_length),
diff --git a/src/queue/QueuePrint.cxx b/src/queue/QueuePrint.cxx
index f5daca0c4..0b9912ecf 100644
--- a/src/queue/QueuePrint.cxx
+++ b/src/queue/QueuePrint.cxx
@@ -20,10 +20,10 @@
 #include "config.h"
 #include "QueuePrint.hxx"
 #include "Queue.hxx"
-#include "SongFilter.hxx"
+#include "song/Filter.hxx"
 #include "SongPrint.hxx"
-#include "DetachedSong.hxx"
-#include "db/LightSong.hxx"
+#include "song/DetachedSong.hxx"
+#include "song/LightSong.hxx"
 #include "client/Response.hxx"
 
 /**
diff --git a/src/queue/QueueSave.cxx b/src/queue/QueueSave.cxx
index 4bfb54072..b82f0ed6d 100644
--- a/src/queue/QueueSave.cxx
+++ b/src/queue/QueueSave.cxx
@@ -21,7 +21,7 @@
 #include "QueueSave.hxx"
 #include "Queue.hxx"
 #include "PlaylistError.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "SongSave.hxx"
 #include "playlist/PlaylistSong.hxx"
 #include "fs/io/TextFile.hxx"