27 files changed, 4 insertions, 4 deletions
diff --git a/src/Client.hxx b/src/Client.hxx
index cbb0cbafc..586c1f264 100644
--- a/src/Client.hxx
+++ b/src/Client.hxx
@@ -22,7 +22,7 @@
 
 #include "check.h"
 #include "ClientMessage.hxx"
-#include "CommandListBuilder.hxx"
+#include "command/CommandListBuilder.hxx"
 #include "event/FullyBufferedSocket.hxx"
 #include "event/TimeoutMonitor.hxx"
 #include "Compiler.h"
diff --git a/src/ClientInternal.hxx b/src/ClientInternal.hxx
index e0affb045..9c70ec2e2 100644
--- a/src/ClientInternal.hxx
+++ b/src/ClientInternal.hxx
@@ -22,7 +22,7 @@
 
 #include "check.h"
 #include "Client.hxx"
-#include "CommandResult.hxx"
+#include "command/CommandResult.hxx"
 
 enum {
 	CLIENT_MAX_SUBSCRIPTIONS = 16,
diff --git a/src/ClientProcess.cxx b/src/ClientProcess.cxx
index 39040f319..485e687c9 100644
--- a/src/ClientProcess.cxx
+++ b/src/ClientProcess.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "ClientInternal.hxx"
 #include "protocol/Result.hxx"
-#include "AllCommands.hxx"
+#include "command/AllCommands.hxx"
 #include "Log.hxx"
 
 #include <string.h>
diff --git a/src/Main.cxx b/src/Main.cxx
index 05f7eeac0..2280abfa9 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -34,7 +34,7 @@
 #include "Listen.hxx"
 #include "Client.hxx"
 #include "ClientList.hxx"
-#include "AllCommands.hxx"
+#include "command/AllCommands.hxx"
 #include "Partition.hxx"
 #include "Volume.hxx"
 #include "OutputAll.hxx"
diff --git a/src/AllCommands.cxx b/src/command/AllCommands.cxx
index 2271aeff2..2271aeff2 100644
--- a/src/AllCommands.cxx
+++ b/src/command/AllCommands.cxx
diff --git a/src/AllCommands.hxx b/src/command/AllCommands.hxx
index 2be94c136..2be94c136 100644
--- a/src/AllCommands.hxx
+++ b/src/command/AllCommands.hxx
diff --git a/src/CommandError.cxx b/src/command/CommandError.cxx
index fe9d9481a..fe9d9481a 100644
--- a/src/CommandError.cxx
+++ b/src/command/CommandError.cxx
diff --git a/src/CommandError.hxx b/src/command/CommandError.hxx
index 183797213..183797213 100644
--- a/src/CommandError.hxx
+++ b/src/command/CommandError.hxx
diff --git a/src/CommandListBuilder.cxx b/src/command/CommandListBuilder.cxx
index cc10f7205..cc10f7205 100644
--- a/src/CommandListBuilder.cxx
+++ b/src/command/CommandListBuilder.cxx
diff --git a/src/CommandListBuilder.hxx b/src/command/CommandListBuilder.hxx
index a112ac33b..a112ac33b 100644
--- a/src/CommandListBuilder.hxx
+++ b/src/command/CommandListBuilder.hxx
diff --git a/src/CommandResult.hxx b/src/command/CommandResult.hxx
index 4132dacb7..4132dacb7 100644
--- a/src/CommandResult.hxx
+++ b/src/command/CommandResult.hxx
diff --git a/src/DatabaseCommands.cxx b/src/command/DatabaseCommands.cxx
index b86cbdae7..b86cbdae7 100644
--- a/src/DatabaseCommands.cxx
+++ b/src/command/DatabaseCommands.cxx
diff --git a/src/DatabaseCommands.hxx b/src/command/DatabaseCommands.hxx
index c60caf246..c60caf246 100644
--- a/src/DatabaseCommands.hxx
+++ b/src/command/DatabaseCommands.hxx
diff --git a/src/MessageCommands.cxx b/src/command/MessageCommands.cxx
index 7d9893e70..7d9893e70 100644
--- a/src/MessageCommands.cxx
+++ b/src/command/MessageCommands.cxx
diff --git a/src/MessageCommands.hxx b/src/command/MessageCommands.hxx
index 921b20c94..921b20c94 100644
--- a/src/MessageCommands.hxx
+++ b/src/command/MessageCommands.hxx
diff --git a/src/OtherCommands.cxx b/src/command/OtherCommands.cxx
index 1291caf4e..1291caf4e 100644
--- a/src/OtherCommands.cxx
+++ b/src/command/OtherCommands.cxx
diff --git a/src/OtherCommands.hxx b/src/command/OtherCommands.hxx
index fe3e145c4..fe3e145c4 100644
--- a/src/OtherCommands.hxx
+++ b/src/command/OtherCommands.hxx
diff --git a/src/OutputCommands.cxx b/src/command/OutputCommands.cxx
index 8d6ea8ed7..8d6ea8ed7 100644
--- a/src/OutputCommands.cxx
+++ b/src/command/OutputCommands.cxx
diff --git a/src/OutputCommands.hxx b/src/command/OutputCommands.hxx
index ac3c0211a..ac3c0211a 100644
--- a/src/OutputCommands.hxx
+++ b/src/command/OutputCommands.hxx
diff --git a/src/PlayerCommands.cxx b/src/command/PlayerCommands.cxx
index d30bde273..d30bde273 100644
--- a/src/PlayerCommands.cxx
+++ b/src/command/PlayerCommands.cxx
diff --git a/src/PlayerCommands.hxx b/src/command/PlayerCommands.hxx
index c201c7a57..c201c7a57 100644
--- a/src/PlayerCommands.hxx
+++ b/src/command/PlayerCommands.hxx
diff --git a/src/PlaylistCommands.cxx b/src/command/PlaylistCommands.cxx
index d178fa097..d178fa097 100644
--- a/src/PlaylistCommands.cxx
+++ b/src/command/PlaylistCommands.cxx
diff --git a/src/PlaylistCommands.hxx b/src/command/PlaylistCommands.hxx
index 786f8b89f..786f8b89f 100644
--- a/src/PlaylistCommands.hxx
+++ b/src/command/PlaylistCommands.hxx
diff --git a/src/QueueCommands.cxx b/src/command/QueueCommands.cxx
index a21eb75f0..a21eb75f0 100644
--- a/src/QueueCommands.cxx
+++ b/src/command/QueueCommands.cxx
diff --git a/src/QueueCommands.hxx b/src/command/QueueCommands.hxx
index 3beb28e52..3beb28e52 100644
--- a/src/QueueCommands.hxx
+++ b/src/command/QueueCommands.hxx
diff --git a/src/StickerCommands.cxx b/src/command/StickerCommands.cxx
index cbd371c8f..cbd371c8f 100644
--- a/src/StickerCommands.cxx
+++ b/src/command/StickerCommands.cxx
diff --git a/src/StickerCommands.hxx b/src/command/StickerCommands.hxx
index fb91a8ad3..fb91a8ad3 100644
--- a/src/StickerCommands.hxx
+++ b/src/command/StickerCommands.hxx