test: Clean up includes

To make sure everything still compiles, we add a preliminary include
of forward.h to tests.h to make sure it is included in every test source
file. We'll clean up the tests.h includes in a later commit.

We also add a <errno.h> include to errno-list.h to keep test-errno-list.c
compiling. It'll be removed again when we clean up includes in src/basic.

Split out of #37344.

diff --git a/src/basic/errno-list.h b/src/basic/errno-list.h
index afe54d0e8c4a8597a23aced67cbd1af028be419b..e4a59788296cb64adad5653db2d09ed9f5d6f0f2 100644 (file)
--- 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 <errno.h>
 #include <stdbool.h>
 #include <string.h>
 

diff --git a/src/shared/tests.h b/src/shared/tests.h
index eae1d76ee03df14a320562f63055547a82ed4d82..c9ebafdd83bd7f4fc8999595ac2133af6ab6992f 100644 (file)
--- 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/test/nss-test-util.c b/src/test/nss-test-util.c
index 11cc7e4f0b58672e4565af92d86d51681d7a28de..7b17c2136741697d829c8f8e611d0986a184677e 100644 (file)
--- a/src/test/nss-test-util.c
+++ b/src/test/nss-test-util.c
@@ -4,7 +4,6 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#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 f081e6467ed150739a81b1bc8d2a606f25861535..efd65845c57985433cee0a6597aa915bcb21adc5 100644 (file)
--- a/src/test/nss-test-util.h
+++ b/src/test/nss-test-util.h
@@ -2,7 +2,8 @@
 #pragma once
 
 #include <nss.h>
-#include <stdint.h>
+
+#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 bd68f58baeb8d68a281f73d563b5a6d19ee3cec7..5967c4b40616094c39cd191a026d4d7c1b7e2528 100644 (file)
--- 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 1623c483a88d0af4cefc9b04283e0b2f32e1c4c8..2dbb3097d9ebde22ac7a6f2478efd41e1ec2aa23 100644 (file)
--- 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 <sys/socket.h>
-
-#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 24cb5f73eb78cfd85ad0291a70d33631c5032c38..46d67284e9bd18ac9ac895a6c817588283c35558 100644 (file)
--- 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 <malloc.h>
-#include <stdint.h>
 
 #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 72ff95655861b67423cf79add8cd34d6087e73bd..59f375426b451641e9d9b4b6c3eccdad65bccde2 100644 (file)
--- 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 <linux/if_arp.h>
-#include <net/if.h>
 
 #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 7b0f7dc6bef214d9e613a5d6a69dbc76db9246f9..2edc1088b881247976dee3b58f8d24659eb404eb 100644 (file)
--- 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 <fcntl.h>
-#include <sys/prctl.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
 #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 75df1426a60b2c123a8eb01e3d12b1708e544b9c..af2813d6170afdbaf267f1fe03213845a9e36f5e 100644 (file)
--- 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 f965a6c06d6d8caa48f1440a91e2ba5891f872eb..ccafe5b066605b5a9d37d869f06001f48fe55a1c 100644 (file)
--- 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 <stdio.h>
+#include <stdlib.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>

diff --git a/src/test/test-bitfield.c b/src/test/test-bitfield.c
index f26b423940e08c1293196ec78cafc424f14789b4..89c3d663158aabd486e0ade809f9cf41139cae98 100644 (file)
--- 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 <stddef.h>
-
 #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 6ede05852d9d8309dbdd32d3629acb7ea3c59a5c..5e5eee0e60eb89847560fa0c362e69ebd9fb244b 100644 (file)
--- 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 677172964f1de70e523d6e7af136bcf9bcf644e5..3917bb0c1dc850e65c95de8013903b640799427f 100644 (file)
--- 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 <sys/types.h>
-#include <unistd.h>
-
 #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 1642673e756b84cbb63a2a85b5fca1ff28eec8cb..2694b1eebc83b6e1f5c3b3c3c76cd60a1dd366cf 100644 (file)
--- 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 <sys/resource.h>
-#include <sys/time.h>
-#include <unistd.h>
 
 #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 8f3c7b41d83deb2f0e9077d54118060115a0944d..82f03a1e8998f0af083f9fb2e0a6ea582876a113 100644 (file)
--- 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 <linux/bpf_insn.h>
-#include <string.h>
 #include <unistd.h>
 
 #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 1b1f1762c9dee1b0f2d9052660bee59490e51233..f2de3553dd85f18ad2f277a592e9f64a3b5e6802 100644 (file)
--- 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 <fcntl.h>
+#include <linux/bpf.h>
 #include <linux/bpf_insn.h>
 #include <string.h>
-#include <sys/mman.h>
 #include <unistd.h>
 
-#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 522bb010e7cf3f2e3dc5b6af5eb03361082d7c96..29a1470dc60ef3b6358bc355abf2e3de98da9b57 100644 (file)
--- 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 221c08e57e3353dee84fa32d09cfbe7b6f4d20e4..e039a63b933bdf641d0e7aaae14b8c64cab27c0d 100644 (file)
--- 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 <errno.h>
 #include <fcntl.h>
 
 #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 326712a42dd268f904e2ecefae62ab1ff9fd8bcf..d81c129d65e6152709170f87e138023202fc7732 100644 (file)
--- a/src/test/test-btrfs.c
+++ b/src/test/test-btrfs.c
@@ -2,6 +2,7 @@
 
 #include <fcntl.h>
 #include <sys/file.h>
+#include <sys/stat.h>
 
 #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 491e790f6a7a824c218ffa5c4723003bcf1ba98f..6361d7f17a1a5ee0c4d6f521e37efad056739a2d 100644 (file)
--- 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 e8c50ead9f783716defcb86cda173c8dc8b449be..496fffc4d069ee659f66c315f21aa644da8c8aca 100644 (file)
--- 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 <stdlib.h>
+#include <time.h>
+
 #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 0fb2f31ed2795bdfc9ae30d4e28f364a391583aa..945c5ccec77061317abc4beae914759efe8be852 100644 (file)
--- 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 <stdio.h>
-#include <sys/prctl.h>
 
 #include "alloc-util.h"
 #include "cap-list.h"

diff --git a/src/test/test-capability.c b/src/test/test-capability.c
index 9d863daf2b4e6582f590cab4635df1d7ae3073ad..881aafbc7f441f91628abcbbe3b91a629c410e3f 100644 (file)
--- a/src/test/test-capability.c
+++ b/src/test/test-capability.c
@@ -3,10 +3,12 @@
 #include <linux/prctl.h>
 #include <netinet/in.h>
 #include <pwd.h>
+#include <stdlib.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#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 fcf84d379c1dbbea01e98bbfb1f04c6a7615ba1f..cc9b732e09fce2545375cfb52c6163dd87d400af 100644 (file)
--- 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 f73372d6314ca8a63081ba12e512f2c849ef5d8b..42a055e50f602705890d3a1ac2aeae043a0b9f91 100644 (file)
--- 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 <stdio.h>
-
 #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 818d75eeac21e0d5b7d487cf2b1991a39fc25b88..2e53b0e1c8dd07f612a3b69c3caeb3346be8b017 100644 (file)
--- 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 <stdio.h>
-
 #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 5bd3427ab4a40d8f66e5a1ecf7c7c932add16511..4e7d52f5bcfd49ece2e3dbe3381d94c37916f7e7 100644 (file)
--- 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 8ca6eb1b9da72e34fa3a060e6ece12921fab1857..4d1bbd4b342d667db7159b3ecb33c189d7c6cddf 100644 (file)
--- 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 <unistd.h>
-
 #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 469e0b5a39b4715d7e4431901231dbbcb694fa1c..4f6e006d5e1d4ae213b5011871ee4e62ade5dfee 100644 (file)
--- 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 <stdlib.h>
 #include <unistd.h>
 
 #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 2faf886c977b01261f094d9b2fe99872efdbc018..564b09c183e7e1d5a7657c9a7480bc594d284056 100644 (file)
--- 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 7558de71385aa03dbca9c2add4c34b2ce188f2b9..4b3a6f5247b94d4d114e2b045308b533017bbbc4 100644 (file)
--- 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 <sys/stat.h>
 #include <sys/xattr.h>
 #include <unistd.h>
 
-#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 5115bd83c2c4ab241c98e493de783913e76c7a4c..f31b3613246a86de5fbf107cdf6988f02ffd1f38 100644 (file)
--- a/src/test/test-clock.c
+++ b/src/test/test-clock.c
@@ -3,15 +3,12 @@
   Copyright © 2016 Canonical Ltd.
 ***/
 
-#include <fcntl.h>
 #include <unistd.h>
 
 #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 c4e19f9256ecc606aa0164100d111d3d4af512b0..59e215122d269529ec01995be8f04c3abefbfdba 100644 (file)
--- 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 56a468ab88a3bbabec7870f003dbe8f50113ec66..01e6e9863a95e0df4c6d49d3cd4a4b6244f9ab07 100644 (file)
--- 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 <stdlib.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #if HAVE_LZ4
 #include <lz4.h>
@@ -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 19377962b7af94a4b831dd7c056ade540f10184e..11b3a4241891ccb0ba9ca5fbbf5c46c59a49f256 100644 (file)
--- a/src/test/test-condition.c
+++ b/src/test/test-condition.c
@@ -2,7 +2,7 @@
 
 #include <gnu/libc-version.h>
 #include <stdio.h>
-#include <sys/types.h>
+#include <stdlib.h>
 #include <sys/utsname.h>
 #include <unistd.h>
 
@@ -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 4253490443f894b407f665d5b009605a4a54c08b..cd3b2c2d1c6e860428f67fdc4f38fbbf6541cd62 100644 (file)
--- a/src/test/test-conf-files.c
+++ b/src/test/test-conf-files.c
@@ -3,16 +3,12 @@
   Copyright © 2014 Michael Marineau
 ***/
 
-#include <stdarg.h>
-#include <stdio.h>
+#include <sys/stat.h>
 
 #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 d00444e24f85d750e2368cffbcfe3c8cb30cedf7..86b3a565ad9f1728115ade486fc8ec530e9f655c 100644 (file)
--- 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 ac98bcf2a18a250e835357390ef1a447d8103490..720477904128895989ba2f50804349f9e5b0bb87 100644 (file)
--- a/src/test/test-copy.c
+++ b/src/test/test-copy.c
@@ -5,24 +5,24 @@
 #include <unistd.h>
 
 #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 83c8674c6f08bad3123f802609198a7daddde67d..433eff512a328e0c1c1118523d69a39094d5ccd8 100644 (file)
--- 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 2f66ed63e021fa5c2b93cf71a14d51782d089a96..5ad5f5ff3624002262840c8ae15dace9abef5219 100644 (file)
--- 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 4fbb7717c558e7ec88f9123a88c39c1d3031f444..4758ddeadd5eb4e5e8b87acde1b213b1881c2ca8 100644 (file)
--- 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 4f51ead42ad1dc95834575ace1a33246ed3803f7..1a09297a3fe265d4ba2ecc7654e7a44d64dfc8df 100644 (file)
--- 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 957f0f2a80f43b01050b60105b5fb58f97453a7b..1d3ac41cdd030e185bf7305e53e3dfc7383c2ddd 100644 (file)
--- 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 <unistd.h>
-
 #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 ef047a3c6a69318311b96accbfc51f1dffff7e54..97b5cd4a7e5823945a92168ba907331899892154 100644 (file)
--- 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 <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <sys/socket.h>
 #include <unistd.h>
 
 #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 f39720aba9ac64f8353cc65e2c39e8525d8e6851..7005f37283f9a2c39fd45e66a543583119d33702 100644 (file)
--- 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 <stdlib.h>
 #include <unistd.h>
 
 #include "alloc-util.h"

diff --git a/src/test/test-dev-setup.c b/src/test/test-dev-setup.c
index b748809eb1533e96e0f2051f5be4f2981faa9120..75ea33d9fdb3bf43a9b8a07a3db1a408f5fc8ee4 100644 (file)
--- 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 <sys/stat.h>
+
 #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 36fa2ce8eed36527c39a3285db66ad33e1e79b07..2515d5895e9d721bb0f38f37ec911412430cf08f 100644 (file)
--- 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 <stdio.h>
-#include <sys/types.h>
 
 #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 cb31edcdc647a7b155b3be2deca90473189d3ec6..b5a903fa11d109342b72e183e7110872c3505eaf 100644 (file)
--- 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 <dirent.h>
-#include <fcntl.h>
-#include <stdio.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 
-#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 0fe9e33956a6d21455696725138a7e88fe89f2e7..c7f0cca5c2ad16787518fdb0868cfb36f8fa7a0c 100644 (file)
--- 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 6d56c19b89db13b82d306772122033d48a337a7b..e044c0fca39c30a72ef30ace12525566d9a1759f 100644 (file)
--- 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 <dlfcn.h>
-#include <stdlib.h>
 
 #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 fd5bc32d5bf6b6e6bfe108ea38b05f7e61cb8031..91e1d2f8a3870c2931051b3570cdb7b43e7687dc 100644 (file)
--- a/src/test/test-dlopen.c
+++ b/src/test/test-dlopen.c
@@ -3,8 +3,7 @@
 #include <dlfcn.h>
 #include <stdlib.h>
 
-#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 302fcfb7fbe6c534ee524ce351ff353cada3585b..f1d11305c1d821e10f461e3b9a0fce4c4c40dbe1 100644 (file)
--- 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 d70b727cee71e356faa681e66800b39fa1e695ee..83978446e18de9b0b8b116d0532852020417af08 100644 (file)
--- 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 5c0ce7f05306e9146331498be61724e001f402d4..768ff02a79fcf4c556b957947f26642da2b97a4e 100644 (file)
--- 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 57774d04c54e66efad663697d7d370444b628baa..56b7920d8d7214a336fd169cab56d4da4bc16412 100644 (file)
--- 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 <errno.h>
 #include <stdio.h>
 
-#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 f34b2aac72300eee2cf24deedae279fff1edf7e5..69c8e48daafe414a0c36e98602b82c904c859e61 100644 (file)
--- 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 7eda66bd3ec068ea7f9139392711dd9060a4acec..aa733704bc9a46cc4238a1db3815f3558fa688e7 100644 (file)
--- 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 <stdlib.h>
 #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 032cf3bb11d0f03656959155e70008390f757d90..fb9218027944bc85b112f3e24473532f3b890595 100644 (file)
--- 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 <errno.h>
-
 #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 a04e95223a3b1d197af882e1d82de8892373acb5..1a0154fb0594cc73d8f826a7e33c1d3555c3f23c 100644 (file)
--- 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 e4dfe32c04d62b2623219d5f9f3c8435c07028c0..7162f7ff2dc3c304471f49c087a4172e2cfa565d 100644 (file)
--- 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 6987e558ba4d339c2a334c937e015e1620bcb8a1..6accb28b5657f3fc442d94cc7997779e422d6efb 100644 (file)
--- 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 <errno.h>
+#include <stdlib.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 #include <unistd.h>
 
 #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 1eddf11dd196ccb7a4f1ac64a6ac7efcf8a0e796..88738dd4c98a993dadaf867d0f82a5e694a1f0d4 100644 (file)
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -3,22 +3,23 @@
 #include <fnmatch.h>
 #include <linux/prctl.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/mount.h>
 #include <sys/prctl.h>
-#include <sys/types.h>
 
 #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 aab81935192f818b42db70f3f9caab8a6312964e..a24ae5a8285b63f3a498c2bebfc548fe253f34df 100644 (file)
--- 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 4c18a45231b09aaedab970affe87f74c36b5e444..aad9bbc47dea14590afcc022c6245dddb637e74b 100644 (file)
--- 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 <errno.h>
-#include <stdlib.h>
-
 #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 2ebc776f479f1f8261d84990a7265c8b686450db..768a02f5961a11335b25654bb39152648bff7ce0 100644 (file)
--- 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 7aeaf5f129c645cd70cd5a9a9f90a76cbd97792e..4d4c5716d67485275cb4646566e3bb986279d11c 100644 (file)
--- 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 <fcntl.h>
-#include <unistd.h>
 
 #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 9094a2b9f1d0d80647d10ed1df995c6f1630dc89..5f7ad54bb6ec5c92250904ef96015a72060543ec 100644 (file)
--- 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 <fcntl.h>
-#include <inttypes.h>
 #include <linux/fiemap.h>
-#include <stdio.h>
-#include <sys/types.h>
+#include <stdlib.h>
 #include <unistd.h>
 
-#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 731a37caf1db6273af34c9f4c40fd4058f278078..744fb4942787d10f4e42f75c2f3558b25d3d5543 100644 (file)
--- 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 <fcntl.h>
-#include <limits.h>
 #include <stdio.h>
 #include <unistd.h>
 
 #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 93223be29de9b493d7c3bf497e08518118fd8704..1a2121d0849748f8c047604f97fba33761a29b55 100644 (file)
--- 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 <stdlib.h>
 #include <unistd.h>
 
 #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 0c80770c4dd06c68b683f559e01980b73c7f3bb4..0f16ebffec83408d41a2234c6c0cd16ea10bbd2d 100644 (file)
--- 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 <stdlib.h>
 #include <unistd.h>
 
 #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 8afba4e585fee8b372253126b94e4a0380f0d6d6..0a95837dbef2c3415fce0ce2b9f6822bfa2b5acd 100644 (file)
--- 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 e3c3149db121d98f3e533ea173554c7023306d06..32f7c3c6af72fe85a38537bdc8cf1d6c097b9792 100644 (file)
--- 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 <stdlib.h>
 #include <sys/file.h>
 #include <sys/sysmacros.h>
 #include <unistd.h>
 
 #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 49d71f15c714cb7591e864b9f35499567c718c58..7e1a264cb9da180a17a99f5bb785eb7f62fe5cf3 100644 (file)
--- 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 <fcntl.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
@@ -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 28b53d479a0ef77da3564b75b02a58b837128ca8..2c793181d9c1f7e4bcc1fe6920b9ccaa3d619d42 100644 (file)
--- 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 28ddff643bd7823be82334c2773cfe4b417956e5..eb211c3ed73b5a494eb7d365ef6ef2aa999f8859 100644 (file)
--- 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 74e68a473d9e8130c93972d989f49d4dcdaf43c8..7f25ad101141c2c253475b753994cc55314d5731 100644 (file)
--- 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 e5121d148e1893a549fc3565b7910f451c40aae1..ce86dd0d2a371739dc1b0b5c854d772cb8a0109e 100644 (file)
--- 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 <errno.h>
-
 #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 28f7ab9460e6503a13fe10fd460a7328965a067e..9c74c69da8ce4007901fbf80822b97ebff462142 100644 (file)
--- 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 fbb7de3689ccd33e959e65d21c20699efd1a2cab..87c9f7d7515750ad91aa3c1928874726ce40fb69 100644 (file)
--- 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 <fnmatch.h>
-#include <unistd.h>
+#include <stdlib.h>
 
 #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 2667bb7b19c64f051e1e2520881217d3283309a0..f9f24e0e03c073853d010f5ea6521ab31e04b32c 100644 (file)
--- 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 <unistd.h>
-
-#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 48af629b73ddd5cabdb87940d639f94aa2b093e8..0ecdf76e8066dbdbff1cc3c9ab489f9417d25be1 100644 (file)
--- 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 <fcntl.h>
-#include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #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 c1747f3440a82871ada436a096a77657fd4cddf8..f35bfc6881da6b2593d6e1f4af0d6d1a775ff04a 100644 (file)
--- 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 cc7b139655528fc88128e59b5dd3a9bd4060df48..6934ebfcc0c4921abdec70150034f84ceef2444a 100644 (file)
--- 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 2b44babf8dd33611665200810a8cb850083c9008..de2003dd63a31254581b44aefa13f16603cc93c1 100644 (file)
--- 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 090407b8e37ff09b614e98653e92e98bfe3f88c0..2f38694a05519e17e170a09036e5ad206ce0aff0 100644 (file)
--- 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 5747b84ba52af6b1c878a90e9f43440b749185a6..45704064b206a7fd783a87d254ff9fb350b26d51 100644 (file)
--- a/src/test/test-install.c
+++ b/src/test/test-install.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#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 fa3ef865c94731029eca303de8ad8048ebb4090b..45da6b83f130529652e3c2c1281aa04ab1abe0b3 100644 (file)
--- a/src/test/test-io-util.c
+++ b/src/test/test-io-util.c
@@ -4,10 +4,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#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 210192d9a6d0bbf05ec3fd0d6a1bcfa1ddbafeba..e21ddc059ae580747bc1b82a7951ce241f80a5cf 100644 (file)
--- 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 <netinet/in.h>
+
 #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 a8e003e649c1fb141e4bebfac62efe119694f97f..370da0b1347604cddaa5bf22dc90f64726c2c4ad 100644 (file)
--- 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 <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 
 #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 3fe2f26274c905ce33fe11bd485ae3201d140d32..482e053e7acbaa12a7a9efa370a0dfb89035a904 100644 (file)
--- 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 <float.h>
+#include <sys/socket.h>
 #include <sys/sysmacros.h>
 
 #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 12b8a6d748152c52cedb696f344be1487b64dd23..5ce9988ce277d20e70a7e3f18c2b563b27d4b7e9 100644 (file)
--- 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 <errno.h>
-#include <stddef.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>

diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c
index 45b02a3c7eb00dc8acef94dc2be9f3da4d9de1d7..4fd3b0a07d822a4d1a10ca5b74455789332f466a 100644 (file)
--- 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 <fcntl.h>
-#include <stddef.h>
 #include <stdio.h>
 #include <unistd.h>
 
+#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 c2033bfeb32b215ae667144a8aad608c43bc95b3..c038a7b0f4d021e51d1bae30dc155078f302bab6 100644 (file)
--- 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 <linux/if.h>
 #include <net/if.h>
 #include <stdio.h>
 
+#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 f6386448bc9869537a26599efb8947ba041ac7d1..e264cff5ddde13a4fcda68e3f40b1c10d7cecd89 100644 (file)
--- 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 5edd0875822c8b17cea3719b9a2e504a3e180472..b68086e3ae24505c774dbff5a9d3ea7e3db75bee 100644 (file)
--- 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 3fb08120991f039dbe053187c7733515c6122e6e..87cd36287727c5cd0f61e210cbaaeed1db4c696f 100644 (file)
--- 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 <stddef.h>
-#include <unistd.h>
-
 #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 2d20e234ef22cb533ce3febfb9771c50d41f54a3..6c0f542be87171245830ffdee69d87d6b2d00010 100644 (file)
--- 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 f5dfec24e9e91d6748b8966a44e1d2fb54618c96..d59b4b27b1ef3980440f2a98069d2e5fc0ac6d7a 100644 (file)
--- 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 <fcntl.h>
+#include <linux/fs.h>
 #include <linux/loop.h>
 #include <pthread.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
-#include <sys/mount.h>
 
 #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 db6ee0f32dd0a906d3b6f63620cac0d8ae06bafa..03dcffeafc0f5aea6cca31171a94d8d68b532165 100644 (file)
--- 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 <sched.h>
-#include <stdio.h>
-#include <string.h>
+#include <stdlib.h>
 
 #include "errno-util.h"
 #include "log.h"

diff --git a/src/test/test-macro.c b/src/test/test-macro.c
index 1c76e098585c7df4acd486382f1cfad849b47b80..3b08874b6be5b6c2e9fb0cfe862168c74346642a 100644 (file)
--- 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 <stddef.h>
 #include <sys/stat.h>
 
-#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 6366eedc24b646c08bd9d4a547a250e8efa92581..e3d9c9fff603dbe10ffaf5a5ef77723d1a499b6a 100644 (file)
--- 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 cd4b64ac164b4e6e8668640266705cfc1ced9285..d5abad099e036028201eca2f34c59b2f7c11e15b 100644 (file)
--- 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 <sys/uio.h>
+
 #include "memory-util.h"
 #include "tests.h"
 

diff --git a/src/test/test-mempress.c b/src/test/test-mempress.c
index 6f4e6586161f895daf9b371283586a686e5fb64f..b33ba740c6165b3e6fe0e5bb0d703154f5ad3019 100644 (file)
--- a/src/test/test-mempress.c
+++ b/src/test/test-mempress.c
@@ -2,7 +2,9 @@
 
 #include <fcntl.h>
 #include <pthread.h>
+#include <stdlib.h>
 #include <sys/mman.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #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 bce53e118b6fcde7cde998cef5f65be216d73ebc..b3b1e813b136eb837e5b069e103cbf0c6c391aac 100644 (file)
--- 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 c6f187b21907d4c7ddd0a3dc5d1e9d47f8d4cbb2..13dabe62759a1b346b43b3cd20cfafd6b7a7c5fc 100644 (file)
--- 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 ce6a43101e540acf93c2157b1d3633d1d138e1f2..a7fc06bbe14a5097fbc7d8f4e0bfdeb3c3caa2e0 100644 (file)
--- 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 <sys/mount.h>
+#include <sys/stat.h>
 #include <sys/statvfs.h>
 
 #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 51d3e69be77289a21dad76ccb7b5ed1f6a1b787b..ee2d21825ad562dbaac8523653a807ca51ee6e96 100644 (file)
--- 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 <sched.h>
+#include <stdlib.h>
 #include <sys/mount.h>
 #include <unistd.h>
 
 #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 decebf737c99144edaf0cd28842e5c449f03a704..14558e8794b3b98b73cf57b4586acffa3a2be66b 100644 (file)
--- 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 <fcntl.h>
+#include <sched.h>
+#include <stdlib.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sysexits.h>
 
+#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 a339020857a6694d874a22e98eba41cfdeb23e58..2c98f96850fb3044749b8286e91f003f61cfffc9 100644 (file)
--- 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 eae13d9b4a3e3cc7f452e70d4958cf071f853eb4..02ef02be9780bcba6b631b93e680fa9de2535186 100644 (file)
--- a/src/test/test-netlink-manual.c
+++ b/src/test/test-netlink-manual.c
@@ -2,14 +2,10 @@
 
 #include <arpa/inet.h>
 #include <linux/if_tunnel.h>
-#include <linux/ip.h>
-#include <net/if.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #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 bb0c902493e5f2dc06804c712e9e72e56f7a4cef..6ae2da03eb4cd3aac70db829c083090e1cc77517 100644 (file)
--- 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 <assert.h>
 #include <unistd.h>
 
 #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 3178b9da31522e4b3916f3b6d81499333dfcf146..5820048c92c214f16d84fbaf9d48d7c9af11fb01 100644 (file)
--- 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 <stdlib.h>
 #include <unistd.h>
 
 #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 97b9fc98669df2817f09c40cf0285bceab464b6f..245bf3458252d0e4ae49cc2a13a9500043395dd6 100644 (file)
--- 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 <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 

diff --git a/src/test/test-nss-hosts.c b/src/test/test-nss-hosts.c
index 1b2d107836890b760c4974cb7efd4074d4ce1e63..df93a7b5285d62fc5fc7498a36552efd22e866dd 100644 (file)
--- 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 <net/if.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 #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 9033fd22c9681bb746391f6d7c154e761b7291bd..0f78995fb72b90b06b9e8308f422de0fb3000b50 100644 (file)
--- a/src/test/test-nss-users.c
+++ b/src/test/test-nss-users.c
@@ -2,8 +2,6 @@
 
 #include <pwd.h>
 #include <stdlib.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #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 45e41572968ee008118988b3dafcca9e61f219fd..7125dab2c24d62dac014c7553ae3edb88c508d7b 100644 (file)
--- 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 <stdio.h>
-
 #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 709ee04d6b8c6d85f6d95ea6294a4a983fcc8856..e40c4b49a20e3777d92e52875e299dae0f35b9d4 100644 (file)
--- 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 <errno.h>
+#include <stdlib.h>
 
 #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 9fb1a17b24cea4933393c6642cb2f4f7d6aea4e4..d3d88cf0d1cc72cb5e9412d3b4498823585447b7 100644 (file)
--- a/src/test/test-parse-argument.c
+++ b/src/test/test-parse-argument.c
@@ -2,6 +2,8 @@
 
 #include <signal.h>
 
+#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 483ea671ac7c55e64554463b0b7085902357fc13..041d3816540d3f69d73cf33d8a6ce3ffed8081a6 100644 (file)
--- 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 <linux/in.h>
-#include <stdio.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
 
-#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 a2bb8cf3c3cc4679a0e137af0bef6c0ea71ebc10..2a54dae2a4663014f1ddda46a08c4a410b886474 100644 (file)
--- 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 <errno.h>
 #include <linux/netfilter/nf_tables.h>
 #include <locale.h>
 #include <math.h>
+#include <stdlib.h>
 #include <sys/socket.h>
 
-#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 cff27749317caed58e2a9c8ab7d3a312b1f4ae56..67f3317be258e74d473eadad5476aec197b09f14 100644 (file)
--- 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 <stdlib.h>
-#include <sys/stat.h>
 
 #include "log.h"
 #include "path-lookup.h"

diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index e11599e1859efa061acd62855c4df70f71f0ef76..aa4350e9678f0e83d93e91f460c33c71fe108d59 100644 (file)
--- 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 <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #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 a20535c1b9b0e6cc8ad553053d4804c12c741a84..317537700a9158d8c0155dcd76e46e46f15b89af 100644 (file)
--- 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 <stdbool.h>
+#include <stdlib.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #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 7e8e11b49ce436ed42bffc5df23e136aad88cd0d..5fa680e064739f6a5250b910fe9ccc8ae01a063b 100644 (file)
--- 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 cb7feb034715fb0757fa39ae0f5d820817b7b764..0f6126c5b4f047ef9fa299b03825b438c9c52dab 100644 (file)
--- 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 9ab52c60129f168f9a4f6e5bdcee7dbf05fb63ef..71d8799cbfdb098051456d741887dcfebeedd0bf 100644 (file)
--- 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 <stdio.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #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 7f0540e01c8e5663b2a07c6fd59b9a3083052f7f..8ae9d811e07dfb8e4e6a8b3258a014bab22a901d 100644 (file)
--- 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 <stdlib.h>
+
 #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 6747054cc9266cc05155fa8cfcaef0fe706802df..376b20b04848083148ac25148b9fb616997175f8 100644 (file)
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -3,32 +3,34 @@
 #include <fcntl.h>
 #include <linux/oom.h>
 #include <pthread.h>
+#include <stdlib.h>
 #include <sys/eventfd.h>
 #include <sys/mount.h>
 #include <sys/personality.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#include "strv.h"
 #if HAVE_VALGRIND_VALGRIND_H
 #include <valgrind/valgrind.h>
 #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 4835b0461e711b0348779e314602fed08d8653d9..9c5340a30f6338d7774cc01983e5c22ad0ea12b5 100644 (file)
--- 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 <errno.h>
-
 #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 b199741cf5627ade93a1a76c24aabf20fb1c93a4..b8a78223aedb03b043ff075a1bbb19a6a355a852 100644 (file)
--- 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 4ce0811a8d9cdd73a163a53f549264436a6d1b89..1bb25c2b11bc9300ebc8864d62d68fd0555894ed 100644 (file)
--- 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 221ad854c2005c33a03d1dbdd5121d76207238e3..3545c656fb2e167468135c11e3d65663528fdcb7 100644 (file)
--- 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 <stdlib.h>
+
 #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 de208c74083aa59b01cdfd958102cb50eeb4f99d..d8883706ebeddc2b7e745e45bdabd442b82f2e00 100644 (file)
--- a/src/test/test-ratelimit.c
+++ b/src/test/test-ratelimit.c
@@ -2,7 +2,6 @@
 
 #include <unistd.h>
 
-#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 a43e2c2c29a933f9f87db52ee1cd6644ce5f462e..097bbfe29aaaf29acf60622155a3038b7331ce6b 100644 (file)
--- 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 8d5ed717d978d3ec1567ac2b411674757a46b0a6..b6782f67c9f616d31e121747a80340785d4c6d4f 100644 (file)
--- a/src/test/test-recovery-key.c
+++ b/src/test/test-recovery-key.c
@@ -2,8 +2,6 @@
 
 #include <string.h>
 
-#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 8684d064ec391833ee2aed2f87a5697e204879e0..1502e7f7a89ed6a159a81b47df8d83952435b9f0 100644 (file)
--- 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 56634a854a7329f16b6edbacb2c79ca2843748bb..06a5e13b9212fc44d2853171bbdbe3168f176638 100644 (file)
--- a/src/test/test-replace-var.c
+++ b/src/test/test-replace-var.c
@@ -2,7 +2,6 @@
 
 #include <stdio.h>
 
-#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 55f512cf009b85a1a4d7b3a0187d1747101b6b28..c8abd9d98d1ac3eee938c246325732a2944bcdcb 100644 (file)
--- 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 e4a426324f83aa83c49cf138165580878500cf6d..1ec6148eb19eea444ce714adf4e03d240b9cb7d1 100644 (file)
--- 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 <sys/stat.h>
 #include <unistd.h>
 
-#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 c41b4192d5f9f5787ce140dd17e30b517c08918a..47b31ba5d313210e5c1d2270dccdf0738d16991c 100644 (file)
--- 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 ff90842a0a68452cb140fc433604ffc835d436f5..ca0d75d132b57185dfd0ee425a20da5b0b68225f 100644 (file)
--- a/src/test/test-sched-prio.c
+++ b/src/test/test-sched-prio.c
@@ -6,7 +6,6 @@
 #include <sched.h>
 
 #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 a13f7ce79800b7a001bb811a7c4524001fda2183..0030096a7c4fd1fe3767d8f75940be84551c7f63 100644 (file)
--- 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 39a89d1e8dd92084491aad4b4bdec58eb226b1de..b4e8e95aa0009381c4ff5716c6cfe5f3594ead33 100644 (file)
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -7,8 +7,8 @@
 #include <sys/mman.h>
 #include <sys/personality.h>
 #include <sys/shm.h>
-#include <sys/syscall.h>
-#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #if HAVE_VALGRIND_VALGRIND_H
 #include <valgrind/valgrind.h>
@@ -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 3d353aecda051196682bd89581b307b74f88510f..37771d0ce8719c06c0652095de1d8ee14c9a0f1f 100644 (file)
--- 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 <errno.h>
-
 #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 e7371a81e3aef745e837e86d47414c48ee2c5ee2..e51b3a283b1fc5ff50d08ed6ce091c8255484580 100644 (file)
--- 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 <sys/stat.h>
+#include <sys/socket.h>
 
-#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 ccbd2f89dde69ef39457e310a9136c9a1627ca3e..86b1f5f2e01473bb98bbb7937e788b6e0cb02f29 100644 (file)
--- 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 91244b25ac296eb130804ae2ccb50108171a193b..450c4160bffa755bc570d1d90d76406dedebd560 100644 (file)
--- 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 <pthread.h>
+#include <stdlib.h>
 
 #include "mempool.h"
 #include "process-util.h"

diff --git a/src/test/test-sha1.c b/src/test/test-sha1.c
index bddc7ac241f4e35d2309aa77e9a696e97f4bcca3..3a5ff148df47e2d0acade59d34386b3af76a81fd 100644 (file)
--- 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 1acc893c744d357ce13f49f02b38ab16958855e4..1f4a679ac996b025ace3cce15b78b5f4e2b83bed 100644 (file)
--- 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 27fea2161cd98a575aff17808f2845a1cc9e5fdb..e1fd58ad90ddd94bff2dffaac2050f194dcb80f4 100644 (file)
--- 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 <stdlib.h>
-
 #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 299463c243565de94eb08e2bea4f163be14a090d..95b4717b41f0dbe02c7755e9a3179693c8dd93a5 100644 (file)
--- 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 <fcntl.h>
+#include <stdlib.h>
 #include <sys/mman.h>
 #include <unistd.h>
 

diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
index 45f31b0c5430ceb2e070dfe4c4236ad90fd63304..7d069a7fb24082fe6c103080ff2d97cded0c86d5 100644 (file)
--- 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 <unistd.h>
-
 #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 9332f2750a3afe6707e29bce646c2aacc8f6798b..f4c9916f15d8507f0150171886c2753cb644d454 100644 (file)
--- 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 <limits.h>
+#include <time.h>
 #include <sched.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
-#include <sys/timex.h>
-#include <sys/types.h>
 
 #define __STDC_WANT_IEC_60559_TYPES_EXT__
 #include <float.h>
 
-#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. */

diff --git a/src/test/test-socket-bind.c b/src/test/test-socket-bind.c
index d0e448daa10e13fd7dfab7246530ea531d2ffb17..f6f48f67232986af255cf369564fdf840c1d202a 100644 (file)
--- 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 c2a92a754414702de791ba830729274a1527c139..9313439cf547d2458dd9737bed5e7d5531be93fe 100644 (file)
--- 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 ba2b4470d1c451c2c9a3ddb1565318771be5203f..0313350000a88c56ff75a3b1b8999ace0a9e21e5 100644 (file)
--- a/src/test/test-socket-util.c
+++ b/src/test/test-socket-util.c
@@ -2,27 +2,21 @@
 
 #include <fcntl.h>
 #include <grp.h>
-#include <net/if_arp.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #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 f2f2f057c15c5774610dd9c961dca3b90347fdf8..850f961bfedcf6d405ee50fd91f8f4e2eb792849 100644 (file)
--- 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 <stdlib.h>
 #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 c5aacc32f1a4931b332bd64940ba10900971fecd..fc8bad256f0c6bd84fb95d3221b2c84bfb913f6e 100644 (file)
--- a/src/test/test-stat-util.c
+++ b/src/test/test-stat-util.c
@@ -2,7 +2,6 @@
 
 #include <fcntl.h>
 #include <linux/magic.h>
-#include <sched.h>
 #include <sys/eventfd.h>
 #include <sys/mount.h>
 #include <unistd.h>
@@ -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 49ff205c53f624e0b5ff8f1ac49fdaca9aecd82f..4e12ed73660abf3e2bcc1236966c14c42793eea1 100644 (file)
--- 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 <stdlib.h>
-
 #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 8e6862c41dae9a98f5494dcef0dc6412ef32aaed..fb3d28ed535af64e340fa4315c0a4317de5d8b08 100644 (file)
--- 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 <ctype.h>
-
 #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 7c06e06bb43c3a3c1fa1383c11bb609f638ef052..d2524fb52b45b6498296d538bdb28c99cfa0ff23 100644 (file)
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -3,7 +3,7 @@
 #include <fnmatch.h>
 
 #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 00f595c4bb9a61d52a1977120f2d27d77862cba1..1ca5ac7c9e07e8a898f186d26a3de56f4136dffb 100644 (file)
--- a/src/test/test-strxcpyx.c
+++ b/src/test/test-strxcpyx.c
@@ -2,7 +2,6 @@
 
 #include <stdio.h>
 
-#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 83d6c9036c4ebf89b556174a2182fea5239223b0..16ce41cb933025fbcd74be43bc837cc6c7b4d122 100644 (file)
--- 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 <sys/socket.h>
 #include <sys/utsname.h>
 
 #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 d6e41007604bee60e88fa168c90f26a7146a87fb..cd05b179890832c9926b3a2fea380019b7c70a1c 100644 (file)
--- 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 4b7f23cf51037048dabe83905679827a8bdbdbc8..f128ddca1f1e7d133162b45b1f804f22aea61c3f 100644 (file)
--- 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 <fcntl.h>
-#include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <termios.h>
 #include <unistd.h>
 
 #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 f0daa500eb6a3381aa851a1192da0408e9f41db8..5e01bb2fe3278faff5ada6b6e9d9aac76726e61a 100644 (file)
--- 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 <stdlib.h>
 #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 bef503bf3ef1e1fd86a6a97186ab5be7ed09d26c..413bbf59ab397c3f0953915baeb2d24fb25872ef 100644 (file)
--- 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 <stdlib.h>
+
 #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 4ccf7401764569eeb37084972479211a821151f8..8277fab97822711e681887774e5d2e0c12ea8a8a 100644 (file)
--- 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 07f4e018ac4c314447d72585718472901a7cad44..e6c339bcc7736f50edfa2f30eab47d1d8d510425 100644 (file)
--- 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 <stdlib.h>
 #include <string.h>
 
-#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 9a76ad28a0797af480409a05e8e38b17e16dccf1..4f82eac58db4e8bc7f0fde2453f9d440e5530ea9 100644 (file)
--- 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 <sys/types.h>
 #include <unistd.h>
 
 #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 6041d084906423d73217924dd294c2beb33fcc89..8c4c6eb2643d25d7269d14ad5ec1b4c8bd62b332 100644 (file)
--- 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 <stddef.h>
-
-#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 728c193339c27c1847bb9db381106de83a178439..82a9f82210db45f2297067b1376e1bb5bb9843b1 100644 (file)
--- 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 b934871f950b29b231a3b3a734892795dde4bd18..2f8b288e5358e9baa60aab8b0c07c7ce7eb6dec3 100644 (file)
--- 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 b598eb8bc069012750d6ea408cd2a28e903d385f..4eb9f052b2d7777ade1cb0d3f00f92b64f179272 100644 (file)
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -2,17 +2,16 @@
 
 #include <fnmatch.h>
 #include <stdio.h>
-#include <stdlib.h>
 
+#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 7a1e8a087a8d3e181b9e1f1777320565c0cb8f49..60cc82373d67ed6196306b295ec37903c1bba814 100644 (file)
--- 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 2a4df190a1aa3104b908ab87be5f133a3ecf3460..db03a7c4ffda718cddb9c6583835ae3f8c8cdcaa 100644 (file)
--- 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 bf8dd16d5ba66f5b64534093841bb26c59af074c..4df9cb5edcfb9a6de625afa9cf89d201bc977922 100644 (file)
--- 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 ca985d35727c6d589597b14fd2af7955252e13c9..d09d2f06513a2d03473bc2958db3c61545cd43bd 100644 (file)
--- 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 009d143fbc9daef48681b731a3b8beca8a55132e..00e142ae61ccbac561c83dc6f26e500a771ab00e 100644 (file)
--- 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 <pthread.h>
+#include <sys/socket.h>
 
+#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 649433b3d555082cf4c5be0d9bdc518d6ec6f9b7..efb09ee2dd01a1fd6edc3c0cbd19c3c32263484b 100644 (file)
--- a/src/test/test-varlink.c
+++ b/src/test/test-varlink.c
@@ -3,6 +3,7 @@
 #include <fcntl.h>
 #include <poll.h>
 #include <pthread.h>
+#include <sys/socket.h>
 
 #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 a033d07ee721182b8479bd00e588b78f1bfbed68..03b4836e908f977ef6dc13c79e2b99517a927eda 100644 (file)
--- a/src/test/test-verbs.c
+++ b/src/test/test-verbs.c
@@ -2,7 +2,6 @@
 
 #include <getopt.h>
 
-#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 aeea50c603d388f791be9222a05f33a112498f5e..7fa879b971df606977062e4e9b9d173c089c5cb6 100644 (file)
--- 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 dd8ad11fa415b44526d630451cb1c4ac325363c2..dd1fa49428c533e2a4105ddf4ed6db80e58b27f6 100644 (file)
--- 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 67e6581cfb02fc15e7667baeb1648afd0e39e002..23ba46afe8e84de5c1a064638716d6e98da031a1 100644 (file)
--- 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 <string.h>
-#include <unistd.h>
-
 #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 d376d4a4cd5de6e0177e492fac8f8ddcd2cbe9c1..bb05f372766190f3090030190624c65a009f8337 100644 (file)
--- 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 880b932af6445bb7a02868b47d2869063bd742d2..a9ca0e69b08128288a1b97d2ab2887c20b4085d9 100644 (file)
--- 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 <errno.h>
 #include <fcntl.h>
-#include <sys/types.h>
 #include <sys/xattr.h>
 #include <unistd.h>
 
 #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 6367f2726373bed36e6de8bd5241fa951fb2a04d..bb9e4c49d0947c7f379e518727bbe6767fd08eb1 100644 (file)
--- 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 <stdarg.h>
-
 #include "alloc-util.h"
-#include "string-util.h"
 #include "tests.h"
 #include "xml.h"