diff --git a/src/modules/module-avb/maap.c b/src/modules/module-avb/maap.c
index bd72a2635..7d195be0e 100644
--- a/src/modules/module-avb/maap.c
+++ b/src/modules/module-avb/maap.c
@@ -27,7 +27,6 @@
 #include <spa/utils/json.h>
 
 #include <pipewire/pipewire.h>
-#include <pipewire/conf.h>
 
 #include "utils.h"
 #include "maap.h"
diff --git a/src/modules/module-combine-stream.c b/src/modules/module-combine-stream.c
index 010e3dc37..88b5644ea 100644
--- a/src/modules/module-combine-stream.c
+++ b/src/modules/module-combine-stream.c
@@ -46,7 +46,6 @@
 #include <spa/param/audio/raw.h>
 
 #include <pipewire/impl.h>
-#include <pipewire/conf.h>
 #include <pipewire/i18n.h>
 
 /** \page page_module_combine_stream PipeWire Module: Combine Stream
diff --git a/src/pipewire/conf.c b/src/pipewire/conf.c
index c9dcf832c..700d8ee64 100644
--- a/src/pipewire/conf.c
+++ b/src/pipewire/conf.c
@@ -361,7 +361,7 @@ found:
 }
 
 SPA_EXPORT
-int pw_conf_save_state(const char *prefix, const char *name, struct pw_properties *conf)
+int pw_conf_save_state(const char *prefix, const char *name, const struct pw_properties *conf)
 {
 	char path[PATH_MAX];
 	char *tmp_name;
diff --git a/src/pipewire/pipewire.h b/src/pipewire/pipewire.h
index b932103f4..ed24fbde8 100644
--- a/src/pipewire/pipewire.h
+++ b/src/pipewire/pipewire.h
@@ -33,6 +33,7 @@ extern "C" {
 
 #include <pipewire/array.h>
 #include <pipewire/client.h>
+#include <pipewire/conf.h>
 #include <pipewire/context.h>
 #include <pipewire/device.h>
 #include <pipewire/buffers.h>