diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index 776f5510..85fbb44c 100644
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -25,7 +25,7 @@ libostree_kernel_args_la_SOURCES = \
 	src/libostree/ostree-kernel-args.h \
 	src/libostree/ostree-kernel-args.c \
 	$(NULL)
-libostree_kernel_args_la_CFLAGS = $(OT_INTERNAL_GIO_UNIX_CFLAGS)
+libostree_kernel_args_la_CFLAGS = -I$(srcdir)/libglnx $(OT_INTERNAL_GIO_UNIX_CFLAGS)
 libostree_kernel_args_la_LIBADD = $(OT_INTERNAL_GIO_UNIX_LIBS)
 
 lib_LTLIBRARIES += libostree-1.la
diff --git a/src/libostree/ostree-deployment.c b/src/libostree/ostree-deployment.c
index 0f98c598..c204f43d 100644
--- a/src/libostree/ostree-deployment.c
+++ b/src/libostree/ostree-deployment.c
@@ -22,6 +22,7 @@
 
 #include "ostree-deployment.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 
 struct _OstreeDeployment
 {
diff --git a/src/libostree/ostree-kernel-args.c b/src/libostree/ostree-kernel-args.c
index 524b9cdd..e4dfec06 100644
--- a/src/libostree/ostree-kernel-args.c
+++ b/src/libostree/ostree-kernel-args.c
@@ -22,6 +22,7 @@
 
 #include "ostree-kernel-args.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 
 #include <string.h>
 
diff --git a/src/libostree/ostree-rollsum.c b/src/libostree/ostree-rollsum.c
index 5a57e1c3..c6f08766 100644
--- a/src/libostree/ostree-rollsum.c
+++ b/src/libostree/ostree-rollsum.c
@@ -25,6 +25,7 @@
 
 #include "ostree-rollsum.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 #include "bupsplit.h"
 
 #define ROLLSUM_BLOB_MAX (8192*4)
diff --git a/src/ostree/ot-builtin-remote.c b/src/ostree/ot-builtin-remote.c
index 5fc027fe..608b9ef1 100644
--- a/src/ostree/ot-builtin-remote.c
+++ b/src/ostree/ot-builtin-remote.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include <libglnx.h>
-
 #include "ot-main.h"
 #include "ot-builtins.h"
 #include "ot-remote-builtins.h"
diff --git a/src/ostree/ot-editor.c b/src/ostree/ot-editor.c
index 4a7a90b1..05fbe1f1 100644
--- a/src/ostree/ot-editor.c
+++ b/src/ostree/ot-editor.c
@@ -24,6 +24,7 @@
 
 #include "ot-editor.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 
 #include <sys/wait.h>
 #include <string.h>
diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c
index 47ea36cb..0a75beee 100644
--- a/src/ostree/ot-main.c
+++ b/src/ostree/ot-main.c
@@ -27,8 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <libglnx.h>
-
 #include "ostree.h"
 #include "ot-main.h"
 #include "otutil.h"
diff --git a/src/ostree/ot-main.h b/src/ostree/ot-main.h
index 60ddb36a..4dd6f419 100644
--- a/src/ostree/ot-main.h
+++ b/src/ostree/ot-main.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include "ostree.h"
+#include "libglnx.h"
 
 typedef enum {
   OSTREE_BUILTIN_FLAG_NONE = 0,
diff --git a/src/ostree/ot-remote-builtin-add.c b/src/ostree/ot-remote-builtin-add.c
index 99e47e7c..f6dbe53d 100644
--- a/src/ostree/ot-remote-builtin-add.c
+++ b/src/ostree/ot-remote-builtin-add.c
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <libglnx.h>
-
 #include "otutil.h"
 #include "ot-tool-util.h"
 
diff --git a/src/ostree/ot-remote-builtin-delete.c b/src/ostree/ot-remote-builtin-delete.c
index d8d16db8..caa5cf8f 100644
--- a/src/ostree/ot-remote-builtin-delete.c
+++ b/src/ostree/ot-remote-builtin-delete.c
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <libglnx.h>
-
 #include "otutil.h"
 
 #include "ot-main.h"
diff --git a/src/ostree/ot-remote-builtin-list.c b/src/ostree/ot-remote-builtin-list.c
index 8e4c3d1d..c42c44ba 100644
--- a/src/ostree/ot-remote-builtin-list.c
+++ b/src/ostree/ot-remote-builtin-list.c
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <libglnx.h>
-
 #include "ot-main.h"
 #include "ot-remote-builtins.h"
 
diff --git a/src/ostree/ot-remote-builtin-show-url.c b/src/ostree/ot-remote-builtin-show-url.c
index dea8efc3..a4b447c8 100644
--- a/src/ostree/ot-remote-builtin-show-url.c
+++ b/src/ostree/ot-remote-builtin-show-url.c
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <libglnx.h>
-
 #include "otutil.h"
 
 #include "ot-main.h"
diff --git a/tests/test-bsdiff.c b/tests/test-bsdiff.c
index 17155321..1769cb9c 100644
--- a/tests/test-bsdiff.c
+++ b/tests/test-bsdiff.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "libgsystem.h"
+#include "libglnx.h"
 #include "bsdiff/bsdiff.h"
 #include "bsdiff/bspatch.h"
 #include <glib.h>
diff --git a/tests/test-keyfile-utils.c b/tests/test-keyfile-utils.c
index cdf765c4..25e86f62 100644
--- a/tests/test-keyfile-utils.c
+++ b/tests/test-keyfile-utils.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 #include <glib.h>
 #include <stdlib.h>
 #include <gio/gio.h>
diff --git a/tests/test-mutable-tree.c b/tests/test-mutable-tree.c
index b0c23867..771ccabd 100644
--- a/tests/test-mutable-tree.c
+++ b/tests/test-mutable-tree.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 #include "ostree-mutable-tree.h"
 #include <glib.h>
 #include <stdlib.h>
diff --git a/tests/test-ot-tool-util.c b/tests/test-ot-tool-util.c
index 39807da2..e9b35213 100644
--- a/tests/test-ot-tool-util.c
+++ b/tests/test-ot-tool-util.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 #include "ostree-mutable-tree.h"
 #include <glib.h>
 #include <stdlib.h>
diff --git a/tests/test-ot-unix-utils.c b/tests/test-ot-unix-utils.c
index cd167a26..e2125142 100644
--- a/tests/test-ot-unix-utils.c
+++ b/tests/test-ot-unix-utils.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "libgsystem.h"
+#include "libglnx.h"
 #include "ot-unix-utils.h"
 #include <glib.h>
 
diff --git a/tests/test-varint.c b/tests/test-varint.c
index 1dc6ec13..e069fc57 100644
--- a/tests/test-varint.c
+++ b/tests/test-varint.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "libgsystem.h"
+#include "libglnx.h"
 
 #include "ostree-varint.h"