Merge pull request #13891 from yuwata/basic-drop-missing

tree-wide: drop missing.h

109 files changed, 89 insertions, 152 deletions

diff --git a/src/analyze/analyze-security.c b/src/analyze/analyze-security.c
index ca023ea807..18d1ce2895 100644
--- a/src/analyze/analyze-security.c
+++ b/src/analyze/analyze-security.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <sched.h>
 #include <sys/utsname.h>
 
 #include "analyze-security.h"
@@ -12,7 +11,8 @@
 #include "in-addr-util.h"
 #include "locale-util.h"
 #include "macro.h"
-#include "missing.h"
+#include "missing_capability.h"
+#include "missing_sched.h"
 #include "nulstr-util.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/basic/blockdev-util.c b/src/basic/blockdev-util.c
index 0ee14cbc0b..cff18fc62d 100644
--- a/src/basic/blockdev-util.c
+++ b/src/basic/blockdev-util.c
@@ -2,6 +2,7 @@
 
 #include <sys/stat.h>
 #include <sys/statfs.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "blockdev-util.h"
@@ -9,7 +10,7 @@
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "missing.h"
+#include "missing_magic.h"
 #include "parse-util.h"
 #include "stat-util.h"
 
diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
index 79d6a40aa9..84083b4544 100644
--- a/src/basic/cap-list.c
+++ b/src/basic/cap-list.c
@@ -8,7 +8,6 @@
 #include "cap-list.h"
 #include "extract-word.h"
 #include "macro.h"
-#include "missing.h"
 #include "parse-util.h"
 #include "util.h"
 
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 7531cca5bc..bdf3b9febd 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -27,7 +27,7 @@
 #include "log.h"
 #include "login-util.h"
 #include "macro.h"
-#include "missing.h"
+#include "missing_magic.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index de44f45f53..4bc6931b58 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -14,7 +14,6 @@
 #include "hashmap.h"
 #include "log.h"
 #include "macro.h"
-#include "missing.h"
 #include "path-util.h"
 #include "set.h"
 #include "sort-util.h"
diff --git a/src/basic/copy.c b/src/basic/copy.c
index ca311e021e..e07f548fef 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -22,7 +22,7 @@
 #include "fs-util.h"
 #include "io-util.h"
 #include "macro.h"
-#include "missing.h"
+#include "missing_syscall.h"
 #include "mountpoint-util.h"
 #include "stat-util.h"
 #include "string-util.h"
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index e571f6616e..1024490f23 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -16,7 +16,7 @@
 #include "io-util.h"
 #include "macro.h"
 #include "memfd-util.h"
-#include "missing.h"
+#include "missing_syscall.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index e1600a1e6a..82d27a5ba3 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -20,7 +20,6 @@
 #include "hexdecoct.h"
 #include "log.h"
 #include "macro.h"
-#include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index d20b9a5df5..9d2cff0d24 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -18,7 +18,8 @@
 #include "locale-util.h"
 #include "log.h"
 #include "macro.h"
-#include "missing.h"
+#include "missing_fs.h"
+#include "missing_syscall.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c
index 3bd94a1320..2c4620abf0 100644
--- a/src/basic/hashmap.c
+++ b/src/basic/hashmap.c
@@ -11,7 +11,7 @@
 #include "macro.h"
 #include "memory-util.h"
 #include "mempool.h"
-#include "missing.h"
+#include "missing_syscall.h"
 #include "process-util.h"
 #include "random-util.h"
 #include "set.h"
diff --git a/src/basic/khash.c b/src/basic/khash.c
index 847f2572a6..e893298d68 100644
--- a/src/basic/khash.c
+++ b/src/basic/khash.c
@@ -9,7 +9,7 @@
 #include "hexdecoct.h"
 #include "khash.h"
 #include "macro.h"
-#include "missing.h"
+#include "missing_socket.h"
 #include "string-util.h"
 #include "util.h"
 
diff --git a/src/basic/log.c b/src/basic/log.c
index f26b592a6c..61faf00102 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -25,7 +25,6 @@
 #include "io-util.h"
 #include "log.h"
 #include "macro.h"
-#include "missing.h"
 #include "parse-util.h"
 #include "proc-cmdline.h"
 #include "process-util.h"
diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c
index a382b0494a..e06bdcb0a8 100644
--- a/src/basic/memfd-util.c
+++ b/src/basic/memfd-util.c
@@ -1,21 +1,21 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #if HAVE_LINUX_MEMFD_H
 #include <linux/memfd.h>
 #endif
 #include <stdio.h>
-#include <sys/mman.h>
 #include <sys/prctl.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "macro.h"
 #include "memfd-util.h"
-#include "missing.h"
+#include "missing_fcntl.h"
+#include "missing_mman.h"
+#include "missing_syscall.h"
 #include "string-util.h"
 #include "utf8.h"
 
diff --git a/src/basic/meson.build b/src/basic/meson.build
index 85795d4c4e..f70d1b8bf8 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -124,7 +124,6 @@ basic_sources = files('''
         memory-util.h
         mempool.c
         mempool.h
-        missing.h
         missing_audit.h
         missing_capability.h
         missing_drm.h
diff --git a/src/basic/missing.h b/src/basic/missing.h
deleted file mode 100644
index 9ea4d9467c..0000000000
--- a/src/basic/missing.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
-#pragma once
-
-/* Missing glibc definitions to access certain kernel APIs */
-
-#include "missing_audit.h"
-#include "missing_capability.h"
-#include "missing_drm.h"
-#include "missing_fcntl.h"
-#include "missing_fs.h"
-#include "missing_input.h"
-#include "missing_magic.h"
-#include "missing_mman.h"
-#include "missing_network.h"
-#include "missing_prctl.h"
-#include "missing_random.h"
-#include "missing_resource.h"
-#include "missing_sched.h"
-#include "missing_socket.h"
-#include "missing_stdlib.h"
-#include "missing_timerfd.h"
-#include "missing_type.h"
-
-#include "missing_syscall.h"
diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c
index a79377f05d..1d8147b248 100644
--- a/src/basic/mountpoint-util.c
+++ b/src/basic/mountpoint-util.c
@@ -8,7 +8,6 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
-#include "missing.h"
 #include "mountpoint-util.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c
index 1fc593df40..b0168ae227 100644
--- a/src/basic/namespace-util.c
+++ b/src/basic/namespace-util.c
@@ -1,10 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <linux/magic.h>
+#include <sys/ioctl.h>
 
 #include "fd-util.h"
-#include "missing.h"
+#include "missing_fs.h"
+#include "missing_magic.h"
 #include "namespace-util.h"
 #include "process-util.h"
 #include "stat-util.h"
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index 115a1494a2..1ddb64fd28 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -15,7 +15,7 @@
 #include "extract-word.h"
 #include "locale-util.h"
 #include "macro.h"
-#include "missing.h"
+#include "missing_network.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "stat-util.h"
diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 98b6d0617f..9777beadd8 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -20,7 +20,6 @@
 #include "glob-util.h"
 #include "log.h"
 #include "macro.h"
-#include "missing.h"
 #include "nulstr-util.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 5452edd7a4..9ab6e4fff6 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -33,7 +33,8 @@
 #include "log.h"
 #include "macro.h"
 #include "memory-util.h"
-#include "missing.h"
+#include "missing_sched.h"
+#include "missing_syscall.h"
 #include "namespace-util.h"
 #include "process-util.h"
 #include "raw-clone.h"
diff --git a/src/basic/random-util.c b/src/basic/random-util.c
index b6a9ad4060..cdc2a164cb 100644
--- a/src/basic/random-util.c
+++ b/src/basic/random-util.c
@@ -17,17 +17,12 @@
 #  include <sys/auxv.h>
 #endif
 
-#if USE_SYS_RANDOM_H
-#  include <sys/random.h>
-#else
-#  include <linux/random.h>
-#endif
-
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "io-util.h"
-#include "missing.h"
+#include "missing_random.h"
+#include "missing_syscall.h"
 #include "parse-util.h"
 #include "random-util.h"
 #include "siphash24.h"
diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
index 74b3a023f1..2dc13eabc3 100644
--- a/src/basic/rlimit-util.c
+++ b/src/basic/rlimit-util.c
@@ -1,14 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <sys/resource.h>
 
 #include "alloc-util.h"
 #include "extract-word.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "macro.h"
-#include "missing.h"
+#include "missing_resource.h"
 #include "rlimit-util.h"
 #include "string-table.h"
 #include "time-util.h"
diff --git a/src/basic/socket-label.c b/src/basic/socket-label.c
index b5e9b374c0..64b1855deb 100644
--- a/src/basic/socket-label.c
+++ b/src/basic/socket-label.c
@@ -14,7 +14,7 @@
 #include "fs-util.h"
 #include "log.h"
 #include "macro.h"
-#include "missing.h"
+#include "missing_socket.h"
 #include "mkdir.h"
 #include "selinux-util.h"
 #include "socket-util.h"
diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 82bda64801..b216c25210 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/ioctl.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -23,7 +24,7 @@
 #include "log.h"
 #include "macro.h"
 #include "memory-util.h"
-#include "missing.h"
+#include "missing_socket.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index 4572e004bb..173054f9d7 100644
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -15,7 +15,8 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "macro.h"
-#include "missing.h"
+#include "missing_fs.h"
+#include "missing_magic.h"
 #include "parse-util.h"
 #include "stat-util.h"
 #include "string-util.h"
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 957285c091..7a31a69e36 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -20,7 +20,6 @@
 #include "fileio.h"
 #include "format-util.h"
 #include "macro.h"
-#include "missing.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "random-util.h"
diff --git a/src/basic/util.c b/src/basic/util.c
index 4989b8aa77..b02471c483 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -31,7 +31,6 @@
 #include "hostname-util.h"
 #include "log.h"
 #include "macro.h"
-#include "missing.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
index ab321e0293..2b79ce4b31 100644
--- a/src/basic/xattr-util.c
+++ b/src/basic/xattr-util.c
@@ -11,7 +11,7 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "macro.h"
-#include "missing.h"
+#include "missing_syscall.h"
 #include "sparse-endian.h"
 #include "stdio-util.h"
 #include "string-util.h"
diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index dca594a083..61663b2c1c 100644
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -20,6 +20,7 @@
 #include "fileio.h"
 #include "hashmap.h"
 #include "main-func.h"
+#include "missing_sched.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 63c5a81ace..185fc6a368 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -25,7 +25,6 @@
 #include "io-util.h"
 #include "ioprio.h"
 #include "journal-util.h"
-#include "missing.h"
 #include "mountpoint-util.h"
 #include "namespace.h"
 #include "parse-util.h"
diff --git a/src/core/dbus.c b/src/core/dbus.c
index bbfad1be74..3c40f29694 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -32,7 +32,6 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "log.h"
-#include "missing.h"
 #include "mkdir.h"
 #include "process-util.h"
 #include "selinux-access.h"
diff --git a/src/core/execute.c b/src/core/execute.c
index 82e7428c3c..4401e30e65 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -9,6 +9,7 @@
 #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>
@@ -67,7 +68,7 @@
 #include "macro.h"
 #include "manager.h"
 #include "memory-util.h"
-#include "missing.h"
+#include "missing_fs.h"
 #include "mkdir.h"
 #include "namespace.h"
 #include "parse-util.h"
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
index 66e1a17183..58c1970d05 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -3,11 +3,9 @@
 _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"")
 #endif
 #include <stddef.h>
+#include "all-units.h"
 #include "conf-parser.h"
 #include "load-fragment.h"
-#include "missing.h"
-
-#include "all-units.h"
 %}
 struct ConfigPerfItem;
 %null_strings
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 50203c76a2..f991b7f5e8 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -40,7 +40,6 @@
 #include "limits-util.h"
 #include "load-fragment.h"
 #include "log.h"
-#include "missing.h"
 #include "mountpoint-util.h"
 #include "nulstr-util.h"
 #include "parse-util.h"
diff --git a/src/core/loopback-setup.c b/src/core/loopback-setup.c
index 2a2fb8b59c..27d5a11d78 100644
--- a/src/core/loopback-setup.c
+++ b/src/core/loopback-setup.c
@@ -6,7 +6,7 @@
 #include "sd-netlink.h"
 
 #include "loopback-setup.h"
-#include "missing.h"
+#include "missing_network.h"
 #include "netlink-util.h"
 #include "time-util.h"
 
diff --git a/src/core/main.c b/src/core/main.c
index b3a665b119..7c814f3237 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -54,7 +54,6 @@
 #include "loopback-setup.h"
 #include "machine-id-setup.h"
 #include "manager.h"
-#include "missing.h"
 #include "mount-setup.h"
 #include "os-util.h"
 #include "pager.h"
diff --git a/src/core/manager.c b/src/core/manager.c
index 295ab48261..c9032fced8 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -54,7 +54,6 @@
 #include "macro.h"
 #include "manager.h"
 #include "memory-util.h"
-#include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-lookup.h"
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index f05445e4fb..7ef5b127ad 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -21,7 +21,6 @@
 #include "label.h"
 #include "log.h"
 #include "macro.h"
-#include "missing.h"
 #include "mkdir.h"
 #include "mount-setup.h"
 #include "mountpoint-util.h"
diff --git a/src/core/namespace.c b/src/core/namespace.c
index f6f7736819..dfc7f9fb1c 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -17,7 +17,6 @@
 #include "label.h"
 #include "loop-util.h"
 #include "loopback-setup.h"
-#include "missing.h"
 #include "mkdir.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
diff --git a/src/core/socket.c b/src/core/socket.c
index 7f903ce5de..ee8ed3fd06 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -28,7 +28,6 @@
 #include "ip-protocol-list.h"
 #include "label.h"
 #include "log.h"
-#include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/core/unit.c b/src/core/unit.c
index f7fe56a6d1..3107b9b148 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -34,7 +34,7 @@
 #include "load-fragment.h"
 #include "log.h"
 #include "macro.h"
-#include "missing.h"
+#include "missing_audit.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index d4052f69db..0e9a3c023c 100644
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -35,7 +35,6 @@
 #include "macro.h"
 #include "main-func.h"
 #include "memory-util.h"
-#include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "process-util.h"
diff --git a/src/fuzz/fuzz-udev-rules.c b/src/fuzz/fuzz-udev-rules.c
index 18a34496ed..3194f7aa88 100644
--- a/src/fuzz/fuzz-udev-rules.c
+++ b/src/fuzz/fuzz-udev-rules.c
@@ -10,7 +10,6 @@
 #include "fuzz.h"
 #include "log.h"
 #include "mkdir.h"
-#include "missing.h"
 #include "rm-rf.h"
 #include "string-util.h"
 #include "tests.h"
diff --git a/src/fuzz/meson.build b/src/fuzz/meson.build
index 96496ff4ed..c88812d1de 100644
--- a/src/fuzz/meson.build
+++ b/src/fuzz/meson.build
@@ -146,9 +146,4 @@ fuzzers += [
         [['src/fuzz/fuzz-time-util.c'],
          [libshared],
          []],
-
-        [['src/fuzz/fuzz-fido-id-desc.c',
-          'src/udev/fido_id/fido_id_desc.c'],
-         [],
-         []]
 ]
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 5002eb9d74..5affc57b79 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -22,7 +22,6 @@
 #include "fstab-util.h"
 #include "generator.h"
 #include "gpt.h"
-#include "missing.h"
 #include "mkdir.h"
 #include "mountpoint-util.h"
 #include "parse-util.h"
diff --git a/src/import/export-raw.c b/src/import/export-raw.c
index d76f3c0519..68425953a6 100644
--- a/src/import/export-raw.c
+++ b/src/import/export-raw.c
@@ -17,7 +17,6 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "import-common.h"
-#include "missing.h"
 #include "ratelimit.h"
 #include "stat-util.h"
 #include "string-util.h"
diff --git a/src/import/importd.c b/src/import/importd.c
index f4ca8f4f59..93d89a3a1f 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -15,7 +15,7 @@
 #include "import-util.h"
 #include "machine-pool.h"
 #include "main-func.h"
-#include "missing.h"
+#include "missing_capability.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
index fae9138ecb..339e091dfd 100644
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -6,7 +6,7 @@
 #include "hexdecoct.h"
 #include "io-util.h"
 #include "journald-audit.h"
-#include "missing.h"
+#include "missing_audit.h"
 #include "string-util.h"
 
 typedef struct MapField {
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index ff0188378f..b4dd51446a 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -41,7 +41,7 @@
 #include "journald-stream.h"
 #include "journald-syslog.h"
 #include "log.h"
-#include "missing.h"
+#include "missing_audit.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "proc-cmdline.h"
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 82b180b019..2b969a6405 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -31,7 +31,6 @@
 #include "journal-internal.h"
 #include "list.h"
 #include "lookup3.h"
-#include "missing.h"
 #include "nulstr-util.h"
 #include "path-util.h"
 #include "process-util.h"
diff --git a/src/libsystemd-network/lldp-neighbor.c b/src/libsystemd-network/lldp-neighbor.c
index 9bae4a3c6e..1e9fe73034 100644
--- a/src/libsystemd-network/lldp-neighbor.c
+++ b/src/libsystemd-network/lldp-neighbor.c
@@ -8,7 +8,7 @@
 #include "lldp-internal.h"
 #include "lldp-neighbor.h"
 #include "memory-util.h"
-#include "missing.h"
+#include "missing_network.h"
 #include "unaligned.h"
 
 static void lldp_neighbor_id_hash_func(const LLDPNeighborID *id, struct siphash *state) {
diff --git a/src/libsystemd-network/lldp-network.c b/src/libsystemd-network/lldp-network.c
index 870584c0db..53e329734b 100644
--- a/src/libsystemd-network/lldp-network.c
+++ b/src/libsystemd-network/lldp-network.c
@@ -5,7 +5,7 @@
 
 #include "fd-util.h"
 #include "lldp-network.h"
-#include "missing.h"
+#include "missing_network.h"
 #include "socket-util.h"
 
 int lldp_network_bind_raw_socket(int ifindex) {
diff --git a/src/libsystemd-network/ndisc-router.c b/src/libsystemd-network/ndisc-router.c
index c0938724e3..a2a9366338 100644
--- a/src/libsystemd-network/ndisc-router.c
+++ b/src/libsystemd-network/ndisc-router.c
@@ -11,7 +11,7 @@
 #include "dns-domain.h"
 #include "hostname-util.h"
 #include "memory-util.h"
-#include "missing.h"
+#include "missing_network.h"
 #include "ndisc-internal.h"
 #include "ndisc-router.h"
 #include "strv.h"
diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
index 3541c411a8..18d30d010a 100644
--- a/src/libsystemd/sd-bus/bus-socket.c
+++ b/src/libsystemd/sd-bus/bus-socket.c
@@ -19,7 +19,6 @@
 #include "io-util.h"
 #include "macro.h"
 #include "memory-util.h"
-#include "missing.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "rlimit-util.h"
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 026ac8cb94..ebbfc588ca 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -7,6 +7,7 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/mman.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
@@ -34,7 +35,7 @@
 #include "hostname-util.h"
 #include "macro.h"
 #include "memory-util.h"
-#include "missing.h"
+#include "missing_syscall.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
diff --git a/src/libsystemd/sd-device/device-monitor.c b/src/libsystemd/sd-device/device-monitor.c
index 27d0af5918..52e51fdd66 100644
--- a/src/libsystemd/sd-device/device-monitor.c
+++ b/src/libsystemd/sd-device/device-monitor.c
@@ -4,6 +4,7 @@
 #include <linux/filter.h>
 #include <linux/netlink.h>
 #include <sys/socket.h>
+#include <unistd.h>
 
 #include "sd-device.h"
 #include "sd-event.h"
@@ -17,7 +18,6 @@
 #include "format-util.h"
 #include "hashmap.h"
 #include "io-util.h"
-#include "missing.h"
 #include "mountpoint-util.h"
 #include "set.h"
 #include "socket-util.h"
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index d93d2f4046..b76dbf3d23 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -16,7 +16,7 @@
 #include "list.h"
 #include "macro.h"
 #include "memory-util.h"
-#include "missing.h"
+#include "missing_syscall.h"
 #include "prioq.h"
 #include "process-util.h"
 #include "set.h"
diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/sd-id128/sd-id128.c
index e5f82b8863..b331a6b432 100644
--- a/src/libsystemd/sd-id128/sd-id128.c
+++ b/src/libsystemd/sd-id128/sd-id128.c
@@ -13,7 +13,7 @@
 #include "io-util.h"
 #include "khash.h"
 #include "macro.h"
-#include "missing.h"
+#include "missing_syscall.h"
 #include "random-util.h"
 #include "user-util.h"
 #include "util.h"
diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c
index f499a4c966..295a73fb59 100644
--- a/src/libsystemd/sd-netlink/netlink-message.c
+++ b/src/libsystemd/sd-netlink/netlink-message.c
@@ -8,7 +8,6 @@
 
 #include "alloc-util.h"
 #include "format-util.h"
-#include "missing.h"
 #include "netlink-internal.h"
 #include "netlink-types.h"
 #include "netlink-util.h"
diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/sd-netlink/netlink-socket.c
index 7331aa1c19..9401c43d05 100644
--- a/src/libsystemd/sd-netlink/netlink-socket.c
+++ b/src/libsystemd/sd-netlink/netlink-socket.c
@@ -10,7 +10,6 @@
 #include "fd-util.h"
 #include "format-util.h"
 #include "io-util.h"
-#include "missing.h"
 #include "netlink-internal.h"
 #include "netlink-types.h"
 #include "netlink-util.h"
diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c
index cd6e5c87d5..a55460f034 100644
--- a/src/libsystemd/sd-netlink/netlink-types.c
+++ b/src/libsystemd/sd-netlink/netlink-types.c
@@ -30,7 +30,6 @@
 #include "generic-netlink.h"
 #include "hashmap.h"
 #include "macro.h"
-#include "missing.h"
 #include "netlink-internal.h"
 #include "netlink-types.h"
 #include "string-table.h"
diff --git a/src/libsystemd/sd-netlink/rtnl-message.c b/src/libsystemd/sd-netlink/rtnl-message.c
index 194676a6e5..5bf2efd510 100644
--- a/src/libsystemd/sd-netlink/rtnl-message.c
+++ b/src/libsystemd/sd-netlink/rtnl-message.c
@@ -9,7 +9,6 @@
 #include "sd-netlink.h"
 
 #include "format-util.h"
-#include "missing.h"
 #include "netlink-internal.h"
 #include "netlink-types.h"
 #include "netlink-util.h"
diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c
index 99b9705f33..013e8ae957 100644
--- a/src/libsystemd/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/sd-netlink/sd-netlink.c
@@ -9,7 +9,6 @@
 #include "fd-util.h"
 #include "hashmap.h"
 #include "macro.h"
-#include "missing.h"
 #include "netlink-internal.h"
 #include "netlink-slot.h"
 #include "netlink-util.h"
diff --git a/src/libsystemd/sd-netlink/test-netlink.c b/src/libsystemd/sd-netlink/test-netlink.c
index 379ad3058c..d61657035c 100644
--- a/src/libsystemd/sd-netlink/test-netlink.c
+++ b/src/libsystemd/sd-netlink/test-netlink.c
@@ -9,7 +9,6 @@
 #include "alloc-util.h"
 #include "ether-addr-util.h"
 #include "macro.h"
-#include "missing.h"
 #include "netlink-util.h"
 #include "socket-util.h"
 #include "stdio-util.h"
diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
index ad56ddb580..95d6551e5c 100644
--- a/src/libsystemd/sd-path/sd-path.c
+++ b/src/libsystemd/sd-path/sd-path.c
@@ -7,7 +7,6 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
-#include "missing.h"
 #include "path-util.h"
 #include "string-util.h"
 #include "strv.h"
diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c
index 00a6464e2d..9d4057f7cb 100644
--- a/src/libsystemd/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/sd-resolve/sd-resolve.c
@@ -21,7 +21,7 @@
 #include "io-util.h"
 #include "list.h"
 #include "memory-util.h"
-#include "missing.h"
+#include "missing_syscall.h"
 #include "process-util.h"
 #include "resolve-private.h"
 #include "socket-util.h"
diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
index d11e7a9279..af7312a011 100644
--- a/src/libudev/libudev.c
+++ b/src/libudev/libudev.c
@@ -11,7 +11,6 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
-#include "missing.h"
 #include "string-util.h"
 
 /**
diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index 3057e72394..0fea372155 100644
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -14,7 +14,8 @@
 #include "fd-util.h"
 #include "logind-session-dbus.h"
 #include "logind-session-device.h"
-#include "missing.h"
+#include "missing_drm.h"
+#include "missing_input.h"
 #include "parse-util.h"
 #include "util.h"
 
diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
index fc9d6c2352..59a40faef8 100644
--- a/src/network/netdev/bridge.c
+++ b/src/network/netdev/bridge.c
@@ -3,7 +3,6 @@
 #include <net/if.h>
 
 #include "bridge.h"
-#include "missing.h"
 #include "netlink-util.h"
 #include "network-internal.h"
 #include "networkd-manager.h"
diff --git a/src/network/netdev/fou-tunnel.c b/src/network/netdev/fou-tunnel.c
index 4db5caa0f2..7627ccee9c 100644
--- a/src/network/netdev/fou-tunnel.c
+++ b/src/network/netdev/fou-tunnel.c
@@ -8,7 +8,6 @@
 #include "conf-parser.h"
 #include "fou-tunnel.h"
 #include "ip-protocol-list.h"
-#include "missing.h"
 #include "netlink-util.h"
 #include "networkd-manager.h"
 #include "parse-util.h"
diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c
index 69d43b6a19..771e0292de 100644
--- a/src/network/netdev/geneve.c
+++ b/src/network/netdev/geneve.c
@@ -6,7 +6,6 @@
 #include "conf-parser.h"
 #include "extract-word.h"
 #include "geneve.h"
-#include "missing.h"
 #include "netlink-util.h"
 #include "networkd-manager.h"
 #include "parse-util.h"
diff --git a/src/network/netdev/l2tp-tunnel.c b/src/network/netdev/l2tp-tunnel.c
index e51bd1f206..f10506af1e 100644
--- a/src/network/netdev/l2tp-tunnel.c
+++ b/src/network/netdev/l2tp-tunnel.c
@@ -7,7 +7,6 @@
 #include "conf-parser.h"
 #include "hashmap.h"
 #include "l2tp-tunnel.h"
-#include "missing.h"
 #include "netlink-util.h"
 #include "networkd-address.h"
 #include "networkd-manager.h"
diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
index 8ea7d889b4..25dc23ff03 100644
--- a/src/network/netdev/macsec.c
+++ b/src/network/netdev/macsec.c
@@ -11,7 +11,6 @@
 #include "hexdecoct.h"
 #include "macsec.h"
 #include "memory-util.h"
-#include "missing.h"
 #include "netlink-util.h"
 #include "network-internal.h"
 #include "networkd-address.h"
diff --git a/src/network/netdev/netdevsim.c b/src/network/netdev/netdevsim.c
index ee2632b62d..96f3932ccb 100644
--- a/src/network/netdev/netdevsim.c
+++ b/src/network/netdev/netdevsim.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include "missing.h"
 #include "netdevsim.h"
 
 const NetDevVTable netdevsim_vtable = {
diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c
index 2f08fda3bc..8b79051ef5 100644
--- a/src/network/netdev/tunnel.c
+++ b/src/network/netdev/tunnel.c
@@ -7,7 +7,7 @@
 #include <linux/ip6_tunnel.h>
 
 #include "conf-parser.h"
-#include "missing.h"
+#include "missing_network.h"
 #include "netlink-util.h"
 #include "parse-util.h"
 #include "string-table.h"
diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c
index 76b8f69d95..dc7a967230 100644
--- a/src/network/netdev/vrf.c
+++ b/src/network/netdev/vrf.c
@@ -2,7 +2,6 @@
 
 #include <net/if.h>
 
-#include "missing.h"
 #include "vrf.h"
 
 static int netdev_vrf_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) {
diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c
index afff53ae32..92f6005dcd 100644
--- a/src/network/netdev/vxlan.c
+++ b/src/network/netdev/vxlan.c
@@ -9,7 +9,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "parse-util.h"
-#include "missing.h"
 #include "vxlan.h"
 
 static const char* const df_table[_NETDEV_VXLAN_DF_MAX] = {
diff --git a/src/nspawn/nspawn-patch-uid.c b/src/nspawn/nspawn-patch-uid.c
index 4885744cfc..199e5804dd 100644
--- a/src/nspawn/nspawn-patch-uid.c
+++ b/src/nspawn/nspawn-patch-uid.c
@@ -14,7 +14,7 @@
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
-#include "missing.h"
+#include "missing_magic.h"
 #include "nspawn-def.h"
 #include "nspawn-patch-uid.h"
 #include "stat-util.h"
diff --git a/src/nspawn/nspawn-stub-pid1.c b/src/nspawn/nspawn-stub-pid1.c
index 0589685afe..d86dd23185 100644
--- a/src/nspawn/nspawn-stub-pid1.c
+++ b/src/nspawn/nspawn-stub-pid1.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
+#include <sys/ioctl.h>
 #include <sys/reboot.h>
 #include <sys/wait.h>
 #include <sys/prctl.h>
@@ -9,7 +10,6 @@
 #include "exit-status.h"
 #include "fd-util.h"
 #include "log.h"
-#include "missing.h"
 #include "nspawn-stub-pid1.h"
 #include "process-util.h"
 #include "signal-util.h"
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 2ab308a958..c9ff00544c 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -58,7 +58,7 @@
 #include "machine-image.h"
 #include "macro.h"
 #include "main-func.h"
-#include "missing.h"
+#include "missing_sched.h"
 #include "mkdir.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
diff --git a/src/partition/growfs.c b/src/partition/growfs.c
index 9e7178ac45..5f55d3fc95 100644
--- a/src/partition/growfs.c
+++ b/src/partition/growfs.c
@@ -19,7 +19,7 @@
 #include "fd-util.h"
 #include "format-util.h"
 #include "log.h"
-#include "missing.h"
+#include "missing_fs.h"
 #include "mountpoint-util.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c
index e4618aac0e..5c812b5d5b 100644
--- a/src/pstore/pstore.c
+++ b/src/pstore/pstore.c
@@ -33,7 +33,6 @@
 #include "log.h"
 #include "macro.h"
 #include "main-func.h"
-#include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "process-util.h"
diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
index cbc9745584..e8a4b5e88c 100644
--- a/src/random-seed/random-seed.c
+++ b/src/random-seed/random-seed.c
@@ -20,7 +20,7 @@
 #include "io-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "missing.h"
+#include "missing_syscall.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "random-util.h"
diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c
index ddcf164ebd..691f07945f 100644
--- a/src/resolve/resolved-dns-scope.c
+++ b/src/resolve/resolved-dns-scope.c
@@ -7,7 +7,7 @@
 #include "dns-domain.h"
 #include "fd-util.h"
 #include "hostname-util.h"
-#include "missing.h"
+#include "missing_network.h"
 #include "random-util.h"
 #include "resolved-dnssd.h"
 #include "resolved-dns-scope.h"
diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c
index 562d0c3c02..2a10694997 100644
--- a/src/resolve/resolved-dns-stream.c
+++ b/src/resolve/resolved-dns-stream.c
@@ -1,11 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <netinet/tcp.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "io-util.h"
-#include "missing.h"
+#include "missing_network.h"
 #include "resolved-dns-stream.h"
 
 #define DNS_STREAM_TIMEOUT_USEC (10 * USEC_PER_SEC)
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index 418288a441..9b5b8f8f13 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -33,7 +33,7 @@
 #include "log.h"
 #include "macro.h"
 #include "memory-util.h"
-#include "missing.h"
+#include "missing_syscall.h"
 #include "mkdir.h"
 #include "process-util.h"
 #include "random-util.h"
diff --git a/src/shared/bpf-program.c b/src/shared/bpf-program.c
index 93f8db3f34..e5c9df4004 100644
--- a/src/shared/bpf-program.c
+++ b/src/shared/bpf-program.c
@@ -10,7 +10,7 @@
 #include "fd-util.h"
 #include "log.h"
 #include "memory-util.h"
-#include "missing.h"
+#include "missing_syscall.h"
 #include "path-util.h"
 
 int bpf_program_new(uint32_t prog_type, BPFProgram **ret) {
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 50b0742c97..7a4da51911 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -27,7 +27,6 @@
 #include "def.h"
 #include "escape.h"
 #include "fd-util.h"
-#include "missing.h"
 #include "mountpoint-util.h"
 #include "nsflags.h"
 #include "parse-util.h"
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 40792086da..ce714bcc8b 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -18,7 +18,7 @@
 #include "fs-util.h"
 #include "log.h"
 #include "macro.h"
-#include "missing.h"
+#include "missing_network.h"
 #include "nulstr-util.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 3e75464966..934e0fe830 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -28,7 +28,6 @@
 #include "hexdecoct.h"
 #include "hostname-util.h"
 #include "id128-util.h"
-#include "missing.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
 #include "nulstr-util.h"
diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c
index 346277c83a..e29b81f132 100644
--- a/src/shared/ethtool-util.c
+++ b/src/shared/ethtool-util.c
@@ -10,7 +10,6 @@
 #include "extract-word.h"
 #include "log.h"
 #include "memory-util.h"
-#include "missing.h"
 #include "socket-util.h"
 #include "string-table.h"
 #include "strxcpyx.h"
diff --git a/src/shared/machine-pool.c b/src/shared/machine-pool.c
index de4f704252..98f5413133 100644
--- a/src/shared/machine-pool.c
+++ b/src/shared/machine-pool.c
@@ -6,7 +6,7 @@
 #include "btrfs-util.h"
 #include "label.h"
 #include "machine-pool.h"
-#include "missing.h"
+#include "missing_magic.h"
 #include "stat-util.h"
 
 static int check_btrfs(void) {
diff --git a/src/shared/serialize.c b/src/shared/serialize.c
index 0333f87b7b..5b5e4947ef 100644
--- a/src/shared/serialize.c
+++ b/src/shared/serialize.c
@@ -1,12 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
+#include <fcntl.h>
 #include <sys/mman.h>
 
 #include "alloc-util.h"
 #include "env-util.h"
 #include "escape.h"
 #include "fileio.h"
-#include "missing.h"
+#include "missing_mman.h"
+#include "missing_syscall.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "serialize.h"
diff --git a/src/shared/switch-root.c b/src/shared/switch-root.c
index a807826378..ebe9041482 100644
--- a/src/shared/switch-root.c
+++ b/src/shared/switch-root.c
@@ -13,7 +13,7 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "log.h"
-#include "missing.h"
+#include "missing_syscall.h"
 #include "mkdir.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
index 08215fd3ee..1be26bf56f 100644
--- a/src/shutdown/shutdown.c
+++ b/src/shutdown/shutdown.c
@@ -25,7 +25,6 @@
 #include "fileio.h"
 #include "killall.h"
 #include "log.h"
-#include "missing.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "reboot-util.h"
diff --git a/src/test/meson.build b/src/test/meson.build
index 5132145b41..6179607a43 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -775,11 +775,6 @@ tests += [
         [['src/test/test-local-addresses.c'],
          [],
          []],
-
-        [['src/test/test-fido-id-desc.c',
-          'src/udev/fido_id/fido_id_desc.c'],
-         [],
-         []],
 ]
 
 ############################################################
diff --git a/src/test/test-bpf.c b/src/test/test-bpf.c
index 6a75221542..d333466ab8 100644
--- a/src/test/test-bpf.c
+++ b/src/test/test-bpf.c
@@ -9,7 +9,6 @@
 #include "bpf-program.h"
 #include "load-fragment.h"
 #include "manager.h"
-#include "missing.h"
 #include "rm-rf.h"
 #include "service.h"
 #include "test-helper.h"
diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index 8dc9fdda50..ad441ae731 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
+#include <fcntl.h>
 #include <sched.h>
 #include <sys/mount.h>
 #include <sys/personality.h>
@@ -17,7 +18,8 @@
 #include "fd-util.h"
 #include "log.h"
 #include "macro.h"
-#include "missing.h"
+#include "missing_sched.h"
+#include "missing_syscall.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "signal-util.h"
diff --git a/src/test/test-rlimit-util.c b/src/test/test-rlimit-util.c
index fac30126ce..90eda96a73 100644
--- a/src/test/test-rlimit-util.c
+++ b/src/test/test-rlimit-util.c
@@ -5,7 +5,7 @@
 #include "alloc-util.h"
 #include "capability-util.h"
 #include "macro.h"
-#include "missing.h"
+#include "missing_resource.h"
 #include "rlimit-util.h"
 #include "string-util.h"
 #include "time-util.h"
diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
index a906070f9a..af17a56516 100644
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
+#include <fcntl.h>
 #include <poll.h>
 #include <sched.h>
 #include <stdlib.h>
@@ -15,7 +16,7 @@
 #include "fd-util.h"
 #include "macro.h"
 #include "memory-util.h"
-#include "missing.h"
+#include "missing_sched.h"
 #include "nsflags.h"
 #include "nulstr-util.h"
 #include "process-util.h"
diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c
index e3d89d6e26..9d9dbd4d1b 100644
--- a/src/test/test-stat-util.c
+++ b/src/test/test-stat-util.c
@@ -7,7 +7,6 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "macro.h"
-#include "missing.h"
 #include "mountpoint-util.h"
 #include "namespace-util.h"
 #include "path-util.h"
diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index af43597596..e87a8ec034 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -16,7 +16,6 @@
 #include "fs-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "missing.h"
 #include "mkdir.h"
 #include "selinux-util.h"
 #include "signal-util.h"
diff --git a/src/time-wait-sync/time-wait-sync.c b/src/time-wait-sync/time-wait-sync.c
index 5b27df1f9e..124c74076b 100644
--- a/src/time-wait-sync/time-wait-sync.c
+++ b/src/time-wait-sync/time-wait-sync.c
@@ -23,7 +23,6 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "main-func.h"
-#include "missing.h"
 #include "signal-util.h"
 #include "time-util.h"
 
diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index 72b6bb8eb7..738178532c 100644
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -21,7 +21,6 @@
 #include "fs-util.h"
 #include "list.h"
 #include "log.h"
-#include "missing.h"
 #include "network-util.h"
 #include "ratelimit.h"
 #include "resolve-private.h"
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index fae949863a..808cc18892 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -41,7 +41,6 @@
 #include "log.h"
 #include "macro.h"
 #include "main-func.h"
-#include "missing.h"
 #include "mkdir.h"
 #include "mountpoint-util.h"
 #include "pager.h"
diff --git a/src/fuzz/fuzz-fido-id-desc.c b/src/udev/fido_id/fuzz-fido-id-desc.c
index cf98dee044..45a4879e82 100644
--- a/src/fuzz/fuzz-fido-id-desc.c
+++ b/src/udev/fido_id/fuzz-fido-id-desc.c
@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "fido_id/fido_id_desc.h"
+#include "fido_id_desc.h"
 #include "fuzz.h"
 #include "log.h"
 
diff --git a/src/test/test-fido-id-desc.c b/src/udev/fido_id/test-fido-id-desc.c
index cf55dd3266..38eec2bc28 100644
--- a/src/test/test-fido-id-desc.c
+++ b/src/udev/fido_id/test-fido-id-desc.c
@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "fido_id/fido_id_desc.h"
+#include "fido_id_desc.h"
 #include "macro.h"
 
 static void test_is_fido_security_token_desc__fido(void) {
diff --git a/src/udev/meson.build b/src/udev/meson.build
index 48573cdb60..991d2eb24b 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -208,5 +208,17 @@ fuzzers += [
           libsystemd_network,
           libshared],
          [threads,
-          libacl]]
+          libacl]],
+
+        [['src/udev/fido_id/fuzz-fido-id-desc.c',
+          'src/udev/fido_id/fido_id_desc.c'],
+         [],
+         []],
+        ]
+
+tests += [
+        [['src/udev/fido_id/test-fido-id-desc.c',
+          'src/udev/fido_id/fido_id_desc.c'],
+         [],
+         []],
         ]
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
index e504285350..7a8e1f75dd 100644
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -7,6 +7,7 @@
  */
 
 #include <errno.h>
+#include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -17,7 +18,7 @@
 
 #include "device-util.h"
 #include "fd-util.h"
-#include "missing.h"
+#include "missing_input.h"
 #include "stdio-util.h"
 #include "string-util.h"
 #include "udev-builtin.h"