3 files changed, 11 insertions, 9 deletions
diff --git a/src/grp-system/systemd-shutdown/Makefile b/src/grp-system/systemd-shutdown/Makefile
index f68758174a..619f1bbdb5 100644
--- a/src/grp-system/systemd-shutdown/Makefile
+++ b/src/grp-system/systemd-shutdown/Makefile
@@ -27,13 +27,13 @@ rootlibexec_PROGRAMS += systemd-shutdown
 systemd_shutdown_SOURCES = \
 	src/core/umount.c \
 	src/core/umount.h \
-	src/core/shutdown.c \
-	src/core/mount-setup.c \
-	src/core/mount-setup.h \
-	src/core/killall.h \
-	src/core/killall.c
+	src/core/shutdown.c
 
 systemd_shutdown_LDADD = \
+	libcore.la \
 	libsystemd-shared.la
 
+sd.CPPFLAGS += -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\"
+sd.CPPFLAGS += -DKEXEC=\"$(KEXEC)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-system/systemd-shutdown/systemd-shutdown.xml b/src/grp-system/systemd-shutdown/systemd-shutdown.xml
index d16e5d628f..536f392d46 100644
--- a/src/grp-system/systemd-shutdown/systemd-shutdown.xml
+++ b/src/grp-system/systemd-shutdown/systemd-shutdown.xml
@@ -21,10 +21,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-halt.service">
+<refentry id="systemd-shutdown">
 
   <refentryinfo>
-    <title>systemd-halt.service</title>
+    <title>systemd-shutdown</title>
     <productname>systemd</productname>
 
     <authorgroup>
@@ -38,16 +38,16 @@
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle>systemd-halt.service</refentrytitle>
+    <refentrytitle>systemd-shutdown</refentrytitle>
     <manvolnum>8</manvolnum>
   </refmeta>
 
   <refnamediv>
+    <refname>systemd-shutdown</refname>
     <refname>systemd-halt.service</refname>
     <refname>systemd-poweroff.service</refname>
     <refname>systemd-reboot.service</refname>
     <refname>systemd-kexec.service</refname>
-    <refname>systemd-shutdown</refname>
     <refpurpose>System shutdown logic</refpurpose>
   </refnamediv>
 
diff --git a/src/grp-system/systemd-shutdown/umount.h b/src/grp-system/systemd-shutdown/umount.h
index 4e2215a47d..ce2fd9ec58 100644
--- a/src/grp-system/systemd-shutdown/umount.h
+++ b/src/grp-system/systemd-shutdown/umount.h
@@ -19,6 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
+
 int umount_all(bool *changed);
 
 int swapoff_all(bool *changed);