10 files changed, 14 insertions, 14 deletions
diff --git a/src/command/AllCommands.cxx b/src/command/AllCommands.cxx
index 47dd70aa0..ed1858ea8 100644
--- a/src/command/AllCommands.cxx
+++ b/src/command/AllCommands.cxx
@@ -31,7 +31,7 @@
 #include "Permission.hxx"
 #include "tag/TagType.h"
 #include "protocol/Result.hxx"
-#include "Client.hxx"
+#include "client/Client.hxx"
 #include "util/Tokenizer.hxx"
 #include "util/Error.hxx"
 
diff --git a/src/command/CommandListBuilder.cxx b/src/command/CommandListBuilder.cxx
index d6b6318bc..1dcbf2946 100644
--- a/src/command/CommandListBuilder.cxx
+++ b/src/command/CommandListBuilder.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "CommandListBuilder.hxx"
-#include "ClientInternal.hxx"
+#include "client/ClientInternal.hxx"
 
 #include <string.h>
 
diff --git a/src/command/DatabaseCommands.cxx b/src/command/DatabaseCommands.cxx
index f650aca0c..eaff1e3ec 100644
--- a/src/command/DatabaseCommands.cxx
+++ b/src/command/DatabaseCommands.cxx
@@ -24,7 +24,7 @@
 #include "DatabasePrint.hxx"
 #include "DatabaseSelection.hxx"
 #include "CommandError.hxx"
-#include "Client.hxx"
+#include "client/Client.hxx"
 #include "tag/Tag.hxx"
 #include "util/Error.hxx"
 #include "SongFilter.hxx"
diff --git a/src/command/FileCommands.cxx b/src/command/FileCommands.cxx
index 9a9e3ad37..b3676fa48 100644
--- a/src/command/FileCommands.cxx
+++ b/src/command/FileCommands.cxx
@@ -22,8 +22,8 @@
 #include "CommandError.hxx"
 #include "protocol/Ack.hxx"
 #include "protocol/Result.hxx"
-#include "ClientFile.hxx"
-#include "Client.hxx"
+#include "client/ClientFile.hxx"
+#include "client/Client.hxx"
 #include "util/CharUtil.hxx"
 #include "util/UriUtil.hxx"
 #include "util/Error.hxx"
diff --git a/src/command/MessageCommands.cxx b/src/command/MessageCommands.cxx
index cb3c9d306..b04e72c07 100644
--- a/src/command/MessageCommands.cxx
+++ b/src/command/MessageCommands.cxx
@@ -19,8 +19,8 @@
 
 #include "config.h"
 #include "MessageCommands.hxx"
-#include "Client.hxx"
-#include "ClientList.hxx"
+#include "client/Client.hxx"
+#include "client/ClientList.hxx"
 #include "Instance.hxx"
 #include "Main.hxx"
 #include "protocol/Result.hxx"
diff --git a/src/command/OtherCommands.cxx b/src/command/OtherCommands.cxx
index b7b84bcde..4d61884c1 100644
--- a/src/command/OtherCommands.cxx
+++ b/src/command/OtherCommands.cxx
@@ -43,8 +43,8 @@
 #include "Permission.hxx"
 #include "PlaylistFile.hxx"
 #include "PlaylistVector.hxx"
-#include "ClientFile.hxx"
-#include "Client.hxx"
+#include "client/ClientFile.hxx"
+#include "client/Client.hxx"
 #include "Idle.hxx"
 
 #include <assert.h>
diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx
index 20de2af92..759a37030 100644
--- a/src/command/PlayerCommands.cxx
+++ b/src/command/PlayerCommands.cxx
@@ -23,7 +23,7 @@
 #include "Playlist.hxx"
 #include "PlaylistPrint.hxx"
 #include "update/UpdateGlue.hxx"
-#include "Client.hxx"
+#include "client/Client.hxx"
 #include "Volume.hxx"
 #include "output/OutputAll.hxx"
 #include "Partition.hxx"
diff --git a/src/command/PlaylistCommands.cxx b/src/command/PlaylistCommands.cxx
index 2f203678b..0441811c4 100644
--- a/src/command/PlaylistCommands.cxx
+++ b/src/command/PlaylistCommands.cxx
@@ -28,7 +28,7 @@
 #include "playlist/PlaylistQueue.hxx"
 #include "playlist/Print.hxx"
 #include "TimePrint.hxx"
-#include "Client.hxx"
+#include "client/Client.hxx"
 #include "protocol/ArgParser.hxx"
 #include "protocol/Result.hxx"
 #include "ls.hxx"
diff --git a/src/command/QueueCommands.cxx b/src/command/QueueCommands.cxx
index 7ffaa97ed..e884c71c3 100644
--- a/src/command/QueueCommands.cxx
+++ b/src/command/QueueCommands.cxx
@@ -25,8 +25,8 @@
 #include "DatabaseSelection.hxx"
 #include "Playlist.hxx"
 #include "PlaylistPrint.hxx"
-#include "ClientFile.hxx"
-#include "Client.hxx"
+#include "client/ClientFile.hxx"
+#include "client/Client.hxx"
 #include "Partition.hxx"
 #include "protocol/ArgParser.hxx"
 #include "protocol/Result.hxx"
diff --git a/src/command/TagCommands.cxx b/src/command/TagCommands.cxx
index d5544eac5..02e95af71 100644
--- a/src/command/TagCommands.cxx
+++ b/src/command/TagCommands.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "TagCommands.hxx"
 #include "CommandError.hxx"
-#include "Client.hxx"
+#include "client/Client.hxx"
 #include "protocol/ArgParser.hxx"
 #include "protocol/Result.hxx"
 #include "tag/Tag.hxx"