6 files changed, 13 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index da62573b..134f7cad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,7 +106,6 @@ mpd_headers = \
 	src/client.h \
 	src/client_internal.h \
 	src/server_socket.h \
-	src/listen.h \
 	src/log.h \
 	src/ls.h \
 	src/mixer_all.h \
@@ -262,7 +261,7 @@ src_mpd_SOURCES = \
 	src/client_subscribe.c \
 	src/client_file.c src/client_file.h \
 	src/server_socket.c \
-	src/listen.c \
+	src/Listen.cxx src/Listen.hxx \
 	src/log.c \
 	src/ls.cxx \
 	src/io_error.h \
diff --git a/src/listen.c b/src/Listen.cxx
index 28709a0e..90cfe5a0 100644
--- a/src/listen.c
+++ b/src/Listen.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 "listen.h"
+#include "Listen.hxx"
+#include "Main.hxx"
+
+extern "C" {
 #include "server_socket.h"
 #include "client.h"
 #include "conf.h"
-#include "Main.hxx"
+}
 
 #include <string.h>
 #include <assert.h>
diff --git a/src/listen.h b/src/Listen.hxx
index 100fe252..fd553477 100644
--- a/src/listen.h
+++ b/src/Listen.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_LISTEN_H
-#define MPD_LISTEN_H
+#ifndef MPD_LISTEN_HXX
+#define MPD_LISTEN_HXX
 
 #include "gerror.h"
 
diff --git a/src/Main.cxx b/src/Main.cxx
index fa21ddbd..88be49e4 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -28,6 +28,7 @@
 #include "DatabaseGlue.hxx"
 #include "DatabaseSimple.hxx"
 #include "Permission.hxx"
+#include "Listen.hxx"
 
 extern "C" {
 #include "daemon.h"
@@ -37,7 +38,6 @@ extern "C" {
 #include "idle.h"
 #include "AllCommands.h"
 #include "playlist.h"
-#include "listen.h"
 #include "cmdline.h"
 #include "conf.h"
 #include "path.h"
diff --git a/src/zeroconf-avahi.c b/src/zeroconf-avahi.c
index f2cc5359..1f93ddb7 100644
--- a/src/zeroconf-avahi.c
+++ b/src/zeroconf-avahi.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "zeroconf-internal.h"
-#include "listen.h"
+#include "Listen.hxx"
 #include "mpd_error.h"
 
 #include <glib.h>
diff --git a/src/zeroconf.c b/src/zeroconf.c
index 4a399e4a..a4611b67 100644
--- a/src/zeroconf.c
+++ b/src/zeroconf.c
@@ -21,7 +21,7 @@
 #include "zeroconf.h"
 #include "zeroconf-internal.h"
 #include "conf.h"
-#include "listen.h"
+#include "Listen.hxx"
 
 #include <glib.h>