Merge pull request #13906 from yuwata/drop-missing-take2

tree-wide: drop xxx.h when xxx-util.h is included

24 files changed, 0 insertions, 31 deletions

diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c
index c8ef3295b5..884372e60e 100644
--- a/src/test/test-af-list.c
+++ b/src/test/test-af-list.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <string.h>
 #include <sys/socket.h>
 
 #include "macro.h"
diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c
index 46358ef952..899e4b5d27 100644
--- a/src/test/test-calendarspec.c
+++ b/src/test/test-calendarspec.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <string.h>
-
 #include "alloc-util.h"
 #include "calendarspec.h"
 #include "errno-util.h"
diff --git a/src/test/test-capability.c b/src/test/test-capability.c
index 84a6e92df1..295136e1ef 100644
--- a/src/test/test-capability.c
+++ b/src/test/test-capability.c
@@ -2,7 +2,6 @@
 
 #include <netinet/in.h>
 #include <pwd.h>
-#include <sys/capability.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c
index 1891df0eb9..f16cb291f2 100644
--- a/src/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <string.h>
 #include <unistd.h>
 
 #include "cgroup-setup.h"
diff --git a/src/test/test-date.c b/src/test/test-date.c
index 9888b65998..7d27cfa703 100644
--- a/src/test/test-date.c
+++ b/src/test/test-date.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <string.h>
-
 #include "alloc-util.h"
 #include "string-util.h"
 #include "tests.h"
diff --git a/src/test/test-engine.c b/src/test/test-engine.c
index 1064811497..265152fb76 100644
--- a/src/test/test-engine.c
+++ b/src/test/test-engine.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include <string.h>
 
 #include "bus-util.h"
 #include "manager.h"
diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c
index 17dacda70f..f0ffe89729 100644
--- a/src/test/test-env-util.c
+++ b/src/test/test-env-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <string.h>
-
 #include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c
index ec51891634..3168411d8b 100644
--- a/src/test/test-exec-util.c
+++ b/src/test/test-exec-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 435ab39cd2..92fb35fd87 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <grp.h>
-#include <pwd.h>
 #include <stdio.h>
 #include <sys/prctl.h>
 #include <sys/types.h>
diff --git a/src/test/test-extract-word.c b/src/test/test-extract-word.c
index bf47a598a9..4ca57555f1 100644
--- a/src/test/test-extract-word.c
+++ b/src/test/test-extract-word.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "extract-word.h"
 #include "log.h"
diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
index b4f41445fe..667d15335f 100644
--- a/src/test/test-glob-util.c
+++ b/src/test/test-glob-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <glob.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/test/test-id128.c b/src/test/test-id128.c
index eea0765b7a..4d7513f6d5 100644
--- a/src/test/test-id128.c
+++ b/src/test/test-id128.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c
index dcb5bcc254..3ca8e1b108 100644
--- a/src/test/test-libudev.c
+++ b/src/test/test-libudev.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <getopt.h>
-#include <stdio.h>
 #include <sys/epoll.h>
 #include <unistd.h>
 
diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c
index 8deaf4eb0f..216f0e4d94 100644
--- a/src/test/test-load-fragment.c
+++ b/src/test/test-load-fragment.c
@@ -3,8 +3,6 @@
 #include <fcntl.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <string.h>
-#include <sys/capability.h>
 #include <unistd.h>
 
 #include "all-units.h"
diff --git a/src/test/test-netlink-manual.c b/src/test/test-netlink-manual.c
index 031a47605e..a734524eeb 100644
--- a/src/test/test-netlink-manual.c
+++ b/src/test/test-netlink-manual.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <arpa/inet.h>
-#include <libkmod.h>
 #include <linux/if_tunnel.h>
 #include <linux/ip.h>
 #include <sys/types.h>
diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index ad441ae731..762a203577 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <sched.h>
 #include <sys/mount.h>
 #include <sys/personality.h>
 #include <sys/prctl.h>
diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
index af17a56516..018c20f8be 100644
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -2,7 +2,6 @@
 
 #include <fcntl.h>
 #include <poll.h>
-#include <sched.h>
 #include <stdlib.h>
 #include <sys/eventfd.h>
 #include <sys/mman.h>
diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
index 8ea4163790..1a8c60ad42 100644
--- a/src/test/test-signal-util.c
+++ b/src/test/test-signal-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <signal.h>
 #include <unistd.h>
 
 #include "log.h"
diff --git a/src/test/test-strbuf.c b/src/test/test-strbuf.c
index 9e93bc1751..483ba44caa 100644
--- a/src/test/test-strbuf.c
+++ b/src/test/test-strbuf.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <stdlib.h>
-#include <string.h>
 
 #include "strbuf.h"
 #include "string-util.h"
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index 5e96f3a8a7..f31ea6f8c6 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <string.h>
-
 #include "alloc-util.h"
 #include "escape.h"
 #include "nulstr-util.h"
diff --git a/src/test/test-strxcpyx.c b/src/test/test-strxcpyx.c
index d7199124a3..749aa46d75 100644
--- a/src/test/test-strxcpyx.c
+++ b/src/test/test-strxcpyx.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <stdio.h>
-#include <string.h>
 
 #include "string-util.h"
 #include "strxcpyx.h"
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index f0186b078f..6021164739 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -56,7 +56,6 @@ static void test_unit_file_build_name_map(char **ids) {
         if (r == 0)
                 log_debug("Cache rebuild skipped based on mtime.");
 
-
         char **id;
         STRV_FOREACH(id, ids) {
                  const char *fragment, *name;
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index aa072c4ca8..c65f6ffe08 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "all-units.h"
diff --git a/src/test/test-util.c b/src/test/test-util.c
index 120baa3593..61725bdf08 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 #include <sys/wait.h>
 #include <unistd.h>