networkd: rework headers to avoid circular includes

[thirdparty/systemd.git] / src / network / networkd.h

diff --git a/src/network/networkd.h b/src/network/networkd.h
index 72a2438ac8db5d5f88fffe2c71448f3dffb30d80..39826a440de7e4221921ab03b866c40e84114dc0 100644 (file)
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -24,19 +24,30 @@
 #include "sd-bus.h"
 #include "sd-event.h"
 #include "sd-netlink.h"
+#include "udev.h"
 
+#include "dhcp-identifier.h"
 #include "hashmap.h"
 #include "list.h"
-#include "udev.h"
 
-typedef struct Manager Manager;
-
-#include "dhcp-identifier.h"
 #include "networkd-address-pool.h"
 #include "networkd-link.h"
+#include "networkd-netdev-bond.h"
+#include "networkd-netdev-bridge.h"
+#include "networkd-netdev-dummy.h"
+#include "networkd-netdev-ipvlan.h"
+#include "networkd-netdev-macvlan.h"
+#include "networkd-netdev-tunnel.h"
+#include "networkd-netdev-tuntap.h"
+#include "networkd-netdev-veth.h"
+#include "networkd-netdev-vlan.h"
+#include "networkd-netdev-vlan.h"
+#include "networkd-netdev-vxlan.h"
 #include "networkd-network.h"
 #include "networkd-util.h"
 
+extern const char* const network_dirs[];
+
 struct Manager {
         sd_netlink *rtnl;
         sd_event *event;
@@ -71,10 +82,6 @@ struct Manager {
         uint8_t dhcp_duid[MAX_DUID_LEN];
 };
 
-extern const char* const network_dirs[];
-
-/* Manager */
-
 extern const sd_bus_vtable manager_vtable[];
 
 int manager_new(Manager **ret);