fix

30 files changed, 183 insertions, 183 deletions

diff --git a/src/grp-journal/journalctl/journalctl.c b/src/grp-journal/journalctl/journalctl.c
index 3602bd0556..043e437358 100644
--- a/src/grp-journal/journalctl/journalctl.c
+++ b/src/grp-journal/journalctl/journalctl.c
@@ -37,40 +37,40 @@
 #include <systemd/sd-journal.h>
 
 #include "acl-util.h"
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "catalog.h"
-#include "chattr-util.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "fs-util.h"
+#include "basic/chattr-util.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/fs-util.h"
 #include "fsprg.h"
-#include "glob-util.h"
-#include "hostname-util.h"
-#include "io-util.h"
+#include "basic/glob-util.h"
+#include "basic/hostname-util.h"
+#include "basic/io-util.h"
 #include "journal-def.h"
 #include "journal-internal.h"
 #include "journal-qrcode.h"
 #include "journal-vacuum.h"
 #include "journal-verify.h"
-#include "locale-util.h"
-#include "log.h"
+#include "basic/locale-util.h"
+#include "basic/log.h"
 #include "logs-show.h"
-#include "mkdir.h"
+#include "basic/mkdir.h"
 #include "pager.h"
-#include "parse-util.h"
-#include "path-util.h"
-#include "rlimit-util.h"
-#include "set.h"
-#include "sigbus.h"
-#include "strv.h"
-#include "syslog-util.h"
-#include "terminal-util.h"
+#include "basic/parse-util.h"
+#include "basic/path-util.h"
+#include "basic/rlimit-util.h"
+#include "basic/set.h"
+#include "basic/sigbus.h"
+#include "basic/strv.h"
+#include "basic/syslog-util.h"
+#include "basic/terminal-util.h"
 #include "udev.h"
 #include "udev-util.h"
-#include "unit-name.h"
-#include "user-util.h"
+#include "basic/unit-name.h"
+#include "basic/user-util.h"
 
 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
 
diff --git a/src/grp-journal/libjournal-core/cat.c b/src/grp-journal/libjournal-core/cat.c
index 93ab6e7f96..8ab4febd53 100644
--- a/src/grp-journal/libjournal-core/cat.c
+++ b/src/grp-journal/libjournal-core/cat.c
@@ -26,11 +26,11 @@
 
 #include <systemd/sd-journal.h>
 
-#include "fd-util.h"
-#include "parse-util.h"
-#include "string-util.h"
-#include "syslog-util.h"
-#include "util.h"
+#include "basic/fd-util.h"
+#include "basic/parse-util.h"
+#include "basic/string-util.h"
+#include "basic/syslog-util.h"
+#include "basic/util.h"
 
 static const char *arg_identifier = NULL;
 static int arg_priority = LOG_INFO;
diff --git a/src/grp-journal/libjournal-core/journald-audit.c b/src/grp-journal/libjournal-core/journald-audit.c
index a433c91c54..7abd2f819e 100644
--- a/src/grp-journal/libjournal-core/journald-audit.c
+++ b/src/grp-journal/libjournal-core/journald-audit.c
@@ -17,14 +17,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "audit-type.h"
-#include "fd-util.h"
-#include "hexdecoct.h"
-#include "io-util.h"
+#include "basic/fd-util.h"
+#include "basic/hexdecoct.h"
+#include "basic/io-util.h"
 #include "journald-audit.h"
-#include "missing.h"
-#include "string-util.h"
+#include "basic/missing.h"
+#include "basic/string-util.h"
 
 typedef struct MapField {
         const char *audit_field;
diff --git a/src/grp-journal/libjournal-core/journald-audit.h b/src/grp-journal/libjournal-core/journald-audit.h
index 8c7457778c..75a4ceba3a 100644
--- a/src/grp-journal/libjournal-core/journald-audit.h
+++ b/src/grp-journal/libjournal-core/journald-audit.h
@@ -20,7 +20,7 @@
 ***/
 
 #include "journald-server.h"
-#include "socket-util.h"
+#include "basic/socket-util.h"
 
 void server_process_audit_message(Server *s, const void *buffer, size_t buffer_size, const struct ucred *ucred, const union sockaddr_union *sa, socklen_t salen);
 
diff --git a/src/grp-journal/libjournal-core/journald-console.c b/src/grp-journal/libjournal-core/journald-console.c
index fcc9f25814..8d8b3045c1 100644
--- a/src/grp-journal/libjournal-core/journald-console.c
+++ b/src/grp-journal/libjournal-core/journald-console.c
@@ -21,17 +21,17 @@
 #include <sys/socket.h>
 #include <time.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "formats-util.h"
-#include "io-util.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 "journald-console.h"
 #include "journald-server.h"
-#include "parse-util.h"
-#include "process-util.h"
-#include "stdio-util.h"
-#include "terminal-util.h"
+#include "basic/parse-util.h"
+#include "basic/process-util.h"
+#include "basic/stdio-util.h"
+#include "basic/terminal-util.h"
 
 static bool prefix_timestamp(void) {
 
diff --git a/src/grp-journal/libjournal-core/journald-kmsg.c b/src/grp-journal/libjournal-core/journald-kmsg.c
index 3712636de2..cac6845590 100644
--- a/src/grp-journal/libjournal-core/journald-kmsg.c
+++ b/src/grp-journal/libjournal-core/journald-kmsg.c
@@ -26,17 +26,17 @@
 #include "libudev.h"
 #include <systemd/sd-messages.h>
 
-#include "escape.h"
-#include "fd-util.h"
-#include "formats-util.h"
-#include "io-util.h"
+#include "basic/escape.h"
+#include "basic/fd-util.h"
+#include "basic/formats-util.h"
+#include "basic/io-util.h"
 #include "journald-kmsg.h"
 #include "journald-server.h"
 #include "journald-syslog.h"
-#include "parse-util.h"
-#include "process-util.h"
-#include "stdio-util.h"
-#include "string-util.h"
+#include "basic/parse-util.h"
+#include "basic/process-util.h"
+#include "basic/stdio-util.h"
+#include "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/journald-native.c
index 0a1ce205c2..3389d84d9e 100644
--- a/src/grp-journal/libjournal-core/journald-native.c
+++ b/src/grp-journal/libjournal-core/journald-native.c
@@ -23,22 +23,22 @@
 #include <sys/statvfs.h>
 #include <unistd.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "fs-util.h"
-#include "io-util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/fs-util.h"
+#include "basic/io-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 "memfd-util.h"
-#include "parse-util.h"
-#include "path-util.h"
-#include "selinux-util.h"
-#include "socket-util.h"
-#include "string-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"
 
 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/journald-rate-limit.c
index fce799a6ce..60725c4884 100644
--- a/src/grp-journal/libjournal-core/journald-rate-limit.c
+++ b/src/grp-journal/libjournal-core/journald-rate-limit.c
@@ -20,13 +20,13 @@
 #include <errno.h>
 #include <string.h>
 
-#include "alloc-util.h"
-#include "hashmap.h"
+#include "basic/alloc-util.h"
+#include "basic/hashmap.h"
 #include "journald-rate-limit.h"
-#include "list.h"
-#include "random-util.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/list.h"
+#include "basic/random-util.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 #define POOLS_MAX 5
 #define BUCKETS_MAX 127
diff --git a/src/grp-journal/libjournal-core/journald-rate-limit.h b/src/grp-journal/libjournal-core/journald-rate-limit.h
index bb0abb7ee9..533dd0f013 100644
--- a/src/grp-journal/libjournal-core/journald-rate-limit.h
+++ b/src/grp-journal/libjournal-core/journald-rate-limit.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "util.h"
+#include "basic/util.h"
 
 typedef struct JournalRateLimit JournalRateLimit;
 
diff --git a/src/grp-journal/libjournal-core/journald-server.c b/src/grp-journal/libjournal-core/journald-server.c
index cc29443e66..ede7a5bf66 100644
--- a/src/grp-journal/libjournal-core/journald-server.c
+++ b/src/grp-journal/libjournal-core/journald-server.c
@@ -32,19 +32,19 @@
 #include <systemd/sd-messages.h>
 
 #include "acl-util.h"
-#include "alloc-util.h"
-#include "audit-util.h"
-#include "cgroup-util.h"
+#include "basic/alloc-util.h"
+#include "basic/audit-util.h"
+#include "basic/cgroup-util.h"
 #include "conf-parser.h"
-#include "dirent-util.h"
-#include "extract-word.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "formats-util.h"
-#include "fs-util.h"
-#include "hashmap.h"
-#include "hostname-util.h"
-#include "io-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 "journal-authenticate.h"
 #include "journal-file.h"
 #include "journal-internal.h"
@@ -56,20 +56,20 @@
 #include "journald-server.h"
 #include "journald-stream.h"
 #include "journald-syslog.h"
-#include "missing.h"
-#include "mkdir.h"
-#include "parse-util.h"
-#include "proc-cmdline.h"
-#include "process-util.h"
-#include "rm-rf.h"
-#include "selinux-util.h"
-#include "signal-util.h"
-#include "socket-util.h"
-#include "stdio-util.h"
-#include "string-table.h"
-#include "string-util.h"
-#include "user-util.h"
-#include "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 "basic/log.h"
 
 #define USER_JOURNALS_MAX 1024
 
diff --git a/src/grp-journal/libjournal-core/journald-server.h b/src/grp-journal/libjournal-core/journald-server.h
index 65f8c1fc6c..897ee09ca2 100644
--- a/src/grp-journal/libjournal-core/journald-server.h
+++ b/src/grp-journal/libjournal-core/journald-server.h
@@ -26,11 +26,11 @@
 
 typedef struct Server Server;
 
-#include "hashmap.h"
+#include "basic/hashmap.h"
 #include "sd-journal/journal-file.h"
 #include "journald-rate-limit.h"
 #include "journald-stream.h"
-#include "list.h"
+#include "basic/list.h"
 
 typedef enum Storage {
         STORAGE_AUTO,
diff --git a/src/grp-journal/libjournal-core/journald-stream.c b/src/grp-journal/libjournal-core/journald-stream.c
index 99d856301c..4b0062bc9a 100644
--- a/src/grp-journal/libjournal-core/journald-stream.c
+++ b/src/grp-journal/libjournal-core/journald-stream.c
@@ -27,25 +27,25 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
-#include "alloc-util.h"
-#include "dirent-util.h"
-#include "escape.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "io-util.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 "journald-console.h"
 #include "journald-kmsg.h"
 #include "journald-server.h"
 #include "journald-stream.h"
 #include "journald-syslog.h"
 #include "journald-wall.h"
-#include "mkdir.h"
-#include "parse-util.h"
-#include "selinux-util.h"
-#include "socket-util.h"
-#include "stdio-util.h"
-#include "string-util.h"
-#include "syslog-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"
 
 #define STDOUT_STREAMS_MAX 4096
 
diff --git a/src/grp-journal/libjournal-core/journald-stream.h b/src/grp-journal/libjournal-core/journald-stream.h
index db4c67fae3..fed48c2104 100644
--- a/src/grp-journal/libjournal-core/journald-stream.h
+++ b/src/grp-journal/libjournal-core/journald-stream.h
@@ -21,7 +21,7 @@
 
 typedef struct StdoutStream StdoutStream;
 
-#include "fdset.h"
+#include "basic/fdset.h"
 #include "journald-server.h"
 
 int server_open_stdout_socket(Server *s);
diff --git a/src/grp-journal/libjournal-core/journald-syslog.c b/src/grp-journal/libjournal-core/journald-syslog.c
index 86fe81d179..5f632eb07b 100644
--- a/src/grp-journal/libjournal-core/journald-syslog.c
+++ b/src/grp-journal/libjournal-core/journald-syslog.c
@@ -23,21 +23,21 @@
 
 #include <systemd/sd-messages.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "formats-util.h"
-#include "io-util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/formats-util.h"
+#include "basic/io-util.h"
 #include "journald-console.h"
 #include "journald-kmsg.h"
 #include "journald-server.h"
 #include "journald-syslog.h"
 #include "journald-wall.h"
-#include "process-util.h"
-#include "selinux-util.h"
-#include "socket-util.h"
-#include "stdio-util.h"
-#include "string-util.h"
-#include "syslog-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"
 
 /* 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/journald-wall.c
index 4d91fafffe..adbe275d66 100644
--- a/src/grp-journal/libjournal-core/journald-wall.c
+++ b/src/grp-journal/libjournal-core/journald-wall.c
@@ -17,12 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
-#include "formats-util.h"
+#include "basic/alloc-util.h"
+#include "basic/formats-util.h"
 #include "journald-server.h"
 #include "journald-wall.h"
-#include "process-util.h"
-#include "string-util.h"
+#include "basic/process-util.h"
+#include "basic/string-util.h"
 #include "utmp-wtmp.h"
 
 void server_forward_wall(
diff --git a/src/grp-journal/libjournal-core/test-catalog.c b/src/grp-journal/libjournal-core/test-catalog.c
index f939fcdc2a..3a26909136 100644
--- a/src/grp-journal/libjournal-core/test-catalog.c
+++ b/src/grp-journal/libjournal-core/test-catalog.c
@@ -25,14 +25,14 @@
 
 #include <systemd/sd-messages.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "catalog.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "log.h"
-#include "macro.h"
-#include "string-util.h"
-#include "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"
 
 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-compress-benchmark.c
index 6f6d71435d..99d7c7d103 100644
--- a/src/grp-journal/libjournal-core/test-compress-benchmark.c
+++ b/src/grp-journal/libjournal-core/test-compress-benchmark.c
@@ -17,13 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "compress.h"
-#include "macro.h"
-#include "parse-util.h"
-#include "random-util.h"
-#include "string-util.h"
-#include "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"
 
 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-compress.c
index 68c9a4d76c..8cd098cabc 100644
--- a/src/grp-journal/libjournal-core/test-compress.c
+++ b/src/grp-journal/libjournal-core/test-compress.c
@@ -21,13 +21,13 @@
 #include <lz4.h>
 #endif
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "compress.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "macro.h"
-#include "random-util.h"
-#include "util.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/macro.h"
+#include "basic/random-util.h"
+#include "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-journal-enum.c
index 54df59f477..b960c5d8cd 100644
--- a/src/grp-journal/libjournal-core/test-journal-enum.c
+++ b/src/grp-journal/libjournal-core/test-journal-enum.c
@@ -22,8 +22,8 @@
 #include <systemd/sd-journal.h>
 
 #include "journal-internal.h"
-#include "log.h"
-#include "macro.h"
+#include "basic/log.h"
+#include "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-journal-flush.c
index 7e9814f8fa..6364a395b8 100644
--- a/src/grp-journal/libjournal-core/test-journal-flush.c
+++ b/src/grp-journal/libjournal-core/test-journal-flush.c
@@ -21,11 +21,11 @@
 
 #include <systemd/sd-journal.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "journal-file.h"
 #include "journal-internal.h"
-#include "macro.h"
-#include "string-util.h"
+#include "basic/macro.h"
+#include "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-journal-init.c
index e6713034dd..c5f1d345e9 100644
--- a/src/grp-journal/libjournal-core/test-journal-init.c
+++ b/src/grp-journal/libjournal-core/test-journal-init.c
@@ -19,10 +19,10 @@
 
 #include <systemd/sd-journal.h>
 
-#include "log.h"
-#include "parse-util.h"
-#include "rm-rf.h"
-#include "util.h"
+#include "basic/log.h"
+#include "basic/parse-util.h"
+#include "basic/rm-rf.h"
+#include "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-journal-interleaving.c
index d09ef011a6..753c92cdbc 100644
--- a/src/grp-journal/libjournal-core/test-journal-interleaving.c
+++ b/src/grp-journal/libjournal-core/test-journal-interleaving.c
@@ -23,13 +23,13 @@
 
 #include <systemd/sd-journal.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "journal-file.h"
 #include "journal-vacuum.h"
-#include "log.h"
-#include "parse-util.h"
-#include "rm-rf.h"
-#include "util.h"
+#include "basic/log.h"
+#include "basic/parse-util.h"
+#include "basic/rm-rf.h"
+#include "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-journal-match.c
index 5ee2adb827..42043b229f 100644
--- a/src/grp-journal/libjournal-core/test-journal-match.c
+++ b/src/grp-journal/libjournal-core/test-journal-match.c
@@ -21,11 +21,11 @@
 
 #include <systemd/sd-journal.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "journal-internal.h"
-#include "log.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/log.h"
+#include "basic/string-util.h"
+#include "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-journal-send.c
index 169082f9a4..192e12c887 100644
--- a/src/grp-journal/libjournal-core/test-journal-send.c
+++ b/src/grp-journal/libjournal-core/test-journal-send.c
@@ -23,7 +23,7 @@
 
 #include <systemd/sd-journal.h>
 
-#include "macro.h"
+#include "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-journal-stream.c
index 0a1da47861..e5a4a02087 100644
--- a/src/grp-journal/libjournal-core/test-journal-stream.c
+++ b/src/grp-journal/libjournal-core/test-journal-stream.c
@@ -22,14 +22,14 @@
 
 #include <systemd/sd-journal.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "journal-file.h"
 #include "journal-internal.h"
-#include "log.h"
-#include "macro.h"
-#include "parse-util.h"
-#include "rm-rf.h"
-#include "util.h"
+#include "basic/log.h"
+#include "basic/macro.h"
+#include "basic/parse-util.h"
+#include "basic/rm-rf.h"
+#include "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-journal-syslog.c
index 4ff7f3ec2e..91bc0ec99e 100644
--- a/src/grp-journal/libjournal-core/test-journal-syslog.c
+++ b/src/grp-journal/libjournal-core/test-journal-syslog.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "journald-syslog.h"
-#include "macro.h"
-#include "string-util.h"
+#include "basic/macro.h"
+#include "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-journal-verify.c
index 3d2312fc55..7a253c2b85 100644
--- a/src/grp-journal/libjournal-core/test-journal-verify.c
+++ b/src/grp-journal/libjournal-core/test-journal-verify.c
@@ -21,13 +21,13 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "fd-util.h"
+#include "basic/fd-util.h"
 #include "journal-file.h"
 #include "journal-verify.h"
-#include "log.h"
-#include "rm-rf.h"
-#include "terminal-util.h"
-#include "util.h"
+#include "basic/log.h"
+#include "basic/rm-rf.h"
+#include "basic/terminal-util.h"
+#include "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-journal.c
index 2543d64b5b..a8ee802220 100644
--- a/src/grp-journal/libjournal-core/test-journal.c
+++ b/src/grp-journal/libjournal-core/test-journal.c
@@ -23,8 +23,8 @@
 #include "journal-authenticate.h"
 #include "journal-file.h"
 #include "journal-vacuum.h"
-#include "log.h"
-#include "rm-rf.h"
+#include "basic/log.h"
+#include "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-mmap-cache.c
index 009aabf55e..7b7c67cca4 100644
--- a/src/grp-journal/libjournal-core/test-mmap-cache.c
+++ b/src/grp-journal/libjournal-core/test-mmap-cache.c
@@ -22,11 +22,11 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include "fd-util.h"
-#include "fileio.h"
-#include "macro.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/macro.h"
 #include "mmap-cache.h"
-#include "util.h"
+#include "basic/util.h"
 
 int main(int argc, char *argv[]) {
         int x, y, z, r;
diff --git a/src/grp-journal/systemd-journald/journald.c b/src/grp-journal/systemd-journald/journald.c
index 1afe44fa8e..9b4a5d3735 100644
--- a/src/grp-journal/systemd-journald/journald.c
+++ b/src/grp-journal/systemd-journald/journald.c
@@ -22,12 +22,12 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-messages.h>
 
-#include "formats-util.h"
+#include "basic/formats-util.h"
 #include "journal-authenticate.h"
 #include "journald-kmsg.h"
 #include "journald-server.h"
 #include "journald-syslog.h"
-#include "sigbus.h"
+#include "basic/sigbus.h"
 
 int main(int argc, char *argv[]) {
         Server server;