fix

92 files changed, 465 insertions, 465 deletions

diff --git a/src/libsystemd/src/sd-bus/bus-bloom.c b/src/libsystemd/src/sd-bus/bus-bloom.c
index 112769fcb6..d8bc9172f2 100644
--- a/src/libsystemd/src/sd-bus/bus-bloom.c
+++ b/src/libsystemd/src/sd-bus/bus-bloom.c
@@ -18,8 +18,8 @@
 ***/
 
 #include "bus-bloom.h"
-#include "siphash24.h"
-#include "util.h"
+#include "basic/siphash24.h"
+#include "basic/util.h"
 
 static inline void set_bit(uint64_t filter[], unsigned long b) {
         filter[b >> 6] |= 1ULL << (b & 63);
diff --git a/src/libsystemd/src/sd-bus/bus-container.c b/src/libsystemd/src/sd-bus/bus-container.c
index 3191d27ded..8eb0ee31be 100644
--- a/src/libsystemd/src/sd-bus/bus-container.c
+++ b/src/libsystemd/src/sd-bus/bus-container.c
@@ -23,9 +23,9 @@
 #include "bus-container.h"
 #include "bus-internal.h"
 #include "bus-socket.h"
-#include "fd-util.h"
-#include "process-util.h"
-#include "util.h"
+#include "basic/fd-util.h"
+#include "basic/process-util.h"
+#include "basic/util.h"
 
 int bus_container_connect_socket(sd_bus *b) {
         _cleanup_close_pair_ int pair[2] = { -1, -1 };
diff --git a/src/libsystemd/src/sd-bus/bus-control.c b/src/libsystemd/src/sd-bus/bus-control.c
index 00de530d58..33b5dbcda0 100644
--- a/src/libsystemd/src/sd-bus/bus-control.c
+++ b/src/libsystemd/src/sd-bus/bus-control.c
@@ -26,17 +26,17 @@
 
 #include <systemd/sd-bus.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-bloom.h"
 #include "bus-control.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-util.h"
-#include "capability-util.h"
-#include "stdio-util.h"
-#include "string-util.h"
-#include "strv.h"
-#include "user-util.h"
+#include "basic/capability-util.h"
+#include "basic/stdio-util.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/user-util.h"
 
 _public_ int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
         int r;
diff --git a/src/libsystemd/src/sd-bus/bus-convenience.c b/src/libsystemd/src/sd-bus/bus-convenience.c
index 2d06bf541f..78ef116fa1 100644
--- a/src/libsystemd/src/sd-bus/bus-convenience.c
+++ b/src/libsystemd/src/sd-bus/bus-convenience.c
@@ -22,7 +22,7 @@
 #include "bus-signature.h"
 #include "bus-type.h"
 #include "bus-util.h"
-#include "string-util.h"
+#include "basic/string-util.h"
 
 _public_ int sd_bus_emit_signal(
                 sd_bus *bus,
diff --git a/src/libsystemd/src/sd-bus/bus-creds.c b/src/libsystemd/src/sd-bus/bus-creds.c
index c4f693dee9..72723f6cc2 100644
--- a/src/libsystemd/src/sd-bus/bus-creds.c
+++ b/src/libsystemd/src/sd-bus/bus-creds.c
@@ -20,25 +20,25 @@
 #include <linux/capability.h>
 #include <stdlib.h>
 
-#include "alloc-util.h"
-#include "audit-util.h"
+#include "basic/alloc-util.h"
+#include "basic/audit-util.h"
 #include "bus-creds.h"
-#include "bus-label.h"
+#include "basic/bus-label.h"
 #include "bus-message.h"
 #include "bus-util.h"
-#include "capability-util.h"
-#include "cgroup-util.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "formats-util.h"
-#include "hexdecoct.h"
-#include "parse-util.h"
-#include "process-util.h"
-#include "string-util.h"
-#include "strv.h"
-#include "terminal-util.h"
-#include "user-util.h"
-#include "util.h"
+#include "basic/capability-util.h"
+#include "basic/cgroup-util.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/formats-util.h"
+#include "basic/hexdecoct.h"
+#include "basic/parse-util.h"
+#include "basic/process-util.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/terminal-util.h"
+#include "basic/user-util.h"
+#include "basic/util.h"
 
 enum {
         CAP_OFFSET_INHERITABLE = 0,
diff --git a/src/libsystemd/src/sd-bus/bus-dump.c b/src/libsystemd/src/sd-bus/bus-dump.c
index 21a6b20a11..ed24e48495 100644
--- a/src/libsystemd/src/sd-bus/bus-dump.c
+++ b/src/libsystemd/src/sd-bus/bus-dump.c
@@ -17,21 +17,21 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-dump.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-type.h"
-#include "cap-list.h"
-#include "capability-util.h"
-#include "fileio.h"
-#include "formats-util.h"
-#include "locale-util.h"
-#include "macro.h"
-#include "string-util.h"
-#include "strv.h"
-#include "terminal-util.h"
-#include "util.h"
+#include "basic/cap-list.h"
+#include "basic/capability-util.h"
+#include "basic/fileio.h"
+#include "basic/formats-util.h"
+#include "basic/locale-util.h"
+#include "basic/macro.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/terminal-util.h"
+#include "basic/util.h"
 
 static char *indent(unsigned level, unsigned flags) {
         char *p;
diff --git a/src/libsystemd/src/sd-bus/bus-error.c b/src/libsystemd/src/sd-bus/bus-error.c
index b6bb0c4a83..69d14ba9ae 100644
--- a/src/libsystemd/src/sd-bus/bus-error.c
+++ b/src/libsystemd/src/sd-bus/bus-error.c
@@ -26,11 +26,11 @@
 
 #include <systemd/sd-bus.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-error.h"
-#include "errno-list.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/errno-list.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = {
         SD_BUS_ERROR_MAP("org.freedesktop.DBus.Error.Failed",                           EACCES),
diff --git a/src/libsystemd/src/sd-bus/bus-error.h b/src/libsystemd/src/sd-bus/bus-error.h
index b7aedf406d..0693d9c68c 100644
--- a/src/libsystemd/src/sd-bus/bus-error.h
+++ b/src/libsystemd/src/sd-bus/bus-error.h
@@ -23,7 +23,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 bool bus_error_is_dirty(sd_bus_error *e);
 
diff --git a/src/libsystemd/src/sd-bus/bus-gvariant.h b/src/libsystemd/src/sd-bus/bus-gvariant.h
index 6da637fb05..d9468ee9a8 100644
--- a/src/libsystemd/src/sd-bus/bus-gvariant.h
+++ b/src/libsystemd/src/sd-bus/bus-gvariant.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "macro.h"
+#include "basic/macro.h"
 
 int bus_gvariant_get_size(const char *signature) _pure_;
 int bus_gvariant_get_alignment(const char *signature) _pure_;
diff --git a/src/libsystemd/src/sd-bus/bus-internal.c b/src/libsystemd/src/sd-bus/bus-internal.c
index caca679086..0dc1db607e 100644
--- a/src/libsystemd/src/sd-bus/bus-internal.c
+++ b/src/libsystemd/src/sd-bus/bus-internal.c
@@ -17,11 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-internal.h"
 #include "bus-message.h"
-#include "hexdecoct.h"
-#include "string-util.h"
+#include "basic/hexdecoct.h"
+#include "basic/string-util.h"
 
 bool object_path_is_valid(const char *p) {
         const char *q;
diff --git a/src/libsystemd/src/sd-bus/bus-internal.h b/src/libsystemd/src/sd-bus/bus-internal.h
index 8c4c6fa772..7cf0925876 100644
--- a/src/libsystemd/src/sd-bus/bus-internal.h
+++ b/src/libsystemd/src/sd-bus/bus-internal.h
@@ -27,13 +27,13 @@
 #include "bus-error.h"
 #include "bus-kernel.h"
 #include "bus-match.h"
-#include "hashmap.h"
+#include "basic/hashmap.h"
 #include "kdbus.h"
-#include "list.h"
-#include "prioq.h"
-#include "refcnt.h"
-#include "socket-util.h"
-#include "util.h"
+#include "basic/list.h"
+#include "basic/prioq.h"
+#include "basic/refcnt.h"
+#include "basic/socket-util.h"
+#include "basic/util.h"
 
 struct reply_callback {
         sd_bus_message_handler_t callback;
diff --git a/src/libsystemd/src/sd-bus/bus-introspect.c b/src/libsystemd/src/sd-bus/bus-introspect.c
index 8f93edb8da..63499d8a19 100644
--- a/src/libsystemd/src/sd-bus/bus-introspect.c
+++ b/src/libsystemd/src/sd-bus/bus-introspect.c
@@ -21,10 +21,10 @@
 #include "bus-introspect.h"
 #include "bus-protocol.h"
 #include "bus-signature.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 int introspect_begin(struct introspect *i, bool trusted) {
         assert(i);
diff --git a/src/libsystemd/src/sd-bus/bus-introspect.h b/src/libsystemd/src/sd-bus/bus-introspect.h
index 87ac03b26a..af4ae10682 100644
--- a/src/libsystemd/src/sd-bus/bus-introspect.h
+++ b/src/libsystemd/src/sd-bus/bus-introspect.h
@@ -23,7 +23,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "set.h"
+#include "basic/set.h"
 
 struct introspect {
         FILE *f;
diff --git a/src/libsystemd/src/sd-bus/bus-kernel.c b/src/libsystemd/src/sd-bus/bus-kernel.c
index 59398b841d..6fcbd2b68e 100644
--- a/src/libsystemd/src/sd-bus/bus-kernel.c
+++ b/src/libsystemd/src/sd-bus/bus-kernel.c
@@ -32,24 +32,24 @@
 #include <libgen.h>
 #undef basename
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-bloom.h"
 #include "bus-internal.h"
 #include "bus-kernel.h"
-#include "bus-label.h"
+#include "basic/bus-label.h"
 #include "bus-message.h"
 #include "bus-util.h"
-#include "capability-util.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "formats-util.h"
-#include "memfd-util.h"
-#include "parse-util.h"
-#include "stdio-util.h"
-#include "string-util.h"
-#include "strv.h"
-#include "user-util.h"
-#include "util.h"
+#include "basic/capability-util.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/formats-util.h"
+#include "basic/memfd-util.h"
+#include "basic/parse-util.h"
+#include "basic/stdio-util.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/user-util.h"
+#include "basic/util.h"
 
 #define UNIQUE_NAME_MAX (3+DECIMAL_STR_MAX(uint64_t))
 
diff --git a/src/libsystemd/src/sd-bus/bus-match.c b/src/libsystemd/src/sd-bus/bus-match.c
index 397baf6f33..45790e1ef6 100644
--- a/src/libsystemd/src/sd-bus/bus-match.c
+++ b/src/libsystemd/src/sd-bus/bus-match.c
@@ -17,16 +17,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-internal.h"
 #include "bus-match.h"
 #include "bus-message.h"
 #include "bus-util.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "hexdecoct.h"
-#include "string-util.h"
-#include "strv.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/hexdecoct.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
 
 /* Example:
  *
diff --git a/src/libsystemd/src/sd-bus/bus-match.h b/src/libsystemd/src/sd-bus/bus-match.h
index 3f71720185..a85abcb377 100644
--- a/src/libsystemd/src/sd-bus/bus-match.h
+++ b/src/libsystemd/src/sd-bus/bus-match.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "hashmap.h"
+#include "basic/hashmap.h"
 
 enum bus_match_node_type {
         BUS_MATCH_ROOT,
diff --git a/src/libsystemd/src/sd-bus/bus-message.c b/src/libsystemd/src/sd-bus/bus-message.c
index a9359c1528..9a50808e07 100644
--- a/src/libsystemd/src/sd-bus/bus-message.c
+++ b/src/libsystemd/src/sd-bus/bus-message.c
@@ -23,21 +23,21 @@
 
 #include <systemd/sd-bus.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-gvariant.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-signature.h"
 #include "bus-type.h"
 #include "bus-util.h"
-#include "fd-util.h"
-#include "io-util.h"
-#include "memfd-util.h"
-#include "string-util.h"
-#include "strv.h"
-#include "time-util.h"
-#include "utf8.h"
-#include "util.h"
+#include "basic/fd-util.h"
+#include "basic/io-util.h"
+#include "basic/memfd-util.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/time-util.h"
+#include "basic/utf8.h"
+#include "basic/util.h"
 
 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
 
diff --git a/src/libsystemd/src/sd-bus/bus-message.h b/src/libsystemd/src/sd-bus/bus-message.h
index 6a2c2d533c..6c33343753 100644
--- a/src/libsystemd/src/sd-bus/bus-message.h
+++ b/src/libsystemd/src/sd-bus/bus-message.h
@@ -27,8 +27,8 @@
 
 #include "bus-creds.h"
 #include "bus-protocol.h"
-#include "macro.h"
-#include "time-util.h"
+#include "basic/macro.h"
+#include "basic/time-util.h"
 
 struct bus_container {
         char enclosing;
diff --git a/src/libsystemd/src/sd-bus/bus-objects.c b/src/libsystemd/src/sd-bus/bus-objects.c
index 9bd07ffcab..04d0fc9bc3 100644
--- a/src/libsystemd/src/sd-bus/bus-objects.c
+++ b/src/libsystemd/src/sd-bus/bus-objects.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-internal.h"
 #include "bus-introspect.h"
 #include "bus-message.h"
@@ -26,9 +26,9 @@
 #include "bus-slot.h"
 #include "bus-type.h"
 #include "bus-util.h"
-#include "set.h"
-#include "string-util.h"
-#include "strv.h"
+#include "basic/set.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
 
 static int node_vtable_get_userdata(
                 sd_bus *bus,
diff --git a/src/libsystemd/src/sd-bus/bus-protocol.h b/src/libsystemd/src/sd-bus/bus-protocol.h
index 9d180cb284..931dc21c46 100644
--- a/src/libsystemd/src/sd-bus/bus-protocol.h
+++ b/src/libsystemd/src/sd-bus/bus-protocol.h
@@ -21,7 +21,7 @@
 
 #include <endian.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 /* Packet header */
 
diff --git a/src/libsystemd/src/sd-bus/bus-signature.c b/src/libsystemd/src/sd-bus/bus-signature.c
index 7bc243494a..c11b113186 100644
--- a/src/libsystemd/src/sd-bus/bus-signature.c
+++ b/src/libsystemd/src/sd-bus/bus-signature.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <util.h>
+#include "basic/util.h"
 
 #include "bus-signature.h"
 #include "bus-type.h"
diff --git a/src/libsystemd/src/sd-bus/bus-slot.c b/src/libsystemd/src/sd-bus/bus-slot.c
index 75c1692bf5..96fc3f82c4 100644
--- a/src/libsystemd/src/sd-bus/bus-slot.c
+++ b/src/libsystemd/src/sd-bus/bus-slot.c
@@ -19,11 +19,11 @@
 
 #include <systemd/sd-bus.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-control.h"
 #include "bus-objects.h"
 #include "bus-slot.h"
-#include "string-util.h"
+#include "basic/string-util.h"
 
 sd_bus_slot *bus_slot_allocate(
                 sd_bus *bus,
diff --git a/src/libsystemd/src/sd-bus/bus-socket.c b/src/libsystemd/src/sd-bus/bus-socket.c
index 1486d7cd55..e05f6d1b04 100644
--- a/src/libsystemd/src/sd-bus/bus-socket.c
+++ b/src/libsystemd/src/sd-bus/bus-socket.c
@@ -25,22 +25,22 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-daemon.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-socket.h"
-#include "fd-util.h"
-#include "formats-util.h"
-#include "hexdecoct.h"
-#include "macro.h"
-#include "missing.h"
-#include "selinux-util.h"
-#include "signal-util.h"
-#include "stdio-util.h"
-#include "string-util.h"
-#include "user-util.h"
-#include "utf8.h"
-#include "util.h"
+#include "basic/fd-util.h"
+#include "basic/formats-util.h"
+#include "basic/hexdecoct.h"
+#include "basic/macro.h"
+#include "basic/missing.h"
+#include "basic/selinux-util.h"
+#include "basic/signal-util.h"
+#include "basic/stdio-util.h"
+#include "basic/string-util.h"
+#include "basic/user-util.h"
+#include "basic/utf8.h"
+#include "basic/util.h"
 
 #define SNDBUF_SIZE (8*1024*1024)
 
diff --git a/src/libsystemd/src/sd-bus/bus-track.c b/src/libsystemd/src/sd-bus/bus-track.c
index 81e6d22816..f6c800439c 100644
--- a/src/libsystemd/src/sd-bus/bus-track.c
+++ b/src/libsystemd/src/sd-bus/bus-track.c
@@ -19,7 +19,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-internal.h"
 #include "bus-track.h"
 #include "bus-util.h"
diff --git a/src/libsystemd/src/sd-bus/bus-type.h b/src/libsystemd/src/sd-bus/bus-type.h
index 7169b0f765..d81aa20df3 100644
--- a/src/libsystemd/src/sd-bus/bus-type.h
+++ b/src/libsystemd/src/sd-bus/bus-type.h
@@ -23,7 +23,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 bool bus_type_is_valid(char c) _const_;
 bool bus_type_is_valid_in_signature(char c) _const_;
diff --git a/src/libsystemd/src/sd-bus/sd-bus.c b/src/libsystemd/src/sd-bus/sd-bus.c
index d3c194e135..b60ae05394 100644
--- a/src/libsystemd/src/sd-bus/sd-bus.c
+++ b/src/libsystemd/src/sd-bus/sd-bus.c
@@ -27,12 +27,12 @@
 
 #include <systemd/sd-bus.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-container.h"
 #include "bus-control.h"
 #include "bus-internal.h"
 #include "bus-kernel.h"
-#include "bus-label.h"
+#include "basic/bus-label.h"
 #include "bus-message.h"
 #include "bus-objects.h"
 #include "bus-protocol.h"
@@ -41,17 +41,17 @@
 #include "bus-track.h"
 #include "bus-type.h"
 #include "bus-util.h"
-#include "cgroup-util.h"
-#include "def.h"
-#include "fd-util.h"
-#include "hexdecoct.h"
-#include "hostname-util.h"
-#include "macro.h"
-#include "missing.h"
-#include "parse-util.h"
-#include "string-util.h"
-#include "strv.h"
-#include "util.h"
+#include "basic/cgroup-util.h"
+#include "basic/def.h"
+#include "basic/fd-util.h"
+#include "basic/hexdecoct.h"
+#include "basic/hostname-util.h"
+#include "basic/macro.h"
+#include "basic/missing.h"
+#include "basic/parse-util.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/util.h"
 
 #define log_debug_bus_message(m)                                         \
         do {                                                             \
diff --git a/src/libsystemd/src/sd-bus/test-bus-benchmark.c b/src/libsystemd/src/sd-bus/test-bus-benchmark.c
index a222d36bb4..c2484ab4d3 100644
--- a/src/libsystemd/src/sd-bus/test-bus-benchmark.c
+++ b/src/libsystemd/src/sd-bus/test-bus-benchmark.c
@@ -21,14 +21,14 @@
 
 #include <systemd/sd-bus.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-internal.h"
 #include "bus-kernel.h"
 #include "bus-util.h"
-#include "def.h"
-#include "fd-util.h"
-#include "time-util.h"
-#include "util.h"
+#include "basic/def.h"
+#include "basic/fd-util.h"
+#include "basic/time-util.h"
+#include "basic/util.h"
 
 #define MAX_SIZE (2*1024*1024)
 
diff --git a/src/libsystemd/src/sd-bus/test-bus-chat.c b/src/libsystemd/src/sd-bus/test-bus-chat.c
index 1f028d2b23..fc40b365bb 100644
--- a/src/libsystemd/src/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/src/sd-bus/test-bus-chat.c
@@ -24,16 +24,16 @@
 
 #include <systemd/sd-bus.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-error.h"
 #include "bus-internal.h"
 #include "bus-match.h"
 #include "bus-util.h"
-#include "fd-util.h"
-#include "formats-util.h"
-#include "log.h"
-#include "macro.h"
-#include "util.h"
+#include "basic/fd-util.h"
+#include "basic/formats-util.h"
+#include "basic/log.h"
+#include "basic/macro.h"
+#include "basic/util.h"
 
 static int match_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
         log_info("Match triggered! interface=%s member=%s", strna(sd_bus_message_get_interface(m)), strna(sd_bus_message_get_member(m)));
diff --git a/src/libsystemd/src/sd-bus/test-bus-cleanup.c b/src/libsystemd/src/sd-bus/test-bus-cleanup.c
index bd4a3fbf34..02c186e1d6 100644
--- a/src/libsystemd/src/sd-bus/test-bus-cleanup.c
+++ b/src/libsystemd/src/sd-bus/test-bus-cleanup.c
@@ -24,7 +24,7 @@
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-util.h"
-#include "refcnt.h"
+#include "basic/refcnt.h"
 
 static void test_bus_new(void) {
         _cleanup_(sd_bus_unrefp) sd_bus *bus = NULL;
diff --git a/src/libsystemd/src/sd-bus/test-bus-creds.c b/src/libsystemd/src/sd-bus/test-bus-creds.c
index c58b76c258..0c0bda49ec 100644
--- a/src/libsystemd/src/sd-bus/test-bus-creds.c
+++ b/src/libsystemd/src/sd-bus/test-bus-creds.c
@@ -21,7 +21,7 @@
 
 #include "bus-dump.h"
 #include "bus-util.h"
-#include "cgroup-util.h"
+#include "basic/cgroup-util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL;
diff --git a/src/libsystemd/src/sd-bus/test-bus-error.c b/src/libsystemd/src/sd-bus/test-bus-error.c
index bce3cc31c9..45c039a885 100644
--- a/src/libsystemd/src/sd-bus/test-bus-error.c
+++ b/src/libsystemd/src/sd-bus/test-bus-error.c
@@ -22,7 +22,7 @@
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-util.h"
-#include "errno-list.h"
+#include "basic/errno-list.h"
 
 static void test_error(void) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL, second = SD_BUS_ERROR_NULL;
diff --git a/src/libsystemd/src/sd-bus/test-bus-gvariant.c b/src/libsystemd/src/sd-bus/test-bus-gvariant.c
index 3c9ec9fef0..dd7218ce79 100644
--- a/src/libsystemd/src/sd-bus/test-bus-gvariant.c
+++ b/src/libsystemd/src/sd-bus/test-bus-gvariant.c
@@ -23,14 +23,14 @@
 
 #include <systemd/sd-bus.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-dump.h"
 #include "bus-gvariant.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-util.h"
-#include "macro.h"
-#include "util.h"
+#include "basic/macro.h"
+#include "basic/util.h"
 
 static void test_bus_gvariant_is_fixed_size(void) {
         assert_se(bus_gvariant_is_fixed_size("") > 0);
diff --git a/src/libsystemd/src/sd-bus/test-bus-introspect.c b/src/libsystemd/src/sd-bus/test-bus-introspect.c
index 4425cfae26..b7b2b79f95 100644
--- a/src/libsystemd/src/sd-bus/test-bus-introspect.c
+++ b/src/libsystemd/src/sd-bus/test-bus-introspect.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "bus-introspect.h"
-#include "log.h"
+#include "basic/log.h"
 
 static int prop_get(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error) {
         return -EINVAL;
diff --git a/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c b/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c
index f16e14a310..d5c8e7eba7 100644
--- a/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c
+++ b/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c
@@ -19,12 +19,12 @@
 
 #include <systemd/sd-bus.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-kernel.h"
 #include "bus-util.h"
-#include "fd-util.h"
-#include "log.h"
-#include "util.h"
+#include "basic/fd-util.h"
+#include "basic/log.h"
+#include "basic/util.h"
 
 static int test_match(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
         int *found = userdata;
diff --git a/src/libsystemd/src/sd-bus/test-bus-kernel.c b/src/libsystemd/src/sd-bus/test-bus-kernel.c
index 2a5ba60cc9..c24c66b996 100644
--- a/src/libsystemd/src/sd-bus/test-bus-kernel.c
+++ b/src/libsystemd/src/sd-bus/test-bus-kernel.c
@@ -21,13 +21,13 @@
 
 #include <systemd/sd-bus.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-dump.h"
 #include "bus-kernel.h"
 #include "bus-util.h"
-#include "fd-util.h"
-#include "log.h"
-#include "util.h"
+#include "basic/fd-util.h"
+#include "basic/log.h"
+#include "basic/util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_close_ int bus_ref = -1;
diff --git a/src/libsystemd/src/sd-bus/test-bus-marshal.c b/src/libsystemd/src/sd-bus/test-bus-marshal.c
index 45db4764a0..f8ced127e6 100644
--- a/src/libsystemd/src/sd-bus/test-bus-marshal.c
+++ b/src/libsystemd/src/sd-bus/test-bus-marshal.c
@@ -30,15 +30,15 @@
 
 #include <systemd/sd-bus.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-dump.h"
-#include "bus-label.h"
+#include "basic/bus-label.h"
 #include "bus-message.h"
 #include "bus-util.h"
-#include "fd-util.h"
-#include "hexdecoct.h"
-#include "log.h"
-#include "util.h"
+#include "basic/fd-util.h"
+#include "basic/hexdecoct.h"
+#include "basic/log.h"
+#include "basic/util.h"
 
 static void test_bus_path_encode_unique(void) {
         _cleanup_free_ char *a = NULL, *b = NULL, *c = NULL, *d = NULL, *e = NULL;
diff --git a/src/libsystemd/src/sd-bus/test-bus-match.c b/src/libsystemd/src/sd-bus/test-bus-match.c
index 29c4529f95..4581d986fb 100644
--- a/src/libsystemd/src/sd-bus/test-bus-match.c
+++ b/src/libsystemd/src/sd-bus/test-bus-match.c
@@ -21,8 +21,8 @@
 #include "bus-message.h"
 #include "bus-slot.h"
 #include "bus-util.h"
-#include "log.h"
-#include "macro.h"
+#include "basic/log.h"
+#include "basic/macro.h"
 
 static bool mask[32];
 
diff --git a/src/libsystemd/src/sd-bus/test-bus-objects.c b/src/libsystemd/src/sd-bus/test-bus-objects.c
index e9bb655665..23f131e405 100644
--- a/src/libsystemd/src/sd-bus/test-bus-objects.c
+++ b/src/libsystemd/src/sd-bus/test-bus-objects.c
@@ -22,15 +22,15 @@
 
 #include <systemd/sd-bus.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-dump.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-util.h"
-#include "log.h"
-#include "macro.h"
-#include "strv.h"
-#include "util.h"
+#include "basic/log.h"
+#include "basic/macro.h"
+#include "basic/strv.h"
+#include "basic/util.h"
 
 struct context {
         int fds[2];
diff --git a/src/libsystemd/src/sd-bus/test-bus-server.c b/src/libsystemd/src/sd-bus/test-bus-server.c
index 190410674b..3a53c909f0 100644
--- a/src/libsystemd/src/sd-bus/test-bus-server.c
+++ b/src/libsystemd/src/sd-bus/test-bus-server.c
@@ -24,9 +24,9 @@
 
 #include "bus-internal.h"
 #include "bus-util.h"
-#include "log.h"
-#include "macro.h"
-#include "util.h"
+#include "basic/log.h"
+#include "basic/macro.h"
+#include "basic/util.h"
 
 struct context {
         int fds[2];
diff --git a/src/libsystemd/src/sd-bus/test-bus-signature.c b/src/libsystemd/src/sd-bus/test-bus-signature.c
index 4f4fd093bf..b2651a1824 100644
--- a/src/libsystemd/src/sd-bus/test-bus-signature.c
+++ b/src/libsystemd/src/sd-bus/test-bus-signature.c
@@ -19,8 +19,8 @@
 
 #include "bus-internal.h"
 #include "bus-signature.h"
-#include "log.h"
-#include "string-util.h"
+#include "basic/log.h"
+#include "basic/string-util.h"
 
 int main(int argc, char *argv[]) {
         char prefix[256];
diff --git a/src/libsystemd/src/sd-bus/test-bus-zero-copy.c b/src/libsystemd/src/sd-bus/test-bus-zero-copy.c
index 9e20d67670..e43ce8bc33 100644
--- a/src/libsystemd/src/sd-bus/test-bus-zero-copy.c
+++ b/src/libsystemd/src/sd-bus/test-bus-zero-copy.c
@@ -21,15 +21,15 @@
 
 #include <systemd/sd-bus.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "bus-dump.h"
 #include "bus-kernel.h"
 #include "bus-message.h"
-#include "fd-util.h"
-#include "log.h"
-#include "memfd-util.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/fd-util.h"
+#include "basic/log.h"
+#include "basic/memfd-util.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 #define FIRST_ARRAY 17
 #define SECOND_ARRAY 33
diff --git a/src/libsystemd/src/sd-daemon/sd-daemon.c b/src/libsystemd/src/sd-daemon/sd-daemon.c
index fa92199c43..863c47d2ba 100644
--- a/src/libsystemd/src/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/src/sd-daemon/sd-daemon.c
@@ -33,14 +33,14 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "fs-util.h"
-#include "parse-util.h"
-#include "path-util.h"
-#include "socket-util.h"
-#include "strv.h"
-#include "util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/fs-util.h"
+#include "basic/parse-util.h"
+#include "basic/path-util.h"
+#include "basic/socket-util.h"
+#include "basic/strv.h"
+#include "basic/util.h"
 
 #define SNDBUF_SIZE (8*1024*1024)
 
diff --git a/src/libsystemd/src/sd-device/device-enumerator.c b/src/libsystemd/src/sd-device/device-enumerator.c
index 796728ee0e..db3228d707 100644
--- a/src/libsystemd/src/sd-device/device-enumerator.c
+++ b/src/libsystemd/src/sd-device/device-enumerator.c
@@ -20,16 +20,16 @@
 
 #include <systemd/sd-device.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "device-enumerator-private.h"
 #include "device-util.h"
-#include "dirent-util.h"
-#include "fd-util.h"
-#include "prioq.h"
-#include "set.h"
-#include "string-util.h"
-#include "strv.h"
-#include "util.h"
+#include "basic/dirent-util.h"
+#include "basic/fd-util.h"
+#include "basic/prioq.h"
+#include "basic/set.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/util.h"
 
 #define DEVICE_ENUMERATE_MAX_DEPTH 256
 
diff --git a/src/libsystemd/src/sd-device/device-internal.h b/src/libsystemd/src/sd-device/device-internal.h
index ab222e27de..5e5ae47339 100644
--- a/src/libsystemd/src/sd-device/device-internal.h
+++ b/src/libsystemd/src/sd-device/device-internal.h
@@ -20,8 +20,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "hashmap.h"
-#include "set.h"
+#include "basic/hashmap.h"
+#include "basic/set.h"
 
 struct sd_device {
         uint64_t n_ref;
diff --git a/src/libsystemd/src/sd-device/device-private.c b/src/libsystemd/src/sd-device/device-private.c
index 51cabcb048..f1c2ada066 100644
--- a/src/libsystemd/src/sd-device/device-private.c
+++ b/src/libsystemd/src/sd-device/device-private.c
@@ -24,26 +24,26 @@
 
 #include <systemd/sd-device.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "device-internal.h"
 #include "device-private.h"
 #include "device-util.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "fs-util.h"
-#include "hashmap.h"
-#include "macro.h"
-#include "mkdir.h"
-#include "parse-util.h"
-#include "path-util.h"
-#include "refcnt.h"
-#include "set.h"
-#include "string-table.h"
-#include "string-util.h"
-#include "strv.h"
-#include "strxcpyx.h"
-#include "user-util.h"
-#include "util.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/fs-util.h"
+#include "basic/hashmap.h"
+#include "basic/macro.h"
+#include "basic/mkdir.h"
+#include "basic/parse-util.h"
+#include "basic/path-util.h"
+#include "basic/refcnt.h"
+#include "basic/set.h"
+#include "basic/string-table.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/strxcpyx.h"
+#include "basic/user-util.h"
+#include "basic/util.h"
 
 int device_add_property(sd_device *device, const char *key, const char *value) {
         int r;
diff --git a/src/libsystemd/src/sd-device/device-util.h b/src/libsystemd/src/sd-device/device-util.h
index 5b42e11de6..a8aca6d8f4 100644
--- a/src/libsystemd/src/sd-device/device-util.h
+++ b/src/libsystemd/src/sd-device/device-util.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "util.h"
+#include "basic/util.h"
 
 #define FOREACH_DEVICE_PROPERTY(device, key, value)                \
         for (key = sd_device_get_property_first(device, &(value)); \
diff --git a/src/libsystemd/src/sd-device/sd-device.c b/src/libsystemd/src/sd-device/sd-device.c
index d21a67cd4c..5a7e34a77b 100644
--- a/src/libsystemd/src/sd-device/sd-device.c
+++ b/src/libsystemd/src/sd-device/sd-device.c
@@ -24,23 +24,23 @@
 
 #include <systemd/sd-device.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "device-internal.h"
 #include "device-private.h"
 #include "device-util.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "fs-util.h"
-#include "hashmap.h"
-#include "macro.h"
-#include "parse-util.h"
-#include "path-util.h"
-#include "set.h"
-#include "stat-util.h"
-#include "string-util.h"
-#include "strv.h"
-#include "strxcpyx.h"
-#include "util.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/fs-util.h"
+#include "basic/hashmap.h"
+#include "basic/macro.h"
+#include "basic/parse-util.h"
+#include "basic/path-util.h"
+#include "basic/set.h"
+#include "basic/stat-util.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/strxcpyx.h"
+#include "basic/util.h"
 
 int device_new_aux(sd_device **ret) {
         _cleanup_(sd_device_unrefp) sd_device *device = NULL;
diff --git a/src/libsystemd/src/sd-event/sd-event.c b/src/libsystemd/src/sd-event/sd-event.c
index 7f6f485353..daa1f55717 100644
--- a/src/libsystemd/src/sd-event/sd-event.c
+++ b/src/libsystemd/src/sd-event/sd-event.c
@@ -25,20 +25,20 @@
 #include <systemd/sd-event.h>
 #include <systemd/sd-id128.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "hashmap.h"
-#include "list.h"
-#include "macro.h"
-#include "missing.h"
-#include "prioq.h"
-#include "process-util.h"
-#include "set.h"
-#include "signal-util.h"
-#include "string-table.h"
-#include "string-util.h"
-#include "time-util.h"
-#include "util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/hashmap.h"
+#include "basic/list.h"
+#include "basic/macro.h"
+#include "basic/missing.h"
+#include "basic/prioq.h"
+#include "basic/process-util.h"
+#include "basic/set.h"
+#include "basic/signal-util.h"
+#include "basic/string-table.h"
+#include "basic/string-util.h"
+#include "basic/time-util.h"
+#include "basic/util.h"
 
 #define DEFAULT_ACCURACY_USEC (250 * USEC_PER_MSEC)
 
diff --git a/src/libsystemd/src/sd-event/test-event.c b/src/libsystemd/src/sd-event/test-event.c
index 324ad7ee02..10395f155f 100644
--- a/src/libsystemd/src/sd-event/test-event.c
+++ b/src/libsystemd/src/sd-event/test-event.c
@@ -19,11 +19,11 @@
 
 #include <systemd/sd-event.h>
 
-#include "fd-util.h"
-#include "log.h"
-#include "macro.h"
-#include "signal-util.h"
-#include "util.h"
+#include "basic/fd-util.h"
+#include "basic/log.h"
+#include "basic/macro.h"
+#include "basic/signal-util.h"
+#include "basic/util.h"
 
 static int prepare_handler(sd_event_source *s, void *userdata) {
         log_info("preparing %c", PTR_TO_INT(userdata));
diff --git a/src/libsystemd/src/sd-hwdb/hwdb-internal.h b/src/libsystemd/src/sd-hwdb/hwdb-internal.h
index 8ffb5e5c74..7b32bbd11d 100644
--- a/src/libsystemd/src/sd-hwdb/hwdb-internal.h
+++ b/src/libsystemd/src/sd-hwdb/hwdb-internal.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sparse-endian.h"
-#include "util.h"
+#include "basic/sparse-endian.h"
+#include "basic/util.h"
 
 #define HWDB_SIG { 'K', 'S', 'L', 'P', 'H', 'H', 'R', 'H' }
 
diff --git a/src/libsystemd/src/sd-hwdb/hwdb-util.h b/src/libsystemd/src/sd-hwdb/hwdb-util.h
index 05dc47962b..c3cba2e9a0 100644
--- a/src/libsystemd/src/sd-hwdb/hwdb-util.h
+++ b/src/libsystemd/src/sd-hwdb/hwdb-util.h
@@ -21,6 +21,6 @@
 
 #include <systemd/sd-hwdb.h>
 
-#include "util.h"
+#include "basic/util.h"
 
 bool hwdb_validate(sd_hwdb *hwdb);
diff --git a/src/libsystemd/src/sd-hwdb/sd-hwdb.c b/src/libsystemd/src/sd-hwdb/sd-hwdb.c
index 7dcfe95b87..8127b7c5c6 100644
--- a/src/libsystemd/src/sd-hwdb/sd-hwdb.c
+++ b/src/libsystemd/src/sd-hwdb/sd-hwdb.c
@@ -29,13 +29,13 @@
 
 #include <systemd/sd-hwdb.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "hashmap.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/hashmap.h"
 #include "hwdb-internal.h"
 #include "hwdb-util.h"
-#include "refcnt.h"
-#include "string-util.h"
+#include "basic/refcnt.h"
+#include "basic/string-util.h"
 
 struct sd_hwdb {
         RefCount n_ref;
diff --git a/src/libsystemd/src/sd-id128/sd-id128.c b/src/libsystemd/src/sd-id128/sd-id128.c
index cda3e9f0df..4a227ab6c0 100644
--- a/src/libsystemd/src/sd-id128/sd-id128.c
+++ b/src/libsystemd/src/sd-id128/sd-id128.c
@@ -23,12 +23,12 @@
 
 #include <systemd/sd-id128.h>
 
-#include "fd-util.h"
-#include "hexdecoct.h"
-#include "io-util.h"
-#include "macro.h"
-#include "random-util.h"
-#include "util.h"
+#include "basic/fd-util.h"
+#include "basic/hexdecoct.h"
+#include "basic/io-util.h"
+#include "basic/macro.h"
+#include "basic/random-util.h"
+#include "basic/util.h"
 
 _public_ char *sd_id128_to_string(sd_id128_t id, char s[SD_ID128_STRING_MAX]) {
         unsigned n;
diff --git a/src/libsystemd/src/sd-journal/Makefile b/src/libsystemd/src/sd-journal/Makefile
index 0064892fb5..7ecfe2b7c8 100644
--- a/src/libsystemd/src/sd-journal/Makefile
+++ b/src/libsystemd/src/sd-journal/Makefile
@@ -23,12 +23,12 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-audit_list_includes = -include linux/audit.h -include $(topsrcdir)/src/libbasic/missing.h
+audit_list_includes = -include linux/audit.h -include $(topsrcdir)/src/libbasic/include/basic/missing.h
 ifneq ($(HAVE_AUDIT),)
 audit_list_includes += -include libaudit.h
 endif # HAVE_AUDIT
 
-$(outdir)/audit_type-list.txt: $(call at.path,$(topsrcdir)/src/libbasic/missing.h)
+$(outdir)/audit_type-list.txt: $(call at.path,$(topsrcdir)/src/libbasic/include/basic/missing.h)
 	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM $(audit_list_includes) - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@
 
 $(outdir)/audit_type-to-name.h: $(outdir)/audit_type-list.txt
diff --git a/src/libsystemd/src/sd-journal/audit-type.c b/src/libsystemd/src/sd-journal/audit-type.c
index 71e8790ca8..330e0b5d9d 100644
--- a/src/libsystemd/src/sd-journal/audit-type.c
+++ b/src/libsystemd/src/sd-journal/audit-type.c
@@ -23,7 +23,7 @@
 #  include <libaudit.h>
 #endif
 
-#include "missing.h"
+#include "basic/missing.h"
 #include "audit-type.h"
 #include "audit_type-to-name.h"
-#include "macro.h"
+#include "basic/macro.h"
diff --git a/src/libsystemd/src/sd-journal/audit-type.h b/src/libsystemd/src/sd-journal/audit-type.h
index 1dd2163707..8b96e2e466 100644
--- a/src/libsystemd/src/sd-journal/audit-type.h
+++ b/src/libsystemd/src/sd-journal/audit-type.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "macro.h"
+#include "basic/macro.h"
 
 const char *audit_type_to_string(int type);
 int audit_type_from_string(const char *s);
diff --git a/src/libsystemd/src/sd-journal/catalog.c b/src/libsystemd/src/sd-journal/catalog.c
index 70838d958c..173f320f40 100644
--- a/src/libsystemd/src/sd-journal/catalog.c
+++ b/src/libsystemd/src/sd-journal/catalog.c
@@ -27,21 +27,21 @@
 
 #include <systemd/sd-id128.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "catalog.h"
-#include "conf-files.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "hashmap.h"
-#include "log.h"
-#include "mkdir.h"
-#include "path-util.h"
-#include "siphash24.h"
-#include "sparse-endian.h"
-#include "strbuf.h"
-#include "string-util.h"
-#include "strv.h"
-#include "util.h"
+#include "basic/conf-files.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/hashmap.h"
+#include "basic/log.h"
+#include "basic/mkdir.h"
+#include "basic/path-util.h"
+#include "basic/siphash24.h"
+#include "basic/sparse-endian.h"
+#include "basic/strbuf.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/util.h"
 
 const char * const catalog_file_dirs[] = {
         "/usr/local/lib/systemd/catalog/",
diff --git a/src/libsystemd/src/sd-journal/catalog.h b/src/libsystemd/src/sd-journal/catalog.h
index b621de3068..fa60757723 100644
--- a/src/libsystemd/src/sd-journal/catalog.h
+++ b/src/libsystemd/src/sd-journal/catalog.h
@@ -23,8 +23,8 @@
 
 #include <systemd/sd-id128.h>
 
-#include "hashmap.h"
-#include "strbuf.h"
+#include "basic/hashmap.h"
+#include "basic/strbuf.h"
 
 int catalog_import_file(Hashmap *h, const char *path);
 int catalog_update(const char* database, const char* root, const char* const* dirs);
diff --git a/src/libsystemd/src/sd-journal/compress.c b/src/libsystemd/src/sd-journal/compress.c
index ba734b5561..f763ceeac8 100644
--- a/src/libsystemd/src/sd-journal/compress.c
+++ b/src/libsystemd/src/sd-journal/compress.c
@@ -32,16 +32,16 @@
 #include <lz4frame.h>
 #endif
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "compress.h"
-#include "fd-util.h"
-#include "io-util.h"
+#include "basic/fd-util.h"
+#include "basic/io-util.h"
 #include "journal-def.h"
-#include "macro.h"
-#include "sparse-endian.h"
-#include "string-table.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/macro.h"
+#include "basic/sparse-endian.h"
+#include "basic/string-table.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 #ifdef HAVE_LZ4
 DEFINE_TRIVIAL_CLEANUP_FUNC(LZ4F_compressionContext_t, LZ4F_freeCompressionContext);
diff --git a/src/libsystemd/src/sd-journal/fsprg.h b/src/libsystemd/src/sd-journal/fsprg.h
index 829b56e240..ef6d34fb4e 100644
--- a/src/libsystemd/src/sd-journal/fsprg.h
+++ b/src/libsystemd/src/sd-journal/fsprg.h
@@ -26,8 +26,8 @@
 #include <inttypes.h>
 #include <sys/types.h>
 
-#include "macro.h"
-#include "util.h"
+#include "basic/macro.h"
+#include "basic/util.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/libsystemd/src/sd-journal/journal-authenticate.c b/src/libsystemd/src/sd-journal/journal-authenticate.c
index d8af113d3f..ecdbdb08b5 100644
--- a/src/libsystemd/src/sd-journal/journal-authenticate.c
+++ b/src/libsystemd/src/sd-journal/journal-authenticate.c
@@ -20,10 +20,10 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#include "fd-util.h"
+#include "basic/fd-util.h"
 #include "fsprg.h"
 #include "gcrypt-util.h"
-#include "hexdecoct.h"
+#include "basic/hexdecoct.h"
 #include "journal-authenticate.h"
 #include "journal-def.h"
 #include "journal-file.h"
diff --git a/src/libsystemd/src/sd-journal/journal-def.h b/src/libsystemd/src/sd-journal/journal-def.h
index a0a052ce4f..86c843905a 100644
--- a/src/libsystemd/src/sd-journal/journal-def.h
+++ b/src/libsystemd/src/sd-journal/journal-def.h
@@ -21,8 +21,8 @@
 
 #include <systemd/sd-id128.h>
 
-#include "macro.h"
-#include "sparse-endian.h"
+#include "basic/macro.h"
+#include "basic/sparse-endian.h"
 
 /*
  * If you change this file you probably should also change its documentation:
diff --git a/src/libsystemd/src/sd-journal/journal-file.c b/src/libsystemd/src/sd-journal/journal-file.c
index 13db5c53de..f626ea0ee9 100644
--- a/src/libsystemd/src/sd-journal/journal-file.c
+++ b/src/libsystemd/src/sd-journal/journal-file.c
@@ -27,22 +27,22 @@
 #include <sys/uio.h>
 #include <unistd.h>
 
-#include "alloc-util.h"
-#include "btrfs-util.h"
-#include "chattr-util.h"
+#include "basic/alloc-util.h"
+#include "basic/btrfs-util.h"
+#include "basic/chattr-util.h"
 #include "compress.h"
-#include "fd-util.h"
+#include "basic/fd-util.h"
 #include "journal-authenticate.h"
 #include "journal-def.h"
 #include "journal-file.h"
 #include "lookup3.h"
-#include "parse-util.h"
-#include "path-util.h"
-#include "random-util.h"
+#include "basic/parse-util.h"
+#include "basic/path-util.h"
+#include "basic/random-util.h"
 #include <systemd/sd-event.h>
-#include "set.h"
-#include "string-util.h"
-#include "xattr-util.h"
+#include "basic/set.h"
+#include "basic/string-util.h"
+#include "basic/xattr-util.h"
 
 #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem))
 #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem))
diff --git a/src/libsystemd/src/sd-journal/journal-file.h b/src/libsystemd/src/sd-journal/journal-file.h
index e48e98f424..366d168166 100644
--- a/src/libsystemd/src/sd-journal/journal-file.h
+++ b/src/libsystemd/src/sd-journal/journal-file.h
@@ -27,12 +27,12 @@
 
 #include <systemd/sd-id128.h>
 
-#include "hashmap.h"
+#include "basic/hashmap.h"
 #include "journal-def.h"
-#include "macro.h"
+#include "basic/macro.h"
 #include "mmap-cache.h"
 #include <systemd/sd-event.h>
-#include "sparse-endian.h"
+#include "basic/sparse-endian.h"
 
 typedef struct JournalMetrics {
         /* For all these: -1 means "pick automatically", and 0 means "no limit enforced" */
diff --git a/src/libsystemd/src/sd-journal/journal-internal.h b/src/libsystemd/src/sd-journal/journal-internal.h
index d8eb11ad06..ff6bf6f2b4 100644
--- a/src/libsystemd/src/sd-journal/journal-internal.h
+++ b/src/libsystemd/src/sd-journal/journal-internal.h
@@ -26,11 +26,11 @@
 #include <systemd/sd-id128.h>
 #include <systemd/sd-journal.h>
 
-#include "hashmap.h"
+#include "basic/hashmap.h"
 #include "journal-def.h"
 #include "journal-file.h"
-#include "list.h"
-#include "set.h"
+#include "basic/list.h"
+#include "basic/set.h"
 
 typedef struct Match Match;
 typedef struct Location Location;
diff --git a/src/libsystemd/src/sd-journal/journal-send.c b/src/libsystemd/src/sd-journal/journal-send.c
index 5a49211f85..7197758289 100644
--- a/src/libsystemd/src/sd-journal/journal-send.c
+++ b/src/libsystemd/src/sd-journal/journal-send.c
@@ -29,15 +29,15 @@
 
 #include <systemd/sd-journal.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "io-util.h"
-#include "memfd-util.h"
-#include "socket-util.h"
-#include "stdio-util.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/io-util.h"
+#include "basic/memfd-util.h"
+#include "basic/socket-util.h"
+#include "basic/stdio-util.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 #define SNDBUF_SIZE (8*1024*1024)
 
diff --git a/src/libsystemd/src/sd-journal/journal-vacuum.c b/src/libsystemd/src/sd-journal/journal-vacuum.c
index cd2676ab63..3ce00bec7d 100644
--- a/src/libsystemd/src/sd-journal/journal-vacuum.c
+++ b/src/libsystemd/src/sd-journal/journal-vacuum.c
@@ -23,16 +23,16 @@
 
 #include <systemd/sd-id128.h>
 
-#include "alloc-util.h"
-#include "dirent-util.h"
-#include "fd-util.h"
+#include "basic/alloc-util.h"
+#include "basic/dirent-util.h"
+#include "basic/fd-util.h"
 #include "journal-def.h"
 #include "journal-file.h"
 #include "journal-vacuum.h"
-#include "parse-util.h"
-#include "string-util.h"
-#include "util.h"
-#include "xattr-util.h"
+#include "basic/parse-util.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
+#include "basic/xattr-util.h"
 
 struct vacuum_info {
         uint64_t usage;
diff --git a/src/libsystemd/src/sd-journal/journal-vacuum.h b/src/libsystemd/src/sd-journal/journal-vacuum.h
index 1e750a2170..c7b38e2da9 100644
--- a/src/libsystemd/src/sd-journal/journal-vacuum.h
+++ b/src/libsystemd/src/sd-journal/journal-vacuum.h
@@ -22,6 +22,6 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include "time-util.h"
+#include "basic/time-util.h"
 
 int journal_directory_vacuum(const char *directory, uint64_t max_use, uint64_t n_max_files, usec_t max_retention_usec, usec_t *oldest_usec, bool verbose);
diff --git a/src/libsystemd/src/sd-journal/journal-verify.c b/src/libsystemd/src/sd-journal/journal-verify.c
index 26572ddd76..3fcae64f92 100644
--- a/src/libsystemd/src/sd-journal/journal-verify.c
+++ b/src/libsystemd/src/sd-journal/journal-verify.c
@@ -22,18 +22,18 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "compress.h"
-#include "fd-util.h"
-#include "fileio.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
 #include "journal-authenticate.h"
 #include "journal-def.h"
 #include "journal-file.h"
 #include "journal-verify.h"
 #include "lookup3.h"
-#include "macro.h"
-#include "terminal-util.h"
-#include "util.h"
+#include "basic/macro.h"
+#include "basic/terminal-util.h"
+#include "basic/util.h"
 
 static void draw_progress(uint64_t p, usec_t *last_usec) {
         unsigned n, i, j, k;
diff --git a/src/libsystemd/src/sd-journal/lookup3.h b/src/libsystemd/src/sd-journal/lookup3.h
index 787921ffbf..28ab5ca4f5 100644
--- a/src/libsystemd/src/sd-journal/lookup3.h
+++ b/src/libsystemd/src/sd-journal/lookup3.h
@@ -3,7 +3,7 @@
 #include <inttypes.h>
 #include <sys/types.h>
 
-#include "macro.h"
+#include "basic/macro.h"
 
 uint32_t jenkins_hashword(const uint32_t *k, size_t length, uint32_t initval) _pure_;
 void jenkins_hashword2(const uint32_t *k, size_t length, uint32_t *pc, uint32_t *pb);
diff --git a/src/libsystemd/src/sd-journal/mmap-cache.c b/src/libsystemd/src/sd-journal/mmap-cache.c
index 6bcd9b6ac8..e488755e67 100644
--- a/src/libsystemd/src/sd-journal/mmap-cache.c
+++ b/src/libsystemd/src/sd-journal/mmap-cache.c
@@ -21,15 +21,15 @@
 #include <stdlib.h>
 #include <sys/mman.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "hashmap.h"
-#include "list.h"
-#include "log.h"
-#include "macro.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/hashmap.h"
+#include "basic/list.h"
+#include "basic/log.h"
+#include "basic/macro.h"
 #include "mmap-cache.h"
-#include "sigbus.h"
-#include "util.h"
+#include "basic/sigbus.h"
+#include "basic/util.h"
 
 typedef struct Window Window;
 typedef struct Context Context;
diff --git a/src/libsystemd/src/sd-journal/sd-journal.c b/src/libsystemd/src/sd-journal/sd-journal.c
index 930486d65f..aada73f8ec 100644
--- a/src/libsystemd/src/sd-journal/sd-journal.c
+++ b/src/libsystemd/src/sd-journal/sd-journal.c
@@ -29,29 +29,29 @@
 
 #include <systemd/sd-journal.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "catalog.h"
 #include "compress.h"
-#include "dirent-util.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/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-def.h"
 #include "journal-file.h"
 #include "journal-internal.h"
-#include "list.h"
+#include "basic/list.h"
 #include "lookup3.h"
-#include "missing.h"
-#include "path-util.h"
-#include "replace-var.h"
-#include "stat-util.h"
-#include "stdio-util.h"
-#include "string-util.h"
-#include "strv.h"
+#include "basic/missing.h"
+#include "basic/path-util.h"
+#include "basic/replace-var.h"
+#include "basic/stat-util.h"
+#include "basic/stdio-util.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
 
 #define JOURNAL_FILES_MAX 7168
 
diff --git a/src/libsystemd/src/sd-login/sd-login.c b/src/libsystemd/src/sd-login/sd-login.c
index 84831d5e95..11686bc90d 100644
--- a/src/libsystemd/src/sd-login/sd-login.c
+++ b/src/libsystemd/src/sd-login/sd-login.c
@@ -25,25 +25,25 @@
 
 #include <systemd/sd-login.h>
 
-#include "alloc-util.h"
-#include "cgroup-util.h"
-#include "dirent-util.h"
-#include "escape.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "formats-util.h"
-#include "fs-util.h"
-#include "hostname-util.h"
-#include "io-util.h"
-#include "login-util.h"
-#include "macro.h"
-#include "parse-util.h"
-#include "path-util.h"
-#include "socket-util.h"
-#include "string-util.h"
-#include "strv.h"
-#include "user-util.h"
-#include "util.h"
+#include "basic/alloc-util.h"
+#include "basic/cgroup-util.h"
+#include "basic/dirent-util.h"
+#include "basic/escape.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/formats-util.h"
+#include "basic/fs-util.h"
+#include "basic/hostname-util.h"
+#include "basic/io-util.h"
+#include "basic/login-util.h"
+#include "basic/macro.h"
+#include "basic/parse-util.h"
+#include "basic/path-util.h"
+#include "basic/socket-util.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/user-util.h"
+#include "basic/util.h"
 
 /* Error codes:
  *
diff --git a/src/libsystemd/src/sd-login/test-login.c b/src/libsystemd/src/sd-login/test-login.c
index 994c76df4a..bec645242a 100644
--- a/src/libsystemd/src/sd-login/test-login.c
+++ b/src/libsystemd/src/sd-login/test-login.c
@@ -22,12 +22,12 @@
 
 #include <systemd/sd-login.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "formats-util.h"
-#include "string-util.h"
-#include "strv.h"
-#include "util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/formats-util.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/util.h"
 
 static void test_login(void) {
         _cleanup_close_pair_ int pair[2] = { -1, -1 };
diff --git a/src/libsystemd/src/sd-netlink/local-addresses.c b/src/libsystemd/src/sd-netlink/local-addresses.c
index 5cceddd03c..5ab5ba6ea6 100644
--- a/src/libsystemd/src/sd-netlink/local-addresses.c
+++ b/src/libsystemd/src/sd-netlink/local-addresses.c
@@ -20,9 +20,9 @@
 
 #include <systemd/sd-netlink.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "local-addresses.h"
-#include "macro.h"
+#include "basic/macro.h"
 
 static int address_compare(const void *_a, const void *_b) {
         const struct local_address *a = _a, *b = _b;
diff --git a/src/libsystemd/src/sd-netlink/local-addresses.h b/src/libsystemd/src/sd-netlink/local-addresses.h
index 1ddc50ace5..7267940520 100644
--- a/src/libsystemd/src/sd-netlink/local-addresses.h
+++ b/src/libsystemd/src/sd-netlink/local-addresses.h
@@ -22,7 +22,7 @@
 
 #include <systemd/sd-netlink.h>
 
-#include "in-addr-util.h"
+#include "basic/in-addr-util.h"
 
 struct local_address {
         int family, ifindex;
diff --git a/src/libsystemd/src/sd-netlink/netlink-internal.h b/src/libsystemd/src/sd-netlink/netlink-internal.h
index 1d29c3a369..ecb3a5eda7 100644
--- a/src/libsystemd/src/sd-netlink/netlink-internal.h
+++ b/src/libsystemd/src/sd-netlink/netlink-internal.h
@@ -23,10 +23,10 @@
 
 #include <systemd/sd-netlink.h>
 
-#include "list.h"
+#include "basic/list.h"
 #include "netlink-types.h"
-#include "prioq.h"
-#include "refcnt.h"
+#include "basic/prioq.h"
+#include "basic/refcnt.h"
 
 #define RTNL_DEFAULT_TIMEOUT ((usec_t) (25 * USEC_PER_SEC))
 
diff --git a/src/libsystemd/src/sd-netlink/netlink-message.c b/src/libsystemd/src/sd-netlink/netlink-message.c
index c00785ea41..115c6416ab 100644
--- a/src/libsystemd/src/sd-netlink/netlink-message.c
+++ b/src/libsystemd/src/sd-netlink/netlink-message.c
@@ -23,15 +23,15 @@
 
 #include <systemd/sd-netlink.h>
 
-#include "alloc-util.h"
-#include "formats-util.h"
-#include "missing.h"
+#include "basic/alloc-util.h"
+#include "basic/formats-util.h"
+#include "basic/missing.h"
 #include "netlink-internal.h"
 #include "netlink-types.h"
 #include "netlink-util.h"
-#include "refcnt.h"
-#include "socket-util.h"
-#include "util.h"
+#include "basic/refcnt.h"
+#include "basic/socket-util.h"
+#include "basic/util.h"
 
 #define GET_CONTAINER(m, i) ((i) < (m)->n_containers ? (struct rtattr*)((uint8_t*)(m)->hdr + (m)->containers[i].offset) : NULL)
 #define PUSH_CONTAINER(m, new) (m)->container_offsets[(m)->n_containers++] = (uint8_t*)(new) - (uint8_t*)(m)->hdr;
diff --git a/src/libsystemd/src/sd-netlink/netlink-socket.c b/src/libsystemd/src/sd-netlink/netlink-socket.c
index d28a413c65..4b7037720d 100644
--- a/src/libsystemd/src/sd-netlink/netlink-socket.c
+++ b/src/libsystemd/src/sd-netlink/netlink-socket.c
@@ -23,15 +23,15 @@
 
 #include <systemd/sd-netlink.h>
 
-#include "alloc-util.h"
-#include "formats-util.h"
-#include "missing.h"
+#include "basic/alloc-util.h"
+#include "basic/formats-util.h"
+#include "basic/missing.h"
 #include "netlink-internal.h"
 #include "netlink-types.h"
 #include "netlink-util.h"
-#include "refcnt.h"
-#include "socket-util.h"
-#include "util.h"
+#include "basic/refcnt.h"
+#include "basic/socket-util.h"
+#include "basic/util.h"
 
 int socket_open(int family) {
         int fd;
diff --git a/src/libsystemd/src/sd-netlink/netlink-types.c b/src/libsystemd/src/sd-netlink/netlink-types.c
index 3a4bac2ced..9f7ddf08d8 100644
--- a/src/libsystemd/src/sd-netlink/netlink-types.c
+++ b/src/libsystemd/src/sd-netlink/netlink-types.c
@@ -30,11 +30,11 @@
 #include <linux/if_link.h>
 #include <linux/if_tunnel.h>
 
-#include "macro.h"
-#include "missing.h"
+#include "basic/macro.h"
+#include "basic/missing.h"
 #include "netlink-types.h"
-#include "string-table.h"
-#include "util.h"
+#include "basic/string-table.h"
+#include "basic/util.h"
 
 /* Maximum ARP IP target defined in kernel */
 #define BOND_MAX_ARP_TARGETS    16
diff --git a/src/libsystemd/src/sd-netlink/netlink-types.h b/src/libsystemd/src/sd-netlink/netlink-types.h
index ecb20bfcdc..53363cdbfa 100644
--- a/src/libsystemd/src/sd-netlink/netlink-types.h
+++ b/src/libsystemd/src/sd-netlink/netlink-types.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "macro.h"
+#include "basic/macro.h"
 
 enum {
         NETLINK_TYPE_UNSPEC,
diff --git a/src/libsystemd/src/sd-netlink/netlink-util.h b/src/libsystemd/src/sd-netlink/netlink-util.h
index e8f932549f..ad723b0f67 100644
--- a/src/libsystemd/src/sd-netlink/netlink-util.h
+++ b/src/libsystemd/src/sd-netlink/netlink-util.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-netlink.h>
 
-#include "util.h"
+#include "basic/util.h"
 
 int rtnl_message_new_synthetic_error(int error, uint32_t serial, sd_netlink_message **ret);
 uint32_t rtnl_message_get_serial(sd_netlink_message *m);
diff --git a/src/libsystemd/src/sd-netlink/rtnl-message.c b/src/libsystemd/src/sd-netlink/rtnl-message.c
index f6482a6157..18c2ad4945 100644
--- a/src/libsystemd/src/sd-netlink/rtnl-message.c
+++ b/src/libsystemd/src/sd-netlink/rtnl-message.c
@@ -23,14 +23,14 @@
 
 #include <systemd/sd-netlink.h>
 
-#include "formats-util.h"
-#include "missing.h"
+#include "basic/formats-util.h"
+#include "basic/missing.h"
 #include "netlink-internal.h"
 #include "netlink-types.h"
 #include "netlink-util.h"
-#include "refcnt.h"
-#include "socket-util.h"
-#include "util.h"
+#include "basic/refcnt.h"
+#include "basic/socket-util.h"
+#include "basic/util.h"
 
 int sd_rtnl_message_route_set_dst_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
         struct rtmsg *rtm;
diff --git a/src/libsystemd/src/sd-netlink/sd-netlink.c b/src/libsystemd/src/sd-netlink/sd-netlink.c
index 3c7488463c..90745ec0c9 100644
--- a/src/libsystemd/src/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/src/sd-netlink/sd-netlink.c
@@ -22,15 +22,15 @@
 
 #include <systemd/sd-netlink.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "hashmap.h"
-#include "macro.h"
-#include "missing.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/hashmap.h"
+#include "basic/macro.h"
+#include "basic/missing.h"
 #include "netlink-internal.h"
 #include "netlink-util.h"
-#include "socket-util.h"
-#include "util.h"
+#include "basic/socket-util.h"
+#include "basic/util.h"
 
 static int sd_netlink_new(sd_netlink **ret) {
         _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
diff --git a/src/libsystemd/src/sd-netlink/test-local-addresses.c b/src/libsystemd/src/sd-netlink/test-local-addresses.c
index e0e28cc0cc..7582a331c8 100644
--- a/src/libsystemd/src/sd-netlink/test-local-addresses.c
+++ b/src/libsystemd/src/sd-netlink/test-local-addresses.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "af-list.h"
-#include "alloc-util.h"
-#include "in-addr-util.h"
+#include "basic/af-list.h"
+#include "basic/alloc-util.h"
+#include "basic/in-addr-util.h"
 #include "local-addresses.h"
 
 static void print_local_addresses(struct local_address *a, unsigned n) {
diff --git a/src/libsystemd/src/sd-netlink/test-netlink.c b/src/libsystemd/src/sd-netlink/test-netlink.c
index aadd0f06a8..704b5a83b2 100644
--- a/src/libsystemd/src/sd-netlink/test-netlink.c
+++ b/src/libsystemd/src/sd-netlink/test-netlink.c
@@ -22,13 +22,13 @@
 
 #include <systemd/sd-netlink.h>
 
-#include "ether-addr-util.h"
-#include "macro.h"
-#include "missing.h"
+#include "basic/ether-addr-util.h"
+#include "basic/macro.h"
+#include "basic/missing.h"
 #include "netlink-util.h"
-#include "socket-util.h"
-#include "string-util.h"
-#include "util.h"
+#include "basic/socket-util.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 static void test_message_link_bridge(sd_netlink *rtnl) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *message = NULL;
diff --git a/src/libsystemd/src/sd-network/network-util.c b/src/libsystemd/src/sd-network/network-util.c
index a0d9b5f1a4..ac488a0bf2 100644
--- a/src/libsystemd/src/sd-network/network-util.c
+++ b/src/libsystemd/src/sd-network/network-util.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alloc-util.h"
-#include "fd-util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
 #include "network-util.h"
-#include "strv.h"
+#include "basic/strv.h"
 
 bool network_is_online(void) {
         _cleanup_free_ char *state = NULL;
diff --git a/src/libsystemd/src/sd-network/sd-network.c b/src/libsystemd/src/sd-network/sd-network.c
index 70083213f9..5c0f9d05e3 100644
--- a/src/libsystemd/src/sd-network/sd-network.c
+++ b/src/libsystemd/src/sd-network/sd-network.c
@@ -25,16 +25,16 @@
 
 #include <systemd/sd-network.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "fs-util.h"
-#include "macro.h"
-#include "parse-util.h"
-#include "stdio-util.h"
-#include "string-util.h"
-#include "strv.h"
-#include "util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/fs-util.h"
+#include "basic/macro.h"
+#include "basic/parse-util.h"
+#include "basic/stdio-util.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/util.h"
 
 _public_ int sd_network_get_operational_state(char **state) {
         _cleanup_free_ char *s = NULL;
diff --git a/src/libsystemd/src/sd-path/sd-path.c b/src/libsystemd/src/sd-path/sd-path.c
index 6d9f3e2a61..f18fd49719 100644
--- a/src/libsystemd/src/sd-path/sd-path.c
+++ b/src/libsystemd/src/sd-path/sd-path.c
@@ -19,16 +19,16 @@
 
 #include <systemd/sd-path.h>
 
-#include "alloc-util.h"
-#include "architecture.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "missing.h"
-#include "path-util.h"
-#include "string-util.h"
-#include "strv.h"
-#include "user-util.h"
-#include "util.h"
+#include "basic/alloc-util.h"
+#include "basic/architecture.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/missing.h"
+#include "basic/path-util.h"
+#include "basic/string-util.h"
+#include "basic/strv.h"
+#include "basic/user-util.h"
+#include "basic/util.h"
 
 static int from_environment(const char *envname, const char *fallback, const char **ret) {
         assert(ret);
diff --git a/src/libsystemd/src/sd-resolve/sd-resolve.c b/src/libsystemd/src/sd-resolve/sd-resolve.c
index 6eacf2b69a..6a1eae4d9f 100644
--- a/src/libsystemd/src/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/src/sd-resolve/sd-resolve.c
@@ -31,13 +31,13 @@
 
 #include <systemd/sd-resolve.h>
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "io-util.h"
-#include "list.h"
-#include "missing.h"
-#include "socket-util.h"
-#include "util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/io-util.h"
+#include "basic/list.h"
+#include "basic/missing.h"
+#include "basic/socket-util.h"
+#include "basic/util.h"
 
 #define WORKERS_MIN 1U
 #define WORKERS_MAX 16U
diff --git a/src/libsystemd/src/sd-resolve/test-resolve.c b/src/libsystemd/src/sd-resolve/test-resolve.c
index 0209cc77e7..ac5cc0c28d 100644
--- a/src/libsystemd/src/sd-resolve/test-resolve.c
+++ b/src/libsystemd/src/sd-resolve/test-resolve.c
@@ -28,10 +28,10 @@
 
 #include <systemd/sd-resolve.h>
 
-#include "alloc-util.h"
-#include "macro.h"
-#include "socket-util.h"
-#include "string-util.h"
+#include "basic/alloc-util.h"
+#include "basic/macro.h"
+#include "basic/socket-util.h"
+#include "basic/string-util.h"
 
 static int getaddrinfo_handler(sd_resolve_query *q, int ret, const struct addrinfo *ai, void *userdata) {
         const struct addrinfo *i;
diff --git a/src/libsystemd/src/sd-utf8/sd-utf8.c b/src/libsystemd/src/sd-utf8/sd-utf8.c
index 77be8e1996..58e4a88f07 100644
--- a/src/libsystemd/src/sd-utf8/sd-utf8.c
+++ b/src/libsystemd/src/sd-utf8/sd-utf8.c
@@ -19,8 +19,8 @@
 
 #include <systemd/sd-utf8.h>
 
-#include "utf8.h"
-#include "util.h"
+#include "basic/utf8.h"
+#include "basic/util.h"
 
 _public_ const char *sd_utf8_is_valid(const char *s) {
         assert_return(s, NULL);