build: Consistently include libglnx header as "libglnx.h"

Recent Meson versions have warnings if you add the subprojects
directory as an include path, because the way Meson wants to consume
subprojects is by the subproject's build system producing a Meson
dependency object that encapsulates its include directory. Flatpak
doesn't have a Meson build system yet, but I'm working on that.

libglnx seems to be set up to have the libglnx directory be its include
path instead: for example, ostree (by the author of libglnx) already
uses "libglnx.h" or <libglnx.h> everywhere. Do the same here.

Signed-off-by: Simon McVittie <smcv@collabora.com>

66 files changed, 67 insertions, 67 deletions

diff --git a/app/flatpak-builtins-build-bundle.c b/app/flatpak-builtins-build-bundle.c
index 06ce36a2..dcb5ca5d 100644
--- a/app/flatpak-builtins-build-bundle.c
+++ b/app/flatpak-builtins-build-bundle.c
@@ -31,7 +31,7 @@
 
 #include <gio/gunixinputstream.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-utils-private.h"
diff --git a/app/flatpak-builtins-build-commit-from.c b/app/flatpak-builtins-build-commit-from.c
index eaf427d2..e2e53291 100644
--- a/app/flatpak-builtins-build-commit-from.c
+++ b/app/flatpak-builtins-build-commit-from.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-utils-private.h"
diff --git a/app/flatpak-builtins-build-export.c b/app/flatpak-builtins-build-export.c
index 047f89f1..936f6ad5 100644
--- a/app/flatpak-builtins-build-export.c
+++ b/app/flatpak-builtins-build-export.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-utils-private.h"
diff --git a/app/flatpak-builtins-build-finish.c b/app/flatpak-builtins-build-finish.c
index 1bd9b0f3..9407a959 100644
--- a/app/flatpak-builtins-build-finish.c
+++ b/app/flatpak-builtins-build-finish.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-context-private.h"
diff --git a/app/flatpak-builtins-build-import-bundle.c b/app/flatpak-builtins-build-import-bundle.c
index dae1c3b6..98e03cd2 100644
--- a/app/flatpak-builtins-build-import-bundle.c
+++ b/app/flatpak-builtins-build-import-bundle.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-utils-private.h"
diff --git a/app/flatpak-builtins-build-init.c b/app/flatpak-builtins-build-init.c
index 1180c7ea..d84cad0a 100644
--- a/app/flatpak-builtins-build-init.c
+++ b/app/flatpak-builtins-build-init.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-build-sign.c b/app/flatpak-builtins-build-sign.c
index f4065cd2..bff76cd6 100644
--- a/app/flatpak-builtins-build-sign.c
+++ b/app/flatpak-builtins-build-sign.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-utils-private.h"
diff --git a/app/flatpak-builtins-build-update-repo.c b/app/flatpak-builtins-build-update-repo.c
index 7595e0be..aa17b4ad 100644
--- a/app/flatpak-builtins-build-update-repo.c
+++ b/app/flatpak-builtins-build-update-repo.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-utils-base-private.h"
diff --git a/app/flatpak-builtins-build.c b/app/flatpak-builtins-build.c
index 0c4c5ce3..b18d6e65 100644
--- a/app/flatpak-builtins-build.c
+++ b/app/flatpak-builtins-build.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-utils-private.h"
diff --git a/app/flatpak-builtins-config.c b/app/flatpak-builtins-config.c
index 8b4855fd..fb956c0f 100644
--- a/app/flatpak-builtins-config.c
+++ b/app/flatpak-builtins-config.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "common/flatpak-dir-private.h"
diff --git a/app/flatpak-builtins-create-usb.c b/app/flatpak-builtins-create-usb.c
index 45f9a2e7..652b9429 100644
--- a/app/flatpak-builtins-create-usb.c
+++ b/app/flatpak-builtins-create-usb.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-document-export.c b/app/flatpak-builtins-document-export.c
index e701a826..3fd92523 100644
--- a/app/flatpak-builtins-document-export.c
+++ b/app/flatpak-builtins-document-export.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "flatpak-document-dbus-generated.h"
 
 #include <gio/gunixfdlist.h>
diff --git a/app/flatpak-builtins-document-info.c b/app/flatpak-builtins-document-info.c
index 4b94433d..3e3eab61 100644
--- a/app/flatpak-builtins-document-info.c
+++ b/app/flatpak-builtins-document-info.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "flatpak-document-dbus-generated.h"
 
 #include <gio/gunixfdlist.h>
diff --git a/app/flatpak-builtins-document-list.c b/app/flatpak-builtins-document-list.c
index 0462036d..56387a72 100644
--- a/app/flatpak-builtins-document-list.c
+++ b/app/flatpak-builtins-document-list.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "flatpak-document-dbus-generated.h"
 
 #include "flatpak-builtins.h"
diff --git a/app/flatpak-builtins-document-unexport.c b/app/flatpak-builtins-document-unexport.c
index 66e0933e..8aa6f437 100644
--- a/app/flatpak-builtins-document-unexport.c
+++ b/app/flatpak-builtins-document-unexport.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "flatpak-document-dbus-generated.h"
 
 #include <gio/gunixfdlist.h>
diff --git a/app/flatpak-builtins-enter.c b/app/flatpak-builtins-enter.c
index 44e14e9b..6c0d9dee 100644
--- a/app/flatpak-builtins-enter.c
+++ b/app/flatpak-builtins-enter.c
@@ -29,7 +29,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-utils-private.h"
diff --git a/app/flatpak-builtins-history.c b/app/flatpak-builtins-history.c
index 4adb9a21..4ac6e291 100644
--- a/app/flatpak-builtins-history.c
+++ b/app/flatpak-builtins-history.c
@@ -29,7 +29,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #ifdef HAVE_LIBSYSTEMD
 #include <systemd/sd-journal.h>
diff --git a/app/flatpak-builtins-info.c b/app/flatpak-builtins-info.c
index c13d2d89..58caa2e2 100644
--- a/app/flatpak-builtins-info.c
+++ b/app/flatpak-builtins-info.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-utils-private.h"
diff --git a/app/flatpak-builtins-install.c b/app/flatpak-builtins-install.c
index 2a0d4c9f..17414f5f 100644
--- a/app/flatpak-builtins-install.c
+++ b/app/flatpak-builtins-install.c
@@ -29,7 +29,7 @@
 
 #include <gio/gunixinputstream.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-kill.c b/app/flatpak-builtins-kill.c
index 7b6831bb..10979d4a 100644
--- a/app/flatpak-builtins-kill.c
+++ b/app/flatpak-builtins-kill.c
@@ -31,7 +31,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-instance.h"
diff --git a/app/flatpak-builtins-list.c b/app/flatpak-builtins-list.c
index 273c5649..fe5c3213 100644
--- a/app/flatpak-builtins-list.c
+++ b/app/flatpak-builtins-list.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-make-current.c b/app/flatpak-builtins-make-current.c
index 0e579bc0..98e99e0b 100644
--- a/app/flatpak-builtins-make-current.c
+++ b/app/flatpak-builtins-make-current.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-utils-private.h"
diff --git a/app/flatpak-builtins-mask.c b/app/flatpak-builtins-mask.c
index f69a853d..9f3f56bf 100644
--- a/app/flatpak-builtins-mask.c
+++ b/app/flatpak-builtins-mask.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-override.c b/app/flatpak-builtins-override.c
index 1bc9c508..7b743ca2 100644
--- a/app/flatpak-builtins-override.c
+++ b/app/flatpak-builtins-override.c
@@ -29,7 +29,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-utils-private.h"
diff --git a/app/flatpak-builtins-permission-list.c b/app/flatpak-builtins-permission-list.c
index e3c99b4a..6835e0cd 100644
--- a/app/flatpak-builtins-permission-list.c
+++ b/app/flatpak-builtins-permission-list.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "flatpak-permission-dbus-generated.h"
 
 #include "flatpak-builtins.h"
diff --git a/app/flatpak-builtins-permission-remove.c b/app/flatpak-builtins-permission-remove.c
index a913d676..cec8164b 100644
--- a/app/flatpak-builtins-permission-remove.c
+++ b/app/flatpak-builtins-permission-remove.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "flatpak-permission-dbus-generated.h"
 
 #include "flatpak-builtins.h"
diff --git a/app/flatpak-builtins-permission-reset.c b/app/flatpak-builtins-permission-reset.c
index 704a53d1..943786fa 100644
--- a/app/flatpak-builtins-permission-reset.c
+++ b/app/flatpak-builtins-permission-reset.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "flatpak-permission-dbus-generated.h"
 
 #include "flatpak-builtins.h"
diff --git a/app/flatpak-builtins-permission-set.c b/app/flatpak-builtins-permission-set.c
index 084041e8..5a8554b0 100644
--- a/app/flatpak-builtins-permission-set.c
+++ b/app/flatpak-builtins-permission-set.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "flatpak-permission-dbus-generated.h"
 
 #include "flatpak-builtins.h"
diff --git a/app/flatpak-builtins-permission-show.c b/app/flatpak-builtins-permission-show.c
index 1b384128..29db2d7a 100644
--- a/app/flatpak-builtins-permission-show.c
+++ b/app/flatpak-builtins-permission-show.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "flatpak-permission-dbus-generated.h"
 
 #include "flatpak-builtins.h"
diff --git a/app/flatpak-builtins-pin.c b/app/flatpak-builtins-pin.c
index d0c8fc1d..4a84da38 100644
--- a/app/flatpak-builtins-pin.c
+++ b/app/flatpak-builtins-pin.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-ps.c b/app/flatpak-builtins-ps.c
index 244bc407..6259bc32 100644
--- a/app/flatpak-builtins-ps.c
+++ b/app/flatpak-builtins-ps.c
@@ -29,7 +29,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-remote-add.c b/app/flatpak-builtins-remote-add.c
index c3d1e3cd..e273ca9d 100644
--- a/app/flatpak-builtins-remote-add.c
+++ b/app/flatpak-builtins-remote-add.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-remote-delete.c b/app/flatpak-builtins-remote-delete.c
index 50047a3b..f0bbd766 100644
--- a/app/flatpak-builtins-remote-delete.c
+++ b/app/flatpak-builtins-remote-delete.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-remote-info.c b/app/flatpak-builtins-remote-info.c
index d5a16972..7e079643 100644
--- a/app/flatpak-builtins-remote-info.c
+++ b/app/flatpak-builtins-remote-info.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-remote-list.c b/app/flatpak-builtins-remote-list.c
index 4b81cb02..f9742a48 100644
--- a/app/flatpak-builtins-remote-list.c
+++ b/app/flatpak-builtins-remote-list.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-remote-ls.c b/app/flatpak-builtins-remote-ls.c
index ab8d4739..3f7cdfb3 100644
--- a/app/flatpak-builtins-remote-ls.c
+++ b/app/flatpak-builtins-remote-ls.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-remote-modify.c b/app/flatpak-builtins-remote-modify.c
index fb9a9a25..904a94a5 100644
--- a/app/flatpak-builtins-remote-modify.c
+++ b/app/flatpak-builtins-remote-modify.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-repair.c b/app/flatpak-builtins-repair.c
index 4680c6df..821580f2 100644
--- a/app/flatpak-builtins-repair.c
+++ b/app/flatpak-builtins-repair.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-repo.c b/app/flatpak-builtins-repo.c
index 13608eba..d9d5c4fd 100644
--- a/app/flatpak-builtins-repo.c
+++ b/app/flatpak-builtins-repo.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-utils-private.h"
diff --git a/app/flatpak-builtins-run.c b/app/flatpak-builtins-run.c
index ba2ae671..9f517374 100644
--- a/app/flatpak-builtins-run.c
+++ b/app/flatpak-builtins-run.c
@@ -29,7 +29,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-utils-private.h"
diff --git a/app/flatpak-builtins-uninstall.c b/app/flatpak-builtins-uninstall.c
index 0c2d7c92..9259778c 100644
--- a/app/flatpak-builtins-uninstall.c
+++ b/app/flatpak-builtins-uninstall.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-update.c b/app/flatpak-builtins-update.c
index d366df94..b1975796 100644
--- a/app/flatpak-builtins-update.c
+++ b/app/flatpak-builtins-update.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
diff --git a/app/flatpak-builtins-utils.h b/app/flatpak-builtins-utils.h
index ab77fa8a..01893157 100644
--- a/app/flatpak-builtins-utils.h
+++ b/app/flatpak-builtins-utils.h
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 #include <appstream.h>
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "flatpak-utils-private.h"
 #include "flatpak-dir-private.h"
 #include "flatpak-permission-dbus-generated.h"
diff --git a/app/flatpak-main.c b/app/flatpak-main.c
index dfdd45b3..23979327 100644
--- a/app/flatpak-main.c
+++ b/app/flatpak-main.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #ifdef USE_SYSTEM_HELPER
 #include <polkit/polkit.h>
diff --git a/common/flatpak-bwrap.c b/common/flatpak-bwrap.c
index cda0dbfb..4367201b 100644
--- a/common/flatpak-bwrap.c
+++ b/common/flatpak-bwrap.c
@@ -35,7 +35,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <gio/gio.h>
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-bwrap-private.h"
 #include "flatpak-utils-private.h"
diff --git a/common/flatpak-context-private.h b/common/flatpak-context-private.h
index 8a565377..a5171f94 100644
--- a/common/flatpak-context-private.h
+++ b/common/flatpak-context-private.h
@@ -21,7 +21,7 @@
 #ifndef __FLATPAK_CONTEXT_H__
 #define __FLATPAK_CONTEXT_H__
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "dbus-proxy/flatpak-proxy.h"
 #include <flatpak-common-types-private.h>
 #include "flatpak-exports-private.h"
diff --git a/common/flatpak-context.c b/common/flatpak-context.c
index 423212dc..b2d01a28 100644
--- a/common/flatpak-context.c
+++ b/common/flatpak-context.c
@@ -35,7 +35,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <gio/gio.h>
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-run-private.h"
 #include "flatpak-proxy.h"
diff --git a/common/flatpak-dir-private.h b/common/flatpak-dir-private.h
index 5c5dec17..74d2e974 100644
--- a/common/flatpak-dir-private.h
+++ b/common/flatpak-dir-private.h
@@ -28,7 +28,7 @@
 #include "flatpak-progress-private.h"
 #include "flatpak-variant-private.h"
 #include "flatpak-ref-utils-private.h"
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 /* Version history:
  * The version field was added in flatpak 1.2, anything before is 0.
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index bb5b6cce..c5d64ea7 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -55,7 +55,7 @@
 #include "flatpak-utils-base-private.h"
 #include "flatpak-variant-private.h"
 #include "flatpak-variant-impl-private.h"
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "system-helper/flatpak-system-helper.h"
 
 #ifdef HAVE_LIBMALCONTENT
diff --git a/common/flatpak-exports-private.h b/common/flatpak-exports-private.h
index d7e22e7e..90308910 100644
--- a/common/flatpak-exports-private.h
+++ b/common/flatpak-exports-private.h
@@ -21,7 +21,7 @@
 #ifndef __FLATPAK_EXPORTS_H__
 #define __FLATPAK_EXPORTS_H__
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "flatpak-bwrap-private.h"
 
 /* In numerical order of more privs */
diff --git a/common/flatpak-exports.c b/common/flatpak-exports.c
index 904198b0..7c94bd5b 100644
--- a/common/flatpak-exports.c
+++ b/common/flatpak-exports.c
@@ -38,7 +38,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <gio/gio.h>
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-exports-private.h"
 #include "flatpak-run-private.h"
diff --git a/common/flatpak-oci-registry-private.h b/common/flatpak-oci-registry-private.h
index fb084995..66d69f08 100644
--- a/common/flatpak-oci-registry-private.h
+++ b/common/flatpak-oci-registry-private.h
@@ -21,7 +21,7 @@
 #ifndef __FLATPAK_OCI_REGISTRY_H__
 #define __FLATPAK_OCI_REGISTRY_H__
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include <glib.h>
 #include <gio/gio.h>
diff --git a/common/flatpak-prune.c b/common/flatpak-prune.c
index c9983fa6..78e397fd 100644
--- a/common/flatpak-prune.c
+++ b/common/flatpak-prune.c
@@ -35,7 +35,7 @@
 #include "flatpak-error.h"
 #include "flatpak-prune-private.h"
 #include "flatpak-variant-impl-private.h"
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "valgrind-private.h"
 
 /* This is a custom implementation of ostree-prune that caches the
diff --git a/common/flatpak-run-private.h b/common/flatpak-run-private.h
index eac25ccc..72b45c8d 100644
--- a/common/flatpak-run-private.h
+++ b/common/flatpak-run-private.h
@@ -21,7 +21,7 @@
 #ifndef __FLATPAK_RUN_H__
 #define __FLATPAK_RUN_H__
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "flatpak-common-types-private.h"
 #include "flatpak-context-private.h"
 #include "flatpak-bwrap-private.h"
diff --git a/common/flatpak-run.c b/common/flatpak-run.c
index b91be51b..e706cbba 100644
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -55,7 +55,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <gio/gio.h>
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include "flatpak-run-private.h"
 #include "flatpak-proxy.h"
diff --git a/common/flatpak-utils-base.c b/common/flatpak-utils-base.c
index 4be6fae7..d5f19e81 100644
--- a/common/flatpak-utils-base.c
+++ b/common/flatpak-utils-base.c
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include <gio/gio.h>
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 char *
 flatpak_get_timezone (void)
diff --git a/common/flatpak-utils-http.c b/common/flatpak-utils-http.c
index 0a230c37..6f2421ba 100644
--- a/common/flatpak-utils-http.c
+++ b/common/flatpak-utils-http.c
@@ -23,7 +23,7 @@
 
 #include <gio/gunixoutputstream.h>
 #include <libsoup/soup.h>
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include <sys/types.h>
 #include <sys/xattr.h>
diff --git a/common/flatpak-utils-private.h b/common/flatpak-utils-private.h
index 826f7daa..d11339d6 100644
--- a/common/flatpak-utils-private.h
+++ b/common/flatpak-utils-private.h
@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include <flatpak-common-types-private.h>
 #include <gio/gio.h>
 #include <gio/gunixfdlist.h>
diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c
index 1b9036bc..bfafc229 100644
--- a/common/flatpak-utils.c
+++ b/common/flatpak-utils.c
@@ -51,7 +51,7 @@
 #include "flatpak-utils-base-private.h"
 #include "flatpak-utils-private.h"
 #include "flatpak-variant-impl-private.h"
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "valgrind-private.h"
 
 /* This is also here so the common code can report these errors to the lib */
diff --git a/common/test-lib.c b/common/test-lib.c
index 4046d83d..239f5cda 100644
--- a/common/test-lib.c
+++ b/common/test-lib.c
@@ -1,6 +1,6 @@
 #include "config.h"
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #include <flatpak.h>
 #include <gio/gunixoutputstream.h>
diff --git a/portal/flatpak-portal-app-info.c b/portal/flatpak-portal-app-info.c
index ac70f143..586fde9d 100644
--- a/portal/flatpak-portal-app-info.c
+++ b/portal/flatpak-portal-app-info.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <gio/gio.h>
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "flatpak-portal-app-info.h"
 #include "flatpak-portal-error.h"
 
diff --git a/tests/can-use-fuse.c b/tests/can-use-fuse.c
index 25f3936e..f39d2f15 100644
--- a/tests/can-use-fuse.c
+++ b/tests/can-use-fuse.c
@@ -11,7 +11,7 @@
 
 #include <glib/gstdio.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 #define FUSE_USE_VERSION 26
 #include <fuse_lowlevel.h>
diff --git a/tests/hold-lock.c b/tests/hold-lock.c
index a4f7593b..542f8af5 100644
--- a/tests/hold-lock.c
+++ b/tests/hold-lock.c
@@ -30,7 +30,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 static GArray *global_locks = NULL;
 static gboolean opt_wait = FALSE;
diff --git a/tests/test-instance.c b/tests/test-instance.c
index 3455f36a..b186d60d 100644
--- a/tests/test-instance.c
+++ b/tests/test-instance.c
@@ -32,8 +32,8 @@
 #include "flatpak-instance-private.h"
 #include "flatpak-run-private.h"
 
-#include "libglnx/libglnx.h"
-#include "libglnx/tests/libglnx-testlib.h"
+#include "libglnx.h"
+#include "tests/libglnx-testlib.h"
 
 #include "testlib.h"
 
diff --git a/tests/testlib.c b/tests/testlib.c
index 1e5d9428..fe26a695 100644
--- a/tests/testlib.c
+++ b/tests/testlib.c
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 
 char *
 assert_mkdtemp (char *tmpl)
diff --git a/tests/testlibrary.c b/tests/testlibrary.c
index 7802fd72..3e2e0bc2 100644
--- a/tests/testlibrary.c
+++ b/tests/testlibrary.c
@@ -7,7 +7,7 @@
 #include <glib.h>
 #include <ostree.h>
 
-#include "libglnx/libglnx.h"
+#include "libglnx.h"
 #include "flatpak.h"
 
 #include "can-use-fuse.h"