From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 21 May 2025 07:37:24 +0000 (+0200)
Subject: tree-wide: Clean up includes
X-Git-Tag: v258-rc1~557^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86b9a3e31d02a1e863a434a80cdf728ff6037ec5;p=thirdparty%2Fsystemd.git

tree-wide: Clean up includes

This removes more unused includes from the components already cleaned
up in #37467 and #37457.

Split out of #37344.
---

diff --git a/src/battery-check/battery-check.c b/src/battery-check/battery-check.c
index 207f477f1c5..78636d77940 100644
--- a/src/battery-check/battery-check.c
+++ b/src/battery-check/battery-check.c
@@ -2,7 +2,6 @@
 
 #include <getopt.h>
 #include <sys/socket.h>
-#include <unistd.h>
 
 #include "sd-messages.h"
 
diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index 266cec4df47..8349233fa62 100644
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -2,7 +2,6 @@
 
 #include <getopt.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #include "sd-bus.h"
 
diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index fc5707e5a31..9b56af7bebd 100644
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -20,7 +20,6 @@
 #include "process-util.h"
 #include "procfs-util.h"
 #include "sort-util.h"
-#include "strv.h"
 #include "terminal-util.h"
 #include "time-util.h"
 #include "virt.h"
diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c
index f3e24038227..ac6d8aa26da 100644
--- a/src/coredump/coredump-vacuum.c
+++ b/src/coredump/coredump-vacuum.c
@@ -2,7 +2,6 @@
 
 #include <sys/stat.h>
 #include <sys/statvfs.h>
-#include <unistd.h>
 
 #include "alloc-util.h"
 #include "coredump-vacuum.h"
diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index b8ba77e6ae3..fafee11482e 100644
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <elf.h>
 #include <stdio.h>
-#include <sys/auxv.h>
 #include <sys/mount.h>
 #include <sys/prctl.h>
 #include <sys/statvfs.h>
diff --git a/src/delta/delta.c b/src/delta/delta.c
index 2dc24945566..337472f2768 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
-#include <sys/prctl.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index f7de15e92f2..14319413f0c 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -6,8 +6,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/mount.h>
 
 #include "sd-device.h"
 
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 48c0b163b8e..6ba7d4ba921 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -2,7 +2,6 @@
 
 #include <fcntl.h>
 #include <getopt.h>
-#include <linux/loop.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
@@ -51,7 +50,6 @@
 #include "terminal-util.h"
 #include "time-util.h"
 #include "tmpfile-util-label.h"
-#include "umask-util.h"
 #include "user-util.h"
 #include "vconsole-util.h"
 
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index da37ace7d1e..a41427ab4dc 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -5,7 +5,6 @@
 
 #include <fcntl.h>
 #include <sys/file.h>
-#include <sys/prctl.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 8b2fd590201..1f8d845c6f5 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <sys/file.h>
-#include <unistd.h>
 
 #include "sd-id128.h"
 
diff --git a/src/growfs/growfs.c b/src/growfs/growfs.c
index 6ba7bce6e7b..d991b82d67c 100644
--- a/src/growfs/growfs.c
+++ b/src/growfs/growfs.c
@@ -2,9 +2,6 @@
 
 #include <fcntl.h>
 #include <getopt.h>
-#include <linux/magic.h>
-#include <sys/ioctl.h>
-#include <sys/mount.h>
 #include <sys/vfs.h>
 
 #include "alloc-util.h"
diff --git a/src/growfs/makefs.c b/src/growfs/makefs.c
index 26f090f1db9..3378bd3d705 100644
--- a/src/growfs/makefs.c
+++ b/src/growfs/makefs.c
@@ -2,9 +2,7 @@
 
 #include <fcntl.h>
 #include <sys/file.h>
-#include <sys/prctl.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #include "alloc-util.h"
 #include "blockdev-util.h"
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 72467704790..38724b53031 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -14,6 +14,7 @@
 #include "bus-common-errors.h"
 #include "bus-get-properties.h"
 #include "bus-log-control-api.h"
+#include "bus-object.h"
 #include "bus-polkit.h"
 #include "bus-util.h"
 #include "constants.h"
diff --git a/src/integritysetup/integritysetup-generator.c b/src/integritysetup/integritysetup-generator.c
index 60f26b5ddc9..56c91b734fa 100644
--- a/src/integritysetup/integritysetup-generator.c
+++ b/src/integritysetup/integritysetup-generator.c
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <stdlib.h>
-#include <sys/stat.h>
-#include <unistd.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/keyutil/keyutil.c b/src/keyutil/keyutil.c
index cd7837ed89e..aed34b39d07 100644
--- a/src/keyutil/keyutil.c
+++ b/src/keyutil/keyutil.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
-#include <unistd.h>
 
 #include "alloc-util.h"
 #include "ask-password-api.h"
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 4a62e063b1c..11d9130bbca 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <sys/stat.h>
-#include <unistd.h>
 
 #include "sd-bus.h"
 #include "sd-event.h"
@@ -10,6 +9,7 @@
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-log-control-api.h"
+#include "bus-object.h"
 #include "bus-polkit.h"
 #include "bus-unit-util.h"
 #include "bus-util.h"
@@ -23,7 +23,6 @@
 #include "service-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "time-util.h"
 
 static int vconsole_reload(sd_bus *bus) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
diff --git a/src/mountfsd/mountfsd-manager.c b/src/mountfsd/mountfsd-manager.c
index fdd98d7936f..6fb49c70a14 100644
--- a/src/mountfsd/mountfsd-manager.c
+++ b/src/mountfsd/mountfsd-manager.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <stdlib.h>
-#include <sys/wait.h>
 
 #include "sd-daemon.h"
 
diff --git a/src/mountfsd/mountwork.c b/src/mountfsd/mountwork.c
index d932169e56a..44cc7ce1f23 100644
--- a/src/mountfsd/mountwork.c
+++ b/src/mountfsd/mountwork.c
@@ -25,7 +25,6 @@
 #include "loop-util.h"
 #include "main-func.h"
 #include "memory-util.h"
-#include "missing_syscall.h"
 #include "namespace-util.h"
 #include "nsresource.h"
 #include "nulstr-util.h"
diff --git a/src/nsresourced/nsresourced-manager.c b/src/nsresourced/nsresourced-manager.c
index ab3086ad76e..de93cd33f90 100644
--- a/src/nsresourced/nsresourced-manager.c
+++ b/src/nsresourced/nsresourced-manager.c
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <stdlib.h>
-#include <sys/mount.h>
-#include <sys/wait.h>
 
 #include "sd-daemon.h"
 
diff --git a/src/nsresourced/nsresourcework.c b/src/nsresourced/nsresourcework.c
index e283593bf7f..5196a338de0 100644
--- a/src/nsresourced/nsresourcework.c
+++ b/src/nsresourced/nsresourcework.c
@@ -7,9 +7,8 @@
 #include <net/if.h>
 #include <poll.h>
 #include <sys/eventfd.h>
-#include <sys/mount.h>
+#include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 #include <utmpx.h>
 
 #include "sd-daemon.h"
diff --git a/src/nsresourced/userns-restrict.c b/src/nsresourced/userns-restrict.c
index e082dce2437..f85119a2657 100644
--- a/src/nsresourced/userns-restrict.c
+++ b/src/nsresourced/userns-restrict.c
@@ -1,13 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <sys/stat.h>
-#include <sched.h>
-#include <sys/mount.h>
 
 #include "bpf-dlopen.h"
 #include "bpf-link.h"
 #include "fd-util.h"
-#include "fs-util.h"
 #include "log.h"
 #include "lsm-util.h"
 #include "mkdir.h"
diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c
index 021035ab85c..8972da0802f 100644
--- a/src/portable/portabled-image-bus.c
+++ b/src/portable/portabled-image-bus.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
diff --git a/src/portable/portabled-image-bus.h b/src/portable/portabled-image-bus.h
index 5784d3ab151..cafef9fdb81 100644
--- a/src/portable/portabled-image-bus.h
+++ b/src/portable/portabled-image-bus.h
@@ -3,7 +3,6 @@
 
 #include "sd-bus-vtable.h"
 
-#include "bus-object.h"
 #include "portabled-forward.h"
 
 int bus_image_common_get_os_release(Manager *m, sd_bus_message *message, const char *name_or_path, Image *image, sd_bus_error *error);
diff --git a/src/portable/portabled.c b/src/portable/portabled.c
index b9c880992d5..f0521ab95e8 100644
--- a/src/portable/portabled.c
+++ b/src/portable/portabled.c
@@ -7,6 +7,7 @@
 
 #include "alloc-util.h"
 #include "bus-log-control-api.h"
+#include "bus-object.h"
 #include "bus-util.h"
 #include "common-signal.h"
 #include "constants.h"
@@ -15,10 +16,8 @@
 #include "log.h"
 #include "main-func.h"
 #include "portabled.h"
-#include "portabled-image-bus.h"
 #include "service-util.h"
 #include "signal-util.h"
-#include "time-util.h"
 
 static Manager* manager_unref(Manager *m);
 DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_unref);
diff --git a/src/portable/portabled.h b/src/portable/portabled.h
index c7ce2479555..1fe41cdd1a5 100644
--- a/src/portable/portabled.h
+++ b/src/portable/portabled.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "bus-object.h"
 #include "list.h"
 #include "portabled-forward.h"
 #include "runtime-scope.h"
diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c
index 028d1b50ea8..8e20add1444 100644
--- a/src/pstore/pstore.c
+++ b/src/pstore/pstore.c
@@ -5,9 +5,6 @@
 /* Generally speaking, the pstore contains a small number of files
  * that in turn contain a small amount of data.  */
 #include <stdio.h>
-#include <stdio_ext.h>
-#include <sys/prctl.h>
-#include <sys/xattr.h>
 #include <unistd.h>
 
 #include "sd-journal.h"
diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index 4daa19093db..3451f63ef2b 100644
--- a/src/quotacheck/quotacheck.c
+++ b/src/quotacheck/quotacheck.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <sys/prctl.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/random-seed/random-seed-tool.c b/src/random-seed/random-seed-tool.c
index deb78d99191..536d1b037da 100644
--- a/src/random-seed/random-seed-tool.c
+++ b/src/random-seed/random-seed-tool.c
@@ -2,9 +2,7 @@
 
 #include <fcntl.h>
 #include <getopt.h>
-#include <linux/random.h>
 #include <stdlib.h>
-#include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/xattr.h>
 #include <unistd.h>
diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c
index 83f6e2f337d..36bc6b7ef20 100644
--- a/src/remount-fs/remount-fs.c
+++ b/src/remount-fs/remount-fs.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <mntent.h>
-#include <sys/prctl.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff --git a/src/repart/repart.c b/src/repart/repart.c
index c8cb286cb7a..210e6da2707 100644
--- a/src/repart/repart.c
+++ b/src/repart/repart.c
@@ -1,12 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#if HAVE_VALGRIND_MEMCHECK_H
-#include <valgrind/memcheck.h>
-#endif
-
 #include <fcntl.h>
 #include <getopt.h>
-#include <linux/loop.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index d0f1afe5e62..ed63927fa69 100644
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <sys/un.h>
-
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
diff --git a/src/run/run.c b/src/run/run.c
index 28f35d156ca..23c9c83a844 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -5,7 +5,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/resource.h>
-#include <sys/stat.h>
 
 #include "sd-bus.h"
 #include "sd-daemon.h"
diff --git a/src/shutdown/detach-loopback.c b/src/shutdown/detach-loopback.c
index aa50299694f..441172e521f 100644
--- a/src/shutdown/detach-loopback.c
+++ b/src/shutdown/detach-loopback.c
@@ -5,7 +5,6 @@
 
 #include <linux/loop.h>
 #include <sys/ioctl.h>
-#include <unistd.h>
 
 #if HAVE_VALGRIND_MEMCHECK_H
 #include <valgrind/memcheck.h>
diff --git a/src/shutdown/detach-md.c b/src/shutdown/detach-md.c
index be24bc20ba8..d65a876e39f 100644
--- a/src/shutdown/detach-md.c
+++ b/src/shutdown/detach-md.c
@@ -6,7 +6,6 @@
 #include <linux/major.h>
 #include <linux/raid/md_u.h>
 #include <sys/ioctl.h>
-#include <unistd.h>
 
 #include "sd-device.h"
 
diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index 2bb456e0877..5f8f9d5754a 100644
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -5,11 +5,11 @@
 
 #include <fcntl.h>
 #include <sys/mount.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
 #include "chase.h"
+#include "constants.h"
 #include "dirent-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
@@ -29,7 +29,6 @@
 #include "signal-util.h"
 #include "stat-util.h"
 #include "string-util.h"
-#include "time-util.h"
 #include "umount.h"
 #include "virt.h"
 
diff --git a/src/sleep/battery-capacity.c b/src/sleep/battery-capacity.c
index 546d0b6ee11..2985223a944 100644
--- a/src/sleep/battery-capacity.c
+++ b/src/sleep/battery-capacity.c
@@ -13,6 +13,7 @@
 #include "parse-util.h"
 #include "siphash24.h"
 #include "string-util.h"
+#include "time-util.h"
 
 #define DISCHARGE_RATE_FILEPATH "/var/lib/systemd/sleep/battery_discharge_percentage_rate_per_hour"
 #define BATTERY_DISCHARGE_RATE_HASH_KEY SD_ID128_MAKE(5f,9a,20,18,38,76,46,07,8d,36,58,0b,bb,c4,e0,63)
diff --git a/src/sleep/battery-capacity.h b/src/sleep/battery-capacity.h
index df7b06ce5a1..8f4f4ac2e7c 100644
--- a/src/sleep/battery-capacity.h
+++ b/src/sleep/battery-capacity.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include "hashmap.h"
-#include "time-util.h"
 
 int fetch_batteries_capacity_by_name(Hashmap **ret_current_capacity);
 int get_capacity_by_name(Hashmap *capacities_by_name, const char *name);
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 3bbfdbadaf0..03375a942a8 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -10,7 +10,6 @@
 #include <stdlib.h>
 #include <sys/timerfd.h>
 #include <sys/utsname.h>
-#include <unistd.h>
 
 #include "sd-bus.h"
 #include "sd-device.h"
diff --git a/src/sleep/test-battery-capacity.c b/src/sleep/test-battery-capacity.c
index 1b3422ae80a..56804179731 100644
--- a/src/sleep/test-battery-capacity.c
+++ b/src/sleep/test-battery-capacity.c
@@ -7,6 +7,7 @@
 #include "hashmap.h"
 #include "log.h"
 #include "tests.h"
+#include "time-util.h"
 
 TEST(fetch_batteries_capacity_by_name) {
         _cleanup_hashmap_free_ Hashmap *capacity = NULL;
diff --git a/src/socket-activate/socket-activate.c b/src/socket-activate/socket-activate.c
index 8bca1326a0e..ada289ded3e 100644
--- a/src/socket-activate/socket-activate.c
+++ b/src/socket-activate/socket-activate.c
@@ -2,7 +2,6 @@
 
 #include <getopt.h>
 #include <sys/epoll.h>
-#include <sys/prctl.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index 93f186b2877..d15f82d61b4 100644
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -4,7 +4,6 @@
 #include <getopt.h>
 #include <netdb.h>
 #include <stdio.h>
-#include <sys/un.h>
 #include <unistd.h>
 
 #include "sd-daemon.h"
diff --git a/src/ssh-generator/ssh-generator.c b/src/ssh-generator/ssh-generator.c
index 55ad498b7d2..1ab4acc9c51 100644
--- a/src/ssh-generator/ssh-generator.c
+++ b/src/ssh-generator/ssh-generator.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <fcntl.h>
-#include <sys/ioctl.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/ssh-generator/ssh-proxy.c b/src/ssh-generator/ssh-proxy.c
index 04f99dbd573..38f64779141 100644
--- a/src/ssh-generator/ssh-proxy.c
+++ b/src/ssh-generator/ssh-proxy.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <net/if_arp.h>
 #include <unistd.h>
 
 #include "sd-varlink.h"
diff --git a/src/sulogin-shell/sulogin-shell.c b/src/sulogin-shell/sulogin-shell.c
index 8678c6fee03..d074f6b543d 100644
--- a/src/sulogin-shell/sulogin-shell.c
+++ b/src/sulogin-shell/sulogin-shell.c
@@ -3,8 +3,6 @@
   Copyright © 2017 Felipe Sateler
 ***/
 
-#include <sys/prctl.h>
-
 #include "sd-bus.h"
 
 #include "alloc-util.h"
diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 188b368c412..61d4195912d 100644
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -35,7 +35,6 @@
 #include "log.h"
 #include "loop-util.h"
 #include "main-func.h"
-#include "missing_magic.h"
 #include "mkdir.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 40bba14a316..3a75e6a33ed 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -17,6 +17,7 @@
 #include "bus-log-control-api.h"
 #include "bus-map-properties.h"
 #include "bus-message-util.h"
+#include "bus-object.h"
 #include "bus-polkit.h"
 #include "bus-unit-util.h"
 #include "bus-util.h"
diff --git a/src/tpm2-setup/tpm2-setup.c b/src/tpm2-setup/tpm2-setup.c
index 5821a23e956..032b1e3381b 100644
--- a/src/tpm2-setup/tpm2-setup.c
+++ b/src/tpm2-setup/tpm2-setup.c
@@ -2,7 +2,6 @@
 
 #include <getopt.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #include "sd-messages.h"
 
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index cc29be10208..3aefc898eea 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -10,7 +10,6 @@
 #include <sys/prctl.h>
 #include <sys/signalfd.h>
 #include <sys/stat.h>
-#include <sys/un.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
index f802ed32e97..3e5dfd29eee 100644
--- a/src/update-done/update-done.c
+++ b/src/update-done/update-done.c
@@ -2,7 +2,6 @@
 
 #include <getopt.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #include "alloc-util.h"
 #include "chase.h"
diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index b80f10cd339..8c7a83ccb62 100644
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <sys/stat.h>
-#include <unistd.h>
 
 #if HAVE_AUDIT
 #  include <libaudit.h>
diff --git a/src/user-sessions/user-sessions.c b/src/user-sessions/user-sessions.c
index 4b05e40534d..faf37602af7 100644
--- a/src/user-sessions/user-sessions.c
+++ b/src/user-sessions/user-sessions.c
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <fcntl.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #include "fs-util.h"
 #include "label-util.h"
diff --git a/src/userdb/userdbd-manager.c b/src/userdb/userdbd-manager.c
index 48bd37ef500..7815930f9b4 100644
--- a/src/userdb/userdbd-manager.c
+++ b/src/userdb/userdbd-manager.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <stdlib.h>
-#include <sys/wait.h>
 
 #include "sd-daemon.h"
 
diff --git a/src/userdb/userwork.c b/src/userdb/userwork.c
index d1e296081c1..0282cc37dcd 100644
--- a/src/userdb/userwork.c
+++ b/src/userdb/userwork.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <poll.h>
-#include <sys/wait.h>
 
 #include "sd-daemon.h"
 #include "sd-varlink.h"
diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 2c89d212822..024a0fd3a21 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -7,7 +7,6 @@
 #include <linux/kd.h>
 #include <linux/tiocl.h>
 #include <linux/vt.h>
-#include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sysexits.h>
diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c
index 5d863e11897..4a79fa1b331 100644
--- a/src/veritysetup/veritysetup-generator.c
+++ b/src/veritysetup/veritysetup-generator.c
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <stdlib.h>
-#include <sys/stat.h>
-#include <unistd.h>
 
 #include "sd-id128.h"
 
diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index 8a3b2f1b086..2e794e45b16 100644
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
-#include <linux/if.h>
-#include <net/if.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/xdg-autostart-generator/xdg-autostart-generator.c b/src/xdg-autostart-generator/xdg-autostart-generator.c
index c7b9a1c70af..6bde82fd1dc 100644
--- a/src/xdg-autostart-generator/xdg-autostart-generator.c
+++ b/src/xdg-autostart-generator/xdg-autostart-generator.c
@@ -2,7 +2,6 @@
 
 #include <stdlib.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #include "alloc-util.h"
 #include "dirent-util.h"
diff --git a/src/xdg-autostart-generator/xdg-autostart-service.c b/src/xdg-autostart-generator/xdg-autostart-service.c
index dbf9087304c..8a752c81009 100644
--- a/src/xdg-autostart-generator/xdg-autostart-service.c
+++ b/src/xdg-autostart-generator/xdg-autostart-service.c
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <fnmatch.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #include "alloc-util.h"
 #include "conf-parser.h"