./fixup.sh

19 files changed, 45 insertions, 29 deletions

diff --git a/src/libsystemd-network/include/systemd-network/dhcp-internal.h b/src/libsystemd-network/include/systemd-network/dhcp-internal.h
index 0fb012e240..63c85b853c 100644
--- a/src/libsystemd-network/include/systemd-network/dhcp-internal.h
+++ b/src/libsystemd-network/include/systemd-network/dhcp-internal.h
@@ -20,14 +20,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/if_packet.h>
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #include <stdint.h>
 
+#include <linux/if_packet.h>
+
 #include "basic/socket-util.h"
-#include "systemd-network/dhcp-protocol.h"
-#include "systemd-network/sd-dhcp-client.h"
+
+#include "dhcp-protocol.h"
+#include "sd-dhcp-client.h"
 
 int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link,
                                  uint32_t xid, const uint8_t *mac_addr,
diff --git a/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h b/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h
index d4108c1095..af66781ac7 100644
--- a/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h
+++ b/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h
@@ -20,13 +20,15 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/if_packet.h>
 #include <stdint.h>
 
+#include <linux/if_packet.h>
+
 #include "basic/list.h"
 #include "basic/util.h"
-#include "systemd-network/dhcp-protocol.h"
-#include "systemd-network/sd-dhcp-client.h"
+
+#include "dhcp-protocol.h"
+#include "sd-dhcp-client.h"
 
 struct sd_dhcp_route {
         struct in_addr dst_addr;
diff --git a/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h b/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h
index 53b46a8514..45f5946e59 100644
--- a/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h
+++ b/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h
@@ -25,8 +25,9 @@
 #include "basic/hashmap.h"
 #include "basic/log.h"
 #include "basic/util.h"
-#include "systemd-network/dhcp-internal.h"
-#include "systemd-network/sd-dhcp-server.h"
+
+#include "dhcp-internal.h"
+#include "sd-dhcp-server.h"
 
 typedef struct DHCPClientId {
         size_t length;
diff --git a/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h b/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h
index 3f51830c94..9da270e9a9 100644
--- a/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h
+++ b/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h
@@ -22,8 +22,8 @@
 
 #include <stdint.h>
 
-#include "systemd-network/dhcp6-internal.h"
-#include "systemd-network/sd-dhcp6-lease.h"
+#include "dhcp6-internal.h"
+#include "sd-dhcp6-lease.h"
 
 struct sd_dhcp6_lease {
         unsigned n_ref;
diff --git a/src/libsystemd-network/include/systemd-network/lldp-internal.h b/src/libsystemd-network/include/systemd-network/lldp-internal.h
index a79031b40d..f657a1d0af 100644
--- a/src/libsystemd-network/include/systemd-network/lldp-internal.h
+++ b/src/libsystemd-network/include/systemd-network/lldp-internal.h
@@ -25,7 +25,8 @@
 #include "basic/hashmap.h"
 #include "basic/log.h"
 #include "basic/prioq.h"
-#include "systemd-network/sd-lldp.h"
+
+#include "sd-lldp.h"
 
 struct sd_lldp {
         int ifindex;
diff --git a/src/libsystemd-network/include/systemd-network/lldp-neighbor.h b/src/libsystemd-network/include/systemd-network/lldp-neighbor.h
index cbd9470be0..b5944164fc 100644
--- a/src/libsystemd-network/include/systemd-network/lldp-neighbor.h
+++ b/src/libsystemd-network/include/systemd-network/lldp-neighbor.h
@@ -25,8 +25,9 @@
 
 #include "basic/hash-funcs.h"
 #include "basic/time-util.h"
-#include "systemd-network/lldp-internal.h"
-#include "systemd-network/sd-lldp.h"
+
+#include "lldp-internal.h"
+#include "sd-lldp.h"
 
 typedef struct LLDPNeighborID {
         /* The spec calls this an "MSAP identifier" */
diff --git a/src/libsystemd-network/include/systemd-network/network-internal.h b/src/libsystemd-network/include/systemd-network/network-internal.h
index 4f98e84c80..a5cf8e4f1c 100644
--- a/src/libsystemd-network/include/systemd-network/network-internal.h
+++ b/src/libsystemd-network/include/systemd-network/network-internal.h
@@ -22,9 +22,10 @@
 #include <stdbool.h>
 
 #include "shared/condition.h"
-#include "systemd-network/sd-dhcp-lease.h"
 #include "udev.h"
 
+#include "sd-dhcp-lease.h"
+
 bool net_match_config(const struct ether_addr *match_mac,
                       char * const *match_path,
                       char * const *match_driver,
diff --git a/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h b/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h
index 375acd5ea7..4704c6b440 100644
--- a/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h
@@ -27,9 +27,8 @@
 
 #include <systemd/sd-event.h>
 
-#include "systemd-network/sd-dhcp-lease.h"
-
 #include "_sd-common.h"
+#include "sd-dhcp-lease.h"
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h b/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h
index 7111ca1274..16947079bb 100644
--- a/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h
@@ -26,9 +26,8 @@
 
 #include <systemd/sd-event.h>
 
-#include "systemd-network/sd-dhcp6-lease.h"
-
 #include "_sd-common.h"
+#include "sd-dhcp6-lease.h"
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd-network/src/arp-util.c b/src/libsystemd-network/src/arp-util.c
index 15867c24a3..1299269672 100644
--- a/src/libsystemd-network/src/arp-util.c
+++ b/src/libsystemd-network/src/arp-util.c
@@ -19,6 +19,7 @@
 ***/
 
 #include <arpa/inet.h>
+
 #include <linux/filter.h>
 
 #include "basic/fd-util.h"
diff --git a/src/libsystemd-network/src/dhcp-network.c b/src/libsystemd-network/src/dhcp-network.c
index d5fa3ebf2d..242d61a05c 100644
--- a/src/libsystemd-network/src/dhcp-network.c
+++ b/src/libsystemd-network/src/dhcp-network.c
@@ -18,15 +18,16 @@
 ***/
 
 #include <errno.h>
-#include <linux/filter.h>
-#include <linux/if_infiniband.h>
-#include <linux/if_packet.h>
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/socket.h>
 
+#include <linux/filter.h>
+#include <linux/if_infiniband.h>
+#include <linux/if_packet.h>
+
 #include "basic/fd-util.h"
 #include "basic/socket-util.h"
 #include "systemd-network/dhcp-internal.h"
diff --git a/src/libsystemd-network/src/dhcp6-network.c b/src/libsystemd-network/src/dhcp6-network.c
index 0222b03a75..0f7c281ad3 100644
--- a/src/libsystemd-network/src/dhcp6-network.c
+++ b/src/libsystemd-network/src/dhcp6-network.c
@@ -18,7 +18,6 @@
 ***/
 
 #include <errno.h>
-#include <linux/if_packet.h>
 #include <netinet/in.h>
 #include <netinet/ip6.h>
 #include <stdio.h>
@@ -27,6 +26,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <linux/if_packet.h>
+
 #include "basic/fd-util.h"
 #include "basic/socket-util.h"
 #include "systemd-network/dhcp6-internal.h"
diff --git a/src/libsystemd-network/src/icmp6-util.c b/src/libsystemd-network/src/icmp6-util.c
index cdca20efa5..0e78e58444 100644
--- a/src/libsystemd-network/src/icmp6-util.c
+++ b/src/libsystemd-network/src/icmp6-util.c
@@ -18,7 +18,6 @@
 ***/
 
 #include <errno.h>
-#include <linux/if_packet.h>
 #include <netinet/icmp6.h>
 #include <netinet/in.h>
 #include <netinet/ip6.h>
@@ -28,6 +27,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <linux/if_packet.h>
+
 #include "basic/fd-util.h"
 #include "basic/socket-util.h"
 #include "systemd-network/icmp6-util.h"
diff --git a/src/libsystemd-network/src/lldp-network.c b/src/libsystemd-network/src/lldp-network.c
index 7e7281d53b..6a525e7089 100644
--- a/src/libsystemd-network/src/lldp-network.c
+++ b/src/libsystemd-network/src/lldp-network.c
@@ -18,9 +18,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/filter.h>
 #include <netinet/if_ether.h>
 
+#include <linux/filter.h>
+
 #include "basic/fd-util.h"
 #include "basic/socket-util.h"
 #include "systemd-network/lldp-network.h"
diff --git a/src/libsystemd-network/src/network-internal.c b/src/libsystemd-network/src/network-internal.c
index 87feb094c6..53a2202068 100644
--- a/src/libsystemd-network/src/network-internal.c
+++ b/src/libsystemd-network/src/network-internal.c
@@ -18,9 +18,10 @@
 ***/
 
 #include <arpa/inet.h>
-#include <linux/if.h>
 #include <netinet/ether.h>
 
+#include <linux/if.h>
+
 #include "basic/alloc-util.h"
 #include "basic/ether-addr-util.h"
 #include "basic/hexdecoct.h"
diff --git a/src/libsystemd-network/src/sd-dhcp-client.c b/src/libsystemd-network/src/sd-dhcp-client.c
index b3ef17961d..5bf04ed028 100644
--- a/src/libsystemd-network/src/sd-dhcp-client.c
+++ b/src/libsystemd-network/src/sd-dhcp-client.c
@@ -18,7 +18,6 @@
 ***/
 
 #include <errno.h>
-#include <linux/if_infiniband.h>
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #include <stdio.h>
@@ -26,6 +25,8 @@
 #include <string.h>
 #include <sys/ioctl.h>
 
+#include <linux/if_infiniband.h>
+
 #include "basic/alloc-util.h"
 #include "basic/async.h"
 #include "basic/hostname-util.h"
diff --git a/src/libsystemd-network/src/sd-dhcp6-client.c b/src/libsystemd-network/src/sd-dhcp6-client.c
index 1f46946b14..ec652d4625 100644
--- a/src/libsystemd-network/src/sd-dhcp6-client.c
+++ b/src/libsystemd-network/src/sd-dhcp6-client.c
@@ -18,10 +18,11 @@
 ***/
 
 #include <errno.h>
-#include <linux/if_infiniband.h>
 #include <string.h>
 #include <sys/ioctl.h>
 
+#include <linux/if_infiniband.h>
+
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
 #include "basic/in-addr-util.h"
diff --git a/src/libsystemd-network/test/test-acd.c b/src/libsystemd-network/test/test-acd.c
index 73f9e04e6f..850c2cb2a4 100644
--- a/src/libsystemd-network/test/test-acd.c
+++ b/src/libsystemd-network/test/test-acd.c
@@ -18,11 +18,12 @@
 ***/
 
 #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>
 
 #include "basic/in-addr-util.h"
diff --git a/src/libsystemd-network/test/test-ipv4ll-manual.c b/src/libsystemd-network/test/test-ipv4ll-manual.c
index 00b909f021..83c2b46124 100644
--- a/src/libsystemd-network/test/test-ipv4ll-manual.c
+++ b/src/libsystemd-network/test/test-ipv4ll-manual.c
@@ -18,11 +18,12 @@
 ***/
 
 #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>
 
 #include "basic/alloc-util.h"