diff --git a/src/modules/module-autolink.c b/src/modules/module-autolink.c
index 1a1faf962..a468dd565 100644
--- a/src/modules/module-autolink.c
+++ b/src/modules/module-autolink.c
@@ -23,8 +23,10 @@
 
 #include "config.h"
 
-#include "pipewire/interfaces.h"
 #include "pipewire/core.h"
+#include "pipewire/interfaces.h"
+#include "pipewire/link.h"
+#include "pipewire/log.h"
 #include "pipewire/module.h"
 
 struct impl {
diff --git a/src/modules/module-client-node.c b/src/modules/module-client-node.c
index 83dd1cc53..05c437fac 100644
--- a/src/modules/module-client-node.c
+++ b/src/modules/module-client-node.c
@@ -24,8 +24,9 @@
 
 #include "config.h"
 
-#include "pipewire/interfaces.h"
 #include "pipewire/core.h"
+#include "pipewire/interfaces.h"
+#include "pipewire/log.h"
 #include "pipewire/module.h"
 
 #include "module-client-node/client-node.h"
diff --git a/src/modules/module-flatpak.c b/src/modules/module-flatpak.c
index 467fd02a2..68c478d43 100644
--- a/src/modules/module-flatpak.c
+++ b/src/modules/module-flatpak.c
@@ -29,11 +29,12 @@
 
 #include <dbus/dbus.h>
 
-#include "pipewire/interfaces.h"
-#include "pipewire/utils.h"
-
 #include "pipewire/core.h"
+#include "pipewire/interfaces.h"
+#include "pipewire/link.h"
+#include "pipewire/log.h"
 #include "pipewire/module.h"
+#include "pipewire/utils.h"
 
 struct impl {
 	struct pw_core *core;
diff --git a/src/modules/module-mixer.c b/src/modules/module-mixer.c
index 9f281e28e..e3e30f646 100644
--- a/src/modules/module-mixer.c
+++ b/src/modules/module-mixer.c
@@ -25,7 +25,10 @@
 #include "config.h"
 
 #include "pipewire/core.h"
+#include "pipewire/link.h"
+#include "pipewire/log.h"
 #include "pipewire/module.h"
+#include "pipewire/type.h"
 #include "modules/spa/spa-node.h"
 
 #define AUDIOMIXER_LIB "audiomixer/libspa-audiomixer"
diff --git a/src/modules/module-suspend-on-idle.c b/src/modules/module-suspend-on-idle.c
index a035f04f2..0147c6873 100644
--- a/src/modules/module-suspend-on-idle.c
+++ b/src/modules/module-suspend-on-idle.c
@@ -24,6 +24,8 @@
 #include "config.h"
 
 #include "pipewire/core.h"
+#include "pipewire/log.h"
+#include "pipewire/type.h"
 #include "pipewire/module.h"
 
 struct impl {
diff --git a/src/modules/spa/module-monitor.c b/src/modules/spa/module-monitor.c
index a61dd6c0f..403a0e888 100644
--- a/src/modules/spa/module-monitor.c
+++ b/src/modules/spa/module-monitor.c
@@ -28,6 +28,7 @@
 #include <spa/lib/props.h>
 
 #include <pipewire/utils.h>
+#include <pipewire/log.h>
 #include <pipewire/core.h>
 #include <pipewire/module.h>
 
diff --git a/src/modules/spa/module-node-factory.c b/src/modules/spa/module-node-factory.c
index 72470235d..9b9d2863c 100644
--- a/src/modules/spa/module-node-factory.c
+++ b/src/modules/spa/module-node-factory.c
@@ -26,6 +26,7 @@
 
 #include "pipewire/interfaces.h"
 #include "pipewire/core.h"
+#include "pipewire/log.h"
 #include "pipewire/module.h"
 
 #include "spa-node.h"
diff --git a/src/modules/spa/module-node.c b/src/modules/spa/module-node.c
index c59ece896..653e87baa 100644
--- a/src/modules/spa/module-node.c
+++ b/src/modules/spa/module-node.c
@@ -27,9 +27,10 @@
 
 #include <spa/lib/props.h>
 
-#include <pipewire/utils.h>
 #include <pipewire/core.h>
+#include <pipewire/log.h>
 #include <pipewire/module.h>
+#include <pipewire/utils.h>
 
 #include "spa-monitor.h"
 #include "spa-node.h"
diff --git a/src/modules/spa/spa-monitor.c b/src/modules/spa/spa-monitor.c
index 14ee6b527..39c1b2317 100644
--- a/src/modules/spa/spa-monitor.c
+++ b/src/modules/spa/spa-monitor.c
@@ -32,6 +32,7 @@
 #include <spa/pod-iter.h>
 
 #include <pipewire/log.h>
+#include <pipewire/type.h>
 #include <pipewire/node.h>
 
 #include "spa-monitor.h"
diff --git a/src/modules/spa/spa-node.h b/src/modules/spa/spa-node.h
index b39a1966a..c21c487fa 100644
--- a/src/modules/spa/spa-node.h
+++ b/src/modules/spa/spa-node.h
@@ -20,6 +20,9 @@
 #ifndef __PIPEWIRE_SPA_NODE_H__
 #define __PIPEWIRE_SPA_NODE_H__
 
+#include <spa/clock.h>
+#include <spa/node.h>
+
 #include <pipewire/core.h>
 #include <pipewire/node.h>
 
diff --git a/src/pipewire/client.h b/src/pipewire/client.h
index 79460dbf7..a18d91aa8 100644
--- a/src/pipewire/client.h
+++ b/src/pipewire/client.h
@@ -30,6 +30,8 @@ extern "C" {
 
 #include <sys/socket.h>
 
+#include <spa/hook.h>
+
 /** \class pw_client
  *
  * \brief PipeWire client object class.
@@ -43,6 +45,7 @@ extern "C" {
 struct pw_client;
 
 #include <pipewire/core.h>
+#include <pipewire/global.h>
 #include <pipewire/introspect.h>
 #include <pipewire/properties.h>
 #include <pipewire/resource.h>
diff --git a/src/pipewire/core.h b/src/pipewire/core.h
index a4f7508ea..f6b9a782e 100644
--- a/src/pipewire/core.h
+++ b/src/pipewire/core.h
@@ -24,8 +24,8 @@
 extern "C" {
 #endif
 
-#include <spa/log.h>
 #include <spa/hook.h>
+#include <spa/format.h>
 
 /** \class pw_core
  *
@@ -38,13 +38,14 @@ extern "C" {
  */
 struct pw_core;
 
-#include <pipewire/type.h>
-#include <pipewire/loop.h>
-#include <pipewire/global.h>
 #include <pipewire/client.h>
-#include <pipewire/port.h>
-#include <pipewire/node.h>
+#include <pipewire/global.h>
+#include <pipewire/introspect.h>
+#include <pipewire/loop.h>
 #include <pipewire/node-factory.h>
+#include <pipewire/port.h>
+#include <pipewire/properties.h>
+#include <pipewire/type.h>
 
 /** \page page_server_api Server API
  *
diff --git a/src/pipewire/data-loop.h b/src/pipewire/data-loop.h
index c1f047b65..54a078ea7 100644
--- a/src/pipewire/data-loop.h
+++ b/src/pipewire/data-loop.h
@@ -24,6 +24,8 @@
 extern "C" {
 #endif
 
+#include <spa/hook.h>
+
 /** \class pw_data_loop
  *
  * PipeWire rt-loop object.
@@ -31,6 +33,7 @@ extern "C" {
 struct pw_data_loop;
 
 #include <pipewire/loop.h>
+#include <pipewire/properties.h>
 
 struct pw_data_loop_events {
 #define PW_VERSION_DATA_LOOP_EVENTS		0
diff --git a/src/pipewire/global.h b/src/pipewire/global.h
index fdd781e44..71057d100 100644
--- a/src/pipewire/global.h
+++ b/src/pipewire/global.h
@@ -24,10 +24,6 @@
 extern "C" {
 #endif
 
-#include <spa/log.h>
-#include <spa/hook.h>
-
-struct pw_global;
 /** \page page_global Global
  *
  * Global objects represent resources that are available on the server and
@@ -52,12 +48,8 @@ struct pw_global;
  */
 struct pw_global;
 
-#include <pipewire/type.h>
-#include <pipewire/loop.h>
+#include <pipewire/core.h>
 #include <pipewire/client.h>
-#include <pipewire/port.h>
-#include <pipewire/node.h>
-#include <pipewire/node-factory.h>
 
 typedef int (*pw_bind_func_t) (struct pw_global *global,	/**< the global to bind */
 			       struct pw_client *client,	/**< client that binds */
diff --git a/src/pipewire/interfaces.h b/src/pipewire/interfaces.h
index 2f59524f6..cea9ec04c 100644
--- a/src/pipewire/interfaces.h
+++ b/src/pipewire/interfaces.h
@@ -30,11 +30,8 @@ extern "C" {
 #include <spa/param-alloc.h>
 #include <spa/node.h>
 
-#include <pipewire/type.h>
 #include <pipewire/introspect.h>
 #include <pipewire/proxy.h>
-#include <pipewire/remote.h>
-#include <pipewire/core.h>
 
 struct pw_core_proxy;
 struct pw_registry_proxy;
diff --git a/src/pipewire/link.h b/src/pipewire/link.h
index e0a2ece66..f7b0880d2 100644
--- a/src/pipewire/link.h
+++ b/src/pipewire/link.h
@@ -24,21 +24,15 @@
 extern "C" {
 #endif
 
-#include <spa/ringbuffer.h>
-
 /** \class pw_link
  *
  * PipeWire link interface.
  */
 struct pw_link;
 
-#include <pipewire/mem.h>
-#include <pipewire/introspect.h>
-
-#include <pipewire/type.h>
 #include <pipewire/core.h>
+#include <pipewire/introspect.h>
 #include <pipewire/port.h>
-#include <pipewire/main-loop.h>
 
 #define PW_TYPE__Link             PW_TYPE_OBJECT_BASE "Link"
 #define PW_TYPE_LINK_BASE         PW_TYPE__Link ":"
diff --git a/src/pipewire/log.h b/src/pipewire/log.h
index 719dbbe63..d2865f295 100644
--- a/src/pipewire/log.h
+++ b/src/pipewire/log.h
@@ -21,7 +21,6 @@
 #define __PIPEWIRE_LOG_H__
 
 #include <spa/log.h>
-#include <spa/loop.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/pipewire/main-loop.h b/src/pipewire/main-loop.h
index b701baed0..8bc516fc2 100644
--- a/src/pipewire/main-loop.h
+++ b/src/pipewire/main-loop.h
@@ -34,6 +34,7 @@ extern "C" {
 struct pw_main_loop;
 
 #include <pipewire/loop.h>
+#include <pipewire/properties.h>
 
 struct pw_main_loop_events {
 #define PW_VERSION_MAIN_LOOP_EVENTS	0
diff --git a/src/pipewire/map.h b/src/pipewire/map.h
index 82553ba40..6f531e9ae 100644
--- a/src/pipewire/map.h
+++ b/src/pipewire/map.h
@@ -28,7 +28,6 @@ extern "C" {
 
 #include <spa/defs.h>
 #include <pipewire/array.h>
-#include <pipewire/log.h>
 
 /** \class pw_map
  *
diff --git a/src/pipewire/module.h b/src/pipewire/module.h
index 8c1d8ee6c..1cbfe5ad8 100644
--- a/src/pipewire/module.h
+++ b/src/pipewire/module.h
@@ -25,6 +25,8 @@
 extern "C" {
 #endif
 
+#include <spa/hook.h>
+
 #include <pipewire/core.h>
 
 #define PW_TYPE__Module           PW_TYPE_OBJECT_BASE "Module"
diff --git a/src/pipewire/node-factory.h b/src/pipewire/node-factory.h
index c7aca63f2..a01e10339 100644
--- a/src/pipewire/node-factory.h
+++ b/src/pipewire/node-factory.h
@@ -36,6 +36,9 @@ extern "C" {
 struct pw_node_factory;
 
 #include <pipewire/core.h>
+#include <pipewire/client.h>
+#include <pipewire/global.h>
+#include <pipewire/properties.h>
 #include <pipewire/resource.h>
 
 struct pw_node_factory_implementation {
diff --git a/src/pipewire/node.c b/src/pipewire/node.c
index 478801495..3f308e4a0 100644
--- a/src/pipewire/node.c
+++ b/src/pipewire/node.c
@@ -22,6 +22,8 @@
 #include <stdio.h>
 #include <errno.h>
 
+#include <spa/clock.h>
+
 #include "pipewire/pipewire.h"
 #include "pipewire/interfaces.h"
 #include "pipewire/private.h"
diff --git a/src/pipewire/node.h b/src/pipewire/node.h
index 7d0091c59..7e5dc4532 100644
--- a/src/pipewire/node.h
+++ b/src/pipewire/node.h
@@ -27,9 +27,6 @@ extern "C" {
 #define PW_TYPE__Node                          PW_TYPE_OBJECT_BASE "Node"
 #define PW_TYPE_NODE_BASE                      PW_TYPE__Node ":"
 
-#include <spa/clock.h>
-#include <spa/node.h>
-
 /** \page page_node Node
  *
  * \section page_node_overview Overview
@@ -44,14 +41,10 @@ extern "C" {
  */
 struct pw_node;
 
-#include <pipewire/mem.h>
-#include <pipewire/introspect.h>
-
 #include <pipewire/core.h>
+#include <pipewire/global.h>
+#include <pipewire/introspect.h>
 #include <pipewire/port.h>
-#include <pipewire/link.h>
-#include <pipewire/client.h>
-#include <pipewire/data-loop.h>
 #include <pipewire/resource.h>
 
 struct pw_node_implementation {
diff --git a/src/pipewire/port.h b/src/pipewire/port.h
index 814c682fd..144b53244 100644
--- a/src/pipewire/port.h
+++ b/src/pipewire/port.h
@@ -27,6 +27,10 @@ extern "C" {
 #define PW_TYPE__Port                          "PipeWire:Object:Port"
 #define PW_TYPE_PORT_BASE                      PW_TYPE__Port ":"
 
+#include <spa/hook.h>
+#include <spa/node.h>
+#include <spa/buffer.h>
+
 /** \page page_port Port
  *
  * \section page_node_overview Overview
@@ -39,14 +43,8 @@ extern "C" {
  */
 struct pw_port;
 
-#include <spa/node.h>
-
-#include <pipewire/utils.h>
-#include <pipewire/introspect.h>
-#include <pipewire/mem.h>
-
 #include <pipewire/core.h>
-#include <pipewire/link.h>
+#include <pipewire/introspect.h>
 #include <pipewire/node.h>
 
 enum pw_port_state {
diff --git a/src/pipewire/private.h b/src/pipewire/private.h
index cc21c4524..6e38686ab 100644
--- a/src/pipewire/private.h
+++ b/src/pipewire/private.h
@@ -27,6 +27,7 @@ extern "C" {
 #include <sys/socket.h>
 #include <spa/graph-scheduler3.h>
 
+#include "pipewire/mem.h"
 #include "pipewire/pipewire.h"
 #include "pipewire/introspect.h"
 
diff --git a/src/pipewire/protocol.h b/src/pipewire/protocol.h
index c15c7d2d4..d61725eff 100644
--- a/src/pipewire/protocol.h
+++ b/src/pipewire/protocol.h
@@ -24,13 +24,11 @@
 extern "C" {
 #endif
 
-#include <spa/defs.h>
 #include <spa/list.h>
 
-#include <pipewire/type.h>
-#include <pipewire/utils.h>
 #include <pipewire/core.h>
 #include <pipewire/properties.h>
+#include <pipewire/utils.h>
 
 #define PW_TYPE__Protocol               "PipeWire:Protocol"
 #define PW_TYPE_PROTOCOL_BASE           PW_TYPE__Protocol ":"
diff --git a/src/pipewire/proxy.h b/src/pipewire/proxy.h
index aff3bfd04..b790e3f2a 100644
--- a/src/pipewire/proxy.h
+++ b/src/pipewire/proxy.h
@@ -24,7 +24,7 @@
 extern "C" {
 #endif
 
-struct pw_remote;
+#include <spa/hook.h>
 
 /** \page page_proxy Proxy
  *
@@ -86,9 +86,6 @@ struct pw_remote;
  */
 struct pw_proxy;
 
-#include <pipewire/utils.h>
-#include <pipewire/core.h>
-#include <pipewire/client.h>
 #include <pipewire/protocol.h>
 
 struct pw_proxy_events {
diff --git a/src/pipewire/remote.h b/src/pipewire/remote.h
index e346d1431..8ffab1c2e 100644
--- a/src/pipewire/remote.h
+++ b/src/pipewire/remote.h
@@ -24,6 +24,8 @@
 extern "C" {
 #endif
 
+#include <spa/hook.h>
+
 /** \page page_remote_api Remote API
  *
  * \section sec_remote_api_overview Overview
@@ -98,13 +100,10 @@ extern "C" {
  */
 struct pw_remote;
 
-#include <pipewire/map.h>
-#include <pipewire/loop.h>
+#include <pipewire/core.h>
 #include <pipewire/properties.h>
 #include <pipewire/protocol.h>
 #include <pipewire/proxy.h>
-#include <pipewire/type.h>
-#include <pipewire/core.h>
 
 /** \enum pw_remote_state The state of a \ref pw_remote \memberof pw_remote */
 enum pw_remote_state {
diff --git a/src/pipewire/resource.h b/src/pipewire/resource.h
index a672d2ac4..88b7646ac 100644
--- a/src/pipewire/resource.h
+++ b/src/pipewire/resource.h
@@ -27,7 +27,7 @@ extern "C" {
 #define PW_TYPE__Resource                            "PipeWire:Object:Resource"
 #define PW_TYPE_RESOURCE_BASE                        PW_TYPE__Resource ":"
 
-#include <spa/list.h>
+#include <spa/hook.h>
 
 /** \page page_resource Resource
  *
@@ -56,8 +56,6 @@ extern "C" {
  */
 struct pw_resource;
 
-#include <pipewire/utils.h>
-#include <pipewire/core.h>
 #include <pipewire/client.h>
 
 struct pw_resource_events {
diff --git a/src/pipewire/thread-loop.h b/src/pipewire/thread-loop.h
index d7c4a28e7..d1d8a48a4 100644
--- a/src/pipewire/thread-loop.h
+++ b/src/pipewire/thread-loop.h
@@ -20,12 +20,12 @@
 #ifndef __PIPEWIRE_THREAD_LOOP_H__
 #define __PIPEWIRE_THREAD_LOOP_H__
 
-#include <pipewire/loop.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include <pipewire/loop.h>
+
 /** \page page_thread_loop Threaded Loop
  *
  * \section sec_thread_loop_overview Overview