tree-wide: Clean up includes (#37457)

src/ask-password/ask-password.c

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
-#include <stddef.h>
 #include <unistd.h>
 
 #include "sd-varlink.h"
@@ -12,15 +10,16 @@
 #include "build.h"
 #include "bus-polkit.h"
 #include "constants.h"
+#include "hashmap.h"
 #include "json-util.h"
 #include "log.h"
-#include "macro.h"
 #include "main-func.h"
 #include "parse-argument.h"
 #include "pretty-print.h"
 #include "string-table.h"
+#include "string-util.h"
 #include "strv.h"
-#include "terminal-util.h"
+#include "time-util.h"
 #include "varlink-io.systemd.AskPassword.h"
 #include "varlink-util.h"
 

src/backlight/backlight.c

@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "sd-device.h"
@@ -16,11 +15,9 @@
 #include "parse-util.h"
 #include "percent-util.h"
 #include "pretty-print.h"
-#include "process-util.h"
 #include "reboot-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "terminal-util.h"
 #include "verbs.h"
 
 #define PCI_CLASS_GRAPHICS_CARD 0x30000

src/basic/forward.h

@@ -244,6 +244,8 @@ typedef enum PagerFlags PagerFlags;
 typedef enum PatternCompileCase PatternCompileCase;
 typedef enum ResolveSupport ResolveSupport;
 typedef enum TPM2Flags TPM2Flags;
+typedef enum Tpm2Support Tpm2Support;
+typedef enum Tpm2UserspaceEventType Tpm2UserspaceEventType;
 typedef enum UnitFileFlags UnitFileFlags;
 typedef enum UnitFilePresetMode UnitFilePresetMode;
 typedef enum UnitFileState UnitFileState;
@@ -269,6 +271,8 @@ typedef struct MountOptions MountOptions;
 typedef struct OpenFile OpenFile;
 typedef struct Pkcs11EncryptedKey Pkcs11EncryptedKey;
 typedef struct Table Table;
+typedef struct Tpm2Context Tpm2Context;
+typedef struct Tpm2Handle Tpm2Handle;
 typedef struct Tpm2PCRValue Tpm2PCRValue;
 typedef struct UnitInfo UnitInfo;
 typedef struct UserRecord UserRecord;

src/battery-check/battery-check.c

@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
 #include <sys/socket.h>
 #include <unistd.h>
@@ -10,17 +9,13 @@
 #include "alloc-util.h"
 #include "battery-util.h"
 #include "build.h"
-#include "errno-util.h"
 #include "fd-util.h"
 #include "glyph-util.h"
-#include "io-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "parse-util.h"
 #include "plymouth-util.h"
 #include "pretty-print.h"
 #include "proc-cmdline.h"
-#include "socket-util.h"
 #include "terminal-util.h"
 #include "time-util.h"
 

src/binfmt/binfmt.c

@@ -1,13 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
-#include <limits.h>
-#include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #include "alloc-util.h"
 #include "binfmt-util.h"

src/bless-boot/bless-boot-generator.c

@@ -1,14 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <unistd.h>
 
-#include "efi-loader.h"
+#include "efivars.h"
 #include "generator.h"
 #include "initrd-util.h"
 #include "log.h"
 #include "special.h"
-#include "string-util.h"
 #include "virt.h"
 
 /* This generator pulls systemd-bless-boot.service into the initial transaction if the "LoaderBootCountPath"
@@ -20,7 +18,7 @@ static int run(const char *dest, const char *dest_early, const char *dest_late)
 
         if (in_initrd()) {
                 log_debug("Skipping generator, running in the initrd.");
-                return EXIT_SUCCESS;
+                return 0;
         }
 
         if (detect_container() > 0) {

src/bless-boot/bless-boot.c

@@ -1,14 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
-#include <stdlib.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
-#include "bootspec.h"
 #include "build.h"
 #include "devnum-util.h"
-#include "efi-api.h"
-#include "efi-loader.h"
 #include "efivars.h"
 #include "fd-util.h"
 #include "find-esp.h"
@@ -18,9 +15,9 @@
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
+#include "string-util.h"
 #include "strv.h"
 #include "sync-util.h"
-#include "terminal-util.h"
 #include "verbs.h"
 #include "virt.h"
 

src/bless-boot/boot-check-no-failures.c

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "sd-bus.h"
 
@@ -13,7 +11,6 @@
 #include "log.h"
 #include "main-func.h"
 #include "pretty-print.h"
-#include "terminal-util.h"
 
 static int help(void) {
         _cleanup_free_ char *link = NULL;

src/cgls/cgls.c

@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -12,7 +11,6 @@
 #include "bus-util.h"
 #include "cgroup-show.h"
 #include "cgroup-util.h"
-#include "fileio.h"
 #include "log.h"
 #include "main-func.h"
 #include "output-mode.h"
@@ -20,6 +18,8 @@
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
+#include "runtime-scope.h"
+#include "string-util.h"
 #include "strv.h"
 #include "unit-name.h"
 

src/cgtop/cgtop.c

@@ -1,18 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
 #include <signal.h>
-#include <stdint.h>
-#include <stdlib.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
-
 #include "alloc-util.h"
 #include "build.h"
-#include "bus-error.h"
-#include "bus-util.h"
 #include "cgroup-show.h"
 #include "cgroup-util.h"
 #include "fd-util.h"
@@ -20,7 +13,6 @@
 #include "hashmap.h"
 #include "log.h"
 #include "main-func.h"
-#include "missing_sched.h"
 #include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
@@ -28,10 +20,9 @@
 #include "process-util.h"
 #include "procfs-util.h"
 #include "sort-util.h"
-#include "stdio-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "unit-name.h"
+#include "time-util.h"
 #include "virt.h"
 
 typedef struct Group {

src/creds/creds.c

@@ -6,15 +6,17 @@
 #include "sd-json.h"
 #include "sd-varlink.h"
 
+#include "alloc-util.h"
 #include "build.h"
 #include "bus-polkit.h"
 #include "creds-util.h"
 #include "dirent-util.h"
+#include "errno-util.h"
 #include "escape.h"
 #include "fileio.h"
 #include "format-table.h"
+#include "hashmap.h"
 #include "hexdecoct.h"
-#include "io-util.h"
 #include "json-util.h"
 #include "libmount-util.h"
 #include "log.h"
@@ -26,11 +28,12 @@
 #include "parse-util.h"
 #include "polkit-agent.h"
 #include "pretty-print.h"
-#include "process-util.h"
 #include "stat-util.h"
 #include "string-table.h"
+#include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "tpm2-pcr.h"
 #include "tpm2-util.h"
 #include "user-util.h"

src/debug-generator/debug-generator.c

@@ -8,8 +8,8 @@
 #include "dropin.h"
 #include "errno-util.h"
 #include "extract-word.h"
-#include "fd-util.h"
 #include "fileio.h"
+#include "log.h"
 #include "generator.h"
 #include "initrd-util.h"
 #include "parse-util.h"

src/delta/delta.c

@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
 #include <sys/prctl.h>
 #include <unistd.h>
@@ -20,15 +19,12 @@
 #include "nulstr-util.h"
 #include "pager.h"
 #include "parse-argument.h"
-#include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
 #include "process-util.h"
-#include "signal-util.h"
 #include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "terminal-util.h"
 
 static const char prefixes[] =
         "/etc\0"

src/detect-virt/detect-virt.c

@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
-#include <stdbool.h>
-#include <stdlib.h>
 
 #include "alloc-util.h"
 #include "build.h"

src/dissect/dissect.c

@@ -4,6 +4,7 @@
 #include <getopt.h>
 #include <linux/loop.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
@@ -17,10 +18,10 @@
 #include "chase.h"
 #include "copy.h"
 #include "device-util.h"
-#include "devnum-util.h"
 #include "discover-image.h"
 #include "dissect-image.h"
 #include "env-util.h"
+#include "errno-util.h"
 #include "escape.h"
 #include "extract-word.h"
 #include "fd-util.h"
@@ -28,13 +29,14 @@
 #include "format-table.h"
 #include "format-util.h"
 #include "fs-util.h"
+#include "hashmap.h"
 #include "hexdecoct.h"
+#include "image-policy.h"
 #include "json-util.h"
 #include "libarchive-util.h"
 #include "log.h"
 #include "loop-util.h"
 #include "main-func.h"
-#include "missing_syscall.h"
 #include "mkdir.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
@@ -46,6 +48,7 @@
 #include "pretty-print.h"
 #include "process-util.h"
 #include "recurse-dir.h"
+#include "runtime-scope.h"
 #include "sha256.h"
 #include "shift-uid.h"
 #include "stat-util.h"

src/environment-d-generator/environment-d-generator.c

@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdio.h>
+
 #include "sd-path.h"
 
 #include "alloc-util.h"
@@ -10,7 +12,7 @@
 #include "glyph-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "path-lookup.h"
+#include "string-util.h"
 #include "strv.h"
 
 static int environment_dirs(char ***ret) {

src/escape/escape.c

@@ -2,7 +2,6 @@
 
 #include <getopt.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "alloc-util.h"
 #include "build.h"
@@ -12,6 +11,7 @@
 #include "pretty-print.h"
 #include "string-util.h"
 #include "strv.h"
+#include "unit-def.h"
 #include "unit-name.h"
 
 static enum {

src/factory-reset/factory-reset-generator.c

@@ -16,7 +16,7 @@ static int run(const char *dest, const char *dest_early, const char *dest_late)
                 return log_error_errno(f, "Failed to determine factory reset mode: %m");
         if (f != FACTORY_RESET_ON) {
                 log_debug("Not in factory reset mode, skipping.");
-                return EXIT_SUCCESS;
+                return 0;
         }
 
         log_debug("Detected factory reset mode, pulling in factory-reset-now.target.");

src/firstboot/firstboot.c

@@ -5,6 +5,7 @@
 #include <linux/loop.h>
 #include <unistd.h>
 
+#include "sd-bus.h"
 #include "sd-id128.h"
 
 #include "alloc-util.h"
@@ -31,9 +32,9 @@
 #include "libcrypt-util.h"
 #include "locale-util.h"
 #include "lock-util.h"
+#include "loop-util.h"
 #include "main-func.h"
 #include "memory-util.h"
-#include "mkdir.h"
 #include "mount-util.h"
 #include "os-util.h"
 #include "parse-argument.h"
@@ -42,8 +43,9 @@
 #include "path-util.h"
 #include "pretty-print.h"
 #include "proc-cmdline.h"
-#include "random-util.h"
+#include "runtime-scope.h"
 #include "smack-util.h"
+#include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"

src/fsck/fsck.c

@@ -3,9 +3,7 @@
   Copyright © 2014 Holger Hans Peter Freyther
 ***/
 
-#include <errno.h>
 #include <fcntl.h>
-#include <stdbool.h>
 #include <sys/file.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
@@ -28,10 +26,11 @@
 #include "path-util.h"
 #include "proc-cmdline.h"
 #include "process-util.h"
-#include "signal-util.h"
 #include "socket-util.h"
 #include "special.h"
 #include "stdio-util.h"
+#include "string-util.h"
+#include "time-util.h"
 
 static bool arg_skip = false;
 static bool arg_force = false;

src/fstab-generator/fstab-generator.c

@@ -1,9 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "argv-util.h"
 #include "bus-error.h"
@@ -14,6 +16,7 @@
 #include "creds-util.h"
 #include "efi-loader.h"
 #include "env-util.h"
+#include "errno-util.h"
 #include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
@@ -23,15 +26,12 @@
 #include "initrd-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "mkdir.h"
 #include "mount-setup.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
-#include "nulstr-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "proc-cmdline.h"
-#include "process-util.h"
 #include "special.h"
 #include "specifier.h"
 #include "stat-util.h"

src/getty-generator/getty-generator.c

@@ -1,23 +1,21 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
 #include "creds-util.h"
-#include "errno-util.h"
 #include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "generator.h"
 #include "initrd-util.h"
 #include "log.h"
-#include "mkdir-label.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "proc-cmdline.h"
 #include "process-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
 #include "unit-name.h"

src/gpt-auto-generator/gpt-auto-generator.c

@@ -1,41 +1,37 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <stdlib.h>
 #include <sys/file.h>
 #include <unistd.h>
 
-#include "sd-device.h"
 #include "sd-id128.h"
 
 #include "alloc-util.h"
-#include "blkid-util.h"
 #include "blockdev-util.h"
-#include "btrfs-util.h"
 #include "device-util.h"
 #include "devnum-util.h"
-#include "dirent-util.h"
 #include "dissect-image.h"
 #include "dropin.h"
 #include "efi-loader.h"
+#include "efivars.h"
+#include "errno-util.h"
 #include "factory-reset.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "fs-util.h"
 #include "fstab-util.h"
 #include "generator.h"
 #include "gpt.h"
-#include "hexdecoct.h"
 #include "image-policy.h"
 #include "initrd-util.h"
+#include "loop-util.h"
 #include "mountpoint-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "proc-cmdline.h"
 #include "special.h"
-#include "specifier.h"
 #include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 #include "unit-name.h"
 #include "virt.h"
 

src/growfs/growfs.c

@@ -1,34 +1,28 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <linux/magic.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
-#include <sys/types.h>
 #include <sys/vfs.h>
 
-#include "sd-device.h"
-
+#include "alloc-util.h"
 #include "blockdev-util.h"
 #include "btrfs-util.h"
 #include "build.h"
 #include "cryptsetup-util.h"
-#include "device-nodes.h"
 #include "device-util.h"
 #include "devnum-util.h"
 #include "dissect-image.h"
-#include "escape.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "missing_fs.h"
 #include "mountpoint-util.h"
-#include "parse-util.h"
 #include "pretty-print.h"
 #include "resize-fs.h"
+#include "string-util.h"
 
 static const char *arg_target = NULL;
 static bool arg_dry_run = false;

src/growfs/makefs.c

@@ -4,7 +4,6 @@
 #include <sys/file.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -15,9 +14,6 @@
 #include "main-func.h"
 #include "mkfs-util.h"
 #include "path-util.h"
-#include "process-util.h"
-#include "signal-util.h"
-#include "string-util.h"
 
 static int run(int argc, char *argv[]) {
         _cleanup_free_ char *device = NULL, *fstype = NULL, *detected = NULL, *label = NULL;

src/hostname/hostnamectl.c

@@ -1,10 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
+#include <linux/vm_sockets.h>
 #include <locale.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "sd-bus.h"
@@ -12,13 +10,13 @@
 #include "sd-json.h"
 
 #include "alloc-util.h"
-#include "architecture.h"
 #include "build.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"
 #include "bus-message-util.h"
+#include "errno-util.h"
 #include "format-table.h"
 #include "hostname-setup.h"
 #include "hostname-util.h"
@@ -27,8 +25,9 @@
 #include "parse-argument.h"
 #include "polkit-agent.h"
 #include "pretty-print.h"
-#include "socket-util.h"
-#include "terminal-util.h"
+#include "runtime-scope.h"
+#include "string-util.h"
+#include "time-util.h"
 #include "verbs.h"
 
 static bool arg_ask_password = true;

src/hostname/hostnamed.c

@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/utsname.h>
 #include <unistd.h>
 
+#include "sd-bus.h"
 #include "sd-device.h"
+#include "sd-event.h"
 #include "sd-json.h"
 
 #include "alloc-util.h"
@@ -22,25 +22,26 @@
 #include "env-file.h"
 #include "env-file-label.h"
 #include "env-util.h"
+#include "extract-word.h"
 #include "fileio.h"
+#include "hashmap.h"
 #include "hostname-setup.h"
 #include "hostname-util.h"
 #include "id128-util.h"
 #include "json-util.h"
+#include "label-util.h"
 #include "log.h"
 #include "main-func.h"
 #include "nulstr-util.h"
 #include "os-util.h"
 #include "parse-util.h"
 #include "path-util.h"
-#include "selinux-util.h"
 #include "service-util.h"
-#include "signal-util.h"
 #include "socket-util.h"
 #include "stat-util.h"
-#include "string-table.h"
+#include "string-util.h"
 #include "strv.h"
-#include "user-util.h"
+#include "time-util.h"
 #include "utf8.h"
 #include "varlink-io.systemd.Hostname.h"
 #include "varlink-io.systemd.service.h"

src/hwdb/hwdb.c

@@ -2,16 +2,13 @@
 
 #include <getopt.h>
 
-#include "sd-hwdb.h"
-
 #include "alloc-util.h"
 #include "build.h"
 #include "hwdb-util.h"
+#include "label-util.h"
 #include "log.h"
 #include "main-func.h"
 #include "pretty-print.h"
-#include "selinux-util.h"
-#include "terminal-util.h"
 #include "verbs.h"
 
 static const char *arg_hwdb_bin_dir = NULL;

src/id128/id128.c

@@ -8,12 +8,13 @@
 #include "format-table.h"
 #include "gpt.h"
 #include "id128-print.h"
+#include "id128-util.h"
 #include "log.h"
 #include "main-func.h"
 #include "parse-argument.h"
 #include "pretty-print.h"
+#include "string-util.h"
 #include "strv.h"
-#include "terminal-util.h"
 #include "verbs.h"
 
 static Id128PrettyPrintMode arg_mode = ID128_PRINT_ID128;

src/initctl/initctl.c

@@ -1,11 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <ctype.h>
-#include <errno.h>
+#include <signal.h>
 #include <stdio.h>
 #include <sys/epoll.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
@@ -18,15 +17,13 @@
 #include "constants.h"
 #include "daemon-util.h"
 #include "fd-util.h"
-#include "format-util.h"
 #include "initreq.h"
 #include "list.h"
 #include "log.h"
 #include "main-func.h"
-#include "memory-util.h"
-#include "process-util.h"
 #include "reboot-util.h"
 #include "special.h"
+#include "time-util.h"
 
 #define SERVER_FD_MAX 16
 #define TIMEOUT_MSEC ((int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC))

src/kernel-install/kernel-install.c

@@ -1,8 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
-#include <stdbool.h>
+#include <stdlib.h>
 #include <sys/utsname.h>
+#include <unistd.h>
 
 #include "argv-util.h"
 #include "boot-entry.h"
@@ -10,6 +11,7 @@
 #include "chase.h"
 #include "conf-files.h"
 #include "dirent-util.h"
+#include "dissect-image.h"
 #include "env-file.h"
 #include "env-util.h"
 #include "exec-util.h"
@@ -23,8 +25,8 @@
 #include "image-policy.h"
 #include "kernel-config.h"
 #include "kernel-image.h"
+#include "loop-util.h"
 #include "main-func.h"
-#include "mkdir.h"
 #include "mount-util.h"
 #include "parse-argument.h"
 #include "path-util.h"

src/keyutil/keyutil.c

@@ -14,6 +14,7 @@
 #include "openssl-util.h"
 #include "parse-argument.h"
 #include "pretty-print.h"
+#include "string-util.h"
 #include "tmpfile-util.h"
 #include "verbs.h"
 

src/machine-id-setup/machine-id-setup-main.c

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "alloc-util.h"
 #include "build.h"
@@ -11,13 +9,12 @@
 #include "id128-util.h"
 #include "image-policy.h"
 #include "log.h"
+#include "loop-util.h"
 #include "machine-id-setup.h"
 #include "main-func.h"
 #include "mount-util.h"
 #include "parse-argument.h"
-#include "path-util.h"
 #include "pretty-print.h"
-#include "terminal-util.h"
 
 static char *arg_root = NULL;
 static char *arg_image = NULL;

src/measure/measure.c

@@ -9,6 +9,7 @@
 #include "ask-password-api.h"
 #include "build.h"
 #include "efi-loader.h"
+#include "efivars.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "hexdecoct.h"
@@ -19,11 +20,9 @@
 #include "pager.h"
 #include "parse-argument.h"
 #include "parse-util.h"
-#include "pe-binary.h"
 #include "pretty-print.h"
-#include "sha256.h"
+#include "string-util.h"
 #include "strv.h"
-#include "terminal-util.h"
 #include "tpm2-pcr.h"
 #include "tpm2-util.h"
 #include "uki.h"

src/modules-load/modules-load.c

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
-#include <limits.h>
 #include <sys/stat.h>
 
 #include "alloc-util.h"

src/mount/mount-tool.c

@@ -13,17 +13,14 @@
 #include "bus-wait-for-jobs.h"
 #include "chase.h"
 #include "device-util.h"
-#include "dirent-util.h"
+#include "errno-util.h"
 #include "escape.h"
 #include "fd-util.h"
-#include "fileio.h"
 #include "format-table.h"
 #include "format-util.h"
-#include "fs-util.h"
 #include "fstab-util.h"
 #include "libmount-util.h"
 #include "main-func.h"
-#include "mount-util.h"
 #include "mountpoint-util.h"
 #include "pager.h"
 #include "parse-argument.h"
@@ -32,12 +29,12 @@
 #include "polkit-agent.h"
 #include "pretty-print.h"
 #include "process-util.h"
-#include "sort-util.h"
+#include "runtime-scope.h"
 #include "stat-util.h"
+#include "string-util.h"
 #include "strv.h"
-#include "terminal-util.h"
+#include "time-util.h"
 #include "udev-util.h"
-#include "umask-util.h"
 #include "unit-def.h"
 #include "unit-name.h"
 #include "user-util.h"

src/notify/notify.c

@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,13 +21,12 @@
 #include "main-func.h"
 #include "notify-recv.h"
 #include "parse-util.h"
+#include "pidref.h"
 #include "pretty-print.h"
 #include "process-util.h"
 #include "signal-util.h"
-#include "socket-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "terminal-util.h"
 #include "time-util.h"
 #include "user-util.h"
 

src/pcrextend/pcrextend.c

@@ -12,11 +12,10 @@
 #include "escape.h"
 #include "json-util.h"
 #include "main-func.h"
-#include "openssl-util.h"
 #include "parse-argument.h"
-#include "parse-util.h"
 #include "pcrextend-util.h"
 #include "pretty-print.h"
+#include "string-util.h"
 #include "strv.h"
 #include "tpm2-pcr.h"
 #include "tpm2-util.h"

src/pcrlock/pcrlock-firmware.c

@@ -3,6 +3,7 @@
 #include <openssl/evp.h>
 
 #include "log.h"
+#include "memory-util.h"
 #include "pcrlock-firmware.h"
 #include "unaligned.h"
 

src/pcrlock/pcrlock-firmware.h

@@ -1,10 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/types.h>
-
+#include "forward.h"
 #include "tpm2-event-log.h"
-#include "tpm2-util.h"
 
 int validate_firmware_event(
                 const TCG_PCR_EVENT2 *event,

src/pcrlock/pcrlock.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
-#include <math.h>
 #include <openssl/evp.h>
 #include <sys/file.h>
+#include <unistd.h>
 
 #include "sd-device.h"
 #include "sd-json.h"
@@ -20,23 +20,23 @@
 #include "conf-files.h"
 #include "creds-util.h"
 #include "efi-api.h"
+#include "efivars.h"
 #include "env-util.h"
+#include "errno-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "find-esp.h"
 #include "format-table.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "gpt.h"
-#include "hash-funcs.h"
 #include "hexdecoct.h"
 #include "initrd-util.h"
 #include "json-util.h"
 #include "list.h"
 #include "main-func.h"
 #include "mkdir-label.h"
-#include "openssl-util.h"
 #include "ordered-set.h"
 #include "parse-argument.h"
 #include "parse-util.h"
@@ -46,16 +46,16 @@
 #include "pe-binary.h"
 #include "pretty-print.h"
 #include "proc-cmdline.h"
-#include "random-util.h"
 #include "recovery-key.h"
 #include "sort-util.h"
 #include "string-table.h"
+#include "string-util.h"
 #include "strv.h"
-#include "terminal-util.h"
+#include "time-util.h"
+#include "tpm2-pcr.h"
 #include "tpm2-util.h"
 #include "unaligned.h"
 #include "unit-name.h"
-#include "user-util.h"
 #include "utf8.h"
 #include "varlink-io.systemd.PCRLock.h"
 #include "varlink-util.h"

src/pstore/pstore.c

@@ -4,46 +4,29 @@
 
 /* Generally speaking, the pstore contains a small number of files
  * that in turn contain a small amount of data.  */
-#include <errno.h>
 #include <stdio.h>
 #include <stdio_ext.h>
 #include <sys/prctl.h>
 #include <sys/xattr.h>
 #include <unistd.h>
 
-#include "sd-daemon.h"
 #include "sd-journal.h"
-#include "sd-login.h"
-#include "sd-messages.h"
 
-#include "acl-util.h"
 #include "alloc-util.h"
-#include "capability-util.h"
-#include "cgroup-util.h"
-#include "compress.h"
 #include "conf-parser.h"
 #include "copy.h"
 #include "dirent-util.h"
-#include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "fs-util.h"
 #include "iovec-util.h"
-#include "journal-importer.h"
 #include "log.h"
-#include "macro.h"
 #include "main-func.h"
 #include "mkdir.h"
 #include "parse-util.h"
-#include "process-util.h"
-#include "signal-util.h"
-#include "socket-util.h"
 #include "sort-util.h"
-#include "special.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
-#include "user-util.h"
 
 /* Command line argument handling */
 typedef enum PStoreStorage {

src/ptyfwd/ptyfwd-tool.c

@@ -9,11 +9,14 @@
 #include "fd-util.h"
 #include "log.h"
 #include "main-func.h"
+#include "pidref.h"
 #include "pretty-print.h"
 #include "process-util.h"
 #include "ptyfwd.h"
 #include "signal-util.h"
+#include "string-util.h"
 #include "strv.h"
+#include "terminal-util.h"
 
 static bool arg_quiet = false;
 static bool arg_read_only = false;

src/quotacheck/quotacheck.c

@@ -1,17 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
+#include "log.h"
 #include "main-func.h"
 #include "proc-cmdline.h"
 #include "process-util.h"
-#include "signal-util.h"
 #include "static-destruct.h"
 #include "string-util.h"
 

src/random-seed/random-seed.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <linux/random.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/xattr.h>
@@ -20,7 +20,6 @@
 #include "log.h"
 #include "main-func.h"
 #include "missing_random.h"
-#include "missing_syscall.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "pretty-print.h"

src/rc-local-generator/rc-local-generator.c

@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
-#include <stdio.h>
 #include <unistd.h>
 
-#include "alloc-util.h"
 #include "generator.h"
 #include "initrd-util.h"
 #include "log.h"

src/remount-fs/remount-fs.c

@@ -1,15 +1,17 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <mntent.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "env-util.h"
 #include "exit-status.h"
+#include "format-util.h"
 #include "fstab-util.h"
+#include "hashmap.h"
 #include "log.h"
 #include "main-func.h"
 #include "mount-setup.h"
@@ -17,7 +19,6 @@
 #include "path-util.h"
 #include "process-util.h"
 #include "signal-util.h"
-#include "strv.h"
 
 /* Goes through /etc/fstab and remounts all API file systems, applying options that are in /etc/fstab that
  * systemd might not have respected. */

src/repart/repart.c

@@ -11,7 +11,6 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 
-#include "sd-device.h"
 #include "sd-id128.h"
 #include "sd-json.h"
 
@@ -31,8 +30,11 @@
 #include "device-util.h"
 #include "devnum-util.h"
 #include "dirent-util.h"
+#include "dissect-image.h"
 #include "efivars.h"
+#include "env-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "factory-reset.h"
 #include "fd-util.h"
 #include "fdisk-util.h"
@@ -50,10 +52,8 @@
 #include "io-util.h"
 #include "json-util.h"
 #include "list.h"
-#include "logarithm.h"
 #include "loop-util.h"
 #include "main-func.h"
-#include "missing_fs.h"
 #include "mkdir.h"
 #include "mkfs-util.h"
 #include "mount-util.h"
@@ -64,19 +64,19 @@
 #include "parse-helpers.h"
 #include "parse-util.h"
 #include "pretty-print.h"
-#include "proc-cmdline.h"
 #include "process-util.h"
 #include "random-util.h"
 #include "resize-fs.h"
 #include "rm-rf.h"
+#include "set.h"
 #include "sort-util.h"
 #include "specifier.h"
-#include "stdio-util.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
 #include "sync-util.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "tmpfile-util.h"
 #include "tpm2-pcr.h"
 #include "tpm2-util.h"

src/reply-password/reply-password.c

@@ -1,16 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
-#include <stddef.h>
 #include <sys/un.h>
 
-#include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
-#include "macro.h"
 #include "main-func.h"
-#include "memory-util.h"
 #include "socket-util.h"
 #include "string-util.h"
 

src/rfkill/rfkill.c

@@ -4,7 +4,6 @@
 #include <linux/rfkill.h>
 #include <poll.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "sd-daemon.h"
@@ -19,11 +18,11 @@
 #include "io-util.h"
 #include "list.h"
 #include "main-func.h"
-#include "mkdir.h"
 #include "parse-util.h"
 #include "reboot-util.h"
 #include "string-table.h"
 #include "string-util.h"
+#include "time-util.h"
 #include "udev-util.h"
 
 /* Note that any write is delayed until exit and the rfkill state will not be

src/run-generator/run-generator.c

@@ -3,15 +3,15 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "generator.h"
 #include "glyph-util.h"
-#include "mkdir.h"
+#include "log.h"
 #include "proc-cmdline.h"
 #include "special.h"
 #include "specifier.h"
+#include "string-util.h"
 #include "strv.h"
 
 static const char *arg_dest = NULL;

src/run/run.c

@@ -3,8 +3,9 @@
 #include <fcntl.h>
 #include <getopt.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <sys/resource.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #include "sd-bus.h"
 #include "sd-daemon.h"
@@ -25,6 +26,7 @@
 #include "capsule-util.h"
 #include "chase.h"
 #include "env-util.h"
+#include "errno-util.h"
 #include "escape.h"
 #include "event-util.h"
 #include "exec-util.h"
@@ -35,22 +37,25 @@
 #include "format-util.h"
 #include "fs-util.h"
 #include "hostname-setup.h"
-#include "hostname-util.h"
 #include "log.h"
 #include "main-func.h"
 #include "osc-context.h"
 #include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
+#include "pidref.h"
 #include "polkit-agent.h"
 #include "pretty-print.h"
 #include "process-util.h"
 #include "ptyfwd.h"
+#include "runtime-scope.h"
 #include "signal-util.h"
 #include "special.h"
 #include "string-table.h"
+#include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "uid-classification.h"
 #include "unit-def.h"
 #include "unit-name.h"

src/sbsign/authenticode.h

@@ -3,7 +3,7 @@
 
 #include <openssl/asn1t.h>
 
-#include "memory-util.h"
+#include "forward.h"
 
 #define SPC_INDIRECT_DATA_OBJID "1.3.6.1.4.1.311.2.1.4"
 #define SPC_PE_IMAGE_DATA_OBJID "1.3.6.1.4.1.311.2.1.15"

src/sbsign/sbsign.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "ansi-color.h"
@@ -11,6 +12,7 @@
 #include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "fs-util.h"
 #include "io-util.h"
 #include "log.h"
 #include "main-func.h"
@@ -19,6 +21,8 @@
 #include "pe-binary.h"
 #include "pretty-print.h"
 #include "stat-util.h"
+#include "string-util.h"
+#include "time-util.h"
 #include "tmpfile-util.h"
 #include "verbs.h"
 

src/shared/tpm2-util.h

@@ -55,7 +55,7 @@ static inline bool TPM2_PCR_MASK_VALID(uint32_t pcr_mask) {
 
 int dlopen_tpm2(void);
 
-typedef struct {
+typedef struct Tpm2Context {
         unsigned n_ref;
 
         void *tcti_dl;
@@ -78,7 +78,7 @@ Tpm2Context *tpm2_context_ref(Tpm2Context *context);
 Tpm2Context *tpm2_context_unref(Tpm2Context *context);
 DEFINE_TRIVIAL_CLEANUP_FUNC(Tpm2Context*, tpm2_context_unref);
 
-typedef struct {
+typedef struct Tpm2Handle {
         Tpm2Context *tpm2_context;
         ESYS_TR esys_handle;
 
@@ -94,7 +94,7 @@ int tpm2_handle_new(Tpm2Context *context, Tpm2Handle **ret_handle);
 Tpm2Handle *tpm2_handle_free(Tpm2Handle *handle);
 DEFINE_TRIVIAL_CLEANUP_FUNC(Tpm2Handle*, tpm2_handle_free);
 
-typedef struct {
+typedef struct Tpm2PCRValue {
         unsigned index;
         TPMI_ALG_HASH hash;
         TPM2B_DIGEST value;
@@ -370,9 +370,9 @@ int tpm2_hmac_key_from_pin(Tpm2Context *c, const Tpm2Handle *session, const TPM2
         })
 
 #else /* HAVE_TPM2 */
-typedef struct {} Tpm2Context;
-typedef struct {} Tpm2Handle;
-typedef struct {} Tpm2PCRValue;
+typedef struct Tpm2Context {} Tpm2Context;
+typedef struct Tpm2Handle {} Tpm2Handle;
+typedef struct Tpm2PCRValue {} Tpm2PCRValue;
 
 #define TPM2_PCR_VALUE_MAKE(i, h, v) (Tpm2PCRValue) {}
 
@@ -440,7 +440,7 @@ char* tpm2_pcr_mask_to_string(uint32_t mask);
 
 extern const uint16_t tpm2_hash_algorithms[];
 
-typedef struct {
+typedef struct systemd_tpm2_plugin_params {
         uint32_t search_pcr_mask;
         const char *device;
         const char *signature_path;

src/sleep/battery-capacity.c

@@ -5,15 +5,14 @@
 #include "alloc-util.h"
 #include "battery-capacity.h"
 #include "battery-util.h"
-#include "device-private.h"
 #include "device-util.h"
 #include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "hexdecoct.h"
 #include "id128-util.h"
 #include "parse-util.h"
 #include "siphash24.h"
+#include "string-util.h"
 
 #define DISCHARGE_RATE_FILEPATH "/var/lib/systemd/sleep/battery_discharge_percentage_rate_per_hour"
 #define BATTERY_DISCHARGE_RATE_HASH_KEY SD_ID128_MAKE(5f,9a,20,18,38,76,46,07,8d,36,58,0b,bb,c4,e0,63)

src/sleep/sleep.c

@@ -4,12 +4,11 @@
   Copyright © 2018 Dell Inc.
 ***/
 
-#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <poll.h>
+#include <stdlib.h>
 #include <sys/timerfd.h>
-#include <sys/types.h>
 #include <sys/utsname.h>
 #include <unistd.h>
 
@@ -29,25 +28,20 @@
 #include "bus-unit-util.h"
 #include "bus-util.h"
 #include "constants.h"
-#include "devnum-util.h"
 #include "efivars.h"
 #include "env-util.h"
+#include "errno-util.h"
 #include "exec-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "format-util.h"
 #include "hibernate-util.h"
-#include "id128-util.h"
 #include "io-util.h"
 #include "log.h"
 #include "main-func.h"
 #include "os-util.h"
-#include "parse-util.h"
 #include "pretty-print.h"
 #include "sleep-config.h"
 #include "special.h"
-#include "stdio-util.h"
-#include "string-util.h"
 #include "strv.h"
 #include "time-util.h"
 

src/socket-activate/socket-activate.c

@@ -15,17 +15,15 @@
 #include "errno-util.h"
 #include "escape.h"
 #include "fd-util.h"
+#include "format-util.h"
 #include "log.h"
-#include "macro.h"
 #include "main-func.h"
 #include "pretty-print.h"
 #include "process-util.h"
-#include "signal-util.h"
 #include "socket-netlink.h"
 #include "socket-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "terminal-util.h"
 
 static char **arg_listen = NULL;
 static bool arg_accept = false;

src/socket-proxy/socket-proxyd.c

@@ -1,11 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <netdb.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/un.h>
 #include <unistd.h>
 
@@ -22,12 +20,12 @@
 #include "log.h"
 #include "main-func.h"
 #include "parse-util.h"
-#include "path-util.h"
 #include "pretty-print.h"
 #include "resolve-private.h"
 #include "set.h"
 #include "socket-util.h"
 #include "string-util.h"
+#include "time-util.h"
 
 #define BUFFER_SIZE (256 * 1024)
 

src/ssh-generator/ssh-generator.c

@@ -6,10 +6,12 @@
 
 #include "alloc-util.h"
 #include "creds-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "generator.h"
 #include "install.h"
+#include "log.h"
 #include "missing_socket.h"
 #include "parse-util.h"
 #include "path-util.h"
@@ -18,6 +20,7 @@
 #include "socket-util.h"
 #include "special.h"
 #include "string-util.h"
+#include "strv.h"
 #include "virt.h"
 
 /* A small generator binding potentially five or more SSH sockets:

src/ssh-generator/ssh-proxy.c

@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if_arp.h>
-#include <stdio.h>
 #include <unistd.h>
 
 #include "sd-varlink.h"
@@ -13,7 +12,6 @@
 #include "log.h"
 #include "main-func.h"
 #include "missing_socket.h"
-#include "parse-util.h"
 #include "socket-util.h"
 #include "string-util.h"
 #include "strv.h"

src/stdio-bridge/stdio-bridge.c

@@ -1,15 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
-#include <stddef.h>
-#include <string.h>
+#include <poll.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
 #include "sd-daemon.h"
 
-#include "alloc-util.h"
 #include "build.h"
 #include "bus-internal.h"
 #include "bus-util.h"
@@ -17,6 +14,7 @@
 #include "io-util.h"
 #include "log.h"
 #include "main-func.h"
+#include "time-util.h"
 
 static const char *arg_bus_path = DEFAULT_SYSTEM_BUS_ADDRESS;
 static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;

src/storagetm/storagetm.c

@@ -1,7 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
+#include <stdlib.h>
 #include <sys/file.h>
+#include <unistd.h>
+
+#include "sd-event.h"
+#include "sd-netlink.h"
 
 #include "af-list.h"
 #include "alloc-util.h"
@@ -12,24 +17,25 @@
 #include "device-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "format-util.h"
 #include "fs-util.h"
+#include "hashmap.h"
 #include "id128-util.h"
 #include "local-addresses.h"
-#include "loop-util.h"
 #include "main-func.h"
 #include "mountpoint-util.h"
 #include "os-util.h"
-#include "parse-argument.h"
 #include "path-util.h"
 #include "plymouth-util.h"
 #include "pretty-print.h"
-#include "process-util.h"
 #include "random-util.h"
 #include "recurse-dir.h"
+#include "siphash24.h"
 #include "socket-util.h"
+#include "stat-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "udev-util.h"
 
 static char **arg_devices = NULL;

src/sulogin-shell/sulogin-shell.c

@@ -3,24 +3,23 @@
   Copyright © 2017 Felipe Sateler
 ***/
 
-#include <errno.h>
 #include <sys/prctl.h>
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-unit-util.h"
 #include "bus-util.h"
-#include "constants.h"
 #include "env-util.h"
 #include "initrd-util.h"
 #include "log.h"
 #include "main-func.h"
 #include "proc-cmdline.h"
 #include "process-util.h"
-#include "signal-util.h"
 #include "special.h"
+#include "string-util.h"
 #include "unit-def.h"
 
 static int target_is_inactive(sd_bus *bus, const char *target) {

src/sysctl/sysctl.c

@@ -1,13 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
-#include <limits.h>
-#include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #include "alloc-util.h"
 #include "build.h"

src/sysext/sysext.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <linux/loop.h>
+#include <stdlib.h>
 #include <sys/file.h>
 #include <sys/mount.h>
 #include <unistd.h>
@@ -14,17 +14,15 @@
 #include "argv-util.h"
 #include "blockdev-util.h"
 #include "build.h"
-#include "bus-error.h"
-#include "bus-locator.h"
 #include "bus-unit-util.h"
 #include "bus-util.h"
 #include "capability-util.h"
 #include "chase.h"
-#include "constants.h"
 #include "devnum-util.h"
 #include "discover-image.h"
 #include "dissect-image.h"
 #include "env-util.h"
+#include "errno-util.h"
 #include "escape.h"
 #include "extension-util.h"
 #include "fd-util.h"
@@ -32,8 +30,10 @@
 #include "format-table.h"
 #include "fs-util.h"
 #include "hashmap.h"
+#include "image-policy.h"
 #include "initrd-util.h"
 #include "log.h"
+#include "loop-util.h"
 #include "main-func.h"
 #include "missing_magic.h"
 #include "mkdir.h"
@@ -47,11 +47,14 @@
 #include "pretty-print.h"
 #include "process-util.h"
 #include "rm-rf.h"
+#include "runtime-scope.h"
 #include "selinux-util.h"
 #include "sort-util.h"
+#include "stat-util.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "terminal-util.h"
+#include "strv.h"
+#include "time-util.h"
 #include "user-util.h"
 #include "varlink-io.systemd.sysext.h"
 #include "varlink-util.h"

src/system-update-generator/system-update-generator.c

@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <unistd.h>
 
 #include "alloc-util.h"

src/sysusers/sysusers.c

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
+#include <stdlib.h>
+#include <sys/stat.h>
 
 #if HAVE_AUDIT
 #  include <libaudit.h>
@@ -15,6 +17,8 @@
 #include "creds-util.h"
 #include "dissect-image.h"
 #include "env-util.h"
+#include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"
@@ -23,26 +27,25 @@
 #include "image-policy.h"
 #include "libaudit-util.h"
 #include "libcrypt-util.h"
+#include "log.h"
+#include "loop-util.h"
 #include "main-func.h"
-#include "memory-util.h"
 #include "mount-util.h"
 #include "pager.h"
 #include "parse-argument.h"
 #include "path-util.h"
 #include "pretty-print.h"
-#include "selinux-util.h"
 #include "set.h"
 #include "smack-util.h"
 #include "specifier.h"
-#include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "sync-util.h"
+#include "time-util.h"
 #include "tmpfile-util-label.h"
 #include "uid-classification.h"
 #include "uid-range.h"
 #include "user-util.h"
-#include "utf8.h"
 #include "verbs.h"
 
 typedef enum ItemType {

src/sysv-generator/sysv-generator.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #include "sd-messages.h"
@@ -9,16 +9,16 @@
 #include "alloc-util.h"
 #include "dirent-util.h"
 #include "exit-status.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "generator.h"
+#include "glyph-util.h"
 #include "hashmap.h"
 #include "hexdecoct.h"
 #include "initrd-util.h"
 #include "install.h"
 #include "log.h"
-#include "main-func.h"
-#include "mkdir.h"
 #include "path-lookup.h"
 #include "path-util.h"
 #include "set.h"

src/tmpfiles/offline-passwd.c

@@ -3,9 +3,12 @@
 #include "alloc-util.h"
 #include "chase.h"
 #include "fd-util.h"
+#include "hash-funcs.h"
+#include "hashmap.h"
 #include "log.h"
 #include "offline-passwd.h"
 #include "path-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
 

src/tmpfiles/offline-passwd.h

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/types.h>
-
-#include "hashmap.h"
+#include "forward.h"
 
 int name_to_uid_offline(const char *root, const char *user, uid_t *ret_uid, Hashmap **cache);
 int name_to_gid_offline(const char *root, const char *group, gid_t *ret_gid, Hashmap **cache);

src/tmpfiles/test-offline-passwd.c

@@ -3,9 +3,9 @@
 #include <getopt.h>
 
 #include "format-util.h"
+#include "hashmap.h"
 #include "offline-passwd.h"
 #include "tests.h"
-#include "user-util.h"
 
 static char *arg_root = NULL;
 

src/tmpfiles/tmpfiles.c

@@ -1,13 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
 #include <getopt.h>
-#include <limits.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
 #include <sys/file.h>
 #include <sysexits.h>
 #include <time.h>
@@ -33,6 +28,7 @@
 #include "env-util.h"
 #include "errno-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"
@@ -43,10 +39,9 @@
 #include "io-util.h"
 #include "label-util.h"
 #include "log.h"
-#include "macro.h"
+#include "loop-util.h"
 #include "main-func.h"
 #include "missing_fs.h"
-#include "missing_syscall.h"
 #include "mkdir-label.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
@@ -64,12 +59,11 @@
 #include "sort-util.h"
 #include "specifier.h"
 #include "stat-util.h"
-#include "stdio-util.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
 #include "sysctl-util.h"
-#include "terminal-util.h"
+#include "time-util.h"
 #include "umask-util.h"
 #include "user-util.h"
 #include "verbs.h"

src/tpm2-setup/tpm2-clear.c

@@ -8,6 +8,7 @@
 #include "build.h"
 #include "env-util.h"
 #include "fileio.h"
+#include "log.h"
 #include "main-func.h"
 #include "pretty-print.h"
 #include "proc-cmdline.h"

src/tpm2-setup/tpm2-generator.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "generator.h"
+#include "log.h"
 #include "parse-util.h"
 #include "proc-cmdline.h"
 #include "special.h"

src/tpm2-setup/tpm2-setup.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "sd-messages.h"
@@ -16,7 +17,7 @@
 #include "mkdir.h"
 #include "parse-util.h"
 #include "pretty-print.h"
-#include "terminal-util.h"
+#include "string-util.h"
 #include "tmpfile-util.h"
 #include "tpm2-util.h"
 

src/tty-ask-password-agent/tty-ask-password-agent.c

@@ -3,15 +3,13 @@
   Copyright © 2015 Werner Fink
 ***/
 
-#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <poll.h>
+#include <stdlib.h>
 #include <sys/prctl.h>
 #include <sys/signalfd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/un.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ -20,19 +18,17 @@
 #include "ask-password-api.h"
 #include "build.h"
 #include "conf-parser.h"
-#include "constants.h"
 #include "daemon-util.h"
 #include "devnum-util.h"
 #include "dirent-util.h"
+#include "errno-util.h"
 #include "exit-status.h"
 #include "fd-util.h"
+#include "format-util.h"
 #include "fileio.h"
-#include "hashmap.h"
 #include "inotify-util.h"
 #include "io-util.h"
-#include "macro.h"
 #include "main-func.h"
-#include "memory-util.h"
 #include "mkdir-label.h"
 #include "path-util.h"
 #include "pretty-print.h"
@@ -44,6 +40,7 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "wall.h"
 
 static enum {

src/update-done/update-done.c

@@ -2,7 +2,6 @@
 
 #include <getopt.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -10,12 +9,12 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "label-util.h"
 #include "log.h"
 #include "main-func.h"
 #include "parse-argument.h"
-#include "path-util.h"
 #include "pretty-print.h"
-#include "selinux-util.h"
+#include "string-util.h"
 #include "time-util.h"
 
 static char *arg_root = NULL;

src/update-utmp/update-utmp.c

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #if HAVE_AUDIT
@@ -15,17 +13,15 @@
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-util.h"
-#include "format-util.h"
 #include "libaudit-util.h"
 #include "log.h"
-#include "macro.h"
 #include "main-func.h"
-#include "process-util.h"
 #include "random-util.h"
 #include "special.h"
 #include "stdio-util.h"
 #include "strv.h"
-#include "unit-name.h"
+#include "time-util.h"
+#include "unit-def.h"
 #include "utmp-wtmp.h"
 #include "verbs.h"
 

src/user-sessions/user-sessions.c

@@ -1,16 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "fs-util.h"
+#include "label-util.h"
 #include "log.h"
 #include "main-func.h"
 #include "reboot-util.h"
-#include "selinux-util.h"
 #include "string-util.h"
 
 static int run(int argc, char *argv[]) {

src/validatefs/validatefs.c

@@ -2,6 +2,8 @@
 
 #include <getopt.h>
 
+#include "sd-device.h"
+
 #include "alloc-util.h"
 #include "blkid-util.h"
 #include "blockdev-util.h"
@@ -12,6 +14,7 @@
 #include "fd-util.h"
 #include "gpt.h"
 #include "initrd-util.h"
+#include "log.h"
 #include "main-func.h"
 #include "mountpoint-util.h"
 #include "parse-argument.h"

src/varlinkctl/varlinkctl.c

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
+#include <stdlib.h>
+#include <sys/stat.h>
 
 #include "sd-daemon.h"
 #include "sd-varlink.h"
@@ -10,17 +12,18 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-table.h"
-#include "io-util.h"
+#include "format-util.h"
 #include "log.h"
 #include "main-func.h"
 #include "memfd-util.h"
 #include "pager.h"
 #include "parse-argument.h"
-#include "path-util.h"
 #include "pretty-print.h"
 #include "process-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "varlink-idl-util.h"
 #include "varlink-util.h"
 #include "verbs.h"

src/vconsole/vconsole-setup.c

@@ -3,25 +3,19 @@
   Copyright © 2016 Michal Soltys <soltys@ziu.info>
 ***/
 
-#include <errno.h>
 #include <fcntl.h>
-#include <limits.h>
 #include <linux/kd.h>
 #include <linux/tiocl.h>
 #include <linux/vt.h>
-#include <stdbool.h>
-#include <stdlib.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sysexits.h>
 #include <termios.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
 #include "creds-util.h"
-#include "dev-setup.h"
 #include "env-file.h"
 #include "errno-util.h"
 #include "fd-util.h"
@@ -32,12 +26,10 @@
 #include "main-func.h"
 #include "proc-cmdline.h"
 #include "process-util.h"
-#include "signal-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "virt.h"
 
 typedef struct Context {
         char *keymap;

src/veritysetup/veritysetup-generator.c

@@ -1,20 +1,18 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "sd-id128.h"
+
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fstab-util.h"
 #include "generator.h"
 #include "hexdecoct.h"
-#include "id128-util.h"
-#include "main-func.h"
-#include "mkdir.h"
+#include "log.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "proc-cmdline.h"

src/veritysetup/veritysetup.c

@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <stdio.h>
 #include <sys/stat.h>
 
@@ -18,9 +17,8 @@
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
-#include "process-util.h"
 #include "string-util.h"
-#include "terminal-util.h"
+#include "strv.h"
 #include "verbs.h"
 
 static char *arg_hash = NULL; /* the hash algorithm */

src/volatile-root/volatile-root.c

@@ -13,6 +13,7 @@
 #include "mount-util.h"
 #include "mountpoint-util.h"
 #include "path-util.h"
+#include "stat-util.h"
 #include "string-util.h"
 #include "volatile-util.h"
 

src/vpick/vpick-tool.c

@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <dirent.h>
 #include <getopt.h>
 
 #include "alloc-util.h"
 #include "architecture.h"
 #include "build.h"
 #include "format-table.h"
-#include "fs-util.h"
 #include "log.h"
 #include "main-func.h"
 #include "parse-util.h"
@@ -15,7 +15,6 @@
 #include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "terminal-util.h"
 #include "vpick.h"
 
 static char *arg_filter_basename = NULL;