tree-wide: Clean up more includes

diff --git a/src/boot/chid.c b/src/boot/chid.c
index a5a90a3b63e4e2f0e1faeff1c80d392a736fc6d1..74be7d594f31d46c58b47c15aff7df789e136ec2 100644 (file)
--- a/src/boot/chid.c
+++ b/src/boot/chid.c
@@ -17,7 +17,9 @@
 #include "chid.h"
 #include "chid-fundamental.h"
 #include "edid.h"
+#if SD_BOOT
 #include "efi-log.h"
+#endif
 #include "efi-string.h"
 #include "smbios.h"
 #include "util.h"

diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index 358fc2582d940db5c89059bbe0472c112272b07d..4614609e8a02bd6d8b288990cc1acab049936b6f 100644 (file)
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -13,7 +13,6 @@
 #include "escape.h"
 #include "extract-word.h"
 #include "fd-util.h"
-#include "fileio.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "hashmap.h"

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 84a6264fe6d61ee93709229a24579d93d6d863a8..cfc3dd1bf1031ef73da0c53727b4f7a81f3580a8 100644 (file)
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -10,7 +10,6 @@
 #include "device-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
-#include "fileio.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "hashmap.h"

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 9311d918faefe7d7cd93fb4bc36acb2af946dbab..ef79214b5dd09135d3cfd08b696b834ba2599903 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -21,10 +21,8 @@
 #include "devnum-util.h"
 #include "env-file.h"
 #include "errno-util.h"
-#include "escape.h"
 #include "extract-word.h"
 #include "fd-util.h"
-#include "fileio.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "hashmap.h"

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 855edb35fdba8bcdbf198720f0837c1c1bc1835a..5c423c21dd6fc6857e210514916c51c23a6a3513 100644 (file)
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -14,7 +14,6 @@
 #include "errno-util.h"
 #include "escape.h"
 #include "fd-util.h"
-#include "fileio.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "hashmap.h"

diff --git a/src/network/netdev/ipoib.c b/src/network/netdev/ipoib.c
index ca9147ec0b26d8e14eb0f983e44408faeb8ff439..cb7ded0fd41aa7e2a1b51812ce5106dc2a762e0e 100644 (file)
--- a/src/network/netdev/ipoib.c
+++ b/src/network/netdev/ipoib.c
@@ -7,6 +7,7 @@
 
 #include "conf-parser.h"
 #include "ipoib.h"
+#include "networkd-link.h"
 #include "networkd-network.h"
 #include "parse-util.h"
 #include "string-table.h"

diff --git a/src/network/netdev/l2tp-tunnel.c b/src/network/netdev/l2tp-tunnel.c
index 39f69c6c25caa0d32cd3b443c32a02018a17b878..fba015bcc22c201f727e67d0242a8570b5057fa0 100644 (file)
--- a/src/network/netdev/l2tp-tunnel.c
+++ b/src/network/netdev/l2tp-tunnel.c
@@ -12,6 +12,7 @@
 #include "l2tp-tunnel.h"
 #include "netlink-util.h"
 #include "networkd-address.h"
+#include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-route-util.h"
 #include "set.h"

diff --git a/src/network/netdev/macvlan.c b/src/network/netdev/macvlan.c
index 3a44138f059f713561ec853a85b37dcf04ba076b..66b8f7cc76b6b006dc4a7c3dcd0c5f030477eace 100644 (file)
--- a/src/network/netdev/macvlan.c
+++ b/src/network/netdev/macvlan.c
@@ -7,6 +7,7 @@
 #include "conf-parser.h"
 #include "macvlan.h"
 #include "macvlan-util.h"
+#include "networkd-link.h"
 #include "networkd-network.h"
 #include "parse-util.h"
 #include "set.h"

diff --git a/src/network/networkd-address-pool.c b/src/network/networkd-address-pool.c
index a93d2ddfa65aaa7bba59f80a29f50bf3efa9fcca..580a66446a8ea1b0b14a5426723af4801961e01e 100644 (file)
--- a/src/network/networkd-address-pool.c
+++ b/src/network/networkd-address-pool.c
@@ -3,6 +3,7 @@
 #include "alloc-util.h"
 #include "networkd-address.h"
 #include "networkd-address-pool.h"
+#include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-queue.h"
 #include "ordered-set.h"

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index ab6ed78f4d5dcce874301611958c7ce18480bb42..406c40babb62522173eeccacde9e2d8396320bef 100644 (file)
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -21,6 +21,7 @@
 #include "networkd-dhcp-prefix-delegation.h"
 #include "networkd-dhcp-server.h"
 #include "networkd-ipv4acd.h"
+#include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-ndisc.h"
 #include "networkd-netlabel.h"

diff --git a/src/network/networkd-dhcp-server-bus.c b/src/network/networkd-dhcp-server-bus.c
index 14effff529a0a3c41d976f54528743def2ed45de..db2ee37f34be621fce2b192fa6a8f81cb522e08d 100644 (file)
--- a/src/network/networkd-dhcp-server-bus.c
+++ b/src/network/networkd-dhcp-server-bus.c
@@ -8,6 +8,7 @@
 #include "hashmap.h"
 #include "networkd-dhcp-server-bus.h"
 #include "networkd-link-bus.h"
+#include "networkd-link.h"
 #include "networkd-manager.h"
 
 static int property_get_leases(

diff --git a/src/network/networkd-dhcp4-bus.c b/src/network/networkd-dhcp4-bus.c
index 9162a5ce427d5e407b99bc2ff2cf2ff5722ba55b..e8668c583c87230d364762f9e99219b463664b4d 100644 (file)
--- a/src/network/networkd-dhcp4-bus.c
+++ b/src/network/networkd-dhcp4-bus.c
@@ -8,6 +8,7 @@
 #include "dhcp-client-internal.h"
 #include "networkd-dhcp4-bus.h"
 #include "networkd-link-bus.h"
+#include "networkd-link.h"
 #include "networkd-manager.h"
 
 static int property_get_dhcp_client_state(

diff --git a/src/network/networkd-dhcp6-bus.c b/src/network/networkd-dhcp6-bus.c
index ee2f645df3aa27b94c696fae3d0a679c6df6afe6..25923bdd6949d28afc3fc5cd6db5e77934e6d343 100644 (file)
--- a/src/network/networkd-dhcp6-bus.c
+++ b/src/network/networkd-dhcp6-bus.c
@@ -8,6 +8,7 @@
 #include "dhcp6-protocol.h"
 #include "networkd-dhcp6-bus.h"
 #include "networkd-link-bus.h"
+#include "networkd-link.h"
 #include "networkd-manager.h"
 
 static int property_get_dhcp6_client_state(

diff --git a/src/network/networkd-dns.c b/src/network/networkd-dns.c
index 9648a508d2a98cb4077b48bba8cb16c2b5665f01..44289d665865b95e327a7051d696d18d28c8a02a 100644 (file)
--- a/src/network/networkd-dns.c
+++ b/src/network/networkd-dns.c
@@ -6,6 +6,7 @@
 #include "extract-word.h"
 #include "hostname-util.h"
 #include "networkd-dns.h"
+#include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-network.h"
 #include "ordered-set.h"

diff --git a/src/network/networkd-manager-varlink.c b/src/network/networkd-manager-varlink.c
index d64c4dd8d81dbda54fbed62cff1facf71c2f3f3d..d44318870979ee16aece102b8d94f3a59d66de17 100644 (file)
--- a/src/network/networkd-manager-varlink.c
+++ b/src/network/networkd-manager-varlink.c
@@ -12,6 +12,7 @@
 #include "lldp-rx-internal.h"
 #include "network-util.h"
 #include "networkd-dhcp-server.h"
+#include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-manager-varlink.h"
 #include "stat-util.h"

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 3af3eda63076be57cd0d4bc326f766fa81bf8d37..c40d7fbff37eeefbecfd76839fdb61449c630c71 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -30,6 +30,7 @@
 #include "networkd-address.h"
 #include "networkd-address-label.h"
 #include "networkd-address-pool.h"
+#include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-manager-bus.h"
 #include "networkd-manager-varlink.h"

diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 2a002e3faad7b2db8780b609f06ac57bdd93a898..0c79061c024d1143484dc63e354a6229c67893b0 100644 (file)
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -17,6 +17,7 @@
 #include "networkd-address.h"
 #include "networkd-address-generation.h"
 #include "networkd-dhcp6.h"
+#include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-ndisc.h"
 #include "networkd-nexthop.h"

diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
index 4ead5028f9821afba231e52b576f8ff5bd0a7cf6..0808fee6943899136390894f2d7a66f2cf5d3a33 100644 (file)
--- a/src/network/networkd-network.h
+++ b/src/network/networkd-network.h
@@ -9,16 +9,18 @@
 #include "ipoib.h"
 #include "net-condition.h"
 #include "network-util.h"
+#include "networkd-bridge-vlan.h"
 #include "networkd-dhcp-common.h"
 #include "networkd-dhcp4.h"
 #include "networkd-dhcp6.h"
 #include "networkd-dns.h"
 #include "networkd-forward.h"
-#include "networkd-link.h"
+#include "networkd-ipv6ll.h"
 #include "networkd-lldp-rx.h"
 #include "networkd-ndisc.h"
 #include "networkd-radv.h"
 #include "networkd-sysctl.h"
+#include "resolve-util.h"
 
 typedef enum KeepConfiguration {
         KEEP_CONFIGURATION_NO               = 0,

diff --git a/src/network/networkd-route-nexthop.c b/src/network/networkd-route-nexthop.c
index 7b4384b523910365f6702276c3a6a9e25cf9f1ff..5ad8cd4c6485ff8c392a9ce81716f25de213cd18 100644 (file)
--- a/src/network/networkd-route-nexthop.c
+++ b/src/network/networkd-route-nexthop.c
@@ -9,6 +9,7 @@
 #include "conf-parser.h"
 #include "extract-word.h"
 #include "netlink-util.h"
+#include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-network.h"
 #include "networkd-nexthop.h"

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 52c2cb4fc1b2354d09f837a54c41b1d1afb750b5..4f27ccc81be085c1f5ed9b8175e8bcdfc68734f9 100644 (file)
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -14,6 +14,7 @@
 #include "netlink-util.h"
 #include "networkd-address.h"
 #include "networkd-ipv4ll.h"
+#include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-network.h"
 #include "networkd-nexthop.h"

diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c
index b47718e4715314a345c6863a5a391800fc8f080c..9ad12fb855a7657ddbb425e3500c98c1979baba1 100644 (file)
--- a/src/network/networkd-routing-policy-rule.c
+++ b/src/network/networkd-routing-policy-rule.c
@@ -10,6 +10,7 @@
 #include "hashmap.h"
 #include "netlink-util.h"
 #include "network-util.h"
+#include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-queue.h"
 #include "networkd-route-util.h"

diff --git a/src/network/networkd-wiphy.c b/src/network/networkd-wiphy.c
index 2e16c130407fb395148a65bda2932f900f440fda..5b29c5ca5c5e94be53c3897de60552d9257548a2 100644 (file)
--- a/src/network/networkd-wiphy.c
+++ b/src/network/networkd-wiphy.c
@@ -10,6 +10,7 @@
 #include "device-util.h"
 #include "errno-util.h"
 #include "hashmap.h"
+#include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-wiphy.h"
 #include "path-util.h"

diff --git a/src/portable/portable.h b/src/portable/portable.h
index c0ce30f72dd6e42b3dff11ddeebaf2bdbd037344..e83ff9a787aa79a712e7a48934453f86e21e19b3 100644 (file)
--- a/src/portable/portable.h
+++ b/src/portable/portable.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "dissect-image.h"
 #include "forward.h"
 #include "runtime-scope.h"
 #include "string-util.h"

diff --git a/src/repart/repart.c b/src/repart/repart.c
index 62112db4bdb269c17ed678db28138631ae2f626d..ccc820ec515430963cb28a8f2ed5ef7eb4f6fdf5 100644 (file)
--- a/src/repart/repart.c
+++ b/src/repart/repart.c
@@ -76,7 +76,6 @@
 #include "tmpfile-util.h"
 #include "tpm2-pcr.h"
 #include "tpm2-util.h"
-#include "user-util.h"
 #include "utf8.h"
 #include "xattr-util.h"
 

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index dcad19ed5d20a4db8ea55fefdfe3946e151894b3..44a523ac63ae445c141e0a11ed18b7a996036e99 100644 (file)
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -54,7 +54,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "time-util.h"
-#include "user-util.h"
 #include "varlink-io.systemd.sysext.h"
 #include "varlink-util.h"
 #include "verbs.h"

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index cf36c2bfee3129789ed95756961b53ced68bc378..0c8a2c96c623757521ec68e7249c629ee93a85d8 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -9,7 +9,6 @@
 #include "bus-print-properties.h"
 #include "bus-util.h"
 #include "capsule-util.h"
-#include "dissect-image.h"
 #include "extract-word.h"
 #include "image-policy.h"
 #include "install.h"