diff --git a/helpers/check-locale.c b/helpers/check-locale.c
index 52b7f2230fad66704794acab13ee6fe7ba22ca21..0bc19be373b4ad6ea467958c3dda02eb7115959c 100644
--- a/helpers/check-locale.c
+++ b/helpers/check-locale.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <json-glib/json-glib.h>
 
-#include "steam-runtime-tools/glib-compat.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "steam-runtime-tools/utils-internal.h"
 
 #ifdef MOCK_CHECK_LOCALE
diff --git a/helpers/meson.build b/helpers/meson.build
index ea906175cef8a5b7130c03f9030d26c0e1823000..be8331aa4ca80d52fc169ab7752308901a1a01c8 100644
--- a/helpers/meson.build
+++ b/helpers/meson.build
@@ -35,7 +35,7 @@ executable(
   multiarch + '-check-locale',
   'check-locale.c',
   include_directories : project_include_dirs,
-  dependencies : [glib, json_glib],
+  dependencies : [glib, gio_unix, libglnx_dep, json_glib],
   install : true,
   install_dir : pkglibexecdir,
   # Use json-glib and GLib from the adjacent libdir, ignoring LD_LIBRARY_PATH
diff --git a/pressure-vessel/adverb.c b/pressure-vessel/adverb.c
index cec616196a9a325c49c6209cef05ef78f2872219..73087bc89a34fb509b07a456bd3ff214e115827c 100644
--- a/pressure-vessel/adverb.c
+++ b/pressure-vessel/adverb.c
@@ -35,7 +35,7 @@
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "libglnx/libglnx.h"
 
 #include "bwrap-lock.h"
diff --git a/pressure-vessel/bwrap-lock.h b/pressure-vessel/bwrap-lock.h
index 41c5aba6ec55bc7396e7ccd3c32328af5b5190d0..58170f51280459d6b43577b88381a987b3741ad0 100644
--- a/pressure-vessel/bwrap-lock.h
+++ b/pressure-vessel/bwrap-lock.h
@@ -22,7 +22,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "libglnx/libglnx.h"
 
 /**
diff --git a/pressure-vessel/bwrap.h b/pressure-vessel/bwrap.h
index c8e5a5a9c3f5c35eb1758b687efb79a79217ee48..b4613da1230199fe2a023184cb451999dd4a2cf8 100644
--- a/pressure-vessel/bwrap.h
+++ b/pressure-vessel/bwrap.h
@@ -25,7 +25,7 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-bwrap-private.h"
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 
 gboolean pv_bwrap_run_sync (FlatpakBwrap *bwrap,
                             int *exit_status_out,
diff --git a/pressure-vessel/elf-utils.c b/pressure-vessel/elf-utils.c
index 5fcb790bc29f69b7998fd6283334d7dfabdff4a0..466003e5807f0b300f0d72eb5c63b718895f5c16 100644
--- a/pressure-vessel/elf-utils.c
+++ b/pressure-vessel/elf-utils.c
@@ -26,7 +26,7 @@
 
 #include "libglnx/libglnx.h"
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 
 #define throw_elf_error(error, format, ...) \
   glnx_null_throw (error, format ": %s", ##__VA_ARGS__, elf_errmsg (elf_errno ()))
diff --git a/pressure-vessel/elf-utils.h b/pressure-vessel/elf-utils.h
index fa89652e727feb5ca26b5ced048203434fceffb5..cb0529cf8c6cb50c62d2bffc403496cbf9f3b998 100644
--- a/pressure-vessel/elf-utils.h
+++ b/pressure-vessel/elf-utils.h
@@ -25,7 +25,7 @@
 
 #include "libglnx/libglnx.h"
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (Elf, elf_end);
 
diff --git a/pressure-vessel/flatpak-bwrap.c b/pressure-vessel/flatpak-bwrap.c
index 2eaf9ca451866795a428c72369a8fce9c14b6854..e3d0a482eb1b298fdd6d454080b06efd3278743e 100644
--- a/pressure-vessel/flatpak-bwrap.c
+++ b/pressure-vessel/flatpak-bwrap.c
@@ -42,7 +42,7 @@
 #include "flatpak-utils-private.h"
 #include "flatpak-utils-base-private.h"
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 
 static void
 clear_fd (gpointer data)
diff --git a/pressure-vessel/flatpak-run-private.h b/pressure-vessel/flatpak-run-private.h
index ddc9a406c535cfa313b06b0ae386e96332b146a0..1b42f9526091c0eb2109feb5f6dc849a8d463c37 100644
--- a/pressure-vessel/flatpak-run-private.h
+++ b/pressure-vessel/flatpak-run-private.h
@@ -36,7 +36,7 @@
 #include "flatpak-context-private.h"
 #include "flatpak-bwrap-private.h"
 #include "flatpak-utils-private.h"
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 
 void flatpak_run_add_x11_args (FlatpakBwrap *bwrap,
                                gboolean      allowed);
diff --git a/pressure-vessel/launch.c b/pressure-vessel/launch.c
index 41413a0770681d124ac0049b5f16f5fb6b80cafe..7cdbe216a91e57fe0593312f1d30fa6da18423a1 100644
--- a/pressure-vessel/launch.c
+++ b/pressure-vessel/launch.c
@@ -39,7 +39,7 @@
 #include <gio/gio.h>
 #include <gio/gunixfdlist.h>
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "libglnx/libglnx.h"
 
 #include "launcher.h"
diff --git a/pressure-vessel/launcher.c b/pressure-vessel/launcher.c
index 6e76b72d892fb95b95f7eb8b6296a762f987da6b..a30cdee0f671aab4789539d5383e8bd930d1baaf 100644
--- a/pressure-vessel/launcher.c
+++ b/pressure-vessel/launcher.c
@@ -40,7 +40,7 @@
 #include <gio/gio.h>
 #include <gio/gunixfdlist.h>
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "libglnx/libglnx.h"
 
 #include "flatpak-utils-base-private.h"
diff --git a/pressure-vessel/launcher.h b/pressure-vessel/launcher.h
index f85d94d6b4b2df024798871bbc87fc836a88c58f..b36e3eca8982011861200d1f5e4345e2079acfe8 100644
--- a/pressure-vessel/launcher.h
+++ b/pressure-vessel/launcher.h
@@ -28,7 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "libglnx/libglnx.h"
 
 #include "launcher1.h"
diff --git a/pressure-vessel/meson.build b/pressure-vessel/meson.build
index e98d31880fd1f8f903165fdb8eafde5c870ccb38..c317ba281e241974d1956bd79e15276b76efda81 100644
--- a/pressure-vessel/meson.build
+++ b/pressure-vessel/meson.build
@@ -86,8 +86,6 @@ pressure_vessel_utils = static_library(
     'flatpak-utils-base-private.h',
     'flatpak-utils.c',
     'flatpak-utils-private.h',
-    'glib-backports.c',
-    'glib-backports.h',
     'resolve-in-sysroot.c',
     'resolve-in-sysroot.h',
     'tree-copy.c',
diff --git a/pressure-vessel/resolve-in-sysroot.c b/pressure-vessel/resolve-in-sysroot.c
index 8fe6cadb3b1a16f02f4e24442e8c6825b302811e..4b25da6ae8fe95e98c412323ac5450ead9cfa5ef 100644
--- a/pressure-vessel/resolve-in-sysroot.c
+++ b/pressure-vessel/resolve-in-sysroot.c
@@ -25,7 +25,7 @@
 
 #include "libglnx/libglnx.h"
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 
 /* Enabling debug logging for this is rather too verbose, so only
  * enable it when actively debugging this module */
diff --git a/pressure-vessel/runtime.c b/pressure-vessel/runtime.c
index 679b5b1b98a77aa8f9a766a0be80d505b39a4757..d449eda5d75905d57bf074121c12ad6ce4d1f121 100644
--- a/pressure-vessel/runtime.c
+++ b/pressure-vessel/runtime.c
@@ -25,7 +25,7 @@
 
 /* Include these before steam-runtime-tools.h so that their backport of
  * G_DEFINE_AUTOPTR_CLEANUP_FUNC will be visible to it */
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "libglnx/libglnx.h"
 
 #include <steam-runtime-tools/steam-runtime-tools.h>
diff --git a/pressure-vessel/runtime.h b/pressure-vessel/runtime.h
index a2412ac0d122cde05e7950b9fbd16f03190ba0b0..7d5f226f82b2ccafc78f6d3404e385a00099d2ec 100644
--- a/pressure-vessel/runtime.h
+++ b/pressure-vessel/runtime.h
@@ -23,7 +23,7 @@
 #include <glib/gstdio.h>
 #include <glib-object.h>
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "libglnx/libglnx.h"
 
 #include "flatpak-bwrap-private.h"
diff --git a/pressure-vessel/tree-copy.c b/pressure-vessel/tree-copy.c
index 81160366e8880ac9b96ca180d1d2e5802abea110..80b014442d6d50f6310da84b6870a1b2c49dacf0 100644
--- a/pressure-vessel/tree-copy.c
+++ b/pressure-vessel/tree-copy.c
@@ -30,7 +30,7 @@
 
 #include "libglnx/libglnx.h"
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "flatpak-bwrap-private.h"
 #include "flatpak-utils-base-private.h"
 #include "flatpak-utils-private.h"
diff --git a/pressure-vessel/utils.c b/pressure-vessel/utils.c
index ed603158970586e77ede7ca6283683faad41b6e7..73c98c94a36826df81316ed70f9b6d1e3c2c2d7a 100644
--- a/pressure-vessel/utils.c
+++ b/pressure-vessel/utils.c
@@ -35,7 +35,7 @@
 
 #include "libglnx/libglnx.h"
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "flatpak-bwrap-private.h"
 #include "flatpak-utils-base-private.h"
 #include "flatpak-utils-private.h"
diff --git a/pressure-vessel/wrap-interactive.h b/pressure-vessel/wrap-interactive.h
index 2170f590257c350fe0f565d10089fcefa343d437..c0ff1a228a1003b073e30395719e14db85d755eb 100644
--- a/pressure-vessel/wrap-interactive.h
+++ b/pressure-vessel/wrap-interactive.h
@@ -25,7 +25,7 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-bwrap-private.h"
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 
 typedef enum
 {
diff --git a/pressure-vessel/wrap.c b/pressure-vessel/wrap.c
index 92827ea8b1dd2ff8756a590469d1673a1ffa5801..831dabca34e7d3c2e35dbef34c6a3ca94ad22714 100644
--- a/pressure-vessel/wrap.c
+++ b/pressure-vessel/wrap.c
@@ -29,7 +29,7 @@
 #include <locale.h>
 #include <stdlib.h>
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "libglnx/libglnx.h"
 
 #include "bwrap.h"
diff --git a/steam-runtime-tools/architecture.c b/steam-runtime-tools/architecture.c
index 3c1fadf75d10d4990f397fb691e9edc304d2d1d5..c3d1fffdfe72f3ce16b16222f6491b6498666000 100644
--- a/steam-runtime-tools/architecture.c
+++ b/steam-runtime-tools/architecture.c
@@ -26,7 +26,7 @@
 #include "steam-runtime-tools/architecture.h"
 #include "steam-runtime-tools/architecture-internal.h"
 
-#include "steam-runtime-tools/glib-compat.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "steam-runtime-tools/utils.h"
 #include "steam-runtime-tools/utils-internal.h"
 
diff --git a/steam-runtime-tools/cpu-feature.c b/steam-runtime-tools/cpu-feature.c
index b231f850f96bf28840f44d7fff5ceec4d3352442..7730c6c5f6cfae6cfabfd6a4bedf005ee1b8c46a 100644
--- a/steam-runtime-tools/cpu-feature.c
+++ b/steam-runtime-tools/cpu-feature.c
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <cpuid.h>
 
-#include "steam-runtime-tools/glib-compat.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "steam-runtime-tools/utils.h"
 #include "steam-runtime-tools/utils-internal.h"
 
diff --git a/steam-runtime-tools/desktop-entry.c b/steam-runtime-tools/desktop-entry.c
index bb5b1af1230d0045e06f70a59a7be2b4b0092533..e98c75fccb13c384b0537a032a77eea3307ebcef 100644
--- a/steam-runtime-tools/desktop-entry.c
+++ b/steam-runtime-tools/desktop-entry.c
@@ -36,7 +36,7 @@
 
 #include "steam-runtime-tools/desktop-entry-internal.h"
 #include "steam-runtime-tools/enums.h"
-#include "steam-runtime-tools/glib-compat.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "steam-runtime-tools/utils.h"
 
 /**
diff --git a/pressure-vessel/glib-backports.h b/steam-runtime-tools/glib-backports-internal.h
similarity index 98%
rename from pressure-vessel/glib-backports.h
rename to steam-runtime-tools/glib-backports-internal.h
index 73a587bce98758cfdeb7e0ab4322810c57b16af6..2aeed240181f1145dd81b5b328e72f4556971ddb 100644
--- a/pressure-vessel/glib-backports.h
+++ b/steam-runtime-tools/glib-backports-internal.h
@@ -22,6 +22,12 @@
 
 #include <glib.h>
 
+#include <libglnx.h>
+
+#if !GLIB_CHECK_VERSION (2, 42, 0)
+# define G_OPTION_FLAG_NONE (0)
+#endif
+
 #ifndef G_SPAWN_DEFAULT
 #define G_SPAWN_DEFAULT 0
 #endif
@@ -68,10 +74,6 @@ void my_g_ptr_array_insert (GPtrArray *arr,
                             gpointer data);
 #endif
 
-#if !GLIB_CHECK_VERSION (2, 42, 0)
-#define G_OPTION_FLAG_NONE 0
-#endif
-
 #if !GLIB_CHECK_VERSION(2, 36, 0)
 #define g_dbus_address_escape_value my_g_dbus_address_escape_value
 gchar *my_g_dbus_address_escape_value (const gchar *string);
diff --git a/pressure-vessel/glib-backports.c b/steam-runtime-tools/glib-backports.c
similarity index 99%
rename from pressure-vessel/glib-backports.c
rename to steam-runtime-tools/glib-backports.c
index 3a4694733a39a729ba1634674b036f148aa4ecfb..f6c9ab294518c75c4391de0596b553827c3a4c5c 100644
--- a/pressure-vessel/glib-backports.c
+++ b/steam-runtime-tools/glib-backports.c
@@ -24,7 +24,7 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 
 #include <errno.h>
 #include <string.h>
diff --git a/steam-runtime-tools/glib-compat.h b/steam-runtime-tools/glib-compat.h
deleted file mode 100644
index adeac63fc4f4aba67d4810db01c71230f772e988..0000000000000000000000000000000000000000
--- a/steam-runtime-tools/glib-compat.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*<private_header>*/
-/*
- * Copyright © 2019 Collabora Ltd.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#pragma once
-
-#include <glib.h>
-
-#if !GLIB_CHECK_VERSION (2, 42, 0)
-# define G_OPTION_FLAG_NONE (0)
-#endif
-
-#if !GLIB_CHECK_VERSION (2, 38, 0)
-# define G_SPAWN_DEFAULT (0)
-#endif
-
-#if !defined(g_steal_pointer)
-#define g_steal_pointer(x) _srt_steal_pointer (x)
-/* A simplified version of g_steal_pointer without type-safety. */
-static inline gpointer
-_srt_steal_pointer (gpointer pointer_to_pointer)
-{
-  gpointer *pp = pointer_to_pointer;
-  gpointer ret;
-
-  ret = *pp;
-  *pp = NULL;
-  return ret;
-}
-#endif
-
-#if !defined(g_clear_pointer)
-#define g_clear_pointer(x, destroy) \
-  _srt_clear_pointer (x, (GDestroyNotify) (void (*)(void)) destroy)
-/* A simplified version of g_clear_pointer without type-safety. */
-static inline void
-_srt_clear_pointer (gpointer pointer_to_pointer,
-                    GDestroyNotify destroy)
-{
-  gpointer *pp = pointer_to_pointer;
-  gpointer p = g_steal_pointer (pp);
-
-  if (p != NULL)
-    destroy (p);
-}
-#endif
diff --git a/steam-runtime-tools/graphics.c b/steam-runtime-tools/graphics.c
index 382465870e305575948bd81c39ce1a84b1c6eb9d..8eeb5c657055bbad6f426dd6410f99f37dcf0b77 100644
--- a/steam-runtime-tools/graphics.c
+++ b/steam-runtime-tools/graphics.c
@@ -27,7 +27,7 @@
 
 #include "steam-runtime-tools/architecture.h"
 #include "steam-runtime-tools/enums.h"
-#include "steam-runtime-tools/glib-compat.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "steam-runtime-tools/graphics-internal.h"
 #include "steam-runtime-tools/library-internal.h"
 #include "steam-runtime-tools/utils.h"
diff --git a/steam-runtime-tools/library.c b/steam-runtime-tools/library.c
index 8a522713e939220c825d19f62da32431218a7e76..3401b6987dcd4d0afbc6f1c50d82344612705530 100644
--- a/steam-runtime-tools/library.c
+++ b/steam-runtime-tools/library.c
@@ -27,7 +27,7 @@
 
 #include "steam-runtime-tools/architecture.h"
 #include "steam-runtime-tools/enums.h"
-#include "steam-runtime-tools/glib-compat.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "steam-runtime-tools/library-internal.h"
 #include "steam-runtime-tools/utils.h"
 #include "steam-runtime-tools/utils-internal.h"
diff --git a/steam-runtime-tools/locale.c b/steam-runtime-tools/locale.c
index a4b9f9bab8edf927c58bd9c1bcaaff033d385e4e..f10a05c832ea8422be4ca28063295622384b12c5 100644
--- a/steam-runtime-tools/locale.c
+++ b/steam-runtime-tools/locale.c
@@ -27,7 +27,7 @@
 
 #include "steam-runtime-tools/architecture.h"
 #include "steam-runtime-tools/enums.h"
-#include "steam-runtime-tools/glib-compat.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "steam-runtime-tools/locale-internal.h"
 #include "steam-runtime-tools/utils-internal.h"
 
diff --git a/steam-runtime-tools/meson.build b/steam-runtime-tools/meson.build
index 417b3764acea7a7c42ecbcff68f2299db8bd511b..eec30738c7f8eea4d68824a23af33ee7d34ce029 100644
--- a/steam-runtime-tools/meson.build
+++ b/steam-runtime-tools/meson.build
@@ -28,6 +28,8 @@ libsteamrt_sources = [
     'cpu-feature.c',
     'desktop-entry-internal.h',
     'desktop-entry.c',
+    'glib-backports.c',
+    'glib-backports-internal.h',
     'graphics-internal.h',
     'graphics.c',
     'library-internal.h',
diff --git a/steam-runtime-tools/os.c b/steam-runtime-tools/os.c
index 5b4f9e894942a7b1ef53371810f07ab7adb52001..e408e5430175646949ff35aec5d9e380aba0e68e 100644
--- a/steam-runtime-tools/os.c
+++ b/steam-runtime-tools/os.c
@@ -27,7 +27,7 @@
 
 #include <string.h>
 
-#include "steam-runtime-tools/glib-compat.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 
 #include <glib.h>
 
diff --git a/steam-runtime-tools/runtime.c b/steam-runtime-tools/runtime.c
index 2578a44e74ceadf0e15a6e11b7e7f68cc4ec252d..82efce91ab21a68dc76f6c9e456f0921e31936b9 100644
--- a/steam-runtime-tools/runtime.c
+++ b/steam-runtime-tools/runtime.c
@@ -36,7 +36,7 @@
 
 #include <glib/gstdio.h>
 
-#include "steam-runtime-tools/glib-compat.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "steam-runtime-tools/utils.h"
 
 /**
diff --git a/steam-runtime-tools/steam.c b/steam-runtime-tools/steam.c
index e15ed2e3370c332b7692895969f411d5620e9780..47103d4f5476b690fa393a713cbea0033b745fca 100644
--- a/steam-runtime-tools/steam.c
+++ b/steam-runtime-tools/steam.c
@@ -36,7 +36,7 @@
 
 #include "steam-runtime-tools/desktop-entry-internal.h"
 #include "steam-runtime-tools/enums.h"
-#include "steam-runtime-tools/glib-compat.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "steam-runtime-tools/utils.h"
 #include "steam-runtime-tools/utils-internal.h"
 
diff --git a/steam-runtime-tools/system-info.c b/steam-runtime-tools/system-info.c
index fdfb25bddf32651623b4b875d3885e48ce31e3f6..a4fab61ece18277dccfbb21fd15e7b5d0c91ceae 100644
--- a/steam-runtime-tools/system-info.c
+++ b/steam-runtime-tools/system-info.c
@@ -29,7 +29,7 @@
 #include "steam-runtime-tools/architecture-internal.h"
 #include "steam-runtime-tools/cpu-feature-internal.h"
 #include "steam-runtime-tools/desktop-entry-internal.h"
-#include "steam-runtime-tools/glib-compat.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "steam-runtime-tools/graphics.h"
 #include "steam-runtime-tools/graphics-internal.h"
 #include "steam-runtime-tools/library-internal.h"
diff --git a/steam-runtime-tools/utils.c b/steam-runtime-tools/utils.c
index 3c88a429ac7613c10e5797c8ed6a823dc4efa6a0..425de4faaebe0b61fa4d11f03bc022a5bb71c794 100644
--- a/steam-runtime-tools/utils.c
+++ b/steam-runtime-tools/utils.c
@@ -43,7 +43,7 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-#include "steam-runtime-tools/glib-compat.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 
 #ifdef HAVE_GETAUXVAL
 #define getauxval_AT_SECURE() getauxval (AT_SECURE)
diff --git a/tests/adverb.c b/tests/adverb.c
index 6159c779f2e4df604a79db4a7c33eb174ce5afa9..3928eda843a2a0c327187e35c921bf10ab184d0f 100644
--- a/tests/adverb.c
+++ b/tests/adverb.c
@@ -33,7 +33,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
-#include "steam-runtime-tools/glib-compat.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 
 static gboolean opt_print_version = FALSE;
 static gboolean opt_ignore_sigchld = FALSE;
diff --git a/tests/check-requirements-cli.c b/tests/check-requirements-cli.c
index 75d294354773762cb501f369bf64ba13ff5169ca..45cda5df882d778f72145e20a077e862ae00bbf2 100644
--- a/tests/check-requirements-cli.c
+++ b/tests/check-requirements-cli.c
@@ -27,7 +27,7 @@
 
 #include <libglnx.h>
 
-#include <steam-runtime-tools/glib-compat.h>
+#include <steam-runtime-tools/glib-backports-internal.h>
 
 #include <glib.h>
 #include <glib/gstdio.h>
diff --git a/tests/meson.build b/tests/meson.build
index 88bcd87206f1072a3f908ba7ba0450f66ce20a85..6f08fa9ddfc7ade04bc7ca5f3a6f2057e3bb87be 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -125,7 +125,7 @@ endforeach
 executable(
   'adverb',
   'adverb.c',
-  dependencies : [glib, gio],
+  dependencies : [glib, gio, gio_unix, libglnx_dep],
   include_directories : project_include_dirs,
   install : get_option('installed_tests'),
   install_dir : tests_dir,
@@ -180,7 +180,7 @@ executable(
     '-DMOCK_CHECK_LOCALE_HAVE_C_UTF8',
     '-DMOCK_CHECK_LOCALE_HAVE_EN_US',
   ],
-  dependencies : [glib, json_glib],
+  dependencies : [glib, gio_unix, libglnx_dep, json_glib],
   include_directories : project_include_dirs,
   install: true,
   install_dir : tests_dir
@@ -196,7 +196,7 @@ executable(
     '-DMOCK_CHECK_LOCALE_HAVE_EN_US',
     '-DMOCK_CHECK_LOCALE_LEGACY',
   ],
-  dependencies : [glib, json_glib],
+  dependencies : [glib, gio_unix, libglnx_dep, json_glib],
   include_directories : project_include_dirs,
   install: true,
   install_dir : tests_dir
@@ -208,7 +208,7 @@ executable(
   'mock-unamerican-check-locale',
   join_paths('..', 'helpers', 'check-locale.c'),
   c_args : ['-DMOCK_CHECK_LOCALE', '-DMOCK_CHECK_LOCALE_HAVE_C_UTF8'],
-  dependencies : [glib, json_glib],
+  dependencies : [glib, gio_unix, libglnx_dep, json_glib],
   include_directories : project_include_dirs,
   install: true,
   install_dir : tests_dir
diff --git a/tests/mock-container-capsule-capture-libs.c b/tests/mock-container-capsule-capture-libs.c
index 721498875038b8ebf74f6e27725707ad1e541d5a..f6c087723c44e1d16cb8fb5b09024961a27d2a0e 100644
--- a/tests/mock-container-capsule-capture-libs.c
+++ b/tests/mock-container-capsule-capture-libs.c
@@ -25,7 +25,7 @@
 
 #include <libglnx.h>
 
-#include <steam-runtime-tools/glib-compat.h>
+#include <steam-runtime-tools/glib-backports-internal.h>
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/tests/mock-debian-capsule-capture-libs.c b/tests/mock-debian-capsule-capture-libs.c
index 03113e61bf6bbe879e660002a1ceaf981b69aacb..da45ba8418b2546a067a4fb59122467f2dc2b72b 100644
--- a/tests/mock-debian-capsule-capture-libs.c
+++ b/tests/mock-debian-capsule-capture-libs.c
@@ -23,7 +23,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <steam-runtime-tools/glib-compat.h>
+#include <steam-runtime-tools/glib-backports-internal.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/mock-fedora-capsule-capture-libs.c b/tests/mock-fedora-capsule-capture-libs.c
index 4fe83b9575972f2a567669c0831b15c85fd98d7a..5e97bcaea29f2c6e6091882ca5c8bf96c6c23312 100644
--- a/tests/mock-fedora-capsule-capture-libs.c
+++ b/tests/mock-fedora-capsule-capture-libs.c
@@ -23,7 +23,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <steam-runtime-tools/glib-compat.h>
+#include <steam-runtime-tools/glib-backports-internal.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/pressure-vessel/bwrap-lock.c b/tests/pressure-vessel/bwrap-lock.c
index dc64f8c9a5541c78768c207929456da6bcffd515..de00281d72cbc63d9b51b3e000fca62de183b5d9 100644
--- a/tests/pressure-vessel/bwrap-lock.c
+++ b/tests/pressure-vessel/bwrap-lock.c
@@ -28,7 +28,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "libglnx/libglnx.h"
 
 #include "bwrap-lock.h"
diff --git a/tests/pressure-vessel/cheap-copy.c b/tests/pressure-vessel/cheap-copy.c
index f9fc6b3d2457cf4a2a6603ebdbc88df224fe05da..511d65c841dc078036055631272195f76edccc3b 100644
--- a/tests/pressure-vessel/cheap-copy.c
+++ b/tests/pressure-vessel/cheap-copy.c
@@ -25,7 +25,7 @@
 
 #include "libglnx/libglnx.h"
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "tree-copy.h"
 #include "utils.h"
 
diff --git a/tests/pressure-vessel/elf-get-soname.c b/tests/pressure-vessel/elf-get-soname.c
index 218623ed8cdd2bf5ab04c2504c9a54041b876120..c7dff85794e580b67a30c6541e6203cc996d89ad 100644
--- a/tests/pressure-vessel/elf-get-soname.c
+++ b/tests/pressure-vessel/elf-get-soname.c
@@ -25,7 +25,7 @@
 
 #include "libglnx/libglnx.h"
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 
 #include "elf-utils.h"
 #include "utils.h"
diff --git a/tests/pressure-vessel/helper.c b/tests/pressure-vessel/helper.c
index fa4264551205376c016ca75ac7f0ebbb88d25a73..63ff8b58acd037904d8820d7bc13970db9d2c70e 100644
--- a/tests/pressure-vessel/helper.c
+++ b/tests/pressure-vessel/helper.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "libglnx/libglnx.h"
 
 #include "utils.h"
diff --git a/tests/pressure-vessel/resolve-in-sysroot.c b/tests/pressure-vessel/resolve-in-sysroot.c
index f2af8354eafec5edbfdf7181739654c2acd54d92..df57deab13f16ea3480771c19dfdc5b9119c11b8 100644
--- a/tests/pressure-vessel/resolve-in-sysroot.c
+++ b/tests/pressure-vessel/resolve-in-sysroot.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "libglnx/libglnx.h"
 
 #include "resolve-in-sysroot.h"
diff --git a/tests/pressure-vessel/utils.c b/tests/pressure-vessel/utils.c
index 1625efb5a5785a7df53b8f69d3210bf9b270a96d..5b396fa89a1f6f3c33c4201ff29cbf8181d37692 100644
--- a/tests/pressure-vessel/utils.c
+++ b/tests/pressure-vessel/utils.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "libglnx/libglnx.h"
 
 #include "tests/test-utils.h"
diff --git a/tests/pressure-vessel/wait-for-child-processes.c b/tests/pressure-vessel/wait-for-child-processes.c
index edd3d0307ae9cfa7f7de3924a52a66c893313c52..8faf8e798b28de09ab049bb737a728ea06abe5f8 100644
--- a/tests/pressure-vessel/wait-for-child-processes.c
+++ b/tests/pressure-vessel/wait-for-child-processes.c
@@ -32,7 +32,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include "glib-backports.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include "libglnx/libglnx.h"
 
 #include "tests/test-utils.h"
diff --git a/tests/system-info-cli.c b/tests/system-info-cli.c
index 34d06fabb59c792da7a7031376c6df0097d0e8fc..b3d6e71fcddcc299c0474c557033fa0469076b85 100644
--- a/tests/system-info-cli.c
+++ b/tests/system-info-cli.c
@@ -27,7 +27,7 @@
 
 #include <steam-runtime-tools/steam-runtime-tools.h>
 
-#include <steam-runtime-tools/glib-compat.h>
+#include <steam-runtime-tools/glib-backports-internal.h>
 #include <steam-runtime-tools/json-glib-compat.h>
 
 #include <glib.h>
diff --git a/tests/system-info.c b/tests/system-info.c
index 5b11cdd101cb64e5c1a913942553c6e080e371f9..9ba94ba51ef767338f9f78e8969c150e60007e4e 100644
--- a/tests/system-info.c
+++ b/tests/system-info.c
@@ -28,7 +28,7 @@
 #include <steam-runtime-tools/steam-runtime-tools.h>
 #include "steam-runtime-tools/utils-internal.h"
 
-#include <steam-runtime-tools/glib-compat.h>
+#include <steam-runtime-tools/glib-backports-internal.h>
 
 #include <glib.h>
 #include <glib/gstdio.h>
diff --git a/tests/test-utils.c b/tests/test-utils.c
index 64f6bc8c99e3c9180111f2f0d39d7384a49d58ba..7d8836d2e921efda6147aa1f27e598824d8b041d 100644
--- a/tests/test-utils.c
+++ b/tests/test-utils.c
@@ -30,7 +30,7 @@
 
 #include "libglnx/libglnx.h"
 
-#include "steam-runtime-tools/glib-compat.h"
+#include "steam-runtime-tools/glib-backports-internal.h"
 #include <steam-runtime-tools/steam-runtime-tools.h>
 #include "steam-runtime-tools/utils-internal.h"