6 files changed, 12 insertions, 13 deletions
diff --git a/src/Main.cxx b/src/Main.cxx
index 371602247..82816fcf9 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -34,6 +34,7 @@
 #include "Client.hxx"
 #include "AllCommands.hxx"
 #include "Partition.hxx"
+#include "Volume.hxx"
 
 extern "C" {
 #include "daemon.h"
@@ -45,7 +46,6 @@ extern "C" {
 #include "sig_handlers.h"
 #include "audio_config.h"
 #include "output_all.h"
-#include "volume.h"
 #include "log.h"
 #include "pcm_resample.h"
 #include "replay_gain_config.h"
diff --git a/src/OtherCommands.cxx b/src/OtherCommands.cxx
index 9de616759..d467c30ef 100644
--- a/src/OtherCommands.cxx
+++ b/src/OtherCommands.cxx
@@ -32,10 +32,10 @@
 #include "protocol/ArgParser.hxx"
 #include "protocol/Result.hxx"
 #include "ls.hxx"
+#include "Volume.hxx"
 
 extern "C" {
 #include "uri.h"
-#include "volume.h"
 #include "stats.h"
 }
 
diff --git a/src/PlayerCommands.cxx b/src/PlayerCommands.cxx
index 2bd6fc4e6..5920863a6 100644
--- a/src/PlayerCommands.cxx
+++ b/src/PlayerCommands.cxx
@@ -24,12 +24,12 @@
 #include "PlaylistPrint.hxx"
 #include "UpdateGlue.hxx"
 #include "ClientInternal.hxx"
+#include "Volume.hxx"
 #include "protocol/Result.hxx"
 #include "protocol/ArgParser.hxx"
 
 extern "C" {
 #include "audio_format.h"
-#include "volume.h"
 #include "replay_gain_config.h"
 #include "output_all.h"
 }
diff --git a/src/StateFile.cxx b/src/StateFile.cxx
index 1d77b77de..29a560c75 100644
--- a/src/StateFile.cxx
+++ b/src/StateFile.cxx
@@ -23,10 +23,7 @@
 #include "PlaylistState.hxx"
 #include "TextFile.hxx"
 #include "Partition.hxx"
-
-extern "C" {
-#include "volume.h"
-}
+#include "Volume.hxx"
 
 #include <glib.h>
 #include <assert.h>
diff --git a/src/volume.c b/src/Volume.cxx
index 549feab9b..f6643a905 100644
--- a/src/volume.c
+++ b/src/Volume.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,10 +18,13 @@
  */
 
 #include "config.h"
-#include "volume.h"
+#include "Volume.hxx"
+
+extern "C" {
 #include "idle.h"
 #include "mixer_all.h"
 #include "event_pipe.h"
+}
 
 #include <glib.h>
 
diff --git a/src/volume.h b/src/Volume.hxx
index b08899a84..024b2840a 100644
--- a/src/volume.h
+++ b/src/Volume.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,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_VOLUME_H
-#define MPD_VOLUME_H
+#ifndef MPD_VOLUME_HXX
+#define MPD_VOLUME_HXX
 
-#include <stdbool.h>
 #include <stdio.h>
 
 void volume_init(void);