diff --git a/Makefile.am b/Makefile.am
index e0ef76586..387100dfc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -114,7 +114,6 @@ mpd_headers = \
 	src/output/httpd_client.h \
 	src/output/httpd_internal.h \
 	src/page.h \
-	src/player_control.h \
 	src/Playlist.hxx \
 	src/playlist_error.h \
 	src/PlaylistInternal.hxx \
@@ -265,7 +264,7 @@ src_mpd_SOURCES = \
 	src/page.c \
 	src/Permission.cxx src/Permission.hxx \
 	src/PlayerThread.cxx src/PlayerThread.hxx \
-	src/PlayerControl.cxx \
+	src/PlayerControl.cxx src/PlayerControl.hxx \
 	src/Playlist.cxx \
 	src/PlaylistGlobal.cxx \
 	src/PlaylistControl.cxx \
diff --git a/src/Main.cxx b/src/Main.cxx
index 3340bf3de..b10e0f328 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -22,6 +22,7 @@
 #include "CommandLine.hxx"
 #include "Playlist.hxx"
 #include "PlaylistFile.hxx"
+#include "PlayerControl.hxx"
 #include "UpdateGlue.hxx"
 #include "MusicChunk.hxx"
 #include "StateFile.hxx"
@@ -41,7 +42,6 @@ extern "C" {
 #include "idle.h"
 #include "conf.h"
 #include "path.h"
-#include "player_control.h"
 #include "stats.h"
 #include "sig_handlers.h"
 #include "audio_config.h"
diff --git a/src/OutputAll.cxx b/src/OutputAll.cxx
index 113eca43c..d211cdce4 100644
--- a/src/OutputAll.cxx
+++ b/src/OutputAll.cxx
@@ -24,6 +24,7 @@ extern "C" {
 #include "output_internal.h"
 }
 
+#include "PlayerControl.hxx"
 #include "OutputControl.hxx"
 #include "OutputError.hxx"
 #include "MusicBuffer.hxx"
@@ -32,7 +33,6 @@ extern "C" {
 #include "mpd_error.h"
 
 extern "C" {
-#include "player_control.h"
 #include "conf.h"
 #include "notify.h"
 }
diff --git a/src/OutputCommand.cxx b/src/OutputCommand.cxx
index ed4cd8e88..cce1a5b04 100644
--- a/src/OutputCommand.cxx
+++ b/src/OutputCommand.cxx
@@ -26,13 +26,13 @@
 
 #include "config.h"
 #include "OutputCommand.hxx"
+#include "PlayerControl.hxx"
 
 extern "C" {
 #include "output_all.h"
 #include "output_internal.h"
 #include "output_plugin.h"
 #include "mixer_control.h"
-#include "player_control.h"
 #include "idle.h"
 }
 
diff --git a/src/OutputThread.cxx b/src/OutputThread.cxx
index 6fddf15de..3d0d96f7a 100644
--- a/src/OutputThread.cxx
+++ b/src/OutputThread.cxx
@@ -23,7 +23,6 @@
 extern "C" {
 #include "output_api.h"
 #include "output_internal.h"
-#include "player_control.h"
 #include "pcm_mix.h"
 #include "filter_plugin.h"
 #include "filter/convert_filter_plugin.h"
@@ -31,6 +30,7 @@ extern "C" {
 #include "notify.h"
 }
 
+#include "PlayerControl.hxx"
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"
 
diff --git a/src/PlayerCommands.cxx b/src/PlayerCommands.cxx
index 55bd83a13..25b82f37d 100644
--- a/src/PlayerCommands.cxx
+++ b/src/PlayerCommands.cxx
@@ -28,11 +28,13 @@
 #include "protocol/ArgParser.hxx"
 
 extern "C" {
-#include "player_control.h"
+#include "audio_format.h"
 #include "volume.h"
 #include "replay_gain_config.h"
 }
 
+#include "PlayerControl.hxx"
+
 #include <errno.h>
 
 #define COMMAND_STATUS_STATE            "state"
diff --git a/src/PlayerControl.cxx b/src/PlayerControl.cxx
index 07749b7f0..7d729bfdc 100644
--- a/src/PlayerControl.cxx
+++ b/src/PlayerControl.cxx
@@ -18,9 +18,9 @@
  */
 
 #include "config.h"
+#include "PlayerControl.hxx"
 
 extern "C" {
-#include "player_control.h"
 #include "idle.h"
 }
 
diff --git a/src/player_control.h b/src/PlayerControl.hxx
similarity index 100%
rename from src/player_control.h
rename to src/PlayerControl.hxx
diff --git a/src/PlayerThread.cxx b/src/PlayerThread.cxx
index 624698f5c..0343b9fcd 100644
--- a/src/PlayerThread.cxx
+++ b/src/PlayerThread.cxx
@@ -28,9 +28,9 @@
 #include "Main.hxx"
 #include "mpd_error.h"
 #include "CrossFade.hxx"
+#include "PlayerControl.hxx"
 
 extern "C" {
-#include "player_control.h"
 #include "output_all.h"
 #include "event_pipe.h"
 #include "tag.h"
diff --git a/src/Playlist.cxx b/src/Playlist.cxx
index de2daf144..9f08439a0 100644
--- a/src/Playlist.cxx
+++ b/src/Playlist.cxx
@@ -19,10 +19,10 @@
 
 #include "config.h"
 #include "PlaylistInternal.hxx"
+#include "PlayerControl.hxx"
 #include "song.h"
 
 extern "C" {
-#include "player_control.h"
 #include "conf.h"
 #include "idle.h"
 }
diff --git a/src/PlaylistControl.cxx b/src/PlaylistControl.cxx
index 464b25cfc..89c680523 100644
--- a/src/PlaylistControl.cxx
+++ b/src/PlaylistControl.cxx
@@ -24,12 +24,9 @@
 
 #include "config.h"
 #include "PlaylistInternal.hxx"
+#include "PlayerControl.hxx"
 #include "song.h"
 
-extern "C" {
-#include "player_control.h"
-}
-
 #include <glib.h>
 
 #undef G_LOG_DOMAIN
diff --git a/src/PlaylistEdit.cxx b/src/PlaylistEdit.cxx
index baf483427..90a65fd29 100644
--- a/src/PlaylistEdit.cxx
+++ b/src/PlaylistEdit.cxx
@@ -25,9 +25,9 @@
 
 #include "config.h"
 #include "PlaylistInternal.hxx"
+#include "PlayerControl.hxx"
 
 extern "C" {
-#include "player_control.h"
 #include "uri.h"
 #include "song.h"
 #include "idle.h"
diff --git a/src/PlaylistState.cxx b/src/PlaylistState.cxx
index 92aa62947..32929d077 100644
--- a/src/PlaylistState.cxx
+++ b/src/PlaylistState.cxx
@@ -27,9 +27,9 @@
 #include "Playlist.hxx"
 #include "QueueSave.hxx"
 #include "TextFile.hxx"
+#include "PlayerControl.hxx"
 
 extern "C" {
-#include "player_control.h"
 #include "conf.h"
 }
 
diff --git a/src/Stats.cxx b/src/Stats.cxx
index f96bcf177..f848a9b03 100644
--- a/src/Stats.cxx
+++ b/src/Stats.cxx
@@ -21,9 +21,9 @@
 
 extern "C" {
 #include "stats.h"
-#include "player_control.h"
 }
 
+#include "PlayerControl.hxx"
 #include "ClientInternal.hxx"
 #include "DatabaseSelection.hxx"
 #include "DatabaseGlue.hxx"
diff --git a/test/run_output.cxx b/test/run_output.cxx
index 9307256ab..18967ead2 100644
--- a/test/run_output.cxx
+++ b/test/run_output.cxx
@@ -33,7 +33,7 @@ extern "C" {
 }
 
 #include "Playlist.hxx"
-#include "player_control.h"
+#include "PlayerControl.hxx"
 #include "stdbin.h"
 
 #include <glib.h>