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

9 files changed, 19 insertions, 22 deletions

diff --git a/src/libsystemd-network/test/test-acd.c b/src/libsystemd-network/test/test-acd.c
index bf3f401ade..73f9e04e6f 100644
--- a/src/libsystemd-network/test/test-acd.c
+++ b/src/libsystemd-network/test/test-acd.c
@@ -18,11 +18,10 @@
 ***/
 
 #include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-
 #include <linux/veth.h>
 #include <net/if.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #include <systemd/sd-event.h>
 
diff --git a/src/libsystemd-network/test/test-dhcp-client.c b/src/libsystemd-network/test/test-dhcp-client.c
index bee542ac42..c116696c8d 100644
--- a/src/libsystemd-network/test/test-dhcp-client.c
+++ b/src/libsystemd-network/test/test-dhcp-client.c
@@ -22,15 +22,15 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "systemd-network/sd-dhcp-client.h"
 #include <systemd/sd-event.h>
 
 #include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/util.h"
 #include "systemd-network/dhcp-identifier.h"
 #include "systemd-network/dhcp-internal.h"
 #include "systemd-network/dhcp-protocol.h"
-#include "basic/fd-util.h"
-#include "basic/util.h"
+#include "systemd-network/sd-dhcp-client.h"
 
 static uint8_t mac_addr[] = {'A', 'B', 'C', '1', '2', '3'};
 
diff --git a/src/libsystemd-network/test/test-dhcp-option.c b/src/libsystemd-network/test/test-dhcp-option.c
index 20995c98ba..eda42b0ba5 100644
--- a/src/libsystemd-network/test/test-dhcp-option.c
+++ b/src/libsystemd-network/test/test-dhcp-option.c
@@ -4,10 +4,10 @@
 #include <string.h>
 
 #include "basic/alloc-util.h"
-#include "systemd-network/dhcp-internal.h"
-#include "systemd-network/dhcp-protocol.h"
 #include "basic/macro.h"
 #include "basic/util.h"
+#include "systemd-network/dhcp-internal.h"
+#include "systemd-network/dhcp-protocol.h"
 
 struct option_desc {
         uint8_t sname[64];
diff --git a/src/libsystemd-network/test/test-dhcp-server.c b/src/libsystemd-network/test/test-dhcp-server.c
index d7029d1cc5..0796a98707 100644
--- a/src/libsystemd-network/test/test-dhcp-server.c
+++ b/src/libsystemd-network/test/test-dhcp-server.c
@@ -20,10 +20,10 @@
 
 #include <errno.h>
 
-#include "systemd-network/sd-dhcp-server.h"
 #include <systemd/sd-event.h>
 
 #include "systemd-network/dhcp-server-internal.h"
+#include "systemd-network/sd-dhcp-server.h"
 
 static void test_pool(struct in_addr *address, unsigned size, int ret) {
         _cleanup_(sd_dhcp_server_unrefp) sd_dhcp_server *server = NULL;
diff --git a/src/libsystemd-network/test/test-dhcp6-client.c b/src/libsystemd-network/test/test-dhcp6-client.c
index 9709fabf74..66424bc624 100644
--- a/src/libsystemd-network/test/test-dhcp6-client.c
+++ b/src/libsystemd-network/test/test-dhcp6-client.c
@@ -24,16 +24,16 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "systemd-network/sd-dhcp6-client.h"
 #include <systemd/sd-event.h>
 
-#include "systemd-network/dhcp6-internal.h"
-#include "systemd-network/dhcp6-lease-internal.h"
-#include "systemd-network/dhcp6-protocol.h"
 #include "basic/fd-util.h"
 #include "basic/macro.h"
 #include "basic/socket-util.h"
 #include "basic/virt.h"
+#include "systemd-network/dhcp6-internal.h"
+#include "systemd-network/dhcp6-lease-internal.h"
+#include "systemd-network/dhcp6-protocol.h"
+#include "systemd-network/sd-dhcp6-client.h"
 
 static struct ether_addr mac_addr = {
         .ether_addr_octet = {'A', 'B', 'C', '1', '2', '3'}
diff --git a/src/libsystemd-network/test/test-ipv4ll-manual.c b/src/libsystemd-network/test/test-ipv4ll-manual.c
index aba41f4af9..00b909f021 100644
--- a/src/libsystemd-network/test/test-ipv4ll-manual.c
+++ b/src/libsystemd-network/test/test-ipv4ll-manual.c
@@ -18,10 +18,10 @@
 ***/
 
 #include <errno.h>
+#include <linux/veth.h>
 #include <net/if.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <linux/veth.h>
 
 #include <systemd/sd-event.h>
 
diff --git a/src/libsystemd-network/test/test-ipv4ll.c b/src/libsystemd-network/test/test-ipv4ll.c
index afb69a22fc..af259cf0de 100644
--- a/src/libsystemd-network/test/test-ipv4ll.c
+++ b/src/libsystemd-network/test/test-ipv4ll.c
@@ -25,12 +25,11 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "systemd-network/sd-ipv4ll.h"
-#include "systemd-network/arp-util.h"
-
 #include "basic/fd-util.h"
 #include "basic/socket-util.h"
 #include "basic/util.h"
+#include "systemd-network/arp-util.h"
+#include "systemd-network/sd-ipv4ll.h"
 
 static bool verbose = false;
 static bool extended = false;
diff --git a/src/libsystemd-network/test/test-lldp.c b/src/libsystemd-network/test/test-lldp.c
index ea625ea28b..858c7789d7 100644
--- a/src/libsystemd-network/test/test-lldp.c
+++ b/src/libsystemd-network/test/test-lldp.c
@@ -25,13 +25,13 @@
 #include <unistd.h>
 
 #include <systemd/sd-event.h>
-#include "systemd-network/sd-lldp.h"
 
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
-#include "systemd-network/lldp-network.h"
 #include "basic/macro.h"
 #include "basic/string-util.h"
+#include "systemd-network/lldp-network.h"
+#include "systemd-network/sd-lldp.h"
 
 #define TEST_LLDP_PORT "em1"
 #define TEST_LLDP_TYPE_SYSTEM_NAME "systemd-lldp"
diff --git a/src/libsystemd-network/test/test-ndisc-rs.c b/src/libsystemd-network/test/test-ndisc-rs.c
index 200983b4ab..92445eff5d 100644
--- a/src/libsystemd-network/test/test-ndisc-rs.c
+++ b/src/libsystemd-network/test/test-ndisc-rs.c
@@ -19,10 +19,9 @@
 
 #include <netinet/icmp6.h>
 
-#include "systemd-network/sd-ndisc.h"
-
-#include "systemd-network/icmp6-util.h"
 #include "basic/socket-util.h"
+#include "systemd-network/icmp6-util.h"
+#include "systemd-network/sd-ndisc.h"
 
 static struct ether_addr mac_addr = {
         .ether_addr_octet = {'A', 'B', 'C', '1', '2', '3'}