diff --git a/src/Main.cxx b/src/Main.cxx
index 9d9a3430b..e13cbcc00 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -43,7 +43,7 @@
 #include "fs/AllocatedPath.hxx"
 #include "fs/Config.hxx"
 #include "playlist/PlaylistRegistry.hxx"
-#include "zeroconf/ZeroconfGlue.hxx"
+#include "zeroconf/Glue.hxx"
 #include "decoder/DecoderList.hxx"
 #include "pcm/AudioParser.hxx"
 #include "pcm/Convert.hxx"
diff --git a/src/zeroconf/ZeroconfBonjour.cxx b/src/zeroconf/Bonjour.cxx
similarity index 97%
rename from src/zeroconf/ZeroconfBonjour.cxx
rename to src/zeroconf/Bonjour.cxx
index ba6cd63e2..b7a5eeb64 100644
--- a/src/zeroconf/ZeroconfBonjour.cxx
+++ b/src/zeroconf/Bonjour.cxx
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "ZeroconfBonjour.hxx"
-#include "ZeroconfInternal.hxx"
+#include "Bonjour.hxx"
+#include "Internal.hxx"
 #include "event/SocketEvent.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
diff --git a/src/zeroconf/ZeroconfBonjour.hxx b/src/zeroconf/Bonjour.hxx
similarity index 100%
rename from src/zeroconf/ZeroconfBonjour.hxx
rename to src/zeroconf/Bonjour.hxx
diff --git a/src/zeroconf/ZeroconfGlue.cxx b/src/zeroconf/Glue.cxx
similarity index 96%
rename from src/zeroconf/ZeroconfGlue.cxx
rename to src/zeroconf/Glue.cxx
index da84e3758..e05b71e26 100644
--- a/src/zeroconf/ZeroconfGlue.cxx
+++ b/src/zeroconf/Glue.cxx
@@ -17,9 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "ZeroconfGlue.hxx"
-#include "ZeroconfAvahi.hxx"
-#include "ZeroconfBonjour.hxx"
+#include "Glue.hxx"
+#include "avahi/Init.hxx"
+#include "Bonjour.hxx"
 #include "config/Data.hxx"
 #include "config/Option.hxx"
 #include "Listen.hxx"
diff --git a/src/zeroconf/ZeroconfGlue.hxx b/src/zeroconf/Glue.hxx
similarity index 100%
rename from src/zeroconf/ZeroconfGlue.hxx
rename to src/zeroconf/Glue.hxx
diff --git a/src/zeroconf/ZeroconfInternal.hxx b/src/zeroconf/Internal.hxx
similarity index 93%
rename from src/zeroconf/ZeroconfInternal.hxx
rename to src/zeroconf/Internal.hxx
index c9735f622..d270a128e 100644
--- a/src/zeroconf/ZeroconfInternal.hxx
+++ b/src/zeroconf/Internal.hxx
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef ZEROCONF_INTERNAL_H
-#define ZEROCONF_INTERNAL_H
+#ifndef ZEROCONF_INTERNAL_HXX
+#define ZEROCONF_INTERNAL_HXX
 
 /* The dns-sd service type qualifier to publish */
 #define SERVICE_TYPE		"_mpd._tcp"
diff --git a/src/zeroconf/ZeroconfAvahi.cxx b/src/zeroconf/avahi/Init.cxx
similarity index 89%
rename from src/zeroconf/ZeroconfAvahi.cxx
rename to src/zeroconf/avahi/Init.cxx
index d03542e39..873ee8155 100644
--- a/src/zeroconf/ZeroconfAvahi.cxx
+++ b/src/zeroconf/avahi/Init.cxx
@@ -17,13 +17,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "ZeroconfAvahi.hxx"
-#include "avahi/Client.hxx"
-#include "avahi/ConnectionListener.hxx"
-#include "avahi/ErrorHandler.hxx"
-#include "avahi/Publisher.hxx"
-#include "avahi/Service.hxx"
-#include "ZeroconfInternal.hxx"
+#include "Init.hxx"
+#include "../Internal.hxx"
+#include "Client.hxx"
+#include "ConnectionListener.hxx"
+#include "ErrorHandler.hxx"
+#include "Publisher.hxx"
+#include "Service.hxx"
 #include "util/RuntimeError.hxx"
 #include "Log.hxx"
 
diff --git a/src/zeroconf/ZeroconfAvahi.hxx b/src/zeroconf/avahi/Init.hxx
similarity index 100%
rename from src/zeroconf/ZeroconfAvahi.hxx
rename to src/zeroconf/avahi/Init.hxx
diff --git a/src/zeroconf/avahi/meson.build b/src/zeroconf/avahi/meson.build
index d13b55201..e6427adf4 100644
--- a/src/zeroconf/avahi/meson.build
+++ b/src/zeroconf/avahi/meson.build
@@ -6,6 +6,7 @@ endif
 
 avahi = static_library(
   'avahi',
+  'Init.cxx',
   'Client.cxx',
   'Error.cxx',
   'Poll.cxx',
diff --git a/src/zeroconf/meson.build b/src/zeroconf/meson.build
index aedcfbeb9..b9891419f 100644
--- a/src/zeroconf/meson.build
+++ b/src/zeroconf/meson.build
@@ -35,8 +35,8 @@ if zeroconf_option == 'bonjour'
 
   zeroconf = static_library(
     'zeroconf_bonjour',
-    'ZeroconfGlue.cxx',
-    'ZeroconfBonjour.cxx',
+    'Glue.cxx',
+    'Bonjour.cxx',
     include_directories: inc,
   )
 
@@ -56,8 +56,7 @@ else
   
   zeroconf = static_library(
     'zeroconf_bonjour',
-    'ZeroconfGlue.cxx',
-    'ZeroconfAvahi.cxx',
+    'Glue.cxx',
     include_directories: inc,
     dependencies: [
       avahi_dep,
diff --git a/test/run_avahi.cxx b/test/run_avahi.cxx
index c41c90ca2..669b9b180 100644
--- a/test/run_avahi.cxx
+++ b/test/run_avahi.cxx
@@ -19,7 +19,7 @@
 
 #include "event/Loop.hxx"
 #include "ShutdownHandler.hxx"
-#include "zeroconf/ZeroconfAvahi.hxx"
+#include "zeroconf/avahi/Init.hxx"
 
 #include <stdlib.h>