diff --git a/src/modules/module-protocol-native.c b/src/modules/module-protocol-native.c
index e2dff43f4..371fc28d9 100644
--- a/src/modules/module-protocol-native.c
+++ b/src/modules/module-protocol-native.c
@@ -23,6 +23,8 @@
 #endif
 
 #include <spa/pod/iter.h>
+#include <spa/pod/parser.h>
+#include <spa/pod/builder.h>
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 
@@ -1465,6 +1467,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 {
 	struct pw_context *context = pw_impl_module_get_context(module);
 	struct pw_protocol *this;
+	struct pw_impl_core *core = context->core;
 	struct protocol_data *d;
 	const struct pw_properties *props;
 	int res;
@@ -1496,10 +1499,10 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	d->module = module;
 
 	props = pw_context_get_properties(context);
-	d->local = create_server(this, context->core, &props->dict);
+	d->local = create_server(this, core, &props->dict);
 
 	if (need_server(context, &props->dict)) {
-		if (impl_add_server(this, context->core, &props->dict) == NULL) {
+		if (impl_add_server(this, core, &props->dict) == NULL) {
 			res = -errno;
 			goto error_cleanup;
 		}
diff --git a/src/modules/module-protocol-native/defs.h b/src/modules/module-protocol-native/defs.h
index 3b5519097..429934e0a 100644
--- a/src/modules/module-protocol-native/defs.h
+++ b/src/modules/module-protocol-native/defs.h
@@ -27,3 +27,9 @@ static inline void *get_first_pod_from_data(void *data, uint32_t maxsize, uint64
 		return NULL;
 	return pod;
 }
+
+struct protocol_compat_v2 {
+	/* v2 typemap */
+	struct pw_map types;
+	unsigned int send_types:1;
+};
diff --git a/src/modules/module-protocol-native/v0/protocol-native.c b/src/modules/module-protocol-native/v0/protocol-native.c
index 91ce017a1..862d9eda1 100644
--- a/src/modules/module-protocol-native/v0/protocol-native.c
+++ b/src/modules/module-protocol-native/v0/protocol-native.c
@@ -22,6 +22,7 @@
 #include "interfaces.h"
 #include "typemap.h"
 
+#include "../defs.h"
 #include "../connection.h"
 
 PW_LOG_TOPIC_EXTERN(mod_topic);
diff --git a/src/pipewire/private.h b/src/pipewire/private.h
index 8d23ae7c3..10573e2b3 100644
--- a/src/pipewire/private.h
+++ b/src/pipewire/private.h
@@ -213,12 +213,6 @@ enum spa_node0_command {
 	SPA_NODE0_COMMAND_ClockUpdate,
 };
 
-struct protocol_compat_v2 {
-	/* v2 typemap */
-	struct pw_map types;
-	unsigned int send_types:1;
-};
-
 #define pw_impl_core_emit(s,m,v,...) spa_hook_list_call(&s->listener_list, struct pw_impl_core_events, m, v, ##__VA_ARGS__)
 
 #define pw_impl_core_emit_destroy(s)		pw_impl_core_emit(s, destroy, 0)