diff --git a/src/core/job.h b/src/core/job.h
index 8e8d6ff08f0..680b4a60169 100644
--- a/src/core/job.h
+++ b/src/core/job.h
@@ -3,12 +3,11 @@
 
 #include <stdbool.h>
 
+#include "sd-bus.h"
 #include "sd-event.h"
 
 #include "list.h"
 #include "unit-dependency-atom.h"
-#include "unit-name.h"
-#include "unit.h"
 
 typedef struct ActivationDetails ActivationDetails;
 typedef struct Job Job;
@@ -17,6 +16,8 @@ typedef enum JobType JobType;
 typedef enum JobState JobState;
 typedef enum JobMode JobMode;
 typedef enum JobResult JobResult;
+typedef struct Manager Manager;
+typedef struct Unit Unit;
 
 /* Be careful when changing the job types! Adjust job_merging_table[] accordingly! */
 enum JobType {
diff --git a/src/core/unit.h b/src/core/unit.h
index 831bce885c1..7f11539986b 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -17,15 +17,12 @@ typedef enum UnitMountDependencyType {
         _UNIT_MOUNT_DEPENDENCY_TYPE_INVALID = -EINVAL,
 } UnitMountDependencyType;
 
-#include "bpf-program.h"
 #include "cgroup.h"
 #include "condition.h"
 #include "emergency-action.h"
 #include "install.h"
 #include "list.h"
 #include "pidref.h"
-#include "set.h"
-#include "show-status.h"
 #include "unit-file.h"
 
 typedef struct UnitRef UnitRef;