./fixup.sh

13 files changed, 20 insertions, 10 deletions

diff --git a/src/grp-network/libnetworkd-core/networkd-address-pool.h b/src/grp-network/libnetworkd-core/networkd-address-pool.h
index d5659a9eeb..5d7020739d 100644
--- a/src/grp-network/libnetworkd-core/networkd-address-pool.h
+++ b/src/grp-network/libnetworkd-core/networkd-address-pool.h
@@ -19,11 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-typedef struct AddressPool AddressPool;
-
 #include "basic/in-addr-util.h"
 #include "basic/list.h"
 
+typedef struct AddressPool AddressPool;
 typedef struct Manager Manager;
 
 struct AddressPool {
diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp4.c b/src/grp-network/libnetworkd-core/networkd-dhcp4.c
index 371613043e..fe565ad075 100644
--- a/src/grp-network/libnetworkd-core/networkd-dhcp4.c
+++ b/src/grp-network/libnetworkd-core/networkd-dhcp4.c
@@ -18,6 +18,7 @@
 ***/
 
 #include <netinet/ether.h>
+
 #include <linux/if.h>
 
 #include "basic/alloc-util.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp6.c b/src/grp-network/libnetworkd-core/networkd-dhcp6.c
index 9ebb162d6c..6399849ff6 100644
--- a/src/grp-network/libnetworkd-core/networkd-dhcp6.c
+++ b/src/grp-network/libnetworkd-core/networkd-dhcp6.c
@@ -18,6 +18,7 @@
 ***/
 
 #include <netinet/ether.h>
+
 #include <linux/if.h>
 
 #include "systemd-network/network-internal.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-ipv4ll.c b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c
index d196aa909f..735cbc624d 100644
--- a/src/grp-network/libnetworkd-core/networkd-ipv4ll.c
+++ b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c
@@ -18,6 +18,7 @@
 ***/
 
 #include <netinet/ether.h>
+
 #include <linux/if.h>
 
 #include "systemd-network/network-internal.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-link.c b/src/grp-network/libnetworkd-core/networkd-link.c
index f4cef69fbb..72f6b5057e 100644
--- a/src/grp-network/libnetworkd-core/networkd-link.c
+++ b/src/grp-network/libnetworkd-core/networkd-link.c
@@ -18,9 +18,10 @@
 ***/
 
 #include <netinet/ether.h>
-#include <linux/if.h>
 #include <unistd.h>
 
+#include <linux/if.h>
+
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-manager.c b/src/grp-network/libnetworkd-core/networkd-manager.c
index 0f54debf07..1bf22edcb7 100644
--- a/src/grp-network/libnetworkd-core/networkd-manager.c
+++ b/src/grp-network/libnetworkd-core/networkd-manager.c
@@ -18,6 +18,7 @@
  ***/
 
 #include <sys/socket.h>
+
 #include <linux/if.h>
 
 #include <systemd/sd-daemon.h>
diff --git a/src/grp-network/libnetworkd-core/networkd-ndisc.c b/src/grp-network/libnetworkd-core/networkd-ndisc.c
index 1033ccc342..c454be7ba3 100644
--- a/src/grp-network/libnetworkd-core/networkd-ndisc.c
+++ b/src/grp-network/libnetworkd-core/networkd-ndisc.c
@@ -20,6 +20,7 @@
 #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 12e5e58159..7e7b8f8804 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
@@ -18,9 +18,10 @@
     along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/if_bonding.h>
 #include <netinet/ether.h>
 
+#include <linux/if_bonding.h>
+
 #include "basic/alloc-util.h"
 #include "basic/extract-word.h"
 #include "basic/missing.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
index eaee167506..49f18a8cd9 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
@@ -18,10 +18,11 @@
 ***/
 
 #include <arpa/inet.h>
+#include <net/if.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 5232f77ba8..ab5b90fcc9 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c
@@ -18,13 +18,14 @@
 ***/
 
 #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>
 #include <sys/types.h>
 
+#include <linux/if_tun.h>
+
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
 #include "basic/user-util.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-veth.c b/src/grp-network/libnetworkd-core/networkd-netdev-veth.c
index b25d468aa4..fb068c75bf 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-veth.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-veth.c
@@ -17,9 +17,10 @@
     along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/veth.h>
 #include <net/if.h>
 
+#include <linux/veth.h>
+
 #include "sd-netlink/sd-netlink.h"
 
 #include "networkd-netdev-veth.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h
index 6e8393145e..7950c867e3 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-typedef struct VxLan VxLan;
-
 #include "basic/in-addr-util.h"
 
+typedef struct VxLan VxLan;
+
 #include "networkd-netdev.h"
 
 #define VXLAN_VID_MAX (1u << 24) - 1
diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c
index 02bf652c0b..9ec0550d44 100644
--- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c
+++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c
@@ -17,9 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <fnmatch.h>
 #include <netinet/ether.h>
+
 #include <linux/if.h>
-#include <fnmatch.h>
 
 #include "basic/alloc-util.h"
 #include "basic/time-util.h"