diff --git a/common/xdg-app-run.c b/common/xdg-app-run.c
index e4d32f71..38c41267 100644
--- a/common/xdg-app-run.c
+++ b/common/xdg-app-run.c
@@ -2215,7 +2215,7 @@ static void
 add_monitor_path_args (GPtrArray *argv_array,
                        char ***envp_p)
 {
-  g_autoptr(XdgAppSessionHelper) session_helper = NULL;
+  g_autoptr(AutoXdgAppSessionHelper) session_helper = NULL;
   g_autofree char *monitor_path = NULL;
 
   session_helper =
diff --git a/common/xdg-app-utils.h b/common/xdg-app-utils.h
index 5f0fbccc..7dae8106 100644
--- a/common/xdg-app-utils.h
+++ b/common/xdg-app-utils.h
@@ -284,7 +284,11 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(SoupRequest, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(SoupURI, soup_uri_free)
 #endif
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(XdgAppSessionHelper, g_object_unref)
+/* This uses a weird Auto prefix to avoid conflicts with later added autogenerated autoptr support, per:
+ * https://git.gnome.org/browse/glib/commit/?id=1c6cd5f0a3104aa9b62c7f1d3086181f63e71b59
+ */
+typedef XdgAppSessionHelper AutoXdgAppSessionHelper;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(AutoXdgAppSessionHelper, g_object_unref)
 
 typedef struct XdgAppXml XdgAppXml;