headerssss

6 files changed, 31 insertions, 30 deletions

diff --git a/src/grp-network/libnetworkd-core/networkd-link.h b/src/grp-network/libnetworkd-core/networkd-link.h
index 76cdd7e42d..ac10bd41b7 100644
--- a/src/grp-network/libnetworkd-core/networkd-link.h
+++ b/src/grp-network/libnetworkd-core/networkd-link.h
@@ -22,16 +22,16 @@
 #include <endian.h>
 
 #include <systemd/sd-bus.h>
+
+#include "basic/list.h"
+#include "basic/set.h"
+#include "sd-netlink/sd-netlink.h"
 #include "systemd-network/sd-dhcp-client.h"
 #include "systemd-network/sd-dhcp-server.h"
 #include "systemd-network/sd-dhcp6-client.h"
 #include "systemd-network/sd-ipv4ll.h"
 #include "systemd-network/sd-lldp.h"
 #include "systemd-network/sd-ndisc.h"
-#include <systemd/sd-netlink.h>
-
-#include "basic/list.h"
-#include "basic/set.h"
 
 typedef enum LinkState {
         LINK_STATE_PENDING,
diff --git a/src/grp-network/libnetworkd-core/networkd-manager.c b/src/grp-network/libnetworkd-core/networkd-manager.c
index 6226c24b01..8f57e890ae 100644
--- a/src/grp-network/libnetworkd-core/networkd-manager.c
+++ b/src/grp-network/libnetworkd-core/networkd-manager.c
@@ -21,24 +21,25 @@
 #include <linux/if.h>
 
 #include <systemd/sd-daemon.h>
-#include <systemd/sd-netlink.h>
 
 #include "basic/alloc-util.h"
-#include "shared/bus-util.h"
-#include "shared/conf-parser.h"
 #include "basic/def.h"
-#include "shared/dns-domain.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
-#include "libudev-private.h"
-#include "local-addresses.h"
-#include "netlink-util.h"
-#include "networkd.h"
 #include "basic/ordered-set.h"
 #include "basic/path-util.h"
 #include "basic/set.h"
-#include "shared/udev-util.h"
 #include "basic/virt.h"
+#include "sd-netlink/sd-netlink.h"
+#include "shared/bus-util.h"
+#include "shared/conf-parser.h"
+#include "shared/dns-domain.h"
+#include "shared/udev-util.h"
+
+#include "libudev-private.h"
+#include "local-addresses.h"
+#include "netlink-util.h"
+#include "networkd.h"
 
 /* use 8 MB for receive socket kernel queue. */
 #define RCVBUF_SIZE    (8*1024*1024)
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
index fc1d4eb12f..6f55c3ee06 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
@@ -21,15 +21,15 @@
 #include <netinet/ether.h>
 #include <linux/if_bonding.h>
 
-#include <systemd/sd-netlink.h>
-
 #include "basic/alloc-util.h"
-#include "shared/conf-parser.h"
 #include "basic/extract-word.h"
 #include "basic/missing.h"
-#include "networkd-netdev-bond.h"
 #include "basic/string-table.h"
 #include "basic/string-util.h"
+#include "sd-netlink/sd-netlink.h"
+#include "shared/conf-parser.h"
+
+#include "networkd-netdev-bond.h"
 
 /*
  * Number of seconds between instances where the bonding
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
index 16bb8a56e8..1ede86737f 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
@@ -23,16 +23,16 @@
 #include <linux/if_tunnel.h>
 #include <linux/ip6_tunnel.h>
 
-#include <systemd/sd-netlink.h>
-
-#include "shared/conf-parser.h"
 #include "basic/missing.h"
-#include "networkd-link.h"
-#include "networkd-netdev-tunnel.h"
 #include "basic/parse-util.h"
 #include "basic/string-table.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
+#include "sd-netlink/sd-netlink.h"
+#include "shared/conf-parser.h"
+
+#include "networkd-link.h"
+#include "networkd-netdev-tunnel.h"
 
 #define DEFAULT_TNL_HOP_LIMIT   64
 #define IP6_FLOWINFO_FLOWLABEL  htonl(0x000FFFFF)
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev.h b/src/grp-network/libnetworkd-core/networkd-netdev.h
index fcfee9e234..43311852b2 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev.h
@@ -19,10 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <systemd/sd-netlink.h>
-
 #include "basic/list.h"
 #include "basic/time-util.h"
+#include "sd-netlink/sd-netlink.h"
 
 typedef struct netdev_join_callback netdev_join_callback;
 typedef struct Link Link;
diff --git a/src/grp-network/networkctl/networkctl.c b/src/grp-network/networkctl/networkctl.c
index 8d443aef3d..205b051f9a 100644
--- a/src/grp-network/networkctl/networkctl.c
+++ b/src/grp-network/networkctl/networkctl.c
@@ -23,20 +23,14 @@
 
 #include <systemd/sd-device.h>
 #include <systemd/sd-hwdb.h>
-#include "systemd-network/sd-lldp.h"
 #include <systemd/sd-netlink.h>
 #include <systemd/sd-network.h>
 
 #include "basic/alloc-util.h"
 #include "basic/arphrd-list.h"
-#include "device-util.h"
 #include "basic/ether-addr-util.h"
 #include "basic/fd-util.h"
-#include "hwdb-util.h"
-#include "local-addresses.h"
 #include "basic/locale-util.h"
-#include "netlink-util.h"
-#include "shared/pager.h"
 #include "basic/parse-util.h"
 #include "basic/socket-util.h"
 #include "basic/sparse-endian.h"
@@ -48,6 +42,13 @@
 #include "basic/terminal-util.h"
 #include "basic/util.h"
 #include "basic/verbs.h"
+#include "shared/pager.h"
+#include "systemd-network/sd-lldp.h"
+
+#include "device-util.h"
+#include "hwdb-util.h"
+#include "local-addresses.h"
+#include "netlink-util.h"
 
 static bool arg_no_pager = false;
 static bool arg_legend = true;