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

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

15 files changed, 0 insertions, 32 deletions

diff --git a/src/core/bpf-firewall.c b/src/core/bpf-firewall.c
index a637437a5a..424162f445 100644
--- a/src/core/bpf-firewall.c
+++ b/src/core/bpf-firewall.c
@@ -12,7 +12,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/core/dynamic-user.c b/src/core/dynamic-user.c
index e7a2f64525..75373407b4 100644
--- a/src/core/dynamic-user.c
+++ b/src/core/dynamic-user.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <grp.h>
-#include <pwd.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/core/execute.c b/src/core/execute.c
index 4401e30e65..1c22c3d80e 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2,20 +2,13 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <glob.h>
-#include <grp.h>
 #include <poll.h>
-#include <signal.h>
-#include <string.h>
-#include <sys/capability.h>
 #include <sys/eventfd.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/personality.h>
 #include <sys/prctl.h>
 #include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/un.h>
 #include <unistd.h>
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index a91cfebc67..1286743273 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <ftw.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -13,7 +12,6 @@
 #include "string-util.h"
 
 #if HAVE_KMOD
-#include <libkmod.h>
 #include "module-util.h"
 
 static void systemd_kmod_log(
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index f991b7f5e8..288de616b6 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -11,9 +11,7 @@
 #include <seccomp.h>
 #endif
 #include <sched.h>
-#include <string.h>
 #include <sys/resource.h>
-#include <sys/stat.h>
 
 #include "af-list.h"
 #include "alloc-util.h"
diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index aa4a89c17a..33728b0ff2 100644
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "env-file.h"
 #include "env-util.h"
diff --git a/src/core/main.c b/src/core/main.c
index 3545fde71d..bfbb9331f3 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -3,13 +3,9 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
 #include <sys/mount.h>
 #include <sys/prctl.h>
 #include <sys/reboot.h>
-#include <sys/stat.h>
 #include <unistd.h>
 #if HAVE_SECCOMP
 #include <seccomp.h>
diff --git a/src/core/manager.c b/src/core/manager.c
index c9032fced8..700493ee0d 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3,8 +3,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/kd.h>
-#include <signal.h>
-#include <string.h>
 #include <sys/epoll.h>
 #include <sys/inotify.h>
 #include <sys/ioctl.h>
diff --git a/src/core/namespace.c b/src/core/namespace.c
index dfc7f9fb1c..df0455b7eb 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -3,9 +3,7 @@
 #include <errno.h>
 #include <sched.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/mount.h>
-#include <sys/stat.h>
 #include <unistd.h>
 #include <linux/fs.h>
 
diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
index cb136322fe..9fd3099fea 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -7,7 +7,6 @@
 #include <errno.h>
 #include <selinux/avc.h>
 #include <selinux/selinux.h>
-#include <stdio.h>
 #if HAVE_AUDIT
 #include <libaudit.h>
 #endif
diff --git a/src/core/service.c b/src/core/service.c
index e0d359890a..ebbd99a3cc 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <signal.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
index e2d4c0d6e1..4427397f27 100644
--- a/src/core/smack-setup.c
+++ b/src/core/smack-setup.c
@@ -5,12 +5,10 @@
         Nathaniel Chen <nathaniel.chen@intel.com>
 ***/
 
-#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/core/socket.c b/src/core/socket.c
index ee8ed3fd06..fc5ee69c9c 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -5,7 +5,6 @@
 #include <fcntl.h>
 #include <mqueue.h>
 #include <netinet/tcp.h>
-#include <signal.h>
 #include <sys/epoll.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/core/swap.c b/src/core/swap.c
index c184afa29d..e4b018616d 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -727,7 +727,6 @@ static void swap_enter_signal(Swap *s, SwapState state, SwapResult f) {
         if (s->result == SWAP_SUCCESS)
                 s->result = f;
 
-
         r = unit_kill_context(UNIT(s),
                               &s->kill_context,
                               state_to_kill_operation(s, state),
@@ -929,7 +928,6 @@ static int swap_stop(Unit *u) {
                 swap_enter_signal(s, SWAP_DEACTIVATING_SIGKILL, SWAP_SUCCESS);
                 return 0;
 
-
         default:
                 assert_not_reached("Unexpected state.");
         }
diff --git a/src/core/unit.c b/src/core/unit.c
index 3107b9b148..5f2ca44701 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2,9 +2,7 @@
 
 #include <errno.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/prctl.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
 #include "sd-id128.h"