diff --git a/src/basic/constants.h b/src/basic/constants.h index 93e6efbdca..7a09fbf878 100644 --- a/src/basic/constants.h +++ b/src/basic/constants.h @@ -1,29 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#if !defined(HAS_FEATURE_MEMORY_SANITIZER) -# if defined(__has_feature) -# if __has_feature(memory_sanitizer) -# define HAS_FEATURE_MEMORY_SANITIZER 1 -# endif -# endif -# if !defined(HAS_FEATURE_MEMORY_SANITIZER) -# define HAS_FEATURE_MEMORY_SANITIZER 0 -# endif -#endif - -#if !defined(HAS_FEATURE_ADDRESS_SANITIZER) -# ifdef __SANITIZE_ADDRESS__ -# define HAS_FEATURE_ADDRESS_SANITIZER 1 -# elif defined(__has_feature) -# if __has_feature(address_sanitizer) -# define HAS_FEATURE_ADDRESS_SANITIZER 1 -# endif -# endif -# if !defined(HAS_FEATURE_ADDRESS_SANITIZER) -# define HAS_FEATURE_ADDRESS_SANITIZER 0 -# endif -#endif +#include "time-util.h" #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC) diff --git a/src/basic/errno-list.h b/src/basic/errno-list.h index afe54d0e8c..e4a5978829 100644 --- a/src/basic/errno-list.h +++ b/src/basic/errno-list.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include diff --git a/src/basic/forward.h b/src/basic/forward.h index 27d248ce9d..666a078eb2 100644 --- a/src/basic/forward.h +++ b/src/basic/forward.h @@ -254,6 +254,7 @@ typedef enum UserStorage UserStorage; typedef struct Bitmap Bitmap; typedef struct BPFProgram BPFProgram; +typedef struct BusObjectImplementation BusObjectImplementation; typedef struct CalendarSpec CalendarSpec; typedef struct Condition Condition; typedef struct ConfigSection ConfigSection; diff --git a/src/basic/macro.h b/src/basic/macro.h index 9391fc5e88..03a05b1368 100644 --- a/src/basic/macro.h +++ b/src/basic/macro.h @@ -1,9 +1,32 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "constants.h" #include "macro-fundamental.h" +#if !defined(HAS_FEATURE_MEMORY_SANITIZER) +# if defined(__has_feature) +# if __has_feature(memory_sanitizer) +# define HAS_FEATURE_MEMORY_SANITIZER 1 +# endif +# endif +# if !defined(HAS_FEATURE_MEMORY_SANITIZER) +# define HAS_FEATURE_MEMORY_SANITIZER 0 +# endif +#endif + +#if !defined(HAS_FEATURE_ADDRESS_SANITIZER) +# ifdef __SANITIZE_ADDRESS__ +# define HAS_FEATURE_ADDRESS_SANITIZER 1 +# elif defined(__has_feature) +# if __has_feature(address_sanitizer) +# define HAS_FEATURE_ADDRESS_SANITIZER 1 +# endif +# endif +# if !defined(HAS_FEATURE_ADDRESS_SANITIZER) +# define HAS_FEATURE_ADDRESS_SANITIZER 0 +# endif +#endif + /* Note: on GCC "no_sanitize_address" is a function attribute only, on llvm it may also be applied to global * variables. We define a specific macro which knows this. Note that on GCC we don't need this decorator so much, since * our primary use case for this attribute is registration structures placed in named ELF sections which shall not be diff --git a/src/battery-check/battery-check.c b/src/battery-check/battery-check.c index 207f477f1c..78636d7794 100644 --- a/src/battery-check/battery-check.c +++ b/src/battery-check/battery-check.c @@ -2,7 +2,6 @@ #include #include -#include #include "sd-messages.h" diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c index 266cec4df4..8349233fa6 100644 --- a/src/cgls/cgls.c +++ b/src/cgls/cgls.c @@ -2,7 +2,6 @@ #include #include -#include #include "sd-bus.h" diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c index fc5707e5a3..9b56af7beb 100644 --- a/src/cgtop/cgtop.c +++ b/src/cgtop/cgtop.c @@ -20,7 +20,6 @@ #include "process-util.h" #include "procfs-util.h" #include "sort-util.h" -#include "strv.h" #include "terminal-util.h" #include "time-util.h" #include "virt.h" diff --git a/src/core/ipe-setup.c b/src/core/ipe-setup.c index 392c9187e5..7bf4f52d04 100644 --- a/src/core/ipe-setup.c +++ b/src/core/ipe-setup.c @@ -4,6 +4,7 @@ #include "alloc-util.h" #include "conf-files.h" +#include "constants.h" #include "copy.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c index f3e2403822..ac6d8aa26d 100644 --- a/src/coredump/coredump-vacuum.c +++ b/src/coredump/coredump-vacuum.c @@ -2,7 +2,6 @@ #include #include -#include #include "alloc-util.h" #include "coredump-vacuum.h" diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c index b8ba77e6ae..fafee11482 100644 --- a/src/coredump/coredump.c +++ b/src/coredump/coredump.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include -#include #include #include #include diff --git a/src/delta/delta.c b/src/delta/delta.c index 2dc2494556..337472f276 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include "alloc-util.h" diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index f7de15e92f..14319413f0 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -6,8 +6,6 @@ #include #include #include -#include -#include #include "sd-device.h" diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 48c0b163b8..6ba7d4ba92 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -2,7 +2,6 @@ #include #include -#include #include #include "sd-bus.h" @@ -51,7 +50,6 @@ #include "terminal-util.h" #include "time-util.h" #include "tmpfile-util-label.h" -#include "umask-util.h" #include "user-util.h" #include "vconsole-util.h" diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index da37ace7d1..a41427ab4d 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -5,7 +5,6 @@ #include #include -#include #include #include diff --git a/src/fundamental/macro-fundamental.h b/src/fundamental/macro-fundamental.h index da5c0c9c50..6a75d7864a 100644 --- a/src/fundamental/macro-fundamental.h +++ b/src/fundamental/macro-fundamental.h @@ -444,6 +444,7 @@ assert_cc(sizeof(dummy_t) == 0); #define DECLARE_SBAT(text) #endif +#define typeof_field(struct_type, member) typeof(((struct_type *) 0)->member) #define sizeof_field(struct_type, member) sizeof(((struct_type *) 0)->member) #define endoffsetof_field(struct_type, member) (offsetof(struct_type, member) + sizeof_field(struct_type, member)) #define voffsetof(v, member) offsetof(typeof(v), member) diff --git a/src/fuzz/fuzz-bus-label.c b/src/fuzz/fuzz-bus-label.c index c7be82a767..795afeb7ea 100644 --- a/src/fuzz/fuzz-bus-label.c +++ b/src/fuzz/fuzz-bus-label.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "alloc-util.h" #include "bus-label.h" #include "fuzz.h" diff --git a/src/fuzz/fuzz-calendarspec.c b/src/fuzz/fuzz-calendarspec.c index b31a3f2b17..8095d40d99 100644 --- a/src/fuzz/fuzz-calendarspec.c +++ b/src/fuzz/fuzz-calendarspec.c @@ -2,7 +2,6 @@ #include "alloc-util.h" #include "calendarspec.h" -#include "fd-util.h" #include "fuzz.h" #include "string-util.h" #include "time-util.h" diff --git a/src/fuzz/fuzz-catalog.c b/src/fuzz/fuzz-catalog.c index cbe8463a89..965828827a 100644 --- a/src/fuzz/fuzz-catalog.c +++ b/src/fuzz/fuzz-catalog.c @@ -1,9 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "catalog.h" #include "fd-util.h" -#include "fs-util.h" #include "fuzz.h" +#include "hashmap.h" #include "tmpfile-util.h" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { diff --git a/src/fuzz/fuzz-compress.c b/src/fuzz/fuzz-compress.c index adb0a969a8..bf53de9279 100644 --- a/src/fuzz/fuzz-compress.c +++ b/src/fuzz/fuzz-compress.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "alloc-util.h" #include "compress.h" #include "fuzz.h" diff --git a/src/fuzz/fuzz-env-file.c b/src/fuzz/fuzz-env-file.c index ff7e529ac3..6a0fda69b4 100644 --- a/src/fuzz/fuzz-env-file.c +++ b/src/fuzz/fuzz-env-file.c @@ -2,7 +2,6 @@ #include -#include "alloc-util.h" #include "env-file.h" #include "fd-util.h" #include "fuzz.h" diff --git a/src/fuzz/fuzz-json.c b/src/fuzz/fuzz-json.c index ea11940e4b..c0c0f2b1b7 100644 --- a/src/fuzz/fuzz-json.c +++ b/src/fuzz/fuzz-json.c @@ -2,7 +2,6 @@ #include "sd-json.h" -#include "alloc-util.h" #include "env-util.h" #include "fd-util.h" #include "fuzz.h" diff --git a/src/fuzz/fuzz-main.c b/src/fuzz/fuzz-main.c index cf70424c16..928fc74525 100644 --- a/src/fuzz/fuzz-main.c +++ b/src/fuzz/fuzz-main.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "alloc-util.h" #include "fileio.h" #include "fuzz.h" diff --git a/src/fuzz/fuzz-time-util.c b/src/fuzz/fuzz-time-util.c index 5be2e4f1dd..6f5124986a 100644 --- a/src/fuzz/fuzz-time-util.c +++ b/src/fuzz/fuzz-time-util.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" -#include "fd-util.h" #include "fuzz.h" #include "time-util.h" diff --git a/src/fuzz/fuzz-udev-database.c b/src/fuzz/fuzz-udev-database.c index 6b4fc8270d..f1a4ef76e3 100644 --- a/src/fuzz/fuzz-udev-database.c +++ b/src/fuzz/fuzz-udev-database.c @@ -3,7 +3,6 @@ #include "device-internal.h" #include "device-private.h" #include "fd-util.h" -#include "fs-util.h" #include "fuzz.h" #include "tmpfile-util.h" diff --git a/src/fuzz/fuzz-varlink-idl.c b/src/fuzz/fuzz-varlink-idl.c index 9eb021a7d1..f2b73f622a 100644 --- a/src/fuzz/fuzz-varlink-idl.c +++ b/src/fuzz/fuzz-varlink-idl.c @@ -1,16 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "sd-varlink-idl.h" #include "alloc-util.h" -#include "errno-util.h" -#include "fd-util.h" #include "fuzz.h" -#include "io-util.h" #include "log.h" -#include "string-util.h" #include "varlink-idl-util.h" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { diff --git a/src/fuzz/fuzz-varlink.c b/src/fuzz/fuzz-varlink.c index 2497fe3b9e..84ff9b904a 100644 --- a/src/fuzz/fuzz-varlink.c +++ b/src/fuzz/fuzz-varlink.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include "sd-varlink.h" diff --git a/src/fuzz/fuzz.h b/src/fuzz/fuzz.h index 6da06f237b..6e4935d555 100644 --- a/src/fuzz/fuzz.h +++ b/src/fuzz/fuzz.h @@ -1,11 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include -#include +#include + +#include "forward.h" -#include "assert-util.h" -#include "env-util.h" #include "fileio.h" #include "log.h" diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index 8b2fd59020..1f8d845c6f 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "sd-id128.h" diff --git a/src/growfs/growfs.c b/src/growfs/growfs.c index 6ba7bce6e7..d991b82d67 100644 --- a/src/growfs/growfs.c +++ b/src/growfs/growfs.c @@ -2,9 +2,6 @@ #include #include -#include -#include -#include #include #include "alloc-util.h" diff --git a/src/growfs/makefs.c b/src/growfs/makefs.c index 26f090f1db..3378bd3d70 100644 --- a/src/growfs/makefs.c +++ b/src/growfs/makefs.c @@ -2,9 +2,7 @@ #include #include -#include #include -#include #include "alloc-util.h" #include "blockdev-util.h" diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index 7246770479..38724b5303 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -14,6 +14,7 @@ #include "bus-common-errors.h" #include "bus-get-properties.h" #include "bus-log-control-api.h" +#include "bus-object.h" #include "bus-polkit.h" #include "bus-util.h" #include "constants.h" diff --git a/src/integritysetup/integritysetup-generator.c b/src/integritysetup/integritysetup-generator.c index 60f26b5ddc..56c91b734f 100644 --- a/src/integritysetup/integritysetup-generator.c +++ b/src/integritysetup/integritysetup-generator.c @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include #include "alloc-util.h" #include "fd-util.h" diff --git a/src/keyutil/keyutil.c b/src/keyutil/keyutil.c index cd7837ed89..aed34b39d0 100644 --- a/src/keyutil/keyutil.c +++ b/src/keyutil/keyutil.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "alloc-util.h" #include "ask-password-api.h" diff --git a/src/libsystemd-network/icmp6-packet.h b/src/libsystemd-network/icmp6-packet.h index dc5c1ab5e7..cb961ff641 100644 --- a/src/libsystemd-network/icmp6-packet.h +++ b/src/libsystemd-network/icmp6-packet.h @@ -8,7 +8,7 @@ #include "memory-util.h" #include "time-util.h" -typedef struct ICMP6Pakcet { +typedef struct ICMP6Packet { unsigned n_ref; struct in6_addr sender_address; diff --git a/src/locale/localed.c b/src/locale/localed.c index 4a62e063b1..11d9130bbc 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "sd-bus.h" #include "sd-event.h" @@ -10,6 +9,7 @@ #include "bus-error.h" #include "bus-locator.h" #include "bus-log-control-api.h" +#include "bus-object.h" #include "bus-polkit.h" #include "bus-unit-util.h" #include "bus-util.h" @@ -23,7 +23,6 @@ #include "service-util.h" #include "string-util.h" #include "strv.h" -#include "time-util.h" static int vconsole_reload(sd_bus *bus) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; diff --git a/src/mountfsd/mountfsd-manager.c b/src/mountfsd/mountfsd-manager.c index fdd98d7936..6fb49c70a1 100644 --- a/src/mountfsd/mountfsd-manager.c +++ b/src/mountfsd/mountfsd-manager.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "sd-daemon.h" diff --git a/src/mountfsd/mountwork.c b/src/mountfsd/mountwork.c index d932169e56..44cc7ce1f2 100644 --- a/src/mountfsd/mountwork.c +++ b/src/mountfsd/mountwork.c @@ -25,7 +25,6 @@ #include "loop-util.h" #include "main-func.h" #include "memory-util.h" -#include "missing_syscall.h" #include "namespace-util.h" #include "nsresource.h" #include "nulstr-util.h" diff --git a/src/nsresourced/nsresourced-manager.c b/src/nsresourced/nsresourced-manager.c index ab3086ad76..de93cd33f9 100644 --- a/src/nsresourced/nsresourced-manager.c +++ b/src/nsresourced/nsresourced-manager.c @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include #include "sd-daemon.h" diff --git a/src/nsresourced/nsresourcework.c b/src/nsresourced/nsresourcework.c index e283593bf7..5196a338de 100644 --- a/src/nsresourced/nsresourcework.c +++ b/src/nsresourced/nsresourcework.c @@ -7,9 +7,8 @@ #include #include #include -#include +#include #include -#include #include #include "sd-daemon.h" diff --git a/src/nsresourced/userns-restrict.c b/src/nsresourced/userns-restrict.c index e082dce243..f85119a265 100644 --- a/src/nsresourced/userns-restrict.c +++ b/src/nsresourced/userns-restrict.c @@ -1,13 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include #include "bpf-dlopen.h" #include "bpf-link.h" #include "fd-util.h" -#include "fs-util.h" #include "log.h" #include "lsm-util.h" #include "mkdir.h" diff --git a/src/oom/oomctl.c b/src/oom/oomctl.c index 09df6080a8..d9098de0eb 100644 --- a/src/oom/oomctl.c +++ b/src/oom/oomctl.c @@ -1,7 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include + +#include "sd-bus.h" #include "alloc-util.h" #include "build.h" @@ -12,7 +13,6 @@ #include "main-func.h" #include "pager.h" #include "pretty-print.h" -#include "terminal-util.h" #include "verbs.h" static PagerFlags arg_pager_flags = 0; diff --git a/src/oom/oomd-conf.c b/src/oom/oomd-conf.c index 1fcac36251..299d2afe96 100644 --- a/src/oom/oomd-conf.c +++ b/src/oom/oomd-conf.c @@ -4,6 +4,9 @@ #include "log.h" #include "oomd-conf.h" #include "oomd-manager.h" +#include "parse-util.h" +#include "string-util.h" +#include "time-util.h" static int config_parse_duration( const char *unit, diff --git a/src/oom/oomd-conf.h b/src/oom/oomd-conf.h index 0283b9e61d..429b976b91 100644 --- a/src/oom/oomd-conf.h +++ b/src/oom/oomd-conf.h @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "conf-parser.h" -#include "oomd-manager.h" +typedef struct Manager Manager; void manager_set_defaults(Manager *m); diff --git a/src/oom/oomd-manager-bus.c b/src/oom/oomd-manager-bus.c index f2bf6b41cb..08f261fcc1 100644 --- a/src/oom/oomd-manager-bus.c +++ b/src/oom/oomd-manager-bus.c @@ -1,15 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include "sd-bus.h" #include "alloc-util.h" -#include "bus-common-errors.h" -#include "bus-polkit.h" +#include "bus-object.h" #include "fd-util.h" #include "memfd-util.h" #include "oomd-manager.h" #include "oomd-manager-bus.h" -#include "user-util.h" static int bus_method_dump_by_fd(sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_free_ char *dump = NULL; diff --git a/src/oom/oomd-manager-bus.h b/src/oom/oomd-manager-bus.h index 7935b357a4..70c473f15b 100644 --- a/src/oom/oomd-manager-bus.h +++ b/src/oom/oomd-manager-bus.h @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "bus-object.h" - -typedef struct Manager Manager; +#include "forward.h" extern const BusObjectImplementation manager_object; diff --git a/src/oom/oomd-manager.c b/src/oom/oomd-manager.c index f5389accd9..dae7a957e2 100644 --- a/src/oom/oomd-manager.c +++ b/src/oom/oomd-manager.c @@ -1,25 +1,30 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "sd-bus.h" #include "sd-daemon.h" +#include "sd-event.h" #include "sd-json.h" #include "alloc-util.h" #include "bus-log-control-api.h" -#include "bus-polkit.h" +#include "bus-object.h" #include "bus-util.h" #include "cgroup-util.h" +#include "constants.h" #include "daemon-util.h" #include "fd-util.h" -#include "fileio.h" #include "format-util.h" #include "json-util.h" -#include "memory-util.h" #include "memstream-util.h" #include "oomd-conf.h" #include "oomd-manager.h" #include "oomd-manager-bus.h" +#include "parse-util.h" #include "path-util.h" #include "percent-util.h" +#include "set.h" +#include "string-util.h" +#include "time-util.h" #include "varlink-io.systemd.oom.h" #include "varlink-io.systemd.service.h" #include "varlink-util.h" diff --git a/src/oom/oomd-manager.h b/src/oom/oomd-manager.h index a40946ce4e..311250c6f3 100644 --- a/src/oom/oomd-manager.h +++ b/src/oom/oomd-manager.h @@ -1,11 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "sd-bus.h" -#include "sd-event.h" -#include "sd-varlink.h" - -#include "conf-parser.h" +#include "conf-parser-forward.h" +#include "forward.h" #include "oomd-util.h" /* Polling interval for monitoring stats */ @@ -27,9 +24,7 @@ #define RECLAIM_DURATION_USEC (30 * USEC_PER_SEC) #define POST_ACTION_DELAY_USEC (15 * USEC_PER_SEC) -typedef struct Manager Manager; - -struct Manager { +typedef struct Manager { sd_bus *bus; sd_event *event; @@ -59,7 +54,7 @@ struct Manager { /* This varlink server object is used to manage systemd-oomd's varlink server which is used by user * managers to report changes in ManagedOOM settings (oomd server - systemd client). */ sd_varlink_server *varlink_server; -}; +} Manager; Manager* manager_free(Manager *m); DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free); diff --git a/src/oom/oomd-util.c b/src/oom/oomd-util.c index b6b6c2a2f1..de0f2e6854 100644 --- a/src/oom/oomd-util.c +++ b/src/oom/oomd-util.c @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include - +#include "alloc-util.h" #include "errno-util.h" #include "fd-util.h" #include "fileio.h" @@ -12,12 +10,14 @@ #include "oomd-util.h" #include "parse-util.h" #include "path-util.h" +#include "pidref.h" #include "procfs-util.h" +#include "set.h" #include "signal-util.h" #include "sort-util.h" -#include "stat-util.h" #include "stdio-util.h" -#include "user-util.h" +#include "string-util.h" +#include "time-util.h" DEFINE_HASH_OPS_WITH_VALUE_DESTRUCTOR( oomd_cgroup_ctx_hash_ops, diff --git a/src/oom/oomd-util.h b/src/oom/oomd-util.h index 14fe5c5eba..cfb310ff32 100644 --- a/src/oom/oomd-util.h +++ b/src/oom/oomd-util.h @@ -1,10 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include - #include "cgroup-util.h" -#include "hashmap.h" +#include "forward.h" #include "psi-util.h" #define DUMP_ON_KILL_COUNT 10u diff --git a/src/oom/oomd.c b/src/oom/oomd.c index d0876d789f..b1d3efb8f5 100644 --- a/src/oom/oomd.c +++ b/src/oom/oomd.c @@ -2,12 +2,13 @@ #include +#include "sd-event.h" + #include "alloc-util.h" #include "build.h" #include "bus-log-control-api.h" #include "bus-object.h" #include "cgroup-util.h" -#include "conf-parser.h" #include "daemon-util.h" #include "fileio.h" #include "log.h" @@ -18,7 +19,6 @@ #include "parse-util.h" #include "pretty-print.h" #include "psi-util.h" -#include "signal-util.h" static bool arg_dry_run = false; diff --git a/src/oom/test-oomd-util.c b/src/oom/test-oomd-util.c index 2eca39c295..3c5159129f 100644 --- a/src/oom/test-oomd-util.c +++ b/src/oom/test-oomd-util.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "alloc-util.h" @@ -7,13 +8,12 @@ #include "cgroup-util.h" #include "fd-util.h" #include "fileio.h" -#include "fs-util.h" #include "oomd-util.h" #include "parse-util.h" #include "path-util.h" -#include "string-util.h" -#include "strv.h" +#include "set.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" static int fork_and_sleep(unsigned sleep_min) { diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c index 021035ab85..8972da0802 100644 --- a/src/portable/portabled-image-bus.c +++ b/src/portable/portabled-image-bus.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include "sd-bus.h" diff --git a/src/portable/portabled-image-bus.h b/src/portable/portabled-image-bus.h index 5784d3ab15..cafef9fdb8 100644 --- a/src/portable/portabled-image-bus.h +++ b/src/portable/portabled-image-bus.h @@ -3,7 +3,6 @@ #include "sd-bus-vtable.h" -#include "bus-object.h" #include "portabled-forward.h" int bus_image_common_get_os_release(Manager *m, sd_bus_message *message, const char *name_or_path, Image *image, sd_bus_error *error); diff --git a/src/portable/portabled.c b/src/portable/portabled.c index d192c24326..6963e9b977 100644 --- a/src/portable/portabled.c +++ b/src/portable/portabled.c @@ -7,6 +7,7 @@ #include "alloc-util.h" #include "bus-log-control-api.h" +#include "bus-object.h" #include "bus-util.h" #include "common-signal.h" #include "constants.h" @@ -15,10 +16,8 @@ #include "log.h" #include "main-func.h" #include "portabled.h" -#include "portabled-image-bus.h" #include "service-util.h" #include "signal-util.h" -#include "time-util.h" static Manager* manager_unref(Manager *m); DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_unref); diff --git a/src/portable/portabled.h b/src/portable/portabled.h index c7ce247955..1fe41cdd1a 100644 --- a/src/portable/portabled.h +++ b/src/portable/portabled.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "bus-object.h" #include "list.h" #include "portabled-forward.h" #include "runtime-scope.h" diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c index 028d1b50ea..8e20add144 100644 --- a/src/pstore/pstore.c +++ b/src/pstore/pstore.c @@ -5,9 +5,6 @@ /* 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 "sd-journal.h" diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c index 4daa19093d..3451f63ef2 100644 --- a/src/quotacheck/quotacheck.c +++ b/src/quotacheck/quotacheck.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include diff --git a/src/random-seed/random-seed-tool.c b/src/random-seed/random-seed-tool.c index deb78d9919..536d1b037d 100644 --- a/src/random-seed/random-seed-tool.c +++ b/src/random-seed/random-seed-tool.c @@ -2,9 +2,7 @@ #include #include -#include #include -#include #include #include #include diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c index 83f6e2f337..36bc6b7ef2 100644 --- a/src/remount-fs/remount-fs.c +++ b/src/remount-fs/remount-fs.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include #include diff --git a/src/repart/repart.c b/src/repart/repart.c index c8cb286cb7..210e6da270 100644 --- a/src/repart/repart.c +++ b/src/repart/repart.c @@ -1,12 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#if HAVE_VALGRIND_MEMCHECK_H -#include -#endif - #include #include -#include #include #include #include diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c index d0f1afe5e6..ed63927fa6 100644 --- a/src/reply-password/reply-password.c +++ b/src/reply-password/reply-password.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "fd-util.h" #include "fileio.h" #include "log.h" diff --git a/src/resolve/resolved-dns-delegate.c b/src/resolve/resolved-dns-delegate.c index 6a094ce68e..969836c304 100644 --- a/src/resolve/resolved-dns-delegate.c +++ b/src/resolve/resolved-dns-delegate.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "conf-files.h" +#include "constants.h" #include "dns-domain.h" #include "in-addr-util.h" #include "path-util.h" diff --git a/src/run/run.c b/src/run/run.c index 28f35d156c..23c9c83a84 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -5,7 +5,6 @@ #include #include #include -#include #include "sd-bus.h" #include "sd-daemon.h" diff --git a/src/shared/conf-parser-forward.h b/src/shared/conf-parser-forward.h new file mode 100644 index 0000000000..f534e5e270 --- /dev/null +++ b/src/shared/conf-parser-forward.h @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +#pragma once + +#include "cleanup-util.h" + +/* Argument list for parsers of specific configuration settings. */ +#define CONFIG_PARSER_ARGUMENTS \ + const char *unit, \ + const char *filename, \ + unsigned line, \ + const char *section, \ + unsigned section_line, \ + const char *lvalue, \ + int ltype, \ + const char *rvalue, \ + void *data, \ + void *userdata + +/* Prototype for a parser for a specific configuration setting */ +typedef int (*ConfigParserCallback)(CONFIG_PARSER_ARGUMENTS); + +/* A macro declaring a function prototype, following the typedef above, simply because it's so cumbersomely long + * otherwise. (And current emacs gets irritatingly slow when editing files that contain lots of very long function + * prototypes on the same screen…) */ +#define CONFIG_PARSER_PROTOTYPE(name) int name(CONFIG_PARSER_ARGUMENTS) + +typedef struct ConfigSection { + unsigned line; + bool invalid; + char filename[]; +} ConfigSection; + +#define DEFINE_SECTION_CLEANUP_FUNCTIONS(type, free_func) \ + static inline type* free_func##_or_set_invalid(type *p) { \ + assert(p); \ + \ + if (p->section) \ + p->section->invalid = true; \ + else \ + free_func(p); \ + return NULL; \ + } \ + DEFINE_TRIVIAL_CLEANUP_FUNC(type*, free_func); \ + DEFINE_TRIVIAL_CLEANUP_FUNC(type*, free_func##_or_set_invalid); diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h index fdc6c3755b..2a60eb6ab8 100644 --- a/src/shared/conf-parser.h +++ b/src/shared/conf-parser.h @@ -8,6 +8,7 @@ #include #include +#include "conf-parser-forward.h" #include "hashmap.h" #include "log.h" #include "memory-util.h" @@ -19,27 +20,6 @@ typedef enum ConfigParseFlags { CONFIG_PARSE_WARN = 1 << 1, /* Emit non-debug messages */ } ConfigParseFlags; -/* Argument list for parsers of specific configuration settings. */ -#define CONFIG_PARSER_ARGUMENTS \ - const char *unit, \ - const char *filename, \ - unsigned line, \ - const char *section, \ - unsigned section_line, \ - const char *lvalue, \ - int ltype, \ - const char *rvalue, \ - void *data, \ - void *userdata - -/* Prototype for a parser for a specific configuration setting */ -typedef int (*ConfigParserCallback)(CONFIG_PARSER_ARGUMENTS); - -/* A macro declaring a function prototype, following the typedef above, simply because it's so cumbersomely long - * otherwise. (And current emacs gets irritatingly slow when editing files that contain lots of very long function - * prototypes on the same screen…) */ -#define CONFIG_PARSER_PROTOTYPE(name) int name(CONFIG_PARSER_ARGUMENTS) - /* Wraps information for parsing a specific configuration variable, to * be stored in a simple array */ typedef struct ConfigTableItem { @@ -164,12 +144,6 @@ int config_section_parse( const char *rvalue, void *userdata); -typedef struct ConfigSection { - unsigned line; - bool invalid; - char filename[]; -} ConfigSection; - static inline ConfigSection* config_section_free(ConfigSection *cs) { return mfree(cs); } @@ -207,19 +181,6 @@ static inline bool section_is_invalid(ConfigSection *section) { return section->invalid; } -#define DEFINE_SECTION_CLEANUP_FUNCTIONS(type, free_func) \ - static inline type* free_func##_or_set_invalid(type *p) { \ - assert(p); \ - \ - if (p->section) \ - p->section->invalid = true; \ - else \ - free_func(p); \ - return NULL; \ - } \ - DEFINE_TRIVIAL_CLEANUP_FUNC(type*, free_func); \ - DEFINE_TRIVIAL_CLEANUP_FUNC(type*, free_func##_or_set_invalid); - #define log_section_full_errno_zerook(section, level, error, ...) \ ({ \ const ConfigSection *_s = (section); \ diff --git a/src/shared/pcre2-util.h b/src/shared/pcre2-util.h index 1e2ff96799..e9ce0b21d8 100644 --- a/src/shared/pcre2-util.h +++ b/src/shared/pcre2-util.h @@ -29,7 +29,7 @@ typedef struct {} pcre2_code; extern const struct hash_ops pcre2_code_hash_ops_free; -typedef enum { +typedef enum PatternCompileCase { PATTERN_COMPILE_CASE_AUTO, PATTERN_COMPILE_CASE_SENSITIVE, PATTERN_COMPILE_CASE_INSENSITIVE, diff --git a/src/shared/tests.h b/src/shared/tests.h index eae1d76ee0..c9ebafdd83 100644 --- a/src/shared/tests.h +++ b/src/shared/tests.h @@ -10,6 +10,7 @@ #include "argv-util.h" #include "errno-util.h" #include "extract-word.h" +#include "forward.h" #include "log.h" #include "macro.h" #include "process-util.h" diff --git a/src/shutdown/detach-loopback.c b/src/shutdown/detach-loopback.c index aa50299694..441172e521 100644 --- a/src/shutdown/detach-loopback.c +++ b/src/shutdown/detach-loopback.c @@ -5,7 +5,6 @@ #include #include -#include #if HAVE_VALGRIND_MEMCHECK_H #include diff --git a/src/shutdown/detach-md.c b/src/shutdown/detach-md.c index be24bc20ba..d65a876e39 100644 --- a/src/shutdown/detach-md.c +++ b/src/shutdown/detach-md.c @@ -6,7 +6,6 @@ #include #include #include -#include #include "sd-device.h" diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c index 2bb456e087..5f8f9d5754 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c @@ -5,11 +5,11 @@ #include #include -#include #include #include "alloc-util.h" #include "chase.h" +#include "constants.h" #include "dirent-util.h" #include "errno-util.h" #include "fd-util.h" @@ -29,7 +29,6 @@ #include "signal-util.h" #include "stat-util.h" #include "string-util.h" -#include "time-util.h" #include "umount.h" #include "virt.h" diff --git a/src/sleep/battery-capacity.c b/src/sleep/battery-capacity.c index 546d0b6ee1..2985223a94 100644 --- a/src/sleep/battery-capacity.c +++ b/src/sleep/battery-capacity.c @@ -13,6 +13,7 @@ #include "parse-util.h" #include "siphash24.h" #include "string-util.h" +#include "time-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/battery-capacity.h b/src/sleep/battery-capacity.h index df7b06ce5a..8f4f4ac2e7 100644 --- a/src/sleep/battery-capacity.h +++ b/src/sleep/battery-capacity.h @@ -2,7 +2,6 @@ #pragma once #include "hashmap.h" -#include "time-util.h" int fetch_batteries_capacity_by_name(Hashmap **ret_current_capacity); int get_capacity_by_name(Hashmap *capacities_by_name, const char *name); diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index 3bbfdbadaf..03375a942a 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -10,7 +10,6 @@ #include #include #include -#include #include "sd-bus.h" #include "sd-device.h" diff --git a/src/sleep/test-battery-capacity.c b/src/sleep/test-battery-capacity.c index 1b3422ae80..5680417973 100644 --- a/src/sleep/test-battery-capacity.c +++ b/src/sleep/test-battery-capacity.c @@ -7,6 +7,7 @@ #include "hashmap.h" #include "log.h" #include "tests.h" +#include "time-util.h" TEST(fetch_batteries_capacity_by_name) { _cleanup_hashmap_free_ Hashmap *capacity = NULL; diff --git a/src/socket-activate/socket-activate.c b/src/socket-activate/socket-activate.c index 8bca1326a0..ada289ded3 100644 --- a/src/socket-activate/socket-activate.c +++ b/src/socket-activate/socket-activate.c @@ -2,7 +2,6 @@ #include #include -#include #include #include diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c index 93f186b287..d15f82d61b 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include "sd-daemon.h" diff --git a/src/ssh-generator/ssh-generator.c b/src/ssh-generator/ssh-generator.c index 55ad498b7d..1ab4acc9c5 100644 --- a/src/ssh-generator/ssh-generator.c +++ b/src/ssh-generator/ssh-generator.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include #include #include "alloc-util.h" diff --git a/src/ssh-generator/ssh-proxy.c b/src/ssh-generator/ssh-proxy.c index 04f99dbd57..38f6477914 100644 --- a/src/ssh-generator/ssh-proxy.c +++ b/src/ssh-generator/ssh-proxy.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include "sd-varlink.h" diff --git a/src/sulogin-shell/sulogin-shell.c b/src/sulogin-shell/sulogin-shell.c index 8678c6fee0..d074f6b543 100644 --- a/src/sulogin-shell/sulogin-shell.c +++ b/src/sulogin-shell/sulogin-shell.c @@ -3,8 +3,6 @@ Copyright © 2017 Felipe Sateler ***/ -#include - #include "sd-bus.h" #include "alloc-util.h" diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c index 188b368c41..61d4195912 100644 --- a/src/sysext/sysext.c +++ b/src/sysext/sysext.c @@ -35,7 +35,6 @@ #include "log.h" #include "loop-util.h" #include "main-func.h" -#include "missing_magic.h" #include "mkdir.h" #include "mount-util.h" #include "mountpoint-util.h" diff --git a/src/systemctl/systemctl-daemon-reload.c b/src/systemctl/systemctl-daemon-reload.c index 03a06c077d..2e924b75b1 100644 --- a/src/systemctl/systemctl-daemon-reload.c +++ b/src/systemctl/systemctl-daemon-reload.c @@ -2,6 +2,7 @@ #include "bus-error.h" #include "bus-locator.h" +#include "constants.h" #include "systemctl.h" #include "systemctl-daemon-reload.h" #include "systemctl-util.h" diff --git a/src/test/nss-test-util.c b/src/test/nss-test-util.c index 11cc7e4f0b..7b17c21367 100644 --- a/src/test/nss-test-util.c +++ b/src/test/nss-test-util.c @@ -4,7 +4,6 @@ #include #include -#include "alloc-util.h" #include "log.h" #include "nss-test-util.h" #include "string-util.h" diff --git a/src/test/nss-test-util.h b/src/test/nss-test-util.h index f081e6467e..efd65845c5 100644 --- a/src/test/nss-test-util.h +++ b/src/test/nss-test-util.h @@ -2,7 +2,8 @@ #pragma once #include -#include + +#include "forward.h" const char* nss_status_to_string(enum nss_status status, char *buf, size_t buf_len); void* nss_open_handle(const char *dir, const char *module, int flags); diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c index bd68f58bae..5967c4b406 100644 --- a/src/test/test-acl-util.c +++ b/src/test/test-acl-util.c @@ -9,9 +9,9 @@ #include "errno-util.h" #include "fd-util.h" #include "format-util.h" -#include "fs-util.h" #include "path-util.h" #include "string-util.h" +#include "strv.h" #include "tests.h" #include "tmpfile-util.h" #include "user-util.h" diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c index 1623c483a8..2dbb3097d9 100644 --- a/src/test/test-af-list.c +++ b/src/test/test-af-list.c @@ -1,9 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - -#include "macro.h" -#include "string-util.h" #include "tests.h" _unused_ diff --git a/src/test/test-alloc-util.c b/src/test/test-alloc-util.c index 24cb5f73eb..46d67284e9 100644 --- a/src/test/test-alloc-util.c +++ b/src/test/test-alloc-util.c @@ -1,10 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "alloc-util.h" -#include "macro.h" #include "memory-util.h" #include "random-util.h" #include "tests.h" diff --git a/src/test/test-arphrd-util.c b/src/test/test-arphrd-util.c index 72ff956558..59f375426b 100644 --- a/src/test/test-arphrd-util.c +++ b/src/test/test-arphrd-util.c @@ -1,10 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "arphrd-util.h" -#include "string-util.h" #include "tests.h" TEST(arphrd) { diff --git a/src/test/test-async.c b/src/test/test-async.c index 7b0f7dc6be..2edc1088b8 100644 --- a/src/test/test-async.c +++ b/src/test/test-async.c @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include #include "async.h" #include "fs-util.h" #include "path-util.h" +#include "pidref.h" #include "process-util.h" #include "signal-util.h" #include "tests.h" diff --git a/src/test/test-audit-util.c b/src/test/test-audit-util.c index 75df1426a6..af2813d617 100644 --- a/src/test/test-audit-util.c +++ b/src/test/test-audit-util.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "audit-util.h" +#include "format-util.h" +#include "pidref.h" #include "tests.h" TEST(audit_loginuid_from_pid) { diff --git a/src/test/test-barrier.c b/src/test/test-barrier.c index f965a6c06d..ccafe5b066 100644 --- a/src/test/test-barrier.c +++ b/src/test/test-barrier.c @@ -9,7 +9,7 @@ * increase it at the slightly cost of lengthen test-duration on other machines. */ -#include +#include #include #include #include diff --git a/src/test/test-bitfield.c b/src/test/test-bitfield.c index f26b423940..89c3d66315 100644 --- a/src/test/test-bitfield.c +++ b/src/test/test-bitfield.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "bitfield.h" -#include "log.h" #include "tests.h" #define TEST_BITS(bits, v, ...) \ diff --git a/src/test/test-blockdev-util.c b/src/test/test-blockdev-util.c index 6ede05852d..5e5eee0e60 100644 --- a/src/test/test-blockdev-util.c +++ b/src/test/test-blockdev-util.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "sd-daemon.h" + #include "blockdev-util.h" #include "device-util.h" #include "errno-util.h" diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c index 677172964f..3917bb0c1d 100644 --- a/src/test/test-boot-timestamps.c +++ b/src/test/test-boot-timestamps.c @@ -1,14 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include - #include "acpi-fpdt.h" #include "boot-timestamps.h" #include "efi-loader.h" #include "errno-util.h" #include "log.h" #include "tests.h" +#include "time-util.h" static int test_acpi_fpdt(void) { usec_t loader_start, loader_exit; diff --git a/src/test/test-bpf-devices.c b/src/test/test-bpf-devices.c index 1642673e75..2694b1eebc 100644 --- a/src/test/test-bpf-devices.c +++ b/src/test/test-bpf-devices.c @@ -1,17 +1,17 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include #include "alloc-util.h" #include "bpf-devices.h" #include "bpf-program.h" #include "cgroup-setup.h" +#include "cgroup.h" #include "errno-list.h" #include "fd-util.h" #include "fs-util.h" #include "path-util.h" +#include "strv.h" #include "tests.h" static void test_policy_closed(const char *cgroup_path, BPFProgram **installed_prog) { diff --git a/src/test/test-bpf-firewall.c b/src/test/test-bpf-firewall.c index 8f3c7b41d8..82f03a1e89 100644 --- a/src/test/test-bpf-firewall.c +++ b/src/test/test-bpf-firewall.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include "bpf-firewall.h" @@ -10,8 +9,10 @@ #include "load-fragment.h" #include "manager.h" #include "memory-util.h" +#include "path-util.h" #include "rm-rf.h" #include "service.h" +#include "set.h" #include "tests.h" #include "unit-serialize.h" #include "virt.h" diff --git a/src/test/test-bpf-foreign-programs.c b/src/test/test-bpf-foreign-programs.c index 1b1f1762c9..f2de3553dd 100644 --- a/src/test/test-bpf-foreign-programs.c +++ b/src/test/test-bpf-foreign-programs.c @@ -1,18 +1,18 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include #include -#include #include -#include "bpf-foreign.h" +#include "bpf-program.h" #include "load-fragment.h" #include "manager.h" #include "process-util.h" #include "rlimit-util.h" #include "rm-rf.h" #include "service.h" +#include "strv.h" #include "tests.h" #include "unit.h" #include "virt.h" diff --git a/src/test/test-bpf-restrict-fs.c b/src/test/test-bpf-restrict-fs.c index 522bb010e7..29a1470dc6 100644 --- a/src/test/test-bpf-restrict-fs.c +++ b/src/test/test-bpf-restrict-fs.c @@ -10,7 +10,6 @@ #include "strv.h" #include "tests.h" #include "unit.h" -#include "virt.h" static int test_restrict_filesystems(Manager *m, const char *unit_name, const char *file_path, char **allowed_filesystems) { _cleanup_free_ char *exec_start = NULL; diff --git a/src/test/test-btrfs-physical-offset.c b/src/test/test-btrfs-physical-offset.c index 221c08e57e..e039a63b93 100644 --- a/src/test/test-btrfs-physical-offset.c +++ b/src/test/test-btrfs-physical-offset.c @@ -1,11 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include "btrfs-util.h" #include "fd-util.h" -#include "format-util.h" #include "log.h" #include "memory-util.h" #include "tests.h" diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c index 326712a42d..d81c129d65 100644 --- a/src/test/test-btrfs.c +++ b/src/test/test-btrfs.c @@ -2,6 +2,7 @@ #include #include +#include #include "btrfs-util.h" #include "fd-util.h" @@ -11,6 +12,7 @@ #include "log.h" #include "string-util.h" #include "tests.h" +#include "time-util.h" int main(int argc, char *argv[]) { BtrfsQuotaInfo quota; diff --git a/src/test/test-bus-util.c b/src/test/test-bus-util.c index 491e790f6a..6361d7f17a 100644 --- a/src/test/test-bus-util.c +++ b/src/test/test-bus-util.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "sd-bus.h" + #include "bus-util.h" #include "log.h" #include "tests.h" diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c index e8c50ead9f..496fffc4d0 100644 --- a/src/test/test-calendarspec.c +++ b/src/test/test-calendarspec.c @@ -1,11 +1,15 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include +#include + #include "alloc-util.h" #include "calendarspec.h" #include "env-util.h" #include "errno-util.h" #include "string-util.h" #include "tests.h" +#include "time-util.h" static void _test_one(int line, const char *input, const char *output) { _cleanup_(calendar_spec_freep) CalendarSpec *c = NULL; diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c index 0fb2f31ed2..945c5ccec7 100644 --- a/src/test/test-cap-list.c +++ b/src/test/test-cap-list.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "alloc-util.h" #include "cap-list.h" diff --git a/src/test/test-capability.c b/src/test/test-capability.c index 9d863daf2b..881aafbc7f 100644 --- a/src/test/test-capability.c +++ b/src/test/test-capability.c @@ -3,10 +3,12 @@ #include #include #include +#include #include #include #include #include +#include "pidref.h" #define TEST_CAPABILITY_C @@ -15,10 +17,8 @@ #include "errno-util.h" #include "fd-util.h" #include "fileio.h" -#include "macro.h" #include "parse-util.h" #include "process-util.h" -#include "string-util.h" #include "tests.h" static uid_t test_uid = -1; diff --git a/src/test/test-cgroup-cpu.c b/src/test/test-cgroup-cpu.c index fcf84d379c..cc9b732e09 100644 --- a/src/test/test-cgroup-cpu.c +++ b/src/test/test-cgroup-cpu.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "cgroup.h" -#include "log.h" #include "tests.h" +#include "time-util.h" TEST(group_cpu_adjust_period) { /* Period 1ms, quota 40% -> Period 2.5ms */ diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c index f73372d631..42a055e50f 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c @@ -1,13 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "cgroup.h" #include "cgroup-util.h" -#include "macro.h" #include "manager.h" #include "rm-rf.h" -#include "string-util.h" #include "tests.h" #include "unit.h" diff --git a/src/test/test-cgroup-unit-default.c b/src/test/test-cgroup-unit-default.c index 818d75eeac..2e53b0e1c8 100644 --- a/src/test/test-cgroup-unit-default.c +++ b/src/test/test-cgroup-unit-default.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "cgroup.h" #include "manager.h" #include "rm-rf.h" diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c index 5bd3427ab4..4e7d52f5bc 100644 --- a/src/test/test-cgroup-util.c +++ b/src/test/test-cgroup-util.c @@ -2,19 +2,15 @@ #include "alloc-util.h" #include "cgroup-util.h" -#include "dirent-util.h" #include "errno-util.h" #include "fd-util.h" #include "format-util.h" -#include "parse-util.h" -#include "proc-cmdline.h" +#include "path-util.h" +#include "pidref.h" #include "process-util.h" #include "special.h" -#include "stat-util.h" #include "string-util.h" -#include "strv.h" #include "tests.h" -#include "user-util.h" static void check_p_d_u(const char *path, int code, const char *result) { _cleanup_free_ char *unit = NULL; diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c index 8ca6eb1b9d..4d1bbd4b34 100644 --- a/src/test/test-cgroup.c +++ b/src/test/test-cgroup.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "cgroup-setup.h" #include "cgroup-util.h" #include "errno-util.h" diff --git a/src/test/test-chase.c b/src/test/test-chase.c index 469e0b5a39..4f6e006d5e 100644 --- a/src/test/test-chase.c +++ b/src/test/test-chase.c @@ -1,8 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "alloc-util.h" +#include "argv-util.h" #include "chase.h" #include "dirent-util.h" #include "fd-util.h" @@ -12,6 +14,7 @@ #include "path-util.h" #include "random-util.h" #include "rm-rf.h" +#include "stat-util.h" #include "string-util.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-chid.c b/src/test/test-chid.c index 2faf886c97..564b09c183 100644 --- a/src/test/test-chid.c +++ b/src/test/test-chid.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "chid-fundamental.h" -#include "string-util.h" #include "tests.h" const char16_t *const test_fields[_CHID_SMBIOS_FIELDS_MAX] = { diff --git a/src/test/test-chown-rec.c b/src/test/test-chown-rec.c index 7558de7138..4b3a6f5247 100644 --- a/src/test/test-chown-rec.c +++ b/src/test/test-chown-rec.c @@ -1,11 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include -#include "alloc-util.h" #include "chown-recursive.h" -#include "log.h" #include "rm-rf.h" #include "string-util.h" #include "tests.h" diff --git a/src/test/test-clock.c b/src/test/test-clock.c index 5115bd83c2..f31b361324 100644 --- a/src/test/test-clock.c +++ b/src/test/test-clock.c @@ -3,15 +3,12 @@ Copyright © 2016 Canonical Ltd. ***/ -#include #include #include "clock-util.h" #include "fd-util.h" #include "fileio.h" -#include "fs-util.h" #include "log.h" -#include "macro.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-compress-benchmark.c b/src/test/test-compress-benchmark.c index c4e19f9256..59e215122d 100644 --- a/src/test/test-compress-benchmark.c +++ b/src/test/test-compress-benchmark.c @@ -2,15 +2,12 @@ #include "alloc-util.h" #include "compress.h" -#include "env-util.h" -#include "macro.h" -#include "memory-util.h" #include "nulstr-util.h" #include "parse-util.h" #include "process-util.h" #include "random-util.h" -#include "string-util.h" #include "tests.h" +#include "time-util.h" typedef int (compress_t)(const void *src, uint64_t src_size, void *dst, size_t dst_alloc_size, size_t *dst_size, int level); diff --git a/src/test/test-compress.c b/src/test/test-compress.c index 56a468ab88..01e6e9863a 100644 --- a/src/test/test-compress.c +++ b/src/test/test-compress.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include +#include #if HAVE_LZ4 #include @@ -10,9 +12,6 @@ #include "compress.h" #include "dlfcn-util.h" #include "fd-util.h" -#include "fs-util.h" -#include "macro.h" -#include "memory-util.h" #include "path-util.h" #include "random-util.h" #include "tests.h" diff --git a/src/test/test-condition.c b/src/test/test-condition.c index 19377962b7..11b3a42418 100644 --- a/src/test/test-condition.c +++ b/src/test/test-condition.c @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include @@ -16,27 +16,23 @@ #include "condition.h" #include "confidential-virt.h" #include "cpu-set-util.h" -#include "efi-loader.h" +#include "efivars.h" #include "env-util.h" #include "errno-util.h" #include "fileio.h" #include "fs-util.h" #include "hostname-setup.h" -#include "hostname-util.h" #include "id128-util.h" #include "ima-util.h" #include "libaudit-util.h" #include "limits-util.h" #include "log.h" -#include "macro.h" #include "nulstr-util.h" #include "os-util.h" #include "path-util.h" -#include "process-util.h" #include "psi-util.h" #include "rm-rf.h" #include "selinux-util.h" -#include "set.h" #include "smack-util.h" #include "string-util.h" #include "strv.h" diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c index 4253490443..cd3b2c2d1c 100644 --- a/src/test/test-conf-files.c +++ b/src/test/test-conf-files.c @@ -3,16 +3,12 @@ Copyright © 2014 Michael Marineau ***/ -#include -#include +#include #include "alloc-util.h" #include "conf-files.h" #include "fd-util.h" #include "fileio.h" -#include "fs-util.h" -#include "macro.h" -#include "mkdir.h" #include "path-util.h" #include "rm-rf.h" #include "string-util.h" diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c index d00444e24f..86b3a565ad 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -3,16 +3,13 @@ #include "conf-parser.h" #include "fd-util.h" #include "fileio.h" -#include "fs-util.h" #include "log.h" -#include "macro.h" #include "mkdir.h" #include "rm-rf.h" -#include "string-util.h" #include "strv.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" -#include "user-util.h" static void test_config_parse_path_one(const char *rvalue, const char *expected) { _cleanup_free_ char *path = NULL; diff --git a/src/test/test-copy.c b/src/test/test-copy.c index ac98bcf2a1..7204779041 100644 --- a/src/test/test-copy.c +++ b/src/test/test-copy.c @@ -5,24 +5,24 @@ #include #include "alloc-util.h" +#include "argv-util.h" #include "chase.h" #include "copy.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" +#include "hashmap.h" #include "hexdecoct.h" #include "io-util.h" #include "log.h" -#include "macro.h" #include "mkdir.h" #include "path-util.h" -#include "random-util.h" #include "rm-rf.h" +#include "stat-util.h" #include "string-util.h" #include "strv.h" #include "tests.h" #include "tmpfile-util.h" -#include "user-util.h" #include "xattr-util.h" TEST(copy_file) { diff --git a/src/test/test-core-unit.c b/src/test/test-core-unit.c index 83c8674c6f..433eff512a 100644 --- a/src/test/test-core-unit.c +++ b/src/test/test-core-unit.c @@ -2,6 +2,7 @@ #include "alloc-util.h" #include "escape.h" +#include "strv.h" #include "tests.h" #include "unit.h" diff --git a/src/test/test-coredump-util.c b/src/test/test-coredump-util.c index 2f66ed63e0..5ad5f5ff36 100644 --- a/src/test/test-coredump-util.c +++ b/src/test/test-coredump-util.c @@ -7,7 +7,6 @@ #include "fd-util.h" #include "fileio.h" #include "format-util.h" -#include "macro.h" #include "tests.h" TEST(coredump_filter_to_from_string) { diff --git a/src/test/test-cpu-set-util.c b/src/test/test-cpu-set-util.c index 4fbb7717c5..4758ddeadd 100644 --- a/src/test/test-cpu-set-util.c +++ b/src/test/test-cpu-set-util.c @@ -2,8 +2,6 @@ #include "alloc-util.h" #include "cpu-set-util.h" -#include "macro.h" -#include "string-util.h" #include "tests.h" TEST(parse_cpu_set) { diff --git a/src/test/test-cryptolib.c b/src/test/test-cryptolib.c index 4f51ead42a..1a09297a3f 100644 --- a/src/test/test-cryptolib.c +++ b/src/test/test-cryptolib.c @@ -1,9 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" -#include "macro.h" #include "openssl-util.h" -#include "string-util.h" #include "tests.h" TEST(string_hashsum) { diff --git a/src/test/test-daemon.c b/src/test/test-daemon.c index 957f0f2a80..1d3ac41cdd 100644 --- a/src/test/test-daemon.c +++ b/src/test/test-daemon.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "sd-daemon.h" #include "parse-util.h" diff --git a/src/test/test-data-fd-util.c b/src/test/test-data-fd-util.c index ef047a3c6a..97b5cd4a7e 100644 --- a/src/test/test-data-fd-util.c +++ b/src/test/test-data-fd-util.c @@ -1,16 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include +#include #include #include "data-fd-util.h" #include "fd-util.h" #include "memfd-util.h" -#include "memory-util.h" #include "process-util.h" -#include "random-util.h" #include "tests.h" static void assert_equal_fd(int fd1, int fd2) { diff --git a/src/test/test-date.c b/src/test/test-date.c index f39720aba9..7005f37283 100644 --- a/src/test/test-date.c +++ b/src/test/test-date.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "alloc-util.h" diff --git a/src/test/test-dev-setup.c b/src/test/test-dev-setup.c index b748809eb1..75ea33d9fd 100644 --- a/src/test/test-dev-setup.c +++ b/src/test/test-dev-setup.c @@ -1,8 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "capability-util.h" #include "dev-setup.h" -#include "fs-util.h" #include "mkdir.h" #include "path-util.h" #include "rm-rf.h" diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c index 36fa2ce8ee..2515d5895e 100644 --- a/src/test/test-device-nodes.c +++ b/src/test/test-device-nodes.c @@ -1,11 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "alloc-util.h" #include "device-nodes.h" -#include "string-util.h" #include "tests.h" /* helpers for test_encode_devnode_name */ diff --git a/src/test/test-dirent-util.c b/src/test/test-dirent-util.c index cb31edcdc6..b5a903fa11 100644 --- a/src/test/test-dirent-util.c +++ b/src/test/test-dirent-util.c @@ -1,18 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include +#include #include #include -#include "alloc-util.h" #include "dirent-util.h" #include "fs-util.h" -#include "mkdir.h" -#include "path-util.h" #include "rm-rf.h" -#include "stat-util.h" #include "string-util.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-display-quota.c b/src/test/test-display-quota.c index 0fe9e33956..c7f0cca5c2 100644 --- a/src/test/test-display-quota.c +++ b/src/test/test-display-quota.c @@ -6,8 +6,9 @@ #include "format-util.h" #include "log.h" #include "main-func.h" -#include "missing_syscall.h" #include "quota-util.h" +#include "strv.h" +#include "user-util.h" #include "userdb.h" static int show_quota(uid_t uid, const char *path) { diff --git a/src/test/test-dlopen-so.c b/src/test/test-dlopen-so.c index 6d56c19b89..e044c0fca3 100644 --- a/src/test/test-dlopen-so.c +++ b/src/test/test-dlopen-so.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "apparmor-util.h" #include "bpf-dlopen.h" @@ -12,7 +11,6 @@ #include "idn-util.h" #include "libarchive-util.h" #include "libfido2-util.h" -#include "macro.h" #include "main-func.h" #include "module-util.h" #include "password-quality-util-passwdqc.h" diff --git a/src/test/test-dlopen.c b/src/test/test-dlopen.c index fd5bc32d5b..91e1d2f8a3 100644 --- a/src/test/test-dlopen.c +++ b/src/test/test-dlopen.c @@ -3,8 +3,7 @@ #include #include -#include "assert-util.h" -#include "macro.h" +#include "forward.h" int main(int argc, char **argv) { void *handles[argc - 1]; diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c index 302fcfb7fb..f1d11305c1 100644 --- a/src/test/test-dns-domain.c +++ b/src/test/test-dns-domain.c @@ -2,7 +2,7 @@ #include "alloc-util.h" #include "dns-domain.h" -#include "macro.h" +#include "in-addr-util.h" #include "string-util.h" #include "tests.h" diff --git a/src/test/test-ellipsize.c b/src/test/test-ellipsize.c index d70b727cee..83978446e1 100644 --- a/src/test/test-ellipsize.c +++ b/src/test/test-ellipsize.c @@ -4,7 +4,6 @@ #include "alloc-util.h" #include "ansi-color.h" -#include "constants.h" #include "escape.h" #include "string-util.h" #include "strv.h" diff --git a/src/test/test-emergency-action.c b/src/test/test-emergency-action.c index 5c0ce7f053..768ff02a79 100644 --- a/src/test/test-emergency-action.c +++ b/src/test/test-emergency-action.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "emergency-action.h" +#include "runtime-scope.h" #include "tests.h" TEST(parse_emergency_action) { diff --git a/src/test/test-engine.c b/src/test/test-engine.c index 57774d04c5..56b7920d8d 100644 --- a/src/test/test-engine.c +++ b/src/test/test-engine.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include "bus-util.h" +#include "sd-bus.h" + #include "manager.h" #include "manager-dump.h" #include "rm-rf.h" diff --git a/src/test/test-env-file.c b/src/test/test-env-file.c index f34b2aac72..69c8e48daa 100644 --- a/src/test/test-env-file.c +++ b/src/test/test-env-file.c @@ -4,7 +4,6 @@ #include "fd-util.h" #include "fileio.h" #include "fs-util.h" -#include "macro.h" #include "strv.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c index 7eda66bd3e..aa733704bc 100644 --- a/src/test/test-env-util.c +++ b/src/test/test-env-util.c @@ -1,13 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include "env-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" #include "parse-util.h" #include "process-util.h" -#include "serialize.h" -#include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-errno-list.c b/src/test/test-errno-list.c index 032cf3bb11..fb92180279 100644 --- a/src/test/test-errno-list.c +++ b/src/test/test-errno-list.c @@ -1,11 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "errno-list.h" #include "errno-to-name.h" -#include "macro.h" -#include "string-util.h" #include "tests.h" TEST(errno_list) { diff --git a/src/test/test-errno-util.c b/src/test/test-errno-util.c index a04e95223a..1a0154fb05 100644 --- a/src/test/test-errno-util.c +++ b/src/test/test-errno-util.c @@ -2,7 +2,6 @@ #include "errno-util.h" #include "stdio-util.h" -#include "string-util.h" #include "tests.h" TEST(strerror_not_threadsafe) { diff --git a/src/test/test-escape.c b/src/test/test-escape.c index e4dfe32c04..7162f7ff2d 100644 --- a/src/test/test-escape.c +++ b/src/test/test-escape.c @@ -2,7 +2,6 @@ #include "alloc-util.h" #include "escape.h" -#include "macro.h" #include "tests.h" TEST(cescape) { diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c index 6987e558ba..6accb28b56 100644 --- a/src/test/test-exec-util.c +++ b/src/test/test-exec-util.c @@ -1,20 +1,17 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include -#include #include #include "alloc-util.h" #include "constants.h" -#include "copy.h" #include "env-util.h" #include "exec-util.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" #include "log.h" -#include "macro.h" #include "path-util.h" #include "rm-rf.h" #include "string-util.h" diff --git a/src/test/test-execute.c b/src/test/test-execute.c index 1eddf11dd1..88738dd4c9 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -3,22 +3,23 @@ #include #include #include +#include #include #include -#include #include "sd-event.h" +#include "argv-util.h" #include "build-path.h" #include "capability-util.h" #include "copy.h" #include "cpu-set-util.h" #include "dropin.h" #include "errno-list.h" +#include "extract-word.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" -#include "macro.h" #include "manager.h" #include "mkdir.h" #include "mount-util.h" @@ -30,9 +31,9 @@ #include "signal-util.h" #include "stat-util.h" #include "static-destruct.h" +#include "strv.h" #include "sysctl-util.h" #include "tests.h" -#include "tmpfile-util.h" #include "unit.h" #include "user-util.h" #include "virt.h" diff --git a/src/test/test-exit-status.c b/src/test/test-exit-status.c index aab8193519..a24ae5a828 100644 --- a/src/test/test-exit-status.c +++ b/src/test/test-exit-status.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "exit-status.h" -#include "string-util.h" #include "tests.h" TEST(exit_status_to_string) { diff --git a/src/test/test-extract-word.c b/src/test/test-extract-word.c index 4c18a45231..aad9bbc47d 100644 --- a/src/test/test-extract-word.c +++ b/src/test/test-extract-word.c @@ -1,11 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include - #include "extract-word.h" -#include "log.h" -#include "string-util.h" #include "tests.h" TEST(extract_first_word) { diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c index 2ebc776f47..768a02f596 100644 --- a/src/test/test-fd-util.c +++ b/src/test/test-fd-util.c @@ -7,12 +7,8 @@ #include "alloc-util.h" #include "fd-util.h" -#include "fileio.h" #include "fs-util.h" -#include "macro.h" #include "memfd-util.h" -#include "memory-util.h" -#include "missing_syscall.h" #include "mkdir.h" #include "mount-util.h" #include "namespace-util.h" @@ -24,7 +20,6 @@ #include "seccomp-util.h" #include "serialize.h" #include "stat-util.h" -#include "string-util.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-fdset.c b/src/test/test-fdset.c index 7aeaf5f129..4d4c5716d6 100644 --- a/src/test/test-fdset.c +++ b/src/test/test-fdset.c @@ -1,12 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "fd-util.h" #include "fdset.h" -#include "fs-util.h" -#include "macro.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-fiemap.c b/src/test/test-fiemap.c index 9094a2b9f1..5f7ad54bb6 100644 --- a/src/test/test-fiemap.c +++ b/src/test/test-fiemap.c @@ -1,13 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include -#include -#include +#include #include -#include "errno-util.h" +#include "argv-util.h" #include "fd-util.h" #include "hibernate-util.h" #include "log.h" diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c index 731a37caf1..744fb49427 100644 --- a/src/test/test-fileio.c +++ b/src/test/test-fileio.c @@ -1,12 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include #include "alloc-util.h" -#include "ctype.h" #include "env-file.h" #include "env-util.h" #include "errno-util.h" diff --git a/src/test/test-firewall-util.c b/src/test/test-firewall-util.c index 93223be29d..1a2121d084 100644 --- a/src/test/test-firewall-util.c +++ b/src/test/test-firewall-util.c @@ -1,9 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "firewall-util.h" #include "firewall-util-private.h" +#include "in-addr-util.h" #include "log.h" #include "random-util.h" #include "socket-util.h" diff --git a/src/test/test-format-table.c b/src/test/test-format-table.c index 0c80770c4d..0f16ebffec 100644 --- a/src/test/test-format-table.c +++ b/src/test/test-format-table.c @@ -1,12 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "alloc-util.h" #include "format-table.h" #include "json-util.h" -#include "string-util.h" -#include "strv.h" #include "terminal-util.h" #include "tests.h" #include "time-util.h" diff --git a/src/test/test-format-util.c b/src/test/test-format-util.c index 8afba4e585..0a95837dbe 100644 --- a/src/test/test-format-util.c +++ b/src/test/test-format-util.c @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "format-util.h" -#include "macro.h" -#include "string-util.h" #include "tests.h" #include "uchar.h" diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c index e3c3149db1..32f7c3c6af 100644 --- a/src/test/test-fs-util.c +++ b/src/test/test-fs-util.c @@ -1,30 +1,28 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include #include #include "alloc-util.h" +#include "argv-util.h" #include "copy.h" -#include "dirent-util.h" #include "fd-util.h" -#include "fileio.h" #include "fs-util.h" -#include "macro.h" #include "mkdir.h" #include "path-util.h" #include "process-util.h" #include "random-util.h" #include "rm-rf.h" #include "stat-util.h" -#include "stdio-util.h" #include "string-util.h" #include "strv.h" #include "sync-util.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" #include "umask-util.h" -#include "user-util.h" #include "virt.h" static const char *arg_test_dir = NULL; diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c index 49d71f15c7..7e1a264cb9 100644 --- a/src/test/test-glob-util.c +++ b/src/test/test-glob-util.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include #include @@ -8,7 +8,6 @@ #include "dirent-util.h" #include "fs-util.h" #include "glob-util.h" -#include "macro.h" #include "rm-rf.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-gpt.c b/src/test/test-gpt.c index 28b53d479a..2c793181d9 100644 --- a/src/test/test-gpt.c +++ b/src/test/test-gpt.c @@ -1,12 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "architecture.h" -#include "glyph-util.h" #include "gpt.h" #include "log.h" #include "pretty-print.h" #include "strv.h" -#include "terminal-util.h" #include "tests.h" TEST(gpt_types_against_architectures) { diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c index 28ddff643b..eb211c3ed7 100644 --- a/src/test/test-hashmap-plain.c +++ b/src/test/test-hashmap-plain.c @@ -5,7 +5,6 @@ #include "log.h" #include "nulstr-util.h" #include "stdio-util.h" -#include "string-util.h" #include "strv.h" #include "tests.h" #include "time-util.h" diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c index 74e68a473d..7f25ad1011 100644 --- a/src/test/test-hashmap.c +++ b/src/test/test-hashmap.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "hashmap.h" -#include "string-util.h" #include "tests.h" unsigned custom_counter = 0; diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c index e5121d148e..ce86dd0d2a 100644 --- a/src/test/test-hexdecoct.c +++ b/src/test/test-hexdecoct.c @@ -1,10 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "alloc-util.h" #include "hexdecoct.h" -#include "macro.h" #include "random-util.h" #include "string-util.h" #include "tests.h" diff --git a/src/test/test-hmac.c b/src/test/test-hmac.c index 28f7ab9460..9c74c69da8 100644 --- a/src/test/test-hmac.c +++ b/src/test/test-hmac.c @@ -2,7 +2,6 @@ #include "hexdecoct.h" #include "hmac.h" -#include "string-util.h" #include "tests.h" static void hmac_sha256_by_string(const char *key, const char *value, uint8_t res[static SHA256_DIGEST_SIZE]) { diff --git a/src/test/test-hostname-setup.c b/src/test/test-hostname-setup.c index fbb7de3689..87c9f7d751 100644 --- a/src/test/test-hostname-setup.c +++ b/src/test/test-hostname-setup.c @@ -1,16 +1,14 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include +#include #include "alloc-util.h" #include "fd-util.h" #include "fileio.h" -#include "fs-util.h" #include "hostname-setup.h" #include "hostname-util.h" #include "id128-util.h" -#include "string-util.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-hostname-util.c b/src/test/test-hostname-util.c index 2667bb7b19..f9f24e0e03 100644 --- a/src/test/test-hostname-util.c +++ b/src/test/test-hostname-util.c @@ -1,9 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - -#include "alloc-util.h" -#include "fileio.h" #include "hostname-util.h" #include "string-util.h" #include "tests.h" diff --git a/src/test/test-id128.c b/src/test/test-id128.c index 48af629b73..0ecdf76e80 100644 --- a/src/test/test-id128.c +++ b/src/test/test-id128.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include +#include #include #include "sd-daemon.h" @@ -10,11 +10,10 @@ #include "alloc-util.h" #include "fd-util.h" #include "id128-util.h" -#include "macro.h" #include "path-util.h" #include "rm-rf.h" -#include "string-util.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" #define ID128_WALDI SD_ID128_MAKE(01, 02, 03, 04, 05, 06, 07, 08, 09, 0a, 0b, 0c, 0d, 0e, 0f, 10) diff --git a/src/test/test-image-policy.c b/src/test/test-image-policy.c index c1747f3440..f35bfc6881 100644 --- a/src/test/test-image-policy.c +++ b/src/test/test-image-policy.c @@ -1,9 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "ansi-color.h" #include "image-policy.h" -#include "pager.h" -#include "pretty-print.h" -#include "string-util.h" #include "tests.h" static void test_policy(const ImagePolicy *p, const char *name) { diff --git a/src/test/test-import-util.c b/src/test/test-import-util.c index cc7b139655..6934ebfcc0 100644 --- a/src/test/test-import-util.c +++ b/src/test/test-import-util.c @@ -2,8 +2,6 @@ #include "alloc-util.h" #include "import-util.h" -#include "log.h" -#include "string-util.h" #include "tests.h" static void test_import_url_last_component_one(const char *input, const char *output, int ret) { diff --git a/src/test/test-in-addr-prefix-util.c b/src/test/test-in-addr-prefix-util.c index 2b44babf8d..de2003dd63 100644 --- a/src/test/test-in-addr-prefix-util.c +++ b/src/test/test-in-addr-prefix-util.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "in-addr-prefix-util.h" +#include "set.h" #include "tests.h" static void test_in_addr_prefix_to_string_one(int f, const char *addr, unsigned prefixlen) { diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c index 090407b8e3..2f38694a05 100644 --- a/src/test/test-install-root.c +++ b/src/test/test-install-root.c @@ -4,7 +4,7 @@ #include "alloc-util.h" #include "fileio.h" -#include "fs-util.h" +#include "hashmap.h" #include "install.h" #include "mkdir.h" #include "rm-rf.h" diff --git a/src/test/test-install.c b/src/test/test-install.c index 5747b84ba5..45704064b2 100644 --- a/src/test/test-install.c +++ b/src/test/test-install.c @@ -3,6 +3,7 @@ #include #include +#include "hashmap.h" #include "install.h" #include "tests.h" diff --git a/src/test/test-io-util.c b/src/test/test-io-util.c index fa3ef865c9..45da6b83f1 100644 --- a/src/test/test-io-util.c +++ b/src/test/test-io-util.c @@ -4,10 +4,8 @@ #include #include -#include "alloc-util.h" #include "fd-util.h" #include "io-util.h" -#include "macro.h" #include "tests.h" static void test_sparse_write_one(int fd, const char *buffer, size_t n) { diff --git a/src/test/test-ip-protocol-list.c b/src/test/test-ip-protocol-list.c index 210192d9a6..e21ddc059a 100644 --- a/src/test/test-ip-protocol-list.c +++ b/src/test/test-ip-protocol-list.c @@ -1,10 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "ip-protocol-list.h" -#include "macro.h" -#include "missing_network.h" #include "stdio-util.h" -#include "string-util.h" #include "tests.h" static void test_int(int i) { diff --git a/src/test/test-journal-importer.c b/src/test/test-journal-importer.c index a8e003e649..370da0b134 100644 --- a/src/test/test-journal-importer.c +++ b/src/test/test-journal-importer.c @@ -1,14 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include #include "alloc-util.h" #include "journal-importer.h" #include "log.h" -#include "path-util.h" -#include "string-util.h" #include "tests.h" static void assert_iovec_entry(const struct iovec *iovec, const char* content) { diff --git a/src/test/test-json.c b/src/test/test-json.c index 3fe2f26274..482e053e7a 100644 --- a/src/test/test-json.c +++ b/src/test/test-json.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include "sd-json.h" @@ -8,15 +9,16 @@ #include "alloc-util.h" #include "escape.h" #include "fd-util.h" +#include "format-util.h" #include "fileio.h" #include "iovec-util.h" #include "json-internal.h" #include "json-util.h" #include "math-util.h" #include "ordered-set.h" +#include "pidref.h" +#include "set.h" #include "string-table.h" -#include "string-util.h" -#include "strv.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-label.c b/src/test/test-label.c index 12b8a6d748..5ce9988ce2 100644 --- a/src/test/test-label.c +++ b/src/test/test-label.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include #include #include #include diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c index 45b02a3c7e..4fd3b0a07d 100644 --- a/src/test/test-load-fragment.c +++ b/src/test/test-load-fragment.c @@ -1,31 +1,27 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include #include #include +#include "sd-daemon.h" #include "sd-id128.h" #include "all-units.h" #include "alloc-util.h" #include "capability-util.h" #include "conf-parser.h" -#include "fd-util.h" #include "fileio.h" #include "format-util.h" -#include "fs-util.h" #include "hashmap.h" #include "hostname-setup.h" -#include "hostname-util.h" #include "install.h" #include "install-printf.h" #include "load-fragment.h" -#include "macro.h" -#include "memory-util.h" +#include "manager.h" #include "open-file.h" #include "pcre2-util.h" #include "rm-rf.h" +#include "set.h" #include "specifier.h" #include "string-util.h" #include "strv.h" diff --git a/src/test/test-local-addresses.c b/src/test/test-local-addresses.c index c2033bfeb3..c038a7b0f4 100644 --- a/src/test/test-local-addresses.c +++ b/src/test/test-local-addresses.c @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include +#include "sd-netlink.h" + #include "af-list.h" #include "alloc-util.h" -#include "capability-util.h" #include "in-addr-util.h" #include "local-addresses.h" #include "netlink-util.h" diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c index f6386448bc..e264cff5dd 100644 --- a/src/test/test-locale-util.c +++ b/src/test/test-locale-util.c @@ -3,7 +3,6 @@ #include "glyph-util.h" #include "kbd-util.h" #include "locale-util.h" -#include "macro.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-lock-util.c b/src/test/test-lock-util.c index 5edd087582..b68086e3ae 100644 --- a/src/test/test-lock-util.c +++ b/src/test/test-lock-util.c @@ -7,6 +7,7 @@ #include "lock-util.h" #include "rm-rf.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" TEST(make_lock_file) { diff --git a/src/test/test-log.c b/src/test/test-log.c index 3fb0812099..87cd362877 100644 --- a/src/test/test-log.c +++ b/src/test/test-log.c @@ -1,10 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include - #include "format-util.h" -#include "io-util.h" #include "iovec-util.h" #include "iovec-wrapper.h" #include "log.h" diff --git a/src/test/test-login-util.c b/src/test/test-login-util.c index 2d20e234ef..6c0f542be8 100644 --- a/src/test/test-login-util.c +++ b/src/test/test-login-util.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "login-util.h" -#include "string-util.h" #include "tests.h" TEST(session_id_valid) { diff --git a/src/test/test-loop-block.c b/src/test/test-loop-block.c index f5dfec24e9..d59b4b27b1 100644 --- a/src/test/test-loop-block.c +++ b/src/test/test-loop-block.c @@ -1,19 +1,18 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include #include #include -#include #include "alloc-util.h" #include "capability-util.h" #include "dissect-image.h" #include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" #include "gpt.h" +#include "loop-util.h" #include "main-func.h" #include "mkfs-util.h" #include "mount-util.h" @@ -23,8 +22,8 @@ #include "string-util.h" #include "strv.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" -#include "user-util.h" #include "virt.h" static unsigned arg_n_threads = 5; diff --git a/src/test/test-loopback.c b/src/test/test-loopback.c index db6ee0f32d..03dcffeafc 100644 --- a/src/test/test-loopback.c +++ b/src/test/test-loopback.c @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include +#include #include "errno-util.h" #include "log.h" diff --git a/src/test/test-macro.c b/src/test/test-macro.c index 1c76e09858..3b08874b6b 100644 --- a/src/test/test-macro.c +++ b/src/test/test-macro.c @@ -1,14 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include "sd-messages.h" +#include "sd-id128.h" #include "errno-util.h" -#include "id128-util.h" -#include "log.h" -#include "macro.h" #include "tests.h" TEST(saturate_add) { diff --git a/src/test/test-memfd-util.c b/src/test/test-memfd-util.c index 6366eedc24..e3d9c9fff6 100644 --- a/src/test/test-memfd-util.c +++ b/src/test/test-memfd-util.c @@ -4,7 +4,6 @@ #include "fd-util.h" #include "memfd-util.h" #include "missing_mman.h" -#include "string-util.h" #include "tests.h" TEST(memfd_get_sealed) { diff --git a/src/test/test-memory-util.c b/src/test/test-memory-util.c index cd4b64ac16..d5abad099e 100644 --- a/src/test/test-memory-util.c +++ b/src/test/test-memory-util.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "memory-util.h" #include "tests.h" diff --git a/src/test/test-mempress.c b/src/test/test-mempress.c index 6f4e658616..b33ba740c6 100644 --- a/src/test/test-mempress.c +++ b/src/test/test-mempress.c @@ -2,7 +2,9 @@ #include #include +#include #include +#include #include #include "sd-bus.h" @@ -11,6 +13,8 @@ #include "bus-locator.h" #include "bus-wait-for-jobs.h" #include "fd-util.h" +#include "format-util.h" +#include "hashmap.h" #include "path-util.h" #include "process-util.h" #include "random-util.h" @@ -18,6 +22,7 @@ #include "signal-util.h" #include "socket-util.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" #include "unit-def.h" diff --git a/src/test/test-memstream-util.c b/src/test/test-memstream-util.c index bce53e118b..b3b1e813b1 100644 --- a/src/test/test-memstream-util.c +++ b/src/test/test-memstream-util.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "memstream-util.h" -#include "string-util.h" #include "tests.h" TEST(memstream_done) { diff --git a/src/test/test-mkdir.c b/src/test/test-mkdir.c index c6f187b219..13dabe6275 100644 --- a/src/test/test-mkdir.c +++ b/src/test/test-mkdir.c @@ -10,8 +10,8 @@ #include "rm-rf.h" #include "stat-util.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" -#include "user-util.h" TEST(mkdir_p_safe) { _cleanup_(rm_rf_physical_and_freep) char *tmp = NULL; diff --git a/src/test/test-mount-util.c b/src/test/test-mount-util.c index ce6a43101e..a7fc06bbe1 100644 --- a/src/test/test-mount-util.c +++ b/src/test/test-mount-util.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include "alloc-util.h" @@ -9,7 +10,6 @@ #include "fileio.h" #include "fs-util.h" #include "libmount-util.h" -#include "missing_magic.h" #include "mkdir.h" #include "mount-util.h" #include "mountpoint-util.h" @@ -18,7 +18,6 @@ #include "process-util.h" #include "random-util.h" #include "rm-rf.h" -#include "stat-util.h" #include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c index 51d3e69be7..ee2d21825a 100644 --- a/src/test/test-mountpoint-util.c +++ b/src/test/test-mountpoint-util.c @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include #include "alloc-util.h" -#include "constants.h" #include "fd-util.h" #include "fileio.h" +#include "fs-util.h" #include "hashmap.h" #include "log.h" -#include "missing_syscall.h" #include "mountpoint-util.h" #include "path-util.h" #include "rm-rf.h" diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c index decebf737c..14558e8794 100644 --- a/src/test/test-namespace.c +++ b/src/test/test-namespace.c @@ -1,13 +1,18 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include +#include #include #include #include +#include "sd-id128.h" + #include "alloc-util.h" #include "fd-util.h" #include "fileio.h" +#include "namespace-util.h" #include "namespace.h" #include "pidref.h" #include "process-util.h" diff --git a/src/test/test-net-naming-scheme.c b/src/test/test-net-naming-scheme.c index a339020857..2c98f96850 100644 --- a/src/test/test-net-naming-scheme.c +++ b/src/test/test-net-naming-scheme.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "netif-naming-scheme.h" -#include "string-util.h" #include "tests.h" #ifdef _DEFAULT_NET_NAMING_SCHEME diff --git a/src/test/test-netlink-manual.c b/src/test/test-netlink-manual.c index eae13d9b4a..02ef02be97 100644 --- a/src/test/test-netlink-manual.c +++ b/src/test/test-netlink-manual.c @@ -2,14 +2,10 @@ #include #include -#include -#include -#include #include #include "sd-netlink.h" -#include "macro.h" #include "module-util.h" #include "tests.h" diff --git a/src/test/test-nft-set.c b/src/test/test-nft-set.c index bb0c902493..6ae2da03eb 100644 --- a/src/test/test-nft-set.c +++ b/src/test/test-nft-set.c @@ -1,11 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include "firewall-util.h" #include "in-addr-util.h" -#include "log.h" #include "netlink-internal.h" #include "parse-util.h" #include "string-util.h" diff --git a/src/test/test-notify-recv.c b/src/test/test-notify-recv.c index 3178b9da31..5820048c92 100644 --- a/src/test/test-notify-recv.c +++ b/src/test/test-notify-recv.c @@ -1,16 +1,17 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "sd-daemon.h" #include "event-util.h" #include "fd-util.h" +#include "fdset.h" #include "notify-recv.h" -#include "path-util.h" +#include "pidref.h" #include "process-util.h" -#include "rm-rf.h" -#include "socket-util.h" +#include "strv.h" #include "tests.h" typedef struct Context { diff --git a/src/test/test-ns.c b/src/test/test-ns.c index 97b9fc9866..245bf34582 100644 --- a/src/test/test-ns.c +++ b/src/test/test-ns.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include diff --git a/src/test/test-nss-hosts.c b/src/test/test-nss-hosts.c index 1b2d107836..df93a7b528 100644 --- a/src/test/test-nss-hosts.c +++ b/src/test/test-nss-hosts.c @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include #include "af-list.h" #include "alloc-util.h" @@ -12,7 +10,6 @@ #include "format-ifname.h" #include "hexdecoct.h" #include "hostname-setup.h" -#include "hostname-util.h" #include "in-addr-util.h" #include "local-addresses.h" #include "log.h" @@ -22,7 +19,6 @@ #include "parse-util.h" #include "path-util.h" #include "socket-util.h" -#include "stdio-util.h" #include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-nss-users.c b/src/test/test-nss-users.c index 9033fd22c9..0f78995fb7 100644 --- a/src/test/test-nss-users.c +++ b/src/test/test-nss-users.c @@ -2,8 +2,6 @@ #include #include -#include -#include #include "alloc-util.h" #include "dlfcn-util.h" @@ -15,11 +13,9 @@ #include "nss-util.h" #include "parse-util.h" #include "path-util.h" -#include "stdio-util.h" #include "string-util.h" #include "strv.h" #include "tests.h" -#include "user-util.h" static size_t arg_bufsize = 1024; diff --git a/src/test/test-ordered-set.c b/src/test/test-ordered-set.c index 45e4157296..7125dab2c2 100644 --- a/src/test/test-ordered-set.c +++ b/src/test/test-ordered-set.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "ordered-set.h" -#include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-os-util.c b/src/test/test-os-util.c index 709ee04d6b..e40c4b49a2 100644 --- a/src/test/test-os-util.c +++ b/src/test/test-os-util.c @@ -1,9 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include "fileio.h" -#include "fs-util.h" #include "log.h" #include "mkdir.h" #include "os-util.h" diff --git a/src/test/test-parse-argument.c b/src/test/test-parse-argument.c index 9fb1a17b24..d3d88cf0d1 100644 --- a/src/test/test-parse-argument.c +++ b/src/test/test-parse-argument.c @@ -2,6 +2,8 @@ #include +#include "sd-json.h" + #include "parse-argument.h" #include "stdio-util.h" #include "tests.h" diff --git a/src/test/test-parse-helpers.c b/src/test/test-parse-helpers.c index 483ea671ac..041d381654 100644 --- a/src/test/test-parse-helpers.c +++ b/src/test/test-parse-helpers.c @@ -1,10 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include +#include #include -#include "macro.h" #include "parse-helpers.h" #include "tests.h" diff --git a/src/test/test-parse-util.c b/src/test/test-parse-util.c index a2bb8cf3c3..2a54dae2a4 100644 --- a/src/test/test-parse-util.c +++ b/src/test/test-parse-util.c @@ -1,16 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include #include +#include #include -#include "alloc-util.h" -#include "errno-list.h" -#include "log.h" #include "parse-util.h" -#include "string-util.h" #include "tests.h" TEST(parse_boolean) { diff --git a/src/test/test-path-lookup.c b/src/test/test-path-lookup.c index cff2774931..67f3317be2 100644 --- a/src/test/test-path-lookup.c +++ b/src/test/test-path-lookup.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "log.h" #include "path-lookup.h" diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index e11599e185..aa4350e967 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include "alloc-util.h" +#include "argv-util.h" #include "exec-util.h" #include "fd-util.h" -#include "fs-util.h" -#include "macro.h" #include "path-util.h" #include "process-util.h" #include "rm-rf.h" diff --git a/src/test/test-path.c b/src/test/test-path.c index a20535c1b9..317537700a 100644 --- a/src/test/test-path.c +++ b/src/test/test-path.c @@ -1,17 +1,14 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include -#include #include "all-units.h" #include "alloc-util.h" #include "fd-util.h" #include "fs-util.h" -#include "macro.h" #include "manager.h" #include "mkdir.h" -#include "path-util.h" #include "rm-rf.h" #include "string-util.h" #include "strv.h" diff --git a/src/test/test-percent-util.c b/src/test/test-percent-util.c index 7e8e11b49c..5fa680e064 100644 --- a/src/test/test-percent-util.c +++ b/src/test/test-percent-util.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ + #include "percent-util.h" #include "tests.h" -#include "time-util.h" TEST(parse_percent) { assert_se(parse_percent("") == -EINVAL); diff --git a/src/test/test-pidref.c b/src/test/test-pidref.c index cb7feb0347..0f6126c5b4 100644 --- a/src/test/test-pidref.c +++ b/src/test/test-pidref.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "fd-util.h" +#include "format-util.h" #include "pidref.h" #include "process-util.h" -#include "signal-util.h" #include "stdio-util.h" #include "tests.h" diff --git a/src/test/test-pretty-print.c b/src/test/test-pretty-print.c index 9ab52c6012..71d8799cbf 100644 --- a/src/test/test-pretty-print.c +++ b/src/test/test-pretty-print.c @@ -1,14 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include #include #include "alloc-util.h" -#include "macro.h" #include "pretty-print.h" -#include "strv.h" #include "tests.h" #define CYLON_WIDTH 6 diff --git a/src/test/test-proc-cmdline.c b/src/test/test-proc-cmdline.c index 7f0540e01c..8ae9d811e0 100644 --- a/src/test/test-proc-cmdline.c +++ b/src/test/test-proc-cmdline.c @@ -1,15 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "alloc-util.h" -#include "env-util.h" #include "errno-util.h" #include "initrd-util.h" #include "log.h" -#include "macro.h" #include "nulstr-util.h" #include "proc-cmdline.h" -#include "process-util.h" -#include "special.h" #include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c index 6747054cc9..376b20b048 100644 --- a/src/test/test-process-util.c +++ b/src/test/test-process-util.c @@ -3,32 +3,34 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include +#include "strv.h" #if HAVE_VALGRIND_VALGRIND_H #include #endif +#include "sd-daemon.h" + #include "alloc-util.h" #include "architecture.h" -#include "dirent-util.h" +#include "argv-util.h" #include "errno-list.h" #include "errno-util.h" #include "fd-util.h" #include "ioprio-util.h" #include "log.h" -#include "macro.h" #include "missing_sched.h" -#include "missing_syscall.h" #include "namespace-util.h" #include "parse-util.h" #include "pidfd-util.h" +#include "pidref.h" #include "process-util.h" #include "procfs-util.h" #include "rlimit-util.h" @@ -37,6 +39,7 @@ #include "string-util.h" #include "terminal-util.h" #include "tests.h" +#include "time-util.h" #include "user-util.h" #include "virt.h" diff --git a/src/test/test-procfs-util.c b/src/test/test-procfs-util.c index 4835b0461e..9c5340a30f 100644 --- a/src/test/test-procfs-util.c +++ b/src/test/test-procfs-util.c @@ -1,13 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "errno-util.h" #include "format-util.h" #include "log.h" #include "process-util.h" #include "procfs-util.h" #include "tests.h" +#include "time-util.h" int main(int argc, char *argv[]) { nsec_t nsec; diff --git a/src/test/test-progress-bar.c b/src/test/test-progress-bar.c index b199741cf5..b8a78223ae 100644 --- a/src/test/test-progress-bar.c +++ b/src/test/test-progress-bar.c @@ -1,8 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "format-util.h" #include "pretty-print.h" +#include "process-util.h" #include "random-util.h" #include "tests.h" +#include "time-util.h" #define PROGRESS_PREFIX "test:" diff --git a/src/test/test-psi-util.c b/src/test/test-psi-util.c index 4ce0811a8d..1bb25c2b11 100644 --- a/src/test/test-psi-util.c +++ b/src/test/test-psi-util.c @@ -1,9 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" -#include "fs-util.h" #include "parse-util.h" #include "psi-util.h" #include "tests.h" diff --git a/src/test/test-qrcode-util.c b/src/test/test-qrcode-util.c index 221ad854c2..3545c656fb 100644 --- a/src/test/test-qrcode-util.c +++ b/src/test/test-qrcode-util.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "locale-util.h" +#include + #include "main-func.h" #include "qrcode-util.h" #include "tests.h" diff --git a/src/test/test-ratelimit.c b/src/test/test-ratelimit.c index de208c7408..d8883706eb 100644 --- a/src/test/test-ratelimit.c +++ b/src/test/test-ratelimit.c @@ -2,7 +2,6 @@ #include -#include "macro.h" #include "ratelimit.h" #include "tests.h" #include "time-util.h" diff --git a/src/test/test-raw-clone.c b/src/test/test-raw-clone.c index a43e2c2c29..097bbfe29a 100644 --- a/src/test/test-raw-clone.c +++ b/src/test/test-raw-clone.c @@ -5,7 +5,7 @@ #include "errno-util.h" #include "format-util.h" -#include "missing_syscall.h" +#include "missing_sched.h" #include "raw-clone.h" #include "tests.h" diff --git a/src/test/test-recovery-key.c b/src/test/test-recovery-key.c index 8d5ed717d9..b6782f67c9 100644 --- a/src/test/test-recovery-key.c +++ b/src/test/test-recovery-key.c @@ -2,8 +2,6 @@ #include -#include "memory-util.h" -#include "random-util.h" #include "recovery-key.h" #include "tests.h" diff --git a/src/test/test-recurse-dir.c b/src/test/test-recurse-dir.c index 8684d064ec..1502e7f7a8 100644 --- a/src/test/test-recurse-dir.c +++ b/src/test/test-recurse-dir.c @@ -6,8 +6,10 @@ #include "log.h" #include "missing_magic.h" #include "recurse-dir.h" +#include "stat-util.h" #include "strv.h" #include "tests.h" +#include "time-util.h" static char **list_nftw = NULL; diff --git a/src/test/test-replace-var.c b/src/test/test-replace-var.c index 56634a854a..06a5e13b92 100644 --- a/src/test/test-replace-var.c +++ b/src/test/test-replace-var.c @@ -2,7 +2,6 @@ #include -#include "macro.h" #include "replace-var.h" #include "string-util.h" #include "tests.h" diff --git a/src/test/test-rlimit-util.c b/src/test/test-rlimit-util.c index 55f512cf00..c8abd9d98d 100644 --- a/src/test/test-rlimit-util.c +++ b/src/test/test-rlimit-util.c @@ -7,7 +7,6 @@ #include "alloc-util.h" #include "capability-util.h" -#include "macro.h" #include "process-util.h" #include "rlimit-util.h" #include "string-util.h" diff --git a/src/test/test-rm-rf.c b/src/test/test-rm-rf.c index e4a426324f..1ec6148eb1 100644 --- a/src/test/test-rm-rf.c +++ b/src/test/test-rm-rf.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include -#include "alloc-util.h" #include "process-util.h" #include "rm-rf.h" #include "string-util.h" diff --git a/src/test/test-sbat.c b/src/test/test-sbat.c index c41b4192d5..47b31ba5d3 100644 --- a/src/test/test-sbat.c +++ b/src/test/test-sbat.c @@ -2,7 +2,6 @@ /* We include efi_config.h after undefining PROJECT_VERSION which is also defined in config.h. */ #undef PROJECT_VERSION -#include "build.h" #include "efi_config.h" #include "sbat.h" #include "tests.h" diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index ff90842a0a..ca0d75d132 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -6,7 +6,6 @@ #include #include "all-units.h" -#include "macro.h" #include "manager.h" #include "rm-rf.h" #include "tests.h" diff --git a/src/test/test-sd-hwdb.c b/src/test/test-sd-hwdb.c index a13f7ce798..0030096a7c 100644 --- a/src/test/test-sd-hwdb.c +++ b/src/test/test-sd-hwdb.c @@ -2,8 +2,6 @@ #include "sd-hwdb.h" -#include "alloc-util.h" -#include "errno.h" #include "errno-util.h" #include "hwdb-internal.h" #include "nulstr-util.h" diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c index 39a89d1e8d..b4e8e95aa0 100644 --- a/src/test/test-seccomp.c +++ b/src/test/test-seccomp.c @@ -7,8 +7,8 @@ #include #include #include -#include -#include +#include +#include #include #if HAVE_VALGRIND_VALGRIND_H #include @@ -19,7 +19,6 @@ #include "fd-util.h" #include "fileio.h" #include "fs-util.h" -#include "macro.h" #include "memory-util.h" #include "missing_sched.h" #include "missing_syscall.h" diff --git a/src/test/test-secure-bits.c b/src/test/test-secure-bits.c index 3d353aecda..37771d0ce8 100644 --- a/src/test/test-secure-bits.c +++ b/src/test/test-secure-bits.c @@ -1,11 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "securebits-util.h" #include "strv.h" #include "tests.h" -#include "unit-file.h" static const char * const string_bits[] = { "keep-caps", diff --git a/src/test/test-selinux.c b/src/test/test-selinux.c index e7371a81e3..e51b3a283b 100644 --- a/src/test/test-selinux.c +++ b/src/test/test-selinux.c @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include -#include "alloc-util.h" #include "fd-util.h" #include "log.h" #include "selinux-util.h" diff --git a/src/test/test-serialize.c b/src/test/test-serialize.c index ccbd2f89dd..86b1f5f2e0 100644 --- a/src/test/test-serialize.c +++ b/src/test/test-serialize.c @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "escape.h" +#include "extract-word.h" #include "fd-util.h" #include "fileio.h" -#include "fs-util.h" #include "log.h" #include "serialize.h" +#include "set.h" #include "strv.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-set-disable-mempool.c b/src/test/test-set-disable-mempool.c index 91244b25ac..450c4160bf 100644 --- a/src/test/test-set-disable-mempool.c +++ b/src/test/test-set-disable-mempool.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include "mempool.h" #include "process-util.h" diff --git a/src/test/test-sha1.c b/src/test/test-sha1.c index bddc7ac241..3a5ff148df 100644 --- a/src/test/test-sha1.c +++ b/src/test/test-sha1.c @@ -2,7 +2,6 @@ #include "hexdecoct.h" #include "sha1-fundamental.h" -#include "string-util.h" #include "tests.h" static void sha1_process_string(const char *key, struct sha1_ctx *ctx) { diff --git a/src/test/test-sha256.c b/src/test/test-sha256.c index 1acc893c74..1f4a679ac9 100644 --- a/src/test/test-sha256.c +++ b/src/test/test-sha256.c @@ -2,7 +2,6 @@ #include "hexdecoct.h" #include "sha256.h" -#include "string-util.h" #include "tests.h" static void sha256_process_string(const char *key, struct sha256_ctx *ctx) { diff --git a/src/test/test-shift-uid.c b/src/test/test-shift-uid.c index 27fea2161c..e1fd58ad90 100644 --- a/src/test/test-shift-uid.c +++ b/src/test/test-shift-uid.c @@ -1,10 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "log.h" #include "shift-uid.h" -#include "string-util.h" #include "tests.h" #include "user-util.h" diff --git a/src/test/test-sigbus.c b/src/test/test-sigbus.c index 299463c243..95b4717b41 100644 --- a/src/test/test-sigbus.c +++ b/src/test/test-sigbus.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c index 45f31b0c54..7d069a7fb2 100644 --- a/src/test/test-signal-util.c +++ b/src/test/test-signal-util.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "log.h" -#include "macro.h" #include "process-util.h" #include "signal-util.h" #include "stdio-util.h" diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c index fe90341dc8..f4c9916f15 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -1,20 +1,17 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include #include #include #include #include #include -#include -#include #define __STDC_WANT_IEC_60559_TYPES_EXT__ #include -#include "assert-util.h" -#include "time-util.h" +#include "forward.h" /* Print information about various types. Useful when diagnosing * gcc diagnostics on an unfamiliar architecture. */ @@ -65,7 +62,7 @@ int main(void) { check_no_sign(ino_t, SIZEOF_INO_T); check_no_sign(rlim_t, SIZEOF_RLIM_T); check(time_t, SIZEOF_TIME_T); - check(typeof(((struct timex *)0)->freq), SIZEOF_TIMEX_MEMBER); + check(typeof_field(struct timex, freq), SIZEOF_TIMEX_MEMBER); info_no_sign(typeof(function_pointer)); info_no_sign(void*); diff --git a/src/test/test-socket-bind.c b/src/test/test-socket-bind.c index d0e448daa1..f6f48f6723 100644 --- a/src/test/test-socket-bind.c +++ b/src/test/test-socket-bind.c @@ -3,6 +3,7 @@ #include "bpf-socket-bind.h" #include "load-fragment.h" #include "manager.h" +#include "path-util.h" #include "process-util.h" #include "rlimit-util.h" #include "rm-rf.h" diff --git a/src/test/test-socket-netlink.c b/src/test/test-socket-netlink.c index c2a92a7544..9313439cf5 100644 --- a/src/test/test-socket-netlink.c +++ b/src/test/test-socket-netlink.c @@ -6,6 +6,7 @@ #include "fd-util.h" #include "missing_network.h" #include "socket-netlink.h" +#include "socket-util.h" #include "string-util.h" #include "tests.h" diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c index ba2b4470d1..0313350000 100644 --- a/src/test/test-socket-util.c +++ b/src/test/test-socket-util.c @@ -2,27 +2,21 @@ #include #include -#include -#include -#include #include #include "alloc-util.h" -#include "async.h" #include "escape.h" -#include "exit-status.h" #include "fd-util.h" #include "fs-util.h" #include "in-addr-util.h" #include "iovec-util.h" #include "log.h" -#include "macro.h" #include "path-util.h" +#include "pidref.h" #include "process-util.h" #include "random-util.h" #include "rm-rf.h" #include "socket-util.h" -#include "string-util.h" #include "tests.h" #include "tmpfile-util.h" #include "user-util.h" diff --git a/src/test/test-specifier.c b/src/test/test-specifier.c index f2f2f057c1..850f961bfe 100644 --- a/src/test/test-specifier.c +++ b/src/test/test-specifier.c @@ -1,16 +1,17 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include "sd-id128.h" #include "alloc-util.h" +#include "format-util.h" #include "log.h" +#include "process-util.h" +#include "runtime-scope.h" #include "specifier.h" -#include "stat-util.h" #include "stdio-util.h" -#include "string-util.h" #include "strv.h" #include "tests.h" -#include "unit-file.h" static void test_specifier_escape_one(const char *a, const char *b) { _cleanup_free_ char *x = NULL; diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c index c5aacc32f1..fc8bad256f 100644 --- a/src/test/test-stat-util.c +++ b/src/test/test-stat-util.c @@ -2,7 +2,6 @@ #include #include -#include #include #include #include @@ -11,13 +10,12 @@ #include "errno-list.h" #include "fd-util.h" #include "fs-util.h" -#include "macro.h" #include "mount-util.h" #include "mountpoint-util.h" -#include "namespace-util.h" #include "path-util.h" #include "rm-rf.h" #include "stat-util.h" +#include "strv.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-strbuf.c b/src/test/test-strbuf.c index 49ff205c53..4e12ed7366 100644 --- a/src/test/test-strbuf.c +++ b/src/test/test-strbuf.c @@ -1,10 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "nulstr-util.h" #include "strbuf.h" -#include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-string-util.c b/src/test/test-string-util.c index 8e6862c41d..fb3d28ed53 100644 --- a/src/test/test-string-util.c +++ b/src/test/test-string-util.c @@ -1,14 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "alloc-util.h" +#include "extract-word.h" #include "locale-util.h" -#include "macro.h" #include "string-util.h" #include "strv.h" #include "tests.h" -#include "utf8.h" TEST(string_erase) { char *x; diff --git a/src/test/test-strv.c b/src/test/test-strv.c index 7c06e06bb4..d2524fb52b 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -3,7 +3,7 @@ #include #include "alloc-util.h" -#include "escape.h" +#include "extract-word.h" #include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-strxcpyx.c b/src/test/test-strxcpyx.c index 00f595c4bb..1ca5ac7c9e 100644 --- a/src/test/test-strxcpyx.c +++ b/src/test/test-strxcpyx.c @@ -2,7 +2,6 @@ #include -#include "string-util.h" #include "strxcpyx.h" #include "tests.h" diff --git a/src/test/test-sysctl-util.c b/src/test/test-sysctl-util.c index 83d6c9036c..16ce41cb93 100644 --- a/src/test/test-sysctl-util.c +++ b/src/test/test-sysctl-util.c @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "sd-id128.h" #include "errno-util.h" -#include "hostname-util.h" #include "strv.h" #include "sysctl-util.h" #include "tests.h" diff --git a/src/test/test-tables.c b/src/test/test-tables.c index d6e4100760..cd05b17989 100644 --- a/src/test/test-tables.c +++ b/src/test/test-tables.c @@ -11,6 +11,7 @@ #include "device-private.h" #include "discover-image.h" #include "execute.h" +#include "gpt.h" #include "import-util.h" #include "install.h" #include "job.h" @@ -18,6 +19,7 @@ #include "locale-util.h" #include "log.h" #include "logs-show.h" +#include "manager.h" #include "mount.h" #include "netif-naming-scheme.h" #include "path.h" diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c index 4b7f23cf51..f128ddca1f 100644 --- a/src/test/test-terminal-util.c +++ b/src/test/test-terminal-util.c @@ -1,18 +1,15 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include +#include #include #include -#include #include #include "alloc-util.h" #include "ansi-color.h" #include "fd-util.h" -#include "fs-util.h" -#include "macro.h" #include "path-util.h" #include "process-util.h" #include "stat-util.h" diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c index f0daa500eb..5e01bb2fe3 100644 --- a/src/test/test-time-util.c +++ b/src/test/test-time-util.c @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include "env-util.h" -#include "fd-util.h" -#include "fileio.h" #include "random-util.h" #include "serialize.h" #include "string-util.h" diff --git a/src/test/test-tmpfile-util.c b/src/test/test-tmpfile-util.c index bef503bf3e..413bbf59ab 100644 --- a/src/test/test-tmpfile-util.c +++ b/src/test/test-tmpfile-util.c @@ -1,6 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "alloc-util.h" +#include "argv-util.h" #include "errno-util.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/test/test-tpm2.c b/src/test/test-tpm2.c index 4ccf740176..8277fab978 100644 --- a/src/test/test-tpm2.c +++ b/src/test/test-tpm2.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "hexdecoct.h" -#include "macro.h" #include "tests.h" #include "tpm2-util.h" #include "virt.h" diff --git a/src/test/test-udev-util.c b/src/test/test-udev-util.c index 07f4e018ac..e6c339bcc7 100644 --- a/src/test/test-udev-util.c +++ b/src/test/test-udev-util.c @@ -1,10 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include "macro.h" -#include "string-util.h" #include "tests.h" #include "udev-util.h" diff --git a/src/test/test-uid-classification.c b/src/test/test-uid-classification.c index 9a76ad28a0..4f82eac58d 100644 --- a/src/test/test-uid-classification.c +++ b/src/test/test-uid-classification.c @@ -1,12 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include "fd-util.h" #include "fileio.h" #include "format-util.h" -#include "fs-util.h" #include "tests.h" #include "tmpfile-util.h" #include "uid-classification.h" diff --git a/src/test/test-uid-range.c b/src/test/test-uid-range.c index 6041d08490..8c4c6eb264 100644 --- a/src/test/test-uid-range.c +++ b/src/test/test-uid-range.c @@ -1,8 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - -#include "alloc-util.h" #include "errno-util.h" #include "fd-util.h" #include "fileio.h" @@ -10,7 +7,6 @@ #include "tests.h" #include "tmpfile-util.h" #include "uid-range.h" -#include "user-util.h" #include "virt.h" TEST(uid_range) { diff --git a/src/test/test-unaligned.c b/src/test/test-unaligned.c index 728c193339..82a9f82210 100644 --- a/src/test/test-unaligned.c +++ b/src/test/test-unaligned.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "memory-util.h" -#include "sparse-endian.h" #include "tests.h" #include "unaligned.h" diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index b934871f95..2f8b288e53 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "argv-util.h" #include "fileio.h" #include "initrd-util.h" #include "path-lookup.h" @@ -10,6 +11,7 @@ #include "special.h" #include "strv.h" #include "tests.h" +#include "time-util.h" #include "unit-file.h" TEST(unit_validate_alias_symlink_and_warn) { diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index b598eb8bc0..4eb9f052b2 100644 --- a/src/test/test-unit-name.c +++ b/src/test/test-unit-name.c @@ -2,17 +2,16 @@ #include #include -#include +#include "sd-daemon.h" #include "sd-id128.h" #include "all-units.h" #include "alloc-util.h" +#include "fd-util.h" #include "format-util.h" #include "glob-util.h" #include "hostname-setup.h" -#include "hostname-util.h" -#include "macro.h" #include "manager.h" #include "path-util.h" #include "rm-rf.h" diff --git a/src/test/test-unit-serialize.c b/src/test/test-unit-serialize.c index 7a1e8a087a..60cc82373d 100644 --- a/src/test/test-unit-serialize.c +++ b/src/test/test-unit-serialize.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "manager.h" #include "rm-rf.h" #include "service.h" #include "tests.h" diff --git a/src/test/test-user-record.c b/src/test/test-user-record.c index 2a4df190a1..db03a7c4ff 100644 --- a/src/test/test-user-record.c +++ b/src/test/test-user-record.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "json-util.h" -#include "macro.h" #include "tests.h" #include "user-record.h" diff --git a/src/test/test-user-util.c b/src/test/test-user-util.c index bf8dd16d5b..4df9cb5edc 100644 --- a/src/test/test-user-util.c +++ b/src/test/test-user-util.c @@ -4,7 +4,6 @@ #include "format-util.h" #include "libcrypt-util.h" #include "log.h" -#include "macro.h" #include "memory-util.h" #include "path-util.h" #include "string-util.h" diff --git a/src/test/test-utmp.c b/src/test/test-utmp.c index ca985d3572..d09d2f0651 100644 --- a/src/test/test-utmp.c +++ b/src/test/test-utmp.c @@ -1,9 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "format-util.h" -#include "socket-util.h" +#include "in-addr-util.h" #include "stdio-util.h" -#include "string-util.h" #include "tests.h" #include "utmp-wtmp.h" diff --git a/src/test/test-varlink-idl.c b/src/test/test-varlink-idl.c index 009d143fbc..00e142ae61 100644 --- a/src/test/test-varlink-idl.c +++ b/src/test/test-varlink-idl.c @@ -1,7 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include +#include "sd-event.h" #include "sd-varlink.h" #include "sd-varlink-idl.h" diff --git a/src/test/test-varlink.c b/src/test/test-varlink.c index 649433b3d5..efb09ee2dd 100644 --- a/src/test/test-varlink.c +++ b/src/test/test-varlink.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "sd-event.h" #include "sd-json.h" @@ -12,10 +13,8 @@ #include "json-util.h" #include "memfd-util.h" #include "rm-rf.h" -#include "strv.h" #include "tests.h" #include "tmpfile-util.h" -#include "user-util.h" #include "varlink-util.h" /* Let's pick some high value, that is higher than the largest listen() backlog, but leaves enough room below diff --git a/src/test/test-verbs.c b/src/test/test-verbs.c index a033d07ee7..03b4836e90 100644 --- a/src/test/test-verbs.c +++ b/src/test/test-verbs.c @@ -2,7 +2,6 @@ #include -#include "macro.h" #include "strv.h" #include "tests.h" #include "verbs.h" diff --git a/src/test/test-vpick.c b/src/test/test-vpick.c index aeea50c603..7fa879b971 100644 --- a/src/test/test-vpick.c +++ b/src/test/test-vpick.c @@ -3,7 +3,6 @@ #include "fd-util.h" #include "fileio.h" #include "fs-util.h" -#include "mkdir.h" #include "path-util.h" #include "rm-rf.h" #include "tests.h" diff --git a/src/test/test-watch-pid.c b/src/test/test-watch-pid.c index dd8ad11fa4..dd1fa49428 100644 --- a/src/test/test-watch-pid.c +++ b/src/test/test-watch-pid.c @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "log.h" #include "manager.h" #include "process-util.h" #include "rm-rf.h" #include "service.h" +#include "set.h" #include "tests.h" TEST(watch_pid) { diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c index 67e6581cfb..23ba46afe8 100644 --- a/src/test/test-watchdog.c +++ b/src/test/test-watchdog.c @@ -1,10 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include - #include "log.h" #include "tests.h" +#include "time-util.h" #include "watchdog.h" int main(int argc, char *argv[]) { diff --git a/src/test/test-web-util.c b/src/test/test-web-util.c index d376d4a4cd..bb05f37276 100644 --- a/src/test/test-web-util.c +++ b/src/test/test-web-util.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "macro.h" #include "tests.h" #include "web-util.h" diff --git a/src/test/test-xattr-util.c b/src/test/test-xattr-util.c index 880b932af6..a9ca0e69b0 100644 --- a/src/test/test-xattr-util.c +++ b/src/test/test-xattr-util.c @@ -1,20 +1,18 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include #include #include #include "alloc-util.h" #include "fd-util.h" #include "fs-util.h" -#include "macro.h" #include "nulstr-util.h" #include "rm-rf.h" #include "string-util.h" #include "strv.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" #include "xattr-util.h" diff --git a/src/test/test-xml.c b/src/test/test-xml.c index 6367f27263..bb9e4c49d0 100644 --- a/src/test/test-xml.c +++ b/src/test/test-xml.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "alloc-util.h" -#include "string-util.h" #include "tests.h" #include "xml.h" diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index 78b4feaebe..d55b26188f 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -14,6 +14,7 @@ #include "bus-locator.h" #include "bus-map-properties.h" #include "bus-print-properties.h" +#include "constants.h" #include "env-util.h" #include "format-table.h" #include "in-addr-util.h" diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 40bba14a31..3a75e6a33e 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -17,6 +17,7 @@ #include "bus-log-control-api.h" #include "bus-map-properties.h" #include "bus-message-util.h" +#include "bus-object.h" #include "bus-polkit.h" #include "bus-unit-util.h" #include "bus-util.h" diff --git a/src/timesync/test-timesync.c b/src/timesync/test-timesync.c index c8d8fd4bd4..7cbdd4060d 100644 --- a/src/timesync/test-timesync.c +++ b/src/timesync/test-timesync.c @@ -2,8 +2,6 @@ /* Some unit tests for the helper functions in timesyncd. */ -#include "log.h" -#include "macro.h" #include "tests.h" #include "timesyncd-conf.h" #include "timesyncd-manager.h" diff --git a/src/timesync/timesyncd-bus.c b/src/timesync/timesyncd-bus.c index 2c780f1d17..b060431f6c 100644 --- a/src/timesync/timesyncd-bus.c +++ b/src/timesync/timesyncd-bus.c @@ -1,26 +1,20 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "sd-bus.h" -#include "alloc-util.h" #include "bus-get-properties.h" -#include "bus-internal.h" #include "bus-log-control-api.h" +#include "bus-object.h" #include "bus-polkit.h" -#include "bus-protocol.h" #include "bus-util.h" #include "dns-domain.h" #include "in-addr-util.h" #include "log.h" -#include "macro.h" #include "strv.h" #include "time-util.h" #include "timesyncd-bus.h" #include "timesyncd-manager.h" #include "timesyncd-server.h" -#include "user-util.h" static int property_get_servers( sd_bus *bus, diff --git a/src/timesync/timesyncd-bus.h b/src/timesync/timesyncd-bus.h index 4ad25a0a6a..57c272d6a5 100644 --- a/src/timesync/timesyncd-bus.h +++ b/src/timesync/timesyncd-bus.h @@ -1,9 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "bus-object.h" - -typedef struct Manager Manager; +#include "timesyncd-forward.h" extern const BusObjectImplementation manager_object; diff --git a/src/timesync/timesyncd-conf.c b/src/timesync/timesyncd-conf.c index 4b1d4ddbfe..0c7d9f39c1 100644 --- a/src/timesync/timesyncd-conf.c +++ b/src/timesync/timesyncd-conf.c @@ -1,9 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" -#include "constants.h" +#include "conf-parser.h" #include "dns-domain.h" #include "extract-word.h" +#include "log.h" #include "string-util.h" #include "timesyncd-conf.h" #include "timesyncd-manager.h" diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h index f0f1ab5cdf..745ba74b5c 100644 --- a/src/timesync/timesyncd-conf.h +++ b/src/timesync/timesyncd-conf.h @@ -1,10 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "conf-parser.h" -#include "timesyncd-server.h" - -typedef struct Manager Manager; +#include "timesyncd-forward.h" const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, GPERF_LEN_TYPE length); diff --git a/src/timesync/timesyncd-forward.h b/src/timesync/timesyncd-forward.h new file mode 100644 index 0000000000..7a63e38f54 --- /dev/null +++ b/src/timesync/timesyncd-forward.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +#pragma once + +#include "conf-parser-forward.h" /* IWYU pragma: export */ +#include "forward.h" /* IWYU pragma: export */ + +typedef enum ServerType ServerType; + +typedef struct Manager Manager; +typedef struct ServerAddress ServerAddress; +typedef struct ServerName ServerName; diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index de490cc0ba..f4cea2ddd7 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -1,27 +1,26 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include +#include #include #include #include -#include -#include -#include -#include +#include "sd-bus.h" #include "sd-daemon.h" #include "sd-messages.h" +#include "sd-network.h" #include "alloc-util.h" -#include "bus-polkit.h" #include "clock-util.h" #include "common-signal.h" #include "dns-domain.h" +#include "errno-util.h" #include "event-util.h" #include "fd-util.h" #include "format-util.h" #include "fs-util.h" +#include "hashmap.h" #include "list.h" #include "log.h" #include "logarithm.h" @@ -33,10 +32,8 @@ #include "string-util.h" #include "strv.h" #include "time-util.h" -#include "timesyncd-conf.h" #include "timesyncd-manager.h" #include "timesyncd-server.h" -#include "user-util.h" #ifndef ADJ_SETOFFSET #define ADJ_SETOFFSET 0x0100 /* add 'time' to current time */ diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h index 371a7ca111..252e5164d3 100644 --- a/src/timesync/timesyncd-manager.h +++ b/src/timesync/timesyncd-manager.h @@ -1,23 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include - -#include "sd-bus.h" -#include "sd-event.h" -#include "sd-network.h" -#include "sd-resolve.h" - -#include "hashmap.h" #include "list.h" #include "ratelimit.h" #include "time-util.h" +#include "timesyncd-forward.h" #include "timesyncd-ntp-message.h" -typedef enum ServerType ServerType; -typedef struct ServerAddress ServerAddress; -typedef struct ServerName ServerName; - /* * "A client MUST NOT under any conditions use a poll interval less * than 15 seconds." diff --git a/src/timesync/timesyncd-ntp-message.h b/src/timesync/timesyncd-ntp-message.h index fc122cbb9a..ee6a6d7a77 100644 --- a/src/timesync/timesyncd-ntp-message.h +++ b/src/timesync/timesyncd-ntp-message.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "macro.h" #include "sparse-endian.h" +#include "timesyncd-forward.h" /* NTP protocol, packet header */ #define NTP_LEAP_PLUSSEC 1 diff --git a/src/timesync/timesyncd-server.h b/src/timesync/timesyncd-server.h index dac74199ff..ba3d9ff183 100644 --- a/src/timesync/timesyncd-server.h +++ b/src/timesync/timesyncd-server.h @@ -3,10 +3,7 @@ #include "list.h" #include "socket-util.h" - -typedef struct Manager Manager; -typedef struct ServerAddress ServerAddress; -typedef struct ServerName ServerName; +#include "timesyncd-forward.h" typedef enum ServerType { SERVER_SYSTEM, diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c index 6537f1ae92..822662c016 100644 --- a/src/timesync/timesyncd.c +++ b/src/timesync/timesyncd.c @@ -1,24 +1,25 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include "sd-daemon.h" #include "sd-event.h" #include "sd-messages.h" #include "bus-log-control-api.h" +#include "bus-object.h" #include "capability-util.h" #include "clock-util.h" #include "daemon-util.h" +#include "errno-util.h" #include "fd-util.h" +#include "format-util.h" #include "fs-util.h" +#include "log.h" #include "main-func.h" #include "mkdir-label.h" #include "network-util.h" #include "process-util.h" #include "service-util.h" -#include "signal-util.h" #include "timesyncd-bus.h" #include "timesyncd-conf.h" #include "timesyncd-manager.h" diff --git a/src/timesync/wait-sync.c b/src/timesync/wait-sync.c index fa34138875..f593b420b7 100644 --- a/src/timesync/wait-sync.c +++ b/src/timesync/wait-sync.c @@ -1,13 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ /* systemd service to wait until kernel realtime clock is synchronized */ -#include -#include #include -#include -#include #include -#include #include #include @@ -16,8 +11,8 @@ #include "errno-util.h" #include "fd-util.h" #include "inotify-util.h" +#include "log.h" #include "main-func.h" -#include "signal-util.h" #include "time-util.h" typedef struct ClockState { diff --git a/src/tpm2-setup/tpm2-setup.c b/src/tpm2-setup/tpm2-setup.c index 5821a23e95..032b1e3381 100644 --- a/src/tpm2-setup/tpm2-setup.c +++ b/src/tpm2-setup/tpm2-setup.c @@ -2,7 +2,6 @@ #include #include -#include #include "sd-messages.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 cc29be1020..3aefc898ee 100644 --- a/src/tty-ask-password-agent/tty-ask-password-agent.c +++ b/src/tty-ask-password-agent/tty-ask-password-agent.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c index f802ed32e9..3e5dfd29ee 100644 --- a/src/update-done/update-done.c +++ b/src/update-done/update-done.c @@ -2,7 +2,6 @@ #include #include -#include #include "alloc-util.h" #include "chase.h" diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c index b80f10cd33..8c7a83ccb6 100644 --- a/src/update-utmp/update-utmp.c +++ b/src/update-utmp/update-utmp.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #if HAVE_AUDIT # include diff --git a/src/user-sessions/user-sessions.c b/src/user-sessions/user-sessions.c index 4b05e40534..faf37602af 100644 --- a/src/user-sessions/user-sessions.c +++ b/src/user-sessions/user-sessions.c @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include #include "fs-util.h" #include "label-util.h" diff --git a/src/userdb/userdbd-manager.c b/src/userdb/userdbd-manager.c index 48bd37ef50..7815930f9b 100644 --- a/src/userdb/userdbd-manager.c +++ b/src/userdb/userdbd-manager.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "sd-daemon.h" diff --git a/src/userdb/userwork.c b/src/userdb/userwork.c index d1e296081c..0282cc37dc 100644 --- a/src/userdb/userwork.c +++ b/src/userdb/userwork.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "sd-daemon.h" #include "sd-varlink.h" diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 2c89d21282..024a0fd3a2 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c index 5d863e1189..4a79fa1b33 100644 --- a/src/veritysetup/veritysetup-generator.c +++ b/src/veritysetup/veritysetup-generator.c @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include #include "sd-id128.h" diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c index 54d6ce770a..ebbec77a25 100644 --- a/src/vmspawn/vmspawn.c +++ b/src/vmspawn/vmspawn.c @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include #include #include #include diff --git a/src/xdg-autostart-generator/xdg-autostart-generator.c b/src/xdg-autostart-generator/xdg-autostart-generator.c index c7b9a1c70a..6bde82fd1d 100644 --- a/src/xdg-autostart-generator/xdg-autostart-generator.c +++ b/src/xdg-autostart-generator/xdg-autostart-generator.c @@ -2,7 +2,6 @@ #include #include -#include #include "alloc-util.h" #include "dirent-util.h" diff --git a/src/xdg-autostart-generator/xdg-autostart-service.c b/src/xdg-autostart-generator/xdg-autostart-service.c index dbf9087304..8a752c8100 100644 --- a/src/xdg-autostart-generator/xdg-autostart-service.c +++ b/src/xdg-autostart-generator/xdg-autostart-service.c @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include #include "alloc-util.h" #include "conf-parser.h"