diff --git a/app/flatpak-builtins-add-remote.c b/app/flatpak-builtins-add-remote.c
index 4d845bba..fbfb45dc 100644
--- a/app/flatpak-builtins-add-remote.c
+++ b/app/flatpak-builtins-add-remote.c
@@ -31,7 +31,7 @@
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 
 static gboolean opt_no_gpg_verify;
 static gboolean opt_do_gpg_verify;
diff --git a/app/flatpak-builtins-build-bundle.c b/app/flatpak-builtins-build-bundle.c
index d5e5af84..c789a34b 100644
--- a/app/flatpak-builtins-build-bundle.c
+++ b/app/flatpak-builtins-build-bundle.c
@@ -34,9 +34,9 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
-#include "flatpak-oci-registry.h"
-#include "flatpak-chain-input-stream.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-oci-registry-private.h"
+#include "flatpak-chain-input-stream-private.h"
 #include "flatpak-builtins-utils.h"
 
 #include <archive.h>
diff --git a/app/flatpak-builtins-build-commit-from.c b/app/flatpak-builtins-build-commit-from.c
index 25650812..39c6f934 100644
--- a/app/flatpak-builtins-build-commit-from.c
+++ b/app/flatpak-builtins-build-commit-from.c
@@ -30,7 +30,7 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "parse-datetime.h"
 
 static char *opt_src_repo;
diff --git a/app/flatpak-builtins-build-export.c b/app/flatpak-builtins-build-export.c
index 680b516f..72073d2b 100644
--- a/app/flatpak-builtins-build-export.c
+++ b/app/flatpak-builtins-build-export.c
@@ -30,7 +30,7 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "parse-datetime.h"
 
 static char *opt_subject;
diff --git a/app/flatpak-builtins-build-finish.c b/app/flatpak-builtins-build-finish.c
index 0a93728b..912a4928 100644
--- a/app/flatpak-builtins-build-finish.c
+++ b/app/flatpak-builtins-build-finish.c
@@ -31,9 +31,9 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-context.h"
-#include "flatpak-utils.h"
-#include "flatpak-run.h"
+#include "flatpak-context-private.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-run-private.h"
 
 static char *opt_command;
 static char *opt_require_version;
diff --git a/app/flatpak-builtins-build-import-bundle.c b/app/flatpak-builtins-build-import-bundle.c
index 2489354d..6ecdb646 100644
--- a/app/flatpak-builtins-build-import-bundle.c
+++ b/app/flatpak-builtins-build-import-bundle.c
@@ -30,8 +30,8 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
-#include "flatpak-oci-registry.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-oci-registry-private.h"
 
 static char *opt_ref;
 static gboolean opt_oci = FALSE;
diff --git a/app/flatpak-builtins-build-init.c b/app/flatpak-builtins-build-init.c
index e6f54b3e..420e4410 100644
--- a/app/flatpak-builtins-build-init.c
+++ b/app/flatpak-builtins-build-init.c
@@ -31,8 +31,8 @@
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
-#include "flatpak-utils.h"
-#include "flatpak-run.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-run-private.h"
 
 static char *opt_arch;
 static char *opt_var;
diff --git a/app/flatpak-builtins-build-sign.c b/app/flatpak-builtins-build-sign.c
index c6119b2c..a3ef6163 100644
--- a/app/flatpak-builtins-build-sign.c
+++ b/app/flatpak-builtins-build-sign.c
@@ -30,7 +30,7 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 
 static char *opt_arch;
 static gboolean opt_runtime;
diff --git a/app/flatpak-builtins-build.c b/app/flatpak-builtins-build.c
index f0d9e997..3920e187 100644
--- a/app/flatpak-builtins-build.c
+++ b/app/flatpak-builtins-build.c
@@ -31,8 +31,8 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
-#include "flatpak-run.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-run-private.h"
 
 static gboolean opt_runtime;
 static char *opt_build_dir;
diff --git a/app/flatpak-builtins-config.c b/app/flatpak-builtins-config.c
index 2494f621..007196c1 100644
--- a/app/flatpak-builtins-config.c
+++ b/app/flatpak-builtins-config.c
@@ -30,7 +30,7 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "common/flatpak-dir.h"
+#include "common/flatpak-dir-private.h"
 
 static gboolean opt_get;
 static gboolean opt_set;
diff --git a/app/flatpak-builtins-document-export.c b/app/flatpak-builtins-document-export.c
index 46b4c944..d67f60d5 100644
--- a/app/flatpak-builtins-document-export.c
+++ b/app/flatpak-builtins-document-export.c
@@ -34,8 +34,8 @@
 #include <gio/gunixfdlist.h>
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
-#include "flatpak-run.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-run-private.h"
 
 static gboolean opt_unique = FALSE;
 static gboolean opt_transient = FALSE;
diff --git a/app/flatpak-builtins-document-info.c b/app/flatpak-builtins-document-info.c
index c9605456..8c8af2ac 100644
--- a/app/flatpak-builtins-document-info.c
+++ b/app/flatpak-builtins-document-info.c
@@ -34,8 +34,8 @@
 #include <gio/gunixfdlist.h>
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
-#include "flatpak-run.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-run-private.h"
 
 static GOptionEntry options[] = {
   { NULL }
diff --git a/app/flatpak-builtins-document-list.c b/app/flatpak-builtins-document-list.c
index 48cd1afb..2754f7a6 100644
--- a/app/flatpak-builtins-document-list.c
+++ b/app/flatpak-builtins-document-list.c
@@ -32,8 +32,8 @@
 #include "flatpak-document-dbus.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
-#include "flatpak-run.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-run-private.h"
 
 static GOptionEntry options[] = {
   { NULL }
diff --git a/app/flatpak-builtins-document-unexport.c b/app/flatpak-builtins-document-unexport.c
index 82e58f38..267d5a26 100644
--- a/app/flatpak-builtins-document-unexport.c
+++ b/app/flatpak-builtins-document-unexport.c
@@ -34,8 +34,8 @@
 #include <gio/gunixfdlist.h>
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
-#include "flatpak-run.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-run-private.h"
 
 static GOptionEntry options[] = {
   { NULL }
diff --git a/app/flatpak-builtins-enter.c b/app/flatpak-builtins-enter.c
index e49a4246..b9ad05aa 100644
--- a/app/flatpak-builtins-enter.c
+++ b/app/flatpak-builtins-enter.c
@@ -32,9 +32,9 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-dbus.h"
-#include "flatpak-run.h"
+#include "flatpak-run-private.h"
 
 
 static GOptionEntry options[] = {
diff --git a/app/flatpak-builtins-info-remote.c b/app/flatpak-builtins-info-remote.c
index d81530a4..4eed507f 100644
--- a/app/flatpak-builtins-info-remote.c
+++ b/app/flatpak-builtins-info-remote.c
@@ -31,7 +31,7 @@
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-table-printer.h"
 
 static char *opt_arch;
diff --git a/app/flatpak-builtins-info.c b/app/flatpak-builtins-info.c
index ed17294c..eba707e6 100644
--- a/app/flatpak-builtins-info.c
+++ b/app/flatpak-builtins-info.c
@@ -30,9 +30,9 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-builtins-utils.h"
-#include "flatpak-run.h"
+#include "flatpak-run-private.h"
 
 static gboolean opt_user;
 static gboolean opt_system;
diff --git a/app/flatpak-builtins-install.c b/app/flatpak-builtins-install.c
index 62779b8d..bd6a1482 100644
--- a/app/flatpak-builtins-install.c
+++ b/app/flatpak-builtins-install.c
@@ -34,9 +34,9 @@
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
 #include "flatpak-transaction.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "lib/flatpak-error.h"
-#include "flatpak-chain-input-stream.h"
+#include "flatpak-chain-input-stream-private.h"
 
 static char *opt_arch;
 static char **opt_gpg_file;
diff --git a/app/flatpak-builtins-list-remotes.c b/app/flatpak-builtins-list-remotes.c
index 9228a593..4c4e246f 100644
--- a/app/flatpak-builtins-list-remotes.c
+++ b/app/flatpak-builtins-list-remotes.c
@@ -30,7 +30,7 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-table-printer.h"
 
 static gboolean opt_show_details;
diff --git a/app/flatpak-builtins-list.c b/app/flatpak-builtins-list.c
index cd3158d8..64dce108 100644
--- a/app/flatpak-builtins-list.c
+++ b/app/flatpak-builtins-list.c
@@ -30,7 +30,7 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-table-printer.h"
 
 static gboolean opt_show_details;
diff --git a/app/flatpak-builtins-ls-remote.c b/app/flatpak-builtins-ls-remote.c
index f2272c37..b1158b99 100644
--- a/app/flatpak-builtins-ls-remote.c
+++ b/app/flatpak-builtins-ls-remote.c
@@ -31,7 +31,7 @@
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-table-printer.h"
 
 static gboolean opt_show_details;
diff --git a/app/flatpak-builtins-make-current.c b/app/flatpak-builtins-make-current.c
index 8bf752b7..ea71118e 100644
--- a/app/flatpak-builtins-make-current.c
+++ b/app/flatpak-builtins-make-current.c
@@ -30,7 +30,7 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 
 static char *opt_arch;
 
diff --git a/app/flatpak-builtins-override.c b/app/flatpak-builtins-override.c
index c971a9db..6756c96a 100644
--- a/app/flatpak-builtins-override.c
+++ b/app/flatpak-builtins-override.c
@@ -32,8 +32,8 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
-#include "flatpak-run.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-run-private.h"
 
 static GOptionEntry options[] = {
   { NULL }
diff --git a/app/flatpak-builtins-repo-update.c b/app/flatpak-builtins-repo-update.c
index 62b138b6..9686ba9b 100644
--- a/app/flatpak-builtins-repo-update.c
+++ b/app/flatpak-builtins-repo-update.c
@@ -30,7 +30,7 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-builtins-utils.h"
 
 static char *opt_title;
diff --git a/app/flatpak-builtins-repo.c b/app/flatpak-builtins-repo.c
index e5f8cb01..84beb1d1 100644
--- a/app/flatpak-builtins-repo.c
+++ b/app/flatpak-builtins-repo.c
@@ -30,7 +30,7 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-table-printer.h"
 
 static void
diff --git a/app/flatpak-builtins-run.c b/app/flatpak-builtins-run.c
index 2b58ad06..4b62011e 100644
--- a/app/flatpak-builtins-run.c
+++ b/app/flatpak-builtins-run.c
@@ -32,10 +32,10 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-error.h"
 #include "flatpak-dbus.h"
-#include "flatpak-run.h"
+#include "flatpak-run-private.h"
 
 static char *opt_arch;
 static char *opt_branch;
diff --git a/app/flatpak-builtins-search.c b/app/flatpak-builtins-search.c
index 69e5eeae..b02abdab 100644
--- a/app/flatpak-builtins-search.c
+++ b/app/flatpak-builtins-search.c
@@ -25,9 +25,9 @@
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
-#include "flatpak-dir.h"
+#include "flatpak-dir-private.h"
 #include "flatpak-table-printer.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 
 static char *opt_arch;
 
diff --git a/app/flatpak-builtins-uninstall.c b/app/flatpak-builtins-uninstall.c
index f1c0a4ec..98d339d5 100644
--- a/app/flatpak-builtins-uninstall.c
+++ b/app/flatpak-builtins-uninstall.c
@@ -31,7 +31,7 @@
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-error.h"
 
 static char *opt_arch;
diff --git a/app/flatpak-builtins-update.c b/app/flatpak-builtins-update.c
index b0ef75c0..2c529597 100644
--- a/app/flatpak-builtins-update.c
+++ b/app/flatpak-builtins-update.c
@@ -32,7 +32,7 @@
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
 #include "flatpak-transaction.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-error.h"
 
 static char *opt_arch;
diff --git a/app/flatpak-builtins-utils.c b/app/flatpak-builtins-utils.c
index a06b90e0..0868664a 100644
--- a/app/flatpak-builtins-utils.c
+++ b/app/flatpak-builtins-utils.c
@@ -24,10 +24,10 @@
 
 
 #include <gio/gunixinputstream.h>
-#include "flatpak-chain-input-stream.h"
+#include "flatpak-chain-input-stream-private.h"
 
 #include "flatpak-builtins-utils.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 
 
 gboolean
diff --git a/app/flatpak-builtins-utils.h b/app/flatpak-builtins-utils.h
index 53e68dae..9f527670 100644
--- a/app/flatpak-builtins-utils.h
+++ b/app/flatpak-builtins-utils.h
@@ -23,8 +23,8 @@
 
 #include <glib.h>
 #include "libglnx/libglnx.h"
-#include "flatpak-utils.h"
-#include "flatpak-dir.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-dir-private.h"
 
 /* Appstream data expires after a day */
 #define FLATPAK_APPSTREAM_TTL 86400
diff --git a/app/flatpak-builtins.h b/app/flatpak-builtins.h
index 17c4cede..ab9a7fa7 100644
--- a/app/flatpak-builtins.h
+++ b/app/flatpak-builtins.h
@@ -24,8 +24,8 @@
 #include <ostree.h>
 #include <gio/gio.h>
 
-#include "flatpak-utils.h"
-#include "flatpak-dir.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-dir-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/app/flatpak-cli-transaction.c b/app/flatpak-cli-transaction.c
new file mode 100644
index 00000000..48282710
--- /dev/null
+++ b/app/flatpak-cli-transaction.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright © 2018 Red Hat, Inc
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *       Alexander Larsson <alexl@redhat.com>
+ */
+
+#include "config.h"
+
+#include "flatpak-cli-transaction.h"
+#include "flatpak-transaction-private.h"
+#include "flatpak-utils-private.h"
+#include <glib/gi18n.h>
+
+typedef struct {
+  FlatpakTransaction *transaction;
+  gboolean disable_interaction;
+} FlatpakCliTransaction;
+
+static int
+choose_remote_for_ref (FlatpakTransaction *transaction,
+                       const char *for_ref,
+                       const char *runtime_ref,
+                       const char * const *remotes,
+                       gpointer data)
+{
+  FlatpakCliTransaction *cli = data;
+  int n_remotes = g_strv_length ((char **)remotes);
+  int chosen = -1;
+  const char *pref;
+  int i;
+
+  pref = strchr (for_ref, '/') + 1;
+
+  if (cli->disable_interaction)
+    {
+      g_print (_("Required runtime for %s (%s) found in remote %s\n"),
+               pref, runtime_ref, remotes[0]);
+      chosen = 0;
+    }
+  else if (n_remotes == 1)
+    {
+      g_print (_("Required runtime for %s (%s) found in remote %s\n"),
+               pref, runtime_ref, remotes[0]);
+      if (flatpak_yes_no_prompt (_("Do you want to install it?")))
+        chosen = 0;
+    }
+  else
+    {
+      g_print (_("Required runtime for %s (%s) found in remotes: %s\n"),
+               pref, runtime_ref, remotes[0]);
+      for (i = 0; remotes[i] != NULL; i++)
+        {
+          g_print ("%d) %s\n", i + 1, remotes[i]);
+        }
+      chosen = flatpak_number_prompt (0, n_remotes, _("Which do you want to install (0 to abort)?"));
+      chosen -= 1; /* convert from base-1 to base-0 (and -1 to abort) */
+    }
+
+  return chosen;
+}
+
+static void
+flatpak_cli_transaction_free (FlatpakCliTransaction *cli)
+{
+  g_free (cli);
+}
+
+FlatpakTransaction *
+flatpak_cli_transaction_new (FlatpakDir *dir,
+                             gboolean disable_interaction)
+{
+  FlatpakTransaction *transaction = flatpak_transaction_new (dir);
+  FlatpakCliTransaction *cli = g_new0 (FlatpakCliTransaction, 1);
+
+  cli->transaction = transaction;
+  cli->disable_interaction = disable_interaction;
+  g_object_set_data_full (G_OBJECT (transaction), "cli", cli, (GDestroyNotify)flatpak_cli_transaction_free);
+
+  g_signal_connect (transaction, "choose-remote-for-ref", G_CALLBACK (choose_remote_for_ref), cli);
+
+  return transaction;
+}
diff --git a/app/flatpak-cli-transaction.h b/app/flatpak-cli-transaction.h
new file mode 100644
index 00000000..dc73612a
--- /dev/null
+++ b/app/flatpak-cli-transaction.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2018 Red Hat, Inc
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *       Alexander Larsson <alexl@redhat.com>
+ */
+
+#ifndef __FLATPAK_CLI_TRANSACTION_H__
+#define __FLATPAK_CLI_TRANSACTION_H__
+
+#include "flatpak-transaction.h"
+#include "flatpak-dir-private.h"
+
+FlatpakTransaction *flatpak_cli_transaction_new (FlatpakDir *dir,
+                                                 gboolean disable_interaction);
+
+#endif /* __FLATPAK_CLI_TRANSACTION_H__ */
diff --git a/app/flatpak-main.c b/app/flatpak-main.c
index 1f7cfe40..4405577c 100644
--- a/app/flatpak-main.c
+++ b/app/flatpak-main.c
@@ -31,7 +31,7 @@
 #include "libglnx/libglnx.h"
 
 #include "flatpak-builtins.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 
 static int opt_verbose;
 static gboolean opt_ostree_verbose;
diff --git a/app/flatpak-transaction.c b/app/flatpak-transaction.c
index 5594a6e6..faa3c3f0 100644
--- a/app/flatpak-transaction.c
+++ b/app/flatpak-transaction.c
@@ -24,7 +24,7 @@
 #include <glib/gi18n.h>
 
 #include "flatpak-transaction.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-builtins-utils.h"
 #include "flatpak-error.h"
 
diff --git a/app/flatpak-transaction.h b/app/flatpak-transaction.h
index 4e51572f..3afa58c9 100644
--- a/app/flatpak-transaction.h
+++ b/app/flatpak-transaction.h
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include "libglnx/libglnx.h"
 
-#include "flatpak-dir.h"
+#include "flatpak-dir-private.h"
 
 typedef struct FlatpakTransaction FlatpakTransaction;
 
diff --git a/common/Makefile.am.inc b/common/Makefile.am.inc
index 70fa6784..589a6697 100644
--- a/common/Makefile.am.inc
+++ b/common/Makefile.am.inc
@@ -43,31 +43,31 @@ BUILT_SOURCES += $(nodist_libflatpak_common_la_SOURCES)
 CLEANFILES += $(nodist_libflatpak_common_la_SOURCES)
 
 libflatpak_common_la_SOURCES = \
-	common/flatpak-common-types.h \
+	common/flatpak-common-types-private.h \
 	common/flatpak-bwrap.c \
-	common/flatpak-bwrap.h \
+	common/flatpak-bwrap-private.h \
 	common/flatpak-dir.c \
-	common/flatpak-dir.h \
+	common/flatpak-dir-private.h \
 	common/flatpak-run.c \
-	common/flatpak-run.h \
+	common/flatpak-run-private.h \
 	common/flatpak-context.c \
-	common/flatpak-context.h \
+	common/flatpak-context-private.h \
 	common/flatpak-exports.c \
-	common/flatpak-exports.h \
+	common/flatpak-exports-private.h \
 	common/flatpak-utils.c \
-	common/flatpak-utils.h \
+	common/flatpak-utils-private.h \
 	common/flatpak-table-printer.c \
 	common/flatpak-table-printer.h \
 	common/flatpak-chain-input-stream.c \
-	common/flatpak-chain-input-stream.h \
+	common/flatpak-chain-input-stream-private.h \
 	common/flatpak-portal-error.c \
 	common/flatpak-portal-error.h \
 	common/flatpak-json.c \
-	common/flatpak-json.h \
+	common/flatpak-json-private.h \
 	common/flatpak-json-oci.c \
-	common/flatpak-json-oci.h \
+	common/flatpak-json-oci-private.h \
 	common/flatpak-oci-registry.c \
-	common/flatpak-oci-registry.h \
+	common/flatpak-oci-registry-private.h \
 	$(NULL)
 
 libflatpak_common_la_CFLAGS = \
diff --git a/common/flatpak-bwrap.h b/common/flatpak-bwrap-private.h
similarity index 100%
rename from common/flatpak-bwrap.h
rename to common/flatpak-bwrap-private.h
diff --git a/common/flatpak-bwrap.c b/common/flatpak-bwrap.c
index 5de5db03..bc10dd16 100644
--- a/common/flatpak-bwrap.c
+++ b/common/flatpak-bwrap.c
@@ -37,8 +37,8 @@
 #include <gio/gio.h>
 #include "libglnx/libglnx.h"
 
-#include "flatpak-bwrap.h"
-#include "flatpak-utils.h"
+#include "flatpak-bwrap-private.h"
+#include "flatpak-utils-private.h"
 
 static void
 clear_fd (gpointer data)
diff --git a/common/flatpak-chain-input-stream.h b/common/flatpak-chain-input-stream-private.h
similarity index 100%
rename from common/flatpak-chain-input-stream.h
rename to common/flatpak-chain-input-stream-private.h
diff --git a/common/flatpak-chain-input-stream.c b/common/flatpak-chain-input-stream.c
index b714e04a..5b13fcfe 100644
--- a/common/flatpak-chain-input-stream.c
+++ b/common/flatpak-chain-input-stream.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "flatpak-chain-input-stream.h"
+#include "flatpak-chain-input-stream-private.h"
 
 enum {
   PROP_0,
diff --git a/common/flatpak-common-types.h b/common/flatpak-common-types-private.h
similarity index 100%
rename from common/flatpak-common-types.h
rename to common/flatpak-common-types-private.h
diff --git a/common/flatpak-context.h b/common/flatpak-context-private.h
similarity index 98%
rename from common/flatpak-context.h
rename to common/flatpak-context-private.h
index 7239d405..3926570b 100644
--- a/common/flatpak-context.h
+++ b/common/flatpak-context-private.h
@@ -23,8 +23,8 @@
 
 #include "libglnx/libglnx.h"
 #include "dbus-proxy/flatpak-proxy.h"
-#include <flatpak-common-types.h>
-#include "flatpak-exports.h"
+#include <flatpak-common-types-private.h>
+#include "flatpak-exports-private.h"
 
 typedef struct FlatpakContext FlatpakContext;
 
diff --git a/common/flatpak-context.c b/common/flatpak-context.c
index 62051ca5..bf1ddf4a 100644
--- a/common/flatpak-context.c
+++ b/common/flatpak-context.c
@@ -37,10 +37,10 @@
 #include <gio/gio.h>
 #include "libglnx/libglnx.h"
 
-#include "flatpak-run.h"
+#include "flatpak-run-private.h"
 #include "flatpak-proxy.h"
-#include "flatpak-utils.h"
-#include "flatpak-dir.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-dir-private.h"
 #include "flatpak-systemd-dbus.h"
 #include "lib/flatpak-error.h"
 
diff --git a/common/flatpak-dir.h b/common/flatpak-dir-private.h
similarity index 99%
rename from common/flatpak-dir.h
rename to common/flatpak-dir-private.h
index e05c7efd..bca00e5a 100644
--- a/common/flatpak-dir.h
+++ b/common/flatpak-dir-private.h
@@ -24,8 +24,8 @@
 #include <ostree.h>
 
 #include "libglnx/libglnx.h"
-#include <flatpak-common-types.h>
-#include <flatpak-context.h>
+#include <flatpak-common-types-private.h>
+#include <flatpak-context-private.h>
 
 #define FLATPAK_TYPE_DIR flatpak_dir_get_type ()
 #define FLATPAK_DIR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLATPAK_TYPE_DIR, FlatpakDir))
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 34138e12..2262fbc0 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -41,10 +41,10 @@
 #include "lib/flatpak-error.h"
 #include <ostree.h>
 
-#include "flatpak-dir.h"
-#include "flatpak-utils.h"
-#include "flatpak-oci-registry.h"
-#include "flatpak-run.h"
+#include "flatpak-dir-private.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-oci-registry-private.h"
+#include "flatpak-run-private.h"
 
 #include "errno.h"
 
diff --git a/common/flatpak-exports.h b/common/flatpak-exports-private.h
similarity index 98%
rename from common/flatpak-exports.h
rename to common/flatpak-exports-private.h
index f783f048..49f6ee8d 100644
--- a/common/flatpak-exports.h
+++ b/common/flatpak-exports-private.h
@@ -22,7 +22,7 @@
 #define __FLATPAK_EXPORTS_H__
 
 #include "libglnx/libglnx.h"
-#include "flatpak-bwrap.h"
+#include "flatpak-bwrap-private.h"
 
 /* In numerical order of more privs */
 typedef enum {
diff --git a/common/flatpak-exports.c b/common/flatpak-exports.c
index de267178..28f0c3c1 100644
--- a/common/flatpak-exports.c
+++ b/common/flatpak-exports.c
@@ -40,11 +40,11 @@
 #include <gio/gio.h>
 #include "libglnx/libglnx.h"
 
-#include "flatpak-exports.h"
-#include "flatpak-run.h"
+#include "flatpak-exports-private.h"
+#include "flatpak-run-private.h"
 #include "flatpak-proxy.h"
-#include "flatpak-utils.h"
-#include "flatpak-dir.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-dir-private.h"
 #include "flatpak-systemd-dbus.h"
 #include "lib/flatpak-error.h"
 
diff --git a/common/flatpak-json-oci.h b/common/flatpak-json-oci-private.h
similarity index 99%
rename from common/flatpak-json-oci.h
rename to common/flatpak-json-oci-private.h
index 873de0ca..dbe16ad9 100644
--- a/common/flatpak-json-oci.h
+++ b/common/flatpak-json-oci-private.h
@@ -21,7 +21,7 @@
 #ifndef __FLATPAK_JSON_OCI_H__
 #define __FLATPAK_JSON_OCI_H__
 
-#include "flatpak-json.h"
+#include "flatpak-json-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/common/flatpak-json-oci.c b/common/flatpak-json-oci.c
index 308e1a2e..c0212320 100644
--- a/common/flatpak-json-oci.c
+++ b/common/flatpak-json-oci.c
@@ -21,8 +21,8 @@
 #include "config.h"
 #include "string.h"
 
-#include "flatpak-json-oci.h"
-#include "flatpak-utils.h"
+#include "flatpak-json-oci-private.h"
+#include "flatpak-utils-private.h"
 #include "libglnx.h"
 
 const char *
diff --git a/common/flatpak-json.h b/common/flatpak-json-private.h
similarity index 100%
rename from common/flatpak-json.h
rename to common/flatpak-json-private.h
diff --git a/common/flatpak-json.c b/common/flatpak-json.c
index ba94de42..05ee097f 100644
--- a/common/flatpak-json.c
+++ b/common/flatpak-json.c
@@ -21,8 +21,8 @@
 #include "config.h"
 #include "string.h"
 
-#include "flatpak-json.h"
-#include "flatpak-utils.h"
+#include "flatpak-json-private.h"
+#include "flatpak-utils-private.h"
 #include "libglnx.h"
 
 G_DEFINE_TYPE (FlatpakJson, flatpak_json, G_TYPE_OBJECT);
diff --git a/common/flatpak-oci-registry.h b/common/flatpak-oci-registry-private.h
similarity index 99%
rename from common/flatpak-oci-registry.h
rename to common/flatpak-oci-registry-private.h
index c430c911..cdd9eb25 100644
--- a/common/flatpak-oci-registry.h
+++ b/common/flatpak-oci-registry-private.h
@@ -26,8 +26,8 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include <archive.h>
-#include "flatpak-json-oci.h"
-#include "flatpak-utils.h"
+#include "flatpak-json-oci-private.h"
+#include "flatpak-utils-private.h"
 
 #define FLATPAK_TYPE_OCI_REGISTRY flatpak_oci_registry_get_type ()
 #define FLATPAK_OCI_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLATPAK_TYPE_OCI_REGISTRY, FlatpakOciRegistry))
diff --git a/common/flatpak-oci-registry.c b/common/flatpak-oci-registry.c
index d8d2713b..fee3118a 100644
--- a/common/flatpak-oci-registry.c
+++ b/common/flatpak-oci-registry.c
@@ -28,8 +28,8 @@
 
 #include <gpgme.h>
 #include <libsoup/soup.h>
-#include "flatpak-oci-registry.h"
-#include "flatpak-utils.h"
+#include "flatpak-oci-registry-private.h"
+#include "flatpak-utils-private.h"
 
 G_DEFINE_QUARK (flatpak_oci_error, flatpak_oci_error)
 
diff --git a/common/flatpak-run.h b/common/flatpak-run-private.h
similarity index 98%
rename from common/flatpak-run.h
rename to common/flatpak-run-private.h
index 3944bb32..740d293f 100644
--- a/common/flatpak-run.h
+++ b/common/flatpak-run-private.h
@@ -22,11 +22,11 @@
 #define __FLATPAK_RUN_H__
 
 #include "libglnx/libglnx.h"
-#include "flatpak-common-types.h"
-#include "flatpak-context.h"
-#include "flatpak-bwrap.h"
-#include "flatpak-utils.h"
-#include "flatpak-exports.h"
+#include "flatpak-common-types-private.h"
+#include "flatpak-context-private.h"
+#include "flatpak-bwrap-private.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-exports-private.h"
 
 gboolean flatpak_run_in_transient_unit (const char *app_id,
                                         GError    **error);
diff --git a/common/flatpak-run.c b/common/flatpak-run.c
index 0d44efef..89dc0704 100644
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -46,10 +46,10 @@
 #include <gio/gio.h>
 #include "libglnx/libglnx.h"
 
-#include "flatpak-run.h"
+#include "flatpak-run-private.h"
 #include "flatpak-proxy.h"
-#include "flatpak-utils.h"
-#include "flatpak-dir.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-dir-private.h"
 #include "flatpak-systemd-dbus.h"
 #include "flatpak-document-dbus.h"
 #include "lib/flatpak-error.h"
diff --git a/common/flatpak-table-printer.c b/common/flatpak-table-printer.c
index aba6134e..3ba884b3 100644
--- a/common/flatpak-table-printer.c
+++ b/common/flatpak-table-printer.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include "flatpak-table-printer.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/common/flatpak-transaction-private.h b/common/flatpak-transaction-private.h
new file mode 100644
index 00000000..66dadbbd
--- /dev/null
+++ b/common/flatpak-transaction-private.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2018 Red Hat, Inc
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *       Alexander Larsson <alexl@redhat.com>
+ */
+
+#ifndef __FLATPAK_TRANSACTION_PRIVATE_H__
+#define __FLATPAK_TRANSACTION_PRIVATE_H__
+
+#include "flatpak-transaction.h"
+
+#include "flatpak-dir-private.h"
+
+FlatpakTransaction *flatpak_transaction_new                       (FlatpakDir          *dir);
+
+#endif /* __FLATPAK_TRANSACTION_PRIVATE_H__ */
diff --git a/common/flatpak-utils.h b/common/flatpak-utils-private.h
similarity index 99%
rename from common/flatpak-utils.h
rename to common/flatpak-utils-private.h
index e1c79a3b..01e529d9 100644
--- a/common/flatpak-utils.h
+++ b/common/flatpak-utils-private.h
@@ -24,13 +24,13 @@
 #include <string.h>
 
 #include "libglnx/libglnx.h"
-#include <flatpak-common-types.h>
+#include <flatpak-common-types-private.h>
 #include <gio/gio.h>
 #include <gio/gunixfdlist.h>
 #include <libsoup/soup.h>
 #include "flatpak-dbus.h"
 #include "flatpak-document-dbus.h"
-#include "flatpak-context.h"
+#include "flatpak-context-private.h"
 #include <ostree.h>
 #include <json-glib/json-glib.h>
 
diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c
index 806331dd..4b7853ac 100644
--- a/common/flatpak-utils.c
+++ b/common/flatpak-utils.c
@@ -20,11 +20,11 @@
 
 #include "config.h"
 
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "lib/flatpak-error.h"
-#include "flatpak-dir.h"
-#include "flatpak-oci-registry.h"
-#include "flatpak-run.h"
+#include "flatpak-dir-private.h"
+#include "flatpak-oci-registry-private.h"
+#include "flatpak-run-private.h"
 
 #include <glib/gi18n.h>
 
diff --git a/lib/flatpak-bundle-ref.c b/lib/flatpak-bundle-ref.c
index 733ebb8f..86072a83 100644
--- a/lib/flatpak-bundle-ref.c
+++ b/lib/flatpak-bundle-ref.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-bundle-ref.h"
 #include "flatpak-enum-types.h"
 
diff --git a/lib/flatpak-enum-types.c.template b/lib/flatpak-enum-types.c.template
index f8118881..063fd191 100644
--- a/lib/flatpak-enum-types.c.template
+++ b/lib/flatpak-enum-types.c.template
@@ -1,6 +1,6 @@
 /*** BEGIN file-header ***/
 #include "config.h"
-#include <flatpak-utils.h>
+#include <flatpak-utils-private.h>
 #include <flatpak.h>
 #include <flatpak-enum-types.h>
 #include <gio/gio.h>
diff --git a/lib/flatpak-installation.c b/lib/flatpak-installation.c
index a70826d5..87d295ba 100644
--- a/lib/flatpak-installation.c
+++ b/lib/flatpak-installation.c
@@ -27,15 +27,15 @@
 #include <ostree-repo-finder-avahi.h>
 #endif  /* FLATPAK_ENABLE_P2P */
 
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-installation.h"
 #include "flatpak-installed-ref-private.h"
 #include "flatpak-related-ref-private.h"
 #include "flatpak-remote-private.h"
 #include "flatpak-remote-ref-private.h"
 #include "flatpak-enum-types.h"
-#include "flatpak-dir.h"
-#include "flatpak-run.h"
+#include "flatpak-dir-private.h"
+#include "flatpak-run-private.h"
 #include "flatpak-error.h"
 
 /**
diff --git a/lib/flatpak-installed-ref-private.h b/lib/flatpak-installed-ref-private.h
index f8cf117f..0471bb9b 100644
--- a/lib/flatpak-installed-ref-private.h
+++ b/lib/flatpak-installed-ref-private.h
@@ -26,7 +26,7 @@
 #define __FLATPAK_INSTALLED_REF_PRIVATE_H__
 
 #include <flatpak-installed-ref.h>
-#include <flatpak-dir.h>
+#include <flatpak-dir-private.h>
 
 FlatpakInstalledRef *flatpak_installed_ref_new (const char  *full_ref,
                                                 const char  *commit,
diff --git a/lib/flatpak-installed-ref.c b/lib/flatpak-installed-ref.c
index 8ba1a281..1b228c59 100644
--- a/lib/flatpak-installed-ref.c
+++ b/lib/flatpak-installed-ref.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-installed-ref.h"
 #include "flatpak-installed-ref-private.h"
 #include "flatpak-enum-types.h"
diff --git a/lib/flatpak-ref.c b/lib/flatpak-ref.c
index cf4f0971..b74e4153 100644
--- a/lib/flatpak-ref.c
+++ b/lib/flatpak-ref.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-ref.h"
 #include "flatpak-enum-types.h"
 
diff --git a/lib/flatpak-related-ref-private.h b/lib/flatpak-related-ref-private.h
index 7bec4e91..a0560e97 100644
--- a/lib/flatpak-related-ref-private.h
+++ b/lib/flatpak-related-ref-private.h
@@ -26,7 +26,7 @@
 #define __FLATPAK_RELATED_REF_PRIVATE_H__
 
 #include <flatpak-related-ref.h>
-#include <flatpak-dir.h>
+#include <flatpak-dir-private.h>
 
 FlatpakRelatedRef *flatpak_related_ref_new (const char  *collection_id,
                                             const char  *full_ref,
diff --git a/lib/flatpak-related-ref.c b/lib/flatpak-related-ref.c
index 50ec0076..9c9b9da6 100644
--- a/lib/flatpak-related-ref.c
+++ b/lib/flatpak-related-ref.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-related-ref.h"
 #include "flatpak-related-ref-private.h"
 #include "flatpak-enum-types.h"
diff --git a/lib/flatpak-remote-private.h b/lib/flatpak-remote-private.h
index 21febf9a..56f8e901 100644
--- a/lib/flatpak-remote-private.h
+++ b/lib/flatpak-remote-private.h
@@ -26,7 +26,7 @@
 #define __FLATPAK_REMOTE_PRIVATE_H__
 
 #include <flatpak-remote.h>
-#include <flatpak-dir.h>
+#include <flatpak-dir-private.h>
 #include <ostree.h>
 
 FlatpakRemote *flatpak_remote_new_with_dir (const char *name,
diff --git a/lib/flatpak-remote-ref-private.h b/lib/flatpak-remote-ref-private.h
index d5d1a449..52d8b5f6 100644
--- a/lib/flatpak-remote-ref-private.h
+++ b/lib/flatpak-remote-ref-private.h
@@ -26,7 +26,7 @@
 #define __FLATPAK_REMOTE_REF_PRIVATE_H__
 
 #include <flatpak-remote-ref.h>
-#include <flatpak-dir.h>
+#include <flatpak-dir-private.h>
 
 FlatpakRemoteRef *flatpak_remote_ref_new (FlatpakCollectionRef *coll_ref,
                                           const char *commit,
diff --git a/lib/flatpak-remote-ref.c b/lib/flatpak-remote-ref.c
index 3573fa6d..f42c68e9 100644
--- a/lib/flatpak-remote-ref.c
+++ b/lib/flatpak-remote-ref.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-remote-ref-private.h"
 #include "flatpak-remote-ref.h"
 #include "flatpak-enum-types.h"
diff --git a/lib/flatpak-remote.c b/lib/flatpak-remote.c
index 1cee6006..4c89471d 100644
--- a/lib/flatpak-remote.c
+++ b/lib/flatpak-remote.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 #include "flatpak-remote-private.h"
 #include "flatpak-remote-ref-private.h"
 #include "flatpak-enum-types.h"
diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c
index 2c766b3d..b1293db6 100644
--- a/session-helper/flatpak-session-helper.c
+++ b/session-helper/flatpak-session-helper.c
@@ -28,7 +28,7 @@
 #include <gio/gio.h>
 #include <gio/gunixfdlist.h>
 #include "flatpak-dbus.h"
-#include "flatpak-utils.h"
+#include "flatpak-utils-private.h"
 
 static char *monitor_dir;
 
diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c
index dbe0793f..b7016cc4 100644
--- a/system-helper/flatpak-system-helper.c
+++ b/system-helper/flatpak-system-helper.c
@@ -27,8 +27,8 @@
 #include <polkit/polkit.h>
 
 #include "flatpak-dbus.h"
-#include "flatpak-dir.h"
-#include "flatpak-oci-registry.h"
+#include "flatpak-dir-private.h"
+#include "flatpak-oci-registry-private.h"
 #include "lib/flatpak-error.h"
 
 static PolkitAuthority *authority = NULL;