find src \( -name '*.h' -o -name '*.c' \) -type f -exec ./fixup_includes {} \;

30 files changed, 92 insertions, 71 deletions

diff --git a/src/grp-network/libnetworkd-core/networkd-address-pool.c b/src/grp-network/libnetworkd-core/networkd-address-pool.c
index 407ef06a09..7b57f6be0e 100644
--- a/src/grp-network/libnetworkd-core/networkd-address-pool.c
+++ b/src/grp-network/libnetworkd-core/networkd-address-pool.c
@@ -18,11 +18,12 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "networkd-address-pool.h"
-#include "networkd.h"
 #include "basic/set.h"
 #include "basic/string-util.h"
 
+#include "networkd-address-pool.h"
+#include "networkd.h"
+
 int address_pool_new(
                 Manager *m,
                 AddressPool **ret,
diff --git a/src/grp-network/libnetworkd-core/networkd-address.c b/src/grp-network/libnetworkd-core/networkd-address.c
index 03b4a3f1b7..3c814db91b 100644
--- a/src/grp-network/libnetworkd-core/networkd-address.c
+++ b/src/grp-network/libnetworkd-core/networkd-address.c
@@ -20,17 +20,18 @@
 #include <net/if.h>
 
 #include "basic/alloc-util.h"
-#include "shared/conf-parser.h"
-#include "firewall-util.h"
-#include "netlink-util.h"
-#include "networkd-address.h"
-#include "networkd.h"
 #include "basic/parse-util.h"
 #include "basic/set.h"
 #include "basic/socket-util.h"
 #include "basic/string-util.h"
 #include "basic/utf8.h"
 #include "basic/util.h"
+#include "firewall-util.h"
+#include "sd-netlink/netlink-util.h"
+#include "shared/conf-parser.h"
+
+#include "networkd-address.h"
+#include "networkd.h"
 
 int address_new(Address **ret) {
         _cleanup_address_free_ Address *address = NULL;
diff --git a/src/grp-network/libnetworkd-core/networkd-conf.c b/src/grp-network/libnetworkd-core/networkd-conf.c
index e022e313e1..e9993f9f32 100644
--- a/src/grp-network/libnetworkd-core/networkd-conf.c
+++ b/src/grp-network/libnetworkd-core/networkd-conf.c
@@ -19,12 +19,13 @@
 
 #include <ctype.h>
 
-#include "shared/conf-parser.h"
 #include "basic/def.h"
-#include "systemd-network/dhcp-identifier.h"
 #include "basic/hexdecoct.h"
-#include "networkd-conf.h"
 #include "basic/string-table.h"
+#include "shared/conf-parser.h"
+#include "systemd-network/dhcp-identifier.h"
+
+#include "networkd-conf.h"
 
 int manager_parse_config_file(Manager *m) {
         assert(m);
diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp4.c b/src/grp-network/libnetworkd-core/networkd-dhcp4.c
index 4fbd9644cd..b74541ed11 100644
--- a/src/grp-network/libnetworkd-core/networkd-dhcp4.c
+++ b/src/grp-network/libnetworkd-core/networkd-dhcp4.c
@@ -17,13 +17,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <netinet/ether.h>
 #include <linux/if.h>
+#include <netinet/ether.h>
 
 #include "basic/alloc-util.h"
-#include "systemd-network/dhcp-lease-internal.h"
 #include "basic/hostname-util.h"
+#include "systemd-network/dhcp-lease-internal.h"
 #include "systemd-network/network-internal.h"
+
 #include "networkd.h"
 
 static int dhcp4_route_handler(sd_netlink *rtnl, sd_netlink_message *m,
diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp6.c b/src/grp-network/libnetworkd-core/networkd-dhcp6.c
index c3d8f1df08..cf2f4e3af5 100644
--- a/src/grp-network/libnetworkd-core/networkd-dhcp6.c
+++ b/src/grp-network/libnetworkd-core/networkd-dhcp6.c
@@ -17,11 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <netinet/ether.h>
 #include <linux/if.h>
+#include <netinet/ether.h>
 
-#include "systemd-network/sd-dhcp6-client.h"
 #include "systemd-network/network-internal.h"
+#include "systemd-network/sd-dhcp6-client.h"
+
 #include "networkd.h"
 
 static int dhcp6_lease_address_acquired(sd_dhcp6_client *client, Link *link);
diff --git a/src/grp-network/libnetworkd-core/networkd-fdb.c b/src/grp-network/libnetworkd-core/networkd-fdb.c
index 75fccea6b9..5f6146d52c 100644
--- a/src/grp-network/libnetworkd-core/networkd-fdb.c
+++ b/src/grp-network/libnetworkd-core/networkd-fdb.c
@@ -21,11 +21,12 @@
 #include <net/if.h>
 
 #include "basic/alloc-util.h"
+#include "basic/util.h"
+#include "sd-netlink/netlink-util.h"
 #include "shared/conf-parser.h"
-#include "netlink-util.h"
+
 #include "networkd-fdb.h"
 #include "networkd.h"
-#include "basic/util.h"
 
 /* create a new FDB entry or get an existing one. */
 int fdb_entry_new_static(Network *const network,
diff --git a/src/grp-network/libnetworkd-core/networkd-ipv4ll.c b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c
index c82525788d..ac7266d0cf 100644
--- a/src/grp-network/libnetworkd-core/networkd-ipv4ll.c
+++ b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c
@@ -17,10 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <netinet/ether.h>
 #include <linux/if.h>
+#include <netinet/ether.h>
 
 #include "systemd-network/network-internal.h"
+
 #include "networkd.h"
 
 static int ipv4ll_address_lost(Link *link) {
diff --git a/src/grp-network/libnetworkd-core/networkd-link-bus.c b/src/grp-network/libnetworkd-core/networkd-link-bus.c
index 86fff49be0..aa352f447a 100644
--- a/src/grp-network/libnetworkd-core/networkd-link-bus.c
+++ b/src/grp-network/libnetworkd-core/networkd-link-bus.c
@@ -18,11 +18,12 @@
 ***/
 
 #include "basic/alloc-util.h"
+#include "basic/parse-util.h"
+#include "basic/strv.h"
 #include "shared/bus-util.h"
+
 #include "networkd-link.h"
 #include "networkd.h"
-#include "basic/parse-util.h"
-#include "basic/strv.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_operational_state, link_operstate, LinkOperationalState);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_administrative_state, link_state, LinkState);
diff --git a/src/grp-network/libnetworkd-core/networkd-link.c b/src/grp-network/libnetworkd-core/networkd-link.c
index 45ff76c5ec..53c3712cb6 100644
--- a/src/grp-network/libnetworkd-core/networkd-link.c
+++ b/src/grp-network/libnetworkd-core/networkd-link.c
@@ -17,26 +17,27 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <netinet/ether.h>
 #include <linux/if.h>
+#include <netinet/ether.h>
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "shared/bus-util.h"
-#include "systemd-network/dhcp-lease-internal.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
-#include "netlink-util.h"
-#include "systemd-network/network-internal.h"
-#include "networkd.h"
-#include "networkd-lldp-tx.h"
 #include "basic/set.h"
 #include "basic/socket-util.h"
 #include "basic/stdio-util.h"
 #include "basic/string-table.h"
-#include "shared/udev-util.h"
 #include "basic/util.h"
 #include "basic/virt.h"
+#include "sd-netlink/netlink-util.h"
+#include "shared/bus-util.h"
+#include "shared/udev-util.h"
+#include "systemd-network/dhcp-lease-internal.h"
+#include "systemd-network/network-internal.h"
+
+#include "networkd-lldp-tx.h"
+#include "networkd.h"
 
 static bool link_dhcp6_enabled(Link *link) {
         assert(link);
diff --git a/src/grp-network/libnetworkd-core/networkd-lldp-tx.c b/src/grp-network/libnetworkd-core/networkd-lldp-tx.c
index 52c056e694..6a015ec24f 100644
--- a/src/grp-network/libnetworkd-core/networkd-lldp-tx.c
+++ b/src/grp-network/libnetworkd-core/networkd-lldp-tx.c
@@ -25,14 +25,15 @@
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/hostname-util.h"
-#include "networkd-lldp-tx.h"
-#include "networkd.h"
 #include "basic/parse-util.h"
 #include "basic/random-util.h"
 #include "basic/socket-util.h"
 #include "basic/string-util.h"
 #include "basic/unaligned.h"
 
+#include "networkd-lldp-tx.h"
+#include "networkd.h"
+
 /* The LLDP spec calls this "txFastInit", see 9.2.5.19 */
 #define LLDP_TX_FAST_INIT 4U
 
diff --git a/src/grp-network/libnetworkd-core/networkd-manager-bus.c b/src/grp-network/libnetworkd-core/networkd-manager-bus.c
index b6cbba5a85..53652953fe 100644
--- a/src/grp-network/libnetworkd-core/networkd-manager-bus.c
+++ b/src/grp-network/libnetworkd-core/networkd-manager-bus.c
@@ -19,6 +19,7 @@
 
 #include "basic/alloc-util.h"
 #include "shared/bus-util.h"
+
 #include "networkd.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_operational_state, link_operstate, LinkOperationalState);
diff --git a/src/grp-network/libnetworkd-core/networkd-manager.c b/src/grp-network/libnetworkd-core/networkd-manager.c
index 8f57e890ae..5ce81223bf 100644
--- a/src/grp-network/libnetworkd-core/networkd-manager.c
+++ b/src/grp-network/libnetworkd-core/networkd-manager.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
-#include <sys/socket.h>
 #include <linux/if.h>
+#include <sys/socket.h>
 
 #include <systemd/sd-daemon.h>
 
@@ -30,15 +30,15 @@
 #include "basic/path-util.h"
 #include "basic/set.h"
 #include "basic/virt.h"
+#include "libudev-private.h"
+#include "sd-netlink/local-addresses.h"
+#include "sd-netlink/netlink-util.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. */
diff --git a/src/grp-network/libnetworkd-core/networkd-ndisc.c b/src/grp-network/libnetworkd-core/networkd-ndisc.c
index 1033ccc342..5480cc465d 100644
--- a/src/grp-network/libnetworkd-core/networkd-ndisc.c
+++ b/src/grp-network/libnetworkd-core/networkd-ndisc.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <linux/if.h>
 #include <netinet/ether.h>
 #include <netinet/icmp6.h>
 #include <netinet/in.h>
-#include <linux/if.h>
 
 #include "systemd-network/sd-ndisc.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
index 6f55c3ee06..12e5e58159 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
@@ -18,8 +18,8 @@
     along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <netinet/ether.h>
 #include <linux/if_bonding.h>
+#include <netinet/ether.h>
 
 #include "basic/alloc-util.h"
 #include "basic/extract-word.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c
index bb07ec59a6..54ef059df0 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c
@@ -21,9 +21,10 @@
 #include <net/if.h>
 
 #include "basic/missing.h"
-#include "netlink-util.h"
-#include "networkd.h"
+#include "sd-netlink/netlink-util.h"
+
 #include "networkd-netdev-bridge.h"
+#include "networkd.h"
 
 /* callback for brige netdev's parameter set */
 static int netdev_bridge_set_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c
index e388fa6567..724fc86f92 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c
@@ -19,9 +19,10 @@
 
 #include <net/if.h>
 
+#include "basic/string-table.h"
 #include "shared/conf-parser.h"
+
 #include "networkd-netdev-ipvlan.h"
-#include "basic/string-table.h"
 
 static const char* const ipvlan_mode_table[_NETDEV_IPVLAN_MODE_MAX] = {
         [NETDEV_IPVLAN_MODE_L2] = "L2",
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h
index 00ad769756..a7ccd4922a 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h
@@ -20,6 +20,7 @@
 ***/
 
 #include "basic/missing.h"
+
 #include "networkd-netdev.h"
 
 typedef enum IPVlanMode {
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c
index 030ec51b15..bf559f1b46 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c
@@ -19,9 +19,10 @@
 
 #include <net/if.h>
 
+#include "basic/string-table.h"
 #include "shared/conf-parser.h"
+
 #include "networkd-netdev-macvlan.h"
-#include "basic/string-table.h"
 
 static const char* const macvlan_mode_table[_NETDEV_MACVLAN_MODE_MAX] = {
         [NETDEV_MACVLAN_MODE_PRIVATE] = "private",
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
index 1ede86737f..eaee167506 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
@@ -18,10 +18,10 @@
 ***/
 
 #include <arpa/inet.h>
-#include <net/if.h>
-#include <linux/ip.h>
 #include <linux/if_tunnel.h>
+#include <linux/ip.h>
 #include <linux/ip6_tunnel.h>
+#include <net/if.h>
 
 #include "basic/missing.h"
 #include "basic/parse-util.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c
index 1f0752cd0a..5232f77ba8 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c
@@ -27,9 +27,10 @@
 
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
-#include "networkd-netdev-tuntap.h"
 #include "basic/user-util.h"
 
+#include "networkd-netdev-tuntap.h"
+
 #define TUN_DEV "/dev/net/tun"
 
 static int netdev_fill_tuntap_message(NetDev *netdev, struct ifreq *ifr) {
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-veth.c b/src/grp-network/libnetworkd-core/networkd-netdev-veth.c
index 185b441c5a..b25d468aa4 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-veth.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-veth.c
@@ -17,10 +17,10 @@
     along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <net/if.h>
 #include <linux/veth.h>
+#include <net/if.h>
 
-#include <systemd/sd-netlink.h>
+#include "sd-netlink/sd-netlink.h"
 
 #include "networkd-netdev-veth.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c
index 1a36e8609f..8c611ac5db 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c
@@ -19,13 +19,12 @@
 
 #include <net/if.h>
 
-#include <systemd/sd-netlink.h>
-
-#include "shared/conf-parser.h"
 #include "basic/alloc-util.h"
 #include "basic/extract-word.h"
-#include "basic/parse-util.h"
 #include "basic/missing.h"
+#include "basic/parse-util.h"
+#include "sd-netlink/sd-netlink.h"
+#include "shared/conf-parser.h"
 
 #include "networkd-link.h"
 #include "networkd-netdev-vxlan.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h
index 097e4e2369..6e8393145e 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h
@@ -22,6 +22,7 @@
 typedef struct VxLan VxLan;
 
 #include "basic/in-addr-util.h"
+
 #include "networkd-netdev.h"
 
 #define VXLAN_VID_MAX (1u << 24) - 1
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev.c b/src/grp-network/libnetworkd-core/networkd-netdev.c
index dc4cad9c33..c421042196 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev.c
@@ -21,17 +21,18 @@
 
 #include "basic/alloc-util.h"
 #include "basic/conf-files.h"
-#include "shared/conf-parser.h"
 #include "basic/fd-util.h"
 #include "basic/list.h"
-#include "netlink-util.h"
-#include "systemd-network/network-internal.h"
-#include "networkd-netdev.h"
-#include "networkd.h"
 #include "basic/siphash24.h"
 #include "basic/stat-util.h"
 #include "basic/string-table.h"
 #include "basic/string-util.h"
+#include "sd-netlink/netlink-util.h"
+#include "shared/conf-parser.h"
+#include "systemd-network/network-internal.h"
+
+#include "networkd-netdev.h"
+#include "networkd.h"
 
 const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = {
 
diff --git a/src/grp-network/libnetworkd-core/networkd-network-bus.c b/src/grp-network/libnetworkd-core/networkd-network-bus.c
index f218cf624c..572c0913a9 100644
--- a/src/grp-network/libnetworkd-core/networkd-network-bus.c
+++ b/src/grp-network/libnetworkd-core/networkd-network-bus.c
@@ -18,10 +18,11 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "networkd.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
 
+#include "networkd.h"
+
 static int property_get_ether_addrs(
                 sd_bus *bus,
                 const char *path,
diff --git a/src/grp-network/libnetworkd-core/networkd-network.c b/src/grp-network/libnetworkd-core/networkd-network.c
index 715be97d13..2895fd4bd9 100644
--- a/src/grp-network/libnetworkd-core/networkd-network.c
+++ b/src/grp-network/libnetworkd-core/networkd-network.c
@@ -22,19 +22,20 @@
 
 #include "basic/alloc-util.h"
 #include "basic/conf-files.h"
-#include "shared/conf-parser.h"
-#include "shared/dns-domain.h"
 #include "basic/fd-util.h"
 #include "basic/hostname-util.h"
-#include "systemd-network/network-internal.h"
-#include "networkd-network.h"
-#include "networkd.h"
 #include "basic/parse-util.h"
 #include "basic/set.h"
 #include "basic/stat-util.h"
 #include "basic/string-table.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
+#include "shared/conf-parser.h"
+#include "shared/dns-domain.h"
+#include "systemd-network/network-internal.h"
+
+#include "networkd-network.h"
+#include "networkd.h"
 
 static int network_load_one(Manager *manager, const char *filename) {
         _cleanup_network_free_ Network *network = NULL;
diff --git a/src/grp-network/libnetworkd-core/networkd-network.h b/src/grp-network/libnetworkd-core/networkd-network.h
index 3d77524bba..fdf76b8924 100644
--- a/src/grp-network/libnetworkd-core/networkd-network.h
+++ b/src/grp-network/libnetworkd-core/networkd-network.h
@@ -20,12 +20,12 @@
 ***/
 
 #include <systemd/sd-bus.h>
-#include "udev.h"
 
-#include "shared/condition.h"
-#include "systemd-network/dhcp-identifier.h"
 #include "basic/hashmap.h"
+#include "shared/condition.h"
 #include "shared/resolve-util.h"
+#include "systemd-network/dhcp-identifier.h"
+#include "udev.h"
 
 #include "networkd-address.h"
 #include "networkd-fdb.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-route.c b/src/grp-network/libnetworkd-core/networkd-route.c
index ee34a7df01..974a7fa847 100644
--- a/src/grp-network/libnetworkd-core/networkd-route.c
+++ b/src/grp-network/libnetworkd-core/networkd-route.c
@@ -18,15 +18,16 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "shared/conf-parser.h"
 #include "basic/in-addr-util.h"
-#include "netlink-util.h"
-#include "networkd-route.h"
-#include "networkd.h"
 #include "basic/parse-util.h"
 #include "basic/set.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
+#include "sd-netlink/netlink-util.h"
+#include "shared/conf-parser.h"
+
+#include "networkd-route.h"
+#include "networkd.h"
 
 int route_new(Route **ret) {
         _cleanup_route_free_ Route *route = NULL;
diff --git a/src/grp-network/libnetworkd-core/networkd-util.c b/src/grp-network/libnetworkd-core/networkd-util.c
index 7fb2fb26d2..e5a5bce8cb 100644
--- a/src/grp-network/libnetworkd-core/networkd-util.c
+++ b/src/grp-network/libnetworkd-core/networkd-util.c
@@ -17,12 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "shared/conf-parser.h"
-#include "networkd-util.h"
 #include "basic/parse-util.h"
 #include "basic/string-table.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
+#include "shared/conf-parser.h"
+
+#include "networkd-util.h"
 
 const char *address_family_boolean_to_string(AddressFamilyBoolean b) {
         if (b == ADDRESS_FAMILY_YES ||
diff --git a/src/grp-network/libnetworkd-core/networkd.h b/src/grp-network/libnetworkd-core/networkd.h
index a3ae0b988b..cfee5dd045 100644
--- a/src/grp-network/libnetworkd-core/networkd.h
+++ b/src/grp-network/libnetworkd-core/networkd.h
@@ -23,12 +23,12 @@
 
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
-#include <systemd/sd-netlink.h>
-#include "udev.h"
 
-#include "systemd-network/dhcp-identifier.h"
 #include "basic/hashmap.h"
 #include "basic/list.h"
+#include "sd-netlink/sd-netlink.h"
+#include "systemd-network/dhcp-identifier.h"
+#include "udev.h"
 
 #include "networkd-address-pool.h"
 #include "networkd-link.h"