common: Don't include flatpak-utils.h from flatpak-context.h and flatpak-exports.h

This allows us to use FlatpakContext arguments in flatpak-utils.h

4 files changed, 5 insertions, 4 deletions

diff --git a/common/flatpak-common-types.h b/common/flatpak-common-types.h
index f6ce9e16..c55ad586 100644
--- a/common/flatpak-common-types.h
+++ b/common/flatpak-common-types.h
@@ -30,5 +30,6 @@ typedef struct FlatpakDir     FlatpakDir;
 typedef struct FlatpakDeploy  FlatpakDeploy;
 typedef struct FlatpakOciRegistry FlatpakOciRegistry;
 typedef struct _FlatpakOciManifest FlatpakOciManifest;
+typedef struct FlatpakCompletion FlatpakCompletion;
 
 #endif /* __FLATPAK_COMMON_TYPES_H__ */
diff --git a/common/flatpak-context.h b/common/flatpak-context.h
index 0eff6a50..0ecbf6e5 100644
--- a/common/flatpak-context.h
+++ b/common/flatpak-context.h
@@ -23,7 +23,7 @@
 
 #include "libglnx/libglnx.h"
 #include "dbus-proxy/flatpak-proxy.h"
-#include "flatpak-utils.h"
+#include <flatpak-common-types.h>
 #include "flatpak-exports.h"
 
 typedef struct FlatpakContext FlatpakContext;
diff --git a/common/flatpak-exports.h b/common/flatpak-exports.h
index 33c2f8db..f783f048 100644
--- a/common/flatpak-exports.h
+++ b/common/flatpak-exports.h
@@ -22,7 +22,6 @@
 #define __FLATPAK_EXPORTS_H__
 
 #include "libglnx/libglnx.h"
-#include "flatpak-utils.h"
 #include "flatpak-bwrap.h"
 
 /* In numerical order of more privs */
diff --git a/common/flatpak-utils.h b/common/flatpak-utils.h
index e1ad6882..fcd19bb8 100644
--- a/common/flatpak-utils.h
+++ b/common/flatpak-utils.h
@@ -30,6 +30,7 @@
 #include <libsoup/soup.h>
 #include "flatpak-dbus.h"
 #include "flatpak-document-dbus.h"
+#include "flatpak-context.h"
 #include <ostree.h>
 #include <json-glib/json-glib.h>
 
@@ -654,7 +655,7 @@ gboolean flatpak_download_http_uri (SoupSession *soup_session,
                                     GCancellable *cancellable,
                                     GError      **error);
 
-typedef struct {
+struct FlatpakCompletion {
   char *shell_cur;
   char *cur;
   char *prev;
@@ -664,7 +665,7 @@ typedef struct {
   char **original_argv;
   int argc;
   int original_argc;
-} FlatpakCompletion;
+};
 
 void flatpak_completion_debug (const gchar *format, ...);