common: Rename all private headers to *-private.h

This is the start of the merging of lib/* into common/*

Closes: #1706
Approved by: alexlarsson

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;

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>

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;

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;

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;

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;

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;

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;

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;

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;

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;

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 }

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 }

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 }

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[] = {

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;

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;

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;

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;

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;

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;

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;
 

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 }

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;

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

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;

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;
 

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;

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;

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

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

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
 

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;
+}

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__ */

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;

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"
 

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;
 

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 = \

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)

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,

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;
 

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"
 

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))

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"
 

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 {

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"
 

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
 

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 *

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);

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))

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)
 

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);

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"

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>

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__ */

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>
 

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>
 

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"
 

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>

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"
 
 /**

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,

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"

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"
 

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,

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"

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,

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,

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"

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"

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;
 

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;