util: drop missing.h from socket-util.h

diff --git a/src/basic/missing.h b/src/basic/missing.h
index a7ba9bf823be1f1d2686e0b2fc02ecc466cee9bc..7e14e0a2a401f6137244c136e0054060838fb580 100644 (file)
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@ -3,10 +3,6 @@
 
 /* Missing glibc definitions to access certain kernel APIs */
 
-#include <errno.h>
-#include <inttypes.h>
-#include <sys/syscall.h>
-
 #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 37b1bca81a8e104ffea667f1265867e06a5e61ec..574d2b73f5627e8dc52194a8ac4cbd3996bfbad5 100644 (file)
--- 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 <inttypes.h>
+#include <linux/netlink.h>
+#include <linux/if_infiniband.h>
+#include <linux/if_packet.h>
 #include <netinet/ether.h>
 #include <netinet/in.h>
 #include <stdbool.h>
@@ -8,13 +12,10 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/un.h>
-#include <linux/netlink.h>
-#include <linux/if_infiniband.h>
-#include <linux/if_packet.h>
 
 #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 389b545ac27ce14801d07727e5b8e394f0153bb3..3a1e60fc5dd4db82f286a94449c4ff45ea8eb8ed 100644 (file)
--- 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 <netinet/icmp6.h>
 #include <arpa/inet.h>
+#include <netinet/icmp6.h>
+#include <unistd.h>
 
 #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 e5cd134d57f74d3149e697c57f3d7dd8d883afa2..969fc71051bcead68d4eed3096e30381fa9a6869 100644 (file)
--- a/src/libsystemd-network/sd-lldp.c
+++ b/src/libsystemd-network/sd-lldp.c
@@ -2,6 +2,7 @@
 
 #include <arpa/inet.h>
 #include <linux/sockios.h>
+#include <sys/ioctl.h>
 
 #include "sd-lldp.h"
 

diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c
index d88b018dc9432d073e22ca397875f7bb89e31469..fa94b3cb7529bb632aaa1947e1cf35e63a90069f 100644 (file)
--- 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 506ed0d73c3303444258796b490217f7e7c032d6..38900cf718be84051211bd2ab2d37980b3085f17 100644 (file)
--- 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 <sys/time.h>
+
 #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 7e90a56e6774689e681f414bdba755e57a225a78..d0538104ae251100f2e1ffd1f366040d646d6bfc 100644 (file)
--- 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 92624909e00132245fe84aab2f25bd8357ee8b0c..2dd3d41a302a290b6c9409e26ce1292909d3ac2d 100644 (file)
--- 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 39def1681eeb22697b83fe19940325f63621fee1..d5583488f20ce828fb430ba20ab77b60b22aecef 100644 (file)
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libsystemd/sd-device/sd-device.c
@@ -2,6 +2,7 @@
 
 #include <ctype.h>
 #include <net/if.h>
+#include <sys/ioctl.h>
 #include <sys/types.h>
 
 #include "sd-device.h"

diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c
index 77481002106f673a06583df12d31158beedc3381..bff2c4976b9e5d4b171c60b0ac9a18a20e97cb68 100644 (file)
--- 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 95489a3d9492982a4b444f0334b905bedac19a17..285918b4cc5c63f9badd98718a8371924e953ac9 100644 (file)
--- 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 5296f687a78bc6888ceb47f2a020b62c85b122a6..3933655bfe9ca462ed67278c22e230df2de9134c 100644 (file)
--- 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 253308e36cd3129f4aeb6a38fb1806689d649472..8fd6365e68b42870ba5c719d91dcfce59ccc383c 100644 (file)
--- 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 1e3fabc450bfa85a8fede5920ffdfc6289ce8a37..c4a712ddee3205305cf10c121735147ae713910d 100644 (file)
--- 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 75702d593f41a607c759f38b056400f13cb76f15..b9fd77552612229cc137dd447704f9454cbb4b78 100644 (file)
--- 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 c8c4d829e844840a993ee23f19d657aeb5121be7..015aabaf9bb5f19c7c14e4413e422c45fbcd52ca 100644 (file)
--- 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 9a8ce7ae2d8dfdbd97ca8216310f86d07bcbec76..f65116c3b45462f93109267c6386aa1422c97ca0 100644 (file)
--- 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 c2db31df0fdfd8dde3bdbd6249fb02b875e9c34d..24bb37b35e848eaaf59195267ad887046f94b508 100644 (file)
--- 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 2174d660ff0e781f97d014ae1a0074b521907ffa..23a7b87801c940bf0667f34992dbffe813b42025 100644 (file)
--- 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 8110b2cb16884e66bc8f2e0250463365d3780148..8fe177990a6b7ae975f4d9cff0b1d94ad1b19546 100644 (file)
--- 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 a5beb9200fafbcaeaa01c0a3d798c6cdd0543737..8cc2d0873db2da20252a4f37d0f00c1024512792 100644 (file)
--- a/src/shared/nsflags.c
+++ b/src/shared/nsflags.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <sched.h>
+#include <errno.h>
 
 #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 f902f500e0cc349052a0572bb88ce58498bb94b1..07ff4878340f057d8dfd10733e4f4613b67ffd42 100644 (file)
--- 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 f2238ae14edd8e6686dd79ddb423956c58f5f266..d90ebb72599fdfbdf147f02d7c9c9e2d4b5685ea 100644 (file)
--- 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