More header cleanups (#37571)

Split out of #37344

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,

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"

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

src/basic/forward.h

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+/* IWYU pragma: always_keep */
+
 #include <errno.h>              /* IWYU pragma: export */
 #include <inttypes.h>           /* IWYU pragma: export */
 #include <limits.h>             /* IWYU pragma: export */
@@ -20,10 +22,11 @@
 typedef uint64_t usec_t;
 typedef uint64_t nsec_t;
 
-/* Libc forward declarations */
+/* Libc/Linux forward declarations */
 
 struct dirent;
 struct ether_addr;
+struct fiemap;
 struct file_handle;
 struct glob_t;
 struct group;
@@ -58,6 +61,8 @@ typedef __socklen_t socklen_t;
 
 /* 3rd-party library forward declarations */
 
+enum bpf_map_type;
+
 struct fdisk_context;
 struct fdisk_table;
 struct crypt_device;
@@ -76,6 +81,10 @@ struct iovec_wrapper;
 union in_addr_union;
 union sockaddr_union;
 
+typedef enum CGroupFlags CGroupFlags;
+typedef enum CGroupMask CGroupMask;
+typedef enum ExtractFlags ExtractFlags;
+typedef enum ImageClass ImageClass;
 typedef enum JobMode JobMode;
 typedef enum RuntimeScope RuntimeScope;
 typedef enum TimestampStyle TimestampStyle;
@@ -223,8 +232,12 @@ typedef struct sd_hwdb sd_hwdb;
 
 /* shared/ forward declarations */
 
+typedef int (*copy_progress_bytes_t)(uint64_t n_bytes, void *userdata);
+typedef int (*copy_progress_path_t)(const char *path, const struct stat *st, void *userdata);
+
 struct local_address;
 struct in_addr_prefix;
+struct in_addr_full;
 
 typedef enum AskPasswordFlags AskPasswordFlags;
 typedef enum BootEntryTokenType BootEntryTokenType;
@@ -237,11 +250,14 @@ typedef enum DnsOverTlsMode DnsOverTlsMode;
 typedef enum DnssecMode DnssecMode;
 typedef enum Fido2EnrollFlags Fido2EnrollFlags;
 typedef enum KeySourceType KeySourceType;
+typedef enum LabelFixFlags LabelFixFlags;
 typedef enum MountInNamespaceFlags MountInNamespaceFlags;
 typedef enum NamePolicy NamePolicy;
+typedef enum OutputFlags OutputFlags;
 typedef enum OutputMode OutputMode;
 typedef enum PagerFlags PagerFlags;
 typedef enum PatternCompileCase PatternCompileCase;
+typedef enum RemoveFlags RemoveFlags;
 typedef enum ResolveSupport ResolveSupport;
 typedef enum TPM2Flags TPM2Flags;
 typedef enum Tpm2Support Tpm2Support;
@@ -249,6 +265,8 @@ typedef enum Tpm2UserspaceEventType Tpm2UserspaceEventType;
 typedef enum UnitFileFlags UnitFileFlags;
 typedef enum UnitFilePresetMode UnitFilePresetMode;
 typedef enum UnitFileState UnitFileState;
+typedef enum UnitType UnitType;
+typedef enum UserDBFlags UserDBFlags;
 typedef enum UserRecordLoadFlags UserRecordLoadFlags;
 typedef enum UserStorage UserStorage;
 
@@ -266,6 +284,7 @@ typedef struct FirewallContext FirewallContext;
 typedef struct GroupRecord GroupRecord;
 typedef struct Image Image;
 typedef struct ImagePolicy ImagePolicy;
+typedef struct InstallInfo InstallInfo;
 typedef struct LookupPaths LookupPaths;
 typedef struct LoopDevice LoopDevice;
 typedef struct MountOptions MountOptions;

src/basic/meson.build

@@ -155,17 +155,17 @@ errno_list_txt = custom_target(
         capture : true)
 
 generated_gperf_headers = []
-foreach item : [['af',     af_list_txt,     'af',         ''],
-                ['arphrd', arphrd_list_txt, 'arphrd',     'ARPHRD_'],
-                ['cap',    cap_list_txt,    'capability', ''],
-                ['errno',  errno_list_txt,  'errno',      '']]
+foreach item : [['af',     af_list_txt,     'af',         '',        ['<sys/socket.h>']],
+                ['arphrd', arphrd_list_txt, 'arphrd',     'ARPHRD_', []],
+                ['cap',    cap_list_txt,    'capability', '',        []],
+                ['errno',  errno_list_txt,  'errno',      '',        []]]
 
         fname = '@0@-from-name.gperf'.format(item[0])
         gperf_file = custom_target(
                 fname,
                 input : item[1],
                 output : fname,
-                command : [generate_gperfs, item[2], item[3], '@INPUT@'],
+                command : [generate_gperfs, item[2], item[3], '@INPUT@'] + item[4],
                 capture : true)
 
         fname = '@0@-from-name.inc'.format(item[0])

src/basic/origin-id.h

@@ -3,6 +3,7 @@
 
 #include <pthread.h>
 
+#include "process-util.h"
 #include "random-util.h"
 
 /* This pattern needs to be repeated exactly in multiple modules, so macro it.

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>

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"

src/core/core-forward.h

@@ -7,7 +7,6 @@
 
 typedef enum CGroupDevicePermissions CGroupDevicePermissions;
 typedef enum CGroupDevicePolicy CGroupDevicePolicy;
-typedef enum CGroupMask CGroupMask;
 typedef enum ExecCleanMask ExecCleanMask;
 typedef enum ExecPreserveMode ExecPreserveMode;
 typedef enum FreezerAction FreezerAction;

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

src/libudev/libudev-queue.c

@@ -4,6 +4,7 @@
 ***/
 
 #include <errno.h>
+#include <sys/inotify.h>
 #include <unistd.h>
 
 #include "libudev.h"

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"

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"

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] = {

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"

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"

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"

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) {

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"

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"

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(

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"

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"

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"

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"

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"

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"

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(

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"

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"

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"

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"

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"

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>
 

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"

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"
 

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"

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"

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"