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

12 files changed, 25 insertions, 22 deletions

diff --git a/src/grp-udev/libudev-core/net/ethtool-util.c b/src/grp-udev/libudev-core/net/ethtool-util.c
index 09a3517444..759ecde5e4 100644
--- a/src/grp-udev/libudev-core/net/ethtool-util.c
+++ b/src/grp-udev/libudev-core/net/ethtool-util.c
@@ -17,17 +17,18 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <net/if.h>
-#include <sys/ioctl.h>
 #include <linux/ethtool.h>
 #include <linux/sockios.h>
+#include <net/if.h>
+#include <sys/ioctl.h>
 
-#include "shared/conf-parser.h"
-#include "ethtool-util.h"
 #include "basic/log.h"
 #include "basic/string-table.h"
 #include "basic/strxcpyx.h"
 #include "basic/util.h"
+#include "shared/conf-parser.h"
+
+#include "ethtool-util.h"
 
 static const char* const duplex_table[_DUP_MAX] = {
         [DUP_FULL] = "full",
diff --git a/src/grp-udev/libudev-core/net/link-config.c b/src/grp-udev/libudev-core/net/link-config.c
index c2cd3dcc3c..f6803e00df 100644
--- a/src/grp-udev/libudev-core/net/link-config.c
+++ b/src/grp-udev/libudev-core/net/link-config.c
@@ -33,11 +33,11 @@
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/util.h"
+#include "libudev-private.h"
 #include "sd-netlink/netlink-util.h"
 #include "sd-netlink/sd-netlink.h"
 #include "shared/conf-parser.h"
 #include "systemd-network/network-internal.h"
-#include "libudev-private.h"
 
 #include "ethtool-util.h"
 #include "link-config.h"
diff --git a/src/grp-udev/libudev-core/net/link-config.h b/src/grp-udev/libudev-core/net/link-config.h
index b520e1ee9e..ad5211610a 100644
--- a/src/grp-udev/libudev-core/net/link-config.h
+++ b/src/grp-udev/libudev-core/net/link-config.h
@@ -19,11 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "libudev.h"
+#include <libudev.h>
 
+#include "basic/list.h"
 #include "shared/condition.h"
+
 #include "ethtool-util.h"
-#include "basic/list.h"
 
 typedef struct link_config_ctx link_config_ctx;
 typedef struct link_config link_config;
diff --git a/src/grp-udev/libudev-core/udev-builtin-blkid.c b/src/grp-udev/libudev-core/udev-builtin-blkid.c
index b226626e8d..89fa75fa73 100644
--- a/src/grp-udev/libudev-core/udev-builtin-blkid.c
+++ b/src/grp-udev/libudev-core/udev-builtin-blkid.c
@@ -30,10 +30,10 @@
 #include <systemd/sd-id128.h>
 
 #include "basic/alloc-util.h"
-#include "shared/efivars.h"
 #include "basic/fd-util.h"
-#include "shared/gpt.h"
 #include "basic/string-util.h"
+#include "shared/efivars.h"
+#include "shared/gpt.h"
 #include "udev.h"
 
 static void print_property(struct udev_device *dev, bool test, const char *name, const char *value) {
diff --git a/src/grp-udev/libudev-core/udev-builtin-hwdb.c b/src/grp-udev/libudev-core/udev-builtin-hwdb.c
index a5290ebf2b..d2d95bf394 100644
--- a/src/grp-udev/libudev-core/udev-builtin-hwdb.c
+++ b/src/grp-udev/libudev-core/udev-builtin-hwdb.c
@@ -22,13 +22,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "udev.h"
-
 #include "basic/alloc-util.h"
 #include "basic/string-util.h"
 #include "sd-hwdb/hwdb-util.h"
 #include "sd-hwdb/sd-hwdb.h"
 #include "shared/udev-util.h"
+#include "udev.h"
 
 static sd_hwdb *hwdb;
 
diff --git a/src/grp-udev/libudev-core/udev-builtin-input_id.c b/src/grp-udev/libudev-core/udev-builtin-input_id.c
index ba2c819bfa..f5d700e299 100644
--- a/src/grp-udev/libudev-core/udev-builtin-input_id.c
+++ b/src/grp-udev/libudev-core/udev-builtin-input_id.c
@@ -22,19 +22,19 @@
  */
 
 #include <errno.h>
+#include <linux/input.h>
+#include <linux/limits.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <linux/limits.h>
-#include <linux/input.h>
 
 #include "basic/fd-util.h"
 #include "basic/stdio-util.h"
 #include "basic/string-util.h"
-#include "udev.h"
 #include "basic/util.h"
+#include "udev.h"
 
 /* we must use this kernel-compatible implementation */
 #define BITS_PER_LONG (sizeof(unsigned long) * 8)
diff --git a/src/grp-udev/libudev-core/udev-builtin-keyboard.c b/src/grp-udev/libudev-core/udev-builtin-keyboard.c
index f3ea583134..5067e2247a 100644
--- a/src/grp-udev/libudev-core/udev-builtin-keyboard.c
+++ b/src/grp-udev/libudev-core/udev-builtin-keyboard.c
@@ -17,11 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <linux/input.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
-#include <linux/input.h>
 
 #include "basic/fd-util.h"
 #include "basic/parse-util.h"
diff --git a/src/grp-udev/libudev-core/udev-builtin-net_id.c b/src/grp-udev/libudev-core/udev-builtin-net_id.c
index 3441f844be..f120f816e8 100644
--- a/src/grp-udev/libudev-core/udev-builtin-net_id.c
+++ b/src/grp-udev/libudev-core/udev-builtin-net_id.c
@@ -89,6 +89,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <linux/pci_regs.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <stdarg.h>
@@ -96,7 +97,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <linux/pci_regs.h>
 
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
diff --git a/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c b/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c
index 4a32bac98a..3f3522f5e1 100644
--- a/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c
+++ b/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c
@@ -18,10 +18,11 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "net/link-config.h"
 #include "basic/log.h"
 #include "udev.h"
 
+#include "net/link-config.h"
+
 static link_config_ctx *ctx = NULL;
 
 static int builtin_net_setup_link(struct udev_device *dev, int argc, char **argv, bool test) {
diff --git a/src/grp-udev/libudev-core/udev-builtin-uaccess.c b/src/grp-udev/libudev-core/udev-builtin-uaccess.c
index f15f07ad95..aab1c376de 100644
--- a/src/grp-udev/libudev-core/udev-builtin-uaccess.c
+++ b/src/grp-udev/libudev-core/udev-builtin-uaccess.c
@@ -25,9 +25,10 @@
 #include <systemd/sd-login.h>
 
 #include "basic/login-util.h"
-#include "logind-acl.h"
-#include "udev.h"
 #include "basic/util.h"
+#include "udev.h"
+
+#include "logind-acl.h"
 
 static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool test) {
         int r;
diff --git a/src/grp-udev/libudev-core/udev-event.c b/src/grp-udev/libudev-core/udev-event.c
index 6825863c86..59f4e1fb35 100644
--- a/src/grp-udev/libudev-core/udev-event.c
+++ b/src/grp-udev/libudev-core/udev-event.c
@@ -33,10 +33,10 @@
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
-#include "sd-netlink/netlink-util.h"
 #include "basic/process-util.h"
 #include "basic/signal-util.h"
 #include "basic/string-util.h"
+#include "sd-netlink/netlink-util.h"
 #include "udev.h"
 
 typedef struct Spawn {
diff --git a/src/grp-udev/libudev-core/udev-rules.c b/src/grp-udev/libudev-core/udev-rules.c
index 73fb7677da..134d269fd8 100644
--- a/src/grp-udev/libudev-core/udev-rules.c
+++ b/src/grp-udev/libudev-core/udev-rules.c
@@ -41,10 +41,10 @@
 #include "basic/strbuf.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
-#include "shared/sysctl-util.h"
-#include "udev.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
+#include "shared/sysctl-util.h"
+#include "udev.h"
 
 #define PREALLOC_TOKEN          2048