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

7 files changed, 23 insertions, 18 deletions

diff --git a/src/grp-machine/grp-import/systemd-import/import-common.c b/src/grp-machine/grp-import/systemd-import/import-common.c
index c2baef83f8..cd69e900ec 100644
--- a/src/grp-machine/grp-import/systemd-import/import-common.c
+++ b/src/grp-machine/grp-import/systemd-import/import-common.c
@@ -25,10 +25,11 @@
 #include "basic/btrfs-util.h"
 #include "basic/capability-util.h"
 #include "basic/fd-util.h"
-#include "import-common.h"
 #include "basic/signal-util.h"
 #include "basic/util.h"
 
+#include "import-common.h"
+
 int import_make_read_only_fd(int fd) {
         int r;
 
diff --git a/src/grp-machine/grp-import/systemd-import/import-compress.c b/src/grp-machine/grp-import/systemd-import/import-compress.c
index 05643cfbaf..4f1a9891e8 100644
--- a/src/grp-machine/grp-import/systemd-import/import-compress.c
+++ b/src/grp-machine/grp-import/systemd-import/import-compress.c
@@ -17,10 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "import-compress.h"
 #include "basic/string-table.h"
 #include "basic/util.h"
 
+#include "import-compress.h"
+
 void import_compress_free(ImportCompress *c) {
         assert(c);
 
diff --git a/src/grp-machine/grp-import/systemd-import/import-raw.c b/src/grp-machine/grp-import/systemd-import/import-raw.c
index 0bbae2aa8a..658c912f88 100644
--- a/src/grp-machine/grp-import/systemd-import/import-raw.c
+++ b/src/grp-machine/grp-import/systemd-import/import-raw.c
@@ -30,18 +30,19 @@
 #include "basic/fileio.h"
 #include "basic/fs-util.h"
 #include "basic/hostname-util.h"
-#include "import-common.h"
-#include "import-compress.h"
-#include "import-raw.h"
 #include "basic/io-util.h"
-#include "shared/machine-pool.h"
 #include "basic/mkdir.h"
 #include "basic/path-util.h"
-#include "qcow2-util.h"
 #include "basic/ratelimit.h"
 #include "basic/rm-rf.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
+#include "qcow2-util.h"
+#include "shared/machine-pool.h"
+
+#include "import-common.h"
+#include "import-compress.h"
+#include "import-raw.h"
 
 struct RawImport {
         sd_event *event;
diff --git a/src/grp-machine/grp-import/systemd-import/import-raw.h b/src/grp-machine/grp-import/systemd-import/import-raw.h
index a3bc532d37..61ec8cc91e 100644
--- a/src/grp-machine/grp-import/systemd-import/import-raw.h
+++ b/src/grp-machine/grp-import/systemd-import/import-raw.h
@@ -21,8 +21,8 @@
 
 #include <systemd/sd-event.h>
 
-#include "shared/import-util.h"
 #include "basic/macro.h"
+#include "shared/import-util.h"
 
 typedef struct RawImport RawImport;
 
diff --git a/src/grp-machine/grp-import/systemd-import/import-tar.c b/src/grp-machine/grp-import/systemd-import/import-tar.c
index 8848beb11b..f66a7e7e4c 100644
--- a/src/grp-machine/grp-import/systemd-import/import-tar.c
+++ b/src/grp-machine/grp-import/systemd-import/import-tar.c
@@ -29,19 +29,20 @@
 #include "basic/fileio.h"
 #include "basic/fs-util.h"
 #include "basic/hostname-util.h"
-#include "import-common.h"
-#include "import-compress.h"
-#include "import-tar.h"
 #include "basic/io-util.h"
-#include "shared/machine-pool.h"
 #include "basic/mkdir.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
-#include "qcow2-util.h"
 #include "basic/ratelimit.h"
 #include "basic/rm-rf.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
+#include "qcow2-util.h"
+#include "shared/machine-pool.h"
+
+#include "import-common.h"
+#include "import-compress.h"
+#include "import-tar.h"
 
 struct TarImport {
         sd_event *event;
diff --git a/src/grp-machine/grp-import/systemd-import/import-tar.h b/src/grp-machine/grp-import/systemd-import/import-tar.h
index 90ab082f1a..35a08fcfc5 100644
--- a/src/grp-machine/grp-import/systemd-import/import-tar.h
+++ b/src/grp-machine/grp-import/systemd-import/import-tar.h
@@ -21,8 +21,8 @@
 
 #include <systemd/sd-event.h>
 
-#include "shared/import-util.h"
 #include "basic/macro.h"
+#include "shared/import-util.h"
 
 typedef struct TarImport TarImport;
 
diff --git a/src/grp-machine/grp-import/systemd-import/import.c b/src/grp-machine/grp-import/systemd-import/import.c
index 6c76c639c3..6744006312 100644
--- a/src/grp-machine/grp-import/systemd-import/import.c
+++ b/src/grp-machine/grp-import/systemd-import/import.c
@@ -25,13 +25,14 @@
 #include "basic/fd-util.h"
 #include "basic/fs-util.h"
 #include "basic/hostname-util.h"
-#include "import-raw.h"
-#include "import-tar.h"
-#include "shared/import-util.h"
-#include "shared/machine-image.h"
 #include "basic/signal-util.h"
 #include "basic/string-util.h"
 #include "basic/verbs.h"
+#include "shared/import-util.h"
+#include "shared/machine-image.h"
+
+#include "import-raw.h"
+#include "import-tar.h"
 
 static bool arg_force = false;
 static bool arg_read_only = false;