6 files changed, 13 insertions, 17 deletions
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index 670995214..6f9528a4e 100644
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -21,11 +21,7 @@
 #include "CommandLine.hxx"
 #include "path.h"
 #include "ls.hxx"
-
-extern "C" {
-#include "log.h"
-}
-
+#include "Log.hxx"
 #include "conf.h"
 #include "decoder_list.h"
 #include "decoder_plugin.h"
diff --git a/src/log.c b/src/Log.cxx
index 2d3c7cafd..7ca64197f 100644
--- a/src/log.c
+++ b/src/Log.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,7 @@
  */
 
 #include "config.h"
-#include "log.h"
+#include "Log.hxx"
 #include "conf.h"
 #include "utils.h"
 #include "fd_util.h"
diff --git a/src/log.h b/src/Log.hxx
index 683ff3e9f..cfcece104 100644
--- a/src/log.h
+++ b/src/Log.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_LOG_H
-#define MPD_LOG_H
+#ifndef MPD_LOG_HXX
+#define MPD_LOG_HXX
 
 #include <glib.h>
 #include <stdbool.h>
diff --git a/src/Main.cxx b/src/Main.cxx
index d05a95947..c66943070 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -41,15 +41,15 @@
 #include "conf.h"
 #include "replay_gain_config.h"
 #include "Idle.hxx"
+#include "SignalHandlers.hxx"
+#include "Log.hxx"
 
 extern "C" {
 #include "daemon.h"
 #include "io_thread.h"
 #include "path.h"
 #include "stats.h"
-#include "sig_handlers.h"
 #include "audio_config.h"
-#include "log.h"
 #include "pcm_resample.h"
 #include "decoder_list.h"
 #include "input_init.h"
diff --git a/src/sig_handlers.c b/src/SignalHandlers.cxx
index eabca1997..dfef9bf84 100644
--- a/src/sig_handlers.c
+++ b/src/SignalHandlers.cxx
@@ -18,11 +18,11 @@
  */
 
 #include "config.h"
-#include "sig_handlers.h"
+#include "SignalHandlers.hxx"
 
 #ifndef WIN32
 
-#include "log.h"
+#include "Log.hxx"
 #include "Main.hxx"
 #include "event_pipe.h"
 #include "mpd_error.h"
diff --git a/src/sig_handlers.h b/src/SignalHandlers.hxx
index 32e9bad95..99f347fb0 100644
--- a/src/sig_handlers.h
+++ b/src/SignalHandlers.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_SIG_HANDLERS_H
-#define MPD_SIG_HANDLERS_H
+#ifndef MPD_SIGNAL_HANDLERS_HXX
+#define MPD_SIGNAL_HANDLERS_HXX
 
 void initSigHandlers(void);