6 files changed, 13 insertions, 10 deletions
diff --git a/src/AllCommands.cxx b/src/AllCommands.cxx
index 6026c6906..6017f9859 100644
--- a/src/AllCommands.cxx
+++ b/src/AllCommands.cxx
@@ -31,7 +31,7 @@ extern "C" {
 #include "OutputCommands.hxx"
 #include "MessageCommands.hxx"
 #include "OtherCommands.hxx"
-#include "permission.h"
+#include "Permission.hxx"
 #include "tag.h"
 
 extern "C" {
diff --git a/src/ClientNew.cxx b/src/ClientNew.cxx
index 28a837b62..e1c042614 100644
--- a/src/ClientNew.cxx
+++ b/src/ClientNew.cxx
@@ -25,8 +25,8 @@ extern "C" {
 extern "C" {
 #include "fifo_buffer.h"
 #include "resolver.h"
-#include "permission.h"
 }
+#include "Permission.hxx"
 #include "glib_socket.h"
 
 #include <assert.h>
diff --git a/src/Main.cxx b/src/Main.cxx
index 24da70bc4..4dc606a30 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -27,6 +27,7 @@
 #include "Mapper.hxx"
 #include "DatabaseGlue.hxx"
 #include "DatabaseSimple.hxx"
+#include "Permission.hxx"
 
 extern "C" {
 #include "daemon.h"
@@ -47,7 +48,6 @@ extern "C" {
 #include "output_all.h"
 #include "volume.h"
 #include "log.h"
-#include "permission.h"
 #include "pcm_resample.h"
 #include "replay_gain_config.h"
 #include "decoder_list.h"
diff --git a/src/OtherCommands.cxx b/src/OtherCommands.cxx
index a7a262495..756f8d5b6 100644
--- a/src/OtherCommands.cxx
+++ b/src/OtherCommands.cxx
@@ -37,9 +37,9 @@ extern "C" {
 #include "decoder_print.h"
 #include "volume.h"
 #include "stats.h"
-#include "permission.h"
 }
 
+#include "Permission.hxx"
 #include "PlaylistFile.hxx"
 
 extern "C" {
diff --git a/src/permission.c b/src/Permission.cxx
index cd52b9c86..e455f7ee7 100644
--- a/src/permission.c
+++ b/src/Permission.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 "permission.h"
-#include "conf.h"
+#include "Permission.hxx"
 #include "mpd_error.h"
 
+extern "C" {
+#include "conf.h"
+}
+
 #include <glib.h>
 
 #include <stdbool.h>
diff --git a/src/permission.h b/src/Permission.hxx
index 6c3771362..de8558494 100644
--- a/src/permission.h
+++ b/src/Permission.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_PERMISSION_H
-#define MPD_PERMISSION_H
+#ifndef MPD_PERMISSION_HXX
+#define MPD_PERMISSION_HXX
 
 #define PERMISSION_NONE    0
 #define PERMISSION_READ    1