tree-wide: Sort includes

This was done by running a locally built clang-format with
https://github.com/llvm/llvm-project/pull/137617 and
https://github.com/llvm/llvm-project/pull/137840 applied on all .c
and .h files.

src/network/netdev/bareudp.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 
-#include <netinet/in.h>
 #include <linux/if_arp.h>
+#include <netinet/in.h>
 
 #include "bareudp.h"
 #include "netlink-util.h"

src/network/netdev/batadv.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <inttypes.h>
-#include <netinet/in.h>
 #include <linux/genetlink.h>
 #include <linux/if_arp.h>
+#include <netinet/in.h>
 
 #include "batadv.h"
 #include "fileio.h"

src/network/netdev/bond.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <netinet/in.h>
 #include <linux/if_arp.h>
+#include <netinet/in.h>
 
 #include "alloc-util.h"
 #include "bond.h"

src/network/netdev/bond.h

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <netinet/in.h>
 #include <linux/if_bonding.h>
+#include <netinet/in.h>
 
 #include "bond-util.h"
 #include "macro.h"

src/network/netdev/bridge.c

@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <linux/if_arp.h>
 #include <linux/if_bridge.h>
+#include <net/if.h>
 #include <netinet/in.h>
 
 #include "bridge.h"

src/network/netdev/fou-tunnel.c

@@ -1,10 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <linux/fou.h>
-#include <netinet/in.h>
 #include <linux/ip.h>
+#include <net/if.h>
+#include <netinet/in.h>
 
 #include "conf-parser.h"
 #include "fou-tunnel.h"

src/network/netdev/fou-tunnel.h

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <netinet/in.h>
 #include <linux/fou.h>
+#include <netinet/in.h>
 
 #include "in-addr-util.h"
 #include "netdev.h"

src/network/netdev/geneve.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <linux/if_arp.h>
+#include <net/if.h>
 #include <netinet/in.h>
 
 #include "alloc-util.h"

src/network/netdev/hsr.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <linux/if_arp.h>
+#include <net/if.h>
 #include <netinet/in.h>
 
 #include "hsr.h"

src/network/netdev/ipvlan.c

@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
+#include <linux/if_arp.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <linux/if_arp.h>
 
 #include "conf-parser.h"
 #include "ipvlan.h"

src/network/netdev/ipvlan.h

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <netinet/in.h>
 #include <linux/if_link.h>
+#include <netinet/in.h>
 
 #include "ipvlan-util.h"
 #include "netdev.h"

src/network/netdev/l2tp-tunnel.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <netinet/in.h>
+#include <linux/genetlink.h>
 #include <linux/if_arp.h>
 #include <linux/l2tp.h>
-#include <linux/genetlink.h>
+#include <netinet/in.h>
 
 #include "conf-parser.h"
 #include "hashmap.h"

src/network/netdev/l2tp-tunnel.h

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <netinet/in.h>
 #include <linux/l2tp.h>
+#include <netinet/in.h>
 
 #include "in-addr-util.h"
 #include "netdev.h"

src/network/netdev/macsec.c

@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <netinet/in.h>
+#include <linux/genetlink.h>
 #include <linux/if_arp.h>
 #include <linux/if_ether.h>
 #include <linux/if_macsec.h>
-#include <linux/genetlink.h>
+#include <netinet/in.h>
 
 #include "conf-parser.h"
 #include "fileio.h"

src/network/netdev/macsec.h

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <netinet/in.h>
 #include <linux/if_macsec.h>
+#include <netinet/in.h>
 
 #include "ether-addr-util.h"
 #include "in-addr-util.h"

src/network/netdev/macvlan.c

@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
+#include <linux/if_arp.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <linux/if_arp.h>
 
 #include "conf-parser.h"
 #include "macvlan.h"

src/network/netdev/netdev.c

@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
+#include <linux/if_arp.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <linux/if_arp.h>
 #include <unistd.h>
 
 #include "alloc-util.h"

src/network/netdev/tunnel.c

@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <netinet/in.h>
 #include <linux/fou.h>
 #include <linux/if_arp.h>
 #include <linux/if_tunnel.h>
 #include <linux/ip.h>
 #include <linux/ip6_tunnel.h>
+#include <netinet/in.h>
 
 #include "af-list.h"
 #include "conf-parser.h"

src/network/netdev/tunnel.h

@@ -1,12 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "in-addr-util.h"
-
 #include "conf-parser.h"
 #include "fou-tunnel.h"
-#include "netdev-util.h"
+#include "in-addr-util.h"
 #include "netdev.h"
+#include "netdev-util.h"
 #include "networkd-link.h"
 
 typedef enum Ip6TnlMode {

src/network/netdev/tuntap.c

@@ -1,10 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/if_tun.h>
+#include <net/if.h>
 #include <netinet/if_ether.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>

src/network/netdev/vcan.h

@@ -3,8 +3,8 @@
 
 typedef struct VCan VCan;
 
-#include <netinet/in.h>
 #include <linux/can/netlink.h>
+#include <netinet/in.h>
 
 #include "netdev.h"
 

src/network/netdev/veth.c

@@ -1,10 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <errno.h>
 #include <linux/if_arp.h>
 #include <linux/veth.h>
+#include <net/if.h>
 #include <netinet/in.h>
 
 #include "netlink-util.h"

src/network/netdev/vlan.c

@@ -1,14 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <errno.h>
 #include <linux/if_arp.h>
 #include <linux/if_vlan.h>
+#include <net/if.h>
 
 #include "parse-util.h"
-#include "vlan-util.h"
 #include "vlan.h"
+#include "vlan-util.h"
 
 static int netdev_vlan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *req) {
         assert(link);

src/network/netdev/vrf.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <linux/if_arp.h>
+#include <net/if.h>
 #include <netinet/in.h>
 
 #include "vrf.h"

src/network/netdev/vxlan.c

@@ -1,18 +1,17 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
+#include <linux/if_arp.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <linux/if_arp.h>
 
-#include "conf-parser.h"
 #include "alloc-util.h"
+#include "conf-parser.h"
 #include "extract-word.h"
 #include "networkd-link.h"
+#include "parse-util.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
-#include "parse-util.h"
 #include "vxlan.h"
 
 static const char* const df_table[_NETDEV_VXLAN_DF_MAX] = {

src/network/netdev/vxlan.h

@@ -6,8 +6,8 @@ typedef struct VxLan VxLan;
 #include <linux/if_link.h>
 
 #include "in-addr-util.h"
-#include "netdev-util.h"
 #include "netdev.h"
+#include "netdev-util.h"
 
 #define VXLAN_VID_MAX (1u << 24) - 1
 #define VXLAN_FLOW_LABEL_MAX_MASK 0xFFFFFU

src/network/netdev/wireguard.c

@@ -3,10 +3,9 @@
   Copyright © 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
 ***/
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <linux/if_arp.h>
 #include <linux/ipv6_route.h>
+#include <net/if.h>
 #include <netinet/in.h>
 #include <sys/ioctl.h>
 
@@ -22,8 +21,8 @@
 #include "memory-util.h"
 #include "netlink-util.h"
 #include "networkd-manager.h"
-#include "networkd-route-util.h"
 #include "networkd-route.h"
+#include "networkd-route-util.h"
 #include "networkd-util.h"
 #include "parse-helpers.h"
 #include "parse-util.h"

src/network/netdev/wireguard.h

@@ -4,8 +4,8 @@
 
 typedef struct Wireguard Wireguard;
 
-#include <netinet/in.h>
 #include <linux/wireguard.h>
+#include <netinet/in.h>
 
 #include "sd-event.h"
 #include "sd-resolve.h"

src/network/networkctl-status-link.c

@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
 #include <net/if.h>
 
 #include "sd-network.h"

src/network/networkd-address-label.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <linux/if_addrlabel.h>
+#include <net/if.h>
 
 #include "alloc-util.h"
 #include "netlink-util.h"

src/network/networkd-address-pool.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "alloc-util.h"
-#include "networkd-address-pool.h"
 #include "networkd-address.h"
+#include "networkd-address-pool.h"
 #include "networkd-manager.h"
 #include "networkd-queue.h"
 #include "string-util.h"

src/network/networkd-address.c

@@ -11,8 +11,8 @@
 #include "logarithm.h"
 #include "memory-util.h"
 #include "netlink-util.h"
-#include "networkd-address-pool.h"
 #include "networkd-address.h"
+#include "networkd-address-pool.h"
 #include "networkd-dhcp-prefix-delegation.h"
 #include "networkd-dhcp-server.h"
 #include "networkd-ipv4acd.h"
@@ -21,8 +21,8 @@
 #include "networkd-netlabel.h"
 #include "networkd-network.h"
 #include "networkd-queue.h"
-#include "networkd-route-util.h"
 #include "networkd-route.h"
+#include "networkd-route-util.h"
 #include "parse-util.h"
 #include "string-util.h"
 #include "strv.h"

src/network/networkd-bridge-mdb.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <linux/if_bridge.h>
+#include <net/if.h>
 
 #include "netlink-util.h"
 #include "networkd-bridge-mdb.h"

src/network/networkd-bridge-vlan.c

@@ -3,8 +3,8 @@
   Copyright © 2016 BISDN GmbH. All rights reserved.
 ***/
 
-#include <netinet/in.h>
 #include <linux/if_bridge.h>
+#include <netinet/in.h>
 #include <stdbool.h>
 
 #include "alloc-util.h"

src/network/networkd-can.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <linux/can/netlink.h>
+#include <net/if.h>
 
 #include "networkd-can.h"
 #include "networkd-link.h"

src/network/networkd-dhcp-common.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <netinet/in.h>
 #include <linux/if_arp.h>
+#include <netinet/in.h>
 
 #include "bus-error.h"
 #include "bus-locator.h"

src/network/networkd-dhcp-prefix-delegation.c

@@ -5,16 +5,16 @@
 #include "dhcp6-lease-internal.h"
 #include "hashmap.h"
 #include "in-addr-prefix-util.h"
-#include "networkd-address-generation.h"
 #include "networkd-address.h"
+#include "networkd-address-generation.h"
 #include "networkd-dhcp-prefix-delegation.h"
 #include "networkd-dhcp6.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-queue.h"
 #include "networkd-radv.h"
-#include "networkd-route-util.h"
 #include "networkd-route.h"
+#include "networkd-route-util.h"
 #include "networkd-setlink.h"
 #include "parse-util.h"
 #include "string-util.h"

src/network/networkd-dhcp-server.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <netinet/in.h>
-#include <linux/if_arp.h>
 #include <linux/if.h>
+#include <linux/if_arp.h>
+#include <netinet/in.h>
 
 #include "sd-dhcp-server.h"
 
@@ -12,9 +12,9 @@
 #include "fileio.h"
 #include "network-common.h"
 #include "networkd-address.h"
+#include "networkd-dhcp-server.h"
 #include "networkd-dhcp-server-bus.h"
 #include "networkd-dhcp-server-static-lease.h"
-#include "networkd-dhcp-server.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-network.h"

src/network/networkd-dhcp4.c

@@ -1,21 +1,20 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <netinet/in.h>
-#include <netinet/ip.h>
 #include <linux/if.h>
 #include <linux/if_arp.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
 
 #include "alloc-util.h"
 #include "device-private.h"
 #include "dhcp-client-internal.h"
 #include "hostname-setup.h"
 #include "hostname-util.h"
-#include "parse-util.h"
 #include "network-internal.h"
 #include "networkd-address.h"
 #include "networkd-dhcp-prefix-delegation.h"
-#include "networkd-dhcp4-bus.h"
 #include "networkd-dhcp4.h"
+#include "networkd-dhcp4-bus.h"
 #include "networkd-ipv4ll.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"
@@ -26,6 +25,7 @@
 #include "networkd-route.h"
 #include "networkd-setlink.h"
 #include "networkd-state-file.h"
+#include "parse-util.h"
 #include "string-table.h"
 #include "strv.h"
 #include "sysctl-util.h"

src/network/networkd-dhcp6.c

@@ -10,8 +10,8 @@
 #include "hostname-util.h"
 #include "networkd-address.h"
 #include "networkd-dhcp-prefix-delegation.h"
-#include "networkd-dhcp6-bus.h"
 #include "networkd-dhcp6.h"
+#include "networkd-dhcp6-bus.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-ntp.h"

src/network/networkd-ipv4ll.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <netinet/in.h>
 #include <linux/if.h>
+#include <netinet/in.h>
 
 #include "netif-util.h"
 #include "networkd-address.h"

src/network/networkd-ipv6-proxy-ndp.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <netinet/in.h>
 #include <linux/if.h>
+#include <netinet/in.h>
 
 #include "netlink-util.h"
 #include "networkd-ipv6-proxy-ndp.h"

src/network/networkd-json.c

@@ -19,8 +19,8 @@
 #include "networkd-network.h"
 #include "networkd-nexthop.h"
 #include "networkd-ntp.h"
-#include "networkd-route-util.h"
 #include "networkd-route.h"
+#include "networkd-route-util.h"
 #include "networkd-routing-policy-rule.h"
 #include "sort-util.h"
 #include "strv.h"

src/network/networkd-link-bus.c

@@ -12,8 +12,8 @@
 #include "dns-domain.h"
 #include "networkd-dhcp4.h"
 #include "networkd-json.h"
-#include "networkd-link-bus.h"
 #include "networkd-link.h"
+#include "networkd-link-bus.h"
 #include "networkd-manager.h"
 #include "networkd-state-file.h"
 #include "parse-util.h"

src/network/networkd-link.c

@@ -1,12 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
-#include <netinet/in.h>
 #include <linux/if.h>
 #include <linux/if_arp.h>
 #include <linux/if_link.h>
 #include <linux/netdevice.h>
+#include <net/if.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
@@ -32,8 +31,8 @@
 #include "missing_network.h"
 #include "netlink-util.h"
 #include "network-internal.h"
-#include "networkd-address-label.h"
 #include "networkd-address.h"
+#include "networkd-address-label.h"
 #include "networkd-bridge-fdb.h"
 #include "networkd-bridge-mdb.h"
 #include "networkd-bridge-vlan.h"
@@ -45,8 +44,8 @@
 #include "networkd-ipv4acd.h"
 #include "networkd-ipv4ll.h"
 #include "networkd-ipv6-proxy-ndp.h"
-#include "networkd-link-bus.h"
 #include "networkd-link.h"
+#include "networkd-link-bus.h"
 #include "networkd-lldp-tx.h"
 #include "networkd-manager.h"
 #include "networkd-ndisc.h"
@@ -54,8 +53,8 @@
 #include "networkd-nexthop.h"
 #include "networkd-queue.h"
 #include "networkd-radv.h"
-#include "networkd-route-util.h"
 #include "networkd-route.h"
+#include "networkd-route-util.h"
 #include "networkd-routing-policy-rule.h"
 #include "networkd-setlink.h"
 #include "networkd-sriov.h"

src/network/networkd-link.h

@@ -14,8 +14,8 @@
 #include "sd-lldp-rx.h"
 #include "sd-lldp-tx.h"
 #include "sd-ndisc.h"
-#include "sd-radv.h"
 #include "sd-netlink.h"
+#include "sd-radv.h"
 
 #include "ether-addr-util.h"
 #include "log-link.h"

src/network/networkd-manager-bus.c

@@ -12,10 +12,10 @@
 #include "networkd-dhcp4-bus.h"
 #include "networkd-dhcp6-bus.h"
 #include "networkd-json.h"
-#include "networkd-link-bus.h"
 #include "networkd-link.h"
-#include "networkd-manager-bus.h"
+#include "networkd-link-bus.h"
 #include "networkd-manager.h"
+#include "networkd-manager-bus.h"
 #include "networkd-network-bus.h"
 #include "path-util.h"
 #include "strv.h"

src/network/networkd-manager.c

@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/fib_rules.h>
+#include <linux/if.h>
+#include <linux/nexthop.h>
+#include <linux/nl80211.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <unistd.h>
-#include <linux/if.h>
-#include <linux/fib_rules.h>
-#include <linux/nexthop.h>
-#include <linux/nl80211.h>
 
 #include "sd-netlink.h"
 
@@ -34,9 +34,9 @@
 #include "mount-util.h"
 #include "netlink-util.h"
 #include "network-internal.h"
+#include "networkd-address.h"
 #include "networkd-address-label.h"
 #include "networkd-address-pool.h"
-#include "networkd-address.h"
 #include "networkd-dhcp-server-bus.h"
 #include "networkd-dhcp6.h"
 #include "networkd-link-bus.h"

src/network/networkd-ndisc.c

@@ -4,17 +4,17 @@
 ***/
 
 #include <arpa/inet.h>
-#include <netinet/icmp6.h>
 #include <linux/if.h>
 #include <linux/if_arp.h>
+#include <netinet/icmp6.h>
 
 #include "sd-ndisc.h"
 
 #include "event-util.h"
 #include "missing_network.h"
 #include "ndisc-router-internal.h"
-#include "networkd-address-generation.h"
 #include "networkd-address.h"
+#include "networkd-address-generation.h"
 #include "networkd-dhcp6.h"
 #include "networkd-manager.h"
 #include "networkd-ndisc.h"

src/network/networkd-network.c

@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
+#include <linux/netdevice.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <linux/netdevice.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -16,8 +15,8 @@
 #include "net-condition.h"
 #include "netdev/macvlan.h"
 #include "network-util.h"
-#include "networkd-address-label.h"
 #include "networkd-address.h"
+#include "networkd-address-label.h"
 #include "networkd-bridge-fdb.h"
 #include "networkd-bridge-mdb.h"
 #include "networkd-dhcp-common.h"

src/network/networkd-nexthop.c

@@ -2,9 +2,8 @@
  * Copyright © 2019 VMware, Inc.
  */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <linux/nexthop.h>
+#include <net/if.h>
 
 #include "alloc-util.h"
 #include "netlink-util.h"

src/network/networkd-radv.c

@@ -3,13 +3,13 @@
   Copyright © 2017 Intel Corporation. All rights reserved.
 ***/
 
-#include <netinet/icmp6.h>
 #include <arpa/inet.h>
+#include <netinet/icmp6.h>
 
 #include "dns-domain.h"
 #include "ndisc-router-internal.h"
-#include "networkd-address-generation.h"
 #include "networkd-address.h"
+#include "networkd-address-generation.h"
 #include "networkd-dhcp-prefix-delegation.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"
@@ -19,8 +19,8 @@
 #include "networkd-route-util.h"
 #include "parse-util.h"
 #include "radv-internal.h"
-#include "string-util.h"
 #include "string-table.h"
+#include "string-util.h"
 #include "strv.h"
 
 bool link_radv_enabled(Link *link) {

src/network/networkd-radv.h

@@ -10,8 +10,8 @@
 
 #include "sd-radv.h"
 
-#include "in-addr-util.h"
 #include "conf-parser.h"
+#include "in-addr-util.h"
 #include "ndisc-option.h"
 #include "networkd-util.h"
 

src/network/networkd-route-util.c

@@ -9,8 +9,8 @@
 #include "networkd-address.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"
-#include "networkd-route-util.h"
 #include "networkd-route.h"
+#include "networkd-route-util.h"
 #include "parse-util.h"
 #include "string-table.h"
 #include "string-util.h"

src/network/networkd-route.c

@@ -13,8 +13,8 @@
 #include "networkd-network.h"
 #include "networkd-nexthop.h"
 #include "networkd-queue.h"
-#include "networkd-route-util.h"
 #include "networkd-route.h"
+#include "networkd-route-util.h"
 #include "parse-util.h"
 #include "string-util.h"
 #include "strv.h"

src/network/networkd-routing-policy-rule.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <linux/fib_rules.h>
+#include <net/if.h>
 
 #include "af-list.h"
 #include "alloc-util.h"

src/network/networkd-setlink.c

@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <netinet/in.h>
 #include <linux/if.h>
 #include <linux/if_arp.h>
 #include <linux/if_bridge.h>
 #include <linux/ipv6.h>
+#include <netinet/in.h>
 
 #include "device-private.h"
 #include "missing_network.h"

src/network/networkd-speed-meter.c

@@ -5,8 +5,8 @@
 #include "sd-event.h"
 #include "sd-netlink.h"
 
-#include "networkd-link-bus.h"
 #include "networkd-link.h"
+#include "networkd-link-bus.h"
 #include "networkd-manager.h"
 #include "networkd-speed-meter.h"
 

src/network/networkd-state-file.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <netinet/in.h>
 #include <linux/if.h>
+#include <netinet/in.h>
 
 #include "alloc-util.h"
 #include "dns-domain.h"
@@ -13,8 +13,8 @@
 #include "network-internal.h"
 #include "networkd-dhcp-common.h"
 #include "networkd-link.h"
-#include "networkd-manager-bus.h"
 #include "networkd-manager.h"
+#include "networkd-manager-bus.h"
 #include "networkd-network.h"
 #include "networkd-ntp.h"
 #include "networkd-state-file.h"

src/network/networkd-sysctl.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <netinet/in.h>
 #include <linux/if.h>
 #include <linux/if_arp.h>
+#include <netinet/in.h>
 
 #include "sd-messages.h"
 
@@ -26,7 +26,6 @@
 #if HAVE_VMLINUX_H
 
 #include "bpf-link.h"
-
 #include "bpf/sysctl_monitor/sysctl-monitor-skel.h"
 #include "bpf/sysctl_monitor/sysctl-write-event.h"
 

src/network/networkd-wifi.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <net/ethernet.h>
 #include <linux/nl80211.h>
+#include <net/ethernet.h>
 
 #include "ether-addr-util.h"
 #include "netlink-util.h"

src/network/networkd-wiphy.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <net/if_arp.h>
 #include <linux/nl80211.h>
+#include <net/if_arp.h>
 
 #include "device-private.h"
 #include "device-util.h"

src/network/networkd.c

@@ -14,8 +14,8 @@
 #include "main-func.h"
 #include "mkdir-label.h"
 #include "networkd-conf.h"
-#include "networkd-manager-bus.h"
 #include "networkd-manager.h"
+#include "networkd-manager-bus.h"
 #include "networkd-serialize.h"
 #include "service-util.h"
 #include "signal-util.h"

src/network/tc/htb.c

@@ -4,11 +4,11 @@
 
 #include "alloc-util.h"
 #include "conf-parser.h"
+#include "htb.h"
 #include "netlink-util.h"
 #include "networkd-link.h"
 #include "parse-util.h"
 #include "qdisc.h"
-#include "htb.h"
 #include "string-util.h"
 #include "tc-util.h"
 

src/network/tc/pie.c

@@ -5,9 +5,9 @@
 
 #include "alloc-util.h"
 #include "conf-parser.h"
-#include "pie.h"
 #include "netlink-util.h"
 #include "parse-util.h"
+#include "pie.h"
 #include "string-util.h"
 
 static int pie_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {

src/network/tc/qdisc.c

@@ -4,39 +4,38 @@
 #include <linux/pkt_sched.h>
 
 #include "alloc-util.h"
+#include "cake.h"
+#include "codel.h"
 #include "conf-parser.h"
+#include "drr.h"
+#include "ets.h"
+#include "fifo.h"
+#include "fq.h"
+#include "fq-codel.h"
+#include "fq-pie.h"
+#include "gred.h"
+#include "hhf.h"
+#include "htb.h"
 #include "in-addr-util.h"
+#include "mq.h"
+#include "multiq.h"
+#include "netem.h"
 #include "netlink-util.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-network.h"
 #include "networkd-queue.h"
 #include "parse-util.h"
-#include "qdisc.h"
-#include "set.h"
-#include "string-util.h"
-#include "strv.h"
-#include "tc-util.h"
-
-#include "cake.h"
-#include "codel.h"
-#include "ets.h"
-#include "fifo.h"
-#include "fq-codel.h"
-#include "fq-pie.h"
-#include "fq.h"
-#include "gred.h"
-#include "hhf.h"
-#include "htb.h"
-#include "mq.h"
-#include "multiq.h"
 #include "pie.h"
+#include "qdisc.h"
 #include "qfq.h"
-#include "netem.h"
-#include "drr.h"
+#include "set.h"
 #include "sfb.h"
 #include "sfq.h"
+#include "string-util.h"
+#include "strv.h"
 #include "tbf.h"
+#include "tc-util.h"
 #include "teql.h"
 
 const QDiscVTable * const qdisc_vtable[_QDISC_KIND_MAX] = {

src/network/tc/tclass.c

@@ -5,6 +5,8 @@
 
 #include "alloc-util.h"
 #include "conf-parser.h"
+#include "drr.h"
+#include "htb.h"
 #include "in-addr-util.h"
 #include "netlink-util.h"
 #include "networkd-link.h"
@@ -12,16 +14,13 @@
 #include "networkd-network.h"
 #include "networkd-queue.h"
 #include "parse-util.h"
+#include "qfq.h"
 #include "set.h"
 #include "string-util.h"
 #include "strv.h"
 #include "tc-util.h"
 #include "tclass.h"
 
-#include "drr.h"
-#include "htb.h"
-#include "qfq.h"
-
 const TClassVTable * const tclass_vtable[_TCLASS_KIND_MAX] = {
         [TCLASS_KIND_DRR] = &drr_tclass_vtable,
         [TCLASS_KIND_HTB] = &htb_tclass_vtable,

src/network/test-network-tables.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/* Make sure the net/if.h header is included before any linux/ one */
-#include <net/if.h>
 #include <linux/if.h>
+#include <net/if.h>
 
 #include "bond.h"
 #include "dhcp6-internal.h"

src/network/wait-online/manager.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <netinet/ether.h>
-#include <linux/if.h>
 #include <fnmatch.h>
+#include <linux/if.h>
+#include <netinet/ether.h>
 
 #include "sd-event.h"
 #include "sd-json.h"