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

5 files changed, 8 insertions, 5 deletions

diff --git a/src/grp-udev/udevadm/udevadm-hwdb.c b/src/grp-udev/udevadm/udevadm-hwdb.c
index 264e8027e2..3446de358c 100644
--- a/src/grp-udev/udevadm/udevadm-hwdb.c
+++ b/src/grp-udev/udevadm/udevadm-hwdb.c
@@ -26,12 +26,12 @@
 #include "basic/conf-files.h"
 #include "basic/fileio.h"
 #include "basic/fs-util.h"
-#include "sd-hwdb/hwdb-internal.h"
-#include "sd-hwdb/hwdb-util.h"
 #include "basic/strbuf.h"
 #include "basic/string-util.h"
-#include "udev.h"
 #include "basic/util.h"
+#include "sd-hwdb/hwdb-internal.h"
+#include "sd-hwdb/hwdb-util.h"
+#include "udev.h"
 
 /*
  * Generic udev properties, key/value database based on modalias strings.
diff --git a/src/grp-udev/udevadm/udevadm-info.c b/src/grp-udev/udevadm/udevadm-info.c
index 9694a991ec..f8b2d915a4 100644
--- a/src/grp-udev/udevadm/udevadm-info.c
+++ b/src/grp-udev/udevadm/udevadm-info.c
@@ -30,6 +30,7 @@
 #include "basic/string-util.h"
 #include "shared/udev-util.h"
 #include "udev.h"
+
 #include "udevadm-util.h"
 
 static bool skip_attribute(const char *name) {
diff --git a/src/grp-udev/udevadm/udevadm-settle.c b/src/grp-udev/udevadm/udevadm-settle.c
index 8b32e58a0c..2a7a150517 100644
--- a/src/grp-udev/udevadm/udevadm-settle.c
+++ b/src/grp-udev/udevadm/udevadm-settle.c
@@ -27,8 +27,8 @@
 #include <unistd.h>
 
 #include "basic/parse-util.h"
-#include "udev.h"
 #include "basic/util.h"
+#include "udev.h"
 
 static void help(void) {
         printf("%s settle OPTIONS\n\n"
diff --git a/src/grp-udev/udevadm/udevadm-trigger.c b/src/grp-udev/udevadm/udevadm-trigger.c
index 89ca90d01b..280f348fae 100644
--- a/src/grp-udev/udevadm/udevadm-trigger.c
+++ b/src/grp-udev/udevadm/udevadm-trigger.c
@@ -24,10 +24,11 @@
 #include <unistd.h>
 
 #include "basic/string-util.h"
+#include "basic/util.h"
 #include "shared/udev-util.h"
 #include "udev.h"
+
 #include "udevadm-util.h"
-#include "basic/util.h"
 
 static int verbose;
 static int dry_run;
diff --git a/src/grp-udev/udevadm/udevadm-util.c b/src/grp-udev/udevadm/udevadm-util.c
index 4ae5e6c7ef..8dc871cb10 100644
--- a/src/grp-udev/udevadm/udevadm-util.c
+++ b/src/grp-udev/udevadm/udevadm-util.c
@@ -16,6 +16,7 @@
  */
 
 #include "basic/string-util.h"
+
 #include "udevadm-util.h"
 
 struct udev_device *find_device(struct udev *udev,