diff --git a/Makefile.am b/Makefile.am
index 22486443d..405f51ef7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -189,10 +189,10 @@ src_mpd_SOURCES = \
 	src/PlaylistInfo.hxx \
 	src/PlaylistDatabase.cxx src/PlaylistDatabase.hxx \
 	src/PlaylistUpdate.cxx \
-	src/IdTable.hxx \
-	src/Queue.cxx src/Queue.hxx \
-	src/QueuePrint.cxx src/QueuePrint.hxx \
-	src/QueueSave.cxx src/QueueSave.hxx \
+	src/queue/IdTable.hxx \
+	src/queue/Queue.cxx src/queue/Queue.hxx \
+	src/queue/QueuePrint.cxx src/queue/QueuePrint.hxx \
+	src/queue/QueueSave.cxx src/queue/QueueSave.hxx \
 	src/ReplayGainConfig.cxx src/ReplayGainConfig.hxx \
 	src/ReplayGainInfo.cxx src/ReplayGainInfo.hxx \
 	src/SignalHandlers.cxx src/SignalHandlers.hxx \
@@ -1663,7 +1663,7 @@ test_test_translate_song_LDADD = \
 	$(CPPUNIT_LIBS)
 
 test_test_queue_priority_SOURCES = \
-	src/Queue.cxx \
+	src/queue/Queue.cxx \
 	src/DetachedSong.cxx \
 	test/test_queue_priority.cxx
 test_test_queue_priority_CPPFLAGS = $(AM_CPPFLAGS) $(CPPUNIT_CFLAGS) -DCPPUNIT_HAVE_RTTI=0
diff --git a/src/Playlist.hxx b/src/Playlist.hxx
index f2b7ebd67..db7889227 100644
--- a/src/Playlist.hxx
+++ b/src/Playlist.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_PLAYLIST_HXX
 #define MPD_PLAYLIST_HXX
 
-#include "Queue.hxx"
+#include "queue/Queue.hxx"
 #include "PlaylistError.hxx"
 
 enum TagType : uint8_t;
diff --git a/src/PlaylistPrint.cxx b/src/PlaylistPrint.cxx
index 63972f712..56fbddfaf 100644
--- a/src/PlaylistPrint.cxx
+++ b/src/PlaylistPrint.cxx
@@ -21,7 +21,7 @@
 #include "PlaylistPrint.hxx"
 #include "PlaylistFile.hxx"
 #include "Playlist.hxx"
-#include "QueuePrint.hxx"
+#include "queue/QueuePrint.hxx"
 #include "SongPrint.hxx"
 #include "DatabaseGlue.hxx"
 #include "DatabasePlugin.hxx"
diff --git a/src/PlaylistState.cxx b/src/PlaylistState.cxx
index bcac3e324..e727ecd1f 100644
--- a/src/PlaylistState.cxx
+++ b/src/PlaylistState.cxx
@@ -26,7 +26,7 @@
 #include "PlaylistState.hxx"
 #include "PlaylistError.hxx"
 #include "Playlist.hxx"
-#include "QueueSave.hxx"
+#include "queue/QueueSave.hxx"
 #include "fs/TextFile.hxx"
 #include "PlayerControl.hxx"
 #include "ConfigGlobal.hxx"
diff --git a/src/IdTable.hxx b/src/queue/IdTable.hxx
similarity index 100%
rename from src/IdTable.hxx
rename to src/queue/IdTable.hxx
diff --git a/src/Queue.cxx b/src/queue/Queue.cxx
similarity index 100%
rename from src/Queue.cxx
rename to src/queue/Queue.cxx
diff --git a/src/Queue.hxx b/src/queue/Queue.hxx
similarity index 100%
rename from src/Queue.hxx
rename to src/queue/Queue.hxx
diff --git a/src/QueuePrint.cxx b/src/queue/QueuePrint.cxx
similarity index 100%
rename from src/QueuePrint.cxx
rename to src/queue/QueuePrint.cxx
diff --git a/src/QueuePrint.hxx b/src/queue/QueuePrint.hxx
similarity index 100%
rename from src/QueuePrint.hxx
rename to src/queue/QueuePrint.hxx
diff --git a/src/QueueSave.cxx b/src/queue/QueueSave.cxx
similarity index 100%
rename from src/QueueSave.cxx
rename to src/queue/QueueSave.cxx
diff --git a/src/QueueSave.hxx b/src/queue/QueueSave.hxx
similarity index 100%
rename from src/QueueSave.hxx
rename to src/queue/QueueSave.hxx
diff --git a/test/test_queue_priority.cxx b/test/test_queue_priority.cxx
index 108a608c4..517cb028c 100644
--- a/test/test_queue_priority.cxx
+++ b/test/test_queue_priority.cxx
@@ -1,5 +1,5 @@
 #include "config.h"
-#include "Queue.hxx"
+#include "queue/Queue.hxx"
 #include "DetachedSong.hxx"
 #include "util/Macros.hxx"