network: header cleanup

diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
index 9d3b8d6e4cd9b009506cd2448c4cd4fc5aa9f7e8..9f0e6f25c1e51739fc889fd33394b102d48a33b7 100644 (file)
--- a/src/network/netdev/macsec.c
+++ b/src/network/netdev/macsec.c
@@ -13,7 +13,6 @@
 #include "memory-util.h"
 #include "netlink-util.h"
 #include "network-internal.h"
-#include "networkd-address.h"
 #include "networkd-manager.h"
 #include "path-util.h"
 #include "socket-util.h"

diff --git a/src/network/networkd-address-pool.c b/src/network/networkd-address-pool.c
index 5f5a17071877d302a6f3cf8159ebb4374e17da3f..24a6bff2a1e3fe9593fbff3492e31ac0592da206 100644 (file)
--- a/src/network/networkd-address-pool.c
+++ b/src/network/networkd-address-pool.c
@@ -2,6 +2,7 @@
 
 #include "alloc-util.h"
 #include "networkd-address-pool.h"
+#include "networkd-address.h"
 #include "networkd-manager.h"
 #include "set.h"
 #include "string-util.h"

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index d82d54d418582b70aa028013a031b29a2e941d4f..170adfbbf696e21f24c5446b8a659d6fcc040177 100644 (file)
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -3,20 +3,15 @@
 #include <net/if.h>
 
 #include "alloc-util.h"
-#include "conf-parser.h"
 #include "firewall-util.h"
 #include "memory-util.h"
-#include "missing_network.h"
 #include "netlink-util.h"
 #include "networkd-address.h"
 #include "networkd-manager.h"
-#include "networkd-ndisc.h"
+#include "networkd-network.h"
 #include "parse-util.h"
-#include "set.h"
-#include "socket-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "utf8.h"
 
 #define ADDRESSES_PER_LINK_MAX 2048U
 #define STATIC_ADDRESSES_PER_NETWORK_MAX 1024U

diff --git a/src/network/networkd-address.h b/src/network/networkd-address.h
index b936e3e87abe16c102329cb190d33c250f44cc7d..ec1f51927efab4437ff75fdbd104b1ba789306cb 100644 (file)
--- a/src/network/networkd-address.h
+++ b/src/network/networkd-address.h
@@ -3,26 +3,22 @@
 
 #include <inttypes.h>
 #include <stdbool.h>
+#include <stdio.h>
+
+#include "sd-ipv4acd.h"
 
 #include "conf-parser.h"
 #include "in-addr-util.h"
-
-typedef struct Address Address;
-
 #include "networkd-link.h"
-#include "networkd-network.h"
 #include "networkd-util.h"
 
-#include "sd-ipv4acd.h"
-
 #define CACHE_INFO_INFINITY_LIFE_TIME 0xFFFFFFFFU
 
+typedef struct Manager Manager;
 typedef struct Network Network;
-typedef struct Link Link;
-typedef struct NetworkConfigSection NetworkConfigSection;
 typedef int (*address_ready_callback_t)(Address *address);
 
-struct Address {
+typedef struct Address {
         Network *network;
         NetworkConfigSection *section;
 
@@ -52,7 +48,7 @@ struct Address {
         address_ready_callback_t callback;
 
         sd_ipv4acd *acd;
-};
+} Address;
 
 int address_new(Address **ret);
 Address *address_free(Address *address);

diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
index 9195f0680fe7fd8b33cdd45ef13718306f530587..a0ef756df864d34d1d7545ff4a9f4944b31f1372 100644 (file)
--- a/src/network/networkd-dhcp-server.c
+++ b/src/network/networkd-dhcp-server.c
@@ -4,6 +4,7 @@
 
 #include "fd-util.h"
 #include "fileio.h"
+#include "networkd-address.h"
 #include "networkd-dhcp-server.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"

diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index 18ce0c61bb636ac137f0a7d01b2cf79d9e19fb21..59c68744c0f64a26fb94dd45db6e4ecde4c34deb 100644 (file)
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -11,6 +11,7 @@
 #include "hostname-util.h"
 #include "parse-util.h"
 #include "network-internal.h"
+#include "networkd-address.h"
 #include "networkd-dhcp4.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"

diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index f0642c9f724463acd4d1de038dbedba5b3249859..4b99c5f30843b74441c6ea7295a311cb969c8c42 100644 (file)
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -14,6 +14,7 @@
 #include "hostname-util.h"
 #include "missing_network.h"
 #include "network-internal.h"
+#include "networkd-address.h"
 #include "networkd-dhcp6.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index ef3a20befbb0ae6f0d60e3f40a17ce63a12deb65..00839595912d5dbacca9114211c8ef251df4273b 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -21,6 +21,7 @@
 #include "netlink-util.h"
 #include "network-internal.h"
 #include "networkd-address-label.h"
+#include "networkd-address.h"
 #include "networkd-can.h"
 #include "networkd-dhcp-server.h"
 #include "networkd-dhcp4.h"

diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 361646ec4dd5b546351102bb3ef33e0b4c73abe7..510d3f8c03e2443ef620e58f57d1006b77f20dec 100644 (file)
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -15,7 +15,6 @@
 #include "sd-radv.h"
 #include "sd-netlink.h"
 
-#include "list.h"
 #include "log-link.h"
 #include "network-util.h"
 #include "networkd-util.h"

diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 545574e12666c08d94efa70ea63c463032ebd097..6a21f12907a39ad7a8d35f48f986bb6d6c69508d 100644 (file)
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -9,6 +9,7 @@
 #include "sd-ndisc.h"
 
 #include "missing_network.h"
+#include "networkd-address.h"
 #include "networkd-dhcp6.h"
 #include "networkd-manager.h"
 #include "networkd-ndisc.h"

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 1d899464d8ec4c752722baa3ec876de59b50f234..a5680adc1687c89e59b49d72cb9b280f20856799 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -7,6 +7,7 @@ _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"")
 #include "netem.h"
 #include "network-internal.h"
 #include "networkd-address-label.h"
+#include "networkd-address.h"
 #include "networkd-can.h"
 #include "networkd-conf.h"
 #include "networkd-dhcp-common.h"

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index c1c1ff502e1716ffa930918e99ad53076074a92f..3c6f45c61b3dbb05a79b29be3ac200fcb283a6c3 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -15,6 +15,7 @@
 #include "networkd-dhcp-server.h"
 #include "network-internal.h"
 #include "networkd-address-label.h"
+#include "networkd-address.h"
 #include "networkd-fdb.h"
 #include "networkd-manager.h"
 #include "networkd-mdb.h"

diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
index f6ebda4a144b17f6482a8cc78a541955203340ce..99cce405337084546996c583f6a934b3977fac84 100644 (file)
--- a/src/network/networkd-network.h
+++ b/src/network/networkd-network.h
@@ -12,7 +12,6 @@
 #include "conf-parser.h"
 #include "hashmap.h"
 #include "netdev.h"
-#include "networkd-address.h"
 #include "networkd-brvlan.h"
 #include "networkd-dhcp-common.h"
 #include "networkd-dhcp4.h"