From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 22 May 2025 11:40:43 +0000 (+0200)
Subject: tree-wide: Clean up includes
X-Git-Tag: v258-rc1~518^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F37571%2Fhead;p=thirdparty%2Fsystemd.git

tree-wide: Clean up includes

Preparation for cleaning up includes in src/shared.
---

diff --git a/src/analyze/analyze-dot.c b/src/analyze/analyze-dot.c
index 8d1bee39e97..0a250b7c80c 100644
--- a/src/analyze/analyze-dot.c
+++ b/src/analyze/analyze-dot.c
@@ -15,6 +15,7 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
+#include "unit-def.h"
 
 static int graph_one_property(
                 sd_bus *bus,
diff --git a/src/analyze/analyze-security.c b/src/analyze/analyze-security.c
index 544a7ee1274..e0d313dcec4 100644
--- a/src/analyze/analyze-security.c
+++ b/src/analyze/analyze-security.c
@@ -4,6 +4,7 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "analyze-verify-util.h"
 #include "analyze.h"
 #include "analyze-security.h"
@@ -30,6 +31,7 @@
 #include "service.h"
 #include "set.h"
 #include "stdio-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "unit-def.h"
 #include "unit-name.h"
diff --git a/src/analyze/analyze-syscall-filter.c b/src/analyze/analyze-syscall-filter.c
index 41ff86e8dd5..11024803fdf 100644
--- a/src/analyze/analyze-syscall-filter.c
+++ b/src/analyze/analyze-syscall-filter.c
@@ -11,6 +11,7 @@
 #include "pager.h"
 #include "seccomp-util.h"
 #include "set.h"
+#include "string-util.h"
 #include "strv.h"
 
 #if HAVE_SECCOMP
diff --git a/src/core/bpf-firewall.c b/src/core/bpf-firewall.c
index cf9d826332e..01f7639469d 100644
--- a/src/core/bpf-firewall.c
+++ b/src/core/bpf-firewall.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/bpf.h>
 #include <linux/bpf_insn.h>
 #include <linux/if_ether.h>
 #include <net/if.h>
diff --git a/src/core/bpf-foreign.c b/src/core/bpf-foreign.c
index b58cff8a0b4..962ff88b557 100644
--- a/src/core/bpf-foreign.c
+++ b/src/core/bpf-foreign.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/bpf.h>
+
 #include "alloc-util.h"
 #include "bpf-foreign.h"
 #include "bpf-program.h"
diff --git a/src/core/main.c b/src/core/main.c
index 640e26925ea..2005d733c64 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -57,6 +57,7 @@
 #include "ipe-setup.h"
 #include "killall.h"
 #include "kmod-setup.h"
+#include "label-util.h"
 #include "limits-util.h"
 #include "load-fragment.h"
 #include "log.h"
diff --git a/src/core/manager.h b/src/core/manager.h
index ebb50af5a12..39f822f4e22 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -8,6 +8,7 @@
 #include "execute.h"
 #include "forward.h"
 #include "log.h"
+#include "path-lookup.h"
 #include "show-status.h"
 #include "unit.h"
 
diff --git a/src/creds/creds.c b/src/creds/creds.c
index 14116b03f97..d9845987ad7 100644
--- a/src/creds/creds.c
+++ b/src/creds/creds.c
@@ -9,6 +9,7 @@
 #include "alloc-util.h"
 #include "build.h"
 #include "bus-polkit.h"
+#include "bus-util.h"
 #include "creds-util.h"
 #include "dirent-util.h"
 #include "errno-util.h"
diff --git a/src/home/homectl.c b/src/home/homectl.c
index ea5e27bfa95..a015f8edfe4 100644
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -10,6 +10,7 @@
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "bus-util.h"
 #include "cap-list.h"
 #include "capability-util.h"
 #include "cgroup-util.h"
diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index e2dfa2e677e..f63036ee7a1 100644
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -16,6 +16,7 @@
 #include "bus-locator.h"
 #include "bus-map-properties.h"
 #include "bus-message-util.h"
+#include "bus-util.h"
 #include "errno-util.h"
 #include "format-table.h"
 #include "hostname-setup.h"
diff --git a/src/import/import-fs.c b/src/import/import-fs.c
index 6a364dc02f8..a60849fe109 100644
--- a/src/import/import-fs.c
+++ b/src/import/import-fs.c
@@ -7,6 +7,7 @@
 #include "ansi-color.h"
 #include "btrfs-util.h"
 #include "build.h"
+#include "copy.h"
 #include "discover-image.h"
 #include "fd-util.h"
 #include "format-util.h"
diff --git a/src/import/importd.c b/src/import/importd.c
index 4936bd80312..a361ea74788 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 
 #include "sd-bus.h"
+#include "sd-daemon.h"
 #include "sd-varlink.h"
 
 #include "alloc-util.h"
diff --git a/src/journal-remote/fuzz-journal-remote.c b/src/journal-remote/fuzz-journal-remote.c
index af6512185d7..e8d98b29ebe 100644
--- a/src/journal-remote/fuzz-journal-remote.c
+++ b/src/journal-remote/fuzz-journal-remote.c
@@ -11,6 +11,7 @@
 #include "journal-remote.h"
 #include "logs-show.h"
 #include "memfd-util.h"
+#include "output-mode.h"
 #include "path-util.h"
 #include "rm-rf.h"
 #include "tests.h"
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index 832ab05076b..ae69e17c9c7 100644
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -29,6 +29,7 @@
 #include "memory-util.h"
 #include "microhttpd-util.h"
 #include "os-util.h"
+#include "output-mode.h"
 #include "parse-util.h"
 #include "pretty-print.h"
 #include "signal-util.h"
diff --git a/src/journal/journalctl-show.c b/src/journal/journalctl-show.c
index 13f0fd07c07..10af3c7b367 100644
--- a/src/journal/journalctl-show.c
+++ b/src/journal/journalctl-show.c
@@ -16,6 +16,7 @@
 #include "journalctl-varlink.h"
 #include "log.h"
 #include "logs-show.h"
+#include "output-mode.h"
 #include "pager.h"
 #include "string-util.h"
 #include "terminal-util.h"
diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c
index 507cd3547d4..2767c6f7fca 100644
--- a/src/libsystemd-network/dhcp6-option.c
+++ b/src/libsystemd-network/dhcp6-option.c
@@ -12,7 +12,9 @@
 #include "dhcp6-internal.h"
 #include "dhcp6-option.h"
 #include "dhcp6-protocol.h"
+#include "dns-def.h"
 #include "dns-domain.h"
+#include "errno-util.h"
 #include "escape.h"
 #include "memory-util.h"
 #include "network-common.h"
diff --git a/src/libsystemd-network/ndisc-option.c b/src/libsystemd-network/ndisc-option.c
index 1d4be8e2dd2..d0f95c896fd 100644
--- a/src/libsystemd-network/ndisc-option.c
+++ b/src/libsystemd-network/ndisc-option.c
@@ -4,6 +4,7 @@
 #include <netinet/icmp6.h>
 
 #include "alloc-util.h"
+#include "dns-def.h"
 #include "dns-domain.h"
 #include "dns-resolver-internal.h"
 #include "ether-addr-util.h"
diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c
index 21761ffc513..2eb9bf25eef 100644
--- a/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/libsystemd-network/sd-dhcp-lease.c
@@ -15,6 +15,7 @@
 #include "alloc-util.h"
 #include "dhcp-lease-internal.h"
 #include "dhcp-option.h"
+#include "dns-def.h"
 #include "dns-domain.h"
 #include "dns-resolver-internal.h"
 #include "env-file.h"
diff --git a/src/libsystemd-network/sd-dhcp-server-lease.c b/src/libsystemd-network/sd-dhcp-server-lease.c
index 598ca2329fa..d9ea5304e85 100644
--- a/src/libsystemd-network/sd-dhcp-server-lease.c
+++ b/src/libsystemd-network/sd-dhcp-server-lease.c
@@ -2,6 +2,8 @@
 
 #include "alloc-util.h"
 #include "dhcp-server-lease-internal.h"
+#include "dns-def.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "iovec-util.h"
diff --git a/src/libsystemd-network/sd-dns-resolver.c b/src/libsystemd-network/sd-dns-resolver.c
index fc6d6440be3..673208106c7 100644
--- a/src/libsystemd-network/sd-dns-resolver.c
+++ b/src/libsystemd-network/sd-dns-resolver.c
@@ -2,6 +2,7 @@
 
 #include "alloc-util.h"
 #include "dns-resolver-internal.h"
+#include "errno-util.h"
 #include "log.h"
 #include "macro.h"
 #include "socket-netlink.h"
diff --git a/src/libsystemd/sd-journal/test-journal-interleaving.c b/src/libsystemd/sd-journal/test-journal-interleaving.c
index fe20118207d..6d5eacff020 100644
--- a/src/libsystemd/sd-journal/test-journal-interleaving.c
+++ b/src/libsystemd/sd-journal/test-journal-interleaving.c
@@ -16,6 +16,7 @@
 #include "parse-util.h"
 #include "random-util.h"
 #include "rm-rf.h"
+#include "strv.h"
 #include "tests.h"
 #include "tmpfile-util.h"
 
diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c
index c4aa78dd65e..852bd370edd 100644
--- a/src/libudev/libudev-queue.c
+++ b/src/libudev/libudev-queue.c
@@ -4,6 +4,7 @@
 ***/
 
 #include <errno.h>
+#include <sys/inotify.h>
 #include <unistd.h>
 
 #include "libudev.h"
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 451bd19e085..7c729249ac2 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -9,6 +9,7 @@
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"
+#include "bus-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-table.h"
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 1b82ce92384..3a4f3c8c9a5 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -14,6 +14,7 @@
 #include "bus-map-properties.h"
 #include "bus-print-properties.h"
 #include "bus-unit-procs.h"
+#include "bus-util.h"
 #include "cgroup-show.h"
 #include "cgroup-util.h"
 #include "format-table.h"
diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index 0ade0a77bbc..0684d5daf02 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -21,6 +21,7 @@
 #include "process-util.h"
 #include "special.h"
 #include "string-table.h"
+#include "strv.h"
 #include "user-util.h"
 
 static const HandleActionData handle_action_data_table[_HANDLE_ACTION_MAX] = {
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 61c434c9848..a0aa555ee04 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -61,6 +61,7 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "tmpfile-util.h"
+#include "unit-def.h"
 #include "user-record.h"
 #include "user-util.h"
 #include "virt.h"
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 07fdb996e9b..6d995099a64 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -22,6 +22,7 @@
 #include "bus-print-properties.h"
 #include "bus-unit-procs.h"
 #include "bus-unit-util.h"
+#include "bus-util.h"
 #include "bus-wait-for-jobs.h"
 #include "cgroup-show.h"
 #include "cgroup-util.h"
@@ -40,6 +41,7 @@
 #include "main-func.h"
 #include "nulstr-util.h"
 #include "osc-context.h"
+#include "output-mode.h"
 #include "pager.h"
 #include "parse-argument.h"
 #include "parse-util.h"
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index 8cb06c5162c..3d468e06215 100644
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -10,6 +10,7 @@
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-unit-util.h"
+#include "bus-util.h"
 #include "bus-wait-for-jobs.h"
 #include "chase.h"
 #include "device-util.h"
diff --git a/src/network/networkctl-journal.c b/src/network/networkctl-journal.c
index c54d9a9a8c2..900327062b2 100644
--- a/src/network/networkctl-journal.c
+++ b/src/network/networkctl-journal.c
@@ -8,6 +8,7 @@
 #include "logs-show.h"
 #include "networkctl.h"
 #include "networkctl-journal.h"
+#include "output-mode.h"
 #include "terminal-util.h"
 
 static OutputFlags get_output_flags(void) {
diff --git a/src/network/networkctl-misc.c b/src/network/networkctl-misc.c
index 4166b90061a..6f658fdc942 100644
--- a/src/network/networkctl-misc.c
+++ b/src/network/networkctl-misc.c
@@ -5,6 +5,7 @@
 
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "bus-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "format-ifname.h"
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 2f1354259a5..f9aa40ba1bd 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -2,6 +2,8 @@
 
 #include <getopt.h>
 
+#include "sd-json.h"
+
 #include "alloc-util.h"
 #include "build.h"
 #include "log.h"
diff --git a/src/nspawn/nspawn-register.c b/src/nspawn/nspawn-register.c
index e2350e5267a..750cb5e8748 100644
--- a/src/nspawn/nspawn-register.c
+++ b/src/nspawn/nspawn-register.c
@@ -15,6 +15,7 @@
 #include "special.h"
 #include "stat-util.h"
 #include "string-util.h"
+#include "unit-def.h"
 #include "unit-name.h"
 
 static int append_machine_properties(
diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
index ab49cf6edf7..4b8e1cd88a2 100644
--- a/src/portable/portablectl.c
+++ b/src/portable/portablectl.c
@@ -9,6 +9,7 @@
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-unit-util.h"
+#include "bus-util.h"
 #include "bus-wait-for-jobs.h"
 #include "chase.h"
 #include "env-file.h"
diff --git a/src/repart/repart.c b/src/repart/repart.c
index 210e6da2707..62112db4bdb 100644
--- a/src/repart/repart.c
+++ b/src/repart/repart.c
@@ -21,6 +21,7 @@
 #include "conf-files.h"
 #include "conf-parser.h"
 #include "constants.h"
+#include "copy.h"
 #include "cryptsetup-util.h"
 #include "device-util.h"
 #include "devnum-util.h"
diff --git a/src/run/run.c b/src/run/run.c
index 23c9c83a844..6a74123c96a 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -20,6 +20,7 @@
 #include "bus-map-properties.h"
 #include "bus-message-util.h"
 #include "bus-unit-util.h"
+#include "bus-util.h"
 #include "bus-wait-for-jobs.h"
 #include "calendarspec.h"
 #include "capsule-util.h"
diff --git a/src/ssh-generator/ssh-generator.c b/src/ssh-generator/ssh-generator.c
index 1ab4acc9c51..4cfbd85763a 100644
--- a/src/ssh-generator/ssh-generator.c
+++ b/src/ssh-generator/ssh-generator.c
@@ -12,6 +12,7 @@
 #include "log.h"
 #include "missing_socket.h"
 #include "parse-util.h"
+#include "path-lookup.h"
 #include "path-util.h"
 #include "proc-cmdline.h"
 #include "socket-netlink.h"
diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 61d4195912d..dcad19ed5d2 100644
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -8,7 +8,6 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
 #include "sd-varlink.h"
 
 #include "argv-util.h"
@@ -32,6 +31,7 @@
 #include "hashmap.h"
 #include "image-policy.h"
 #include "initrd-util.h"
+#include "label-util.h"
 #include "log.h"
 #include "loop-util.h"
 #include "main-func.h"
diff --git a/src/systemctl/systemctl-enable.c b/src/systemctl/systemctl-enable.c
index f4afb53890e..59b14380421 100644
--- a/src/systemctl/systemctl-enable.c
+++ b/src/systemctl/systemctl-enable.c
@@ -10,6 +10,7 @@
 #include "glyph-util.h"
 #include "install.h"
 #include "log.h"
+#include "path-lookup.h"
 #include "path-util.h"
 #include "string-util.h"
 #include "strv-fundamental.h"
diff --git a/src/systemctl/systemctl-list-units.c b/src/systemctl/systemctl-list-units.c
index 17b5bb7709c..7e16b4377b4 100644
--- a/src/systemctl/systemctl-list-units.c
+++ b/src/systemctl/systemctl-list-units.c
@@ -20,6 +20,7 @@
 #include "systemctl.h"
 #include "systemctl-list-units.h"
 #include "systemctl-util.h"
+#include "unit-def.h"
 #include "unit-name.h"
 
 static int get_unit_list_recursive(
diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c
index 958b2a5657c..207107c6a38 100644
--- a/src/systemctl/systemctl-show.c
+++ b/src/systemctl/systemctl-show.c
@@ -29,6 +29,7 @@
 #include "memory-util.h"
 #include "numa-util.h"
 #include "open-file.h"
+#include "output-mode.h"
 #include "pager.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/systemctl/systemctl-sysv-compat.c b/src/systemctl/systemctl-sysv-compat.c
index b805bbe9ab3..a872e94d8d9 100644
--- a/src/systemctl/systemctl-sysv-compat.c
+++ b/src/systemctl/systemctl-sysv-compat.c
@@ -10,6 +10,7 @@
 #include "io-util.h"
 #include "log.h"
 #include "parse-util.h"
+#include "path-lookup.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "string-util.h"
diff --git a/src/systemctl/systemctl-util.c b/src/systemctl/systemctl-util.c
index 43d36ebca86..019b763a869 100644
--- a/src/systemctl/systemctl-util.c
+++ b/src/systemctl/systemctl-util.c
@@ -12,6 +12,7 @@
 #include "bus-locator.h"
 #include "bus-map-properties.h"
 #include "bus-unit-util.h"
+#include "bus-util.h"
 #include "chase.h"
 #include "dropin.h"
 #include "env-util.h"
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 658bc72d85a..2d33bff852f 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -21,6 +21,7 @@
 #include "fs-util.h"
 #include "hashmap.h"
 #include "image-policy.h"
+#include "label-util.h"
 #include "libaudit-util.h"
 #include "libcrypt-util.h"
 #include "log.h"
diff --git a/src/test/test-async.c b/src/test/test-async.c
index 2edc1088b88..e65acfe6110 100644
--- a/src/test/test-async.c
+++ b/src/test/test-async.c
@@ -9,6 +9,7 @@
 #include "path-util.h"
 #include "pidref.h"
 #include "process-util.h"
+#include "rm-rf.h"
 #include "signal-util.h"
 #include "tests.h"
 #include "time-util.h"
diff --git a/src/test/test-bpf-firewall.c b/src/test/test-bpf-firewall.c
index 82f03a1e899..737934ca876 100644
--- a/src/test/test-bpf-firewall.c
+++ b/src/test/test-bpf-firewall.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/bpf.h>
 #include <linux/bpf_insn.h>
 #include <unistd.h>
 
diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
index b4e8e95aa00..9acb558d402 100644
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -16,6 +16,7 @@
 
 #include "alloc-util.h"
 #include "capability-util.h"
+#include "errno-list.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
diff --git a/src/test/test-user-record.c b/src/test/test-user-record.c
index db03a7c4ffd..dd5d7360070 100644
--- a/src/test/test-user-record.c
+++ b/src/test/test-user-record.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-json.h"
+
 #include "tests.h"
 #include "user-record.h"
 
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index d55b26188f6..36ec7bc833d 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -14,6 +14,7 @@
 #include "bus-locator.h"
 #include "bus-map-properties.h"
 #include "bus-print-properties.h"
+#include "bus-util.h"
 #include "constants.h"
 #include "env-util.h"
 #include "format-table.h"
diff --git a/src/udev/test-udev-rule-runner.c b/src/udev/test-udev-rule-runner.c
index a78ab5365af..97a5b136700 100644
--- a/src/udev/test-udev-rule-runner.c
+++ b/src/udev/test-udev-rule-runner.c
@@ -9,6 +9,7 @@
 #include "device-private.h"
 #include "device-util.h"
 #include "fs-util.h"
+#include "label-util.h"
 #include "log.h"
 #include "main-func.h"
 #include "mkdir-label.h"
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 74787b72ba3..2d619b02cdf 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -4,6 +4,8 @@
 #include <fnmatch.h>
 #include <unistd.h>
 
+#include "sd-json.h"
+
 #include "alloc-util.h"
 #include "architecture.h"
 #include "chase.h"