17 files changed, 16 insertions, 16 deletions
diff --git a/src/Main.cxx b/src/Main.cxx
index ba47856a0..6e646da39 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -25,7 +25,7 @@
 #include "PlaylistGlobal.hxx"
 #include "MusicChunk.hxx"
 #include "StateFile.hxx"
-#include "PlayerThread.hxx"
+#include "player/Thread.hxx"
 #include "Mapper.hxx"
 #include "Permission.hxx"
 #include "Listen.hxx"
diff --git a/src/Partition.hxx b/src/Partition.hxx
index dfc4ac19a..cd7b3c66e 100644
--- a/src/Partition.hxx
+++ b/src/Partition.hxx
@@ -23,8 +23,8 @@
 #include "queue/Playlist.hxx"
 #include "output/MultipleOutputs.hxx"
 #include "mixer/Listener.hxx"
-#include "PlayerControl.hxx"
-#include "PlayerListener.hxx"
+#include "player/Control.hxx"
+#include "player/Listener.hxx"
 #include "Chrono.hxx"
 #include "Compiler.h"
 
diff --git a/src/Stats.cxx b/src/Stats.cxx
index 9ed3a25dd..0f92b4f47 100644
--- a/src/Stats.cxx
+++ b/src/Stats.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "Stats.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "client/Response.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"
diff --git a/src/output/MultipleOutputs.cxx b/src/output/MultipleOutputs.cxx
index a2260f19c..fc8b3888b 100644
--- a/src/output/MultipleOutputs.cxx
+++ b/src/output/MultipleOutputs.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "MultipleOutputs.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "Internal.hxx"
 #include "Domain.hxx"
 #include "MusicBuffer.hxx"
diff --git a/src/output/OutputCommand.cxx b/src/output/OutputCommand.cxx
index 0297ebbcd..83abcf2ca 100644
--- a/src/output/OutputCommand.cxx
+++ b/src/output/OutputCommand.cxx
@@ -28,7 +28,7 @@
 #include "OutputCommand.hxx"
 #include "MultipleOutputs.hxx"
 #include "Internal.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "mixer/MixerControl.hxx"
 #include "Idle.hxx"
 
diff --git a/src/output/OutputThread.cxx b/src/output/OutputThread.cxx
index badf8f6c9..67205aa4c 100644
--- a/src/output/OutputThread.cxx
+++ b/src/output/OutputThread.cxx
@@ -27,7 +27,7 @@
 #include "filter/FilterInternal.hxx"
 #include "filter/plugins/ConvertFilterPlugin.hxx"
 #include "filter/plugins/ReplayGainFilterPlugin.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"
 #include "thread/Util.hxx"
diff --git a/src/PlayerControl.cxx b/src/player/Control.cxx
index 972b33361..d7352ad57 100644
--- a/src/PlayerControl.cxx
+++ b/src/player/Control.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "PlayerControl.hxx"
+#include "Control.hxx"
 #include "Idle.hxx"
 #include "DetachedSong.hxx"
 
diff --git a/src/PlayerControl.hxx b/src/player/Control.hxx
index a2807a9a1..a2807a9a1 100644
--- a/src/PlayerControl.hxx
+++ b/src/player/Control.hxx
diff --git a/src/CrossFade.cxx b/src/player/CrossFade.cxx
index 6d7b41440..6d7b41440 100644
--- a/src/CrossFade.cxx
+++ b/src/player/CrossFade.cxx
diff --git a/src/CrossFade.hxx b/src/player/CrossFade.hxx
index 672abb718..672abb718 100644
--- a/src/CrossFade.hxx
+++ b/src/player/CrossFade.hxx
diff --git a/src/PlayerListener.hxx b/src/player/Listener.hxx
index e10f2547b..e10f2547b 100644
--- a/src/PlayerListener.hxx
+++ b/src/player/Listener.hxx
diff --git a/src/PlayerThread.cxx b/src/player/Thread.cxx
index a1fd24bbe..60e253f4c 100644
--- a/src/PlayerThread.cxx
+++ b/src/player/Thread.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "config.h"
-#include "PlayerThread.hxx"
-#include "PlayerListener.hxx"
+#include "Thread.hxx"
+#include "Listener.hxx"
 #include "decoder/DecoderThread.hxx"
 #include "decoder/DecoderControl.hxx"
 #include "MusicPipe.hxx"
@@ -28,7 +28,7 @@
 #include "DetachedSong.hxx"
 #include "system/FatalError.hxx"
 #include "CrossFade.hxx"
-#include "PlayerControl.hxx"
+#include "Control.hxx"
 #include "output/MultipleOutputs.hxx"
 #include "tag/Tag.hxx"
 #include "Idle.hxx"
diff --git a/src/PlayerThread.hxx b/src/player/Thread.hxx
index 128273aa7..fc6ea4364 100644
--- a/src/PlayerThread.hxx
+++ b/src/player/Thread.hxx
@@ -26,7 +26,7 @@
  * audio outputs via audio_output_all_play().
  *
  * It is controlled by the main thread (the playlist code), see
- * PlayerControl.hxx.  The playlist enqueues new songs into the player
+ * Control.hxx.  The playlist enqueues new songs into the player
  * thread and sends it commands.
  *
  * The player thread itself does not do any I/O.  It synchronizes with
diff --git a/src/queue/Playlist.cxx b/src/queue/Playlist.cxx
index 1da89469c..841684272 100644
--- a/src/queue/Playlist.cxx
+++ b/src/queue/Playlist.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "Playlist.hxx"
 #include "PlaylistError.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "DetachedSong.hxx"
 #include "Idle.hxx"
 #include "Log.hxx"
diff --git a/src/queue/PlaylistControl.cxx b/src/queue/PlaylistControl.cxx
index ed4a77e36..f7f0a4225 100644
--- a/src/queue/PlaylistControl.cxx
+++ b/src/queue/PlaylistControl.cxx
@@ -25,7 +25,7 @@
 #include "config.h"
 #include "Playlist.hxx"
 #include "PlaylistError.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "DetachedSong.hxx"
 #include "Log.hxx"
 
diff --git a/src/queue/PlaylistEdit.cxx b/src/queue/PlaylistEdit.cxx
index c5aad092f..0d15f6a04 100644
--- a/src/queue/PlaylistEdit.cxx
+++ b/src/queue/PlaylistEdit.cxx
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "Playlist.hxx"
 #include "PlaylistError.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "util/UriUtil.hxx"
 #include "util/Error.hxx"
 #include "DetachedSong.hxx"
diff --git a/src/queue/PlaylistState.cxx b/src/queue/PlaylistState.cxx
index 56687b6d6..fa51b1519 100644
--- a/src/queue/PlaylistState.cxx
+++ b/src/queue/PlaylistState.cxx
@@ -29,7 +29,7 @@
 #include "queue/QueueSave.hxx"
 #include "fs/io/TextFile.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
-#include "PlayerControl.hxx"
+#include "player/Control.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/ConfigOption.hxx"
 #include "util/CharUtil.hxx"