diff --git a/src/modules/meson.build b/src/modules/meson.build
index 5a024be1a..1a530472d 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -372,7 +372,7 @@ endif
 if avahi_dep.found()
   pipewire_module_protocol_pulse_sources += [
     'module-protocol-pulse/modules/module-zeroconf-publish.c',
-    'module-zeroconf-discover/avahi-poll.c',
+    'zeroconf-utils/avahi-poll.c',
   ]
   pipewire_module_protocol_pulse_deps += avahi_dep
   cdata.set('HAVE_AVAHI', true)
@@ -569,7 +569,7 @@ if build_module_zeroconf_discover
   pipewire_module_zeroconf_discover = shared_library('pipewire-module-zeroconf-discover',
     [ 'module-zeroconf-discover.c',
       'module-protocol-pulse/format.c',
-      'module-zeroconf-discover/avahi-poll.c' ],
+      'zeroconf-utils/avahi-poll.c' ],
     include_directories : [configinc],
     install : true,
     install_dir : modules_install_dir,
@@ -599,7 +599,7 @@ build_module_raop_discover = avahi_dep.found()
 if build_module_raop_discover
   pipewire_module_raop_discover = shared_library('pipewire-module-raop-discover',
     [ 'module-raop-discover.c',
-      'module-zeroconf-discover/avahi-poll.c' ],
+      'zeroconf-utils/avahi-poll.c' ],
     include_directories : [configinc],
     install : true,
     install_dir : modules_install_dir,
@@ -613,7 +613,7 @@ build_module_snapcast_discover = avahi_dep.found()
 if build_module_snapcast_discover
   pipewire_module_snapcast_discover = shared_library('pipewire-module-snapcast-discover',
     [ 'module-snapcast-discover.c',
-      'module-zeroconf-discover/avahi-poll.c' ],
+      'zeroconf-utils/avahi-poll.c' ],
     include_directories : [configinc],
     install : true,
     install_dir : modules_install_dir,
@@ -661,7 +661,7 @@ pipewire_module_rtp_sink = shared_library('pipewire-module-rtp-sink',
 build_module_rtp_session = avahi_dep.found()
 if build_module_rtp_session
   pipewire_module_rtp_session = shared_library('pipewire-module-rtp-session',
-    [ 'module-zeroconf-discover/avahi-poll.c',
+    [ 'zeroconf-utils/avahi-poll.c',
       'module-rtp-session.c' ],
     include_directories : [configinc],
     install : true,
@@ -705,8 +705,8 @@ pipewire_module_vban_recv = shared_library('pipewire-module-vban-recv',
 
 if avahi_dep.found()
   pipewire_module_sendspin_sources += [
-    'module-sendspin/zeroconf.c',
-    'module-zeroconf-discover/avahi-poll.c',
+    'zeroconf-utils/zeroconf.c',
+    'zeroconf-utils/avahi-poll.c',
   ]
   pipewire_module_sendspin_deps += avahi_dep
 endif
diff --git a/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c b/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
index d4425a3fe..f8ad9212b 100644
--- a/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
+++ b/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
@@ -15,7 +15,7 @@
 #include "../module.h"
 #include "../pulse-server.h"
 #include "../server.h"
-#include "../../module-zeroconf-discover/avahi-poll.h"
+#include "../../zeroconf-utils/avahi-poll.h"
 
 #include <avahi-client/client.h>
 #include <avahi-client/publish.h>
diff --git a/src/modules/module-raop-discover.c b/src/modules/module-raop-discover.c
index 436972ac0..cbfa1da1b 100644
--- a/src/modules/module-raop-discover.c
+++ b/src/modules/module-raop-discover.c
@@ -23,8 +23,8 @@
 #include <avahi-common/error.h>
 #include <avahi-common/malloc.h>
 
+#include "zeroconf-utils/avahi-poll.h"
 #include "module-protocol-pulse/format.h"
-#include "module-zeroconf-discover/avahi-poll.h"
 
 /** \page page_module_raop_discover RAOP Discover
  *
diff --git a/src/modules/module-rtp-session.c b/src/modules/module-rtp-session.c
index 63470c539..ff190aae0 100644
--- a/src/modules/module-rtp-session.c
+++ b/src/modules/module-rtp-session.c
@@ -32,7 +32,7 @@
 #include <avahi-common/error.h>
 #include <avahi-common/malloc.h>
 
-#include "module-zeroconf-discover/avahi-poll.h"
+#include "zeroconf-utils/avahi-poll.h"
 
 #include <module-rtp/rtp.h>
 #include <module-rtp/apple-midi.h>
diff --git a/src/modules/module-sendspin-recv.c b/src/modules/module-sendspin-recv.c
index 76da7194d..517679fba 100644
--- a/src/modules/module-sendspin-recv.c
+++ b/src/modules/module-sendspin-recv.c
@@ -30,8 +30,8 @@
 #include <pipewire/pipewire.h>
 #include <pipewire/impl.h>
 
+#include "zeroconf-utils/zeroconf.h"
 #include "module-sendspin/sendspin.h"
-#include "module-sendspin/zeroconf.h"
 #include "module-sendspin/websocket.h"
 #include "module-sendspin/regress.h"
 #include "network-utils.h"
diff --git a/src/modules/module-sendspin-send.c b/src/modules/module-sendspin-send.c
index 3acf7ea4e..c10a9aba9 100644
--- a/src/modules/module-sendspin-send.c
+++ b/src/modules/module-sendspin-send.c
@@ -32,7 +32,7 @@
 
 #include "module-sendspin/sendspin.h"
 #include "module-sendspin/websocket.h"
-#include "module-sendspin/zeroconf.h"
+#include "zeroconf-utils/zeroconf.h"
 #include "network-utils.h"
 
 /** \page page_module_sendspin_send sendspin sender
diff --git a/src/modules/module-snapcast-discover.c b/src/modules/module-snapcast-discover.c
index e929be9c0..b9df21a3a 100644
--- a/src/modules/module-snapcast-discover.c
+++ b/src/modules/module-snapcast-discover.c
@@ -34,7 +34,7 @@
 #include <avahi-common/malloc.h>
 
 #include "module-protocol-pulse/format.h"
-#include "module-zeroconf-discover/avahi-poll.h"
+#include "zeroconf-utils/avahi-poll.h"
 
 #include "network-utils.h"
 
diff --git a/src/modules/module-zeroconf-discover.c b/src/modules/module-zeroconf-discover.c
index 177556637..a07dfbee8 100644
--- a/src/modules/module-zeroconf-discover.c
+++ b/src/modules/module-zeroconf-discover.c
@@ -25,7 +25,7 @@
 #include <avahi-common/malloc.h>
 
 #include "module-protocol-pulse/format.h"
-#include "module-zeroconf-discover/avahi-poll.h"
+#include "zeroconf-utils/avahi-poll.h"
 
 /** \page page_module_zeroconf_discover Zeroconf Discover
  *
diff --git a/src/modules/module-zeroconf-discover/avahi-poll.c b/src/modules/zeroconf-utils/avahi-poll.c
similarity index 100%
rename from src/modules/module-zeroconf-discover/avahi-poll.c
rename to src/modules/zeroconf-utils/avahi-poll.c
diff --git a/src/modules/module-zeroconf-discover/avahi-poll.h b/src/modules/zeroconf-utils/avahi-poll.h
similarity index 100%
rename from src/modules/module-zeroconf-discover/avahi-poll.h
rename to src/modules/zeroconf-utils/avahi-poll.h
diff --git a/src/modules/module-sendspin/zeroconf.c b/src/modules/zeroconf-utils/zeroconf.c
similarity index 99%
rename from src/modules/module-sendspin/zeroconf.c
rename to src/modules/zeroconf-utils/zeroconf.c
index fb1c5a221..cdd7a0231 100644
--- a/src/modules/module-sendspin/zeroconf.c
+++ b/src/modules/zeroconf-utils/zeroconf.c
@@ -20,8 +20,7 @@
 #include <avahi-common/error.h>
 #include <avahi-common/malloc.h>
 
-#include "../module-zeroconf-discover/avahi-poll.h"
-
+#include "avahi-poll.h"
 #include "zeroconf.h"
 
 #define pw_zeroconf_emit(o,m,v,...) 	spa_hook_list_call(&o->listener_list, struct pw_zeroconf_events, m, v, ##__VA_ARGS__)
diff --git a/src/modules/module-sendspin/zeroconf.h b/src/modules/zeroconf-utils/zeroconf.h
similarity index 100%
rename from src/modules/module-sendspin/zeroconf.h
rename to src/modules/zeroconf-utils/zeroconf.h