diff --git a/src/portable/portabled-bus.h b/src/portable/portabled-bus.h
index 7da366c1c3..c216c3aa75 100644
--- a/src/portable/portabled-bus.h
+++ b/src/portable/portabled-bus.h
@@ -3,7 +3,7 @@
 
 #include "sd-bus.h"
 
-#include "portable.h"
+typedef struct PortableChange PortableChange;
 
 extern const sd_bus_vtable manager_vtable[];
 
diff --git a/src/portable/portabled-image-bus.h b/src/portable/portabled-image-bus.h
index 763a0890f9..d37c244315 100644
--- a/src/portable/portabled-image-bus.h
+++ b/src/portable/portabled-image-bus.h
@@ -3,8 +3,10 @@
 
 #include "sd-bus.h"
 
+#include "bus-object.h"
 #include "discover-image.h"
-#include "portabled.h"
+
+typedef struct Manager Manager;
 
 int bus_image_common_get_os_release(Manager *m, sd_bus_message *message, const char *name_or_path, Image *image, sd_bus_error *error);
 int bus_image_common_get_metadata(Manager *m, sd_bus_message *message, const char *name_or_path, Image *image, sd_bus_error *error);
diff --git a/src/portable/portabled-image.h b/src/portable/portabled-image.h
index 753f389f80..424694b3fd 100644
--- a/src/portable/portabled-image.h
+++ b/src/portable/portabled-image.h
@@ -1,9 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "sd-bus.h"
+
 #include "discover-image.h"
 #include "hashmap.h"
-#include "portabled.h"
+
+typedef struct Manager Manager;
 
 Image *manager_image_cache_get(Manager *m, const char *name_or_path);
 
diff --git a/src/portable/portabled-operation.c b/src/portable/portabled-operation.c
index a694e5e64d..0e4a6e4629 100644
--- a/src/portable/portabled-operation.c
+++ b/src/portable/portabled-operation.c
@@ -5,6 +5,7 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "log.h"
+#include "portabled.h"
 #include "portabled-operation.h"
 #include "process-util.h"
 
diff --git a/src/portable/portabled-operation.h b/src/portable/portabled-operation.h
index f64740e9b8..efbadc4620 100644
--- a/src/portable/portabled-operation.h
+++ b/src/portable/portabled-operation.h
@@ -8,10 +8,9 @@
 
 #include "list.h"
 
+typedef struct Manager Manager;
 typedef struct Operation Operation;
 
-#include "portabled.h"
-
 #define OPERATIONS_MAX 64
 
 struct Operation {
diff --git a/src/portable/portabled.h b/src/portable/portabled.h
index 8503451ccc..418c1040da 100644
--- a/src/portable/portabled.h
+++ b/src/portable/portabled.h
@@ -7,13 +7,10 @@
 #include "bus-object.h"
 #include "hashmap.h"
 #include "list.h"
+#include "portabled-operation.h"
 #include "runtime-scope.h"
 
-typedef struct Manager Manager;
-
-#include "portabled-operation.h"
-
-struct Manager {
+typedef struct Manager {
         sd_event *event;
         sd_bus *bus;
 
@@ -26,6 +23,6 @@ struct Manager {
         unsigned n_operations;
 
         RuntimeScope runtime_scope; /* for now always RUNTIME_SCOPE_SYSTEM */
-};
+} Manager;
 
 extern const BusObjectImplementation manager_object;