diff --git a/spa/plugins/alsa/alsa-acp-device.c b/spa/plugins/alsa/alsa-acp-device.c
index 8e71ebc86..a94b28d0f 100644
--- a/spa/plugins/alsa/alsa-acp-device.c
+++ b/spa/plugins/alsa/alsa-acp-device.c
@@ -31,11 +31,12 @@
 
 #include <alsa/asoundlib.h>
 
-#include <spa/utils/type.h>
 #include <spa/node/node.h>
+#include <spa/utils/type.h>
 #include <spa/utils/keys.h>
 #include <spa/utils/names.h>
 #include <spa/utils/string.h>
+#include <spa/support/log.h>
 #include <spa/support/loop.h>
 #include <spa/support/plugin.h>
 #include <spa/support/i18n.h>
diff --git a/spa/plugins/alsa/alsa-pcm-device.c b/spa/plugins/alsa/alsa-pcm-device.c
index 0a29f150c..1664e38f5 100644
--- a/spa/plugins/alsa/alsa-pcm-device.c
+++ b/spa/plugins/alsa/alsa-pcm-device.c
@@ -31,11 +31,12 @@
 
 #include <alsa/asoundlib.h>
 
-#include <spa/utils/type.h>
 #include <spa/node/node.h>
+#include <spa/utils/type.h>
 #include <spa/utils/keys.h>
 #include <spa/utils/names.h>
 #include <spa/utils/string.h>
+#include <spa/support/log.h>
 #include <spa/support/loop.h>
 #include <spa/support/plugin.h>
 #include <spa/monitor/device.h>
diff --git a/spa/plugins/alsa/alsa-pcm-sink.c b/spa/plugins/alsa/alsa-pcm-sink.c
index 260550305..a8c40b17f 100644
--- a/spa/plugins/alsa/alsa-pcm-sink.c
+++ b/spa/plugins/alsa/alsa-pcm-sink.c
@@ -35,7 +35,6 @@
 #include <spa/utils/string.h>
 #include <spa/param/audio/format.h>
 #include <spa/pod/filter.h>
-#include <spa/debug/pod.h>
 
 #include "alsa-pcm.h"
 
diff --git a/spa/plugins/audioconvert/audioconvert.c b/spa/plugins/audioconvert/audioconvert.c
index 783ab8174..970df16be 100644
--- a/spa/plugins/audioconvert/audioconvert.c
+++ b/spa/plugins/audioconvert/audioconvert.c
@@ -44,7 +44,6 @@
 #include <spa/param/latency-utils.h>
 #include <spa/pod/filter.h>
 #include <spa/debug/types.h>
-#include <spa/debug/pod.h>
 
 #include "volume-ops.h"
 #include "fmt-ops.h"
diff --git a/spa/plugins/avb/avb-pcm-sink.c b/spa/plugins/avb/avb-pcm-sink.c
index 0a102480c..f453494e7 100644
--- a/spa/plugins/avb/avb-pcm-sink.c
+++ b/spa/plugins/avb/avb-pcm-sink.c
@@ -33,7 +33,6 @@
 #include <spa/utils/string.h>
 #include <spa/param/audio/format.h>
 #include <spa/pod/filter.h>
-#include <spa/debug/pod.h>
 
 #include "avb-pcm.h"
 
diff --git a/spa/plugins/avb/avb-pcm-source.c b/spa/plugins/avb/avb-pcm-source.c
index e7891a1a8..9ff9b21be 100644
--- a/spa/plugins/avb/avb-pcm-source.c
+++ b/spa/plugins/avb/avb-pcm-source.c
@@ -33,7 +33,6 @@
 #include <spa/utils/string.h>
 #include <spa/param/audio/format.h>
 #include <spa/pod/filter.h>
-#include <spa/debug/pod.h>
 
 #include "avb-pcm.h"
 
diff --git a/spa/plugins/libcamera/libcamera-device.cpp b/spa/plugins/libcamera/libcamera-device.cpp
index 0edd1a33c..ff206a4f1 100644
--- a/spa/plugins/libcamera/libcamera-device.cpp
+++ b/spa/plugins/libcamera/libcamera-device.cpp
@@ -44,7 +44,7 @@
 #include <spa/pod/builder.h>
 #include <spa/monitor/device.h>
 #include <spa/monitor/utils.h>
-#include <spa/debug/pod.h>
+#include <spa/param/param.h>
 
 #include "libcamera.h"
 #include "libcamera-manager.hpp"
diff --git a/spa/plugins/libcamera/libcamera-source.cpp b/spa/plugins/libcamera/libcamera-source.cpp
index f6f20c827..d2ca67054 100644
--- a/spa/plugins/libcamera/libcamera-source.cpp
+++ b/spa/plugins/libcamera/libcamera-source.cpp
@@ -49,8 +49,8 @@
 #include <spa/node/keys.h>
 #include <spa/param/video/format-utils.h>
 #include <spa/param/param.h>
+#include <spa/control/control.h>
 #include <spa/pod/filter.h>
-#include <spa/debug/pod.h>
 
 #include <libcamera/camera.h>
 #include <libcamera/stream.h>
diff --git a/spa/plugins/v4l2/v4l2-device.c b/spa/plugins/v4l2/v4l2-device.c
index c919098bc..53fb03303 100644
--- a/spa/plugins/v4l2/v4l2-device.c
+++ b/spa/plugins/v4l2/v4l2-device.c
@@ -39,7 +39,7 @@
 #include <spa/pod/builder.h>
 #include <spa/monitor/device.h>
 #include <spa/monitor/utils.h>
-#include <spa/debug/pod.h>
+#include <spa/param/param.h>
 
 #include "v4l2.h"
 
diff --git a/spa/plugins/v4l2/v4l2-source.c b/spa/plugins/v4l2/v4l2-source.c
index cd859463c..b6eae4901 100644
--- a/spa/plugins/v4l2/v4l2-source.c
+++ b/spa/plugins/v4l2/v4l2-source.c
@@ -45,7 +45,7 @@
 #include <spa/param/param.h>
 #include <spa/param/latency-utils.h>
 #include <spa/pod/filter.h>
-#include <spa/debug/pod.h>
+#include <spa/control/control.h>
 
 #include "v4l2.h"
 
diff --git a/src/modules/module-adapter/adapter.c b/src/modules/module-adapter/adapter.c
index 828cdd5b6..65435942c 100644
--- a/src/modules/module-adapter/adapter.c
+++ b/src/modules/module-adapter/adapter.c
@@ -42,7 +42,6 @@
 #include <spa/param/audio/format-utils.h>
 #include <spa/param/format-utils.h>
 #include <spa/debug/types.h>
-#include <spa/debug/pod.h>
 #include <spa/utils/json-pod.h>
 
 #include "pipewire/pipewire.h"
diff --git a/src/modules/module-echo-cancel.c b/src/modules/module-echo-cancel.c
index ac803e633..695b31657 100644
--- a/src/modules/module-echo-cancel.c
+++ b/src/modules/module-echo-cancel.c
@@ -38,7 +38,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <spa/debug/pod.h>
+#include <spa/debug/types.h>
 #include <spa/param/audio/format-utils.h>
 #include <spa/param/audio/raw.h>
 #include <spa/param/profiler.h>
diff --git a/src/modules/module-example-sink.c b/src/modules/module-example-sink.c
index 5d8fe1c6e..b8eadb26c 100644
--- a/src/modules/module-example-sink.c
+++ b/src/modules/module-example-sink.c
@@ -40,7 +40,7 @@
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
 #include <spa/utils/ringbuffer.h>
-#include <spa/debug/pod.h>
+#include <spa/debug/types.h>
 #include <spa/pod/builder.h>
 #include <spa/param/audio/format-utils.h>
 #include <spa/param/audio/raw.h>
diff --git a/src/modules/module-example-source.c b/src/modules/module-example-source.c
index ccf6f388b..b8ad61d71 100644
--- a/src/modules/module-example-source.c
+++ b/src/modules/module-example-source.c
@@ -40,7 +40,7 @@
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
 #include <spa/utils/ringbuffer.h>
-#include <spa/debug/pod.h>
+#include <spa/debug/types.h>
 #include <spa/pod/builder.h>
 #include <spa/param/audio/format-utils.h>
 #include <spa/param/audio/raw.h>
diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c
index 94f102d29..b7faac098 100644
--- a/src/modules/module-filter-chain.c
+++ b/src/modules/module-filter-chain.c
@@ -41,7 +41,7 @@
 #include <spa/support/cpu.h>
 #include <spa/param/profiler.h>
 #include <spa/pod/dynamic.h>
-#include <spa/debug/pod.h>
+#include <spa/debug/types.h>
 
 #include <pipewire/utils.h>
 #include <pipewire/private.h>
diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c
index 0c61e86e4..243e4c4ad 100644
--- a/src/modules/module-loopback.c
+++ b/src/modules/module-loopback.c
@@ -37,7 +37,7 @@
 #include <spa/utils/json.h>
 #include <spa/utils/ringbuffer.h>
 #include <spa/param/profiler.h>
-#include <spa/debug/pod.h>
+#include <spa/debug/types.h>
 
 #include <pipewire/private.h>
 #include <pipewire/impl.h>
diff --git a/src/modules/module-pipe-tunnel.c b/src/modules/module-pipe-tunnel.c
index 1df9f8399..ca0ee5ac5 100644
--- a/src/modules/module-pipe-tunnel.c
+++ b/src/modules/module-pipe-tunnel.c
@@ -42,7 +42,7 @@
 #include <spa/utils/json.h>
 #include <spa/utils/ringbuffer.h>
 #include <spa/utils/dll.h>
-#include <spa/debug/pod.h>
+#include <spa/debug/types.h>
 #include <spa/pod/builder.h>
 #include <spa/param/audio/format-utils.h>
 #include <spa/param/latency-utils.h>
diff --git a/src/modules/module-profiler.c b/src/modules/module-profiler.c
index b32b9bc26..e519e0871 100644
--- a/src/modules/module-profiler.c
+++ b/src/modules/module-profiler.c
@@ -35,7 +35,6 @@
 #include <spa/utils/result.h>
 #include <spa/utils/ringbuffer.h>
 #include <spa/param/profiler.h>
-#include <spa/debug/pod.h>
 
 #include <pipewire/private.h>
 #include <pipewire/impl.h>
diff --git a/src/modules/module-protocol-native/v0/protocol-native.c b/src/modules/module-protocol-native/v0/protocol-native.c
index 65e055c16..d6173acb9 100644
--- a/src/modules/module-protocol-native/v0/protocol-native.c
+++ b/src/modules/module-protocol-native/v0/protocol-native.c
@@ -27,7 +27,7 @@
 
 #include "spa/pod/parser.h"
 #include "spa/pod/builder.h"
-#include "spa/debug/pod.h"
+#include "spa/debug/types.h"
 #include "spa/utils/string.h"
 
 #include "pipewire/pipewire.h"
diff --git a/src/modules/module-pulse-tunnel.c b/src/modules/module-pulse-tunnel.c
index 844ab2bca..e2fe8b630 100644
--- a/src/modules/module-pulse-tunnel.c
+++ b/src/modules/module-pulse-tunnel.c
@@ -41,7 +41,7 @@
 #include <spa/utils/json.h>
 #include <spa/utils/ringbuffer.h>
 #include <spa/utils/dll.h>
-#include <spa/debug/pod.h>
+#include <spa/debug/types.h>
 #include <spa/pod/builder.h>
 #include <spa/param/audio/format-utils.h>
 #include <spa/param/latency-utils.h>
diff --git a/src/modules/module-raop-sink.c b/src/modules/module-raop-sink.c
index 4578411d1..bb634b5b3 100644
--- a/src/modules/module-raop-sink.c
+++ b/src/modules/module-raop-sink.c
@@ -50,7 +50,7 @@
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
 #include <spa/utils/ringbuffer.h>
-#include <spa/debug/pod.h>
+#include <spa/debug/types.h>
 #include <spa/pod/builder.h>
 #include <spa/param/audio/format-utils.h>
 #include <spa/param/audio/raw.h>
diff --git a/src/modules/module-rtp-sink.c b/src/modules/module-rtp-sink.c
index 8a00848ec..7d3795935 100644
--- a/src/modules/module-rtp-sink.c
+++ b/src/modules/module-rtp-sink.c
@@ -39,7 +39,7 @@
 #include <spa/utils/hook.h>
 #include <spa/utils/ringbuffer.h>
 #include <spa/utils/json.h>
-#include <spa/debug/pod.h>
+#include <spa/debug/types.h>
 
 #include <pipewire/pipewire.h>
 #include <pipewire/private.h>
diff --git a/src/pipewire/buffers.c b/src/pipewire/buffers.c
index 3499805ee..c3cd7d8b2 100644
--- a/src/pipewire/buffers.c
+++ b/src/pipewire/buffers.c
@@ -27,10 +27,6 @@
 #include <spa/param/param.h>
 #include <spa/buffer/alloc.h>
 
-#include <spa/debug/node.h>
-#include <spa/debug/pod.h>
-#include <spa/debug/format.h>
-
 #include "pipewire/keys.h"
 #include "pipewire/private.h"
 
diff --git a/src/pipewire/context.c b/src/pipewire/context.c
index 384682701..6ba6488f5 100644
--- a/src/pipewire/context.c
+++ b/src/pipewire/context.c
@@ -38,7 +38,6 @@
 #include <spa/node/utils.h>
 #include <spa/utils/names.h>
 #include <spa/utils/string.h>
-#include <spa/debug/format.h>
 #include <spa/debug/types.h>
 
 #include <pipewire/impl.h>
diff --git a/src/pipewire/filter.c b/src/pipewire/filter.c
index cc18606b9..4ddf08104 100644
--- a/src/pipewire/filter.c
+++ b/src/pipewire/filter.c
@@ -36,9 +36,7 @@
 #include <spa/utils/string.h>
 #include <spa/pod/filter.h>
 #include <spa/pod/dynamic.h>
-#include <spa/debug/format.h>
 #include <spa/debug/types.h>
-#include <spa/debug/pod.h>
 
 #include "pipewire/pipewire.h"
 #include "pipewire/filter.h"
diff --git a/src/pipewire/impl-link.c b/src/pipewire/impl-link.c
index f121ce83a..f77372894 100644
--- a/src/pipewire/impl-link.c
+++ b/src/pipewire/impl-link.c
@@ -31,14 +31,11 @@
 #include <spa/pod/parser.h>
 #include <spa/pod/compare.h>
 #include <spa/param/param.h>
+#include <spa/debug/types.h>
 
 #include "pipewire/impl-link.h"
 #include "pipewire/private.h"
 
-#include <spa/debug/node.h>
-#include <spa/debug/pod.h>
-#include <spa/debug/format.h>
-
 PW_LOG_TOPIC_EXTERN(log_link);
 #define PW_LOG_TOPIC_DEFAULT log_link
 
diff --git a/src/pipewire/stream.c b/src/pipewire/stream.c
index 6bd435db9..13893b299 100644
--- a/src/pipewire/stream.c
+++ b/src/pipewire/stream.c
@@ -30,14 +30,13 @@
 
 #include <spa/buffer/alloc.h>
 #include <spa/param/props.h>
+#include <spa/param/format-utils.h>
 #include <spa/node/io.h>
 #include <spa/node/utils.h>
 #include <spa/utils/ringbuffer.h>
 #include <spa/pod/filter.h>
 #include <spa/pod/dynamic.h>
-#include <spa/debug/format.h>
 #include <spa/debug/types.h>
-#include <spa/debug/pod.h>
 
 #define PW_ENABLE_DEPRECATED
 
diff --git a/src/tools/pw-cat.c b/src/tools/pw-cat.c
index ba376cd3b..513effcd3 100644
--- a/src/tools/pw-cat.c
+++ b/src/tools/pw-cat.c
@@ -46,7 +46,6 @@
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
 #include <spa/debug/types.h>
-#include <spa/debug/pod.h>
 
 #include <pipewire/pipewire.h>
 #include <pipewire/i18n.h>
diff --git a/src/tools/pw-dot.c b/src/tools/pw-dot.c
index 680bd2488..30eb78039 100644
--- a/src/tools/pw-dot.c
+++ b/src/tools/pw-dot.c
@@ -35,8 +35,6 @@
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
-#include <spa/debug/pod.h>
-#include <spa/debug/format.h>
 #include <spa/debug/types.h>
 
 #include <pipewire/pipewire.h>
diff --git a/src/tools/pw-profiler.c b/src/tools/pw-profiler.c
index 00dc4104a..7ee85bbbf 100644
--- a/src/tools/pw-profiler.c
+++ b/src/tools/pw-profiler.c
@@ -30,7 +30,7 @@
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/pod/parser.h>
-#include <spa/debug/pod.h>
+#include <spa/debug/types.h>
 
 #include <pipewire/impl.h>
 #include <pipewire/extensions/profiler.h>
diff --git a/src/tools/pw-top.c b/src/tools/pw-top.c
index 7574cab90..a20bdf9d3 100644
--- a/src/tools/pw-top.c
+++ b/src/tools/pw-top.c
@@ -31,7 +31,7 @@
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/pod/parser.h>
-#include <spa/debug/pod.h>
+#include <spa/debug/types.h>
 #include <spa/param/format-utils.h>
 #include <spa/param/audio/format-utils.h>
 #include <spa/param/video/format-utils.h>