diff --git a/src/modules/meson.build b/src/modules/meson.build
index 162e92e2a..35609d48d 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -141,6 +141,7 @@ pipewire_module_protocol_pulse_sources = [
   'module-protocol-pulse/manager.c',
   'module-protocol-pulse/media-roles.c',
   'module-protocol-pulse/message.c',
+  'module-protocol-pulse/message-handler.c',
   'module-protocol-pulse/module.c',
   'module-protocol-pulse/operation.c',
   'module-protocol-pulse/pending-sample.c',
diff --git a/src/modules/module-protocol-pulse/message-handler.c b/src/modules/module-protocol-pulse/message-handler.c
index 706d75f47..7e94acca9 100644
--- a/src/modules/module-protocol-pulse/message-handler.c
+++ b/src/modules/module-protocol-pulse/message-handler.c
@@ -1,11 +1,27 @@
+#define NAME "pulse-server"
+
+#include <stdint.h>
+
+#include <regex.h>
+
+#include <spa/param/props.h>
+#include <spa/pod/builder.h>
+#include <spa/pod/pod.h>
+#include <spa/utils/defs.h>
 #include <spa/utils/string.h>
 
+#include <pipewire/pipewire.h>
+
+#include "collect.h"
+#include "manager.h"
+#include "message-handler.h"
+
 static int bluez_card_object_message_handler(struct pw_manager *m, struct pw_manager_object *o, const char *message, const char *params, char **response)
 {
 	struct transport_codec_info codecs[64];
 	uint32_t n_codecs, active;
 
-	pw_log_debug(NAME "bluez-card %p object message:'%s' params:'%s'", o, message, params);
+	pw_log_debug(NAME ": bluez-card %p object message:'%s' params:'%s'", o, message, params);
 
 	n_codecs = collect_transport_codec_info(o, codecs, SPA_N_ELEMENTS(codecs), &active);
 
@@ -79,7 +95,7 @@ static int bluez_card_object_message_handler(struct pw_manager *m, struct pw_man
 
 static int core_object_message_handler(struct pw_manager *m, struct pw_manager_object *o, const char *message, const char *params, char **response)
 {
-	pw_log_debug(NAME "core %p object message:'%s' params:'%s'", o, message, params);
+	pw_log_debug(NAME ": core %p object message:'%s' params:'%s'", o, message, params);
 
 	if (spa_streq(message, "list-handlers")) {
 		FILE *r;
@@ -101,7 +117,7 @@ static int core_object_message_handler(struct pw_manager *m, struct pw_manager_o
 	return -ENOSYS;
 }
 
-static void register_object_message_handlers(struct pw_manager_object *o)
+void register_object_message_handlers(struct pw_manager_object *o)
 {
 	const char *str;
 
diff --git a/src/modules/module-protocol-pulse/message-handler.h b/src/modules/module-protocol-pulse/message-handler.h
new file mode 100644
index 000000000..da2a7b060
--- /dev/null
+++ b/src/modules/module-protocol-pulse/message-handler.h
@@ -0,0 +1,8 @@
+#ifndef PULSE_SERVER_MESSAGE_HANDLER_H
+#define PULSE_SERVER_MESSAGE_HANDLER_H
+
+struct pw_manager_object;
+
+void register_object_message_handlers(struct pw_manager_object *o);
+
+#endif /* PULSE_SERVER_MESSAGE_HANDLER_H */
diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c
index 9ad9b2924..814dc627b 100644
--- a/src/modules/module-protocol-pulse/pulse-server.c
+++ b/src/modules/module-protocol-pulse/pulse-server.c
@@ -34,7 +34,6 @@
 #include <time.h>
 #include <sys/time.h>
 #include <fcntl.h>
-#include <regex.h>
 
 #include <pipewire/log.h>
 
@@ -67,6 +66,7 @@
 #include "format.h"
 #include "internal.h"
 #include "message.h"
+#include "message-handler.h"
 #include "module.h"
 #include "operation.h"
 #include "pending-sample.h"
@@ -101,8 +101,6 @@ struct latency_offset_data {
 	unsigned int initialized:1;
 };
 
-#include "message-handler.c"
-
 static struct sample *find_sample(struct impl *impl, uint32_t idx, const char *name)
 {
 	union pw_map_item *item;