From 2cec77e7df1a4a6a98b87981d818e0eea727e0fa Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Fri, 30 May 2025 10:15:49 +0100
Subject: [PATCH] *: unify config.h handling

config.h needs to be consistently included before any standard headers
if we ever want to set feature test macros (like _GNU_SOURCE or whatever)
inside. It can lead to hard-to-debug issues without that.

It can also be problematic just for our own HAVE_* that it may define
if it's not consistently made available before our own headers. Just
always include it first, before everything.

We already did this in many files, just not consistently.
---
 spa/plugins/alsa/acp/compat.c                   | 3 ++-
 spa/plugins/alsa/alsa-seq.h                     | 4 ++--
 spa/plugins/bluez5/bluez5-dbus.c                | 3 ++-
 spa/plugins/bluez5/defs.h                       | 4 ++--
 spa/plugins/bluez5/iso-io.c                     | 3 ++-
 spa/plugins/bluez5/midi-enum.c                  | 3 ++-
 spa/plugins/filter-graph/audio-dsp-avx.c        | 3 ++-
 spa/plugins/filter-graph/audio-dsp-c.c          | 3 ++-
 spa/plugins/filter-graph/audio-dsp-sse.c        | 3 ++-
 spa/plugins/filter-graph/filter-graph.c         | 4 ++--
 spa/plugins/v4l2/v4l2-udev.c                    | 3 ++-
 spa/plugins/v4l2/v4l2.c                         | 3 ++-
 src/daemon/pipewire.c                           | 4 ++--
 src/examples/bluez-session.c                    | 4 ++--
 src/modules/module-access.c                     | 4 ++--
 src/modules/module-adapter.c                    | 4 ++--
 src/modules/module-adapter/adapter.c            | 4 ++--
 src/modules/module-avb.c                        | 4 ++--
 src/modules/module-client-device.c              | 4 ++--
 src/modules/module-client-node.c                | 4 ++--
 src/modules/module-combine-stream.c             | 4 ++--
 src/modules/module-example-filter.c             | 4 ++--
 src/modules/module-example-sink.c               | 4 ++--
 src/modules/module-example-source.c             | 4 ++--
 src/modules/module-fallback-sink.c              | 4 ++--
 src/modules/module-ffado-driver.c               | 4 ++--
 src/modules/module-filter-chain.c               | 4 ++--
 src/modules/module-jack-tunnel.c                | 4 ++--
 src/modules/module-jackdbus-detect.c            | 4 ++--
 src/modules/module-link-factory.c               | 4 ++--
 src/modules/module-loopback.c                   | 4 ++--
 src/modules/module-metadata.c                   | 4 ++--
 src/modules/module-netjack2-driver.c            | 4 ++--
 src/modules/module-netjack2-manager.c           | 4 ++--
 src/modules/module-parametric-equalizer.c       | 4 ++--
 src/modules/module-pipe-tunnel.c                | 4 ++--
 src/modules/module-portal.c                     | 4 ++--
 src/modules/module-profiler.c                   | 4 ++--
 src/modules/module-protocol-pulse.c             | 4 ++--
 src/modules/module-protocol-pulse/snap-policy.c | 2 --
 src/modules/module-pulse-tunnel.c               | 4 ++--
 src/modules/module-raop-discover.c              | 4 ++--
 src/modules/module-raop-sink.c                  | 4 ++--
 src/modules/module-roc-sink.c                   | 4 ++--
 src/modules/module-roc-source.c                 | 4 ++--
 src/modules/module-rt.c                         | 4 ++--
 src/modules/module-rtp/stream.c                 | 4 ++--
 src/modules/module-snapcast-discover.c          | 4 ++--
 src/modules/module-spa-device-factory.c         | 4 ++--
 src/modules/module-spa-node-factory.c           | 4 ++--
 src/modules/module-vban/stream.c                | 4 ++--
 src/modules/module-x11-bell.c                   | 4 ++--
 src/modules/module-zeroconf-discover.c          | 4 ++--
 src/pipewire/impl-node.c                        | 4 ++--
 src/tools/pw-cat.c                              | 4 ++--
 test/pwtest.h                                   | 4 ++--
 test/test-functional.c                          | 4 ++--
 57 files changed, 112 insertions(+), 105 deletions(-)

diff --git a/spa/plugins/alsa/acp/compat.c b/spa/plugins/alsa/acp/compat.c
index e2f317b09..050f2ec54 100644
--- a/spa/plugins/alsa/acp/compat.c
+++ b/spa/plugins/alsa/acp/compat.c
@@ -18,13 +18,14 @@
   along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "config.h"
+
 #include <spa/utils/string.h>
 #include <spa/utils/cleanup.h>
 
 #include "compat.h"
 #include "device-port.h"
 #include "alsa-mixer.h"
-#include "config.h"
 
 static const char *port_types[] = {
 	[PA_DEVICE_PORT_TYPE_UNKNOWN] = "unknown",
diff --git a/spa/plugins/alsa/alsa-seq.h b/spa/plugins/alsa/alsa-seq.h
index 3475de834..75fb1b217 100644
--- a/spa/plugins/alsa/alsa-seq.h
+++ b/spa/plugins/alsa/alsa-seq.h
@@ -5,11 +5,11 @@
 #ifndef SPA_ALSA_SEQ_H
 #define SPA_ALSA_SEQ_H
 
+#include "config.h"
+
 #include <stddef.h>
 #include <math.h>
 
-#include "config.h"
-
 #include <alsa/asoundlib.h>
 #ifdef HAVE_ALSA_UMP
 #include <alsa/ump_msg.h>
diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index 04f029ca4..61491056f 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <errno.h>
 #include <stddef.h>
 #include <unistd.h>
@@ -35,7 +37,6 @@
 #include <spa-private/dbus-helpers.h>
 #include <spa/param/audio/raw-json.h>
 
-#include "config.h"
 #include "codec-loader.h"
 #include "player.h"
 #include "iso-io.h"
diff --git a/spa/plugins/bluez5/defs.h b/spa/plugins/bluez5/defs.h
index 7b7922b15..75ddd109c 100644
--- a/spa/plugins/bluez5/defs.h
+++ b/spa/plugins/bluez5/defs.h
@@ -5,6 +5,8 @@
 #ifndef SPA_BLUEZ5_DEFS_H
 #define SPA_BLUEZ5_DEFS_H
 
+#include "config.h"
+
 #include <math.h>
 
 #include <spa/support/dbus.h>
@@ -17,8 +19,6 @@
 
 #include <dbus/dbus.h>
 
-#include "config.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/spa/plugins/bluez5/iso-io.c b/spa/plugins/bluez5/iso-io.c
index 8a0c30ac7..cdfc6ec4f 100644
--- a/spa/plugins/bluez5/iso-io.c
+++ b/spa/plugins/bluez5/iso-io.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2023 Pauli Virtanen. */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <unistd.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -15,7 +17,6 @@
 #include <spa/utils/result.h>
 #include <spa/node/io.h>
 
-#include "config.h"
 #include "iso-io.h"
 
 #include "media-codecs.h"
diff --git a/spa/plugins/bluez5/midi-enum.c b/spa/plugins/bluez5/midi-enum.c
index 9ef7d2bf5..662228032 100644
--- a/spa/plugins/bluez5/midi-enum.c
+++ b/spa/plugins/bluez5/midi-enum.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2022 Pauli Virtanen */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <errno.h>
 #include <stddef.h>
 
@@ -21,7 +23,6 @@
 #include <spa/node/keys.h>
 
 #include "midi.h"
-#include "config.h"
 
 #include "bluez5-interface-gen.h"
 #include "dbus-monitor.h"
diff --git a/spa/plugins/filter-graph/audio-dsp-avx.c b/spa/plugins/filter-graph/audio-dsp-avx.c
index 1509284c7..9b49fb556 100644
--- a/spa/plugins/filter-graph/audio-dsp-avx.c
+++ b/spa/plugins/filter-graph/audio-dsp-avx.c
@@ -2,13 +2,14 @@
 /* SPDX-FileCopyrightText: Copyright © 2022 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
 
 #include <spa/utils/defs.h>
 
-#include "config.h"
 #ifndef HAVE_FFTW
 #include "pffft.h"
 #endif
diff --git a/spa/plugins/filter-graph/audio-dsp-c.c b/spa/plugins/filter-graph/audio-dsp-c.c
index f2a509a76..ee22b481e 100644
--- a/spa/plugins/filter-graph/audio-dsp-c.c
+++ b/spa/plugins/filter-graph/audio-dsp-c.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2022 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
@@ -10,7 +12,6 @@
 
 #include <spa/utils/defs.h>
 
-#include "config.h"
 #ifdef HAVE_FFTW
 #include <fftw3.h>
 #else
diff --git a/spa/plugins/filter-graph/audio-dsp-sse.c b/spa/plugins/filter-graph/audio-dsp-sse.c
index 8c2ffa8e6..59aee8271 100644
--- a/spa/plugins/filter-graph/audio-dsp-sse.c
+++ b/spa/plugins/filter-graph/audio-dsp-sse.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2022 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
@@ -10,7 +12,6 @@
 
 #include <spa/utils/defs.h>
 
-#include "config.h"
 #ifndef HAVE_FFTW
 #include "pffft.h"
 #endif
diff --git a/spa/plugins/filter-graph/filter-graph.c b/spa/plugins/filter-graph/filter-graph.c
index 480452b1e..233f5ea1a 100644
--- a/spa/plugins/filter-graph/filter-graph.c
+++ b/spa/plugins/filter-graph/filter-graph.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -13,8 +15,6 @@
 #include <limits.h>
 #include <math.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/spa/plugins/v4l2/v4l2-udev.c b/spa/plugins/v4l2/v4l2-udev.c
index c45ef06ff..df99f7b4a 100644
--- a/spa/plugins/v4l2/v4l2-udev.c
+++ b/spa/plugins/v4l2/v4l2-udev.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <stddef.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -24,7 +26,6 @@
 #include <spa/monitor/device.h>
 #include <spa/monitor/utils.h>
 
-#include "config.h"
 #include "v4l2.h"
 
 #ifdef HAVE_LOGIND
diff --git a/spa/plugins/v4l2/v4l2.c b/spa/plugins/v4l2/v4l2.c
index 71489320d..e080bf546 100644
--- a/spa/plugins/v4l2/v4l2.c
+++ b/spa/plugins/v4l2/v4l2.c
@@ -2,12 +2,13 @@
 /* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <errno.h>
 
 #include <spa/support/plugin.h>
 #include <spa/support/log.h>
 
-#include "config.h"
 #include "v4l2.h"
 
 extern const struct spa_handle_factory spa_v4l2_source_factory;
diff --git a/src/daemon/pipewire.c b/src/daemon/pipewire.c
index 9193d817b..7d8f185c7 100644
--- a/src/daemon/pipewire.c
+++ b/src/daemon/pipewire.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <limits.h>
 #include <signal.h>
 #include <getopt.h>
@@ -16,8 +18,6 @@
 
 #include <pipewire/i18n.h>
 
-#include "config.h"
-
 static void do_quit(void *data, int signal_number)
 {
 	struct pw_main_loop *loop = data;
diff --git a/src/examples/bluez-session.c b/src/examples/bluez-session.c
index 81f9926a6..2183071ce 100644
--- a/src/examples/bluez-session.c
+++ b/src/examples/bluez-session.c
@@ -8,14 +8,14 @@
  [title]
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <math.h>
 #include <time.h>
 
-#include "config.h"
-
 #include <spa/monitor/device.h>
 #include <spa/node/node.h>
 #include <spa/utils/hook.h>
diff --git a/src/modules/module-access.c b/src/modules/module-access.c
index 05bc14483..26e64f749 100644
--- a/src/modules/module-access.c
+++ b/src/modules/module-access.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -11,8 +13,6 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include "config.h"
-
 #ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
 #endif
diff --git a/src/modules/module-adapter.c b/src/modules/module-adapter.c
index ea913ebad..9f5474a08 100644
--- a/src/modules/module-adapter.c
+++ b/src/modules/module-adapter.c
@@ -2,13 +2,13 @@
 /* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <dlfcn.h>
 
-#include "config.h"
-
 #include <spa/node/node.h>
 #include <spa/utils/hook.h>
 #include <spa/utils/result.h>
diff --git a/src/modules/module-adapter/adapter.c b/src/modules/module-adapter/adapter.c
index 93ba0d305..6d2614f08 100644
--- a/src/modules/module-adapter/adapter.c
+++ b/src/modules/module-adapter/adapter.c
@@ -2,14 +2,14 @@
 /* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <math.h>
 #include <time.h>
 
-#include "config.h"
-
 #include <spa/node/node.h>
 #include <spa/node/utils.h>
 #include <spa/utils/hook.h>
diff --git a/src/modules/module-avb.c b/src/modules/module-avb.c
index b730b17c1..47afb3759 100644
--- a/src/modules/module-avb.c
+++ b/src/modules/module-avb.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2022 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -10,8 +12,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/src/modules/module-client-device.c b/src/modules/module-client-device.c
index 84b8456b2..c02a4058f 100644
--- a/src/modules/module-client-device.c
+++ b/src/modules/module-client-device.c
@@ -2,13 +2,13 @@
 /* SPDX-FileCopyrightText: Copyright © 2019 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <dlfcn.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 
 #include <pipewire/impl.h>
diff --git a/src/modules/module-client-node.c b/src/modules/module-client-node.c
index dc978084d..ea082b33d 100644
--- a/src/modules/module-client-node.c
+++ b/src/modules/module-client-node.c
@@ -2,13 +2,13 @@
 /* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <dlfcn.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 
 #include <pipewire/impl.h>
diff --git a/src/modules/module-combine-stream.c b/src/modules/module-combine-stream.c
index c897e6e14..4591e3e1f 100644
--- a/src/modules/module-combine-stream.c
+++ b/src/modules/module-combine-stream.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2023 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -14,8 +16,6 @@
 #include <limits.h>
 #include <math.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/src/modules/module-example-filter.c b/src/modules/module-example-filter.c
index 5f6268dd8..ccd8c0e01 100644
--- a/src/modules/module-example-filter.c
+++ b/src/modules/module-example-filter.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2023 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -10,8 +12,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/src/modules/module-example-sink.c b/src/modules/module-example-sink.c
index 8014f61f9..b44470f68 100644
--- a/src/modules/module-example-sink.c
+++ b/src/modules/module-example-sink.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -14,8 +16,6 @@
 #include <limits.h>
 #include <math.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/src/modules/module-example-source.c b/src/modules/module-example-source.c
index 47a061891..f04ae1afc 100644
--- a/src/modules/module-example-source.c
+++ b/src/modules/module-example-source.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -14,8 +16,6 @@
 #include <limits.h>
 #include <math.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/src/modules/module-fallback-sink.c b/src/modules/module-fallback-sink.c
index 86982e624..2e949cdb2 100644
--- a/src/modules/module-fallback-sink.c
+++ b/src/modules/module-fallback-sink.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -10,8 +12,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/param/audio/raw.h>
diff --git a/src/modules/module-ffado-driver.c b/src/modules/module-ffado-driver.c
index 1c9c7c590..761e62471 100644
--- a/src/modules/module-ffado-driver.c
+++ b/src/modules/module-ffado-driver.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -14,8 +16,6 @@
 #include <limits.h>
 #include <math.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c
index e04bb1590..8f1b11d16 100644
--- a/src/modules/module-filter-chain.c
+++ b/src/modules/module-filter-chain.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -11,8 +13,6 @@
 #include <dlfcn.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include <spa/param/latency-utils.h>
 #include <spa/param/tag-utils.h>
 #include <spa/param/audio/raw-json.h>
diff --git a/src/modules/module-jack-tunnel.c b/src/modules/module-jack-tunnel.c
index b69ec7704..6c7416941 100644
--- a/src/modules/module-jack-tunnel.c
+++ b/src/modules/module-jack-tunnel.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -14,8 +16,6 @@
 #include <limits.h>
 #include <math.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/src/modules/module-jackdbus-detect.c b/src/modules/module-jackdbus-detect.c
index 23bce1b45..622ca6efe 100644
--- a/src/modules/module-jackdbus-detect.c
+++ b/src/modules/module-jackdbus-detect.c
@@ -3,6 +3,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2019 Red Hat Inc. */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -11,8 +13,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include <dbus/dbus.h>
 
 #include <spa/utils/string.h>
diff --git a/src/modules/module-link-factory.c b/src/modules/module-link-factory.c
index ca2b8a75c..039ed16ff 100644
--- a/src/modules/module-link-factory.c
+++ b/src/modules/module-link-factory.c
@@ -2,13 +2,13 @@
 /* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <dlfcn.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 
diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c
index f4b068be7..a9fa8c4d9 100644
--- a/src/modules/module-loopback.c
+++ b/src/modules/module-loopback.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -10,8 +12,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/src/modules/module-metadata.c b/src/modules/module-metadata.c
index a1255da30..79d80d1b4 100644
--- a/src/modules/module-metadata.c
+++ b/src/modules/module-metadata.c
@@ -2,13 +2,13 @@
 /* SPDX-FileCopyrightText: Copyright © 2019 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <dlfcn.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/json.h>
 
diff --git a/src/modules/module-netjack2-driver.c b/src/modules/module-netjack2-driver.c
index 011052e7b..5cd93b253 100644
--- a/src/modules/module-netjack2-driver.c
+++ b/src/modules/module-netjack2-driver.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -18,8 +20,6 @@
 #include <net/if.h>
 #include <math.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/src/modules/module-netjack2-manager.c b/src/modules/module-netjack2-manager.c
index fe482fd94..c5d8d308b 100644
--- a/src/modules/module-netjack2-manager.c
+++ b/src/modules/module-netjack2-manager.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2023 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -19,8 +21,6 @@
 #include <net/if.h>
 #include <math.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/src/modules/module-parametric-equalizer.c b/src/modules/module-parametric-equalizer.c
index 315662f82..a11398166 100644
--- a/src/modules/module-parametric-equalizer.c
+++ b/src/modules/module-parametric-equalizer.c
@@ -3,11 +3,11 @@
 /* SPDX-FileCopyrightText: Copyright © 2024 Asymptotic Inc. */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <errno.h>
 #include <limits.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/json-core.h>
 #include <spa/param/audio/raw.h>
diff --git a/src/modules/module-pipe-tunnel.c b/src/modules/module-pipe-tunnel.c
index afc8e0f14..9798336df 100644
--- a/src/modules/module-pipe-tunnel.c
+++ b/src/modules/module-pipe-tunnel.c
@@ -3,6 +3,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2022 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -16,8 +18,6 @@
 #include <limits.h>
 #include <math.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/src/modules/module-portal.c b/src/modules/module-portal.c
index 566e67d4b..4491b0317 100644
--- a/src/modules/module-portal.c
+++ b/src/modules/module-portal.c
@@ -3,6 +3,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2019 Red Hat Inc. */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -11,8 +13,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include <dbus/dbus.h>
 
 #include <spa/utils/string.h>
diff --git a/src/modules/module-profiler.c b/src/modules/module-profiler.c
index ec8c5c7f0..3031caec3 100644
--- a/src/modules/module-profiler.c
+++ b/src/modules/module-profiler.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2020 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <stdalign.h>
@@ -11,8 +13,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include <spa/pod/builder.h>
 #include <spa/utils/result.h>
 #include <spa/utils/ringbuffer.h>
diff --git a/src/modules/module-protocol-pulse.c b/src/modules/module-protocol-pulse.c
index ea5eb6cbe..4c82d97c0 100644
--- a/src/modules/module-protocol-pulse.c
+++ b/src/modules/module-protocol-pulse.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2020 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -10,8 +12,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 
 #include <pipewire/impl.h>
diff --git a/src/modules/module-protocol-pulse/snap-policy.c b/src/modules/module-protocol-pulse/snap-policy.c
index 2921f06de..774763f9a 100644
--- a/src/modules/module-protocol-pulse/snap-policy.c
+++ b/src/modules/module-protocol-pulse/snap-policy.c
@@ -2,9 +2,7 @@
 /* SPDX-FileCopyrightText: Copyright © 2022 Canonical Ltd. */
 /* SPDX-License-Identifier: MIT */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <glib.h>
 #include <snapd-glib/snapd-glib.h>
diff --git a/src/modules/module-pulse-tunnel.c b/src/modules/module-pulse-tunnel.c
index 4999a199d..6e6a7f2e1 100644
--- a/src/modules/module-pulse-tunnel.c
+++ b/src/modules/module-pulse-tunnel.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -14,8 +16,6 @@
 #include <limits.h>
 #include <math.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/src/modules/module-raop-discover.c b/src/modules/module-raop-discover.c
index 9782eb458..1d5a9a82a 100644
--- a/src/modules/module-raop-discover.c
+++ b/src/modules/module-raop-discover.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -10,8 +12,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/src/modules/module-raop-sink.c b/src/modules/module-raop-sink.c
index 076c388d7..dbc4da39a 100644
--- a/src/modules/module-raop-sink.c
+++ b/src/modules/module-raop-sink.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -27,8 +29,6 @@
 #include <openssl/md5.h>
 #include <openssl/evp.h>
 
-#include "config.h"
-
 #include <spa/utils/cleanup.h>
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
diff --git a/src/modules/module-roc-sink.c b/src/modules/module-roc-sink.c
index dcd736848..7b834e3eb 100644
--- a/src/modules/module-roc-sink.c
+++ b/src/modules/module-roc-sink.c
@@ -3,12 +3,12 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Sanchayan Maity <sanchayan@asymptotic.io> */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <limits.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include <spa/utils/hook.h>
 #include <spa/utils/result.h>
 #include <spa/param/audio/format-utils.h>
diff --git a/src/modules/module-roc-source.c b/src/modules/module-roc-source.c
index b5a5ea99b..0da4560e7 100644
--- a/src/modules/module-roc-source.c
+++ b/src/modules/module-roc-source.c
@@ -3,12 +3,12 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Sanchayan Maity <sanchayan@asymptotic.io> */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <limits.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include <spa/utils/hook.h>
 #include <spa/utils/result.h>
 #include <spa/param/audio/format-utils.h>
diff --git a/src/modules/module-rt.c b/src/modules/module-rt.c
index b2d0739cf..108627a13 100644
--- a/src/modules/module-rt.c
+++ b/src/modules/module-rt.c
@@ -26,6 +26,8 @@
   SOFTWARE.
 ***/
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
@@ -44,8 +46,6 @@
 #include <sys/resource.h>
 #include <sys/syscall.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 
diff --git a/src/modules/module-rtp/stream.c b/src/modules/module-rtp/stream.c
index cbd3ee994..9d3713dd5 100644
--- a/src/modules/module-rtp/stream.c
+++ b/src/modules/module-rtp/stream.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2023 Wim Taymans <wim.taymans@gmail.com> */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
@@ -17,8 +19,6 @@
 #include <spa/debug/mem.h>
 #include <spa/debug/log.h>
 
-#include "config.h"
-
 #include <pipewire/pipewire.h>
 #include <pipewire/impl.h>
 
diff --git a/src/modules/module-snapcast-discover.c b/src/modules/module-snapcast-discover.c
index a11409169..17069c9fc 100644
--- a/src/modules/module-snapcast-discover.c
+++ b/src/modules/module-snapcast-discover.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2024 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -17,8 +19,6 @@
 #include <net/if.h>
 #include <ifaddrs.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/src/modules/module-spa-device-factory.c b/src/modules/module-spa-device-factory.c
index eb8d2436a..a3b08a285 100644
--- a/src/modules/module-spa-device-factory.c
+++ b/src/modules/module-spa-device-factory.c
@@ -2,13 +2,13 @@
 /* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <dlfcn.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 
 #include "pipewire/impl.h"
diff --git a/src/modules/module-spa-node-factory.c b/src/modules/module-spa-node-factory.c
index 0f9a97020..c7fedd47e 100644
--- a/src/modules/module-spa-node-factory.c
+++ b/src/modules/module-spa-node-factory.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -9,8 +11,6 @@
 
 #include <spa/utils/result.h>
 
-#include "config.h"
-
 #include "pipewire/impl.h"
 
 #include "spa/spa-node.h"
diff --git a/src/modules/module-vban/stream.c b/src/modules/module-vban/stream.c
index 10eb34a82..3630441b3 100644
--- a/src/modules/module-vban/stream.c
+++ b/src/modules/module-vban/stream.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2023 Wim Taymans <wim.taymans@gmail.com> */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
@@ -18,8 +20,6 @@
 #include <spa/debug/mem.h>
 #include <spa/debug/log.h>
 
-#include "config.h"
-
 #include <pipewire/pipewire.h>
 #include <pipewire/impl.h>
 
diff --git a/src/modules/module-x11-bell.c b/src/modules/module-x11-bell.c
index 1617c20c8..3e3660775 100644
--- a/src/modules/module-x11-bell.c
+++ b/src/modules/module-x11-bell.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2022 Wim Taymans <wim.taymans@gmail.com> */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -10,8 +12,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include <spa/utils/string.h>
 
 #include <X11/Xlib.h>
diff --git a/src/modules/module-zeroconf-discover.c b/src/modules/module-zeroconf-discover.c
index 68edd605c..57462342d 100644
--- a/src/modules/module-zeroconf-discover.c
+++ b/src/modules/module-zeroconf-discover.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -10,8 +12,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c
index f37bfd411..b30b99f8b 100644
--- a/src/pipewire/impl-node.c
+++ b/src/pipewire/impl-node.c
@@ -2,6 +2,8 @@
 /* SPDX-FileCopyrightText: Copyright © 2018 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -11,8 +13,6 @@
 #include <malloc.h>
 #include <limits.h>
 
-#include "config.h"
-
 #include <spa/support/system.h>
 #include <spa/pod/parser.h>
 #include <spa/pod/filter.h>
diff --git a/src/tools/pw-cat.c b/src/tools/pw-cat.c
index 2bcda784f..406675c7a 100644
--- a/src/tools/pw-cat.c
+++ b/src/tools/pw-cat.c
@@ -3,6 +3,8 @@
 /*                         @author Pantelis Antoniou <pantelis.antoniou@konsulko.com> */
 /* SPDX-License-Identifier: MIT */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <time.h>
@@ -34,8 +36,6 @@
 #include <pipewire/i18n.h>
 #include <pipewire/extensions/metadata.h>
 
-#include "config.h"
-
 #ifdef HAVE_PW_CAT_FFMPEG_INTEGRATION
 #include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
diff --git a/test/pwtest.h b/test/pwtest.h
index ae768f08e..dd9f3d7db 100644
--- a/test/pwtest.h
+++ b/test/pwtest.h
@@ -2,11 +2,11 @@
 /* SPDX-FileCopyrightText: Copyright © 2021 Red Hat, Inc. */
 /* SPDX-License-Identifier: MIT */
 
-#include "config.h"
-
 #ifndef PWTEST_H
 #define PWTEST_H
 
+#include "config.h"
+
 #include <limits.h>
 #include <stddef.h>
 #include <stdbool.h>
diff --git a/test/test-functional.c b/test/test-functional.c
index 3cdcb6161..8c3438688 100644
--- a/test/test-functional.c
+++ b/test/test-functional.c
@@ -2,10 +2,10 @@
 /* SPDX-FileCopyrightText: Copyright © 2019 Wim Taymans */
 /* SPDX-License-Identifier: MIT */
 
-#include <sys/wait.h>
-
 #include "config.h"
 
+#include <sys/wait.h>
+
 #include "pwtest.h"
 
 PWTEST(openal_info_test)