wip

36 files changed, 253 insertions, 236 deletions

diff --git a/src/grp-journal/libjournal-core/Makefile b/src/grp-journal/libjournal-core/Makefile
index 330620bbd9..76e6e9ddee 100644
--- a/src/grp-journal/libjournal-core/Makefile
+++ b/src/grp-journal/libjournal-core/Makefile
@@ -23,36 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libjournal_core_la_SOURCES = \
-	src/journal/journald-kmsg.c \
-	src/journal/journald-kmsg.h \
-	src/journal/journald-syslog.c \
-	src/journal/journald-syslog.h \
-	src/journal/journald-stream.c \
-	src/journal/journald-stream.h \
-	src/journal/journald-server.c \
-	src/journal/journald-server.h \
-	src/journal/journald-console.c \
-	src/journal/journald-console.h \
-	src/journal/journald-wall.c \
-	src/journal/journald-wall.h \
-	src/journal/journald-native.c \
-	src/journal/journald-native.h \
-	src/journal/journald-audit.c \
-	src/journal/journald-audit.h \
-	src/journal/journald-rate-limit.c \
-	src/journal/journald-rate-limit.h \
-	src/journal/journal-internal.h
-
-nodist_libjournal_core_la_SOURCES = \
-	src/journal/journald-gperf.c
-
-libjournal_core_la_LIBADD = \
-	libsystemd-shared.la
-
-noinst_LTLIBRARIES += \
-	libjournal-core.la
-
-sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+nested.subdirs += src
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/libjournal-core/journald-audit.h b/src/grp-journal/libjournal-core/include/journal-core/journald-audit.h
index 98c07e95e4..4d5d359d6a 100644
--- a/src/grp-journal/libjournal-core/journald-audit.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-audit.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/socket-util.h"
+#include "systemd-basic/socket-util.h"
 
 #include "journald-server.h"
 
diff --git a/src/grp-journal/libjournal-core/journald-console.h b/src/grp-journal/libjournal-core/include/journal-core/journald-console.h
index dda07e2c28..dda07e2c28 100644
--- a/src/grp-journal/libjournal-core/journald-console.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-console.h
diff --git a/src/grp-journal/libjournal-core/journald-kmsg.h b/src/grp-journal/libjournal-core/include/journal-core/journald-kmsg.h
index dab49f1e8c..dab49f1e8c 100644
--- a/src/grp-journal/libjournal-core/journald-kmsg.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-kmsg.h
diff --git a/src/grp-journal/libjournal-core/journald-native.h b/src/grp-journal/libjournal-core/include/journal-core/journald-native.h
index c13b80aa4f..c13b80aa4f 100644
--- a/src/grp-journal/libjournal-core/journald-native.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-native.h
diff --git a/src/grp-journal/libjournal-core/journald-rate-limit.h b/src/grp-journal/libjournal-core/include/journal-core/journald-rate-limit.h
index 533dd0f013..4f7764eb1d 100644
--- a/src/grp-journal/libjournal-core/journald-rate-limit.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-rate-limit.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/util.h"
+#include "systemd-basic/util.h"
 
 typedef struct JournalRateLimit JournalRateLimit;
 
diff --git a/src/grp-journal/libjournal-core/journald-server.h b/src/grp-journal/libjournal-core/include/journal-core/journald-server.h
index 5f1af1e50b..a621d707ca 100644
--- a/src/grp-journal/libjournal-core/journald-server.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-server.h
@@ -24,9 +24,9 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/hashmap.h"
-#include "basic/list.h"
 #include "sd-journal/journal-file.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
 
 typedef struct Server Server;
 
diff --git a/src/grp-journal/libjournal-core/journald-stream.h b/src/grp-journal/libjournal-core/include/journal-core/journald-stream.h
index fe88cc34f5..ff38effb1d 100644
--- a/src/grp-journal/libjournal-core/journald-stream.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-stream.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "shared/fdset.h"
+#include "systemd-shared/fdset.h"
 
 typedef struct StdoutStream StdoutStream;
 
diff --git a/src/grp-journal/libjournal-core/journald-syslog.h b/src/grp-journal/libjournal-core/include/journal-core/journald-syslog.h
index 46ad715314..46ad715314 100644
--- a/src/grp-journal/libjournal-core/journald-syslog.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-syslog.h
diff --git a/src/grp-journal/libjournal-core/journald-wall.h b/src/grp-journal/libjournal-core/include/journal-core/journald-wall.h
index ebc2b89fa8..ebc2b89fa8 100644
--- a/src/grp-journal/libjournal-core/journald-wall.h
+++ b/src/grp-journal/libjournal-core/include/journal-core/journald-wall.h
diff --git a/src/grp-journal/libjournal-core/src/Makefile b/src/grp-journal/libjournal-core/src/Makefile
new file mode 100644
index 0000000000..429c6ddbb7
--- /dev/null
+++ b/src/grp-journal/libjournal-core/src/Makefile
@@ -0,0 +1,58 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+libjournal_core_la_SOURCES = \
+	src/journal/journald-kmsg.c \
+	src/journal/journald-kmsg.h \
+	src/journal/journald-syslog.c \
+	src/journal/journald-syslog.h \
+	src/journal/journald-stream.c \
+	src/journal/journald-stream.h \
+	src/journal/journald-server.c \
+	src/journal/journald-server.h \
+	src/journal/journald-console.c \
+	src/journal/journald-console.h \
+	src/journal/journald-wall.c \
+	src/journal/journald-wall.h \
+	src/journal/journald-native.c \
+	src/journal/journald-native.h \
+	src/journal/journald-audit.c \
+	src/journal/journald-audit.h \
+	src/journal/journald-rate-limit.c \
+	src/journal/journald-rate-limit.h \
+	src/journal/journal-internal.h
+
+nodist_libjournal_core_la_SOURCES = \
+	src/journal/journald-gperf.c
+
+libjournal_core_la_LIBADD = \
+	libsystemd-shared.la
+
+noinst_LTLIBRARIES += \
+	libjournal-core.la
+
+sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/libjournal-core/journald-audit.c b/src/grp-journal/libjournal-core/src/journald-audit.c
index 74ad0c017e..65f925fdc4 100644
--- a/src/grp-journal/libjournal-core/journald-audit.c
+++ b/src/grp-journal/libjournal-core/src/journald-audit.c
@@ -17,15 +17,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/io-util.h"
-#include "basic/missing.h"
-#include "basic/string-util.h"
+#include "journal-core/journald-audit.h"
 #include "sd-journal/audit-type.h"
-
-#include "journald-audit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/string-util.h"
 
 typedef struct MapField {
         const char *audit_field;
diff --git a/src/grp-journal/libjournal-core/journald-console.c b/src/grp-journal/libjournal-core/src/journald-console.c
index b1e6828dc2..d6d25841f2 100644
--- a/src/grp-journal/libjournal-core/journald-console.c
+++ b/src/grp-journal/libjournal-core/src/journald-console.c
@@ -21,18 +21,17 @@
 #include <sys/socket.h>
 #include <time.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/io-util.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/stdio-util.h"
-#include "basic/terminal-util.h"
-
-#include "journald-console.h"
-#include "journald-server.h"
+#include "journal-core/journald-console.h"
+#include "journal-core/journald-server.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/terminal-util.h"
 
 static bool prefix_timestamp(void) {
 
diff --git a/src/grp-journal/libjournal-core/journald-gperf.gperf b/src/grp-journal/libjournal-core/src/journald-gperf.gperf
index 7c5c68862a..b56872918d 100644
--- a/src/grp-journal/libjournal-core/journald-gperf.gperf
+++ b/src/grp-journal/libjournal-core/src/journald-gperf.gperf
@@ -2,9 +2,8 @@
 #include <stddef.h>
 #include <sys/socket.h>
 
-#include "shared/conf-parser.h"
-
-#include "journald-server.h"
+#include "journal-core/journald-server.h"
+#include "systemd-shared/conf-parser.h"
 %}
 struct ConfigPerfItem;
 %null_strings
diff --git a/src/grp-journal/libjournal-core/journald-kmsg.c b/src/grp-journal/libjournal-core/src/journald-kmsg.c
index 946318c184..598c2d6c80 100644
--- a/src/grp-journal/libjournal-core/journald-kmsg.c
+++ b/src/grp-journal/libjournal-core/src/journald-kmsg.c
@@ -26,18 +26,17 @@
 #include <libudev.h>
 #include <systemd/sd-messages.h>
 
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/io-util.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-
-#include "journald-kmsg.h"
-#include "journald-server.h"
-#include "journald-syslog.h"
+#include "journal-core/journald-kmsg.h"
+#include "journal-core/journald-server.h"
+#include "journal-core/journald-syslog.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
 
 void server_forward_kmsg(
         Server *s,
diff --git a/src/grp-journal/libjournal-core/journald-native.c b/src/grp-journal/libjournal-core/src/journald-native.c
index 9bfea935ad..536765f414 100644
--- a/src/grp-journal/libjournal-core/journald-native.c
+++ b/src/grp-journal/libjournal-core/src/journald-native.c
@@ -23,23 +23,22 @@
 #include <sys/statvfs.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/io-util.h"
-#include "basic/memfd-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/selinux-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-
-#include "journald-console.h"
-#include "journald-kmsg.h"
-#include "journald-native.h"
-#include "journald-server.h"
-#include "journald-syslog.h"
-#include "journald-wall.h"
+#include "journal-core/journald-console.h"
+#include "journal-core/journald-kmsg.h"
+#include "journal-core/journald-native.h"
+#include "journal-core/journald-server.h"
+#include "journal-core/journald-syslog.h"
+#include "journal-core/journald-wall.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/memfd-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
 
 bool valid_user_field(const char *p, size_t l, bool allow_protected) {
         const char *a;
diff --git a/src/grp-journal/libjournal-core/journald-rate-limit.c b/src/grp-journal/libjournal-core/src/journald-rate-limit.c
index 22603bf8e6..a3f17da16d 100644
--- a/src/grp-journal/libjournal-core/journald-rate-limit.c
+++ b/src/grp-journal/libjournal-core/src/journald-rate-limit.c
@@ -20,14 +20,13 @@
 #include <errno.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hashmap.h"
-#include "basic/list.h"
-#include "basic/random-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-
-#include "journald-rate-limit.h"
+#include "journal-core/journald-rate-limit.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #define POOLS_MAX 5
 #define BUCKETS_MAX 127
diff --git a/src/grp-journal/libjournal-core/journald-server.c b/src/grp-journal/libjournal-core/src/journald-server.c
index c314b74ac2..b3702d99a6 100644
--- a/src/grp-journal/libjournal-core/journald-server.c
+++ b/src/grp-journal/libjournal-core/src/journald-server.c
@@ -32,46 +32,45 @@
 #include <systemd/sd-journal.h>
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/audit-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/dirent-util.h"
-#include "basic/extract-word.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/fs-util.h"
-#include "basic/hashmap.h"
-#include "basic/hostname-util.h"
-#include "basic/io-util.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/process-util.h"
-#include "basic/rm-rf.h"
-#include "basic/selinux-util.h"
-#include "basic/signal-util.h"
-#include "basic/socket-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/user-util.h"
+#include "journal-core/journald-audit.h"
+#include "journal-core/journald-kmsg.h"
+#include "journal-core/journald-native.h"
+#include "journal-core/journald-rate-limit.h"
+#include "journal-core/journald-server.h"
+#include "journal-core/journald-stream.h"
+#include "journal-core/journald-syslog.h"
 #include "sd-journal/journal-authenticate.h"
 #include "sd-journal/journal-file.h"
 #include "sd-journal/journal-internal.h"
 #include "sd-journal/journal-vacuum.h"
-#include "shared/acl-util.h"
-#include "shared/conf-parser.h"
-
-#include "journald-audit.h"
-#include "journald-kmsg.h"
-#include "journald-native.h"
-#include "journald-rate-limit.h"
-#include "journald-server.h"
-#include "journald-stream.h"
-#include "journald-syslog.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/audit-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/acl-util.h"
+#include "systemd-shared/conf-parser.h"
 
 #define USER_JOURNALS_MAX 1024
 
diff --git a/src/grp-journal/libjournal-core/journald-stream.c b/src/grp-journal/libjournal-core/src/journald-stream.c
index e90dfac1cd..1c56cce0fc 100644
--- a/src/grp-journal/libjournal-core/journald-stream.c
+++ b/src/grp-journal/libjournal-core/src/journald-stream.c
@@ -27,26 +27,25 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/io-util.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/selinux-util.h"
-#include "basic/socket-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/syslog-util.h"
-
-#include "journald-console.h"
-#include "journald-kmsg.h"
-#include "journald-server.h"
-#include "journald-stream.h"
-#include "journald-syslog.h"
-#include "journald-wall.h"
+#include "journal-core/journald-console.h"
+#include "journal-core/journald-kmsg.h"
+#include "journal-core/journald-server.h"
+#include "journal-core/journald-stream.h"
+#include "journal-core/journald-syslog.h"
+#include "journal-core/journald-wall.h"
+#include "systemd-basic/alloc-util.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/io-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/syslog-util.h"
 
 #define STDOUT_STREAMS_MAX 4096
 
diff --git a/src/grp-journal/libjournal-core/journald-syslog.c b/src/grp-journal/libjournal-core/src/journald-syslog.c
index bc793235d4..054a44b39f 100644
--- a/src/grp-journal/libjournal-core/journald-syslog.c
+++ b/src/grp-journal/libjournal-core/src/journald-syslog.c
@@ -23,22 +23,21 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/io-util.h"
-#include "basic/process-util.h"
-#include "basic/selinux-util.h"
-#include "basic/socket-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/syslog-util.h"
-
-#include "journald-console.h"
-#include "journald-kmsg.h"
-#include "journald-server.h"
-#include "journald-syslog.h"
-#include "journald-wall.h"
+#include "journal-core/journald-console.h"
+#include "journal-core/journald-kmsg.h"
+#include "journal-core/journald-server.h"
+#include "journal-core/journald-syslog.h"
+#include "journal-core/journald-wall.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/syslog-util.h"
 
 /* Warn once every 30s if we missed syslog message */
 #define WARN_FORWARD_SYSLOG_MISSED_USEC (30 * USEC_PER_SEC)
diff --git a/src/grp-journal/libjournal-core/journald-wall.c b/src/grp-journal/libjournal-core/src/journald-wall.c
index 0c816de55f..242e69f6c3 100644
--- a/src/grp-journal/libjournal-core/journald-wall.c
+++ b/src/grp-journal/libjournal-core/src/journald-wall.c
@@ -17,14 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/formats-util.h"
-#include "basic/process-util.h"
-#include "basic/string-util.h"
-#include "shared/utmp-wtmp.h"
-
-#include "journald-server.h"
-#include "journald-wall.h"
+#include "journal-core/journald-server.h"
+#include "journal-core/journald-wall.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/utmp-wtmp.h"
 
 void server_forward_wall(
                 Server *s,
diff --git a/src/grp-journal/libjournal-core/test-audit-type.c b/src/grp-journal/libjournal-core/test/test-audit-type.c
index 812a3953ea..812a3953ea 100644
--- a/src/grp-journal/libjournal-core/test-audit-type.c
+++ b/src/grp-journal/libjournal-core/test/test-audit-type.c
diff --git a/src/grp-journal/libjournal-core/test-catalog.c b/src/grp-journal/libjournal-core/test/test-catalog.c
index 73ffb16104..8adc3832a6 100644
--- a/src/grp-journal/libjournal-core/test-catalog.c
+++ b/src/grp-journal/libjournal-core/test/test-catalog.c
@@ -25,14 +25,14 @@
 
 #include <systemd/sd-messages.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/string-util.h"
-#include "basic/util.h"
 #include "sd-journal/catalog.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/string-util.h"
+#include "systemd-basic/util.h"
 
 static const char *catalog_dirs[] = {
         CATALOG_DIR,
diff --git a/src/grp-journal/libjournal-core/test-compress-benchmark.c b/src/grp-journal/libjournal-core/test/test-compress-benchmark.c
index 4292e4f8cb..e3f45a5d67 100644
--- a/src/grp-journal/libjournal-core/test-compress-benchmark.c
+++ b/src/grp-journal/libjournal-core/test/test-compress-benchmark.c
@@ -17,13 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/random-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "sd-journal/compress.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 typedef int (compress_t)(const void *src, uint64_t src_size, void *dst,
                          size_t dst_alloc_size, size_t *dst_size);
diff --git a/src/grp-journal/libjournal-core/test-compress.c b/src/grp-journal/libjournal-core/test/test-compress.c
index 5682c28e8c..ad9ca34796 100644
--- a/src/grp-journal/libjournal-core/test-compress.c
+++ b/src/grp-journal/libjournal-core/test/test-compress.c
@@ -21,13 +21,13 @@
 #include <lz4.h>
 #endif
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/macro.h"
-#include "basic/random-util.h"
-#include "basic/util.h"
 #include "sd-journal/compress.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/util.h"
 
 #ifdef HAVE_XZ
 # define XZ_OK 0
diff --git a/src/grp-journal/libjournal-core/test-journal-enum.c b/src/grp-journal/libjournal-core/test/test-journal-enum.c
index 588e12c800..2c529f0544 100644
--- a/src/grp-journal/libjournal-core/test-journal-enum.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-enum.c
@@ -21,9 +21,9 @@
 
 #include <systemd/sd-journal.h>
 
-#include "basic/log.h"
-#include "basic/macro.h"
 #include "sd-journal/journal-internal.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
 
 int main(int argc, char *argv[]) {
         unsigned n = 0;
diff --git a/src/grp-journal/libjournal-core/test-journal-flush.c b/src/grp-journal/libjournal-core/test/test-journal-flush.c
index 66ae8f83c4..0ebec91563 100644
--- a/src/grp-journal/libjournal-core/test-journal-flush.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-flush.c
@@ -21,11 +21,11 @@
 
 #include <systemd/sd-journal.h>
 
-#include "basic/alloc-util.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
 #include "sd-journal/journal-file.h"
 #include "sd-journal/journal-internal.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_free_ char *fn = NULL;
diff --git a/src/grp-journal/libjournal-core/test-journal-init.c b/src/grp-journal/libjournal-core/test/test-journal-init.c
index c5f1d345e9..719b99ab77 100644
--- a/src/grp-journal/libjournal-core/test-journal-init.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-init.c
@@ -19,10 +19,10 @@
 
 #include <systemd/sd-journal.h>
 
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/rm-rf.h"
-#include "basic/util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/util.h"
 
 int main(int argc, char *argv[]) {
         sd_journal *j;
diff --git a/src/grp-journal/libjournal-core/test-journal-interleaving.c b/src/grp-journal/libjournal-core/test/test-journal-interleaving.c
index 004394d18a..4bf541d2b3 100644
--- a/src/grp-journal/libjournal-core/test-journal-interleaving.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-interleaving.c
@@ -23,13 +23,13 @@
 
 #include <systemd/sd-journal.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/rm-rf.h"
-#include "basic/util.h"
 #include "sd-journal/journal-file.h"
 #include "sd-journal/journal-vacuum.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/util.h"
 
 /* This program tests skipping around in a multi-file journal.
  */
diff --git a/src/grp-journal/libjournal-core/test-journal-match.c b/src/grp-journal/libjournal-core/test/test-journal-match.c
index 967e30c46a..4d3731b3be 100644
--- a/src/grp-journal/libjournal-core/test-journal-match.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-match.c
@@ -21,11 +21,11 @@
 
 #include <systemd/sd-journal.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "sd-journal/journal-internal.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_(sd_journal_closep) sd_journal*j = NULL;
diff --git a/src/grp-journal/libjournal-core/test-journal-send.c b/src/grp-journal/libjournal-core/test/test-journal-send.c
index 192e12c887..bca76fc4df 100644
--- a/src/grp-journal/libjournal-core/test-journal-send.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-send.c
@@ -23,7 +23,7 @@
 
 #include <systemd/sd-journal.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 int main(int argc, char *argv[]) {
         char huge[4096*1024];
diff --git a/src/grp-journal/libjournal-core/test-journal-stream.c b/src/grp-journal/libjournal-core/test/test-journal-stream.c
index b71c44ef56..84db1eeeb4 100644
--- a/src/grp-journal/libjournal-core/test-journal-stream.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-stream.c
@@ -22,14 +22,14 @@
 
 #include <systemd/sd-journal.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/rm-rf.h"
-#include "basic/util.h"
 #include "sd-journal/journal-file.h"
 #include "sd-journal/journal-internal.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/util.h"
 
 #define N_ENTRIES 200
 
diff --git a/src/grp-journal/libjournal-core/test-journal-syslog.c b/src/grp-journal/libjournal-core/test/test-journal-syslog.c
index 4756126478..f86cfb2677 100644
--- a/src/grp-journal/libjournal-core/test-journal-syslog.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-syslog.c
@@ -17,11 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-
-#include "journald-syslog.h"
+#include "journal-core/journald-syslog.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
 
 static void test_syslog_parse_identifier(const char* str,
                                          const char *ident, const char*pid, int ret) {
diff --git a/src/grp-journal/libjournal-core/test-journal-verify.c b/src/grp-journal/libjournal-core/test/test-journal-verify.c
index 485315c118..8a1aa45901 100644
--- a/src/grp-journal/libjournal-core/test-journal-verify.c
+++ b/src/grp-journal/libjournal-core/test/test-journal-verify.c
@@ -21,13 +21,13 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/rm-rf.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
 #include "sd-journal/journal-file.h"
 #include "sd-journal/journal-verify.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
 
 #define N_ENTRIES 6000
 #define RANDOM_RANGE 77
diff --git a/src/grp-journal/libjournal-core/test-journal.c b/src/grp-journal/libjournal-core/test/test-journal.c
index 05de15f0c0..0792750a61 100644
--- a/src/grp-journal/libjournal-core/test-journal.c
+++ b/src/grp-journal/libjournal-core/test/test-journal.c
@@ -20,11 +20,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "basic/log.h"
-#include "basic/rm-rf.h"
 #include "sd-journal/journal-authenticate.h"
 #include "sd-journal/journal-file.h"
 #include "sd-journal/journal-vacuum.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/rm-rf.h"
 
 static bool arg_keep = false;
 
diff --git a/src/grp-journal/libjournal-core/test-mmap-cache.c b/src/grp-journal/libjournal-core/test/test-mmap-cache.c
index 3eb5444480..636be8c2e3 100644
--- a/src/grp-journal/libjournal-core/test-mmap-cache.c
+++ b/src/grp-journal/libjournal-core/test/test-mmap-cache.c
@@ -22,11 +22,11 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/macro.h"
-#include "basic/util.h"
 #include "sd-journal/mmap-cache.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/util.h"
 
 int main(int argc, char *argv[]) {
         int x, y, z, r;