shared: Clean up includes

Split out of #37344.

src/libsystemd/sd-bus/test-bus-address.c

@@ -2,6 +2,7 @@
 
 #include "sd-bus.h"
 
+#include "argv-util.h"
 #include "bus-internal.h"
 #include "log.h"
 #include "string-util.h"

src/libsystemd/sd-journal/test-journal-flush.c

@@ -6,6 +6,7 @@
 #include "sd-journal.h"
 
 #include "alloc-util.h"
+#include "argv-util.h"
 #include "chattr-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"
@@ -13,9 +14,11 @@
 #include "journal-internal.h"
 #include "logs-show.h"
 #include "macro.h"
+#include "output-mode.h"
 #include "path-util.h"
 #include "rm-rf.h"
 #include "string-util.h"
+#include "strv.h"
 #include "tests.h"
 #include "tmpfile-util.h"
 

src/libsystemd/sd-journal/test-journal-interleaving.c

@@ -7,6 +7,7 @@
 #include "sd-journal.h"
 
 #include "alloc-util.h"
+#include "argv-util.h"
 #include "chattr-util.h"
 #include "iovec-util.h"
 #include "journal-file-util.h"

src/libsystemd/sd-journal/test-journal.c

@@ -3,6 +3,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include "argv-util.h"
 #include "chattr-util.h"
 #include "iovec-util.h"
 #include "journal-authenticate.h"

src/libsystemd/sd-login/test-login.c

@@ -8,6 +8,7 @@
 #include "sd-login.h"
 
 #include "alloc-util.h"
+#include "argv-util.h"
 #include "errno-list.h"
 #include "fd-util.h"
 #include "format-util.h"

src/libsystemd/sd-login/test-sd-login.c

@@ -3,8 +3,10 @@
 #include "sd-login.h"
 
 #include "alloc-util.h"
+#include "format-util.h"
 #include "main-func.h"
 #include "parse-util.h"
+#include "strv.h"
 #include "tests.h"
 
 static const char *arg_verb = NULL;  /* NULL means all */

src/shared/acl-util.c

@@ -1,15 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
-#include <stdbool.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #include "acl-util.h"
 #include "alloc-util.h"
 #include "errno-util.h"
 #include "extract-word.h"
-#include "log.h"
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"

src/shared/acl-util.h

@@ -1,19 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <errno.h>
-#include <unistd.h>
+#include "forward.h"
 
 int fd_acl_make_read_only_fallback(int fd);
 int fd_acl_make_writable_fallback(int fd);
 
 #if HAVE_ACL
-#include <acl/libacl.h>
-#include <stdbool.h>
-#include <sys/acl.h>
-
-#include "macro.h"
-#include "memory-util.h"
+#include <acl/libacl.h> /* IWYU pragma: export */
+#include <sys/acl.h>    /* IWYU pragma: export */
 
 int calc_acl_mask_if_needed(acl_t *acl_p);
 int add_base_acls_if_needed(acl_t *acl_p, const char *path);

src/shared/acpi-fpdt.c

@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
-#include <stddef.h>
-#include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 

src/shared/acpi-fpdt.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <time-util.h>
+#include "forward.h"
 
 int acpi_get_boot_usec(usec_t *ret_loader_start, usec_t *ret_loader_exit);

src/shared/apparmor-util.c

@@ -1,11 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <stddef.h>
+#include <syslog.h>
 
 #include "alloc-util.h"
 #include "apparmor-util.h"
 #include "fileio.h"
-#include "log.h"
 #include "parse-util.h"
 
 #if HAVE_APPARMOR

src/shared/apparmor-util.h

@@ -1,15 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <errno.h>
-#include <stdbool.h>
-
-#include "dlfcn-util.h"
+#include "forward.h"
 
 #if HAVE_APPARMOR
 #  include <sys/apparmor.h>
 
-#include "memory-util.h"
+#  include "dlfcn-util.h"
 
 extern DLSYM_PROTOTYPE(aa_change_onexec);
 extern DLSYM_PROTOTYPE(aa_change_profile);

src/shared/ask-password-agent.c

@@ -1,10 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
 
 #include "ask-password-agent.h"
+#include "bus-util.h"
 #include "exec-util.h"
 #include "log.h"
 #include "process-util.h"

src/shared/ask-password-agent.h

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-
-#include "bus-util.h"
+#include "forward.h"
 
 int ask_password_agent_open(void);
 void ask_password_agent_close(void);

src/shared/ask-password-api.c

@@ -1,20 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
+#include <poll.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/inotify.h>
 #include <sys/signalfd.h>
 #include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/uio.h>
-#include <sys/un.h>
 #include <termios.h>
 #include <unistd.h>
 
@@ -22,7 +13,6 @@
 #include "ansi-color.h"
 #include "ask-password-api.h"
 #include "creds-util.h"
-#include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"
@@ -33,10 +23,7 @@
 #include "iovec-util.h"
 #include "keyring-util.h"
 #include "log.h"
-#include "macro.h"
-#include "memory-util.h"
 #include "missing_syscall.h"
-#include "mkdir-label.h"
 #include "nulstr-util.h"
 #include "parse-util.h"
 #include "path-lookup.h"

src/shared/ask-password-api.h

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-
-#include "time-util.h"
+#include "forward.h"
 
 typedef enum AskPasswordFlags {
         ASK_PASSWORD_ACCEPT_CACHED = 1 << 0,  /* read from kernel keyring */

src/shared/async.c

@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
-#include <stddef.h>
+#include <sched.h>
 #include <sys/prctl.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ -10,8 +9,8 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "log.h"
-#include "macro.h"
 #include "process-util.h"
+#include "rm-rf.h"
 #include "signal-util.h"
 
 int asynchronous_sync(PidRef *ret_pid) {

src/shared/async.h

@@ -1,11 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/types.h>
-
-#include "macro.h"
-#include "pidref.h"
-#include "rm-rf.h"
+#include "forward.h"
 
 /* These functions implement various potentially slow operations that are executed asynchronously. They are
  * carefully written to not use pthreads, but use fork() or clone() (without CLONE_VM) so that the child does

src/shared/barrier.c

@@ -1,19 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
+#include <poll.h>
 #include <sys/eventfd.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "barrier.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "io-util.h"
-#include "macro.h"
 
 /**
  * Barriers

src/shared/barrier.h

@@ -1,12 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <sys/types.h>
-
-#include "macro.h"
-#include "memory-util.h"
+#include "forward.h"
 
 /* See source file for an API description. */
 

src/shared/base-filesystem.c

@@ -1,23 +1,17 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
-#include <stdbool.h>
-#include <stdlib.h>
 #include <sys/stat.h>
 #include <syslog.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "architecture.h"
 #include "base-filesystem.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "log.h"
-#include "macro.h"
 #include "nulstr-util.h"
 #include "path-util.h"
-#include "string-util.h"
 #include "umask-util.h"
 #include "user-util.h"
 

src/shared/base-filesystem.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/types.h>
+#include "forward.h"
 
 int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid);
 int base_filesystem_create(const char *root, uid_t uid, gid_t gid);

src/shared/battery-util.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-device.h"
+#include "forward.h"
 
 int on_ac_power(void);
 

src/shared/binfmt-util.c

@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <sys/stat.h>
-#include <sys/statvfs.h>
 #include <sys/vfs.h>
 
 #include "binfmt-util.h"

src/shared/bitmap.c

@@ -1,15 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "alloc-util.h"
 #include "bitmap.h"
-#include "hashmap.h"
-#include "macro.h"
 #include "memory-util.h"
 
 /* Bitmaps are only meant to store relatively small numbers

src/shared/bitmap.h

@@ -1,10 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-
-#include "hashmap.h"
-#include "macro.h"
+#include "forward.h"
+#include "iterator.h"
 
 typedef struct Bitmap {
         uint64_t *bitmaps;

src/shared/blkid-util.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
-
 #if HAVE_BLKID
 
-#include <errno.h>
+#include "sd-id128.h"
 
 #include "blkid-util.h"
 #include "string-util.h"

src/shared/blkid-util.h

@@ -5,9 +5,7 @@
 
 #include <blkid.h>
 
-#include "sd-id128.h"
-
-#include "memory-util.h"
+#include "forward.h"
 
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(blkid_probe, blkid_free_probe, NULL);
 

src/shared/blockdev-list.c

@@ -6,7 +6,6 @@
 #include "blockdev-list.h"
 #include "blockdev-util.h"
 #include "device-util.h"
-#include "macro.h"
 #include "strv.h"
 #include "terminal-util.h"
 

src/shared/blockdev-list.h

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "forward.h"
+
 typedef enum BlockDevListFlags {
         BLOCKDEV_LIST_SHOW_SYMLINKS              = 1 << 0,
         BLOCKDEV_LIST_REQUIRE_PARTITION_SCANNING = 1 << 1,

src/shared/blockdev-util.c

@@ -1,9 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/blkpg.h>
+#include <linux/fs.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
-#include <sys/mount.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "sd-device.h"
@@ -19,8 +20,9 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
-#include "missing_magic.h"
 #include "parse-util.h"
+#include "path-util.h"
+#include "string-util.h"
 
 static int fd_get_devnum(int fd, BlockDeviceLookupFlag flags, dev_t *ret) {
         struct stat st;

src/shared/blockdev-util.h

@@ -1,13 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/types.h>
+#include <sys/sysmacros.h>
 
-#include "sd-device.h"
-
-#include "macro.h"
+#include "forward.h"
 #include "stdio-util.h"
-#include "string-util.h"
 
 #define SYS_BLOCK_PATH_MAX(suffix)                                      \
         (STRLEN("/sys/dev/block/") + DECIMAL_STR_MAX(dev_t) + 1 + DECIMAL_STR_MAX(dev_t) + STRLEN(suffix))

src/shared/bond-util.h

@@ -1,11 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <errno.h>
 #include <linux/if_bonding.h>
-#include <netinet/in.h>
 
-#include "macro.h"
+#include "forward.h"
 
 /*
  * Maximum number of targets supported by the kernel for a single

src/shared/boot-entry.c

@@ -5,7 +5,6 @@
 #include "chase.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "id128-util.h"
 #include "log.h"
 #include "os-util.h"
 #include "path-util.h"

src/shared/boot-entry.h

@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-
 #include "sd-id128.h"
 
+#include "forward.h"
+
 typedef enum BootEntryTokenType {
         BOOT_ENTRY_TOKEN_MACHINE_ID,
         BOOT_ENTRY_TOKEN_OS_IMAGE_ID,

src/shared/boot-timestamps.c

@@ -3,7 +3,6 @@
 #include "acpi-fpdt.h"
 #include "boot-timestamps.h"
 #include "efi-loader.h"
-#include "macro.h"
 #include "time-util.h"
 
 int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader) {

src/shared/boot-timestamps.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <time-util.h>
+#include "forward.h"
 
 int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader);

src/shared/bootspec.c

@@ -3,16 +3,18 @@
 #include <fnmatch.h>
 #include <unistd.h>
 
+#include "sd-json.h"
+
 #include "alloc-util.h"
 #include "bootspec.h"
 #include "bootspec-fundamental.h"
 #include "chase.h"
-#include "conf-files.h"
 #include "devnum-util.h"
 #include "dirent-util.h"
 #include "efi-loader.h"
+#include "efivars.h"
 #include "env-file.h"
-#include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "find-esp.h"
@@ -22,13 +24,13 @@
 #include "pe-binary.h"
 #include "pretty-print.h"
 #include "recurse-dir.h"
+#include "set.h"
 #include "sort-util.h"
 #include "stat-util.h"
 #include "string-table.h"
+#include "string-util.h"
 #include "strv.h"
-#include "terminal-util.h"
 #include "uki.h"
-#include "unaligned.h"
 
 static const char* const boot_entry_type_table[_BOOT_ENTRY_TYPE_MAX] = {
         [BOOT_ENTRY_CONF]        = "Boot Loader Specification Type #1 (.conf)",

src/shared/bootspec.h

@@ -2,15 +2,7 @@
 
 #pragma once
 
-#include <errno.h>
-#include <inttypes.h>
-#include <stdbool.h>
-#include <sys/types.h>
-
-#include "sd-json.h"
-
-#include "set.h"
-#include "string-util.h"
+#include "forward.h"
 
 typedef enum BootEntryType {
         BOOT_ENTRY_CONF,        /* Boot Loader Specification Type #1 entries: *.conf files */

src/shared/bpf-dlopen.c

@@ -3,7 +3,6 @@
 #include "bpf-dlopen.h"
 #include "dlfcn-util.h"
 #include "log.h"
-#include "strv.h"
 
 #if HAVE_LIBBPF
 

src/shared/bpf-dlopen.h

@@ -1,16 +1,16 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
 #include <syslog.h>
 
 #if HAVE_LIBBPF
 
-#include <bpf/bpf.h>
-#include <bpf/libbpf.h>
+#include <bpf/bpf.h>    /* IWYU pragma: export */
+#include <bpf/libbpf.h> /* IWYU pragma: export */
 
-#include "bpf-compat.h"
+#include "bpf-compat.h" /* IWYU pragma: export */
 #include "dlfcn-util.h"
+#include "forward.h"
 
 extern DLSYM_PROTOTYPE(bpf_link__destroy);
 extern DLSYM_PROTOTYPE(bpf_link__fd);

src/shared/bpf-link.h

@@ -1,14 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
-
 #pragma once
 
 #if HAVE_LIBBPF
 
-#include <stdio.h>
 #include <bpf/libbpf.h>
 
-#include "fdset.h"
-#include "macro.h"
+#include "forward.h"
 
 bool bpf_can_link_program(struct bpf_program *prog);
 

src/shared/bpf-program.c

@@ -1,22 +1,26 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
+#include <linux/bpf.h>
 #include <linux/bpf_insn.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
 #include "bpf-program.h"
 #include "errno-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fd-util.h"
+#include "fdset.h"
+#include "log.h"
 #include "memory-util.h"
 #include "missing_syscall.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "serialize.h"
+#include "set.h"
 #include "string-table.h"
+#include "string-util.h"
 
 static const char *const bpf_cgroup_attach_type_table[__MAX_BPF_ATTACH_TYPE] = {
         [BPF_CGROUP_INET_INGRESS] =     "ingress",

src/shared/bpf-program.h

@@ -1,22 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <linux/bpf.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <sys/syscall.h>
-
-#include "fdset.h"
-#include "list.h"
-#include "macro.h"
-
-typedef struct BPFProgram BPFProgram;
+#include "forward.h"
 
 /* This encapsulates three different concepts: the loaded BPF program, the BPF code, and the attachment to a
  * cgroup. Typically our BPF programs go through all three stages: we build the code, we load it, and finally
  * we attach it, but it might happen that we operate with programs that aren't loaded or aren't attached, or
  * where we don't have the code. */
-struct BPFProgram {
+typedef struct BPFProgram {
         /* The loaded BPF program, if loaded */
         int kernel_fd;
         uint32_t prog_type;
@@ -31,7 +22,7 @@ struct BPFProgram {
         char *attached_path;
         int attached_type;
         uint32_t attached_flags;
-};
+} BPFProgram;
 
 int bpf_program_supported(void);
 

src/shared/bridge-util.h

@@ -2,9 +2,8 @@
 #pragma once
 
 #include <linux/if_bridge.h>
-#include <netinet/in.h>
 
-#include "conf-parser.h"
+#include "forward.h"
 
 typedef enum BridgeState {
         NETDEV_BRIDGE_STATE_DISABLED   = BR_STATE_DISABLED,

src/shared/btrfs-util.c

@@ -1,37 +1,26 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
-#include <inttypes.h>
 #include <linux/btrfs.h>
 #include <linux/btrfs_tree.h>
-#include <linux/loop.h>
 #include <linux/magic.h>
-#include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/sysmacros.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "blockdev-util.h"
 #include "btrfs-util.h"
 #include "chase.h"
 #include "chattr-util.h"
 #include "copy.h"
 #include "errno-util.h"
 #include "fd-util.h"
-#include "fileio.h"
 #include "fs-util.h"
-#include "io-util.h"
 #include "log.h"
-#include "macro.h"
-#include "missing_fs.h"
 #include "path-util.h"
 #include "rm-rf.h"
-#include "smack-util.h"
 #include "sparse-endian.h"
 #include "stat-util.h"
 #include "string-util.h"
@@ -1904,6 +1893,16 @@ int btrfs_subvol_get_parent(int fd, uint64_t subvol_id, uint64_t *ret) {
         return -ENXIO;
 }
 
+bool btrfs_might_be_subvol(const struct stat *st) {
+        if (!st)
+                return false;
+
+        /* Returns true if this 'struct stat' looks like it could refer to a btrfs subvolume. To make a final
+         * decision, needs to be combined with an fstatfs() check to see if this is actually btrfs. */
+
+        return S_ISDIR(st->st_mode) && st->st_ino == 256;
+}
+
 int btrfs_forget_device(const char *path) {
         _cleanup_close_ int control_fd = -EBADF;
         struct btrfs_ioctl_vol_args args = {};

src/shared/btrfs-util.h

@@ -1,15 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <sys/types.h>
-
 #include "sd-id128.h"
 
-#include "btrfs.h"
-#include "copy.h"
-#include "time-util.h"
+#include "btrfs.h"      /* IWYU pragma: export */
+#include "forward.h"
 
 typedef struct BtrfsSubvolInfo {
         uint64_t subvol_id;
@@ -132,15 +127,7 @@ int btrfs_qgroup_get_quota(const char *path, uint64_t qgroupid, BtrfsQuotaInfo *
 
 int btrfs_log_dev_root(int level, int ret, const char *p);
 
-static inline bool btrfs_might_be_subvol(const struct stat *st) {
-        if (!st)
-                return false;
-
-        /* Returns true if this 'struct stat' looks like it could refer to a btrfs subvolume. To make a final
-         * decision, needs to be combined with an fstatfs() check to see if this is actually btrfs. */
-
-        return S_ISDIR(st->st_mode) && st->st_ino == 256;
-}
+bool btrfs_might_be_subvol(const struct stat *st);
 
 int btrfs_forget_device(const char *path);
 

src/shared/bus-get-properties.c

@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "bus-get-properties.h"
 #include "bus-message-util.h"
-#include "log.h"
 #include "rlimit-util.h"
-#include "stdio-util.h"
 #include "string-util.h"
 
 BUS_DEFINE_PROPERTY_GET_GLOBAL(bus_property_get_bool_false, "b", 0);

src/shared/bus-get-properties.h

@@ -3,7 +3,7 @@
 
 #include "sd-bus.h"
 
-#include "macro.h"
+#include "forward.h"
 
 int bus_property_get_bool(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
 int bus_property_set_bool(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *value, void *userdata, sd_bus_error *error);

src/shared/bus-locator.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "assert-util.h"
+#include "sd-bus.h"
+
 #include "bus-locator.h"
-#include "macro.h"
 
 const BusLocator* const bus_home_mgr = &(BusLocator){
         .destination = "org.freedesktop.home1",

src/shared/bus-locator.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-bus.h"
+#include "forward.h"
 
 typedef struct BusLocator {
         const char *destination;

src/shared/bus-log-control-api.c

@@ -5,10 +5,14 @@
 #include "alloc-util.h"
 #include "bus-get-properties.h"
 #include "bus-log-control-api.h"
-#include "bus-util.h"
+#include "bus-object.h"
 #include "log.h"
 #include "syslog-util.h"
 
+int bus_log_control_api_register(sd_bus *bus) {
+        return bus_add_implementation(bus, &log_control_object, NULL);
+}
+
 int bus_property_get_log_level(
                 sd_bus *bus,
                 const char *path,

src/shared/bus-log-control-api.h

@@ -1,14 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-bus.h"
-
-#include "bus-object.h"
+#include "forward.h"
 
 extern const BusObjectImplementation log_control_object;
-static inline int bus_log_control_api_register(sd_bus *bus) {
-        return bus_add_implementation(bus, &log_control_object, NULL);
-}
+
+int bus_log_control_api_register(sd_bus *bus);
 
 int bus_property_get_log_level(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
 int bus_property_set_log_level(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *value, void *userdata, sd_bus_error *error);

src/shared/bus-map-properties.c

@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "alloc-util.h"
+#include "sd-bus.h"
+
 #include "bus-map-properties.h"
-#include "bus-message.h"
 #include "bus-message-util.h"
 #include "bus-util.h"
-#include "log.h"
+#include "string-util.h"
 #include "strv.h"
 
 int bus_map_id128(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata) {

src/shared/bus-map-properties.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-bus.h"
+#include "forward.h"
 
 typedef int (*bus_property_set_t) (sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata);
 

src/shared/bus-message-util.c

@@ -2,11 +2,16 @@
 
 #include <unistd.h>
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "bus-message-util.h"
 #include "bus-util.h"
 #include "copy.h"
+#include "in-addr-util.h"
 #include "resolve-util.h"
+#include "set.h"
+#include "socket-netlink.h"
 
 int bus_message_read_id128(sd_bus_message *m, sd_id128_t *ret) {
         const void *a;

src/shared/bus-message-util.h

@@ -1,11 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-bus.h"
-
-#include "in-addr-util.h"
-#include "set.h"
-#include "socket-netlink.h"
+#include "forward.h"
 
 int bus_message_read_id128(sd_bus_message *m, sd_id128_t *ret);
 

src/shared/bus-object.c

@@ -1,10 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "bus-introspect.h"
 #include "bus-object.h"
 #include "log.h"
-#include "macro.h"
+#include "ordered-set.h"
 #include "string-util.h"
 #include "strv.h"
 

src/shared/bus-object.h

@@ -1,19 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-#include <stdio.h>
-
-#include "sd-bus.h"
-
-typedef struct BusObjectImplementation BusObjectImplementation;
+#include "forward.h"
 
 typedef struct BusObjectVtablePair {
         const sd_bus_vtable *vtable;
         sd_bus_object_find_t object_find;
 } BusObjectVtablePair;
 
-struct BusObjectImplementation {
+typedef struct BusObjectImplementation {
         const char *path;
         const char *interface;
         const sd_bus_vtable **vtables;
@@ -21,7 +16,7 @@ struct BusObjectImplementation {
         sd_bus_node_enumerator_t node_enumerator;
         bool manager;
         const BusObjectImplementation **children;
-};
+} BusObjectImplementation;
 
 #define BUS_VTABLES(...) ((const sd_bus_vtable* []){ __VA_ARGS__, NULL })
 #define BUS_FALLBACK_VTABLES(...) ((const BusObjectVtablePair[]) { __VA_ARGS__, {} })

src/shared/bus-polkit.c

@@ -1,13 +1,18 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "bus-internal.h"
+#include "sd-bus.h"
+#include "sd-event.h"
+
 #include "bus-message.h"
 #include "bus-polkit.h"
 #include "bus-util.h"
+#include "errno-util.h"
+#include "hashmap.h"
+#include "list.h"
 #include "log.h"
-#include "process-util.h"
+#include "pidref.h"
+#include "string-util.h"
 #include "strv.h"
-#include "user-util.h"
 #include "varlink-util.h"
 
 static int bus_message_check_good_user(sd_bus_message *m, uid_t good_user) {

src/shared/bus-polkit.h

@@ -1,11 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-bus.h"
+#include "sd-json.h"
 #include "sd-varlink.h"
 
-#include "hashmap.h"
-#include "user-util.h"
+#include "forward.h"
 
 typedef enum PolkitFlags {
         POLKIT_ALLOW_INTERACTIVE = 1 << 0, /* Allow interactive auth (typically not required, because can be derived from bus message/link automatically) */

src/shared/bus-print-properties.c

@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "bus-print-properties.h"
 #include "cap-list.h"
@@ -9,11 +11,10 @@
 #include "mountpoint-util.h"
 #include "nsflags.h"
 #include "parse-util.h"
-#include "stdio-util.h"
+#include "set.h"
 #include "string-util.h"
 #include "strv.h"
 #include "time-util.h"
-#include "user-util.h"
 
 int bus_print_property_value(const char *name, const char *expected_value, BusPrintPropertyFlags flags, const char *value) {
         assert(name);

src/shared/bus-print-properties.h

@@ -1,12 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-
-#include "sd-bus.h"
-
-#include "macro.h"
-#include "set.h"
+#include "forward.h"
 
 typedef enum BusPrintPropertyFlags {
         BUS_PRINT_PROPERTY_ONLY_VALUE = 1 << 0,  /* e.g. systemctl --value */

src/shared/bus-unit-procs.c

@@ -1,13 +1,16 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "ansi-color.h"
 #include "bus-locator.h"
 #include "bus-unit-procs.h"
+#include "format-util.h"
 #include "glyph-util.h"
 #include "hashmap.h"
 #include "list.h"
 #include "log.h"
-#include "macro.h"
+#include "output-mode.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "sort-util.h"

src/shared/bus-unit-procs.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-bus.h"
-
-#include "output-mode.h"
+#include "forward.h"
 
 int unit_show_processes(sd_bus *bus, const char *unit, const char *cgroup_path, const char *prefix, unsigned n_columns, OutputFlags flags, sd_bus_error *error);

src/shared/bus-unit-util.c

@@ -1,6 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "af-list.h"
+#include <paths.h>
+#include <sys/mount.h>
+
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
@@ -11,24 +15,21 @@
 #include "cgroup-setup.h"
 #include "cgroup-util.h"
 #include "condition.h"
+#include "constants.h"
 #include "coredump-util.h"
 #include "cpu-set-util.h"
-#include "dissect-image.h"
 #include "escape.h"
 #include "exec-util.h"
 #include "exit-status.h"
-#include "fileio.h"
+#include "extract-word.h"
 #include "firewall-util.h"
 #include "hexdecoct.h"
 #include "hostname-util.h"
 #include "in-addr-util.h"
+#include "install.h"
 #include "ioprio-util.h"
 #include "ip-protocol-list.h"
-#include "libmount-util.h"
-#include "locale-util.h"
 #include "log.h"
-#include "macro.h"
-#include "missing_fs.h"
 #include "mountpoint-util.h"
 #include "nsflags.h"
 #include "numa-util.h"
@@ -37,20 +38,17 @@
 #include "parse-util.h"
 #include "path-util.h"
 #include "percent-util.h"
+#include "pidref.h"
 #include "process-util.h"
 #include "rlimit-util.h"
 #include "seccomp-util.h"
 #include "securebits-util.h"
 #include "signal-util.h"
 #include "socket-util.h"
-#include "sort-util.h"
-#include "stdio-util.h"
 #include "string-util.h"
 #include "syslog-util.h"
-#include "terminal-util.h"
+#include "time-util.h"
 #include "unit-def.h"
-#include "user-util.h"
-#include "utf8.h"
 
 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
         assert(message);

src/shared/bus-unit-util.h

@@ -1,11 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-bus.h"
-
-#include "install.h"
-#include "pidref.h"
-#include "unit-def.h"
+#include "forward.h"
 
 typedef enum ExecDirectoryFlags {
         EXEC_DIRECTORY_READ_ONLY      = 1 << 0, /* Public API via DBUS, do not change */

src/shared/bus-util.c

@@ -1,12 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
-#include <inttypes.h>
+#include <malloc.h>
 #include <stdlib.h>
-#include <sys/ioctl.h>
-#include <sys/resource.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
@@ -23,16 +21,20 @@
 #include "chase.h"
 #include "daemon-util.h"
 #include "env-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "log.h"
 #include "memfd-util.h"
 #include "memstream-util.h"
 #include "path-util.h"
+#include "pidref.h"
 #include "socket-util.h"
 #include "stdio-util.h"
 #include "string-table.h"
+#include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 #include "uid-classification.h"
 
 static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
@@ -64,6 +66,10 @@ int bus_log_connect_full(int log_level, int r, BusTransport transport, RuntimeSc
                                           "Failed to connect to %s scope bus via %s transport: %m", runtime_scope_to_string(scope), bus_transport_to_string(transport));
 }
 
+int bus_log_connect_error(int r, BusTransport transport, RuntimeScope scope) {
+        return bus_log_connect_full(LOG_ERR, r, transport, scope);
+}
+
 int bus_async_unregister_and_exit(sd_event *e, sd_bus *bus, const char *name) {
         const char *match;
         const char *unique;

src/shared/bus-util.h

@@ -1,22 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <sys/types.h>
+#include "sd-bus.h" /* IWYU pragma: export */
 
-#include "sd-bus.h"
-#include "sd-event.h"
-
-#include "errno-util.h"
 #include "log.h"
-#include "macro.h"
-#include "pidref.h"
-#include "runtime-scope.h"
-#include "set.h"
-#include "string-util.h"
-#include "time-util.h"
+#include "forward.h"
 
 typedef enum BusTransport {
         BUS_TRANSPORT_LOCAL,
@@ -50,9 +38,7 @@ int bus_connect_transport_systemd(BusTransport transport, const char *host, Runt
 
 int bus_log_address_error(int r, BusTransport transport);
 int bus_log_connect_full(int log_level, int r, BusTransport transport, RuntimeScope scope);
-static inline int bus_log_connect_error(int r, BusTransport transport, RuntimeScope scope) {
-        return bus_log_connect_full(LOG_ERR, r, transport, scope);
-}
+int bus_log_connect_error(int r, BusTransport transport, RuntimeScope scope);
 
 #define bus_log_parse_error(r)                                  \
         log_error_errno(r, "Failed to parse bus message: %m")

src/shared/bus-wait-for-jobs.c

@@ -1,12 +1,16 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "bus-internal.h"
 #include "bus-util.h"
 #include "bus-wait-for-jobs.h"
+#include "errno-util.h"
 #include "escape.h"
 #include "log.h"
 #include "set.h"
+#include "string-util.h"
 #include "strv.h"
 #include "unit-def.h"
 

src/shared/bus-wait-for-jobs.h

@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-bus.h"
-
-#include "macro.h"
-#include "memory-util.h"
+#include "forward.h"
 
 typedef struct BusWaitForJobs BusWaitForJobs;
 

src/shared/bus-wait-for-units.c

@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-map-properties.h"
@@ -7,7 +9,6 @@
 #include "hashmap.h"
 #include "log.h"
 #include "string-util.h"
-#include "strv.h"
 #include "unit-def.h"
 
 typedef struct WaitForItem {

src/shared/bus-wait-for-units.h

@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-bus.h"
-
-#include "macro.h"
-#include "memory-util.h"
+#include "forward.h"
 
 typedef struct BusWaitForUnits BusWaitForUnits;
 

src/shared/calendarspec.c

@@ -1,9 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/mman.h>
@@ -12,10 +8,7 @@
 #include "alloc-util.h"
 #include "calendarspec.h"
 #include "errno-util.h"
-#include "fd-util.h"
-#include "fileio.h"
 #include "log.h"
-#include "macro.h"
 #include "memstream-util.h"
 #include "parse-util.h"
 #include "process-util.h"

src/shared/calendarspec.h

@@ -4,10 +4,7 @@
 /* A structure for specifying (possibly repetitive) points in calendar
  * time, a la cron */
 
-#include <stdbool.h>
-
-#include "memory-util.h"
-#include "time-util.h"
+#include "forward.h"
 
 typedef struct CalendarComponent {
         int start;

src/shared/cgroup-setup.c

@@ -7,6 +7,7 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "log.h"
 #include "missing_magic.h"
@@ -15,6 +16,8 @@
 #include "path-util.h"
 #include "process-util.h"
 #include "recurse-dir.h"
+#include "set.h"
+#include "stat-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
 #include "user-util.h"

src/shared/cgroup-setup.h

@@ -1,11 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <sys/types.h>
-
-#include "cgroup-util.h"
+#include "forward.h"
 
 int cg_weight_parse(const char *s, uint64_t *ret);
 int cg_cpu_weight_parse(const char *s, uint64_t *ret);

src/shared/cgroup-show.c

@@ -1,10 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <dirent.h>
-#include <errno.h>
-#include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
+
+#include "sd-bus.h"
 
 #include "alloc-util.h"
 #include "ansi-color.h"
@@ -16,19 +15,18 @@
 #include "escape.h"
 #include "fd-util.h"
 #include "format-util.h"
+#include "glyph-util.h"
 #include "hostname-util.h"
-#include "locale-util.h"
 #include "log.h"
-#include "macro.h"
 #include "nulstr-util.h"
 #include "output-mode.h"
-#include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
+#include "runtime-scope.h"
 #include "sort-util.h"
 #include "string-util.h"
 #include "terminal-util.h"
-#include "unit-name.h"
+#include "unit-def.h"
 #include "xattr-util.h"
 
 static void show_pid_array(

src/shared/cgroup-show.h

@@ -1,13 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-#include <sys/types.h>
-
-#include "sd-bus.h"
-
-#include "logs-show.h"
-#include "output-mode.h"
+#include "forward.h"
 
 int show_cgroup_by_path(const char *path, const char *prefix, size_t n_columns, OutputFlags flags);
 int show_cgroup(const char *controller, const char *path, const char *prefix, size_t n_columns, OutputFlags flags);

src/shared/chown-recursive.c

@@ -2,15 +2,13 @@
 
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #include "chown-recursive.h"
 #include "dirent-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
-#include "macro.h"
-#include "stdio-util.h"
+#include "path-util.h"
 #include "strv.h"
 #include "user-util.h"
 #include "xattr-util.h"

src/shared/chown-recursive.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/types.h>
+#include "forward.h"
 
 int path_chown_recursive(const char *path, uid_t uid, gid_t gid, mode_t mask, int flags);
 

src/shared/clean-ipc.c

@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
-#include <limits.h>
 #include <mqueue.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
@@ -20,9 +17,7 @@
 #include "fileio.h"
 #include "format-util.h"
 #include "log.h"
-#include "macro.h"
-#include "string-util.h"
-#include "strv.h"
+#include "path-util.h"
 #include "user-util.h"
 
 static bool match_uid_gid(uid_t subject_uid, gid_t subject_gid, uid_t delete_uid, gid_t delete_gid) {

src/shared/clean-ipc.h

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/types.h>
-
-#include "user-util.h"
+#include "forward.h"
 
 int clean_ipc_internal(uid_t uid, gid_t gid, bool rm);
 

src/shared/clock-util.c

@@ -1,16 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <stdio.h>
-#include <sys/ioctl.h>
 #include <sys/time.h>
 
 #include "alloc-util.h"
 #include "clock-util.h"
-#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "macro.h"
 #include "string-util.h"
+#include "time-util.h"
 
 int clock_is_localtime(const char *adjtime_path) {
         int r;

src/shared/color-util.c

@@ -2,9 +2,7 @@
 
 #include <math.h>
 
-#include "assert-util.h"
 #include "color-util.h"
-#include "macro.h"
 
 void rgb_to_hsv(double r, double g, double b,
                 double *ret_h, double *ret_s, double *ret_v) {

src/shared/color-util.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <inttypes.h>
+#include "forward.h"
 
 void rgb_to_hsv(double r, double g, double b,
                 double *ret_h, double *ret_s, double *ret_v);

src/shared/common-signal.c

@@ -1,12 +1,18 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <malloc.h>
+#include <sys/signalfd.h>
+
+#include "sd-event.h"
+
+#include "alloc-util.h"
 #include "common-signal.h"
-#include "fd-util.h"
-#include "fileio.h"
+#include "format-util.h"
 #include "log.h"
 #include "memstream-util.h"
 #include "process-util.h"
 #include "signal-util.h"
+#include "string-util.h"
 
 int sigrtmin18_handler(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) {
         struct sigrtmin18_info *info = userdata;

src/shared/common-signal.h

@@ -3,7 +3,7 @@
 
 #include <syslog.h>
 
-#include "sd-event.h"
+#include "forward.h"
 
 /* All our long-running services should implement a SIGRTMIN+18 handler that can be used to trigger certain
  * actions that affect service runtime. The specific action is indicated via the "value integer" you can pass

src/shared/compare-operator.h

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <errno.h>
-#include <stdbool.h>
+#include "forward.h"
 
 #define COMPARE_OPERATOR_CHARS "!<=>"
 #define COMPARE_OPERATOR_WITH_FNMATCH_CHARS COMPARE_OPERATOR_CHARS "$"

src/shared/condition.c

@@ -1,14 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <ctype.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
 #include <gnu/libc-version.h>
-#include <limits.h>
-#include <stdlib.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/utsname.h>
 #include <time.h>
 #include <unistd.h>
@@ -29,8 +24,8 @@
 #include "confidential-virt.h"
 #include "cpu-set-util.h"
 #include "creds-util.h"
-#include "efi-api.h"
 #include "efi-loader.h"
+#include "efivars.h"
 #include "env-file.h"
 #include "env-util.h"
 #include "extract-word.h"
@@ -39,20 +34,20 @@
 #include "fs-util.h"
 #include "glob-util.h"
 #include "hostname-setup.h"
-#include "hostname-util.h"
 #include "id128-util.h"
 #include "ima-util.h"
 #include "initrd-util.h"
 #include "libaudit-util.h"
 #include "limits-util.h"
 #include "list.h"
-#include "macro.h"
+#include "log.h"
 #include "mountpoint-util.h"
 #include "nulstr-util.h"
 #include "os-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "percent-util.h"
+#include "pidref.h"
 #include "proc-cmdline.h"
 #include "process-util.h"
 #include "psi-util.h"
@@ -62,6 +57,8 @@
 #include "stat-util.h"
 #include "string-table.h"
 #include "string-util.h"
+#include "strv.h"
+#include "time-util.h"
 #include "tomoyo-util.h"
 #include "tpm2-util.h"
 #include "uid-classification.h"

src/shared/condition.h

@@ -1,12 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
-
 #include "list.h"
-#include "macro.h"
+#include "forward.h"
 
 typedef enum ConditionType {
         CONDITION_ARCHITECTURE,

src/shared/conf-parser.c

@@ -1,12 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
-#include <limits.h>
 #include <linux/ipv6.h>
-#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
 
 #include "sd-id128.h"
 
@@ -29,7 +24,6 @@
 #include "in-addr-prefix-util.h"
 #include "ip-protocol-list.h"
 #include "log.h"
-#include "macro.h"
 #include "missing_network.h"
 #include "nulstr-util.h"
 #include "parse-helpers.h"
@@ -40,6 +34,7 @@
 #include "rlimit-util.h"
 #include "set.h"
 #include "signal-util.h"
+#include "siphash24.h"
 #include "socket-util.h"
 #include "stat-util.h"
 #include "string-util.h"
@@ -879,6 +874,22 @@ int _hashmap_by_section_find_unused_line(
         return 0;
 }
 
+int hashmap_by_section_find_unused_line(
+        Hashmap *entries_by_section,
+        const char *filename,
+        unsigned *ret) {
+
+        return _hashmap_by_section_find_unused_line(HASHMAP_BASE(entries_by_section), filename, ret);
+}
+
+int ordered_hashmap_by_section_find_unused_line(
+        OrderedHashmap *entries_by_section,
+        const char *filename,
+        unsigned *ret) {
+
+        return _hashmap_by_section_find_unused_line(HASHMAP_BASE(entries_by_section), filename, ret);
+}
+
 #define DEFINE_PARSER(type, vartype, conv_func)                         \
         DEFINE_CONFIG_PARSE_PTR(config_parse_##type, conv_func, vartype)
 

src/shared/conf-parser.h

@@ -1,17 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <errno.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <sys/stat.h>
 #include <syslog.h>
 
+#include "alloc-util.h"
 #include "conf-parser-forward.h"
-#include "hashmap.h"
+#include "forward.h"
 #include "log.h"
-#include "memory-util.h"
 
 /* An abstract parser for simple, line based, shallow configuration files consisting of variable assignments only. */
 
@@ -159,18 +154,9 @@ int _hashmap_by_section_find_unused_line(
                 HashmapBase *entries_by_section,
                 const char *filename,
                 unsigned *ret);
-static inline int hashmap_by_section_find_unused_line(
-                Hashmap *entries_by_section,
-                const char *filename,
-                unsigned *ret) {
-        return _hashmap_by_section_find_unused_line(HASHMAP_BASE(entries_by_section), filename, ret);
-}
-static inline int ordered_hashmap_by_section_find_unused_line(
-                OrderedHashmap *entries_by_section,
-                const char *filename,
-                unsigned *ret) {
-        return _hashmap_by_section_find_unused_line(HASHMAP_BASE(entries_by_section), filename, ret);
-}
+
+int hashmap_by_section_find_unused_line(Hashmap *entries_by_section, const char *filename, unsigned *ret);
+int ordered_hashmap_by_section_find_unused_line(OrderedHashmap *entries_by_section, const char *filename, unsigned *ret);
 
 static inline bool section_is_invalid(ConfigSection *section) {
         /* If this returns false, then it does _not_ mean the section is valid. */

src/shared/copy.c

@@ -1,20 +1,15 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <linux/btrfs.h>
-#include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/sendfile.h>
 #include <sys/sysmacros.h>
-#include <sys/xattr.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "btrfs-util.h"
 #include "chattr-util.h"
 #include "copy.h"
 #include "dirent-util.h"
@@ -22,23 +17,19 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
-#include "io-util.h"
+#include "hashmap.h"
 #include "log.h"
-#include "macro.h"
-#include "missing_fs.h"
-#include "missing_syscall.h"
-#include "mkdir-label.h"
 #include "mountpoint-util.h"
 #include "nulstr-util.h"
+#include "path-util.h"
 #include "rm-rf.h"
 #include "selinux-util.h"
 #include "signal-util.h"
 #include "stat-util.h"
+#include "set.h"
 #include "stdio-util.h"
 #include "string-util.h"
-#include "strv.h"
 #include "sync-util.h"
-#include "time-util.h"
 #include "tmpfile-util.h"
 #include "umask-util.h"
 #include "user-util.h"

src/shared/copy.h

@@ -1,15 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <fcntl.h>
-#include <inttypes.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include "set.h"
+#include "forward.h"
 
 typedef enum CopyFlags {
         COPY_REFLINK                      = 1 << 0,  /* Try to reflink */

src/shared/coredump-util.h

@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <errno.h>
-#include <pwd.h>
-
-#include "macro.h"
+#include "forward.h"
 
 typedef enum CoredumpFilter {
         COREDUMP_FILTER_PRIVATE_ANONYMOUS = 0,

src/shared/cpu-set-util.c

@@ -1,24 +1,16 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
-#include <stddef.h>
 #include <stdio.h>
 #include <syslog.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "cpu-set-util.h"
-#include "dirent-util.h"
-#include "errno-util.h"
 #include "extract-word.h"
-#include "fd-util.h"
 #include "hexdecoct.h"
 #include "log.h"
-#include "macro.h"
-#include "memory-util.h"
 #include "parse-util.h"
-#include "stat-util.h"
 #include "string-util.h"
-#include "strv.h"
 
 char* cpu_set_to_string(const CPUSet *a) {
         _cleanup_free_ char *str = NULL;

src/shared/cpu-set-util.h

@@ -3,8 +3,7 @@
 
 #include <sched.h>
 
-#include "memory-util.h"
-#include "missing_syscall.h"
+#include "forward.h"
 
 /* This wraps the libc interface with a variable to keep the allocated size. */
 typedef struct CPUSet {

src/shared/creds-util.c

@@ -1,6 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <pwd.h>
 #include <sys/file.h>
+#include <unistd.h>
+#include "efivars.h"
+#include "time-util.h"
 
 #if HAVE_OPENSSL
 #include <openssl/err.h>
@@ -12,9 +16,7 @@
 
 #include "alloc-util.h"
 #include "blockdev-util.h"
-#include "capability-util.h"
 #include "chattr-util.h"
-#include "constants.h"
 #include "copy.h"
 #include "creds-util.h"
 #include "efi-api.h"
@@ -37,6 +39,7 @@
 #include "recurse-dir.h"
 #include "sparse-endian.h"
 #include "stat-util.h"
+#include "string-util.h"
 #include "tmpfile-util.h"
 #include "tpm2-util.h"
 #include "user-util.h"

src/shared/creds-util.h

@@ -1,14 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <inttypes.h>
-#include <stdbool.h>
-#include <sys/types.h>
-
 #include "sd-id128.h"
 
 #include "fd-util.h"
-#include "time-util.h"
+#include "forward.h"
 
 #define CREDENTIAL_NAME_MAX FDNAME_MAX