10 files changed, 37 insertions, 32 deletions
diff --git a/src/playlist_any.c b/src/PlaylistAny.cxx
index e4017ac0d..efa975a1f 100644
--- a/src/playlist_any.c
+++ b/src/PlaylistAny.cxx
@@ -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
@@ -18,11 +18,14 @@
  */
 
 #include "config.h"
-#include "playlist_any.h"
+#include "PlaylistAny.hxx"
+#include "PlaylistMapper.hxx"
+
+extern "C" {
 #include "playlist_list.h"
-#include "PlaylistMapper.h"
 #include "uri.h"
 #include "input_stream.h"
+}
 
 #include <assert.h>
 
diff --git a/src/playlist_any.h b/src/PlaylistAny.hxx
index 310913de9..fbc325420 100644
--- a/src/playlist_any.h
+++ b/src/PlaylistAny.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,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_PLAYLIST_ANY_H
-#define MPD_PLAYLIST_ANY_H
+#ifndef MPD_PLAYLIST_ANY_HXX
+#define MPD_PLAYLIST_ANY_HXX
 
 #include <glib.h>
 
diff --git a/src/PlaylistCommands.cxx b/src/PlaylistCommands.cxx
index 2b5f0b2cf..ed2f47519 100644
--- a/src/PlaylistCommands.cxx
+++ b/src/PlaylistCommands.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
@@ -24,12 +24,12 @@
 #include "PlaylistPrint.hxx"
 #include "PlaylistSave.hxx"
 #include "PlaylistFile.hxx"
+#include "PlaylistQueue.hxx"
 
 extern "C" {
 #include "protocol/argparser.h"
 #include "protocol/result.h"
 #include "playlist.h"
-#include "playlist_queue.h"
 #include "time_print.h"
 #include "ls.h"
 #include "uri.h"
diff --git a/src/PlaylistMapper.cxx b/src/PlaylistMapper.cxx
index 39ac043e4..f1c9471a7 100644
--- a/src/PlaylistMapper.cxx
+++ b/src/PlaylistMapper.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 "PlaylistMapper.h"
+#include "PlaylistMapper.hxx"
 #include "PlaylistFile.hxx"
 
 extern "C" {
diff --git a/src/PlaylistMapper.h b/src/PlaylistMapper.hxx
index 829aac988..dc4e5cce8 100644
--- a/src/PlaylistMapper.h
+++ b/src/PlaylistMapper.hxx
@@ -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
@@ -17,15 +17,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_PLAYLIST_MAPPER_H
-#define MPD_PLAYLIST_MAPPER_H
+#ifndef MPD_PLAYLIST_MAPPER_HXX
+#define MPD_PLAYLIST_MAPPER_HXX
 
 #include <glib.h>
 
 struct input_stream;
 
-G_BEGIN_DECLS
-
 /**
  * Opens a playlist from an URI relative to the playlist or music
  * directory.
@@ -38,6 +36,4 @@ struct playlist_provider *
 playlist_mapper_open(const char *uri, GMutex *mutex, GCond *cond,
 		     struct input_stream **is_r);
 
-G_END_DECLS
-
 #endif
diff --git a/src/PlaylistPrint.cxx b/src/PlaylistPrint.cxx
index 40b895f80..93970076f 100644
--- a/src/PlaylistPrint.cxx
+++ b/src/PlaylistPrint.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
@@ -20,13 +20,13 @@
 #include "config.h"
 #include "PlaylistPrint.hxx"
 #include "PlaylistFile.hxx"
+#include "PlaylistAny.hxx"
+#include "PlaylistSong.hxx"
 #include "QueuePrint.hxx"
 
 extern "C" {
 #include "playlist_list.h"
 #include "playlist_plugin.h"
-#include "playlist_any.h"
-#include "playlist_song.h"
 #include "playlist.h"
 #include "song_print.h"
 #include "song.h"
diff --git a/src/playlist_queue.c b/src/PlaylistQueue.cxx
index 8eb535dbd..ad9739449 100644
--- a/src/playlist_queue.c
+++ b/src/PlaylistQueue.cxx
@@ -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
@@ -18,13 +18,16 @@
  */
 
 #include "config.h"
-#include "playlist_queue.h"
+#include "PlaylistQueue.hxx"
 #include "playlist_plugin.h"
-#include "playlist_any.h"
-#include "playlist_song.h"
+#include "PlaylistAny.hxx"
+#include "PlaylistSong.hxx"
+
+extern "C" {
 #include "playlist.h"
 #include "song.h"
 #include "input_stream.h"
+}
 
 enum playlist_result
 playlist_load_into_queue(const char *uri, struct playlist_provider *source,
diff --git a/src/playlist_queue.h b/src/PlaylistQueue.hxx
index 24a851aab..e1d3bf391 100644
--- a/src/playlist_queue.h
+++ b/src/PlaylistQueue.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
@@ -21,8 +21,8 @@
  * \brief Glue between playlist plugin and the play queue
  */
 
-#ifndef MPD_PLAYLIST_QUEUE_H
-#define MPD_PLAYLIST_QUEUE_H
+#ifndef MPD_PLAYLIST_QUEUE_HXX
+#define MPD_PLAYLIST_QUEUE_HXX
 
 #include "playlist_error.h"
 
diff --git a/src/playlist_song.c b/src/PlaylistSong.cxx
index 2e2870d38..03bf5b703 100644
--- a/src/playlist_song.c
+++ b/src/PlaylistSong.cxx
@@ -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
@@ -18,7 +18,9 @@
  */
 
 #include "config.h"
-#include "playlist_song.h"
+#include "PlaylistSong.hxx"
+
+extern "C" {
 #include "database.h"
 #include "mapper.h"
 #include "song.h"
@@ -26,6 +28,7 @@
 #include "path.h"
 #include "ls.h"
 #include "tag.h"
+}
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/playlist_song.h b/src/PlaylistSong.hxx
index ea8786912..f6959715a 100644
--- a/src/playlist_song.h
+++ b/src/PlaylistSong.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,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_PLAYLIST_SONG_H
-#define MPD_PLAYLIST_SONG_H
+#ifndef MPD_PLAYLIST_SONG_HXX
+#define MPD_PLAYLIST_SONG_HXX
 
 #include <stdbool.h>