diff --git a/src/basic/missing.h b/src/basic/missing.h index a7ba9bf823..7e14e0a2a4 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h @@ -3,10 +3,6 @@ /* Missing glibc definitions to access certain kernel APIs */ -#include -#include -#include - #include "missing_audit.h" #include "missing_btrfs_tree.h" #include "missing_capability.h" diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h index 37b1bca81a..574d2b73f5 100644 --- a/src/basic/socket-util.h +++ b/src/basic/socket-util.h @@ -1,6 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ #pragma once +#include +#include +#include +#include #include #include #include @@ -8,13 +12,10 @@ #include #include #include -#include -#include -#include #include "macro.h" -#include "missing.h" -#include "util.h" +#include "missing_socket.h" +#include "sparse-endian.h" union sockaddr_union { /* The minimal, abstract version */ diff --git a/src/fuzz/fuzz-ndisc-rs.c b/src/fuzz/fuzz-ndisc-rs.c index 389b545ac2..3a1e60fc5d 100644 --- a/src/fuzz/fuzz-ndisc-rs.c +++ b/src/fuzz/fuzz-ndisc-rs.c @@ -1,7 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ -#include #include +#include +#include #include "alloc-util.h" #include "icmp6-util.h" diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c index e5cd134d57..969fc71051 100644 --- a/src/libsystemd-network/sd-lldp.c +++ b/src/libsystemd-network/sd-lldp.c @@ -2,6 +2,7 @@ #include #include +#include #include "sd-lldp.h" diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c index d88b018dc9..fa94b3cb75 100644 --- a/src/libsystemd-network/test-dhcp6-client.c +++ b/src/libsystemd-network/test-dhcp6-client.c @@ -20,6 +20,7 @@ #include "macro.h" #include "socket-util.h" #include "tests.h" +#include "util.h" #include "virt.h" static struct ether_addr mac_addr = { diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c index 506ed0d73c..38900cf718 100644 --- a/src/libsystemd/sd-bus/bus-dump.c +++ b/src/libsystemd/sd-bus/bus-dump.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ +#include + #include "alloc-util.h" #include "bus-dump.h" #include "bus-internal.h" diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c index 7e90a56e67..d0538104ae 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -9,6 +9,7 @@ #include "bus-slot.h" #include "bus-type.h" #include "bus-util.h" +#include "missing_capability.h" #include "set.h" #include "string-util.h" #include "strv.h" diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c index 92624909e0..2dd3d41a30 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c @@ -10,6 +10,7 @@ #include "bus-util.h" #include "def.h" #include "fd-util.h" +#include "missing_resource.h" #include "time-util.h" #include "util.h" diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index 39def1681e..d5583488f2 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -2,6 +2,7 @@ #include #include +#include #include #include "sd-device.h" diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c index 7748100210..bff2c4976b 100644 --- a/src/libsystemd/sd-resolve/test-resolve.c +++ b/src/libsystemd/sd-resolve/test-resolve.c @@ -14,6 +14,7 @@ #include "macro.h" #include "socket-util.h" #include "string-util.h" +#include "time-util.h" #define TEST_TIMEOUT_USEC (20*USEC_PER_SEC) diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 95489a3d94..285918b4cc 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -27,6 +27,7 @@ #include "local-addresses.h" #include "machine-dbus.h" #include "machine.h" +#include "missing_capability.h" #include "mkdir.h" #include "os-util.h" #include "path-util.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 5296f687a7..3933655bfe 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -13,6 +13,7 @@ #include "env-file.h" #include "fd-util.h" #include "fileio.h" +#include "missing_network.h" #include "netlink-util.h" #include "network-internal.h" #include "networkd-ipv6-proxy-ndp.h" diff --git a/src/network/networkd-lldp-tx.c b/src/network/networkd-lldp-tx.c index 253308e36c..8fd6365e68 100644 --- a/src/network/networkd-lldp-tx.c +++ b/src/network/networkd-lldp-tx.c @@ -8,6 +8,7 @@ #include "env-file.h" #include "fd-util.h" #include "hostname-util.h" +#include "missing_network.h" #include "networkd-lldp-tx.h" #include "networkd-manager.h" #include "parse-util.h" diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c index 1e3fabc450..c4a712ddee 100644 --- a/src/resolve/resolvectl.c +++ b/src/resolve/resolvectl.c @@ -16,7 +16,7 @@ #include "gcrypt-util.h" #include "in-addr-util.h" #include "main-func.h" -#include "missing.h" +#include "missing_network.h" #include "netlink-util.h" #include "pager.h" #include "parse-util.h" diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index 75702d593f..b9fd775526 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -4,6 +4,7 @@ #include "bus-common-errors.h" #include "bus-util.h" #include "dns-domain.h" +#include "missing_capability.h" #include "resolved-bus.h" #include "resolved-def.h" #include "resolved-dns-synthesize.h" diff --git a/src/resolve/resolved-dns-stub.c b/src/resolve/resolved-dns-stub.c index c8c4d829e8..015aabaf9b 100644 --- a/src/resolve/resolved-dns-stub.c +++ b/src/resolve/resolved-dns-stub.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ #include "fd-util.h" +#include "missing_network.h" #include "resolved-dns-stub.h" #include "socket-util.h" diff --git a/src/resolve/resolved-dns-synthesize.c b/src/resolve/resolved-dns-synthesize.c index 9a8ce7ae2d..f65116c3b4 100644 --- a/src/resolve/resolved-dns-synthesize.c +++ b/src/resolve/resolved-dns-synthesize.c @@ -3,6 +3,7 @@ #include "alloc-util.h" #include "hostname-util.h" #include "local-addresses.h" +#include "missing_network.h" #include "resolved-dns-synthesize.h" int dns_synthesize_ifindex(int ifindex) { diff --git a/src/resolve/resolved-dnssd-bus.c b/src/resolve/resolved-dnssd-bus.c index c2db31df0f..24bb37b35e 100644 --- a/src/resolve/resolved-dnssd-bus.c +++ b/src/resolve/resolved-dnssd-bus.c @@ -1,6 +1,7 @@ #include "alloc-util.h" #include "bus-util.h" +#include "missing_capability.h" #include "resolved-dnssd.h" #include "resolved-dnssd-bus.h" #include "resolved-link.h" diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index 2174d660ff..23a7b87801 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -17,6 +17,7 @@ #include "fileio.h" #include "hostname-util.h" #include "io-util.h" +#include "missing_network.h" #include "netlink-util.h" #include "network-internal.h" #include "ordered-set.h" diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index 8110b2cb16..8fe177990a 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -18,9 +18,11 @@ #include "fs-util.h" #include "log.h" #include "macro.h" +#include "missing.h" #include "parse-util.h" #include "path-util.h" #include "process-util.h" +#include "rlimit-util.h" #include "signal-util.h" #include "socket-util.h" #include "string-util.h" @@ -28,7 +30,6 @@ #include "syslog-util.h" #include "time-util.h" #include "utf8.h" -#include "rlimit-util.h" int config_item_table_lookup( const void *table, diff --git a/src/shared/nsflags.c b/src/shared/nsflags.c index a5beb9200f..8cc2d0873d 100644 --- a/src/shared/nsflags.c +++ b/src/shared/nsflags.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ -#include +#include #include "alloc-util.h" #include "extract-word.h" diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c index f902f500e0..07ff487834 100644 --- a/src/test/test-socket-util.c +++ b/src/test/test-socket-util.c @@ -13,6 +13,7 @@ #include "io-util.h" #include "log.h" #include "macro.h" +#include "missing_network.h" #include "process-util.h" #include "socket-util.h" #include "string-util.h" diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c index f2238ae14e..d90ebb7259 100644 --- a/src/udev/udev-ctrl.c +++ b/src/udev/udev-ctrl.c @@ -24,6 +24,7 @@ #include "socket-util.h" #include "strxcpyx.h" #include "udev-ctrl.h" +#include "util.h" /* wire protocol magic must match */ #define UDEV_CTRL_MAGIC 0xdead1dea