14 files changed, 25 insertions, 30 deletions
diff --git a/Makefile.am b/Makefile.am
index 4b2d8d75a..482e38921 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,7 +77,6 @@ mpd_headers = \
 	src/gerror.h \
 	src/glib_compat.h \
 	src/gcc.h \
-	src/decoder_list.h \
 	src/decoder/pcm_decoder_plugin.h \
 	src/input_stream.h \
 	src/text_input_stream.h \
@@ -465,7 +464,7 @@ libdecoder_plugins_a_SOURCES = \
 	src/decoder/dsdlib.h \
 	src/decoder_buffer.c \
 	src/decoder_plugin.c \
-	src/decoder_list.c
+	src/DecoderList.cxx src/DecoderList.hxx
 libdecoder_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(VORBIS_CFLAGS) $(TREMOR_CFLAGS) \
 	$(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index 5384fc6dd..0de211fd7 100644
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -22,7 +22,7 @@
 #include "ls.hxx"
 #include "Log.hxx"
 #include "conf.h"
-#include "decoder_list.h"
+#include "DecoderList.hxx"
 #include "decoder_plugin.h"
 #include "OutputList.hxx"
 #include "output_plugin.h"
diff --git a/src/decoder_list.c b/src/DecoderList.cxx
index 80f6db1f3..da9c3fcc6 100644
--- a/src/decoder_list.c
+++ b/src/DecoderList.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2012 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "decoder_list.h"
+#include "DecoderList.hxx"
 #include "decoder_plugin.h"
 #include "conf.h"
 #include "mpd_error.h"
diff --git a/src/decoder_list.h b/src/DecoderList.hxx
index d0a6ade7e..8dab8724e 100644
--- a/src/decoder_list.h
+++ b/src/DecoderList.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,10 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_DECODER_LIST_H
-#define MPD_DECODER_LIST_H
-
-#include <stdbool.h>
+#ifndef MPD_DECODER_LIST_HXX
+#define MPD_DECODER_LIST_HXX
 
 struct decoder_plugin;
 
diff --git a/src/DecoderPrint.cxx b/src/DecoderPrint.cxx
index 70c713e9c..719a499ec 100644
--- a/src/DecoderPrint.cxx
+++ b/src/DecoderPrint.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "DecoderPrint.hxx"
-#include "decoder_list.h"
+#include "DecoderList.hxx"
 #include "decoder_plugin.h"
 #include "Client.hxx"
 
diff --git a/src/DecoderThread.cxx b/src/DecoderThread.cxx
index ac89b54ca..b7b0bf78c 100644
--- a/src/DecoderThread.cxx
+++ b/src/DecoderThread.cxx
@@ -30,9 +30,9 @@
 #include "decoder_api.h"
 #include "tag.h"
 #include "InputStream.hxx"
+#include "DecoderList.hxx"
 
 extern "C" {
-#include "decoder_list.h"
 #include "replay_gain_ape.h"
 #include "uri.h"
 }
diff --git a/src/Main.cxx b/src/Main.cxx
index 83baf4caa..ecea59843 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -50,13 +50,13 @@
 #include "fs/Path.hxx"
 #include "PlaylistRegistry.hxx"
 #include "ZeroconfGlue.hxx"
+#include "DecoderList.hxx"
 
 extern "C" {
 #include "daemon.h"
 #include "stats.h"
 #include "audio_config.h"
 #include "pcm_resample.h"
-#include "decoder_list.h"
 }
 
 #include "mpd_error.h"
diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx
index ce678fe06..e0a8aca1f 100644
--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@@ -29,10 +29,10 @@ extern "C" {
 #include "fs/Path.hxx"
 #include "tag.h"
 #include "input_stream.h"
+#include "decoder_plugin.h"
+#include "DecoderList.hxx"
 
 extern "C" {
-#include "decoder_list.h"
-#include "decoder_plugin.h"
 #include "tag_ape.h"
 #include "tag_id3.h"
 #include "tag_handler.h"
diff --git a/src/TagFile.cxx b/src/TagFile.cxx
index f2a88abd0..046778bd2 100644
--- a/src/TagFile.cxx
+++ b/src/TagFile.cxx
@@ -22,9 +22,9 @@
 
 extern "C" {
 #include "uri.h"
-#include "decoder_list.h"
 }
 
+#include "DecoderList.hxx"
 #include "decoder_plugin.h"
 #include "input_stream.h"
 
diff --git a/src/UpdateSong.cxx b/src/UpdateSong.cxx
index 7994ea754..676ba48e2 100644
--- a/src/UpdateSong.cxx
+++ b/src/UpdateSong.cxx
@@ -27,10 +27,7 @@
 #include "Directory.hxx"
 #include "song.h"
 #include "decoder_plugin.h"
-
-extern "C" {
-#include "decoder_list.h"
-}
+#include "DecoderList.hxx"
 
 #include <glib.h>
 
diff --git a/src/decoder_plugin.h b/src/decoder_plugin.h
index 933ba6751..b7ab738b5 100644
--- a/src/decoder_plugin.h
+++ b/src/decoder_plugin.h
@@ -190,6 +190,10 @@ decoder_plugin_container_scan(	const struct decoder_plugin *plugin,
 	return plugin->container_scan(pathname, tnum);
 }
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Does the plugin announce the specified file name suffix?
  */
@@ -204,4 +208,8 @@ bool
 decoder_plugin_supports_mime_type(const struct decoder_plugin *plugin,
 				  const char *mime_type);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx
index ec09bcb29..6e1f4858e 100644
--- a/test/dump_playlist.cxx
+++ b/test/dump_playlist.cxx
@@ -24,16 +24,13 @@
 #include "input_stream.h"
 #include "conf.h"
 #include "decoder_api.h"
+#include "DecoderList.hxx"
 #include "InputInit.hxx"
 #include "IOThread.hxx"
 #include "PlaylistRegistry.hxx"
 #include "PlaylistPlugin.hxx"
 #include "fs/Path.hxx"
 
-extern "C" {
-#include "decoder_list.h"
-}
-
 #include <glib.h>
 
 #include <unistd.h>
diff --git a/test/read_tags.cxx b/test/read_tags.cxx
index ddd278ffd..1ceddf1d5 100644
--- a/test/read_tags.cxx
+++ b/test/read_tags.cxx
@@ -19,9 +19,7 @@
 
 #include "config.h"
 #include "IOThread.hxx"
-extern "C" {
-#include "decoder_list.h"
-}
+#include "DecoderList.hxx"
 #include "decoder_api.h"
 #include "InputInit.hxx"
 #include "InputStream.hxx"
diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx
index 288b83f95..d5c7c3139 100644
--- a/test/run_decoder.cxx
+++ b/test/run_decoder.cxx
@@ -19,9 +19,7 @@
 
 #include "config.h"
 #include "IOThread.hxx"
-extern "C" {
-#include "decoder_list.h"
-}
+#include "DecoderList.hxx"
 #include "decoder_api.h"
 #include "InputInit.hxx"
 #include "input_stream.h"