6 files changed, 60 insertions, 58 deletions
diff --git a/src/grp-coredump/coredumpctl/Makefile b/src/grp-coredump/coredumpctl/Makefile
index 25a0ee29f2..743f010f7b 100644
--- a/src/grp-coredump/coredumpctl/Makefile
+++ b/src/grp-coredump/coredumpctl/Makefile
@@ -27,6 +27,7 @@ coredumpctl_SOURCES = \
 	src/coredump/coredumpctl.c
 
 coredumpctl_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 bin_PROGRAMS += \
diff --git a/src/grp-coredump/coredumpctl/coredumpctl.c b/src/grp-coredump/coredumpctl/coredumpctl.c
index 19d28f744e..f4adb9c2f8 100644
--- a/src/grp-coredump/coredumpctl/coredumpctl.c
+++ b/src/grp-coredump/coredumpctl/coredumpctl.c
@@ -26,24 +26,24 @@
 
 #include <systemd/sd-journal.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/set.h"
-#include "basic/sigbus.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
 #include "sd-journal/compress.h"
 #include "sd-journal/journal-internal.h"
-#include "shared/pager.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/sigbus.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/pager.h"
 
 static enum {
         ACTION_NONE,
diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile
index edc6a0c054..f27c4a3976 100644
--- a/src/grp-coredump/systemd-coredump/Makefile
+++ b/src/grp-coredump/systemd-coredump/Makefile
@@ -33,6 +33,8 @@ systemd_coredump_CFLAGS = \
 	$(ACL_CFLAGS)
 
 systemd_coredump_LDADD = \
+	libsystemd-internal.la \
+	libjournal-core.la \
 	libsystemd-shared.la \
 	$(ACL_LIBS)
 
@@ -82,7 +84,6 @@ EXTRA_DIST += \
 	sysctl.d/50-coredump.sysctl.in \
 	units/systemd-coredump@.service.in
 
-sd.CPPFLAGS += -I$(topsrcdir)/src/grp-journal/libjournal-core
 sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-coredump/systemd-coredump/coredump-vacuum.c b/src/grp-coredump/systemd-coredump/coredump-vacuum.c
index 7fc6e85436..96fdf7344c 100644
--- a/src/grp-coredump/systemd-coredump/coredump-vacuum.c
+++ b/src/grp-coredump/systemd-coredump/coredump-vacuum.c
@@ -19,15 +19,15 @@
 
 #include <sys/statvfs.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/hashmap.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/time-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "coredump-vacuum.h"
 
diff --git a/src/grp-coredump/systemd-coredump/coredump.c b/src/grp-coredump/systemd-coredump/coredump.c
index dd05326ce0..31127de616 100644
--- a/src/grp-coredump/systemd-coredump/coredump.c
+++ b/src/grp-coredump/systemd-coredump/coredump.c
@@ -32,33 +32,33 @@
 #include <systemd/sd-journal.h>
 #include <systemd/sd-login.h>
 
-#include "basic/alloc-util.h"
-#include "basic/capability-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/copy.h"
-#include "basic/dirent-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/io-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/socket-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "journald-native.h"
+#include "journal-core/journald-native.h"
 #include "sd-journal/compress.h"
-#include "shared/acl-util.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/acl-util.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "coredump-vacuum.h"
 #include "stacktrace.h"
diff --git a/src/grp-coredump/systemd-coredump/stacktrace.c b/src/grp-coredump/systemd-coredump/stacktrace.c
index e51b2986e6..1e59582c67 100644
--- a/src/grp-coredump/systemd-coredump/stacktrace.c
+++ b/src/grp-coredump/systemd-coredump/stacktrace.c
@@ -20,12 +20,12 @@
 #include <dwarf.h>
 #include <elfutils/libdwfl.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "stacktrace.h"