3 files changed, 13 insertions, 7 deletions
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/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