From bf8e91cedcc85451b7028f6d37577e8d4f7942bb Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 17 May 2023 12:51:08 +0100
Subject: [PATCH] common: Stop including utils-http in utils

utils-http is conceptually larger than utils.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 app/flatpak-builtins-install.c        | 1 +
 app/flatpak-builtins-remote-add.c     | 1 +
 common/flatpak-oci-registry-private.h | 1 +
 common/flatpak-transaction.c          | 1 +
 common/flatpak-utils-private.h        | 1 -
 tests/httpcache.c                     | 2 ++
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/flatpak-builtins-install.c b/app/flatpak-builtins-install.c
index 0666ea21..d4d9ae30 100644
--- a/app/flatpak-builtins-install.c
+++ b/app/flatpak-builtins-install.c
@@ -36,6 +36,7 @@
 #include "flatpak-transaction-private.h"
 #include "flatpak-cli-transaction.h"
 #include "flatpak-quiet-transaction.h"
+#include "flatpak-utils-http-private.h"
 #include "flatpak-utils-private.h"
 #include "flatpak-error.h"
 #include "flatpak-chain-input-stream-private.h"
diff --git a/app/flatpak-builtins-remote-add.c b/app/flatpak-builtins-remote-add.c
index 0c390ff2..b78aacca 100644
--- a/app/flatpak-builtins-remote-add.c
+++ b/app/flatpak-builtins-remote-add.c
@@ -31,6 +31,7 @@
 
 #include "flatpak-builtins.h"
 #include "flatpak-builtins-utils.h"
+#include "flatpak-utils-http-private.h"
 #include "flatpak-utils-private.h"
 
 static gboolean opt_no_gpg_verify;
diff --git a/common/flatpak-oci-registry-private.h b/common/flatpak-oci-registry-private.h
index 83ec8467..fda52103 100644
--- a/common/flatpak-oci-registry-private.h
+++ b/common/flatpak-oci-registry-private.h
@@ -27,6 +27,7 @@
 #include <gio/gio.h>
 #include <archive.h>
 #include "flatpak-json-oci-private.h"
+#include "flatpak-utils-http-private.h"
 #include "flatpak-utils-private.h"
 
 #define FLATPAK_TYPE_OCI_REGISTRY flatpak_oci_registry_get_type ()
diff --git a/common/flatpak-transaction.c b/common/flatpak-transaction.c
index 02bbca2f..0d7a944d 100644
--- a/common/flatpak-transaction.c
+++ b/common/flatpak-transaction.c
@@ -28,6 +28,7 @@
 #include "flatpak-installation-private.h"
 #include "flatpak-progress-private.h"
 #include "flatpak-transaction-private.h"
+#include "flatpak-utils-http-private.h"
 #include "flatpak-utils-private.h"
 #include "flatpak-uri-private.h"
 #include "flatpak-variant-impl-private.h"
diff --git a/common/flatpak-utils-private.h b/common/flatpak-utils-private.h
index 3336b0dc..b90107dd 100644
--- a/common/flatpak-utils-private.h
+++ b/common/flatpak-utils-private.h
@@ -32,7 +32,6 @@
 #include "flatpak-context-private.h"
 #include "flatpak-error.h"
 #include "flatpak-glib-backports-private.h"
-#include "flatpak-utils-http-private.h"
 #include "flatpak-variant-private.h"
 #include "flatpak-dir-private.h"
 #include <ostree.h>
diff --git a/tests/httpcache.c b/tests/httpcache.c
index 095b732f..3b9982f7 100644
--- a/tests/httpcache.c
+++ b/tests/httpcache.c
@@ -1,3 +1,5 @@
+#include "libglnx.h"
+#include "common/flatpak-utils-http-private.h"
 #include "common/flatpak-utils-private.h"
 
 int