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

@@ -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"

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;

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

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"

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>

tests/httpcache.c

@@ -1,3 +1,5 @@
+#include "libglnx.h"
+#include "common/flatpak-utils-http-private.h"
 #include "common/flatpak-utils-private.h"
 
 int