tree-wide: Clean up includes

This commit cleans up the includes for all the small tools across
the tree.

A few cases of returning EXIT_SUCCESS are replaced with returning
0 to avoid including <stdlib.h>.

Split out of #37344.

diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c
index b6760a980bbfa6bcd1d627c754ca87feb66b8eab..c56dfc23468c0ff043e7cba76b367c0ffee6e993 100644 (file)
--- a/src/ask-password/ask-password.c
+++ b/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"
 

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index 0fa52093052bb39b0a62ad02b1d13b5ac55b2362..910e5b49f15ebc83480d9ed9a6544890fe4d94ce 100644 (file)
--- a/src/backlight/backlight.c
+++ b/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

diff --git a/src/battery-check/battery-check.c b/src/battery-check/battery-check.c
index b6cbbbb84fc74d16d2f14b0c862fdd4e24c9c20b..207f477f1c5a9df4de9c713b732337b1d1ae611c 100644 (file)
--- a/src/battery-check/battery-check.c
+++ b/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"
 

diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index eb91e916ded9101a2b043a117d04e733d47e10ac..36e1d5d135d4274132a51e2565ec93a4df6a9fa1 100644 (file)
--- a/src/binfmt/binfmt.c
+++ b/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"

diff --git a/src/bless-boot/bless-boot-generator.c b/src/bless-boot/bless-boot-generator.c
index 2c3d54173db7bf34ad11f01c41612644a431e53d..1a99ed5b68448e5605e1ff1ebd511c2f7048301f 100644 (file)
--- a/src/bless-boot/bless-boot-generator.c
+++ b/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) {

diff --git a/src/bless-boot/bless-boot.c b/src/bless-boot/bless-boot.c
index 3fbd09b7e1eb8c252217467252fdc3038f16e0d2..9b2dc08d612670f96d192295e5958bbb9afb418f 100644 (file)
--- a/src/bless-boot/bless-boot.c
+++ b/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"
 

diff --git a/src/bless-boot/boot-check-no-failures.c b/src/bless-boot/boot-check-no-failures.c
index 56c63b71a9cac52b2f56c4b4f7c60c71e1742dfe..b3018924748f1cc954a8deac3324f269d11f0db5 100644 (file)
--- a/src/bless-boot/boot-check-no-failures.c
+++ b/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;

diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index 1dcd316cdb379b08d80c72a5e496546661293b2f..266cec4df47e90d016d6bb8e86a2b8b31ab796aa 100644 (file)
--- a/src/cgls/cgls.c
+++ b/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"
 

diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index 93bd549d6938b17604660b29e3a2adca7c66004a..705a32df0ba58f8c4d787e82e6c758160b7a4554 100644 (file)
--- a/src/cgtop/cgtop.c
+++ b/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 {

diff --git a/src/creds/creds.c b/src/creds/creds.c
index 7295bb7bd136ec718f7cc1f496ef9873a8994a9b..14116b03f97a3d498fff8b8234f3288dad58b8ae 100644 (file)
--- a/src/creds/creds.c
+++ b/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"

diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c
index 098e06ca5dbeca8ec372b7d41f15c5cc783987dc..86014b85f7077a2115e829a441c9c5887ef8f3a4 100644 (file)
--- a/src/debug-generator/debug-generator.c
+++ b/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"

diff --git a/src/delta/delta.c b/src/delta/delta.c
index a6c0a7c1f3081484d7dab1264f9bb58bbf122f79..2dc2494556665b7bbed62cd1562e387102db0060 100644 (file)
--- a/src/delta/delta.c
+++ b/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"

diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c
index 4f5f5d19e4b95b0a3bcc1ba9eeacc568f2e806b2..3513f0b3b186aed75e97da906643e98ac7b82d2c 100644 (file)
--- a/src/detect-virt/detect-virt.c
+++ b/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"

diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index 5db462f4ffaa8339e95d87d99a11f20c400a6d7e..9db5f642bbc7b97fec6ad6feb381a1ea40299cad 100644 (file)
--- a/src/dissect/dissect.c
+++ b/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"

diff --git a/src/environment-d-generator/environment-d-generator.c b/src/environment-d-generator/environment-d-generator.c
index 33f400864b82930b3ea496abbec6038e9ecaaa6b..91ffaa24ea0758da0d61e0ff27b9b25234e9c574 100644 (file)
--- a/src/environment-d-generator/environment-d-generator.c
+++ b/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) {

diff --git a/src/escape/escape.c b/src/escape/escape.c
index f71d4da7493dd54fc266a447ba6198d6cad481d6..0742bf3f05de087a350a53a74104c7e0b94f4084 100644 (file)
--- a/src/escape/escape.c
+++ b/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 {

diff --git a/src/factory-reset/factory-reset-generator.c b/src/factory-reset/factory-reset-generator.c
index 5755eca2b8061d7fe4274eb06250b95429ec033d..4ce4d2fa61893e46e730ad9da998f03a71e71931 100644 (file)
--- a/src/factory-reset/factory-reset-generator.c
+++ b/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.");

diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 3349094e91cf876e64577ab0f18f84c45c0c8a34..48c0b163b8ef7fa6327fc77ccc56b2d007e3c12f 100644 (file)
--- a/src/firstboot/firstboot.c
+++ b/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"

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index c8dea245c8e52b5f20d222277dfdd2a4549d56f4..da37ace7d1e50568ef328fc45e649ef531b94c0c 100644 (file)
--- a/src/fsck/fsck.c
+++ b/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;

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 9f4162023bf08c7017a588fcd823cdffb893cad1..8c9352c349258ff06982350154fe9bd6afc4afaa 100644 (file)
--- a/src/fstab-generator/fstab-generator.c
+++ b/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"

diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
index 3f00810164fe5bbe74ea5e7428ecbbe9784cddec..810ee9a2f9f80e07e492743d9eb4f1f338f0b784 100644 (file)
--- a/src/getty-generator/getty-generator.c
+++ b/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"

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 103acffe772c989ae1f5c6c1e653b157b00308ff..8b2fd590201721244a5864b475241fbfaa7c6bdc 100644 (file)
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/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"
 

diff --git a/src/growfs/growfs.c b/src/growfs/growfs.c
index cb653ba0c76387f96b698a7a52e0220422b8f300..6ba7bce6e7bbbf38fd44122341995b795eb9483e 100644 (file)
--- a/src/growfs/growfs.c
+++ b/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;

diff --git a/src/growfs/makefs.c b/src/growfs/makefs.c
index 1e404bc7bfbc18343ad40ef6aeaba5feff0365cd..26f090f1db91b61998862ff269a9272b6b764a05 100644 (file)
--- a/src/growfs/makefs.c
+++ b/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;

diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index 6530098025d9006d3c8d06acb35c8737d1f56fa5..e2dfa2e677ed0075c1a3f43308953ae7ee287095 100644 (file)
--- a/src/hostname/hostnamectl.c
+++ b/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;

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 5fe4e7e07f9d59274d84e8b49bb572dbb1a3dda3..5f95e52f7f87347e78dd892df5180bfc62b56dad 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/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"

diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index 70ff1d769117f853068003d5f2c587dce5af66f5..6391b04133c5edc5a88a3f0f50302d7499cd1eb4 100644 (file)
--- a/src/hwdb/hwdb.c
+++ b/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;

diff --git a/src/id128/id128.c b/src/id128/id128.c
index e3f69a4f2a3e138bfc0a700eadfb7271bd7b9e43..cdb93ac68fab2caf81a1fdb7bcb0ee1cb757efeb 100644 (file)
--- a/src/id128/id128.c
+++ b/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;

diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index bf3092ff3147fb0c7ef570c6f1c191f3514f87f7..a387fb0d2839a1ff75d118e9d8f459ea38ada266 100644 (file)
--- a/src/initctl/initctl.c
+++ b/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))

diff --git a/src/kernel-install/kernel-install.c b/src/kernel-install/kernel-install.c
index 3774a129c49ac9a4bc0d4a9370201bafc75ed65f..4a743ac316f8475695d7ce39307268610631f7c3 100644 (file)
--- a/src/kernel-install/kernel-install.c
+++ b/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"

diff --git a/src/keyutil/keyutil.c b/src/keyutil/keyutil.c
index 8795b447bb3f999391a146ea97fd6fdcc7b08148..fa2f039d880bd0f3793e2546d7d8499d3b996b75 100644 (file)
--- a/src/keyutil/keyutil.c
+++ b/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"
 

diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index 956a538a7574e22bfc667939bb3e3b24891689d3..87adc892e19eb020c2dbdec2d65a2833102c9f1d 100644 (file)
--- a/src/machine-id-setup/machine-id-setup-main.c
+++ b/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;

diff --git a/src/measure/measure.c b/src/measure/measure.c
index fb18b1a9f7126652d6ebc8ef70d2e8eb5b82f147..b7cb216c8ff795ae6c222e0afa9fb20281837a84 100644 (file)
--- a/src/measure/measure.c
+++ b/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"

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index a09311d41d73a5ee271d398b1300ccf2da2205a8..ea1b717bb31107abfa25361da55734277955f88b 100644 (file)
--- a/src/modules-load/modules-load.c
+++ b/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"

diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index 71fe112702205ad640a95a03c98fcebd82e69168..8cb06c5162cb0519116e143842ef418f3c22823f 100644 (file)
--- a/src/mount/mount-tool.c
+++ b/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"

diff --git a/src/notify/notify.c b/src/notify/notify.c
index 4a0f88a40e9b1d500d5094826b972b14185d0029..facd1eb9eecbd1abf3240d098ddb705afb75ac2b 100644 (file)
--- a/src/notify/notify.c
+++ b/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"
 

diff --git a/src/pcrextend/pcrextend.c b/src/pcrextend/pcrextend.c
index d57fcfbfcc78d02acf1be45d26432e6d8217c511..75b561da90436dfb0ad543b8f9a01fb9f7a533df 100644 (file)
--- a/src/pcrextend/pcrextend.c
+++ b/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"

diff --git a/src/pcrlock/pcrlock-firmware.c b/src/pcrlock/pcrlock-firmware.c
index 34cb82cbcacdf18e52f9dc7da73b85727f4b053c..81481dc168968d0cf663794f096f29cbdf362396 100644 (file)
--- a/src/pcrlock/pcrlock-firmware.c
+++ b/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"
 

diff --git a/src/pcrlock/pcrlock-firmware.h b/src/pcrlock/pcrlock-firmware.h
index 169666ede99a9cae775a6618c951b7f51244f267..f87775e4bbff694029cb322c60fefcc854ea1ec2 100644 (file)
--- a/src/pcrlock/pcrlock-firmware.h
+++ b/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,

diff --git a/src/pcrlock/pcrlock.c b/src/pcrlock/pcrlock.c
index d821c6457e7461d3557e5939c2a4ae6d73355ad0..85ba0314c100c5f77a498a09aa9eb67b04d45e3b 100644 (file)
--- a/src/pcrlock/pcrlock.c
+++ b/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"

diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c
index b941c7e9102923186e46cf20c45a8755baaf5490..028d1b50ea8d97583ddec3e3d262a137e12b2b7b 100644 (file)
--- a/src/pstore/pstore.c
+++ b/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 {

diff --git a/src/ptyfwd/ptyfwd-tool.c b/src/ptyfwd/ptyfwd-tool.c
index 449c0ee4977cd9b5b98439cab1a3f70e9a692c24..a0ae7a2e2a6fc6935eae9dcbe529cc2a1d4c3554 100644 (file)
--- a/src/ptyfwd/ptyfwd-tool.c
+++ b/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;

diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index 63940142ac3eb550fedca4f07e7818fe7b8f765b..4daa19093db8a5014766dc6496b041c722223868 100644 (file)
--- a/src/quotacheck/quotacheck.c
+++ b/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"
 

diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
index 75e34056764d56172bdba20919f31c3909932b6e..deb78d991919e71199f0b902a9e42b754e5d156a 100644 (file)
--- a/src/random-seed/random-seed.c
+++ b/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"

diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c
index f680382bfcc31361497f87d3c4c353e49ed13686..8b1b75f569262cb91b971ffe62b47385e7d07fa4 100644 (file)
--- a/src/rc-local-generator/rc-local-generator.c
+++ b/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"

diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c
index e707eab5490e980eaa0276e15a81848bb265955b..83f6e2f337d567621c87b6fd727ef2d150a1fb3d 100644 (file)
--- a/src/remount-fs/remount-fs.c
+++ b/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. */

diff --git a/src/repart/repart.c b/src/repart/repart.c
index b7efa88e6f5ee66e1364ca262072e073ae06d74f..7cc5af9219d12a9c773d5014d675905110a404db 100644 (file)
--- a/src/repart/repart.c
+++ b/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"

diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index 93fbf11f91289a01356287d39ec957db0894d1ac..d0f1afe5e62e16b075fc27fef7d54a863e1c2db2 100644 (file)
--- a/src/reply-password/reply-password.c
+++ b/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"
 

diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
index 28301cd5270342ad4d0d33b0e6abd5d328f2186d..3e3c20d6179e14dabea0f9fa420824ff82c42099 100644 (file)
--- a/src/rfkill/rfkill.c
+++ b/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

diff --git a/src/run-generator/run-generator.c b/src/run-generator/run-generator.c
index 089790104e3f7a2743e70e450f1b9888cb6ccaec..c2107896193aba9f56f28df98d12d6e45fbb5252 100644 (file)
--- a/src/run-generator/run-generator.c
+++ b/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;

diff --git a/src/run/run.c b/src/run/run.c
index 876e436a5df3f51545bb418357b613c1bd46cbc6..28f35d156caf0ca8468e6c9f21c55f727a8c48d7 100644 (file)
--- a/src/run/run.c
+++ b/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"

diff --git a/src/sbsign/authenticode.h b/src/sbsign/authenticode.h
index 04bd336e0cc7d2d9df3b238f6a171fa88258409d..c1df94c2f995b62b6d12081f1bc1be60cf48dbd0 100644 (file)
--- a/src/sbsign/authenticode.h
+++ b/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"

diff --git a/src/sbsign/sbsign.c b/src/sbsign/sbsign.c
index 346f577ebe666bc242ca2e9e5de9a8c88a5fa091..be11833d7d2dcf20cb51257a787c2be22f253cb3 100644 (file)
--- a/src/sbsign/sbsign.c
+++ b/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"
 

diff --git a/src/sleep/battery-capacity.c b/src/sleep/battery-capacity.c
index 7ddef5235029604ec97f71fdb03bf9f985232ea7..546d0b6ee11e87baeeb06e44449fd7a9bd419407 100644 (file)
--- a/src/sleep/battery-capacity.c
+++ b/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)

diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index ac6912d2f941bf3aa82cc4bee31e2a1a7fa9fea2..3bbfdbadaf0ec4cafd3e09010765b28d4acf797e 100644 (file)
--- a/src/sleep/sleep.c
+++ b/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"
 

diff --git a/src/socket-activate/socket-activate.c b/src/socket-activate/socket-activate.c
index c37fafd34a81752a8fad4bed250cc47ccaad4e73..8bca1326a0ee5743be1db3c9e25642c83ff7224f 100644 (file)
--- a/src/socket-activate/socket-activate.c
+++ b/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;

diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index e8b5127522b06346c3dee7bfd6a37a5b20ede4fc..93f186b287799f6b4aff1eaa99c7cf5a3203b855 100644 (file)
--- a/src/socket-proxy/socket-proxyd.c
+++ b/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)
 

diff --git a/src/ssh-generator/ssh-generator.c b/src/ssh-generator/ssh-generator.c
index 1cc5efd04c86f69289e9e1e944ada4726ede98bf..55ad498b7d256656dab51a5f34f1459552a54a7c 100644 (file)
--- a/src/ssh-generator/ssh-generator.c
+++ b/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:

diff --git a/src/ssh-generator/ssh-proxy.c b/src/ssh-generator/ssh-proxy.c
index eaf5982dea66d56cd7fb9ccc9b04329c02ea21ab..04f99dbd57348cff622ba7ca2a44a11e6b26c06b 100644 (file)
--- a/src/ssh-generator/ssh-proxy.c
+++ b/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"

diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c
index b301e02ed3f82726fb4260bafc33d89703d1ff4b..0de59aaecfe9fa0ac79eb7e203730a789e8e1e69 100644 (file)
--- a/src/stdio-bridge/stdio-bridge.c
+++ b/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;

diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c
index 2af2ee47406ff85ca714120ecc29a15e96440515..008f3c4e09eb26f5d8591a14f578c81f1ab8a2ab 100644 (file)
--- a/src/storagetm/storagetm.c
+++ b/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;

diff --git a/src/sulogin-shell/sulogin-shell.c b/src/sulogin-shell/sulogin-shell.c
index b26663df082ba41c8510147a938b8544a54c0cd4..8678c6fee036a450614fb5c83b06312491dbc043 100644 (file)
--- a/src/sulogin-shell/sulogin-shell.c
+++ b/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) {

diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index cff3bb5b461e756866b5ef811b80e132a00c2996..49ef5517a8aa8974541d997c1cda709f0433cd75 100644 (file)
--- a/src/sysctl/sysctl.c
+++ b/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"

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 250aed060f0047d275a7679d26838a0000d224df..188b368c4122eacca3c5963543581db7665c8c77 100644 (file)
--- a/src/sysext/sysext.c
+++ b/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"

diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c
index c70958b9c96cee7cf260fce27f2545fbf7c867b8..c4fabd8298d110ac574c9810872dbe50dcf84bff 100644 (file)
--- a/src/system-update-generator/system-update-generator.c
+++ b/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"

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 4163994df28c3dd46b87040e5e056926b875d694..c9d3870111ea364993eb870d96a2bb3871f1279d 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/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 {

diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index 0878f85228a4529ff1ae7431f60221a573ffab65..e11edef15ed9ebfa3220f5c42b3881d2123f86f1 100644 (file)
--- a/src/sysv-generator/sysv-generator.c
+++ b/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"

diff --git a/src/tmpfiles/offline-passwd.c b/src/tmpfiles/offline-passwd.c
index 48244d18b863057e32c314cb4b9df7f99847c91b..2334e258cb404dd7a97f03126ac2ffd76bd0ff32 100644 (file)
--- a/src/tmpfiles/offline-passwd.c
+++ b/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"
 

diff --git a/src/tmpfiles/offline-passwd.h b/src/tmpfiles/offline-passwd.h
index 587af7b01cd217a5409bd124d2b30e8899b47fd3..d031ef74c9c7dd27507580563db018469adbf8eb 100644 (file)
--- a/src/tmpfiles/offline-passwd.h
+++ b/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);

diff --git a/src/tmpfiles/test-offline-passwd.c b/src/tmpfiles/test-offline-passwd.c
index 25b1fcceff08fc0b25aa73099638214391a8e578..7be29ff798556399ae48fa14562ec8e2130a4eb9 100644 (file)
--- a/src/tmpfiles/test-offline-passwd.c
+++ b/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;
 

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 9d0d568a4b2f4a3bee90be8da0ef8e60cf7882cc..3a3f8b1bfd2a2b68d0246f38674cc5df8a202a03 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/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"

diff --git a/src/tpm2-setup/tpm2-clear.c b/src/tpm2-setup/tpm2-clear.c
index 2bbaf333bad341220f79435787064621e8b19df3..0800a90747961e2c8d33690500ff0dc9a60b438a 100644 (file)
--- a/src/tpm2-setup/tpm2-clear.c
+++ b/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"

diff --git a/src/tpm2-setup/tpm2-generator.c b/src/tpm2-setup/tpm2-generator.c
index f1d903ee81ad4b0b7ef36d574a833784d95fee15..043e0fd4b7281aedce0f54a7de462021df6949b4 100644 (file)
--- a/src/tpm2-setup/tpm2-generator.c
+++ b/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"

diff --git a/src/tpm2-setup/tpm2-setup.c b/src/tpm2-setup/tpm2-setup.c
index 29f2e55860219b394c23aca2cb80ed4b749ce167..09f402fc689b45f680d0b5a03724bdee950a1114 100644 (file)
--- a/src/tpm2-setup/tpm2-setup.c
+++ b/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"
 

diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index fd28591d197214940c62f30ae7e4e7ac9749013d..cc29be102080600020e82b2a36ed4f399826eef8 100644 (file)
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/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 {

diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
index b39b9c44581792400e721c91a5f343b518199326..f802ed32e9737fad212955b63041d642fd0c114a 100644 (file)
--- a/src/update-done/update-done.c
+++ b/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;

diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index c39ea9b35ddd0026c9876f0737f4c9836d89d3e3..b80f10cd339787a64f2ebb1cf4431ee0e0c3bc8e 100644 (file)
--- a/src/update-utmp/update-utmp.c
+++ b/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"
 

diff --git a/src/user-sessions/user-sessions.c b/src/user-sessions/user-sessions.c
index 7d84d6b54063d9274fca0904f4c018f1a798097a..4b05e40534da6e76bb1f2dea894dcdec9df20191 100644 (file)
--- a/src/user-sessions/user-sessions.c
+++ b/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[]) {

diff --git a/src/validatefs/validatefs.c b/src/validatefs/validatefs.c
index 8dfe5073da1f0f936029f8fceb31310647a9caf5..eef4c798f6a65589322842fa228144e204c5d778 100644 (file)
--- a/src/validatefs/validatefs.c
+++ b/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"

diff --git a/src/varlinkctl/varlinkctl.c b/src/varlinkctl/varlinkctl.c
index e5ce16d1cdc2f0cea9e667c4e40f929d7b3cee81..74f9151a4d5dbbfd35de8e6526fc8fdf71dec3a5 100644 (file)
--- a/src/varlinkctl/varlinkctl.c
+++ b/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"

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 6edb71308ffc28684e865cb4220f6751b5ddf688..2c89d212822ddc103be76aa75752863efa63b7d1 100644 (file)
--- a/src/vconsole/vconsole-setup.c
+++ b/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;

diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c
index 5ec997052945f06b7421204070fbbefef356a189..5d863e11897d327444e89e1860a66ab8bb198e2c 100644 (file)
--- a/src/veritysetup/veritysetup-generator.c
+++ b/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"

diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index 8f808b33e165fe7245a704d1148b52fe7e4286c4..c356150ea3b11afbd34b9a4cee320ff0880066a3 100644 (file)
--- a/src/veritysetup/veritysetup.c
+++ b/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 */

diff --git a/src/volatile-root/volatile-root.c b/src/volatile-root/volatile-root.c
index f7c482de05c116324b531f486b3b4f10f70b5fb4..0e8c2ea0e9f4b57dcd2230f7f780afdf0a564780 100644 (file)
--- a/src/volatile-root/volatile-root.c
+++ b/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"
 

diff --git a/src/vpick/vpick-tool.c b/src/vpick/vpick-tool.c
index df6d888091b734ad086c7c1e442db44e347520fa..c58bcb9d3c48b30a6db2b702cff7e4bbfc80eb79 100644 (file)
--- a/src/vpick/vpick-tool.c
+++ b/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;