diff --git a/modules/module-si-adapter.c b/modules/module-si-adapter.c
index 61f055f854f50b6ec92b45b70cd567c6ffe3e672..cece38e0dc092fa0ecbb1094b4eb5702532aa7ad 100644
--- a/modules/module-si-adapter.c
+++ b/modules/module-si-adapter.c
@@ -7,14 +7,12 @@
  */
 
 #include <wp/wp.h>
-#include <pipewire/pipewire.h>
-#include <pipewire/extensions/session-manager.h>
+#include <pipewire/keys.h>
+#include <pipewire/extensions/session-manager/keys.h>
 
-#include <spa/pod/builder.h>
-#include <spa/param/format-utils.h>
+#include <spa/param/format.h>
 #include <spa/param/audio/raw.h>
-#include <spa/param/audio/format-utils.h>
-#include <spa/param/props.h>
+#include <spa/param/param.h>
 
 #include "module-pipewire/algorithms.h"
 
diff --git a/modules/module-si-audio-softdsp-endpoint.c b/modules/module-si-audio-softdsp-endpoint.c
index 37bfa85362778585f0ce23ab3fecc10f34a82920..75ecf8f6a656dd668af2d91a71713bac8bd9c690 100644
--- a/modules/module-si-audio-softdsp-endpoint.c
+++ b/modules/module-si-audio-softdsp-endpoint.c
@@ -7,8 +7,8 @@
  */
 
 #include <wp/wp.h>
-#include <pipewire/pipewire.h>
-#include <pipewire/extensions/session-manager/keys.h>
+#include <pipewire/keys.h>
+
 #include <spa/utils/names.h>
 
 enum {
@@ -137,7 +137,7 @@ si_audio_softdsp_endpoint_create_convert_node (WpSiAudioSoftdspEndpoint *self,
   wp_properties_setf (props, PW_KEY_OBJECT_PATH, "%p/convert", self);
   wp_properties_setf (props, PW_KEY_NODE_NAME, "%p/convert/%d", self, index);
   wp_properties_set (props, PW_KEY_MEDIA_CLASS, "Audio/Convert");
-  wp_properties_set (props, SPA_KEY_FACTORY_NAME, SPA_NAME_AUDIO_CONVERT);
+  wp_properties_set (props, PW_KEY_FACTORY_NAME, SPA_NAME_AUDIO_CONVERT);
 
   /* Create the node */
   return wp_node_new_from_factory (core, "spa-node-factory",
diff --git a/modules/module-si-convert.c b/modules/module-si-convert.c
index 11b3b767b22e2fada9483936f193a2592c18fe4f..6a19cce1fec6ba18ad97ac8c1ef6abb9977fe308 100644
--- a/modules/module-si-convert.c
+++ b/modules/module-si-convert.c
@@ -8,14 +8,10 @@
 
 #include <wp/wp.h>
 #include <pipewire/pipewire.h>
-#include <pipewire/extensions/session-manager.h>
 
-#include <spa/pod/builder.h>
-#include <spa/param/format-utils.h>
+#include <spa/param/format.h>
 #include <spa/param/audio/raw.h>
-#include <spa/param/audio/format-utils.h>
-#include <spa/param/audio/type-info.h>
-#include <spa/param/props.h>
+#include <spa/param/param.h>
 
 #include "module-pipewire/algorithms.h"