From 164e343dbfabb7fd63736434be248725afcd0711 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 20 Jan 2023 16:08:38 +0100
Subject: [PATCH] remove pipewire/private.h includes when possible

In many places this is not needed.
Expose pw_impl_node_set_param() for adapter.
---
 src/modules/module-access.c                     |  1 -
 src/modules/module-adapter/adapter.c            |  1 -
 src/modules/module-avb.c                        |  1 -
 src/modules/module-avb/avb.c                    |  2 --
 src/modules/module-avb/internal.h               |  1 -
 src/modules/module-echo-cancel.c                | 17 ++++++++++-------
 src/modules/module-filter-chain.c               |  3 +--
 .../module-filter-chain/builtin_plugin.c        |  3 ++-
 src/modules/module-loopback.c                   |  3 +--
 src/modules/module-pipe-tunnel.c                |  1 -
 src/modules/module-portal.c                     |  2 +-
 .../modules/module-echo-cancel.c                |  1 -
 .../modules/module-ladspa-sink.c                |  4 ++--
 .../modules/module-ladspa-source.c              |  4 ++--
 .../modules/module-loopback.c                   |  1 -
 .../modules/module-pipe-sink.c                  |  1 -
 .../modules/module-pipe-source.c                |  1 -
 .../modules/module-raop-discover.c              |  1 -
 .../modules/module-remap-sink.c                 |  1 -
 .../modules/module-remap-source.c               |  1 -
 .../modules/module-roc-sink-input.c             |  1 -
 .../modules/module-roc-sink.c                   |  1 -
 .../modules/module-roc-source.c                 |  1 -
 .../modules/module-rtp-recv.c                   |  1 -
 .../modules/module-rtp-send.c                   |  1 -
 .../modules/module-tunnel-sink.c                |  1 -
 .../modules/module-tunnel-source.c              |  1 -
 .../modules/module-zeroconf-discover.c          |  1 -
 .../module-protocol-pulse/pulse-server.c        |  1 -
 src/modules/module-protocol-pulse/stream.c      |  1 -
 src/modules/module-raop-discover.c              |  1 -
 src/modules/module-raop-sink.c                  |  1 -
 src/modules/module-roc-sink.c                   |  8 +++++---
 src/modules/module-roc-source.c                 |  8 +++++---
 src/modules/module-rtp-sink.c                   |  5 +++--
 src/modules/module-rtp-source.c                 |  5 +++--
 src/modules/module-x11-bell.c                   |  1 -
 src/modules/module-zeroconf-discover.c          |  2 +-
 src/pipewire/impl-node.h                        |  4 ++++
 src/pipewire/private.h                          |  2 --
 40 files changed, 40 insertions(+), 57 deletions(-)

diff --git a/src/modules/module-access.c b/src/modules/module-access.c
index 9b6d02861..db12ad750 100644
--- a/src/modules/module-access.c
+++ b/src/modules/module-access.c
@@ -44,7 +44,6 @@
 #include <spa/utils/json.h>
 
 #include <pipewire/impl.h>
-#include <pipewire/private.h>
 
 #include "flatpak-utils.h"
 
diff --git a/src/modules/module-adapter/adapter.c b/src/modules/module-adapter/adapter.c
index 65435942c..19c571349 100644
--- a/src/modules/module-adapter/adapter.c
+++ b/src/modules/module-adapter/adapter.c
@@ -45,7 +45,6 @@
 #include <spa/utils/json-pod.h>
 
 #include "pipewire/pipewire.h"
-#include "pipewire/private.h"
 
 #include "modules/spa/spa-node.h"
 
diff --git a/src/modules/module-avb.c b/src/modules/module-avb.c
index e70c65031..2359c2d52 100644
--- a/src/modules/module-avb.c
+++ b/src/modules/module-avb.c
@@ -37,7 +37,6 @@
 #include <spa/utils/json.h>
 
 #include <pipewire/impl.h>
-#include <pipewire/private.h>
 #include <pipewire/i18n.h>
 
 #include "module-avb/avb.h"
diff --git a/src/modules/module-avb/avb.c b/src/modules/module-avb/avb.c
index 34526936f..2afdc21aa 100644
--- a/src/modules/module-avb/avb.c
+++ b/src/modules/module-avb/avb.c
@@ -75,8 +75,6 @@ struct pw_avb *pw_avb_new(struct pw_context *context,
 		goto error_free;
 	}
 
-	impl->work_queue = pw_context_get_work_queue(context);
-
 	spa_list_init(&impl->servers);
 
 	avdecc_server_new(impl, &props->dict);
diff --git a/src/modules/module-avb/internal.h b/src/modules/module-avb/internal.h
index f0a1c1499..9d29d92cc 100644
--- a/src/modules/module-avb/internal.h
+++ b/src/modules/module-avb/internal.h
@@ -45,7 +45,6 @@ struct impl {
 	unsigned do_disconnect:1;
 
 	struct pw_properties *props;
-	struct pw_work_queue *work_queue;
 
 	struct spa_list servers;
 };
diff --git a/src/modules/module-echo-cancel.c b/src/modules/module-echo-cancel.c
index 695b31657..34c16c7c7 100644
--- a/src/modules/module-echo-cancel.c
+++ b/src/modules/module-echo-cancel.c
@@ -41,7 +41,7 @@
 #include <spa/debug/types.h>
 #include <spa/param/audio/format-utils.h>
 #include <spa/param/audio/raw.h>
-#include <spa/param/profiler.h>
+#include <spa/param/latency-utils.h>
 #include <spa/pod/builder.h>
 #include <spa/pod/dynamic.h>
 #include <spa/support/plugin.h>
@@ -53,7 +53,6 @@
 #include <spa/support/plugin-loader.h>
 #include <spa/interfaces/audio/aec.h>
 
-#include <pipewire/private.h>
 #include <pipewire/impl.h>
 #include <pipewire/pipewire.h>
 
@@ -1186,17 +1185,21 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 	if ((path = pw_properties_get(props, "library.name")) == NULL)
 		path = "aec/libspa-aec-webrtc";
 
-	struct spa_dict_item info_items[] = {
-		{ SPA_KEY_LIBRARY_NAME, path },
-	};
-	struct spa_dict info = SPA_DICT_INIT_ARRAY(info_items);
+	const struct spa_support *support;
+	uint32_t n_support;
 
-	impl->loader = spa_support_find(context->support, context->n_support, SPA_TYPE_INTERFACE_PluginLoader);
+	support = pw_context_get_support(context, &n_support);
+	impl->loader = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_PluginLoader);
 	if (impl->loader == NULL) {
 		pw_log_error("a plugin loader is needed");
 		return -EINVAL;
 	}
 
+	struct spa_dict_item info_items[] = {
+		{ SPA_KEY_LIBRARY_NAME, path },
+	};
+	struct spa_dict info = SPA_DICT_INIT_ARRAY(info_items);
+
 	handle = spa_plugin_loader_load(impl->loader, SPA_NAME_AEC, &info);
 	if (handle == NULL) {
 		pw_log_error("aec plugin %s not available library.name %s", SPA_NAME_AEC, path);
diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c
index b7faac098..fd41d2001 100644
--- a/src/modules/module-filter-chain.c
+++ b/src/modules/module-filter-chain.c
@@ -39,12 +39,11 @@
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
 #include <spa/support/cpu.h>
-#include <spa/param/profiler.h>
+#include <spa/param/latency-utils.h>
 #include <spa/pod/dynamic.h>
 #include <spa/debug/types.h>
 
 #include <pipewire/utils.h>
-#include <pipewire/private.h>
 #include <pipewire/impl.h>
 #include <pipewire/extensions/profiler.h>
 
diff --git a/src/modules/module-filter-chain/builtin_plugin.c b/src/modules/module-filter-chain/builtin_plugin.c
index 397eb20aa..068df9932 100644
--- a/src/modules/module-filter-chain/builtin_plugin.c
+++ b/src/modules/module-filter-chain/builtin_plugin.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "pipewire/private.h"
 
 #include <float.h>
 #include <math.h>
@@ -45,6 +44,8 @@
 #include "convolver.h"
 #include "dsp-ops.h"
 
+#define MAX_RATES	32u
+
 static struct dsp_ops *dsp_ops;
 
 struct builtin {
diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c
index 243e4c4ad..7d6653965 100644
--- a/src/modules/module-loopback.c
+++ b/src/modules/module-loopback.c
@@ -36,10 +36,9 @@
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
 #include <spa/utils/ringbuffer.h>
-#include <spa/param/profiler.h>
+#include <spa/param/latency-utils.h>
 #include <spa/debug/types.h>
 
-#include <pipewire/private.h>
 #include <pipewire/impl.h>
 #include <pipewire/extensions/profiler.h>
 
diff --git a/src/modules/module-pipe-tunnel.c b/src/modules/module-pipe-tunnel.c
index 4b5d8c402..a59330587 100644
--- a/src/modules/module-pipe-tunnel.c
+++ b/src/modules/module-pipe-tunnel.c
@@ -50,7 +50,6 @@
 
 #include <pipewire/impl.h>
 #include <pipewire/i18n.h>
-#include <pipewire/private.h>
 
 /** \page page_module_pipe_tunnel PipeWire Module: Unix Pipe Tunnel
  *
diff --git a/src/modules/module-portal.c b/src/modules/module-portal.c
index 27ed7f41a..ee5aa73cc 100644
--- a/src/modules/module-portal.c
+++ b/src/modules/module-portal.c
@@ -36,6 +36,7 @@
 #include <dbus/dbus.h>
 
 #include <spa/utils/string.h>
+#include <spa/utils/result.h>
 #include <spa/support/dbus.h>
 
 #include "pipewire/context.h"
@@ -43,7 +44,6 @@
 #include "pipewire/log.h"
 #include "pipewire/module.h"
 #include "pipewire/utils.h"
-#include "pipewire/private.h"
 
 /** \page page_module_portal PipeWire Module: Portal
  *
diff --git a/src/modules/module-protocol-pulse/modules/module-echo-cancel.c b/src/modules/module-protocol-pulse/modules/module-echo-cancel.c
index 05509ed87..c2ab8ad27 100644
--- a/src/modules/module-protocol-pulse/modules/module-echo-cancel.c
+++ b/src/modules/module-protocol-pulse/modules/module-echo-cancel.c
@@ -27,7 +27,6 @@
 #include <spa/utils/hook.h>
 #include <spa/utils/json.h>
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 
 #include "../defs.h"
 #include "../module.h"
diff --git a/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c b/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c
index ab60f8524..3b3b700cf 100644
--- a/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c
+++ b/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c
@@ -22,11 +22,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <spa/param/audio/format-utils.h>
 #include <spa/utils/hook.h>
 #include <spa/utils/json.h>
+#include <spa/param/audio/format-utils.h>
+
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 
 #include "../defs.h"
 #include "../module.h"
diff --git a/src/modules/module-protocol-pulse/modules/module-ladspa-source.c b/src/modules/module-protocol-pulse/modules/module-ladspa-source.c
index 4124e34f9..953335087 100644
--- a/src/modules/module-protocol-pulse/modules/module-ladspa-source.c
+++ b/src/modules/module-protocol-pulse/modules/module-ladspa-source.c
@@ -22,11 +22,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <spa/param/audio/format-utils.h>
 #include <spa/utils/hook.h>
 #include <spa/utils/json.h>
+#include <spa/param/audio/format-utils.h>
+
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 
 #include "../defs.h"
 #include "../module.h"
diff --git a/src/modules/module-protocol-pulse/modules/module-loopback.c b/src/modules/module-protocol-pulse/modules/module-loopback.c
index f8eb81779..614ee501e 100644
--- a/src/modules/module-protocol-pulse/modules/module-loopback.c
+++ b/src/modules/module-protocol-pulse/modules/module-loopback.c
@@ -27,7 +27,6 @@
 #include <spa/utils/hook.h>
 #include <spa/utils/json.h>
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 
 #include "../defs.h"
 #include "../module.h"
diff --git a/src/modules/module-protocol-pulse/modules/module-pipe-sink.c b/src/modules/module-protocol-pulse/modules/module-pipe-sink.c
index 5f493ff24..2cc36db51 100644
--- a/src/modules/module-protocol-pulse/modules/module-pipe-sink.c
+++ b/src/modules/module-protocol-pulse/modules/module-pipe-sink.c
@@ -28,7 +28,6 @@
 #include <unistd.h>
 
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 #include <spa/param/audio/format-utils.h>
 #include <spa/utils/hook.h>
 
diff --git a/src/modules/module-protocol-pulse/modules/module-pipe-source.c b/src/modules/module-protocol-pulse/modules/module-pipe-source.c
index 8d8dda928..6153635a2 100644
--- a/src/modules/module-protocol-pulse/modules/module-pipe-source.c
+++ b/src/modules/module-protocol-pulse/modules/module-pipe-source.c
@@ -28,7 +28,6 @@
 #include <unistd.h>
 
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 #include <spa/param/audio/format-utils.h>
 #include <spa/utils/hook.h>
 
diff --git a/src/modules/module-protocol-pulse/modules/module-raop-discover.c b/src/modules/module-protocol-pulse/modules/module-raop-discover.c
index bb93b0249..e406189be 100644
--- a/src/modules/module-protocol-pulse/modules/module-raop-discover.c
+++ b/src/modules/module-protocol-pulse/modules/module-raop-discover.c
@@ -24,7 +24,6 @@
 
 #include <spa/utils/hook.h>
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 
 #include "../defs.h"
 #include "../module.h"
diff --git a/src/modules/module-protocol-pulse/modules/module-remap-sink.c b/src/modules/module-protocol-pulse/modules/module-remap-sink.c
index eea7a9220..f6b57f072 100644
--- a/src/modules/module-protocol-pulse/modules/module-remap-sink.c
+++ b/src/modules/module-protocol-pulse/modules/module-remap-sink.c
@@ -26,7 +26,6 @@
 #include <spa/utils/hook.h>
 #include <spa/utils/json.h>
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 
 #include "../defs.h"
 #include "../module.h"
diff --git a/src/modules/module-protocol-pulse/modules/module-remap-source.c b/src/modules/module-protocol-pulse/modules/module-remap-source.c
index 5b8d47db7..5ee609209 100644
--- a/src/modules/module-protocol-pulse/modules/module-remap-source.c
+++ b/src/modules/module-protocol-pulse/modules/module-remap-source.c
@@ -26,7 +26,6 @@
 #include <spa/utils/hook.h>
 #include <spa/utils/json.h>
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 
 #include "../defs.h"
 #include "../module.h"
diff --git a/src/modules/module-protocol-pulse/modules/module-roc-sink-input.c b/src/modules/module-protocol-pulse/modules/module-roc-sink-input.c
index c1b2b17a7..3a672acf9 100644
--- a/src/modules/module-protocol-pulse/modules/module-roc-sink-input.c
+++ b/src/modules/module-protocol-pulse/modules/module-roc-sink-input.c
@@ -25,7 +25,6 @@
 
 #include <spa/utils/hook.h>
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 
 #include "../defs.h"
 #include "../module.h"
diff --git a/src/modules/module-protocol-pulse/modules/module-roc-sink.c b/src/modules/module-protocol-pulse/modules/module-roc-sink.c
index c8e64a279..2dd5bb86a 100644
--- a/src/modules/module-protocol-pulse/modules/module-roc-sink.c
+++ b/src/modules/module-protocol-pulse/modules/module-roc-sink.c
@@ -25,7 +25,6 @@
 
 #include <spa/utils/hook.h>
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 
 #include "../defs.h"
 #include "../module.h"
diff --git a/src/modules/module-protocol-pulse/modules/module-roc-source.c b/src/modules/module-protocol-pulse/modules/module-roc-source.c
index b75e46e4d..681f27a0c 100644
--- a/src/modules/module-protocol-pulse/modules/module-roc-source.c
+++ b/src/modules/module-protocol-pulse/modules/module-roc-source.c
@@ -25,7 +25,6 @@
 
 #include <spa/utils/hook.h>
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 
 #include "../defs.h"
 #include "../module.h"
diff --git a/src/modules/module-protocol-pulse/modules/module-rtp-recv.c b/src/modules/module-protocol-pulse/modules/module-rtp-recv.c
index 6dd25aecf..fdaecd70c 100644
--- a/src/modules/module-protocol-pulse/modules/module-rtp-recv.c
+++ b/src/modules/module-protocol-pulse/modules/module-rtp-recv.c
@@ -24,7 +24,6 @@
 
 #include <spa/utils/hook.h>
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 
 #include "../defs.h"
 #include "../module.h"
diff --git a/src/modules/module-protocol-pulse/modules/module-rtp-send.c b/src/modules/module-protocol-pulse/modules/module-rtp-send.c
index 730675fd8..b9aad05d3 100644
--- a/src/modules/module-protocol-pulse/modules/module-rtp-send.c
+++ b/src/modules/module-protocol-pulse/modules/module-rtp-send.c
@@ -24,7 +24,6 @@
 
 #include <spa/utils/hook.h>
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 
 #include "../defs.h"
 #include "../module.h"
diff --git a/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c b/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c
index d78d5d289..55f95358a 100644
--- a/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c
+++ b/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c
@@ -27,7 +27,6 @@
 #include <spa/utils/json.h>
 
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 #include <pipewire/i18n.h>
 
 #include "../defs.h"
diff --git a/src/modules/module-protocol-pulse/modules/module-tunnel-source.c b/src/modules/module-protocol-pulse/modules/module-tunnel-source.c
index 07742dc62..fa17c1646 100644
--- a/src/modules/module-protocol-pulse/modules/module-tunnel-source.c
+++ b/src/modules/module-protocol-pulse/modules/module-tunnel-source.c
@@ -27,7 +27,6 @@
 #include <spa/utils/json.h>
 
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 #include <pipewire/i18n.h>
 
 #include "../defs.h"
diff --git a/src/modules/module-protocol-pulse/modules/module-zeroconf-discover.c b/src/modules/module-protocol-pulse/modules/module-zeroconf-discover.c
index c44c6c867..ccdaf27f4 100644
--- a/src/modules/module-protocol-pulse/modules/module-zeroconf-discover.c
+++ b/src/modules/module-protocol-pulse/modules/module-zeroconf-discover.c
@@ -24,7 +24,6 @@
 
 #include <spa/utils/hook.h>
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 
 #include "../defs.h"
 #include "../module.h"
diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c
index be42eab61..41a814a42 100644
--- a/src/modules/module-protocol-pulse/pulse-server.c
+++ b/src/modules/module-protocol-pulse/pulse-server.c
@@ -49,7 +49,6 @@
 #include <spa/utils/json.h>
 
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
 #include <pipewire/extensions/metadata.h>
 
 #include "pulse-server.h"
diff --git a/src/modules/module-protocol-pulse/stream.c b/src/modules/module-protocol-pulse/stream.c
index fb4309086..59fb8a33d 100644
--- a/src/modules/module-protocol-pulse/stream.c
+++ b/src/modules/module-protocol-pulse/stream.c
@@ -31,7 +31,6 @@
 #include <pipewire/log.h>
 #include <pipewire/loop.h>
 #include <pipewire/map.h>
-#include <pipewire/private.h>
 #include <pipewire/properties.h>
 #include <pipewire/stream.h>
 #include <pipewire/work-queue.h>
diff --git a/src/modules/module-raop-discover.c b/src/modules/module-raop-discover.c
index 483e7d301..0c6201177 100644
--- a/src/modules/module-raop-discover.c
+++ b/src/modules/module-raop-discover.c
@@ -37,7 +37,6 @@
 #include <spa/utils/json.h>
 
 #include <pipewire/impl.h>
-#include <pipewire/private.h>
 #include <pipewire/i18n.h>
 
 #include <avahi-client/lookup.h>
diff --git a/src/modules/module-raop-sink.c b/src/modules/module-raop-sink.c
index bb634b5b3..303cb4210 100644
--- a/src/modules/module-raop-sink.c
+++ b/src/modules/module-raop-sink.c
@@ -58,7 +58,6 @@
 
 #include <pipewire/impl.h>
 #include <pipewire/i18n.h>
-#include <pipewire/private.h>
 
 #include "module-raop/rtsp-client.h"
 
diff --git a/src/modules/module-roc-sink.c b/src/modules/module-roc-sink.c
index 8f0d2e882..86bd983d1 100644
--- a/src/modules/module-roc-sink.c
+++ b/src/modules/module-roc-sink.c
@@ -29,10 +29,9 @@
 
 #include "config.h"
 
-#include <pipewire/pipewire.h>
-#include <pipewire/private.h>
-#include <spa/param/audio/format-utils.h>
 #include <spa/utils/hook.h>
+#include <spa/utils/result.h>
+#include <spa/param/audio/format-utils.h>
 
 #include <roc/config.h>
 #include <roc/log.h>
@@ -40,6 +39,9 @@
 #include <roc/log.h>
 #include <roc/sender.h>
 
+#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
+
 #include "module-roc/common.h"
 
 /** \page page_module_roc_sink PipeWire Module: ROC sink
diff --git a/src/modules/module-roc-source.c b/src/modules/module-roc-source.c
index 301ec77a4..91fe60b34 100644
--- a/src/modules/module-roc-source.c
+++ b/src/modules/module-roc-source.c
@@ -29,10 +29,9 @@
 
 #include "config.h"
 
-#include <pipewire/pipewire.h>
-#include <pipewire/private.h>
-#include <spa/param/audio/format-utils.h>
 #include <spa/utils/hook.h>
+#include <spa/utils/result.h>
+#include <spa/param/audio/format-utils.h>
 
 #include <roc/config.h>
 #include <roc/log.h>
@@ -40,6 +39,9 @@
 #include <roc/log.h>
 #include <roc/receiver.h>
 
+#include <pipewire/pipewire.h>
+#include <pipewire/impl.h>
+
 #include "module-roc/common.h"
 
 /** \page page_module_roc_source PipeWire Module: ROC source
diff --git a/src/modules/module-rtp-sink.c b/src/modules/module-rtp-sink.c
index 7d3795935..eb6e6b48c 100644
--- a/src/modules/module-rtp-sink.c
+++ b/src/modules/module-rtp-sink.c
@@ -35,14 +35,15 @@
 #include <net/if.h>
 #include <ctype.h>
 
-#include <spa/param/audio/format-utils.h>
 #include <spa/utils/hook.h>
+#include <spa/utils/result.h>
 #include <spa/utils/ringbuffer.h>
 #include <spa/utils/json.h>
+#include <spa/param/audio/format-utils.h>
 #include <spa/debug/types.h>
 
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
+#include <pipewire/impl.h>
 
 #include <module-rtp/sap.h>
 #include <module-rtp/rtp.h>
diff --git a/src/modules/module-rtp-source.c b/src/modules/module-rtp-source.c
index 6d1443e6c..7b144244f 100644
--- a/src/modules/module-rtp-source.c
+++ b/src/modules/module-rtp-source.c
@@ -34,14 +34,15 @@
 #include <net/if.h>
 #include <ctype.h>
 
-#include <spa/param/audio/format-utils.h>
 #include <spa/utils/hook.h>
+#include <spa/utils/result.h>
 #include <spa/utils/ringbuffer.h>
 #include <spa/utils/dll.h>
+#include <spa/param/audio/format-utils.h>
 #include <spa/debug/mem.h>
 
 #include <pipewire/pipewire.h>
-#include <pipewire/private.h>
+#include <pipewire/impl.h>
 
 #include <module-rtp/sap.h>
 #include <module-rtp/rtp.h>
diff --git a/src/modules/module-x11-bell.c b/src/modules/module-x11-bell.c
index cc0c2c8d5..908f397cd 100644
--- a/src/modules/module-x11-bell.c
+++ b/src/modules/module-x11-bell.c
@@ -46,7 +46,6 @@
 
 #include <pipewire/pipewire.h>
 #include <pipewire/impl.h>
-#include <pipewire/private.h>
 
 /** \page page_module_x11_bell PipeWire Module: X11 Bell
  *
diff --git a/src/modules/module-zeroconf-discover.c b/src/modules/module-zeroconf-discover.c
index ae7f1f242..5e7436f77 100644
--- a/src/modules/module-zeroconf-discover.c
+++ b/src/modules/module-zeroconf-discover.c
@@ -35,9 +35,9 @@
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
+#include <spa/param/audio/format-utils.h>
 
 #include <pipewire/impl.h>
-#include <pipewire/private.h>
 #include <pipewire/i18n.h>
 
 #include <avahi-client/lookup.h>
diff --git a/src/pipewire/impl-node.h b/src/pipewire/impl-node.h
index 7ef741f0f..978a6d26d 100644
--- a/src/pipewire/impl-node.h
+++ b/src/pipewire/impl-node.h
@@ -175,6 +175,10 @@ bool pw_impl_node_is_active(struct pw_impl_node *node);
 
 /** Check if a node is active, Since 0.3.39 */
 int pw_impl_node_send_command(struct pw_impl_node *node, const struct spa_command *command);
+
+/** Set a param on the node, Since 0.3.65 */
+int pw_impl_node_set_param(struct pw_impl_node *node,
+		uint32_t id, uint32_t flags, const struct spa_pod *param);
 /**
  * \}
  */
diff --git a/src/pipewire/private.h b/src/pipewire/private.h
index 8a8d31eb4..e60a23ee1 100644
--- a/src/pipewire/private.h
+++ b/src/pipewire/private.h
@@ -1245,8 +1245,6 @@ int pw_impl_port_recalc_latency(struct pw_impl_port *port);
 /** Change the state of the node */
 int pw_impl_node_set_state(struct pw_impl_node *node, enum pw_node_state state);
 
-int pw_impl_node_set_param(struct pw_impl_node *node,
-		uint32_t id, uint32_t flags, const struct spa_pod *param);
 
 int pw_impl_node_update_ports(struct pw_impl_node *node);