diff --git a/Makefile.am b/Makefile.am
index 6bc229449..02ea9a3b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -235,7 +235,7 @@ src_mpd_SOURCES = \
 	src/protocol/argparser.c src/protocol/argparser.h \
 	src/protocol/result.c src/protocol/result.h \
 	src/CommandError.cxx src/CommandError.h \
-	src/command.c \
+	src/AllCommands.cxx \
 	src/QueueCommands.cxx src/QueueCommands.hxx \
 	src/PlayerCommands.cxx src/PlayerCommands.hxx \
 	src/PlaylistCommands.cxx src/PlaylistCommands.hxx \
diff --git a/src/command.c b/src/AllCommands.cxx
similarity index 99%
rename from src/command.c
rename to src/AllCommands.cxx
index 26a918141..762ae73d7 100644
--- a/src/command.c
+++ b/src/AllCommands.cxx
@@ -28,16 +28,18 @@
 #include "MessageCommands.hxx"
 #include "OtherCommands.hxx"
 #include "CommandError.h"
-#include "protocol/argparser.h"
-#include "protocol/result.h"
 #include "permission.h"
-#include "tokenizer.h"
 #include "tag.h"
+
+extern "C" {
+#include "protocol/result.h"
+#include "tokenizer.h"
 #include "client.h"
 
 #ifdef ENABLE_SQLITE
 #include "sticker.h"
 #endif
+}
 
 #include <assert.h>
 #include <string.h>