From: Daan De Meyer Date: Fri, 23 May 2025 10:15:45 +0000 (+0200) Subject: tree-wide: Clean up more includes X-Git-Tag: v258-rc1~495 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ee78fc96e604d0808c3d052c0f7489f7c220d5e;p=thirdparty%2Fsystemd.git tree-wide: Clean up more includes --- diff --git a/src/boot/chid.c b/src/boot/chid.c index a5a90a3b63e..74be7d594f3 100644 --- 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 358fc2582d9..4614609e8a0 100644 --- 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 84a6264fe6d..cfc3dd1bf10 100644 --- 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 9311d918fae..ef79214b5dd 100644 --- 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 855edb35fdb..5c423c21dd6 100644 --- 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 ca9147ec0b2..cb7ded0fd41 100644 --- 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 39f69c6c25c..fba015bcc22 100644 --- 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 3a44138f059..66b8f7cc76b 100644 --- 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 a93d2ddfa65..580a66446a8 100644 --- 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 ab6ed78f4d5..406c40babb6 100644 --- 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 14effff529a..db2ee37f34b 100644 --- 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 9162a5ce427..e8668c583c8 100644 --- 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 ee2f645df3a..25923bdd694 100644 --- 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 9648a508d2a..44289d66586 100644 --- 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 d64c4dd8d81..d4431887097 100644 --- 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 3af3eda6307..c40d7fbff37 100644 --- 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 2a002e3faad..0c79061c024 100644 --- 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 4ead5028f98..0808fee6943 100644 --- 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 7b4384b5239..5ad8cd4c648 100644 --- 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 52c2cb4fc1b..4f27ccc81be 100644 --- 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 b47718e4715..9ad12fb855a 100644 --- 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 2e16c130407..5b29c5ca5c5 100644 --- 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 c0ce30f72dd..e83ff9a787a 100644 --- 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 62112db4bdb..ccc820ec515 100644 --- 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 dcad19ed5d2..44a523ac63a 100644 --- 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 cf36c2bfee3..0c8a2c96c62 100644 --- 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"