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

udev: Clean up includes

Split out of #37344.
---

diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
index 84cd93c040a..eea04f70aab 100644
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -5,30 +5,20 @@
  * Copyright © 2009-2010 David Zeuthen <zeuthen@gmail.com>
  */
 
-#include <ctype.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <linux/bsg.h>
 #include <linux/hdreg.h>
-#include <scsi/scsi.h>
-#include <scsi/scsi_ioctl.h>
 #include <scsi/sg.h>
-#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #include "build.h"
 #include "device-nodes.h"
 #include "fd-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "memory-util.h"
 #include "udev-util.h"
 #include "unaligned.h"
 
diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c
index 748093a275a..a36f72e594a 100644
--- a/src/udev/cdrom_id/cdrom_id.c
+++ b/src/udev/cdrom_id/cdrom_id.c
@@ -8,17 +8,16 @@
 #include <linux/cdrom.h>
 #include <scsi/sg.h>
 #include <sys/ioctl.h>
-#include <unistd.h>
 
 #include "alloc-util.h"
 #include "build.h"
 #include "fd-util.h"
 #include "main-func.h"
-#include "memory-util.h"
 #include "random-util.h"
 #include "sort-util.h"
 #include "string-table.h"
 #include "string-util.h"
+#include "time-util.h"
 #include "udev-util.h"
 #include "unaligned.h"
 
diff --git a/src/udev/dmi_memory_id/dmi_memory_id.c b/src/udev/dmi_memory_id/dmi_memory_id.c
index e62222a3070..9475edcd541 100644
--- a/src/udev/dmi_memory_id/dmi_memory_id.c
+++ b/src/udev/dmi_memory_id/dmi_memory_id.c
@@ -43,6 +43,7 @@
  */
 
 #include <getopt.h>
+#include <stdio.h>
 
 #include "alloc-util.h"
 #include "build.h"
diff --git a/src/udev/fido_id/fido_id.c b/src/udev/fido_id/fido_id.c
index 2bd64ee75ed..aa918a97984 100644
--- a/src/udev/fido_id/fido_id.c
+++ b/src/udev/fido_id/fido_id.c
@@ -6,13 +6,10 @@
  * Inspired by Andrew Lutomirski's 'u2f-hidraw-policy.c'
  */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <linux/hid.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -22,10 +19,8 @@
 #include "fd-util.h"
 #include "fido_id_desc.h"
 #include "log.h"
-#include "macro.h"
 #include "main-func.h"
 #include "path-util.h"
-#include "string-util.h"
 #include "udev-util.h"
 
 static const char *arg_device = NULL;
diff --git a/src/udev/fido_id/fido_id_desc.c b/src/udev/fido_id/fido_id_desc.c
index 2dfa759032b..87cfb64587c 100644
--- a/src/udev/fido_id/fido_id_desc.c
+++ b/src/udev/fido_id/fido_id_desc.c
@@ -1,11 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 /* Inspired by Andrew Lutomirski's 'u2f-hidraw-policy.c' */
 
-#include <errno.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
 #include "fido_id_desc.h"
 
 #define HID_RPTDESC_FIRST_BYTE_LONG_ITEM 0xfeu
diff --git a/src/udev/fido_id/fido_id_desc.h b/src/udev/fido_id/fido_id_desc.h
index 57af57e8892..90ae6cbdf1e 100644
--- a/src/udev/fido_id/fido_id_desc.h
+++ b/src/udev/fido_id/fido_id_desc.h
@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
+#include "forward.h"
 
 int is_fido_security_token_desc(const uint8_t *desc, size_t desc_len);
diff --git a/src/udev/fido_id/fuzz-fido-id-desc.c b/src/udev/fido_id/fuzz-fido-id-desc.c
index 040d77a4877..1475d1ff39b 100644
--- a/src/udev/fido_id/fuzz-fido-id-desc.c
+++ b/src/udev/fido_id/fuzz-fido-id-desc.c
@@ -1,13 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/hid.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
 
 #include "fido_id_desc.h"
 #include "fuzz.h"
-#include "log.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         fuzz_setup_logging();
diff --git a/src/udev/fido_id/test-fido-id-desc.c b/src/udev/fido_id/test-fido-id-desc.c
index 0564e64ab96..eb64babacba 100644
--- a/src/udev/fido_id/test-fido-id-desc.c
+++ b/src/udev/fido_id/test-fido-id-desc.c
@@ -1,11 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <stdint.h>
-#include <stdlib.h>
-
 #include "fido_id_desc.h"
-#include "log.h"
-#include "macro.h"
 #include "tests.h"
 
 TEST(is_fido_security_token_desc__fido) {
diff --git a/src/udev/fuzz-udev-rules.c b/src/udev/fuzz-udev-rules.c
index 0a1056d4b52..da94cdaf7e1 100644
--- a/src/udev/fuzz-udev-rules.c
+++ b/src/udev/fuzz-udev-rules.c
@@ -3,9 +3,7 @@
 #include <stdio.h>
 
 #include "fd-util.h"
-#include "fs-util.h"
 #include "fuzz.h"
-#include "tests.h"
 #include "tmpfile-util.h"
 #include "udev-rules.h"
 
diff --git a/src/udev/iocost/iocost.c b/src/udev/iocost/iocost.c
index 58242a33e74..7558160d7b5 100644
--- a/src/udev/iocost/iocost.c
+++ b/src/udev/iocost/iocost.c
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #include "sd-device.h"
 
@@ -14,8 +12,6 @@
 #include "device-util.h"
 #include "devnum-util.h"
 #include "main-func.h"
-#include "path-util.h"
-#include "pretty-print.h"
 #include "string-util.h"
 #include "strv.h"
 #include "udev-util.h"
diff --git a/src/udev/mtd_probe/mtd_probe.c b/src/udev/mtd_probe/mtd_probe.c
index 69dd50a24ad..1bee120912a 100644
--- a/src/udev/mtd_probe/mtd_probe.c
+++ b/src/udev/mtd_probe/mtd_probe.c
@@ -18,18 +18,12 @@
  * Boston, MA  02110-1301  USA
  */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <mtd/mtd-user.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 
-#include "alloc-util.h"
 #include "build.h"
 #include "fd-util.h"
 #include "log.h"
diff --git a/src/udev/mtd_probe/mtd_probe.h b/src/udev/mtd_probe/mtd_probe.h
index ae03a7d2f7e..fe1f28d12fd 100644
--- a/src/udev/mtd_probe/mtd_probe.h
+++ b/src/udev/mtd_probe/mtd_probe.h
@@ -22,7 +22,7 @@
 
 #include <mtd/mtd-user.h>
 
-#include "macro.h"
+#include "forward.h"
 
 /* Full oob structure as written on the flash */
 struct sm_oob {
diff --git a/src/udev/mtd_probe/probe_smartmedia.c b/src/udev/mtd_probe/probe_smartmedia.c
index 67f7009c638..9ce49b85529 100644
--- a/src/udev/mtd_probe/probe_smartmedia.c
+++ b/src/udev/mtd_probe/probe_smartmedia.c
@@ -18,15 +18,9 @@
  * Boston, MA  02110-1301  USA
  */
 
-#include <errno.h>
-#include <fcntl.h>
 #include <mtd/mtd-user.h>
-#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/udev/net/fuzz-link-parser.c b/src/udev/net/fuzz-link-parser.c
index 2833162cc12..2876580acae 100644
--- a/src/udev/net/fuzz-link-parser.c
+++ b/src/udev/net/fuzz-link-parser.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "fd-util.h"
-#include "fs-util.h"
 #include "fuzz.h"
 #include "link-config.h"
 #include "tmpfile-util.h"
diff --git a/src/udev/net/link-config-gperf.gperf b/src/udev/net/link-config-gperf.gperf
index d7cb07ba00f..ef3ebf41cd5 100644
--- a/src/udev/net/link-config-gperf.gperf
+++ b/src/udev/net/link-config-gperf.gperf
@@ -5,6 +5,7 @@ _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"")
 _Pragma("GCC diagnostic ignored \"-Wzero-as-null-pointer-constant\"")
 #endif
 #include <stddef.h>
+#include "condition.h"
 #include "conf-parser.h"
 #include "ethtool-util.h"
 #include "link-config.h"
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 85a2d8490ab..7437c9561f3 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/netdevice.h>
-#include <netinet/ether.h>
+#include <net/if_arp.h>
 #include <unistd.h>
 
 #include "sd-device.h"
@@ -9,29 +9,34 @@
 
 #include "alloc-util.h"
 #include "arphrd-util.h"
+#include "condition.h"
 #include "conf-files.h"
 #include "conf-parser.h"
-#include "constants.h"
+#include "cpu-set-util.h"
 #include "creds-util.h"
 #include "device-private.h"
 #include "device-util.h"
 #include "escape.h"
+#include "ether-addr-util.h"
 #include "ethtool-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "hashmap.h"
 #include "link-config.h"
 #include "log-link.h"
 #include "memory-util.h"
 #include "net-condition.h"
+#include "netif-naming-scheme.h"
 #include "netif-sriov.h"
 #include "netif-util.h"
 #include "netlink-util.h"
 #include "network-util.h"
 #include "parse-util.h"
-#include "path-lookup.h"
 #include "path-util.h"
 #include "proc-cmdline.h"
 #include "random-util.h"
+#include "socket-util.h"
 #include "specifier.h"
 #include "stat-util.h"
 #include "string-table.h"
diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h
index dcbc61359c5..4c50b13ec02 100644
--- a/src/udev/net/link-config.h
+++ b/src/udev/net/link-config.h
@@ -2,16 +2,12 @@
 #pragma once
 
 #include "sd-device.h"
-#include "sd-netlink.h"
 
-#include "condition.h"
-#include "conf-parser.h"
-#include "cpu-set-util.h"
+#include "ether-addr-util.h"
 #include "ethtool-util.h"
-#include "hashmap.h"
+#include "forward.h"
 #include "list.h"
 #include "net-condition.h"
-#include "netif-naming-scheme.h"
 
 typedef struct LinkConfigContext LinkConfigContext;
 typedef struct LinkConfig LinkConfig;
diff --git a/src/udev/scsi_id/scsi.h b/src/udev/scsi_id/scsi.h
index 1b535ea3fe7..ebb8ae9008b 100644
--- a/src/udev/scsi_id/scsi.h
+++ b/src/udev/scsi_id/scsi.h
@@ -4,7 +4,6 @@
 /* Copyright (C) IBM Corp. 2003 */
 
 #include <scsi/scsi.h>
-#include <sys/types.h>
 
 struct scsi_ioctl_command {
         unsigned inlen;        /* excluding scsi command length */
diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
index 6ef93a6b9c2..5216455f41d 100644
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -5,15 +5,9 @@
  */
 
 #include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <getopt.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdbool.h>
 #include <stdio.h>
-#include <sys/stat.h>
-#include <unistd.h>
+#include <stdlib.h>
 
 #include "alloc-util.h"
 #include "build.h"
@@ -21,7 +15,6 @@
 #include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "parse-util.h"
 #include "scsi_id.h"
 #include "string-util.h"
 #include "strv.h"
diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c
index 2d8792df247..39937006154 100644
--- a/src/udev/scsi_id/scsi_serial.c
+++ b/src/udev/scsi_id/scsi_serial.c
@@ -5,24 +5,17 @@
  * Author: Patrick Mansfield<patmans@us.ibm.com>
  */
 
-#include <errno.h>
 #include <fcntl.h>
-#include <inttypes.h>
 #include <linux/bsg.h>
-#include <linux/types.h>
 #include <scsi/scsi.h>
 #include <scsi/sg.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "devnum-util.h"
 #include "log.h"
-#include "memory-util.h"
 #include "random-util.h"
 #include "scsi.h"
 #include "scsi_id.h"
diff --git a/src/udev/test-udev-builtin.c b/src/udev/test-udev-builtin.c
index 265776d997e..2ce7f196fdc 100644
--- a/src/udev/test-udev-builtin.c
+++ b/src/udev/test-udev-builtin.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "log.h"
 #include "tests.h"
 #include "udev-builtin.h"
 
diff --git a/src/udev/test-udev-rule-runner.c b/src/udev/test-udev-rule-runner.c
index 3371892ec40..a78ab5365af 100644
--- a/src/udev/test-udev-rule-runner.c
+++ b/src/udev/test-udev-rule-runner.c
@@ -3,12 +3,7 @@
   Copyright © 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
 ***/
 
-#include <errno.h>
-#include <sched.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <sys/mount.h>
-#include <sys/signalfd.h>
 #include <unistd.h>
 
 #include "device-private.h"
@@ -24,6 +19,7 @@
 #include "signal-util.h"
 #include "string-util.h"
 #include "tests.h"
+#include "time-util.h"
 #include "udev-event.h"
 #include "udev-rules.h"
 #include "udev-spawn.h"
diff --git a/src/udev/test-udev-spawn.c b/src/udev/test-udev-spawn.c
index e4c8f0c70d1..73cfe7abc26 100644
--- a/src/udev/test-udev-spawn.c
+++ b/src/udev/test-udev-spawn.c
@@ -1,8 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdlib.h>
+
+#include "sd-device.h"
+
+#include "alloc-util.h"
 #include "mountpoint-util.h"
 #include "path-util.h"
 #include "signal-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "tests.h"
 #include "udev-event.h"
diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
index 6cd738c3a5f..c5d3e89c778 100644
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -9,17 +9,12 @@
 #include <valgrind/memcheck.h>
 #endif
 
-#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <linux/loop.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 
-#include "sd-id128.h"
-
 #include "alloc-util.h"
 #include "blkid-util.h"
 #include "blockdev-util.h"
@@ -28,8 +23,8 @@
 #include "efi-loader.h"
 #include "errno-util.h"
 #include "fd-util.h"
-#include "gpt.h"
 #include "initrd-util.h"
+#include "gpt.h"
 #include "parse-util.h"
 #include "string-util.h"
 #include "strv.h"
diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c
index 118b934b767..7a9dc7747c8 100644
--- a/src/udev/udev-builtin-btrfs.c
+++ b/src/udev/udev-builtin-btrfs.c
@@ -2,15 +2,12 @@
 
 #include <fcntl.h>
 #include <linux/btrfs.h>
-#include <stdlib.h>
 #include <sys/ioctl.h>
 
 #include "device-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
-#include "missing_fs.h"
 #include "string-util.h"
-#include "strxcpyx.h"
 #include "udev-builtin.h"
 
 static int builtin_btrfs(UdevEvent *event, int argc, char *argv[]) {
diff --git a/src/udev/udev-builtin-dissect_image.c b/src/udev/udev-builtin-dissect_image.c
index 5d6b0d8fce3..02aa8fcbea9 100644
--- a/src/udev/udev-builtin-dissect_image.c
+++ b/src/udev/udev-builtin-dissect_image.c
@@ -1,15 +1,19 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include <sys/file.h>
+
 #include "alloc-util.h"
 #include "blockdev-util.h"
 #include "device-util.h"
 #include "dissect-image.h"
-#include "fd-util.h"
+#include "errno-util.h"
 #include "hexdecoct.h"
 #include "image-policy.h"
 #include "initrd-util.h"
 #include "loop-util.h"
 #include "proc-cmdline.h"
+#include "string-util.h"
+#include "strv.h"
 #include "udev-builtin.h"
 
 static ImagePolicy *arg_image_policy = NULL;
diff --git a/src/udev/udev-builtin-factory_reset.c b/src/udev/udev-builtin-factory_reset.c
index ffa06747720..4c4db72d3da 100644
--- a/src/udev/udev-builtin-factory_reset.c
+++ b/src/udev/udev-builtin-factory_reset.c
@@ -2,6 +2,7 @@
 
 #include "device-util.h"
 #include "factory-reset.h"
+#include "string-util.h"
 #include "udev-builtin.h"
 
 /* Sometimes it is relevant in udev rules to know whether factory reset is currently in effect or not. Report
diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c
index 6e82ad8c755..082af2e6031 100644
--- a/src/udev/udev-builtin-hwdb.c
+++ b/src/udev/udev-builtin-hwdb.c
@@ -1,10 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fnmatch.h>
 #include <getopt.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "sd-hwdb.h"
 
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
index f8ac6d55179..ecb2afe0488 100644
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -6,12 +6,8 @@
  * Copyright © 2014 Carlos Garnacho <carlosg@gnome.org>
  */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <linux/input.h>
-#include <linux/limits.h>
-#include <stdarg.h>
-#include <unistd.h>
 
 #include "device-util.h"
 #include "fd-util.h"
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
index e17fcbe74c8..a48a5500d14 100644
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <linux/input.h>
 #include <stdlib.h>
diff --git a/src/udev/udev-builtin-kmod.c b/src/udev/udev-builtin-kmod.c
index 33031f7f402..4fe37971eea 100644
--- a/src/udev/udev-builtin-kmod.c
+++ b/src/udev/udev-builtin-kmod.c
@@ -5,11 +5,6 @@
  * Copyright © 2011 ProFUSION embedded systems
  */
 
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "device-util.h"
 #include "module-util.h"
 #include "string-util.h"
diff --git a/src/udev/udev-builtin-net_driver.c b/src/udev/udev-builtin-net_driver.c
index 832ed6fdee7..2193243a977 100644
--- a/src/udev/udev-builtin-net_driver.c
+++ b/src/udev/udev-builtin-net_driver.c
@@ -6,8 +6,6 @@
 #include "errno-util.h"
 #include "ethtool-util.h"
 #include "fd-util.h"
-#include "log.h"
-#include "string-util.h"
 #include "udev-builtin.h"
 
 static int builtin_net_driver_set_driver(UdevEvent *event, int argc, char **argv) {
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index a5ace58db63..e3d8a3175d8 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -12,18 +12,13 @@
  * When the code here is changed, man/systemd.net-naming-scheme.xml must be updated too.
  */
 
-#include <errno.h>
-#include <fcntl.h>
 #include <linux/if.h>
 #include <linux/if_arp.h>
 #include <linux/netdevice.h>
 #include <linux/pci_regs.h>
-#include <net/if.h>
-#include <stdarg.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "chase.h"
 #include "device-private.h"
 #include "device-util.h"
 #include "dirent-util.h"
@@ -33,11 +28,8 @@
 #include "glyph-util.h"
 #include "netif-naming-scheme.h"
 #include "parse-util.h"
-#include "proc-cmdline.h"
 #include "stdio-util.h"
 #include "string-util.h"
-#include "strv.h"
-#include "strxcpyx.h"
 #include "udev-builtin.h"
 
 #define ONBOARD_14BIT_INDEX_MAX ((1U << 14) - 1)
diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c
index 0d59a72a062..1277d0fb45c 100644
--- a/src/udev/udev-builtin-net_setup_link.c
+++ b/src/udev/udev-builtin-net_setup_link.c
@@ -1,13 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "alloc-util.h"
 #include "device-private.h"
 #include "device-util.h"
-#include "errno-util.h"
 #include "link-config.h"
 #include "log.h"
-#include "string-util.h"
-#include "strv.h"
+#include "netif-naming-scheme.h"
 #include "udev-builtin.h"
 
 static LinkConfigContext *ctx = NULL;
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index 27897b461ff..4db20e4a13f 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -5,14 +5,10 @@
  * Logic based on Hannes Reinecke's shell script.
  */
 
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <getopt.h>
 #include <linux/usb/ch11.h>
-#include <stdarg.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <stdlib.h>
 
 #include "alloc-util.h"
 #include "device-private.h"
@@ -21,10 +17,8 @@
 #include "fd-util.h"
 #include "parse-util.h"
 #include "string-util.h"
-#include "strv.h"
 #include "sysexits.h"
 #include "udev-builtin.h"
-#include "udev-util.h"
 
 _printf_(2,3)
 static void path_prepend(char **path, const char *fmt, ...) {
diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
index 91d231c24e1..80597ea89ee 100644
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -6,14 +6,10 @@
  *   Author: Hannes Reinecke <hare@suse.de>
  */
 
-#include <ctype.h>
-#include <errno.h>
 #include <fcntl.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <unistd.h>
 
-#include "alloc-util.h"
 #include "device-nodes.h"
 #include "device-util.h"
 #include "fd-util.h"
diff --git a/src/udev/udev-builtin.h b/src/udev/udev-builtin.h
index 1467f36cd6d..62d43f8c795 100644
--- a/src/udev/udev-builtin.h
+++ b/src/udev/udev-builtin.h
@@ -1,13 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include <stdbool.h>
-
-#include "sd-device.h"
-#include "sd-netlink.h"
-
-#include "macro.h"
-#include "udev-def.h"
+#include "forward.h"
 #include "udev-event.h"
 
 typedef struct UdevBuiltin {
diff --git a/src/udev/udev-config.c b/src/udev/udev-config.c
index ef0ee0abd69..600803f93cc 100644
--- a/src/udev/udev-config.c
+++ b/src/udev/udev-config.c
@@ -1,20 +1,24 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <getopt.h>
-#include <unistd.h>
+#include <stdlib.h>
 
 #include "conf-parser.h"
 #include "cpu-set-util.h"
 #include "daemon-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "hashmap.h"
 #include "limits-util.h"
 #include "parse-util.h"
 #include "pretty-print.h"
 #include "proc-cmdline.h"
 #include "serialize.h"
 #include "signal-util.h"
+#include "string-util.h"
+#include "strv.h"
 #include "syslog-util.h"
+#include "time-util.h"
 #include "udev-config.h"
 #include "udev-manager.h"
 #include "udev-rules.h"
diff --git a/src/udev/udev-config.h b/src/udev/udev-config.h
index 127b3b9a1be..61fc693ca19 100644
--- a/src/udev/udev-config.h
+++ b/src/udev/udev-config.h
@@ -1,15 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include <stdbool.h>
-
-#include "time-util.h"
 #include "udev-def.h"
+#include "udev-forward.h"
 
 extern bool arg_daemonize;
 
-typedef struct Manager Manager;
-
 typedef struct UdevConfig {
         int log_level;
         ResolveNameTiming resolve_name_timing;
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 10dd48164a2..5cde769b1f6 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <poll.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/un.h>
 #include <unistd.h>
 
diff --git a/src/udev/udev-ctrl.h b/src/udev/udev-ctrl.h
index 0339d33d576..efd500fd50c 100644
--- a/src/udev/udev-ctrl.h
+++ b/src/udev/udev-ctrl.h
@@ -1,13 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "sd-event.h"
-
-#include "macro.h"
-#include "memory-util.h"
-#include "time-util.h"
-
-typedef struct UdevCtrl UdevCtrl;
+#include "udev-forward.h"
 
 typedef enum UdevCtrlMessageType {
         _UDEV_CTRL_END_MESSAGES,
diff --git a/src/udev/udev-def.h b/src/udev/udev-def.h
index d744f959ae9..836dd704546 100644
--- a/src/udev/udev-def.h
+++ b/src/udev/udev-def.h
@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include <errno.h>
-
 #include "env-util.h"
+#include "udev-forward.h"
 
 #define UDEV_NAME_SIZE   512
 #define UDEV_PATH_SIZE  1024
diff --git a/src/udev/udev-dump.c b/src/udev/udev-dump.c
index accca6df7f6..d5e420d120b 100644
--- a/src/udev/udev-dump.c
+++ b/src/udev/udev-dump.c
@@ -6,9 +6,9 @@
 #include "device-util.h"
 #include "devnum-util.h"
 #include "format-util.h"
-#include "fs-util.h"
+#include "hashmap.h"
 #include "json-util.h"
-#include "parse-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "udev-builtin.h"
 #include "udev-dump.h"
diff --git a/src/udev/udev-dump.h b/src/udev/udev-dump.h
index f64499b6531..dd58999cd97 100644
--- a/src/udev/udev-dump.h
+++ b/src/udev/udev-dump.h
@@ -1,11 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include <stdio.h>
-
-#include "sd-json.h"
-
-typedef struct UdevEvent UdevEvent;
+#include "udev-forward.h"
 
 void event_cache_written_sysattr(UdevEvent *event, const char *attr, const char *value);
 void event_cache_written_sysctl(UdevEvent *event, const char *attr, const char *value);
diff --git a/src/udev/udev-error.c b/src/udev/udev-error.c
index ad3a03384a5..b7cadbd9a49 100644
--- a/src/udev/udev-error.c
+++ b/src/udev/udev-error.c
@@ -16,7 +16,7 @@ int device_add_errno(sd_device *dev, int error) {
         if (error == 0)
                 return 0;
 
-        error = abs(error);
+        error = ABS(error);
 
         r = device_add_property(dev, "UDEV_WORKER_FAILED", "1");
         RET_GATHER(r, device_add_propertyf(dev, "UDEV_WORKER_ERRNO", "%i", error));
diff --git a/src/udev/udev-error.h b/src/udev/udev-error.h
index bc38004ea18..96f9134e68e 100644
--- a/src/udev/udev-error.h
+++ b/src/udev/udev-error.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "sd-device.h"
+#include "forward.h"
 
 int device_add_errno(sd_device *dev, int error);
 int device_add_exit_status(sd_device *dev, int status);
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index d8bdf835b21..2cc6c04a2c5 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -1,15 +1,19 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "sd-netlink.h"
+
 #include "alloc-util.h"
 #include "device-internal.h"
 #include "device-private.h"
 #include "device-util.h"
-#include "fs-util.h"
+#include "hashmap.h"
 #include "netif-naming-scheme.h"
 #include "netlink-util.h"
 #include "path-util.h"
+#include "socket-util.h"
 #include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 #include "udev-event.h"
 #include "udev-node.h"
 #include "udev-rules.h"
diff --git a/src/udev/udev-event.h b/src/udev/udev-event.h
index d18fb0978bf..61915ecf602 100644
--- a/src/udev/udev-event.h
+++ b/src/udev/udev-event.h
@@ -5,20 +5,8 @@
  * Copyright © 2003 Greg Kroah-Hartman <greg@kroah.com>
  */
 
-#include <stdbool.h>
-#include <stddef.h>
-
-#include "sd-device.h"
-#include "sd-netlink.h"
-
-#include "hashmap.h"
-#include "macro.h"
-#include "time-util.h"
 #include "udev-def.h"
-#include "user-util.h"
-
-typedef struct UdevRules UdevRules;
-typedef struct UdevWorker UdevWorker;
+#include "udev-forward.h"
 
 typedef struct UdevEvent {
         unsigned n_ref;
diff --git a/src/udev/udev-format.c b/src/udev/udev-format.c
index 8da68ea86b8..d670ee129fd 100644
--- a/src/udev/udev-format.c
+++ b/src/udev/udev-format.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include <sys/sysmacros.h>
+
 #include "alloc-util.h"
 #include "device-util.h"
 #include "errno-util.h"
diff --git a/src/udev/udev-format.h b/src/udev/udev-format.h
index 9914dc03b2d..918b497c0b5 100644
--- a/src/udev/udev-format.h
+++ b/src/udev/udev-format.h
@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include <stdbool.h>
-#include <stddef.h>
-
-typedef struct UdevEvent UdevEvent;
+#include "udev-forward.h"
 
 #define UDEV_ALLOWED_CHARS_INPUT        "/ $%?,"
 
diff --git a/src/udev/udev-forward.h b/src/udev/udev-forward.h
new file mode 100644
index 00000000000..3d0079f1833
--- /dev/null
+++ b/src/udev/udev-forward.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+#pragma once
+
+#include "forward.h" /* IWYU pragma: export */
+
+typedef struct UdevCtrl UdevCtrl;
+typedef struct UdevEvent UdevEvent;
+typedef struct Manager Manager;
+typedef struct Event Event;
+typedef struct UdevRules UdevRules;
+typedef struct Worker Worker;
+typedef struct UdevWorker UdevWorker;
+typedef struct UdevRuleFile UdevRuleFile;
diff --git a/src/udev/udev-manager-ctrl.h b/src/udev/udev-manager-ctrl.h
index 507072ce278..270a63e861b 100644
--- a/src/udev/udev-manager-ctrl.h
+++ b/src/udev/udev-manager-ctrl.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-typedef struct Manager Manager;
+#include "udev-forward.h"
 
 int manager_init_ctrl(Manager *manager, int fd);
 int manager_start_ctrl(Manager *manager);
diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c
index 8d0d6d58586..f92a186dd4a 100644
--- a/src/udev/udev-manager.c
+++ b/src/udev/udev-manager.c
@@ -1,36 +1,41 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include <poll.h>
+#include <stdlib.h>
+
+#include "sd-varlink.h"
+
 #include "cgroup-util.h"
 #include "common-signal.h"
 #include "daemon-util.h"
 #include "device-monitor-private.h"
 #include "device-private.h"
 #include "device-util.h"
-#include "errno-list.h"
+#include "errno-util.h"
 #include "event-util.h"
 #include "fd-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "hashmap.h"
 #include "io-util.h"
-#include "iovec-util.h"
 #include "list.h"
-#include "mkdir.h"
 #include "notify-recv.h"
+#include "pidref.h"
+#include "prioq.h"
 #include "process-util.h"
 #include "selinux-util.h"
+#include "set.h"
 #include "signal-util.h"
 #include "socket-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "syslog-util.h"
+#include "time-util.h"
 #include "udev-builtin.h"
 #include "udev-config.h"
 #include "udev-ctrl.h"
 #include "udev-error.h"
-#include "udev-event.h"
 #include "udev-manager.h"
 #include "udev-manager-ctrl.h"
-#include "udev-node.h"
 #include "udev-rules.h"
 #include "udev-spawn.h"
 #include "udev-trace.h"
diff --git a/src/udev/udev-manager.h b/src/udev/udev-manager.h
index d59ab0eb368..2a384dcfaa2 100644
--- a/src/udev/udev-manager.h
+++ b/src/udev/udev-manager.h
@@ -1,20 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include <stdbool.h>
-
-#include "sd-device.h"
 #include "sd-event.h"
-#include "sd-varlink.h"
 
-#include "hashmap.h"
+#include "forward.h"
 #include "list.h"
-#include "macro.h"
-#include "prioq.h"
-#include "time-util.h"
 #include "udev-config.h"
-#include "udev-ctrl.h"
-#include "udev-def.h"
+#include "udev-forward.h"
 
 /* This should have a higher priority than the device monitor and inotify watch, to make device monitor and
  * inotify event source stopped as soon as possible when the signal is received. Otherwise, we may continue
@@ -43,10 +35,6 @@
 /* The event is intended to trigger the post-event source, hence can be the lowest priority. */
 #define EVENT_PRIORITY_REQUEUE_EVENT  (SD_EVENT_PRIORITY_NORMAL + 3)
 
-typedef struct Event Event;
-typedef struct UdevRules UdevRules;
-typedef struct Worker Worker;
-
 typedef struct Manager {
         sd_event *event;
         Hashmap *workers;
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index 957f028f171..5f165b5107a 100644
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <sys/file.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "sd-id128.h"
 
@@ -15,14 +17,15 @@
 #include "fileio.h"
 #include "format-util.h"
 #include "fs-util.h"
+#include "hashmap.h"
 #include "hexdecoct.h"
 #include "label-util.h"
 #include "mkdir-label.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "selinux-util.h"
+#include "siphash24.h"
 #include "smack-util.h"
-#include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "udev-node.h"
diff --git a/src/udev/udev-node.h b/src/udev/udev-node.h
index 86a829545a5..8a0a72f0e87 100644
--- a/src/udev/udev-node.h
+++ b/src/udev/udev-node.h
@@ -1,12 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include <stdbool.h>
-#include <sys/types.h>
-
-#include "sd-device.h"
-
-#include "hashmap.h"
+#include "forward.h"
 
 int udev_node_apply_permissions(
                 sd_device *dev,
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 4555219765c..74787b72ba3 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -2,9 +2,11 @@
 
 #include <ctype.h>
 #include <fnmatch.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "architecture.h"
+#include "chase.h"
 #include "conf-files.h"
 #include "conf-parser.h"
 #include "confidential-virt.h"
@@ -12,6 +14,7 @@
 #include "device-private.h"
 #include "device-util.h"
 #include "dirent-util.h"
+#include "errno-util.h"
 #include "escape.h"
 #include "extract-word.h"
 #include "fd-util.h"
@@ -19,9 +22,9 @@
 #include "format-util.h"
 #include "fs-util.h"
 #include "glob-util.h"
+#include "hashmap.h"
 #include "list.h"
 #include "memstream-util.h"
-#include "mkdir.h"
 #include "netif-naming-scheme.h"
 #include "nulstr-util.h"
 #include "parse-util.h"
@@ -30,6 +33,7 @@
 #include "socket-util.h"
 #include "stat-util.h"
 #include "string-table.h"
+#include "string-util.h"
 #include "strv.h"
 #include "strxcpyx.h"
 #include "sysctl-util.h"
@@ -44,6 +48,8 @@
 #include "udev-trace.h"
 #include "udev-util.h"
 #include "udev-worker.h"
+#include "user-record.h"
+#include "user-util.h"
 #include "userdb.h"
 #include "virt.h"
 
diff --git a/src/udev/udev-rules.h b/src/udev/udev-rules.h
index 62dac5ba73b..d0ed2adf00e 100644
--- a/src/udev/udev-rules.h
+++ b/src/udev/udev-rules.h
@@ -1,14 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "alloc-util.h"
-#include "hashmap.h"
-#include "time-util.h"
 #include "udev-def.h"
-
-typedef struct UdevRuleFile UdevRuleFile;
-typedef struct UdevRules UdevRules;
-typedef struct UdevEvent UdevEvent;
+#include "udev-forward.h"
 
 int udev_rule_parse_value(char *str, char **ret_value, char **ret_endpos, bool *ret_is_case_insensitive);
 int udev_rules_parse_file(UdevRules *rules, const char *filename, bool extra_checks, UdevRuleFile **ret);
diff --git a/src/udev/udev-spawn.c b/src/udev/udev-spawn.c
index 0e3ff2e1046..bbbbd4e2fc8 100644
--- a/src/udev/udev-spawn.c
+++ b/src/udev/udev-spawn.c
@@ -9,11 +9,15 @@
 #include "exec-util.h"
 #include "extract-word.h"
 #include "fd-util.h"
+#include "format-util.h"
+#include "hashmap.h"
 #include "path-util.h"
+#include "pidref.h"
 #include "process-util.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 #include "udev-builtin.h"
 #include "udev-event.h"
 #include "udev-spawn.h"
diff --git a/src/udev/udev-spawn.h b/src/udev/udev-spawn.h
index 6b22b68b24f..dceab857100 100644
--- a/src/udev/udev-spawn.h
+++ b/src/udev/udev-spawn.h
@@ -1,17 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include <stdbool.h>
-#include <stddef.h>
-
-#include "macro.h"
-#include "time-util.h"
+#include "udev-forward.h"
 
 #define READ_END  0
 #define WRITE_END 1
 
-typedef struct UdevEvent UdevEvent;
-
 int udev_event_spawn(
                 UdevEvent *event,
                 bool accept_failure,
diff --git a/src/udev/udev-trace.h b/src/udev/udev-trace.h
index 5e943908542..a8ec6dabe99 100644
--- a/src/udev/udev-trace.h
+++ b/src/udev/udev-trace.h
@@ -8,6 +8,7 @@
 #include "device-private.h"
 #include "device-util.h"
 #include "errno-util.h"
+#include "forward.h"
 
 /* Each trace point can have different number of additional arguments. Note that when the macro is used only
  * additional arguments are listed in the macro invocation!
diff --git a/src/udev/udev-varlink.c b/src/udev/udev-varlink.c
index 5c0a97be3da..5228d3512c9 100644
--- a/src/udev/udev-varlink.c
+++ b/src/udev/udev-varlink.c
@@ -2,6 +2,7 @@
 
 #include "json-util.h"
 #include "log.h"
+#include "string-util.h"
 #include "strv.h"
 #include "udev-manager.h"
 #include "udev-varlink.h"
diff --git a/src/udev/udev-varlink.h b/src/udev/udev-varlink.h
index 759a4460ab6..080f7c95a75 100644
--- a/src/udev/udev-varlink.h
+++ b/src/udev/udev-varlink.h
@@ -1,11 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-varlink.h"
-
-#include "time-util.h"
-
-typedef struct Manager Manager;
+#include "udev-forward.h"
 
 int manager_start_varlink_server(Manager *manager);
 int udev_varlink_connect(sd_varlink **ret, usec_t timeout);
diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c
index 01f16db63c0..93d51d461b8 100644
--- a/src/udev/udev-watch.c
+++ b/src/udev/udev-watch.c
@@ -4,6 +4,9 @@
  * Copyright © 2009 Scott James Remnant <scott@netsplit.com>
  */
 
+#include <sys/signalfd.h>
+#include <sys/wait.h>
+
 #include "alloc-util.h"
 #include "blockdev-util.h"
 #include "daemon-util.h"
@@ -12,10 +15,11 @@
 #include "errno-util.h"
 #include "event-util.h"
 #include "fd-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "inotify-util.h"
-#include "mkdir.h"
 #include "parse-util.h"
+#include "pidref.h"
 #include "process-util.h"
 #include "rm-rf.h"
 #include "set.h"
diff --git a/src/udev/udev-watch.h b/src/udev/udev-watch.h
index 71945e06af0..821f5ca20b5 100644
--- a/src/udev/udev-watch.h
+++ b/src/udev/udev-watch.h
@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "sd-device.h"
-
-typedef struct Manager Manager;
-typedef struct UdevWorker UdevWorker;
+#include "udev-forward.h"
 
 void udev_watch_dump(void);
 
diff --git a/src/udev/udev-worker.c b/src/udev/udev-worker.c
index 1f00606d87c..4bcadfa1e75 100644
--- a/src/udev/udev-worker.c
+++ b/src/udev/udev-worker.c
@@ -1,24 +1,22 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include <linux/fs.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
-#include <sys/mount.h>
 
 #include "sd-daemon.h"
+#include "sd-event.h"
+#include "sd-netlink.h"
 
-#include "alloc-util.h"
 #include "blockdev-util.h"
-#include "common-signal.h"
 #include "device-monitor-private.h"
 #include "device-private.h"
 #include "device-util.h"
+#include "errno-list.h"
 #include "errno-util.h"
 #include "fd-util.h"
-#include "path-util.h"
+#include "hashmap.h"
 #include "process-util.h"
-#include "signal-util.h"
-#include "string-util.h"
-#include "strv.h"
 #include "udev-error.h"
 #include "udev-event.h"
 #include "udev-rules.h"
diff --git a/src/udev/udev-worker.h b/src/udev/udev-worker.h
index 356084194e0..fa67d60b5fc 100644
--- a/src/udev/udev-worker.h
+++ b/src/udev/udev-worker.h
@@ -1,22 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include <stdbool.h>
-
-#include "sd-device.h"
-#include "sd-event.h"
-#include "sd-netlink.h"
-
-#include "errno-list.h"
-#include "hashmap.h"
-#include "time-util.h"
 #include "udev-config.h"
+#include "udev-forward.h"
 
 #define DEFAULT_WORKER_TIMEOUT_USEC (3 * USEC_PER_MINUTE)
 #define MIN_WORKER_TIMEOUT_USEC     (1 * USEC_PER_MSEC)
 
-typedef struct UdevRules UdevRules;
-
 typedef struct UdevWorker {
         sd_event *event;
         sd_netlink *rtnl;
diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c
index 8b665366177..c49524a4fea 100644
--- a/src/udev/udevadm-control.c
+++ b/src/udev/udevadm-control.c
@@ -1,19 +1,14 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include <errno.h>
 #include <getopt.h>
-#include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "creds-util.h"
 #include "errno-util.h"
 #include "log.h"
 #include "parse-argument.h"
 #include "parse-util.h"
-#include "process-util.h"
 #include "static-destruct.h"
 #include "strv.h"
 #include "syslog-util.h"
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index d5a4b39cc8f..b84ebea162f 100644
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
+#include <stdio.h>
 
-#include "assert-util.h"
 #include "hwdb-util.h"
 #include "log.h"
 #include "udevadm.h"
diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
index f505680dbd7..ccfc83cce4e 100644
--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
@@ -1,12 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <ctype.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <stddef.h>
 #include <stdio.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 #include <unistd.h>
 
 #include "sd-device.h"
@@ -17,10 +16,8 @@
 #include "device-enumerator-private.h"
 #include "device-private.h"
 #include "device-util.h"
-#include "devnum-util.h"
 #include "dirent-util.h"
 #include "errno-util.h"
-#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "glyph-util.h"
@@ -31,7 +28,7 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
-#include "terminal-util.h"
+#include "time-util.h"
 #include "udev-util.h"
 #include "udevadm.h"
 #include "udevadm-util.h"
diff --git a/src/udev/udevadm-lock.c b/src/udev/udevadm-lock.c
index 9b495fda3c4..00f4deafd68 100644
--- a/src/udev/udevadm-lock.c
+++ b/src/udev/udevadm-lock.c
@@ -1,23 +1,23 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <getopt.h>
-#include <stdlib.h>
 #include <sys/file.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "blockdev-util.h"
-#include "btrfs-util.h"
 #include "device-util.h"
 #include "fd-util.h"
 #include "fdset.h"
+#include "hash-funcs.h"
 #include "lock-util.h"
-#include "main-func.h"
-#include "parse-util.h"
 #include "path-util.h"
+#include "pidref.h"
 #include "pretty-print.h"
 #include "process-util.h"
 #include "signal-util.h"
 #include "sort-util.h"
+#include "static-destruct.h"
 #include "strv.h"
 #include "time-util.h"
 #include "udevadm.h"
diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c
index b411d45b6db..95fe65ff9d1 100644
--- a/src/udev/udevadm-monitor.c
+++ b/src/udev/udevadm-monitor.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include <errno.h>
 #include <getopt.h>
 
 #include "sd-device.h"
@@ -10,11 +9,9 @@
 #include "device-monitor-private.h"
 #include "device-private.h"
 #include "device-util.h"
-#include "fd-util.h"
 #include "format-util.h"
 #include "hashmap.h"
 #include "set.h"
-#include "signal-util.h"
 #include "static-destruct.h"
 #include "string-util.h"
 #include "time-util.h"
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index 9d6ec684f3d..ff9cd5f02c0 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -15,6 +15,7 @@
 #include "alloc-util.h"
 #include "bus-util.h"
 #include "path-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "time-util.h"
 #include "udev-util.h"
diff --git a/src/udev/udevadm-test-builtin.c b/src/udev/udevadm-test-builtin.c
index a75e2432477..a1ad9cb3203 100644
--- a/src/udev/udevadm-test-builtin.c
+++ b/src/udev/udevadm-test-builtin.c
@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include <errno.h>
 #include <getopt.h>
-#include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "device-private.h"
 #include "device-util.h"
diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c
index 7b5fdb59ce0..6380aec36df 100644
--- a/src/udev/udevadm-test.c
+++ b/src/udev/udevadm-test.c
@@ -8,7 +8,9 @@
 #include <stdio.h>
 
 #include "sd-device.h"
+#include "sd-json.h"
 
+#include "alloc-util.h"
 #include "device-private.h"
 #include "log.h"
 #include "parse-argument.h"
diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c
index 94a3a4037a9..cfc157ce279 100644
--- a/src/udev/udevadm-trigger.c
+++ b/src/udev/udevadm-trigger.c
@@ -1,25 +1,21 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include <errno.h>
 #include <getopt.h>
+#include <stdio.h>
 
 #include "sd-device.h"
 #include "sd-event.h"
 
+#include "alloc-util.h"
 #include "device-enumerator-private.h"
 #include "device-private.h"
 #include "device-util.h"
-#include "fd-util.h"
-#include "fileio.h"
 #include "id128-util.h"
-#include "parse-util.h"
-#include "path-util.h"
-#include "process-util.h"
 #include "set.h"
 #include "static-destruct.h"
 #include "string-table.h"
-#include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 #include "udevadm.h"
 #include "udevadm-util.h"
 #include "virt.h"
diff --git a/src/udev/udevadm-util.c b/src/udev/udevadm-util.c
index e3ea2879cf0..09fb24f6e5b 100644
--- a/src/udev/udevadm-util.c
+++ b/src/udev/udevadm-util.c
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include <errno.h>
+#include <getopt.h>
+
+#include "sd-bus.h"
 
 #include "alloc-util.h"
 #include "bus-error.h"
@@ -9,14 +11,19 @@
 #include "conf-files.h"
 #include "constants.h"
 #include "device-private.h"
+#include "errno-util.h"
+#include "extract-word.h"
 #include "log.h"
 #include "path-util.h"
+#include "stat-util.h"
 #include "string-table.h"
+#include "string-util.h"
 #include "strv.h"
 #include "udev-ctrl.h"
 #include "udev-rules.h"
 #include "udev-varlink.h"
 #include "udevadm-util.h"
+#include "unit-def.h"
 #include "unit-name.h"
 #include "varlink-util.h"
 
diff --git a/src/udev/udevadm-util.h b/src/udev/udevadm-util.h
index c75a2c39300..9b41109df86 100644
--- a/src/udev/udevadm-util.h
+++ b/src/udev/udevadm-util.h
@@ -3,7 +3,7 @@
 
 #include "sd-device.h"
 
-#include "time-util.h"
+#include "forward.h"
 #include "udev-def.h"
 
 int find_device(const char *id, const char *prefix, sd_device **ret);
diff --git a/src/udev/udevadm-verify.c b/src/udev/udevadm-verify.c
index ca2e0e472cf..ac46a56463d 100644
--- a/src/udev/udevadm-verify.c
+++ b/src/udev/udevadm-verify.c
@@ -1,12 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include <errno.h>
 #include <getopt.h>
-#include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
 
+#include "alloc-util.h"
 #include "errno-util.h"
 #include "log.h"
 #include "parse-argument.h"
diff --git a/src/udev/udevadm-wait.c b/src/udev/udevadm-wait.c
index c93039895b6..70b14a7e91e 100644
--- a/src/udev/udevadm-wait.c
+++ b/src/udev/udevadm-wait.c
@@ -1,24 +1,23 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <getopt.h>
+#include <stdio.h>
+#include <sys/inotify.h>
 #include <unistd.h>
 
 #include "sd-event.h"
 
-#include "alloc-util.h"
-#include "chase.h"
 #include "device-monitor-private.h"
 #include "device-util.h"
-#include "errno-util.h"
 #include "event-util.h"
-#include "fd-util.h"
 #include "fs-util.h"
-#include "inotify-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "static-destruct.h"
 #include "string-table.h"
+#include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 #include "udev-util.h"
 #include "udevadm.h"
 
diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
index c9e9a354a88..3a91d14ef8e 100644
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -1,17 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include <errno.h>
 #include <getopt.h>
-#include <stddef.h>
 #include <stdio.h>
 
 #include "alloc-util.h"
 #include "argv-util.h"
+#include "label-util.h"
 #include "main-func.h"
 #include "pretty-print.h"
-#include "process-util.h"
-#include "selinux-util.h"
-#include "string-util.h"
 #include "udev-util.h"
 #include "udevadm.h"
 #include "udevd.h"
@@ -89,6 +85,12 @@ static int parse_argv(int argc, char *argv[]) {
         return 1; /* work to do */
 }
 
+int print_version(void) {
+        /* Dracut relies on the version being a single integer */
+        puts(PROJECT_VERSION_STR);
+        return 0;
+}
+
 static int version_main(int argc, char *argv[], void *userdata) {
         return print_version();
 }
diff --git a/src/udev/udevadm.h b/src/udev/udevadm.h
index 665d2f46b37..58c57fee109 100644
--- a/src/udev/udevadm.h
+++ b/src/udev/udevadm.h
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include <stdio.h>
-
-#include "macro.h"
+#include "forward.h"
 
 int cat_main(int argc, char *argv[], void *userdata);
 int info_main(int argc, char *argv[], void *userdata);
@@ -18,8 +16,4 @@ int verify_main(int argc, char *argv[], void *userdata);
 int wait_main(int argc, char *argv[], void *userdata);
 int lock_main(int argc, char *argv[], void *userdata);
 
-static inline int print_version(void) {
-        /* Dracut relies on the version being a single integer */
-        puts(PROJECT_VERSION_STR);
-        return 0;
-}
+int print_version(void);
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index cf3e6632773..fd16654127e 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -5,15 +5,15 @@
  * Copyright © 2009 Scott James Remnant <scott@netsplit.com>
  */
 
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "errno-util.h"
 #include "fd-util.h"
+#include "label-util.h"
 #include "log.h"
-#include "mkdir.h"
 #include "process-util.h"
 #include "rlimit-util.h"
-#include "selinux-util.h"
 #include "terminal-util.h"
 #include "udev-config.h"
 #include "udev-manager.h"
diff --git a/src/udev/v4l_id/v4l_id.c b/src/udev/v4l_id/v4l_id.c
index 312a8233b10..6c37d7c38d6 100644
--- a/src/udev/v4l_id/v4l_id.c
+++ b/src/udev/v4l_id/v4l_id.c
@@ -3,18 +3,11 @@
  * Copyright (c) 2009 Filippo Argiolas <filippo.argiolas@gmail.com>
  */
 
-#include <ctype.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <linux/videodev2.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #include "build.h"
 #include "fd-util.h"