16 files changed, 24 insertions, 1 deletions

diff --git a/src/boot/boot-loader.h b/src/boot/boot-loader.h
index 08827c30ad..b3fcdeedad 100644
--- a/src/boot/boot-loader.h
+++ b/src/boot/boot-loader.h
@@ -21,5 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "boot.h"
+
 int boot_loader_read_entries(struct boot_info *info);
 int boot_loader_find_active_entry(struct boot_info *info, const char *loader_active);
diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 7150e5e7e2..8fa851de32 100644
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -21,7 +21,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
+
 #include "list.h"
+#include "time-util.h"
 
 typedef struct CGroupContext CGroupContext;
 typedef struct CGroupDeviceAllow CGroupDeviceAllow;
diff --git a/src/core/execute.h b/src/core/execute.h
index 153867c7b3..6e0c9faa75 100644
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -199,6 +199,7 @@ struct ExecContext {
 };
 
 #include "cgroup.h"
+#include "cgroup-util.h"
 
 struct ExecParameters {
         char **argv;
diff --git a/src/core/path.h b/src/core/path.h
index d2e91d7d71..0d36aab960 100644
--- a/src/core/path.h
+++ b/src/core/path.h
@@ -22,6 +22,7 @@
 ***/
 
 typedef struct Path Path;
+typedef struct PathSpec PathSpec;
 
 #include "unit.h"
 #include "mount.h"
diff --git a/src/core/unit.h b/src/core/unit.h
index 53b8a7f66b..291bc77a76 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -259,8 +259,8 @@ typedef enum UnitSetPropertiesMode {
 #include "automount.h"
 #include "swap.h"
 #include "timer.h"
-#include "path.h"
 #include "slice.h"
+#include "path.h"
 #include "scope.h"
 
 struct UnitVTable {
diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index e99050cdf2..b51ecdb600 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -32,6 +32,7 @@
 #include "hashmap.h"
 #include "set.h"
 #include "journal-file.h"
+#include "sd-journal.h"
 
 typedef struct Match Match;
 typedef struct Location Location;
diff --git a/src/libsystemd-network/dhcp-identifier.h b/src/libsystemd-network/dhcp-identifier.h
index cbec03eac1..7f44d25499 100644
--- a/src/libsystemd-network/dhcp-identifier.h
+++ b/src/libsystemd-network/dhcp-identifier.h
@@ -23,6 +23,7 @@
 
 #include <net/ethernet.h>
 
+#include "macro.h"
 #include "sparse-endian.h"
 #include "sd-id128.h"
 
diff --git a/src/libsystemd/sd-bus/bus-bloom.h b/src/libsystemd/sd-bus/bus-bloom.h
index 0dad5db78d..96c82d7e8f 100644
--- a/src/libsystemd/sd-bus/bus-bloom.h
+++ b/src/libsystemd/sd-bus/bus-bloom.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
+#include <stdint.h>
 #include <sys/types.h>
 
 /*
diff --git a/src/libsystemd/sd-bus/bus-gvariant.h b/src/libsystemd/sd-bus/bus-gvariant.h
index b4bd2a50f0..fdf533591b 100644
--- a/src/libsystemd/sd-bus/bus-gvariant.h
+++ b/src/libsystemd/sd-bus/bus-gvariant.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "macro.h"
+
 int bus_gvariant_get_size(const char *signature) _pure_;
 int bus_gvariant_get_alignment(const char *signature) _pure_;
 int bus_gvariant_is_fixed_size(const char *signature) _pure_;
diff --git a/src/libsystemd/sd-bus/bus-type.h b/src/libsystemd/sd-bus/bus-type.h
index 581e8d5841..0e507839ca 100644
--- a/src/libsystemd/sd-bus/bus-type.h
+++ b/src/libsystemd/sd-bus/bus-type.h
@@ -23,6 +23,7 @@
 
 #include <stdbool.h>
 
+#include "macro.h"
 #include "sd-bus.h"
 #include "sd-bus-protocol.h"
 
diff --git a/src/libsystemd/sd-bus/busctl-introspect.h b/src/libsystemd/sd-bus/busctl-introspect.h
index 9bea43717d..d6b4cf05a7 100644
--- a/src/libsystemd/sd-bus/busctl-introspect.h
+++ b/src/libsystemd/sd-bus/busctl-introspect.h
@@ -22,6 +22,7 @@
 ***/
 
 #include <inttypes.h>
+#include <stdbool.h>
 
 typedef struct XMLIntrospectOps {
         int (*on_path)(const char *path, void *userdata);
diff --git a/src/shared/btrfs-ctree.h b/src/shared/btrfs-ctree.h
index 7bdf3fe139..8b6f1ab4f4 100644
--- a/src/shared/btrfs-ctree.h
+++ b/src/shared/btrfs-ctree.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include "macro.h"
 #include "sparse-endian.h"
 
 /* Stolen from btrfs' ctree.h */
diff --git a/src/shared/clock-util.h b/src/shared/clock-util.h
index 7ed371a958..198a7b2753 100644
--- a/src/shared/clock-util.h
+++ b/src/shared/clock-util.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "util.h"
+
 int clock_is_localtime(void);
 int clock_set_timezone(int *min);
 int clock_reset_timewarp(void);
diff --git a/src/shared/env-util.h b/src/shared/env-util.h
index fb3a52b707..618441a655 100644
--- a/src/shared/env-util.h
+++ b/src/shared/env-util.h
@@ -24,6 +24,8 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
+#include "macro.h"
+
 bool env_name_is_valid(const char *e);
 bool env_value_is_valid(const char *e);
 bool env_assignment_is_valid(const char *e);
diff --git a/src/shared/ptyfwd.h b/src/shared/ptyfwd.h
index d65b66a3d0..d3e229bd70 100644
--- a/src/shared/ptyfwd.h
+++ b/src/shared/ptyfwd.h
@@ -23,7 +23,9 @@
 
 #include <sys/types.h>
 #include <signal.h>
+#include <stdbool.h>
 
+#include "util.h"
 #include "sd-event.h"
 
 typedef struct PTYForward PTYForward;
diff --git a/src/shared/uid-range.h b/src/shared/uid-range.h
index d3dac8df63..45335e939f 100644
--- a/src/shared/uid-range.h
+++ b/src/shared/uid-range.h
@@ -21,6 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
 #include <sys/types.h>
 
 typedef struct UidRange {