From 0dc510ab03e25e4a8a3dec225c06b5cf45e127f1 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 14 May 2025 22:27:28 +0200 Subject: [PATCH 1/2] tpm2-util: Make sure structs/enums are named and add to forward.h We have to name structs/enums to be able to forward declare them, so let's do that and add the missing ones to forward.h. --- src/basic/forward.h | 4 ++++ src/shared/tpm2-util.h | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/basic/forward.h b/src/basic/forward.h index 5f34874f33..27d248ce9d 100644 --- a/src/basic/forward.h +++ b/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; diff --git a/src/shared/tpm2-util.h b/src/shared/tpm2-util.h index d6e5297ce9..08c6bd45dd 100644 --- a/src/shared/tpm2-util.h +++ b/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; From 8857aa74e51db4b212b93aa29dc4b97b0689e5c2 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 14 May 2025 22:22:11 +0200 Subject: [PATCH 2/2] 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 . Split out of #37344. --- src/ask-password/ask-password.c | 7 +++---- src/backlight/backlight.c | 3 --- src/battery-check/battery-check.c | 5 ----- src/binfmt/binfmt.c | 5 ----- src/bless-boot/bless-boot-generator.c | 6 ++---- src/bless-boot/bless-boot.c | 7 ++----- src/bless-boot/boot-check-no-failures.c | 3 --- src/cgls/cgls.c | 4 ++-- src/cgtop/cgtop.c | 11 +---------- src/creds/creds.c | 7 +++++-- src/debug-generator/debug-generator.c | 2 +- src/delta/delta.c | 4 ---- src/detect-virt/detect-virt.c | 3 --- src/dissect/dissect.c | 7 +++++-- .../environment-d-generator.c | 4 +++- src/escape/escape.c | 2 +- src/factory-reset/factory-reset-generator.c | 2 +- src/firstboot/firstboot.c | 6 ++++-- src/fsck/fsck.c | 5 ++--- src/fstab-generator/fstab-generator.c | 8 ++++---- src/getty-generator/getty-generator.c | 4 +--- src/gpt-auto-generator/gpt-auto-generator.c | 12 ++++-------- src/growfs/growfs.c | 10 ++-------- src/growfs/makefs.c | 4 ---- src/hostname/hostnamectl.c | 11 +++++------ src/hostname/hostnamed.c | 13 +++++++------ src/hwdb/hwdb.c | 5 +---- src/id128/id128.c | 3 ++- src/initctl/initctl.c | 7 ++----- src/kernel-install/kernel-install.c | 6 ++++-- src/keyutil/keyutil.c | 1 + src/machine-id-setup/machine-id-setup-main.c | 5 +---- src/measure/measure.c | 5 ++--- src/modules-load/modules-load.c | 2 -- src/mount/mount-tool.c | 11 ++++------- src/notify/notify.c | 4 +--- src/pcrextend/pcrextend.c | 3 +-- src/pcrlock/pcrlock-firmware.c | 1 + src/pcrlock/pcrlock-firmware.h | 4 +--- src/pcrlock/pcrlock.c | 14 +++++++------- src/pstore/pstore.c | 17 ----------------- src/ptyfwd/ptyfwd-tool.c | 3 +++ src/quotacheck/quotacheck.c | 6 +----- src/random-seed/random-seed.c | 3 +-- src/rc-local-generator/rc-local-generator.c | 3 --- src/remount-fs/remount-fs.c | 5 +++-- src/repart/repart.c | 10 +++++----- src/reply-password/reply-password.c | 5 ----- src/rfkill/rfkill.c | 3 +-- src/run-generator/run-generator.c | 4 ++-- src/run/run.c | 9 +++++++-- src/sbsign/authenticode.h | 2 +- src/sbsign/sbsign.c | 4 ++++ src/sleep/battery-capacity.c | 3 +-- src/sleep/sleep.c | 10 ++-------- src/socket-activate/socket-activate.c | 4 +--- src/socket-proxy/socket-proxyd.c | 4 +--- src/ssh-generator/ssh-generator.c | 3 +++ src/ssh-generator/ssh-proxy.c | 2 -- src/stdio-bridge/stdio-bridge.c | 6 ++---- src/storagetm/storagetm.c | 14 ++++++++++---- src/sulogin-shell/sulogin-shell.c | 5 ++--- src/sysctl/sysctl.c | 5 ----- src/sysext/sysext.c | 13 ++++++++----- .../system-update-generator.c | 1 - src/sysusers/sysusers.c | 11 +++++++---- src/sysv-generator/sysv-generator.c | 6 +++--- src/tmpfiles/offline-passwd.c | 3 +++ src/tmpfiles/offline-passwd.h | 4 +--- src/tmpfiles/test-offline-passwd.c | 2 +- src/tmpfiles/tmpfiles.c | 12 +++--------- src/tpm2-setup/tpm2-clear.c | 1 + src/tpm2-setup/tpm2-generator.c | 1 + src/tpm2-setup/tpm2-setup.c | 3 ++- .../tty-ask-password-agent.c | 13 +++++-------- src/update-done/update-done.c | 5 ++--- src/update-utmp/update-utmp.c | 8 ++------ src/user-sessions/user-sessions.c | 4 +--- src/validatefs/validatefs.c | 3 +++ src/varlinkctl/varlinkctl.c | 7 +++++-- src/vconsole/vconsole-setup.c | 8 -------- src/veritysetup/veritysetup-generator.c | 8 +++----- src/veritysetup/veritysetup.c | 4 +--- src/volatile-root/volatile-root.c | 1 + src/vpick/vpick-tool.c | 3 +-- 85 files changed, 187 insertions(+), 290 deletions(-) diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c index b6760a980b..c56dfc2346 100644 --- 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 #include -#include #include #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 0fa5209305..910e5b49f1 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #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 b6cbbbb84f..207f477f1c 100644 --- 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 #include #include #include @@ -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 eb91e916de..36e1d5d135 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c @@ -1,13 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include -#include #include -#include #include -#include #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 2c3d54173d..1a99ed5b68 100644 --- 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 #include -#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 3fbd09b7e1..9b2dc08d61 100644 --- 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 -#include +#include #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 56c63b71a9..b301892474 100644 --- 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 #include #include -#include #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 1dcd316cdb..266cec4df4 100644 --- a/src/cgls/cgls.c +++ b/src/cgls/cgls.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include #include @@ -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 93bd549d69..705a32df0b 100644 --- a/src/cgtop/cgtop.c +++ b/src/cgtop/cgtop.c @@ -1,18 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include -#include -#include #include -#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 7295bb7bd1..14116b03f9 100644 --- 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 098e06ca5d..86014b85f7 100644 --- 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 a6c0a7c1f3..2dc2494556 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include #include @@ -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 4f5f5d19e4..3513f0b3b1 100644 --- 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 #include -#include -#include #include "alloc-util.h" #include "build.h" diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index 5db462f4ff..9db5f642bb 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -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 33f400864b..91ffaa24ea 100644 --- 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 + #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 f71d4da749..0742bf3f05 100644 --- a/src/escape/escape.c +++ b/src/escape/escape.c @@ -2,7 +2,6 @@ #include #include -#include #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 5755eca2b8..4ce4d2fa61 100644 --- 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 3349094e91..48c0b163b8 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -5,6 +5,7 @@ #include #include +#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 c8dea245c8..da37ace7d1 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -3,9 +3,7 @@ Copyright © 2014 Holger Hans Peter Freyther ***/ -#include #include -#include #include #include #include @@ -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 9f4162023b..8c9352c349 100644 --- 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 #include +#include #include +#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 3f00810164..810ee9a2f9 100644 --- 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 #include #include #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 103acffe77..8b2fd59020 100644 --- 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 #include #include -#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 cb653ba0c7..6ba7bce6e7 100644 --- a/src/growfs/growfs.c +++ b/src/growfs/growfs.c @@ -1,34 +1,28 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include #include #include #include -#include #include -#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 1e404bc7bf..26f090f1db 100644 --- a/src/growfs/makefs.c +++ b/src/growfs/makefs.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #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 6530098025..e2dfa2e677 100644 --- a/src/hostname/hostnamectl.c +++ b/src/hostname/hostnamectl.c @@ -1,10 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include -#include -#include -#include #include #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 5fe4e7e07f..5f95e52f7f 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include #include #include +#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 70ff1d7691..6391b04133 100644 --- a/src/hwdb/hwdb.c +++ b/src/hwdb/hwdb.c @@ -2,16 +2,13 @@ #include -#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 e3f69a4f2a..cdb93ac68f 100644 --- 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 bf3092ff31..a387fb0d28 100644 --- a/src/initctl/initctl.c +++ b/src/initctl/initctl.c @@ -1,11 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include +#include #include #include #include -#include #include #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 3774a129c4..4a743ac316 100644 --- 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 -#include +#include #include +#include #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 8795b447bb..fa2f039d88 100644 --- 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 956a538a75..87adc892e1 100644 --- 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 #include #include -#include #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 fb18b1a9f7..b7cb216c8f 100644 --- 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 a09311d41d..ea1b717bb3 100644 --- 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 #include -#include #include #include "alloc-util.h" diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c index 71fe112702..8cb06c5162 100644 --- 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 4a0f88a40e..facd1eb9ee 100644 --- a/src/notify/notify.c +++ b/src/notify/notify.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include #include @@ -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 d57fcfbfcc..75b561da90 100644 --- 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 34cb82cbca..81481dc168 100644 --- a/src/pcrlock/pcrlock-firmware.c +++ b/src/pcrlock/pcrlock-firmware.c @@ -3,6 +3,7 @@ #include #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 169666ede9..f87775e4bb 100644 --- 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 - +#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 d821c6457e..85ba0314c1 100644 --- a/src/pcrlock/pcrlock.c +++ b/src/pcrlock/pcrlock.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include +#include #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 b941c7e910..028d1b50ea 100644 --- 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 #include #include #include #include #include -#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 449c0ee497..a0ae7a2e2a 100644 --- 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 63940142ac..4daa19093d 100644 --- a/src/quotacheck/quotacheck.c +++ b/src/quotacheck/quotacheck.c @@ -1,17 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include -#include #include #include -#include #include +#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 75e3405676..deb78d9919 100644 --- 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 #include #include #include +#include #include #include #include @@ -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 f680382bfc..8b1b75f569 100644 --- 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 -#include #include -#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 e707eab549..83f6e2f337 100644 --- 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 #include #include #include #include #include +#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 b7efa88e6f..7cc5af9219 100644 --- a/src/repart/repart.c +++ b/src/repart/repart.c @@ -11,7 +11,6 @@ #include #include -#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 93fbf11f91..d0f1afe5e6 100644 --- 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 -#include #include -#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 28301cd527..3e3c20d617 100644 --- a/src/rfkill/rfkill.c +++ b/src/rfkill/rfkill.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #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 089790104e..c210789619 100644 --- a/src/run-generator/run-generator.c +++ b/src/run-generator/run-generator.c @@ -3,15 +3,15 @@ #include #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 876e436a5d..28f35d156c 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -3,8 +3,9 @@ #include #include #include +#include +#include #include -#include #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 04bd336e0c..c1df94c2f9 100644 --- a/src/sbsign/authenticode.h +++ b/src/sbsign/authenticode.h @@ -3,7 +3,7 @@ #include -#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 346f577ebe..be11833d7d 100644 --- a/src/sbsign/sbsign.c +++ b/src/sbsign/sbsign.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #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 7ddef52350..546d0b6ee1 100644 --- 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 ac6912d2f9..3bbfdbadaf 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -4,12 +4,11 @@ Copyright © 2018 Dell Inc. ***/ -#include #include #include #include +#include #include -#include #include #include @@ -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 c37fafd34a..8bca1326a0 100644 --- 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 e8b5127522..93f186b287 100644 --- 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 #include #include #include #include -#include #include #include @@ -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 1cc5efd04c..55ad498b7d 100644 --- 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 eaf5982dea..04f99dbd57 100644 --- 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 -#include #include #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 b301e02ed3..0de59aaecf 100644 --- 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 #include -#include -#include +#include #include #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 2af2ee4740..008f3c4e09 100644 --- a/src/storagetm/storagetm.c +++ b/src/storagetm/storagetm.c @@ -1,7 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include +#include + +#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 b26663df08..8678c6fee0 100644 --- a/src/sulogin-shell/sulogin-shell.c +++ b/src/sulogin-shell/sulogin-shell.c @@ -3,24 +3,23 @@ Copyright © 2017 Felipe Sateler ***/ -#include #include #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 cff3bb5b46..49ef5517a8 100644 --- a/src/sysctl/sysctl.c +++ b/src/sysctl/sysctl.c @@ -1,13 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include -#include #include -#include #include -#include #include "alloc-util.h" #include "build.h" diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c index 250aed060f..188b368c41 100644 --- a/src/sysext/sysext.c +++ b/src/sysext/sysext.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include #include +#include #include #include #include @@ -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 c70958b9c9..c4fabd8298 100644 --- 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 #include #include "alloc-util.h" diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c index 4163994df2..c9d3870111 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include +#include #if HAVE_AUDIT # include @@ -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 0878f85228..e11edef15e 100644 --- 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 #include +#include #include #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 48244d18b8..2334e258cb 100644 --- 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 587af7b01c..d031ef74c9 100644 --- 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 - -#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 25b1fcceff..7be29ff798 100644 --- a/src/tmpfiles/test-offline-passwd.c +++ b/src/tmpfiles/test-offline-passwd.c @@ -3,9 +3,9 @@ #include #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 9d0d568a4b..3a3f8b1bfd 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -1,13 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include #include -#include -#include -#include -#include #include #include #include @@ -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 2bbaf333ba..0800a90747 100644 --- 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 f1d903ee81..043e0fd4b7 100644 --- 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 29f2e55860..09f402fc68 100644 --- 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 +#include #include #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 fd28591d19..cc29be1020 100644 --- 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 #include #include -#include -#include +#include +#include #include #include #include -#include #include #include #include @@ -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 b39b9c4458..f802ed32e9 100644 --- a/src/update-done/update-done.c +++ b/src/update-done/update-done.c @@ -2,7 +2,6 @@ #include #include -#include #include #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 c39ea9b35d..b80f10cd33 100644 --- 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 #include -#include #include #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 7d84d6b540..4b05e40534 100644 --- 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 #include #include -#include #include #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 8dfe5073da..eef4c798f6 100644 --- a/src/validatefs/validatefs.c +++ b/src/validatefs/validatefs.c @@ -2,6 +2,8 @@ #include +#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 e5ce16d1cd..74f9151a4d 100644 --- a/src/varlinkctl/varlinkctl.c +++ b/src/varlinkctl/varlinkctl.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include +#include #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 6edb71308f..2c89d21282 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -3,25 +3,19 @@ Copyright © 2016 Michal Soltys ***/ -#include #include -#include #include #include #include -#include -#include #include #include #include -#include #include #include #include #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 5ec9970529..5d863e1189 100644 --- 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 -#include #include #include #include +#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 8f808b33e1..c356150ea3 100644 --- a/src/veritysetup/veritysetup.c +++ b/src/veritysetup/veritysetup.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include @@ -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 f7c482de05..0e8c2ea0e9 100644 --- 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 df6d888091..c58bcb9d3c 100644 --- 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 #include #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;