17 files changed, 23 insertions, 43 deletions
diff --git a/src/ClientIdle.cxx b/src/ClientIdle.cxx
index c125a8dfa..c68bee839 100644
--- a/src/ClientIdle.cxx
+++ b/src/ClientIdle.cxx
@@ -21,10 +21,7 @@
 #include "ClientIdle.hxx"
 #include "ClientInternal.hxx"
 #include "ClientList.hxx"
-
-extern "C" {
-#include "idle.h"
-}
+#include "Idle.hxx"
 
 #include <assert.h>
 
diff --git a/src/ClientSubscribe.cxx b/src/ClientSubscribe.cxx
index a1ad6e68e..fd7a93c84 100644
--- a/src/ClientSubscribe.cxx
+++ b/src/ClientSubscribe.cxx
@@ -20,10 +20,7 @@
 #include "ClientSubscribe.hxx"
 #include "ClientIdle.hxx"
 #include "ClientInternal.hxx"
-
-extern "C" {
-#include "idle.h"
-}
+#include "Idle.hxx"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/idle.c b/src/Idle.cxx
index 2d174d78a..4027461c2 100644
--- a/src/idle.c
+++ b/src/Idle.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
@@ -23,8 +23,11 @@
  */
 
 #include "config.h"
-#include "idle.h"
+#include "Idle.hxx"
+
+extern "C" {
 #include "event_pipe.h"
+}
 
 #include <assert.h>
 #include <glib.h>
diff --git a/src/idle.h b/src/Idle.hxx
index 0156933c0..e77061300 100644
--- a/src/idle.h
+++ b/src/Idle.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
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MPD_IDLE_H
-#define MPD_IDLE_H
+#ifndef MPD_IDLE_HXX
+#define MPD_IDLE_HXX
 
 enum {
 	/** song database has been updated*/
diff --git a/src/Main.cxx b/src/Main.cxx
index 7ff19538d..cd6392d58 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -39,11 +39,11 @@
 #include "tag.h"
 #include "conf.h"
 #include "replay_gain_config.h"
+#include "Idle.hxx"
 
 extern "C" {
 #include "daemon.h"
 #include "io_thread.h"
-#include "idle.h"
 #include "path.h"
 #include "stats.h"
 #include "sig_handlers.h"
diff --git a/src/OtherCommands.cxx b/src/OtherCommands.cxx
index d467c30ef..b8cc36cc5 100644
--- a/src/OtherCommands.cxx
+++ b/src/OtherCommands.cxx
@@ -44,10 +44,7 @@ extern "C" {
 #include "ClientIdle.hxx"
 #include "ClientFile.hxx"
 #include "Client.hxx"
-
-extern "C" {
-#include "idle.h"
-}
+#include "Idle.hxx"
 
 #ifdef ENABLE_SQLITE
 #include "StickerDatabase.hxx"
diff --git a/src/OutputCommand.cxx b/src/OutputCommand.cxx
index 3c9ff56fe..f4edaa4a1 100644
--- a/src/OutputCommand.cxx
+++ b/src/OutputCommand.cxx
@@ -28,12 +28,12 @@
 #include "OutputCommand.hxx"
 #include "OutputAll.hxx"
 #include "PlayerControl.hxx"
+#include "Idle.hxx"
 
 extern "C" {
 #include "output_internal.h"
 #include "output_plugin.h"
 #include "mixer_control.h"
-#include "idle.h"
 }
 
 extern unsigned audio_output_state_version;
diff --git a/src/PlayerControl.cxx b/src/PlayerControl.cxx
index 4fa9f75b2..1b5ca597e 100644
--- a/src/PlayerControl.cxx
+++ b/src/PlayerControl.cxx
@@ -19,11 +19,7 @@
 
 #include "config.h"
 #include "PlayerControl.hxx"
-
-extern "C" {
-#include "idle.h"
-}
-
+#include "Idle.hxx"
 #include "song.h"
 #include "DecoderControl.hxx"
 #include "Main.hxx"
diff --git a/src/PlayerThread.cxx b/src/PlayerThread.cxx
index 44534a7d8..bb6f52e02 100644
--- a/src/PlayerThread.cxx
+++ b/src/PlayerThread.cxx
@@ -31,10 +31,10 @@
 #include "PlayerControl.hxx"
 #include "OutputAll.hxx"
 #include "tag.h"
+#include "Idle.hxx"
 
 extern "C" {
 #include "event_pipe.h"
-#include "idle.h"
 }
 
 #include <cmath>
diff --git a/src/Playlist.cxx b/src/Playlist.cxx
index 4d1d4897e..a402471da 100644
--- a/src/Playlist.cxx
+++ b/src/Playlist.cxx
@@ -21,10 +21,7 @@
 #include "Playlist.hxx"
 #include "PlayerControl.hxx"
 #include "song.h"
-
-extern "C" {
-#include "idle.h"
-}
+#include "Idle.hxx"
 
 #include <glib.h>
 
diff --git a/src/PlaylistEdit.cxx b/src/PlaylistEdit.cxx
index 22b7242c1..cdfb77150 100644
--- a/src/PlaylistEdit.cxx
+++ b/src/PlaylistEdit.cxx
@@ -30,9 +30,9 @@
 extern "C" {
 #include "uri.h"
 #include "song.h"
-#include "idle.h"
 }
 
+#include "Idle.hxx"
 #include "DatabaseGlue.hxx"
 #include "DatabasePlugin.hxx"
 
diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx
index a048c02ce..d79bea9c5 100644
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -29,11 +29,11 @@
 #include "Mapper.hxx"
 #include "TextFile.hxx"
 #include "conf.h"
+#include "Idle.hxx"
 
 extern "C" {
 #include "path.h"
 #include "uri.h"
-#include "idle.h"
 }
 
 #include "glib_compat.h"
diff --git a/src/PlaylistSave.cxx b/src/PlaylistSave.cxx
index e3b952280..745744490 100644
--- a/src/PlaylistSave.cxx
+++ b/src/PlaylistSave.cxx
@@ -23,11 +23,11 @@
 #include "Playlist.hxx"
 #include "song.h"
 #include "Mapper.hxx"
+#include "Idle.hxx"
 
 extern "C" {
 #include "path.h"
 #include "uri.h"
-#include "idle.h"
 }
 
 #include "glib_compat.h"
diff --git a/src/ReplayGainConfig.cxx b/src/ReplayGainConfig.cxx
index 14bb41755..d86c70053 100644
--- a/src/ReplayGainConfig.cxx
+++ b/src/ReplayGainConfig.cxx
@@ -19,11 +19,7 @@
 
 #include "config.h"
 #include "replay_gain_config.h"
-
-extern "C" {
-#include "idle.h"
-}
-
+#include "Idle.hxx"
 #include "conf.h"
 #include "Playlist.hxx"
 #include "mpd_error.h"
diff --git a/src/StickerDatabase.cxx b/src/StickerDatabase.cxx
index 3d6e212d1..2d77e4b63 100644
--- a/src/StickerDatabase.cxx
+++ b/src/StickerDatabase.cxx
@@ -19,10 +19,7 @@
 
 #include "config.h"
 #include "StickerDatabase.hxx"
-
-extern "C" {
-#include "idle.h"
-}
+#include "Idle.hxx"
 
 #include <string>
 #include <map>
diff --git a/src/UpdateGlue.cxx b/src/UpdateGlue.cxx
index 2edd19cc2..d990ddfe6 100644
--- a/src/UpdateGlue.cxx
+++ b/src/UpdateGlue.cxx
@@ -24,10 +24,10 @@
 #include "UpdateRemove.hxx"
 #include "Mapper.hxx"
 #include "DatabaseSimple.hxx"
+#include "Idle.hxx"
 
 extern "C" {
 #include "event_pipe.h"
-#include "idle.h"
 #include "stats.h"
 }
 
diff --git a/src/Volume.cxx b/src/Volume.cxx
index 2c954fae9..a046aa942 100644
--- a/src/Volume.cxx
+++ b/src/Volume.cxx
@@ -20,9 +20,9 @@
 #include "config.h"
 #include "Volume.hxx"
 #include "MixerAll.hxx"
+#include "Idle.hxx"
 
 extern "C" {
-#include "idle.h"
 #include "event_pipe.h"
 }