tree-wide: Fix various include ordering issues

This fixes the build with `clang-format`.

diff --git a/src/libostree/ostree-bootloader.c b/src/libostree/ostree-bootloader.c
index 790bf5024e52bae4ddd29fad7e81a6625974eb98..788fb2c455a23a974852cb804bcd4689dcd1323a 100644 (file)
--- a/src/libostree/ostree-bootloader.c
+++ b/src/libostree/ostree-bootloader.c
@@ -16,6 +16,7 @@
  */
 
 #include "config.h"
+
 #include "ostree-bootloader.h"
 
 G_DEFINE_INTERFACE (OstreeBootloader, _ostree_bootloader, G_TYPE_OBJECT)

diff --git a/src/libostree/ostree-bootloader.h b/src/libostree/ostree-bootloader.h
index ca1b453eba9fd324b2e0652a1d8e791496b48486..00f5632cf628d70027852fe00ffdbc9caf467ba2 100644 (file)
--- a/src/libostree/ostree-bootloader.h
+++ b/src/libostree/ostree-bootloader.h
@@ -17,7 +17,8 @@
 
 #pragma once
 
-#include <gio/gio.h>
+#include <ostree.h>
+
 #include "otutil.h"
 
 G_BEGIN_DECLS

diff --git a/src/libostree/ostree-repo-static-delta-compilation.c b/src/libostree/ostree-repo-static-delta-compilation.c
index 1e3af0d8618d05d4a9cbc21632c20c4e5b102afd..1f536903f64448da2594d4b577acbddd6fff83ae 100644 (file)
--- a/src/libostree/ostree-repo-static-delta-compilation.c
+++ b/src/libostree/ostree-repo-static-delta-compilation.c
@@ -19,10 +19,9 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <gio/gunixoutputstream.h>
-#include <gio/gmemoryoutputstream.h>
 
 #include "ostree-core-private.h"
 #include "ostree-repo-private.h"

diff --git a/src/ostree/main.c b/src/ostree/main.c
index badfa6dfdceb7637a9b7321dc7eb47f7076c23fe..0b886c1f12f746777652aa4bb6e453150cff41df 100644 (file)
--- a/src/ostree/main.c
+++ b/src/ostree/main.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "ot-main.h"
 #include "ot-builtins.h"
 
 static OstreeCommand commands[] = {

diff --git a/src/ostree/ot-admin-builtins.h b/src/ostree/ot-admin-builtins.h
index 8bac1c5625113651e735d093fb12aca9d430ace3..10af1ec2a034f32d47003da4ae80ff8934bfc61f 100644 (file)
--- a/src/ostree/ot-admin-builtins.h
+++ b/src/ostree/ot-admin-builtins.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <ostree.h>
+#include "ot-main.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/ostree/ot-admin-instutil-builtins.h b/src/ostree/ot-admin-instutil-builtins.h
index 03a0bb694d5c0ae3369763090b6b711d5b66a4e8..832193db1b4615bdab8c501e058717abbfa30127 100644 (file)
--- a/src/ostree/ot-admin-instutil-builtins.h
+++ b/src/ostree/ot-admin-instutil-builtins.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <ostree.h>
+#include "ot-main.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/ostree/ot-admin-kargs-builtins.h b/src/ostree/ot-admin-kargs-builtins.h
index f3837c34cecd08159ffbfa474a1c08f9fe677fb8..5d345f2ae387054f45315c160c7ddee338971a03 100644 (file)
--- a/src/ostree/ot-admin-kargs-builtins.h
+++ b/src/ostree/ot-admin-kargs-builtins.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <ostree.h>
+#include "ot-main.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/ostree/ot-builtins.h b/src/ostree/ot-builtins.h
index 286c2e998e455c6845644e65fba4982f4373aab3..63b1ea384a57dc08248c221ffc078c669e278ba8 100644 (file)
--- a/src/ostree/ot-builtins.h
+++ b/src/ostree/ot-builtins.h
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include "ostree.h"
+#include "ot-main.h"
 
 G_BEGIN_DECLS