7 files changed, 13 insertions, 4 deletions
diff --git a/src/grp-system/libcore/src/Makefile b/src/grp-system/libcore/src/Makefile
index cd63651f2a..ab731a5b4f 100644
--- a/src/grp-system/libcore/src/Makefile
+++ b/src/grp-system/libcore/src/Makefile
@@ -157,6 +157,7 @@ libcore_la_CFLAGS = \
 	$(SECCOMP_CFLAGS)
 
 libcore_la_LIBADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la \
 	$(PAM_LIBS) \
 	$(AUDIT_LIBS) \
@@ -164,7 +165,12 @@ 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 += -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/src/dbus-automount.h b/src/grp-system/libcore/src/dbus-automount.h
index f41adda2a6..5131d747d4 100644
--- a/src/grp-system/libcore/src/dbus-automount.h
+++ b/src/grp-system/libcore/src/dbus-automount.h
@@ -19,6 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <systemd/sd-bus.h>
+
+#include "core/unit.h"
 
 extern const sd_bus_vtable bus_automount_vtable[];
 
diff --git a/src/grp-system/libcore/src/dbus-busname.h b/src/grp-system/libcore/src/dbus-busname.h
index 8643d1a404..c6aa90a424 100644
--- a/src/grp-system/libcore/src/dbus-busname.h
+++ b/src/grp-system/libcore/src/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/src/dbus-path.h b/src/grp-system/libcore/src/dbus-path.h
index d3c19e0c2b..f24b1d5d3d 100644
--- a/src/grp-system/libcore/src/dbus-path.h
+++ b/src/grp-system/libcore/src/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/src/linux/auto_dev-ioctl.h b/src/grp-system/libcore/src/linux/auto_dev-ioctl.h
index aeaeb3ea7a..56ab047141 100644
--- a/src/grp-system/libcore/src/linux/auto_dev-ioctl.h
+++ b/src/grp-system/libcore/src/linux/auto_dev-ioctl.h
@@ -10,6 +10,7 @@
 #ifndef _LINUX_AUTO_DEV_IOCTL_H
 #define _LINUX_AUTO_DEV_IOCTL_H
 
+#include <linux/limits.h>
 #include <linux/auto_fs.h>
 
 #ifdef __KERNEL__
diff --git a/src/grp-system/libcore/src/loopback-setup.c b/src/grp-system/libcore/src/loopback-setup.c
index 8eb6251bd7..d7085640e1 100644
--- a/src/grp-system/libcore/src/loopback-setup.c
+++ b/src/grp-system/libcore/src/loopback-setup.c
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 
 #include "core/loopback-setup.h"
-#include "sd-netlink/netlink-util.h"
 #include "systemd-basic/missing.h"
 #include "systemd-staging/sd-netlink.h"
 
diff --git a/src/grp-system/libcore/src/target.c b/src/grp-system/libcore/src/target.c
index 1e5212d75d..717dee06a9 100644
--- a/src/grp-system/libcore/src/target.c
+++ b/src/grp-system/libcore/src/target.c
@@ -17,7 +17,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "core/target.h"
 #include "core/unit.h"
 #include "systemd-basic/log.h"
 #include "systemd-basic/special.h"