diff --git a/app/flatpak-builtins-remote-ls.c b/app/flatpak-builtins-remote-ls.c
index 898ee617..a368ccff 100644
--- a/app/flatpak-builtins-remote-ls.c
+++ b/app/flatpak-builtins-remote-ls.c
@@ -235,7 +235,7 @@ ls_remote (GHashTable *refs_hash, const char **arches, const char *app_runtime,
         }
 
       keys = (FlatpakDecomposed **) g_hash_table_get_keys_as_array (names, &n_keys);
-      g_qsort_with_data (keys, n_keys, sizeof (char *), (GCompareDataFunc) flatpak_decomposed_strcmp_p, NULL);
+      qsort (keys, n_keys, sizeof (char *), (GCompareFunc) flatpak_decomposed_strcmp_p);
 
       for (i = 0; i < n_keys; i++)
         {
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 6752a7f1..6f8915ad 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -14746,8 +14746,7 @@ flatpak_dir_list_remotes (FlatpakDir   *self,
   if (res == NULL)
     res = g_new0 (char *, 1); /* Return empty array, not error */
 
-  g_qsort_with_data (res, g_strv_length (res), sizeof (char *),
-                     cmp_remote, self);
+  qsort_r (res, g_strv_length (res), sizeof (char *), cmp_remote, self);
 
   return res;
 }
diff --git a/common/flatpak-exports.c b/common/flatpak-exports.c
index 6ec7d69c..b6fb9d1a 100644
--- a/common/flatpak-exports.c
+++ b/common/flatpak-exports.c
@@ -444,7 +444,7 @@ flatpak_exports_append_bwrap_args (FlatpakExports *exports,
   eps = g_hash_table_get_values (exports->hash);
   eps = g_list_sort (eps, (GCompareFunc) compare_eps);
 
-  g_qsort_with_data (keys, n_keys, sizeof (char *), (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
+  qsort (keys, n_keys, sizeof (char *), flatpak_strcmp0_ptr);
 
   g_debug ("Converting FlatpakExports to bwrap arguments...");
 
@@ -666,7 +666,7 @@ flatpak_exports_path_get_mode (FlatpakExports *exports,
   g_autoptr(GString) path_builder = g_string_new ("");
   struct stat st;
 
-  g_qsort_with_data (keys, n_keys, sizeof (char *), (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
+  qsort (keys, n_keys, sizeof (char *), flatpak_strcmp0_ptr);
 
   /* Syntactic canonicalization only, no need to use host_fd */
   path = canonical = flatpak_canonicalize_filename (path);
diff --git a/common/flatpak-repo-utils.c b/common/flatpak-repo-utils.c
index ab31f880..d745ecff 100644
--- a/common/flatpak-repo-utils.c
+++ b/common/flatpak-repo-utils.c
@@ -3617,7 +3617,8 @@ flatpak_repo_generate_appstream (OstreeRepo   *repo,
   all_refs_keys = (FlatpakDecomposed **) g_hash_table_get_keys_as_array (all_refs, &n_keys);
 
   /* Sort refs so that appdata order is stable for e.g. deltas */
-  g_qsort_with_data (all_refs_keys, n_keys, sizeof (FlatpakDecomposed *), (GCompareDataFunc) flatpak_decomposed_strcmp_p, NULL);
+  qsort (all_refs_keys, n_keys, sizeof (FlatpakDecomposed *),
+         (GCompareFunc) flatpak_decomposed_strcmp_p);
 
   transaction = flatpak_repo_transaction_start (repo, cancellable, error);
   if (transaction == NULL)
diff --git a/common/flatpak-transaction.c b/common/flatpak-transaction.c
index 886af236..ff9cf94d 100644
--- a/common/flatpak-transaction.c
+++ b/common/flatpak-transaction.c
@@ -2410,9 +2410,8 @@ find_runtime_remote (FlatpakTransaction             *self,
   /* Put @app_remote before the others at its priority level */
   rsd.dir = priv->dir;
   rsd.prioritized_remote = app_remote;
-  g_qsort_with_data (all_remotes, g_strv_length (all_remotes), sizeof (char *),
-                     cmp_remote_with_prioritized, &rsd);
-
+  qsort_r (all_remotes, g_strv_length (all_remotes), sizeof (char *),
+           cmp_remote_with_prioritized, &rsd);
 
   app_pref = flatpak_decomposed_get_pref (app_ref);
   runtime_pref = flatpak_decomposed_get_pref (runtime_ref);
diff --git a/tests/test-exports.c b/tests/test-exports.c
index a20ed0c9..f973cbe4 100644
--- a/tests/test-exports.c
+++ b/tests/test-exports.c
@@ -342,8 +342,7 @@ test_full_context (void)
                                      &n, &error);
   g_assert_nonnull (strv);
   /* The order is undefined, so sort them first */
-  g_qsort_with_data (strv, n, sizeof (char *),
-                     (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
+  qsort (strv, n, sizeof (char *), flatpak_strcmp0_ptr);
   i = 0;
   g_assert_cmpstr (strv[i++], ==, "!/opt");
   g_assert_cmpstr (strv[i++], ==, "/home");
@@ -357,8 +356,7 @@ test_full_context (void)
                                      &n, &error);
   g_assert_no_error (error);
   g_assert_nonnull (strv);
-  g_qsort_with_data (strv, n, sizeof (char *),
-                     (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
+  qsort (strv, n, sizeof (char *), flatpak_strcmp0_ptr);
   i = 0;
   g_assert_cmpstr (strv[i++], ==, "ipc");
   g_assert_cmpstr (strv[i++], ==, "network");
@@ -371,8 +369,7 @@ test_full_context (void)
                                      &n, &error);
   g_assert_no_error (error);
   g_assert_nonnull (strv);
-  g_qsort_with_data (strv, n, sizeof (char *),
-                     (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
+  qsort (strv, n, sizeof (char *), flatpak_strcmp0_ptr);
   i = 0;
   g_assert_cmpstr (strv[i++], ==, "cups");
   g_assert_cmpstr (strv[i++], ==, "fallback-x11");
@@ -393,8 +390,7 @@ test_full_context (void)
                                      &n, &error);
   g_assert_no_error (error);
   g_assert_nonnull (strv);
-  g_qsort_with_data (strv, n, sizeof (char *),
-                     (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
+  qsort (strv, n, sizeof (char *), flatpak_strcmp0_ptr);
   i = 0;
   g_assert_cmpstr (strv[i++], ==, "all");
   g_assert_cmpstr (strv[i++], ==, "dri");
@@ -409,8 +405,7 @@ test_full_context (void)
                                      &n, &error);
   g_assert_no_error (error);
   g_assert_nonnull (strv);
-  g_qsort_with_data (strv, n, sizeof (char *),
-                     (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
+  qsort (strv, n, sizeof (char *), flatpak_strcmp0_ptr);
   i = 0;
   g_assert_cmpstr (strv[i++], ==, ".openarena");
   g_assert_cmpstr (strv[i], ==, NULL);
@@ -422,8 +417,7 @@ test_full_context (void)
                                      &n, &error);
   g_assert_no_error (error);
   g_assert_nonnull (strv);
-  g_qsort_with_data (strv, n, sizeof (char *),
-                     (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
+  qsort (strv, n, sizeof (char *), flatpak_strcmp0_ptr);
   i = 0;
   g_assert_cmpstr (strv[i++], ==, "LD_AUDIT");
   g_assert_cmpstr (strv[i++], ==, "LD_PRELOAD");
@@ -435,8 +429,7 @@ test_full_context (void)
                               &n, &error);
   g_assert_no_error (error);
   g_assert_nonnull (strv);
-  g_qsort_with_data (strv, n, sizeof (char *),
-                     (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
+  qsort (strv, n, sizeof (char *), flatpak_strcmp0_ptr);
   i = 0;
   g_assert_cmpstr (strv[i++], ==, "org.example.SessionService");
   g_assert_cmpstr (strv[i], ==, NULL);
@@ -453,8 +446,7 @@ test_full_context (void)
                               &n, &error);
   g_assert_no_error (error);
   g_assert_nonnull (strv);
-  g_qsort_with_data (strv, n, sizeof (char *),
-                     (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
+  qsort (strv, n, sizeof (char *), flatpak_strcmp0_ptr);
   i = 0;
   g_assert_cmpstr (strv[i++], ==, "net.example.SystemService");
   g_assert_cmpstr (strv[i], ==, NULL);
@@ -471,8 +463,7 @@ test_full_context (void)
                               &n, &error);
   g_assert_no_error (error);
   g_assert_nonnull (strv);
-  g_qsort_with_data (strv, n, sizeof (char *),
-                     (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
+  qsort (strv, n, sizeof (char *), flatpak_strcmp0_ptr);
   i = 0;
   g_assert_cmpstr (strv[i++], ==, "HYPOTHETICAL_PATH");
   g_assert_cmpstr (strv[i++], ==, "LD_AUDIT");
@@ -501,8 +492,7 @@ test_full_context (void)
                               &n, &error);
   g_assert_no_error (error);
   g_assert_nonnull (strv);
-  g_qsort_with_data (strv, n, sizeof (char *),
-                     (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
+  qsort (strv, n, sizeof (char *), flatpak_strcmp0_ptr);
   i = 0;
   g_assert_cmpstr (strv[i++], ==, "Colours");
   g_assert_cmpstr (strv[i], ==, NULL);
@@ -513,8 +503,7 @@ test_full_context (void)
                                      "Colours", &n, &error);
   g_assert_no_error (error);
   g_assert_nonnull (strv);
-  g_qsort_with_data (strv, n, sizeof (char *),
-                     (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
+  qsort (strv, n, sizeof (char *), flatpak_strcmp0_ptr);
   i = 0;
   g_assert_cmpstr (strv[i++], ==, "blue");
   g_assert_cmpstr (strv[i++], ==, "green");