.mkosi/mkosi.arch

@@ -23,7 +23,6 @@ BuildPackages=
         cryptsetup
         curl
         dbus
-        diffutils
         docbook-xsl
         elfutils
         gcc

src/analyze/analyze-security.c

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
+#include <sched.h>
 #include <sys/utsname.h>
 
 #include "analyze-security.h"
@@ -11,8 +12,7 @@
 #include "in-addr-util.h"
 #include "locale-util.h"
 #include "macro.h"
-#include "missing_capability.h"
-#include "missing_sched.h"
+#include "missing.h"
 #include "nulstr-util.h"
 #include "parse-util.h"
 #include "path-util.h"

src/basic/blockdev-util.c

@@ -2,7 +2,6 @@
 
 #include <sys/stat.h>
 #include <sys/statfs.h>
-#include <unistd.h>
 
 #include "alloc-util.h"
 #include "blockdev-util.h"
@@ -10,7 +9,7 @@
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "missing_magic.h"
+#include "missing.h"
 #include "parse-util.h"
 #include "stat-util.h"
 

src/basic/cap-list.c

@@ -8,6 +8,7 @@
 #include "cap-list.h"
 #include "extract-word.h"
 #include "macro.h"
+#include "missing.h"
 #include "parse-util.h"
 #include "util.h"
 

src/basic/cgroup-util.c

@@ -27,7 +27,7 @@
 #include "log.h"
 #include "login-util.h"
 #include "macro.h"
-#include "missing_magic.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"

src/basic/conf-files.c

@@ -14,6 +14,7 @@
 #include "hashmap.h"
 #include "log.h"
 #include "macro.h"
+#include "missing.h"
 #include "path-util.h"
 #include "set.h"
 #include "sort-util.h"

src/basic/copy.c

@@ -22,7 +22,7 @@
 #include "fs-util.h"
 #include "io-util.h"
 #include "macro.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "mountpoint-util.h"
 #include "stat-util.h"
 #include "string-util.h"

src/basic/fd-util.c

@@ -16,7 +16,7 @@
 #include "io-util.h"
 #include "macro.h"
 #include "memfd-util.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"

src/basic/fileio.c

@@ -20,6 +20,7 @@
 #include "hexdecoct.h"
 #include "log.h"
 #include "macro.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"

src/basic/fs-util.c

@@ -18,8 +18,7 @@
 #include "locale-util.h"
 #include "log.h"
 #include "macro.h"
-#include "missing_fs.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"

src/basic/hashmap.c

@@ -11,7 +11,7 @@
 #include "macro.h"
 #include "memory-util.h"
 #include "mempool.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "process-util.h"
 #include "random-util.h"
 #include "set.h"

src/basic/khash.c

@@ -9,7 +9,7 @@
 #include "hexdecoct.h"
 #include "khash.h"
 #include "macro.h"
-#include "missing_socket.h"
+#include "missing.h"
 #include "string-util.h"
 #include "util.h"
 

src/basic/log.c

@@ -25,6 +25,7 @@
 #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"

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_fcntl.h"
-#include "missing_mman.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "string-util.h"
 #include "utf8.h"
 

src/basic/meson.build

@@ -124,6 +124,7 @@ basic_sources = files('''
         memory-util.h
         mempool.c
         mempool.h
+        missing.h
         missing_audit.h
         missing_capability.h
         missing_drm.h

src/basic/missing.h

@@ -0,0 +1,24 @@
+/* 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"

src/basic/mountpoint-util.c

@@ -8,6 +8,7 @@
 #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"

src/basic/namespace-util.c

@@ -1,11 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <sys/ioctl.h>
+#include <linux/magic.h>
 
 #include "fd-util.h"
-#include "missing_fs.h"
-#include "missing_magic.h"
+#include "missing.h"
 #include "namespace-util.h"
 #include "process-util.h"
 #include "stat-util.h"

src/basic/parse-util.c

@@ -15,7 +15,7 @@
 #include "extract-word.h"
 #include "locale-util.h"
 #include "macro.h"
-#include "missing_network.h"
+#include "missing.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "stat-util.h"

src/basic/path-util.c

@@ -20,6 +20,7 @@
 #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"

src/basic/process-util.c

@@ -33,8 +33,7 @@
 #include "log.h"
 #include "macro.h"
 #include "memory-util.h"
-#include "missing_sched.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "namespace-util.h"
 #include "process-util.h"
 #include "raw-clone.h"

src/basic/random-util.c

@@ -17,12 +17,17 @@
 #  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_random.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "parse-util.h"
 #include "random-util.h"
 #include "siphash24.h"

src/basic/rlimit-util.c

@@ -1,13 +1,14 @@
 /* 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_resource.h"
+#include "missing.h"
 #include "rlimit-util.h"
 #include "string-table.h"
 #include "time-util.h"

src/basic/socket-label.c

@@ -14,7 +14,7 @@
 #include "fs-util.h"
 #include "log.h"
 #include "macro.h"
-#include "missing_socket.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "selinux-util.h"
 #include "socket-util.h"

src/basic/socket-util.c

@@ -12,7 +12,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/ioctl.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -24,7 +23,7 @@
 #include "log.h"
 #include "macro.h"
 #include "memory-util.h"
-#include "missing_socket.h"
+#include "missing.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"

src/basic/stat-util.c

@@ -15,8 +15,7 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "macro.h"
-#include "missing_fs.h"
-#include "missing_magic.h"
+#include "missing.h"
 #include "parse-util.h"
 #include "stat-util.h"
 #include "string-util.h"

src/basic/user-util.c

@@ -20,6 +20,7 @@
 #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"

src/basic/util.c

@@ -31,6 +31,7 @@
 #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"

src/basic/xattr-util.c

@@ -11,7 +11,7 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "macro.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "sparse-endian.h"
 #include "stdio-util.h"
 #include "string-util.h"

src/cgtop/cgtop.c

@@ -20,7 +20,6 @@
 #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"

src/core/dbus-execute.c

@@ -25,6 +25,7 @@
 #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"

src/core/dbus.c

@@ -32,6 +32,7 @@
 #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"

src/core/execute.c

@@ -9,7 +9,6 @@
 #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>
@@ -68,7 +67,7 @@
 #include "macro.h"
 #include "manager.h"
 #include "memory-util.h"
-#include "missing_fs.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "namespace.h"
 #include "parse-util.h"

src/core/load-fragment-gperf.gperf.m4

@@ -3,9 +3,11 @@
 _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

src/core/load-fragment.c

@@ -40,6 +40,7 @@
 #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"

src/core/loopback-setup.c

@@ -6,7 +6,7 @@
 #include "sd-netlink.h"
 
 #include "loopback-setup.h"
-#include "missing_network.h"
+#include "missing.h"
 #include "netlink-util.h"
 #include "time-util.h"
 

src/core/main.c

@@ -54,6 +54,7 @@
 #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"

src/core/manager.c

@@ -54,6 +54,7 @@
 #include "macro.h"
 #include "manager.h"
 #include "memory-util.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-lookup.h"

src/core/mount-setup.c

@@ -21,6 +21,7 @@
 #include "label.h"
 #include "log.h"
 #include "macro.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "mount-setup.h"
 #include "mountpoint-util.h"

src/core/namespace.c

@@ -17,6 +17,7 @@
 #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"

src/core/socket.c

@@ -28,6 +28,7 @@
 #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"

src/core/unit.c

@@ -34,7 +34,7 @@
 #include "load-fragment.h"
 #include "log.h"
 #include "macro.h"
-#include "missing_audit.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"

src/coredump/coredump.c

@@ -35,6 +35,7 @@
 #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"

src/fuzz/fuzz-fido-id-desc.c

@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "fido_id_desc.h"
+#include "fido_id/fido_id_desc.h"
 #include "fuzz.h"
 #include "log.h"
 

src/fuzz/fuzz-udev-rules.c

@@ -10,6 +10,7 @@
 #include "fuzz.h"
 #include "log.h"
 #include "mkdir.h"
+#include "missing.h"
 #include "rm-rf.h"
 #include "string-util.h"
 #include "tests.h"

src/fuzz/meson.build

@@ -146,4 +146,9 @@ fuzzers += [
         [['src/fuzz/fuzz-time-util.c'],
          [libshared],
          []],
+
+        [['src/fuzz/fuzz-fido-id-desc.c',
+          'src/udev/fido_id/fido_id_desc.c'],
+         [],
+         []]
 ]

src/gpt-auto-generator/gpt-auto-generator.c

@@ -22,6 +22,7 @@
 #include "fstab-util.h"
 #include "generator.h"
 #include "gpt.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "mountpoint-util.h"
 #include "parse-util.h"

src/import/export-raw.c

@@ -17,6 +17,7 @@
 #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"

src/import/importd.c

@@ -15,7 +15,7 @@
 #include "import-util.h"
 #include "machine-pool.h"
 #include "main-func.h"
-#include "missing_capability.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"

src/journal/journald-audit.c

@@ -6,7 +6,7 @@
 #include "hexdecoct.h"
 #include "io-util.h"
 #include "journald-audit.h"
-#include "missing_audit.h"
+#include "missing.h"
 #include "string-util.h"
 
 typedef struct MapField {

src/journal/journald-server.c

@@ -41,7 +41,7 @@
 #include "journald-stream.h"
 #include "journald-syslog.h"
 #include "log.h"
-#include "missing_audit.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "proc-cmdline.h"

src/journal/sd-journal.c

@@ -31,6 +31,7 @@
 #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"

src/libsystemd-network/lldp-neighbor.c

@@ -8,7 +8,7 @@
 #include "lldp-internal.h"
 #include "lldp-neighbor.h"
 #include "memory-util.h"
-#include "missing_network.h"
+#include "missing.h"
 #include "unaligned.h"
 
 static void lldp_neighbor_id_hash_func(const LLDPNeighborID *id, struct siphash *state) {

src/libsystemd-network/lldp-network.c

@@ -5,7 +5,7 @@
 
 #include "fd-util.h"
 #include "lldp-network.h"
-#include "missing_network.h"
+#include "missing.h"
 #include "socket-util.h"
 
 int lldp_network_bind_raw_socket(int ifindex) {

src/libsystemd-network/ndisc-router.c

@@ -11,7 +11,7 @@
 #include "dns-domain.h"
 #include "hostname-util.h"
 #include "memory-util.h"
-#include "missing_network.h"
+#include "missing.h"
 #include "ndisc-internal.h"
 #include "ndisc-router.h"
 #include "strv.h"

src/libsystemd-network/sd-dhcp-server.c

@@ -136,7 +136,7 @@ static sd_dhcp_raw_option* raw_option_free(sd_dhcp_raw_option *i) {
 }
 
 _public_ int sd_dhcp_raw_option_new(uint8_t type, char *data, size_t length, sd_dhcp_raw_option **ret) {
-        _cleanup_(sd_dhcp_raw_option_unrefp) sd_dhcp_raw_option *p = NULL;
+        sd_dhcp_raw_option *p;
 
         assert_return(ret, -EINVAL);
 
@@ -151,12 +151,10 @@ _public_ int sd_dhcp_raw_option_new(uint8_t type, char *data, size_t length, sd_
                   .type = type,
         };
 
-        if (!p->data) {
-                free(p);
+        if (!p->data)
                 return -ENOMEM;
-        }
 
-        *ret = TAKE_PTR(p);
+        *ret = p;
         return 0;
 }
 

src/libsystemd/sd-bus/bus-socket.c

@@ -19,6 +19,7 @@
 #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"

src/libsystemd/sd-bus/sd-bus.c

@@ -7,7 +7,6 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/mman.h>
-#include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
@@ -35,7 +34,7 @@
 #include "hostname-util.h"
 #include "macro.h"
 #include "memory-util.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"

src/libsystemd/sd-device/device-monitor.c

@@ -4,7 +4,6 @@
 #include <linux/filter.h>
 #include <linux/netlink.h>
 #include <sys/socket.h>
-#include <unistd.h>
 
 #include "sd-device.h"
 #include "sd-event.h"
@@ -18,6 +17,7 @@
 #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"

src/libsystemd/sd-event/sd-event.c

@@ -16,7 +16,7 @@
 #include "list.h"
 #include "macro.h"
 #include "memory-util.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "prioq.h"
 #include "process-util.h"
 #include "set.h"

src/libsystemd/sd-id128/sd-id128.c

@@ -13,7 +13,7 @@
 #include "io-util.h"
 #include "khash.h"
 #include "macro.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "random-util.h"
 #include "user-util.h"
 #include "util.h"

src/libsystemd/sd-netlink/netlink-message.c

@@ -8,6 +8,7 @@
 
 #include "alloc-util.h"
 #include "format-util.h"
+#include "missing.h"
 #include "netlink-internal.h"
 #include "netlink-types.h"
 #include "netlink-util.h"

src/libsystemd/sd-netlink/netlink-socket.c

@@ -10,6 +10,7 @@
 #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"

src/libsystemd/sd-netlink/netlink-types.c

@@ -30,6 +30,7 @@
 #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"

src/libsystemd/sd-netlink/rtnl-message.c

@@ -9,6 +9,7 @@
 #include "sd-netlink.h"
 
 #include "format-util.h"
+#include "missing.h"
 #include "netlink-internal.h"
 #include "netlink-types.h"
 #include "netlink-util.h"

src/libsystemd/sd-netlink/sd-netlink.c

@@ -9,6 +9,7 @@
 #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"

src/libsystemd/sd-netlink/test-netlink.c

@@ -9,6 +9,7 @@
 #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"

src/libsystemd/sd-path/sd-path.c

@@ -7,6 +7,7 @@
 #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"

src/libsystemd/sd-resolve/sd-resolve.c

@@ -21,7 +21,7 @@
 #include "io-util.h"
 #include "list.h"
 #include "memory-util.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "process-util.h"
 #include "resolve-private.h"
 #include "socket-util.h"

src/libudev/libudev.c

@@ -11,6 +11,7 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
+#include "missing.h"
 #include "string-util.h"
 
 /**

src/login/logind-session-device.c

@@ -14,8 +14,7 @@
 #include "fd-util.h"
 #include "logind-session-dbus.h"
 #include "logind-session-device.h"
-#include "missing_drm.h"
-#include "missing_input.h"
+#include "missing.h"
 #include "parse-util.h"
 #include "util.h"
 

src/network/netdev/bridge.c

@@ -3,6 +3,7 @@
 #include <net/if.h>
 
 #include "bridge.h"
+#include "missing.h"
 #include "netlink-util.h"
 #include "network-internal.h"
 #include "networkd-manager.h"

src/network/netdev/fou-tunnel.c

@@ -8,6 +8,7 @@
 #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"

src/network/netdev/geneve.c

@@ -6,6 +6,7 @@
 #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"

src/network/netdev/l2tp-tunnel.c

@@ -7,6 +7,7 @@
 #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"

src/network/netdev/macsec.c

@@ -11,6 +11,7 @@
 #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"

src/network/netdev/netdevsim.c

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
+#include "missing.h"
 #include "netdevsim.h"
 
 const NetDevVTable netdevsim_vtable = {

src/network/netdev/tunnel.c

@@ -7,7 +7,7 @@
 #include <linux/ip6_tunnel.h>
 
 #include "conf-parser.h"
-#include "missing_network.h"
+#include "missing.h"
 #include "netlink-util.h"
 #include "parse-util.h"
 #include "string-table.h"

src/network/netdev/vrf.c

@@ -2,6 +2,7 @@
 
 #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) {

src/network/netdev/vxlan.c

@@ -9,6 +9,7 @@
 #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] = {

src/nspawn/nspawn-patch-uid.c

@@ -14,7 +14,7 @@
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
-#include "missing_magic.h"
+#include "missing.h"
 #include "nspawn-def.h"
 #include "nspawn-patch-uid.h"
 #include "stat-util.h"

src/nspawn/nspawn-stub-pid1.c

@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <sys/ioctl.h>
 #include <sys/reboot.h>
 #include <sys/wait.h>
 #include <sys/prctl.h>
@@ -10,6 +9,7 @@
 #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"

src/nspawn/nspawn.c

@@ -58,7 +58,7 @@
 #include "machine-image.h"
 #include "macro.h"
 #include "main-func.h"
-#include "missing_sched.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"

src/partition/growfs.c

@@ -19,7 +19,7 @@
 #include "fd-util.h"
 #include "format-util.h"
 #include "log.h"
-#include "missing_fs.h"
+#include "missing.h"
 #include "mountpoint-util.h"
 #include "parse-util.h"
 #include "path-util.h"

src/pstore/pstore.c

@@ -33,6 +33,7 @@
 #include "log.h"
 #include "macro.h"
 #include "main-func.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "process-util.h"

src/random-seed/random-seed.c

@@ -20,7 +20,7 @@
 #include "io-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "random-util.h"

src/resolve/resolved-dns-scope.c

@@ -7,7 +7,7 @@
 #include "dns-domain.h"
 #include "fd-util.h"
 #include "hostname-util.h"
-#include "missing_network.h"
+#include "missing.h"
 #include "random-util.h"
 #include "resolved-dnssd.h"
 #include "resolved-dns-scope.h"

src/resolve/resolved-dns-stream.c

@@ -1,12 +1,11 @@
 /* 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_network.h"
+#include "missing.h"
 #include "resolved-dns-stream.h"
 
 #define DNS_STREAM_TIMEOUT_USEC (10 * USEC_PER_SEC)

src/shared/ask-password-api.c

@@ -33,7 +33,7 @@
 #include "log.h"
 #include "macro.h"
 #include "memory-util.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "process-util.h"
 #include "random-util.h"

src/shared/bpf-program.c

@@ -10,7 +10,7 @@
 #include "fd-util.h"
 #include "log.h"
 #include "memory-util.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "path-util.h"
 
 int bpf_program_new(uint32_t prog_type, BPFProgram **ret) {

src/shared/bus-util.c

@@ -27,6 +27,7 @@
 #include "def.h"
 #include "escape.h"
 #include "fd-util.h"
+#include "missing.h"
 #include "mountpoint-util.h"
 #include "nsflags.h"
 #include "parse-util.h"

src/shared/conf-parser.c

@@ -18,7 +18,7 @@
 #include "fs-util.h"
 #include "log.h"
 #include "macro.h"
-#include "missing_network.h"
+#include "missing.h"
 #include "nulstr-util.h"
 #include "parse-util.h"
 #include "path-util.h"

src/shared/dissect-image.c

@@ -28,6 +28,7 @@
 #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"

src/shared/ethtool-util.c

@@ -10,6 +10,7 @@
 #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"

src/shared/machine-pool.c

@@ -6,7 +6,7 @@
 #include "btrfs-util.h"
 #include "label.h"
 #include "machine-pool.h"
-#include "missing_magic.h"
+#include "missing.h"
 #include "stat-util.h"
 
 static int check_btrfs(void) {

src/shared/serialize.c

@@ -1,14 +1,12 @@
 /* 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_mman.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "serialize.h"

src/shared/switch-root.c

@@ -13,7 +13,7 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "log.h"
-#include "missing_syscall.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"

src/shutdown/shutdown.c

@@ -25,6 +25,7 @@
 #include "fileio.h"
 #include "killall.h"
 #include "log.h"
+#include "missing.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "reboot-util.h"

src/test/meson.build

@@ -775,6 +775,11 @@ tests += [
         [['src/test/test-local-addresses.c'],
          [],
          []],
+
+        [['src/test/test-fido-id-desc.c',
+          'src/udev/fido_id/fido_id_desc.c'],
+         [],
+         []],
 ]
 
 ############################################################

src/test/test-bpf.c

@@ -9,6 +9,7 @@
 #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"