Juggling libglnx.h includes

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

src/libostree/ostree-deployment.c

@@ -22,6 +22,7 @@
 
 #include "ostree-deployment.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 
 struct _OstreeDeployment
 {

src/libostree/ostree-kernel-args.c

@@ -22,6 +22,7 @@
 
 #include "ostree-kernel-args.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 
 #include <string.h>
 

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)

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"

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>

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"

src/ostree/ot-main.h

@@ -23,6 +23,7 @@
 #pragma once
 
 #include "ostree.h"
+#include "libglnx.h"
 
 typedef enum {
   OSTREE_BUILTIN_FLAG_NONE = 0,

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"
 

src/ostree/ot-remote-builtin-delete.c

@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <libglnx.h>
-
 #include "otutil.h"
 
 #include "ot-main.h"

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"
 

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"

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>

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>

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>

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>

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>
 

tests/test-varint.c

@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "libgsystem.h"
+#include "libglnx.h"
 
 #include "ostree-varint.h"