shared: Remove circular dependency between image-policy.h and dissect-image.h

ImagePolicy can just be a forward declaration in dissect-image.h.

src/shared/dissect-image.h

@@ -20,6 +20,7 @@ typedef struct DecryptedImage DecryptedImage;
 typedef struct MountOptions MountOptions;
 typedef struct VeritySettings VeritySettings;
 typedef struct ImageFilter ImageFilter;
+typedef struct ImagePolicy ImagePolicy;
 typedef struct ExtensionReleaseData ExtensionReleaseData;
 
 struct DissectedPartition {
@@ -163,9 +164,6 @@ struct ExtensionReleaseData {
         char *os_release_extension_scope;
 };
 
-/* We include image-policy.h down here, since ImagePolicy wants a complete definition of PartitionDesignator first. */
-#include "image-policy.h"
-
 MountOptions* mount_options_free_all(MountOptions *options);
 DEFINE_TRIVIAL_CLEANUP_FUNC(MountOptions*, mount_options_free_all);
 const char* mount_options_from_designator(const MountOptions *options, PartitionDesignator designator);

src/shared/fdisk-util.c

@@ -5,6 +5,7 @@
 #include "extract-word.h"
 #include "fd-util.h"
 #include "fdisk-util.h"
+#include "log.h"
 #include "parse-util.h"
 
 #if HAVE_LIBFDISK

src/shared/image-policy.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-typedef struct ImagePolicy ImagePolicy;
-
 #include "conf-parser.h"
 #include "dissect-image.h"
 #include "errno-list.h"
@@ -48,11 +46,11 @@ typedef struct PartitionPolicy {
         PartitionPolicyFlags flags;
 } PartitionPolicy;
 
-struct ImagePolicy {
+typedef struct ImagePolicy {
         PartitionPolicyFlags default_flags;  /* for any designator not listed in the list below */
         size_t n_policies;
         PartitionPolicy policies[];          /* sorted by designator, hence suitable for binary search */
-};
+} ImagePolicy;
 
 /* Default policies for various use cases */
 extern const ImagePolicy image_policy_allow;

src/shared/mkfs-util.c

@@ -8,6 +8,7 @@
 #include "fileio.h"
 #include "fs-util.h"
 #include "id128-util.h"
+#include "log.h"
 #include "mkfs-util.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"

src/shared/mount-util.c

@@ -22,6 +22,7 @@
 #include "initrd-util.h"
 #include "label-util.h"
 #include "libmount-util.h"
+#include "log.h"
 #include "missing_syscall.h"
 #include "mkdir-label.h"
 #include "mount-util.h"