diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index 28e5fecf..2e799f20 100644
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -17,59 +17,78 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-privlib_LTLIBRARIES += libostree.la
+lib_LTLIBRARIES += libostree-1.la
 
-libostree_la_SOURCES = src/libostree/ostree.h \
-	src/libostree/ostree-core.c \
+libostreeheadersdir = $(includedir)/ostree-1
+libostreeheaders_DATA = \
+	src/libostree/ostree.h \
 	src/libostree/ostree-core.h \
+	src/libostree/ostree-mutable-tree.h \
+	src/libostree/ostree-repo.h \
+	src/libostree/ostree-types.h \
+	src/libostree/ostree-repo-file.h \
+	src/libostree/ostree-diff.h \
+	$(NULL)
+
+libostree_1_la_SOURCES = \
+	src/libostree/ostree-core.c \
 	src/libostree/ostree-checksum-input-stream.c \
 	src/libostree/ostree-checksum-input-stream.h \
 	src/libostree/ostree-chain-input-stream.c \
 	src/libostree/ostree-chain-input-stream.h \
 	src/libostree/ostree-diff.c \
-	src/libostree/ostree-diff.h \
 	src/libostree/ostree-mutable-tree.c \
-	src/libostree/ostree-mutable-tree.h \
 	src/libostree/ostree-repo.c \
 	src/libostree/ostree-repo-checkout.c \
 	src/libostree/ostree-repo-libarchive.c \
 	src/libostree/ostree-repo-prune.c \
 	src/libostree/ostree-repo-refs.c \
 	src/libostree/ostree-repo-traverse.c \
-	src/libostree/ostree-repo.h \
 	src/libostree/ostree-repo-private.h \
 	src/libostree/ostree-repo-file.c \
-	src/libostree/ostree-repo-file.h \
 	src/libostree/ostree-repo-file-enumerator.c \
 	src/libostree/ostree-repo-file-enumerator.h \
-	src/libostree/ostree-types.h \
 	$(NULL)
 if USE_LIBARCHIVE
-libostree_la_SOURCES += src/libostree/ostree-libarchive-input-stream.h \
+libostree_1_la_SOURCES += src/libostree/ostree-libarchive-input-stream.h \
 	src/libostree/ostree-libarchive-input-stream.c \
 	$(NULL)
 endif
 
-libostree_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libgsystem -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -DLOCALEDIR=\"$(datadir)/locale\" $(OT_INTERNAL_GIO_UNIX_CFLAGS)
-libostree_la_LDFLAGS = -avoid-version -Bsymbolic-functions -export-symbols-regex '^ostree_'
-libostree_la_LIBADD = libotutil.la $(OT_INTERNAL_GIO_UNIX_LIBS)
+libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libgsystem -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -DLOCALEDIR=\"$(datadir)/locale\" $(OT_INTERNAL_GIO_UNIX_CFLAGS)
+libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions -export-symbols-regex '^ostree_'
+libostree_1_la_LIBADD = libotutil.la $(OT_INTERNAL_GIO_UNIX_LIBS)
 
 if USE_LIBARCHIVE
-libostree_la_CFLAGS += $(OT_DEP_LIBARCHIVE_CFLAGS)
-libostree_la_LIBADD += $(OT_DEP_LIBARCHIVE_LIBS)
+libostree_1_la_CFLAGS += $(OT_DEP_LIBARCHIVE_CFLAGS)
+libostree_1_la_LIBADD += $(OT_DEP_LIBARCHIVE_LIBS)
 endif
 
 if USE_LIBSOUP
-libostree_la_SOURCES += \
+libostree_1_la_SOURCES += \
 	src/libostree/ostree-fetcher.h \
 	src/libostree/ostree-fetcher.c \
 	src/libostree/ostree-repo-pull.c \
 	$(NULL)
-libostree_la_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
-libostree_la_LIBADD += $(OT_INTERNAL_SOUP_LIBS)
+libostree_1_la_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
+libostree_1_la_LIBADD += $(OT_INTERNAL_SOUP_LIBS)
 endif
 
+if BUILDOPT_INTROSPECTION
+OSTree-1.0.gir: libostree-1.la Makefile
+OSTree_1_0_gir_EXPORT_PACKAGES = ostree-1
+OSTree_1_0_gir_INCLUDES = Gio-2.0
+OSTree_1_0_gir_CFLAGS = $(libostree_1_la_CFLAGS)
+OSTree_1_0_gir_LIBS = libostree-1.la
+OSTree_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Ostree --symbol-prefix=ostree
+OSTree_1_0_gir_FILES = $(libostreeheaders_DATA) $(filter-out %-private.h,$(libostree_1_la_SOURCES))
+INTROSPECTION_GIRS += OSTree-1.0.gir
+gir_DATA += OSTree-1.0.gir
+typelib_DATA += OSTree-1.0.typelib
+endif
+
+pkgconfig_DATA += src/libostree/ostree-1.pc
 
 INSTALL_DATA_HOOKS += install-libostree-data-hook
 install-libostree-data-hook: 
-	rm -f $(DESTDIR)$(privlibdir)/libostree.la
+	rm -f $(DESTDIR)$(libdir)/libostree-1.la
diff --git a/Makefile-ostree.am b/Makefile-ostree.am
index ee49c38e..d2e3be62 100644
--- a/Makefile-ostree.am
+++ b/Makefile-ostree.am
@@ -72,7 +72,7 @@ ostree_SOURCES += \
 	$(NULL)
 
 ostree_bin_shared_cflags = $(AM_CFLAGS) -I$(srcdir)/src/libgsystem -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -I$(srcdir)/src/ostree  -DLOCALEDIR=\"$(datadir)/locale\"
-ostree_bin_shared_ldadd = libotutil.la libostree.la
+ostree_bin_shared_ldadd = libotutil.la libostree-1.la
 
 ostree_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS)
 ostree_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)
diff --git a/Makefile.am b/Makefile.am
index b87ecb3b..dda09e23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,11 +37,19 @@ EXTRA_DIST =
 bin_PROGRAMS =
 sbin_PROGRAMS =
 bin_SCRIPTS =
+lib_LTLIBRARIES =
 libexec_PROGRAMS =
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 privlibdir = $(pkglibdir)
 privlib_LTLIBRARIES =
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA =
+INTROSPECTION_GIRS = 
+girdir = $(datadir)/gir-1.0
+gir_DATA =
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA =
 
 EXTRA_DIST += autogen.sh COPYING.GPL COPYING.LGPL README.md
 
@@ -78,6 +86,14 @@ libgsystem_cflags = $(OT_INTERNAL_GIO_UNIX_CFLAGS) -I$(srcdir)/src/libgsystem
 libgsystem_libs = $(OT_INTERNAL_GIO_UNIX_LIBS)
 include src/libgsystem/Makefile-libgsystem.am
 noinst_LTLIBRARIES += libgsystem.la
+
+
+if BUILDOPT_INTROSPECTION
+include $(INTROSPECTION_MAKEFILE)
+GIRS =
+TYPELIBS = $(GIRS:.gir=.typelib)
+endif
+
 include Makefile-otutil.am
 include Makefile-libostree.am
 include Makefile-ostree.am
diff --git a/configure.ac b/configure.ac
index f0c57fa8..675f76ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,11 @@ AS_IF([test x$enable_embedded_dependencies = xyes], [
 if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES +libsoup"; fi
 AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno)
 
+m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [
+  GOBJECT_INTROSPECTION_CHECK([1.34.0])
+])
+AM_CONDITIONAL(BUILDOPT_INTROSPECTION, test x$found_introspection = xyes)
+
 LIBARCHIVE_DEPENDENCY="libarchive >= 2.8.0"
 
 AC_ARG_ENABLE(documentation,
@@ -121,6 +126,7 @@ AM_CONDITIONAL(BUILDOPT_DRACUT, test x$with_dracut = xyes)
 AC_CONFIG_FILES([
 Makefile
 embedded-dependencies/Makefile
+src/libostree/ostree-1.pc
 ])
 AC_OUTPUT
 
@@ -130,6 +136,7 @@ echo "
 
 
     embedded dependencies: $enable_embedded_dependencies
+    introspection: $found_introspection
     libsoup (retrieve remote HTTP repositories): $with_soup
     libarchive (parse tar files directly): $with_libarchive
     documentation: $enable_documentation
diff --git a/src/libostree/ostree-1.pc.in b/src/libostree/ostree-1.pc.in
new file mode 100644
index 00000000..d777c597
--- /dev/null
+++ b/src/libostree/ostree-1.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: OSTree
+Description: Git for operating system binaries
+Version: @VERSION@
+Requires: gio-unix-2.0
+Libs: -L${libdir} -lostree-1
+Cflags: -I${includedir}/ostree-1
diff --git a/src/libostree/ostree-chain-input-stream.c b/src/libostree/ostree-chain-input-stream.c
index fa00e374..84602961 100644
--- a/src/libostree/ostree-chain-input-stream.c
+++ b/src/libostree/ostree-chain-input-stream.c
@@ -20,9 +20,8 @@
 
 #include "config.h"
 
-
-#include <gio/gio.h>
 #include "ostree-chain-input-stream.h"
+#include "libgsystem.h"
 
 enum {
   PROP_0,
diff --git a/src/libostree/ostree-checksum-input-stream.c b/src/libostree/ostree-checksum-input-stream.c
index ef5f0d4a..27218e8b 100644
--- a/src/libostree/ostree-checksum-input-stream.c
+++ b/src/libostree/ostree-checksum-input-stream.c
@@ -20,9 +20,8 @@
 
 #include "config.h"
 
-
-#include <gio/gio.h>
 #include "ostree-checksum-input-stream.h"
+#include "libgsystem.h"
 
 enum {
   PROP_0,
diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 8a989373..1a1b396f 100644
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -22,15 +22,15 @@
 
 #include "config.h"
 
-#include "ostree.h"
-#include "otutil.h"
-
-#include <gio/gfiledescriptorbased.h>
-
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <gio/gfiledescriptorbased.h>
 #include <attr/xattr.h>
+#include "ostree.h"
+#include "ostree-chain-input-stream.h"
+#include "otutil.h"
+#include "libgsystem.h"
 
 #define ALIGN_VALUE(this, boundary) \
   (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1)))
diff --git a/src/libostree/ostree-core.h b/src/libostree/ostree-core.h
index c9402507..7a78e1ab 100644
--- a/src/libostree/ostree-core.h
+++ b/src/libostree/ostree-core.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <otutil.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/libostree/ostree-diff.c b/src/libostree/ostree-diff.c
index 560ac808..9cd59942 100644
--- a/src/libostree/ostree-diff.c
+++ b/src/libostree/ostree-diff.c
@@ -24,6 +24,7 @@
 
 #include "ostree.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 static gboolean
 get_file_checksum (GFile  *f,
diff --git a/src/libostree/ostree-fetcher.c b/src/libostree/ostree-fetcher.c
index 22624674..f330150c 100644
--- a/src/libostree/ostree-fetcher.c
+++ b/src/libostree/ostree-fetcher.c
@@ -24,6 +24,8 @@
 
 #include "ostree-fetcher.h"
 #include "ostree.h"
+#include "otutil.h"
+#include "libgsystem.h"
 
 typedef enum {
   OSTREE_FETCHER_STATE_PENDING,
diff --git a/src/libostree/ostree-libarchive-input-stream.c b/src/libostree/ostree-libarchive-input-stream.c
index f27a7a01..701591e8 100644
--- a/src/libostree/ostree-libarchive-input-stream.c
+++ b/src/libostree/ostree-libarchive-input-stream.c
@@ -24,6 +24,7 @@
 #include <archive.h>
 #include <gio/gio.h>
 #include "ostree-libarchive-input-stream.h"
+#include "libgsystem.h"
 
 enum {
   PROP_0,
diff --git a/src/libostree/ostree-mutable-tree.c b/src/libostree/ostree-mutable-tree.c
index 95f17a5a..edbe4f65 100644
--- a/src/libostree/ostree-mutable-tree.c
+++ b/src/libostree/ostree-mutable-tree.c
@@ -25,6 +25,7 @@
 #include "ostree-mutable-tree.h"
 #include "otutil.h"
 #include "ostree-core.h"
+#include "libgsystem.h"
 
 struct OstreeMutableTree
 {
diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c
index e40c8d59..63f54d35 100644
--- a/src/libostree/ostree-repo-checkout.c
+++ b/src/libostree/ostree-repo-checkout.c
@@ -22,6 +22,9 @@
 
 #include "config.h"
 
+#include <glib-unix.h>
+#include "otutil.h"
+
 #include "ostree-repo-file.h"
 #include "ostree-repo-private.h"
 
diff --git a/src/libostree/ostree-repo-file-enumerator.c b/src/libostree/ostree-repo-file-enumerator.c
index 7f25ec6d..15f935c4 100644
--- a/src/libostree/ostree-repo-file-enumerator.c
+++ b/src/libostree/ostree-repo-file-enumerator.c
@@ -22,6 +22,7 @@
 
 #include "config.h"
 
+#include "libgsystem.h"
 #include "ostree-repo-file-enumerator.h"
 #include <string.h>
 
diff --git a/src/libostree/ostree-repo-file.c b/src/libostree/ostree-repo-file.c
index ad2b7f36..c80b529d 100644
--- a/src/libostree/ostree-repo-file.c
+++ b/src/libostree/ostree-repo-file.c
@@ -22,6 +22,7 @@
 
 #include "config.h"
 
+#include "otutil.h"
 #include "ostree-repo-file-enumerator.h"
 #include "ostree-repo.h"
 
diff --git a/src/libostree/ostree-repo-libarchive.c b/src/libostree/ostree-repo-libarchive.c
index 3c23af09..e06092a4 100644
--- a/src/libostree/ostree-repo-libarchive.c
+++ b/src/libostree/ostree-repo-libarchive.c
@@ -31,6 +31,8 @@
 #include "ostree-libarchive-input-stream.h"
 #endif
 
+#include "otutil.h"
+
 #ifdef HAVE_LIBARCHIVE
 
 static GFileInfo *
diff --git a/src/libostree/ostree-repo-prune.c b/src/libostree/ostree-repo-prune.c
index 5260e33f..19651026 100644
--- a/src/libostree/ostree-repo-prune.c
+++ b/src/libostree/ostree-repo-prune.c
@@ -22,7 +22,8 @@
 
 #include "config.h"
 
-#include "ostree-repo.h"
+#include "ostree.h"
+#include "otutil.h"
 
 typedef struct {
   OstreeRepo *repo;
diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 8837b378..83ff8c08 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -69,6 +69,7 @@
 
 #include "ostree.h"
 #include "ostree-fetcher.h"
+#include "otutil.h"
 
 typedef struct {
   enum {
diff --git a/src/libostree/ostree-repo-refs.c b/src/libostree/ostree-repo-refs.c
index fb9f3618..c4948a40 100644
--- a/src/libostree/ostree-repo-refs.c
+++ b/src/libostree/ostree-repo-refs.c
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include "ostree-repo-private.h"
+#include "otutil.h"
 
 static gboolean
 add_ref_to_set (const char       *remote,
@@ -350,6 +351,17 @@ resolve_refspec (OstreeRepo     *self,
   return ret;
 }
 
+/**
+ * ostree_repo_resolve_rev:
+ * @self:
+ * @refspec: A refspec
+ * @allow_noent: Do not throw an error if refspec does not exist
+ * @out_rev: (out) (transfer full): A checksum,or %NULL if @allow_noent is true and it does not exist
+ * @error:
+ *
+ * Look up the given refspec, returning the checksum it references in
+ * the parameter @out_rev.
+ */
 gboolean
 ostree_repo_resolve_rev (OstreeRepo     *self,
                          const char     *refspec,
diff --git a/src/libostree/ostree-repo-traverse.c b/src/libostree/ostree-repo-traverse.c
index 6838314d..7959ae27 100644
--- a/src/libostree/ostree-repo-traverse.c
+++ b/src/libostree/ostree-repo-traverse.c
@@ -24,6 +24,7 @@
 
 #include "ostree.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 GHashTable *
 ostree_repo_traverse_new_reachable (void)
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index fd7d33f4..175e0977 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -22,12 +22,6 @@
 
 #include "config.h"
 
-#include "ostree-repo-private.h"
-#include "ostree-mutable-tree.h"
-#include "ostree-checksum-input-stream.h"
-#include "otutil.h"
-#include "ostree-repo-file-enumerator.h"
-
 #include <gio/gunixoutputstream.h>
 #include <gio/gunixinputstream.h>
 #include <glib/gstdio.h>
@@ -35,6 +29,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "ostree-repo-private.h"
+#include "ostree-mutable-tree.h"
+#include "ostree-checksum-input-stream.h"
+#include "otutil.h"
+#include "libgsystem.h"
+#include "ostree-repo-file-enumerator.h"
+
 typedef struct {
   GObjectClass parent_class;
 } OstreeRepoClass;
@@ -2292,6 +2293,11 @@ ostree_repo_load_variant_if_exists (OstreeRepo       *self,
 
 /**
  * ostree_repo_load_variant:
+ * @self:
+ * @objtype: Expected object type
+ * @sha256: Checksum string
+ * @out_variant: (out): (transfer full): Metadata object
+ * @error:
  * 
  * Load the metadata object @sha256 of type @objtype, storing the
  * result in @out_variant.
diff --git a/src/libostree/ostree-repo.h b/src/libostree/ostree-repo.h
index 85a02a24..9b197bec 100644
--- a/src/libostree/ostree-repo.h
+++ b/src/libostree/ostree-repo.h
@@ -164,7 +164,7 @@ gboolean      ostree_repo_stage_content_finish (OstreeRepo        *self,
 gboolean      ostree_repo_resolve_rev (OstreeRepo  *self,
                                        const char  *refspec,
                                        gboolean     allow_noent,
-                                       char       **out_resolved,
+                                       char       **out_rev,
                                        GError     **error);
 
 gboolean      ostree_repo_write_ref (OstreeRepo  *self,
diff --git a/src/libostree/ostree.h b/src/libostree/ostree.h
index 758e45a4..efafe0d3 100644
--- a/src/libostree/ostree.h
+++ b/src/libostree/ostree.h
@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include <ostree-checksum-input-stream.h>
-#include <ostree-chain-input-stream.h>
 #include <ostree-core.h>
 #include <ostree-repo.h>
 #include <ostree-mutable-tree.h>
diff --git a/src/libotutil/otutil.h b/src/libotutil/otutil.h
index 57f32743..c7a2842b 100644
--- a/src/libotutil/otutil.h
+++ b/src/libotutil/otutil.h
@@ -24,6 +24,7 @@
 
 #include <gio/gio.h>
 #include <libgsystem.h>
+#include <string.h> /* Yeah...let's just do that here. */
 #include <gsystem-local-alloc.h>
 
 #define ot_gobject_refz(o) (o ? g_object_ref (o) : o)
diff --git a/src/ostree/ot-admin-builtin-cleanup.c b/src/ostree/ot-admin-builtin-cleanup.c
index 5dc8b8ea..b8e8f302 100644
--- a/src/ostree/ot-admin-builtin-cleanup.c
+++ b/src/ostree/ot-admin-builtin-cleanup.c
@@ -25,6 +25,7 @@
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 
diff --git a/src/ostree/ot-admin-builtin-deploy.c b/src/ostree/ot-admin-builtin-deploy.c
index 93e38375..bc8dca84 100644
--- a/src/ostree/ot-admin-builtin-deploy.c
+++ b/src/ostree/ot-admin-builtin-deploy.c
@@ -27,6 +27,7 @@
 #include "ot-admin-deploy.h"
 #include "ot-ordered-hash.h"
 #include "ostree.h"
+#include "otutil.h"
 
 #include <glib/gi18n.h>
 
diff --git a/src/ostree/ot-admin-builtin-diff.c b/src/ostree/ot-admin-builtin-diff.c
index 580692e3..8965a3d8 100644
--- a/src/ostree/ot-admin-builtin-diff.c
+++ b/src/ostree/ot-admin-builtin-diff.c
@@ -25,6 +25,7 @@
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 
diff --git a/src/ostree/ot-admin-builtin-init-fs.c b/src/ostree/ot-admin-builtin-init-fs.c
index 9da1e047..9b00814a 100644
--- a/src/ostree/ot-admin-builtin-init-fs.c
+++ b/src/ostree/ot-admin-builtin-init-fs.c
@@ -25,6 +25,7 @@
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 
diff --git a/src/ostree/ot-admin-builtin-os-init.c b/src/ostree/ot-admin-builtin-os-init.c
index 8bdf9708..ddb641fd 100644
--- a/src/ostree/ot-admin-builtin-os-init.c
+++ b/src/ostree/ot-admin-builtin-os-init.c
@@ -25,6 +25,7 @@
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 
diff --git a/src/ostree/ot-admin-builtin-status.c b/src/ostree/ot-admin-builtin-status.c
index 5f1fc34a..fe6c407f 100644
--- a/src/ostree/ot-admin-builtin-status.c
+++ b/src/ostree/ot-admin-builtin-status.c
@@ -25,6 +25,7 @@
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 
diff --git a/src/ostree/ot-admin-builtin-undeploy.c b/src/ostree/ot-admin-builtin-undeploy.c
index 29221890..0b5579c9 100644
--- a/src/ostree/ot-admin-builtin-undeploy.c
+++ b/src/ostree/ot-admin-builtin-undeploy.c
@@ -20,13 +20,14 @@
 
 #include "config.h"
 
+#include <stdlib.h>
+
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "ot-admin-deploy.h"
 #include "ot-ordered-hash.h"
 #include "ostree.h"
-
-#include <stdlib.h>
+#include "otutil.h"
 
 static GOptionEntry options[] = {
   { NULL }
diff --git a/src/ostree/ot-admin-builtin-upgrade.c b/src/ostree/ot-admin-builtin-upgrade.c
index b4b99815..b5b4e93d 100644
--- a/src/ostree/ot-admin-builtin-upgrade.c
+++ b/src/ostree/ot-admin-builtin-upgrade.c
@@ -27,6 +27,7 @@
 #include "ot-admin-deploy.h"
 #include "ostree.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/src/ostree/ot-bootloader-syslinux.c b/src/ostree/ot-bootloader-syslinux.c
index 9fe6ae1a..27eae45f 100644
--- a/src/ostree/ot-bootloader-syslinux.c
+++ b/src/ostree/ot-bootloader-syslinux.c
@@ -21,9 +21,9 @@
 #include "config.h"
 
 #include "ot-bootloader-syslinux.h"
-#include "libgsystem.h"
 #include "otutil.h"
 #include "ot-admin-functions.h"
+#include "libgsystem.h"
 
 #include <string.h>
 
diff --git a/src/ostree/ot-bootloader.c b/src/ostree/ot-bootloader.c
index 68ac223f..27edaa0a 100644
--- a/src/ostree/ot-bootloader.c
+++ b/src/ostree/ot-bootloader.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "ot-bootloader.h"
+#include "libgsystem.h"
 
 G_DEFINE_INTERFACE (OtBootloader, ot_bootloader, G_TYPE_OBJECT)
 
diff --git a/src/ostree/ot-builtin-admin.c b/src/ostree/ot-builtin-admin.c
index c591c015..9b5bdc45 100644
--- a/src/ostree/ot-builtin-admin.c
+++ b/src/ostree/ot-builtin-admin.c
@@ -28,6 +28,7 @@
 #include "ot-main.h"
 #include "ostree.h"
 #include "ostree-repo-file.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 
diff --git a/src/ostree/ot-builtin-cat.c b/src/ostree/ot-builtin-cat.c
index 357878ee..c3f113f2 100644
--- a/src/ostree/ot-builtin-cat.c
+++ b/src/ostree/ot-builtin-cat.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 #include <gio/gunixoutputstream.h>
 
diff --git a/src/ostree/ot-builtin-checkout.c b/src/ostree/ot-builtin-checkout.c
index 5691c71b..c71592e7 100644
--- a/src/ostree/ot-builtin-checkout.c
+++ b/src/ostree/ot-builtin-checkout.c
@@ -22,10 +22,12 @@
 
 #include "config.h"
 
+#include <string.h>
+#include <gio/gunixinputstream.h>
+
 #include "ot-builtins.h"
 #include "ostree.h"
-
-#include <gio/gunixinputstream.h>
+#include "otutil.h"
 
 static gboolean opt_user_mode;
 static gboolean opt_allow_noent;
diff --git a/src/ostree/ot-builtin-checksum.c b/src/ostree/ot-builtin-checksum.c
index d18121b1..aa82a977 100644
--- a/src/ostree/ot-builtin-checksum.c
+++ b/src/ostree/ot-builtin-checksum.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 static GOptionEntry options[] = {
   { NULL }
diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c
index facdee1b..b29c229e 100644
--- a/src/ostree/ot-builtin-commit.c
+++ b/src/ostree/ot-builtin-commit.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static char *opt_subject;
 static char *opt_body;
diff --git a/src/ostree/ot-builtin-config.c b/src/ostree/ot-builtin-config.c
index eb2766da..17707eef 100644
--- a/src/ostree/ot-builtin-config.c
+++ b/src/ostree/ot-builtin-config.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static GOptionEntry options[] = {
   { NULL }
diff --git a/src/ostree/ot-builtin-diff.c b/src/ostree/ot-builtin-diff.c
index 0668609e..e335194c 100644
--- a/src/ostree/ot-builtin-diff.c
+++ b/src/ostree/ot-builtin-diff.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static gboolean opt_stats;
 static gboolean opt_fs_diff;
diff --git a/src/ostree/ot-builtin-fsck.c b/src/ostree/ot-builtin-fsck.c
index 420921b7..e267415b 100644
--- a/src/ostree/ot-builtin-fsck.c
+++ b/src/ostree/ot-builtin-fsck.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static gboolean opt_quiet;
 static gboolean opt_delete;
diff --git a/src/ostree/ot-builtin-init.c b/src/ostree/ot-builtin-init.c
index a992bfbd..6d38899f 100644
--- a/src/ostree/ot-builtin-init.c
+++ b/src/ostree/ot-builtin-init.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 static gboolean opt_archive;
 static char *opt_mode = NULL;
diff --git a/src/ostree/ot-builtin-ls.c b/src/ostree/ot-builtin-ls.c
index 06087e48..3e016902 100644
--- a/src/ostree/ot-builtin-ls.c
+++ b/src/ostree/ot-builtin-ls.c
@@ -25,6 +25,7 @@
 #include "ot-builtins.h"
 #include "ostree.h"
 #include "ostree-repo-file.h"
+#include "otutil.h"
 
 static gboolean opt_dironly;
 static gboolean opt_recursive;
diff --git a/src/ostree/ot-builtin-prune.c b/src/ostree/ot-builtin-prune.c
index 98fe9d61..6e2f0749 100644
--- a/src/ostree/ot-builtin-prune.c
+++ b/src/ostree/ot-builtin-prune.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 static gboolean opt_no_prune;
 static gint opt_depth = -1;
diff --git a/src/ostree/ot-builtin-pull-local.c b/src/ostree/ot-builtin-pull-local.c
index d99e2b8b..cd63450c 100644
--- a/src/ostree/ot-builtin-pull-local.c
+++ b/src/ostree/ot-builtin-pull-local.c
@@ -27,6 +27,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static char *opt_remote;
 
diff --git a/src/ostree/ot-builtin-pull.c b/src/ostree/ot-builtin-pull.c
index a8606257..1bb76357 100644
--- a/src/ostree/ot-builtin-pull.c
+++ b/src/ostree/ot-builtin-pull.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 gboolean opt_related;
 
diff --git a/src/ostree/ot-builtin-refs.c b/src/ostree/ot-builtin-refs.c
index eb3e8fcf..972afe38 100644
--- a/src/ostree/ot-builtin-refs.c
+++ b/src/ostree/ot-builtin-refs.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 static gboolean opt_delete;
 
diff --git a/src/ostree/ot-builtin-remote.c b/src/ostree/ot-builtin-remote.c
index 5a9964a2..76a63a3d 100644
--- a/src/ostree/ot-builtin-remote.c
+++ b/src/ostree/ot-builtin-remote.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static GOptionEntry options[] = {
   { NULL }
diff --git a/src/ostree/ot-builtin-rev-parse.c b/src/ostree/ot-builtin-rev-parse.c
index 7d6eebdf..a1349a68 100644
--- a/src/ostree/ot-builtin-rev-parse.c
+++ b/src/ostree/ot-builtin-rev-parse.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static GOptionEntry options[] = {
   { NULL }
diff --git a/src/ostree/ot-builtin-show.c b/src/ostree/ot-builtin-show.c
index 8cc5e03d..cbdce34c 100644
--- a/src/ostree/ot-builtin-show.c
+++ b/src/ostree/ot-builtin-show.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static gboolean opt_print_related;
 static char* opt_print_variant_type;
diff --git a/src/ostree/ot-builtin-trivial-httpd.c b/src/ostree/ot-builtin-trivial-httpd.c
index f3bd7cff..d6f85f5d 100644
--- a/src/ostree/ot-builtin-trivial-httpd.c
+++ b/src/ostree/ot-builtin-trivial-httpd.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static char *opt_port_file = NULL;
 static gboolean opt_daemonize;
diff --git a/src/ostree/ot-builtin-write-refs.c b/src/ostree/ot-builtin-write-refs.c
index b7e463b4..b744d425 100644
--- a/src/ostree/ot-builtin-write-refs.c
+++ b/src/ostree/ot-builtin-write-refs.c
@@ -22,12 +22,13 @@
 
 #include "config.h"
 
-#include "ot-builtins.h"
-#include "ostree.h"
-
 #include <gio/gunixoutputstream.h>
 #include <gio/gunixinputstream.h>
 
+#include "ot-builtins.h"
+#include "ostree.h"
+#include "otutil.h"
+
 static GOptionEntry options[] = {
   { NULL }
 };
diff --git a/src/ostree/ot-deployment.c b/src/ostree/ot-deployment.c
index 4f51b95f..4956961e 100644
--- a/src/ostree/ot-deployment.c
+++ b/src/ostree/ot-deployment.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "ot-deployment.h"
+#include "libgsystem.h"
 
 struct _OtDeployment
 {
diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c
index 590c1e33..243dfda1 100644
--- a/src/ostree/ot-main.c
+++ b/src/ostree/ot-main.c
@@ -28,6 +28,7 @@
 
 #include "ot-main.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 int
 ostree_usage (char **argv,
diff --git a/src/ostree/ot-ordered-hash.c b/src/ostree/ot-ordered-hash.c
index a7709e47..02c9e434 100644
--- a/src/ostree/ot-ordered-hash.c
+++ b/src/ostree/ot-ordered-hash.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "ot-ordered-hash.h"
+#include "libgsystem.h"
 
 OtOrderedHash *
 ot_ordered_hash_new (void)