diff --git a/src/libostree/ostree-bootloader.c b/src/libostree/ostree-bootloader.c
index 790bf502..788fb2c4 100644
--- 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 ca1b453e..00f5632c 100644
--- 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 1e3af0d8..1f536903 100644
--- 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 badfa6df..0b886c1f 100644
--- 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 8bac1c56..10af1ec2 100644
--- 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 03a0bb69..832193db 100644
--- 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 f3837c34..5d345f2a 100644
--- 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 286c2e99..63b1ea38 100644
--- 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