19 files changed, 32 insertions, 9 deletions
diff --git a/src/grp-system/libcore/Makefile b/src/grp-system/libcore/Makefile
index 02b3add171..a72b4dc7ee 100644
--- a/src/grp-system/libcore/Makefile
+++ b/src/grp-system/libcore/Makefile
@@ -162,7 +162,13 @@ libcore_la_LIBADD = \
 	$(APPARMOR_LIBS) \
 	$(MOUNT_LIBS)
 
-$(outdir)/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
+$(outdir)/load-fragment-gperf-nulstr.c: $(outdir)/load-fragment-gperf.gperf
 	$(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
 
+sd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src
+sd.CPPFLAGS += -DMOUNT_PATH=\"$(MOUNT_PATH)\"
+sd.CPPFLAGS += -DUMOUNT_PATH=\"$(UMOUNT_PATH)\"
+sd.CPPFLAGS += -DSYSTEMD_CGROUP_AGENT_PATH=\"$(libexecdir)/systemd-cgroups-agent\"
+sd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(libexecdir)/systemd\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-system/libcore/busname.h b/src/grp-system/libcore/busname.h
index aa7f0ecb1b..95a356bddc 100644
--- a/src/grp-system/libcore/busname.h
+++ b/src/grp-system/libcore/busname.h
@@ -20,7 +20,6 @@
 ***/
 
 typedef struct BusName BusName;
-typedef struct BusNamePolicy BusNamePolicy;
 
 #include "bus-policy.h"
 #include "unit.h"
diff --git a/src/grp-system/libcore/dbus-automount.h b/src/grp-system/libcore/dbus-automount.h
index 7b51eb973a..d1168c8188 100644
--- a/src/grp-system/libcore/dbus-automount.h
+++ b/src/grp-system/libcore/dbus-automount.h
@@ -19,5 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <systemd/sd-bus.h>
 
 extern const sd_bus_vtable bus_automount_vtable[];
diff --git a/src/grp-system/libcore/dbus-busname.h b/src/grp-system/libcore/dbus-busname.h
index 8643d1a404..c6aa90a424 100644
--- a/src/grp-system/libcore/dbus-busname.h
+++ b/src/grp-system/libcore/dbus-busname.h
@@ -19,5 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <systemd/sd-bus.h>
 
 extern const sd_bus_vtable bus_busname_vtable[];
diff --git a/src/grp-system/libcore/dbus-path.h b/src/grp-system/libcore/dbus-path.h
index d3c19e0c2b..f24b1d5d3d 100644
--- a/src/grp-system/libcore/dbus-path.h
+++ b/src/grp-system/libcore/dbus-path.h
@@ -19,6 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-
+#include <systemd/sd-bus.h>
 
 extern const sd_bus_vtable bus_path_vtable[];
diff --git a/src/grp-system/libcore/device.h b/src/grp-system/libcore/device.h
index 184a1a349b..60d5122966 100644
--- a/src/grp-system/libcore/device.h
+++ b/src/grp-system/libcore/device.h
@@ -21,6 +21,8 @@
 
 typedef struct Device Device;
 
+#include "unit.h"
+
 typedef enum DeviceFound {
         DEVICE_NOT_FOUND = 0,
         DEVICE_FOUND_UDEV = 1,
diff --git a/src/grp-system/libcore/killall.h b/src/grp-system/libcore/killall.h
index acc2439f00..bbb101c863 100644
--- a/src/grp-system/libcore/killall.h
+++ b/src/grp-system/libcore/killall.h
@@ -19,4 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
+
 void broadcast_signal(int sig, bool wait_for_exit, bool send_sighup);
diff --git a/src/grp-system/libcore/load-fragment-gperf.gperf.m4 b/src/grp-system/libcore/load-fragment-gperf.gperf.m4
index 6a5c16a000..ac4598f4c2 100644
--- a/src/grp-system/libcore/load-fragment-gperf.gperf.m4
+++ b/src/grp-system/libcore/load-fragment-gperf.gperf.m4
@@ -1,8 +1,8 @@
 %{
 #include <stddef.h>
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
 #include "load-fragment.h"
-#include "missing.h"
+#include "basic/missing.h"
 %}
 struct ConfigPerfItem;
 %null_strings
diff --git a/src/grp-system/libcore/loopback-setup.c b/src/grp-system/libcore/loopback-setup.c
index d5b65bca9c..f92e346f8c 100644
--- a/src/grp-system/libcore/loopback-setup.c
+++ b/src/grp-system/libcore/loopback-setup.c
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 
 #include "basic/missing.h"
-#include "sd-netlink/netlink-util.h"
 #include "sd-netlink/sd-netlink.h"
 
 #include "loopback-setup.h"
diff --git a/src/grp-system/libcore/machine-id-setup.h b/src/grp-system/libcore/machine-id-setup.h
index 29f4620646..88830ecc42 100644
--- a/src/grp-system/libcore/machine-id-setup.h
+++ b/src/grp-system/libcore/machine-id-setup.h
@@ -19,5 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <systemd/sd-id128.h>
+
 int machine_id_commit(const char *root);
 int machine_id_setup(const char *root, sd_id128_t requested, sd_id128_t *ret);
diff --git a/src/grp-system/libcore/service.h b/src/grp-system/libcore/service.h
index 34a9fbe72e..4dcf5ecf78 100644
--- a/src/grp-system/libcore/service.h
+++ b/src/grp-system/libcore/service.h
@@ -27,6 +27,7 @@ typedef struct ServiceFDStore ServiceFDStore;
 
 #include "kill.h"
 #include "path.h"
+#include "socket.h"
 
 typedef enum ServiceRestart {
         SERVICE_RESTART_NO,
@@ -201,7 +202,7 @@ struct Service {
 
 extern const UnitVTable service_vtable;
 
-int service_set_socket_fd(Service *s, int fd, struct Socket *socket, bool selinux_context_net);
+int service_set_socket_fd(Service *s, int fd, Socket *socket, bool selinux_context_net);
 void service_close_socket_fd(Service *s);
 
 const char* service_restart_to_string(ServiceRestart i) _const_;
diff --git a/src/grp-system/libcore/slice.h b/src/grp-system/libcore/slice.h
index c9f3f61067..71e05a4d6a 100644
--- a/src/grp-system/libcore/slice.h
+++ b/src/grp-system/libcore/slice.h
@@ -21,6 +21,8 @@
 
 typedef struct Slice Slice;
 
+#include "unit.h"
+
 struct Slice {
         Unit meta;
 
diff --git a/src/grp-system/libcore/smack-setup.h b/src/grp-system/libcore/smack-setup.h
index 78164c85e6..f8c62ce067 100644
--- a/src/grp-system/libcore/smack-setup.h
+++ b/src/grp-system/libcore/smack-setup.h
@@ -21,4 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
+
 int mac_smack_setup(bool *loaded_policy);
diff --git a/src/grp-system/libcore/socket.h b/src/grp-system/libcore/socket.h
index 3b214946e0..232d653fbe 100644
--- a/src/grp-system/libcore/socket.h
+++ b/src/grp-system/libcore/socket.h
@@ -23,7 +23,6 @@
 
 typedef struct Socket Socket;
 
-#include "mount.h"
 #include "service.h"
 
 typedef enum SocketExecCommand {
diff --git a/src/grp-system/libcore/swap.h b/src/grp-system/libcore/swap.h
index c2cbfc5d2a..52e22e22e8 100644
--- a/src/grp-system/libcore/swap.h
+++ b/src/grp-system/libcore/swap.h
@@ -24,6 +24,8 @@
 
 typedef struct Swap Swap;
 
+#include "unit.h"
+
 typedef enum SwapExecCommand {
         SWAP_EXEC_ACTIVATE,
         SWAP_EXEC_DEACTIVATE,
diff --git a/src/grp-system/libcore/target.c b/src/grp-system/libcore/target.c
index e62a49be84..74af0ced0c 100644
--- a/src/grp-system/libcore/target.c
+++ b/src/grp-system/libcore/target.c
@@ -23,7 +23,6 @@
 #include "basic/unit-name.h"
 
 #include "dbus-target.h"
-#include "target.h"
 #include "unit.h"
 
 static const UnitActiveState state_translation_table[_TARGET_STATE_MAX] = {
diff --git a/src/grp-system/libcore/target.h b/src/grp-system/libcore/target.h
index 339aea154e..406b80019c 100644
--- a/src/grp-system/libcore/target.h
+++ b/src/grp-system/libcore/target.h
@@ -21,6 +21,8 @@
 
 typedef struct Target Target;
 
+#include "unit.h"
+
 struct Target {
         Unit meta;
 
diff --git a/src/grp-system/libcore/timer.h b/src/grp-system/libcore/timer.h
index 99b47c3880..710ef126f0 100644
--- a/src/grp-system/libcore/timer.h
+++ b/src/grp-system/libcore/timer.h
@@ -23,6 +23,8 @@
 
 typedef struct Timer Timer;
 
+#include "unit.h"
+
 typedef enum TimerBase {
         TIMER_ACTIVE,
         TIMER_BOOT,
diff --git a/src/grp-system/libcore/unit.h b/src/grp-system/libcore/unit.h
index 01123cab00..3e25bfd32a 100644
--- a/src/grp-system/libcore/unit.h
+++ b/src/grp-system/libcore/unit.h
@@ -263,8 +263,10 @@ typedef enum UnitSetPropertiesMode {
 #include "automount.h"
 #include "busname.h"
 #include "device.h"
+#include "mount.h"
 #include "path.h"
 #include "scope.h"
+#include "service.h"
 #include "slice.h"
 #include "socket.h"
 #include "swap.h"