3 files changed, 15 insertions, 13 deletions
diff --git a/src/systemd-hibernate-resume/Makefile b/src/systemd-hibernate-resume/Makefile
index 386f372f78..5a8a0b4ad1 100644
--- a/src/systemd-hibernate-resume/Makefile
+++ b/src/systemd-hibernate-resume/Makefile
@@ -57,4 +57,6 @@ EXTRA_DIST += \
 	units/systemd-hibernate-resume@.service.in \
 	units/systemd-hybrid-sleep.service.in
 
+systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-hibernate-resume/hibernate-resume-generator.c b/src/systemd-hibernate-resume/hibernate-resume-generator.c
index d7ee80d58f..08de7e1983 100644
--- a/src/systemd-hibernate-resume/hibernate-resume-generator.c
+++ b/src/systemd-hibernate-resume/hibernate-resume-generator.c
@@ -20,15 +20,15 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include "alloc-util.h"
-#include "fstab-util.h"
-#include "log.h"
-#include "mkdir.h"
-#include "proc-cmdline.h"
-#include "special.h"
-#include "string-util.h"
-#include "unit-name.h"
-#include "util.h"
+#include "basic/alloc-util.h"
+#include "shared/fstab-util.h"
+#include "basic/log.h"
+#include "basic/mkdir.h"
+#include "basic/proc-cmdline.h"
+#include "basic/special.h"
+#include "basic/string-util.h"
+#include "basic/unit-name.h"
+#include "basic/util.h"
 
 static const char *arg_dest = "/tmp";
 static char *arg_resume_dev = NULL;
diff --git a/src/systemd-hibernate-resume/hibernate-resume.c b/src/systemd-hibernate-resume/hibernate-resume.c
index 21df3c4461..64d14bf64b 100644
--- a/src/systemd-hibernate-resume/hibernate-resume.c
+++ b/src/systemd-hibernate-resume/hibernate-resume.c
@@ -21,10 +21,10 @@
 #include <stdio.h>
 #include <sys/stat.h>
 
-#include "alloc-util.h"
-#include "fileio.h"
-#include "log.h"
-#include "util.h"
+#include "basic/alloc-util.h"
+#include "basic/fileio.h"
+#include "basic/log.h"
+#include "basic/util.h"
 
 int main(int argc, char *argv[]) {
         struct stat st;