tree-wide: Clean up more includes

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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(

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(

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(

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"

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"

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"

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"

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,

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"

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"

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"

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"

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"

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"
 

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"

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"