7 files changed, 31 insertions, 24 deletions
diff --git a/src/systemd-shutdown/Makefile b/src/systemd-shutdown/Makefile
index 72047133ce..1017422b75 100644
--- a/src/systemd-shutdown/Makefile
+++ b/src/systemd-shutdown/Makefile
@@ -36,4 +36,7 @@ systemd_shutdown_SOURCES = \
 systemd_shutdown_LDADD = \
 	libshared.la
 
+systemd.CPPFLAGS += -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\"
+systemd.CPPFLAGS += -DKEXEC=\"$(KEXEC)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-shutdown/killall.c b/src/systemd-shutdown/killall.c
new file mode 120000
index 0000000000..5ddb36306b
--- /dev/null
+++ b/src/systemd-shutdown/killall.c
@@ -0,0 +1 @@
+../libcore/killall.c
+\ No newline at end of file
diff --git a/src/systemd-shutdown/killall.h b/src/systemd-shutdown/killall.h
new file mode 120000
index 0000000000..60b334fe91
--- /dev/null
+++ b/src/systemd-shutdown/killall.h
@@ -0,0 +1 @@
+../libcore/killall.h
+\ No newline at end of file
diff --git a/src/systemd-shutdown/mount-setup.c b/src/systemd-shutdown/mount-setup.c
new file mode 120000
index 0000000000..a4ab487157
--- /dev/null
+++ b/src/systemd-shutdown/mount-setup.c
@@ -0,0 +1 @@
+../libcore/mount-setup.c
+\ No newline at end of file
diff --git a/src/systemd-shutdown/mount-setup.h b/src/systemd-shutdown/mount-setup.h
new file mode 120000
index 0000000000..1f984851f8
--- /dev/null
+++ b/src/systemd-shutdown/mount-setup.h
@@ -0,0 +1 @@
+../libcore/mount-setup.h
+\ No newline at end of file
diff --git a/src/systemd-shutdown/shutdown.c b/src/systemd-shutdown/shutdown.c
index e14755d84e..6281d99c1d 100644
--- a/src/systemd-shutdown/shutdown.c
+++ b/src/systemd-shutdown/shutdown.c
@@ -29,22 +29,22 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "alloc-util.h"
-#include "cgroup-util.h"
-#include "def.h"
-#include "fileio.h"
+#include "basic/alloc-util.h"
+#include "basic/cgroup-util.h"
+#include "basic/def.h"
+#include "basic/fileio.h"
 #include "killall.h"
-#include "log.h"
-#include "missing.h"
-#include "parse-util.h"
-#include "process-util.h"
-#include "string-util.h"
-#include "switch-root.h"
-#include "terminal-util.h"
+#include "basic/log.h"
+#include "basic/missing.h"
+#include "basic/parse-util.h"
+#include "basic/process-util.h"
+#include "basic/string-util.h"
+#include "shared/switch-root.h"
+#include "basic/terminal-util.h"
 #include "umount.h"
-#include "util.h"
-#include "virt.h"
-#include "watchdog.h"
+#include "basic/util.h"
+#include "basic/virt.h"
+#include "shared/watchdog.h"
 
 #define FINALIZE_ATTEMPTS 50
 
diff --git a/src/systemd-shutdown/umount.c b/src/systemd-shutdown/umount.c
index c21a2be54e..2e032fb9d6 100644
--- a/src/systemd-shutdown/umount.c
+++ b/src/systemd-shutdown/umount.c
@@ -27,18 +27,18 @@
 
 #include "libudev.h"
 
-#include "alloc-util.h"
-#include "escape.h"
-#include "fd-util.h"
-#include "fstab-util.h"
-#include "list.h"
+#include "basic/alloc-util.h"
+#include "basic/escape.h"
+#include "basic/fd-util.h"
+#include "shared/fstab-util.h"
+#include "basic/list.h"
 #include "mount-setup.h"
-#include "path-util.h"
-#include "string-util.h"
-#include "udev-util.h"
+#include "basic/path-util.h"
+#include "basic/string-util.h"
+#include "shared/udev-util.h"
 #include "umount.h"
-#include "util.h"
-#include "virt.h"
+#include "basic/util.h"
+#include "basic/virt.h"
 
 typedef struct MountPoint {
         char *path;