wip

1064 files changed, 5804 insertions, 5631 deletions

diff --git a/build-aux/Makefile.each.tail/70-man.mk b/build-aux/Makefile.each.tail/70-man.mk
index c043674457..3ff381b761 100644
--- a/build-aux/Makefile.each.tail/70-man.mk
+++ b/build-aux/Makefile.each.tail/70-man.mk
@@ -35,7 +35,7 @@ files.src.gen += Makefile-man.mk
 
 man.MANPAGES =
 man.MANPAGES_ALIAS =
--include $(srcdir)/Makefile-man.mk
+#-include $(srcdir)/Makefile-man.mk
 
 _man.XML_FILES = \
 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(man.MANPAGES)}}}}}
diff --git a/build-aux/write-atomic b/build-aux/write-atomic
index efb2551f9f..ab2a417c12 100755
--- a/build-aux/write-atomic
+++ b/build-aux/write-atomic
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 outfile=$1
-tmpfile="$(dirname "$outfile")/.tmp${outfile##*/}"
+tmpfile="$(dirname "$outfile")/.tmp.${outfile##*/}.tmp"
 
 cat > "$tmpfile" || { r=$?; rm -f "$tmpfile"; exit $r; }
 mv -f "$tmpfile" "$outfile"
diff --git a/build-aux/write-ifchanged b/build-aux/write-ifchanged
index 185ceb0039..84dfd6e639 100755
--- a/build-aux/write-ifchanged
+++ b/build-aux/write-ifchanged
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 outfile=$1
-tmpfile="$(dirname "$outfile")/.tmp${outfile##*/}"
+tmpfile="$(dirname "$outfile")/.tmp.${outfile##*/}.tmp"
 
 cat > "$tmpfile" || exit $?
 if cmp -s "$tmpfile" "$outfile"; then
diff --git a/config.mk.in b/config.mk.in
index c1859a5cd2..098d29373d 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -102,40 +102,47 @@ rootlibexecdir=$(rootprefix)/lib/systemd
 rootlibdir=@rootlibdir@
 
 # Libraries we provide
-libbasic.CPPFLAGS                    = -I$(topsrcdir)/src/libbasic/include -I$(topoutdir)/src/libbasic/include
-libbasic.DEPENDS                     =   $(topoutdir)/src/libbasic/src/libbasic.la
-libfirewall.CPPFLAGS                 = -I$(topsrcdir)/src/libfirewall
-libfirewall.DEPENDS                  =   $(topoutdir)/src/libfirewall/libfirewall.la
-libshared.CPPFLAGS                   = -I$(topsrcdir)/src/libshared/include $(libsystemd-internal.CPPFLAGS) -I$(topsrcdir)/src/libudev/src
-libshared.DEPENDS                    =   $(topoutdir)/src/libshared/src/libshared.la
-libsystemd-shared.CPPFLAGS =
-libsystemd-shared.DEPENDS =
-
-libsystemd-internal.CPPFLAGS         = -I$(topsrcdir)/src/libsystemd/src -I$(topoutdir)/src/libsystemd/src $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS)
-libsystemd-internal.DEPENDS          =   $(topoutdir)/src/libsystemd/src/libsystemd-internal.la
-libsystemd-network.CPPFLAGS          = -I$(topsrcdir)/src/libsystemd-network/include
-libsystemd-network.DEPENDS           =   $(topoutdir)/src/libsystemd-network/src/libsystemd-network.la
 libsystemd.CPPFLAGS                  = -I$(topsrcdir)/src/libsystemd/include
 libsystemd.DEPENDS                   =   $(topoutdir)/src/libsystemd/libsystemd.la
+libsystemd-internal.CPPFLAGS         = -I$(topsrcdir)/src/libsystemd/src -I$(topoutdir)/src/libsystemd/src $(libsystemd.CPPFLAGS) $(libsystemd-basic.CPPFLAGS)
+libsystemd-internal.DEPENDS          =   $(topoutdir)/src/libsystemd/src/libsystemd-internal.la
+libsystemd-staging.CPPFLAGS          = -I$(topsrcdir)/src/libsystemd/include-staging $(libsystemd.CPPFLAGS)
+libsystemd-staging.DEPENDS           = $(libsystemd-internal.DEPENDS)
+
+libsystemd-basic.CPPFLAGS            = -I$(topsrcdir)/src/libsystemd-basic/include
+libsystemd-basic.DEPENDS             =   $(topoutdir)/src/libsystemd-basic/src/libsystemd-basic.la
+libsystemd-blkid.CPPFLAGS            = -I$(topsrcdir)/src/libsystemd-blkid/include $(libsystemd-basic.CPPFLAGS) $(BLKID_CFLAGS)
+libsystemd-blkid.DEPENDS             = $(BLKID_LIBS)
+libsystemd-firewall.CPPFLAGS         = -I$(topsrcdir)/src/libsystemd-firewall/include $(libsystemd-basic.CPPFLAGS)
+libsystemd-firewall.DEPENDS          =   $(topoutdir)/src/libsystemd-firewall/src/libsystemd-firewall.la
+libsystemd-microhttpd.CPPFLAGS       = -I$(topsrcdir)/src/libsystemd-microhttpd/include $(libsystemd-basic.CPPFLAGS)
+libsystemd-microhttpd.DEPENDS        =   $(topoutdir)/src/libsystemd-microhttpd/src/libsystemd-microhttpd.la
+libsystemd-gcrypt.CPPFLAGS           = -I$(topsrcdir)/src/libsystemd-gcrypt/include
+libsystemd-gcrypt.DEPENDS            =   $(topoutdir)/src/libsystemd-gcrypt/src/libsystemd-gcrypt.la
+libsystemd-network.CPPFLAGS          = -I$(topsrcdir)/src/libsystemd-network/include $(libsystemd-basic.CPPFLAGS) $(libsystemd-shared.CPPFLAGS)
+libsystemd-network.DEPENDS           =   $(topoutdir)/src/libsystemd-network/src/libsystemd-network.la
+libsystemd-shared.CPPFLAGS           = -I$(topsrcdir)/src/libsystemd-shared/include $(libsystemd-basic.CPPFLAGS) $(libudev-internal.CPPFLAGS)
+libsystemd-shared.DEPENDS            =   $(topoutdir)/src/libsystemd-shared/src/libsystemd-shared.la
 
 libudev.CPPFLAGS                     = -I$(topsrcdir)/src/libudev/include
-libudev.DEPENDS                      =   $(topoutdir)/src/libudev/src/libudev.la
-libudev-internal.CPPFLAGS            = -I$(topsrcdir)/src/libudev/src $(libudev.CPPFLAGS) $(libbasic.CPPFLAGS)
+libudev.DEPENDS                      =   $(topoutdir)/src/libudev/libudev.la
+libudev-internal.CPPFLAGS            = -I$(topsrcdir)/src/libudev/src $(libudev.CPPFLAGS) $(libsystemd-basic.CPPFLAGS) $(libsystemd-staging.CPPFLAGS)
 libudev-internal.DEPENDS             =   $(topoutdir)/src/libudev/src/libudev-internal.la
+
 # -core libs
-libcore.CPPFLAGS                     = -I$(topsrcdir)/src/grp-system/libcore $(libshared.CPPFLAGS)
+libcore.CPPFLAGS                     = -I$(topsrcdir)/src/grp-system/libcore $(libsystemd-shared.CPPFLAGS)
 libcore.DEPENDS                      =   $(topoutdir)/src/grp-system/libcore/libcore.la
 #libbus-proxy-core.CPPFLAGS =
 #libbus-proxy-core.DEPENDS  =
-libjournal-core.CPPFLAGS   = -I$(topsrcdir)/src/grp-journal/libjournal-core $(libsystemd-internal.CPPFLAGS) $(libbasic.CPPFLAGS)
-libjournal-core.DEPENDS    =   $(topoutdir)/src/grp-journal/libjournal-core/libjournal-core.la
+libjournal-core.CPPFLAGS   = -I$(topsrcdir)/src/grp-journal/libjournal-core/include $(libsystemd-internal.CPPFLAGS) $(libsystemd-basic.CPPFLAGS) $(libsystemd-shared.CPPFLAGS)
+libjournal-core.DEPENDS    =   $(topoutdir)/src/grp-journal/libjournal-core/src/libjournal-core.la
 #liblogind-core.CPPFLAGS    =
 #liblogind-core.DEPENDS     =
 libmachine-core.CPPFLAGS   = -I$(topsrcdir)/src/grp-machine/libmachine-core/include
 libmachine-core.DEPENDS    =   $(topoutdir)/src/grp-machine/libmachine-core/src/libmachine-core.la
-libnetworkd-core.CPPFLAGS  = -I$(topsrcdir)/src/grp-network/libnetworkd-core $(libsystemd-internal.CPPFLAGS) $(libsystemd-network.CPPFLAGS) $(libshared.CPPFLAGS) $(libudev-internal.CPPFLAGS)
+libnetworkd-core.CPPFLAGS  = -I$(topsrcdir)/src/grp-network/libnetworkd-core $(libsystemd-internal.CPPFLAGS) $(libsystemd-network.CPPFLAGS) $(libsystemd-shared.CPPFLAGS) $(libudev-internal.CPPFLAGS)
 libnetworkd-core.DEPENDS   =   $(topoutdir)/src/grp-network/libnetworkd-core/libnetworkd-core.la
-libudev-core.CPPFLAGS      = -I$(topoutdir)/src/grp-udev/libudev-core $(libsystemd-network.CPPFLAGS) $(libshared.CPPFLAGS)
+libudev-core.CPPFLAGS      = -I$(topoutdir)/src/grp-udev/libudev-core $(libsystemd-network.CPPFLAGS) $(libsystemd-shared.CPPFLAGS)
 libudev-core.DEPENDS       =   $(topoutdir)/src/grp-udev/libudev-core/libudev-core.la
 libbasic-dns.CPPFLAGS      = -I$(topoutdir)/src/grp-resolve/libbasic-dns -I$(topsrcdir)/src/grp-resolve/libbasic-dns
 libbasic-dns.DEPENDS       =   $(topoutdir)/src/grp-resolve/libbasic-dns/libbasic-dns.la
diff --git a/configure.ac b/configure.ac
index ffe7b0019c..b3dc9debc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,7 +193,6 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
         -fno-common \
         -fdiagnostics-show-option \
         -fno-strict-aliasing \
-        -fvisibility=hidden \
         -fstack-protector \
         -fstack-protector-strong \
         -fPIE \
diff --git a/src/Makefile b/src/Makefile
index 77e29b6c40..23363fd543 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -38,11 +38,13 @@ nested.subdirs += grp-system
 nested.subdirs += grp-timedate
 nested.subdirs += grp-udev
 nested.subdirs += grp-utils
-nested.subdirs += libbasic
-nested.subdirs += libfirewall
-nested.subdirs += libshared
 nested.subdirs += libsystemd
+nested.subdirs += libsystemd-basic
+nested.subdirs += libsystemd-firewall
+nested.subdirs += libsystemd-gcrypt
+nested.subdirs += libsystemd-microhttpd
 nested.subdirs += libsystemd-network
+nested.subdirs += libsystemd-shared
 nested.subdirs += libudev
 nested.subdirs += nss-myhostname
 nested.subdirs += systemd-ask-password
diff --git a/src/busctl/Makefile b/src/busctl/Makefile
index bb41d82b85..9e8f1fac4f 100644
--- a/src/busctl/Makefile
+++ b/src/busctl/Makefile
@@ -32,6 +32,7 @@ busctl_SOURCES = \
 	src/libsystemd/sd-bus/busctl-introspect.h
 
 busctl_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/busctl/busctl-introspect.c b/src/busctl/busctl-introspect.c
index 5c92c55483..6f7c1d2a75 100644
--- a/src/busctl/busctl-introspect.c
+++ b/src/busctl/busctl-introspect.c
@@ -19,10 +19,10 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "basic/xml.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/xml.h"
 
 #include "busctl-introspect.h"
 
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 9e3644728d..cc7ca1ae19 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -21,24 +21,24 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/locale-util.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/set.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-dump.h"
 #include "sd-bus/bus-internal.h"
 #include "sd-bus/bus-signature.h"
 #include "sd-bus/bus-type.h"
-#include "shared/bus-util.h"
-#include "shared/pager.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/pager.h"
 
 #include "busctl-introspect.h"
 
diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile
index 90bbed9fad..58f22611e9 100644
--- a/src/grp-boot/bootctl/Makefile
+++ b/src/grp-boot/bootctl/Makefile
@@ -37,6 +37,7 @@ bootctl_CFLAGS = \
 
 bootctl_LDADD = \
 	libsystemd-shared.la \
+	libsystemd-blkid.la \
 	$(BLKID_LIBS)
 
 bin_PROGRAMS += \
diff --git a/src/grp-boot/bootctl/bootctl.c b/src/grp-boot/bootctl/bootctl.c
index 19c5d1417f..59ebb19bed 100644
--- a/src/grp-boot/bootctl/bootctl.c
+++ b/src/grp-boot/bootctl/bootctl.c
@@ -35,16 +35,16 @@
 #include <sys/statfs.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/blkid-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/locale-util.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "shared/efivars.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-blkid/blkid-util.h"
+#include "systemd-shared/efivars.h"
 
 static int verify_esp(const char *p, uint32_t *part, uint64_t *pstart, uint64_t *psize, sd_id128_t *uuid) {
         struct statfs sfs;
diff --git a/src/grp-boot/systemd-boot/measure.c b/src/grp-boot/systemd-boot/measure.c
index 63f8280107..05adf41778 100644
--- a/src/grp-boot/systemd-boot/measure.c
+++ b/src/grp-boot/systemd-boot/measure.c
@@ -160,7 +160,6 @@ typedef EFI_STATUS(EFIAPI * EFI_TCG2_SUBMIT_COMMAND) (IN EFI_TCG2_PROTOCOL * Thi
                                                       IN UINT32 OutputParameterBlockSize, IN UINT8 * OutputParameterBlock);
 
 typedef EFI_STATUS(EFIAPI * EFI_TCG2_GET_ACTIVE_PCR_BANKS) (IN EFI_TCG2_PROTOCOL * This, OUT UINT32 * ActivePcrBanks);
-
 typedef EFI_STATUS(EFIAPI * EFI_TCG2_SET_ACTIVE_PCR_BANKS) (IN EFI_TCG2_PROTOCOL * This, IN UINT32 ActivePcrBanks);
 
 typedef EFI_STATUS(EFIAPI * EFI_TCG2_GET_RESULT_OF_SET_ACTIVE_PCR_BANKS) (IN EFI_TCG2_PROTOCOL * This,
diff --git a/src/grp-coredump/coredumpctl/Makefile b/src/grp-coredump/coredumpctl/Makefile
index 25a0ee29f2..743f010f7b 100644
--- a/src/grp-coredump/coredumpctl/Makefile
+++ b/src/grp-coredump/coredumpctl/Makefile
@@ -27,6 +27,7 @@ coredumpctl_SOURCES = \
 	src/coredump/coredumpctl.c
 
 coredumpctl_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 bin_PROGRAMS += \
diff --git a/src/grp-coredump/coredumpctl/coredumpctl.c b/src/grp-coredump/coredumpctl/coredumpctl.c
index 19d28f744e..f4adb9c2f8 100644
--- a/src/grp-coredump/coredumpctl/coredumpctl.c
+++ b/src/grp-coredump/coredumpctl/coredumpctl.c
@@ -26,24 +26,24 @@
 
 #include <systemd/sd-journal.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/set.h"
-#include "basic/sigbus.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
 #include "sd-journal/compress.h"
 #include "sd-journal/journal-internal.h"
-#include "shared/pager.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/sigbus.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/pager.h"
 
 static enum {
         ACTION_NONE,
diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile
index edc6a0c054..f27c4a3976 100644
--- a/src/grp-coredump/systemd-coredump/Makefile
+++ b/src/grp-coredump/systemd-coredump/Makefile
@@ -33,6 +33,8 @@ systemd_coredump_CFLAGS = \
 	$(ACL_CFLAGS)
 
 systemd_coredump_LDADD = \
+	libsystemd-internal.la \
+	libjournal-core.la \
 	libsystemd-shared.la \
 	$(ACL_LIBS)
 
@@ -82,7 +84,6 @@ EXTRA_DIST += \
 	sysctl.d/50-coredump.sysctl.in \
 	units/systemd-coredump@.service.in
 
-sd.CPPFLAGS += -I$(topsrcdir)/src/grp-journal/libjournal-core
 sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-coredump/systemd-coredump/coredump-vacuum.c b/src/grp-coredump/systemd-coredump/coredump-vacuum.c
index 7fc6e85436..96fdf7344c 100644
--- a/src/grp-coredump/systemd-coredump/coredump-vacuum.c
+++ b/src/grp-coredump/systemd-coredump/coredump-vacuum.c
@@ -19,15 +19,15 @@
 
 #include <sys/statvfs.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/hashmap.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/time-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "coredump-vacuum.h"
 
diff --git a/src/grp-coredump/systemd-coredump/coredump.c b/src/grp-coredump/systemd-coredump/coredump.c
index dd05326ce0..31127de616 100644
--- a/src/grp-coredump/systemd-coredump/coredump.c
+++ b/src/grp-coredump/systemd-coredump/coredump.c
@@ -32,33 +32,33 @@
 #include <systemd/sd-journal.h>
 #include <systemd/sd-login.h>
 
-#include "basic/alloc-util.h"
-#include "basic/capability-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/copy.h"
-#include "basic/dirent-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/io-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/socket-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "journald-native.h"
+#include "journal-core/journald-native.h"
 #include "sd-journal/compress.h"
-#include "shared/acl-util.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/acl-util.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "coredump-vacuum.h"
 #include "stacktrace.h"
diff --git a/src/grp-coredump/systemd-coredump/stacktrace.c b/src/grp-coredump/systemd-coredump/stacktrace.c
index e51b2986e6..1e59582c67 100644
--- a/src/grp-coredump/systemd-coredump/stacktrace.c
+++ b/src/grp-coredump/systemd-coredump/stacktrace.c
@@ -20,12 +20,12 @@
 #include <dwarf.h>
 #include <elfutils/libdwfl.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "stacktrace.h"
 
diff --git a/src/grp-hostname/hostnamectl/Makefile b/src/grp-hostname/hostnamectl/Makefile
index a36d616a5c..5285beca4b 100644
--- a/src/grp-hostname/hostnamectl/Makefile
+++ b/src/grp-hostname/hostnamectl/Makefile
@@ -29,6 +29,7 @@ hostnamectl_SOURCES = \
 	src/hostname/hostnamectl.c
 
 hostnamectl_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 bin_PROGRAMS += \
diff --git a/src/grp-hostname/hostnamectl/hostnamectl.c b/src/grp-hostname/hostnamectl/hostnamectl.c
index 8a24813934..c5f702087d 100644
--- a/src/grp-hostname/hostnamectl/hostnamectl.c
+++ b/src/grp-hostname/hostnamectl/hostnamectl.c
@@ -26,13 +26,13 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/architecture.h"
-#include "basic/hostname-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/spawn-polkit-agent.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/architecture.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/spawn-polkit-agent.h"
 
 static bool arg_ask_password = true;
 static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
diff --git a/src/grp-hostname/systemd-hostnamed/Makefile b/src/grp-hostname/systemd-hostnamed/Makefile
index 2408c1c47f..cce065ccd4 100644
--- a/src/grp-hostname/systemd-hostnamed/Makefile
+++ b/src/grp-hostname/systemd-hostnamed/Makefile
@@ -28,6 +28,7 @@ systemd_hostnamed_SOURCES = \
 	src/hostname/hostnamed.c
 
 systemd_hostnamed_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
diff --git a/src/grp-hostname/systemd-hostnamed/hostnamed.c b/src/grp-hostname/systemd-hostnamed/hostnamed.c
index 366adbb282..a18658e92e 100644
--- a/src/grp-hostname/systemd-hostnamed/hostnamed.c
+++ b/src/grp-hostname/systemd-hostnamed/hostnamed.c
@@ -22,19 +22,19 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/env-util.h"
-#include "basic/fileio-label.h"
-#include "basic/hostname-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/selinux-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "basic/virt.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fileio-label.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
 
 #define VALID_DEPLOYMENT_CHARS (DIGITS LETTERS "-.:")
 
diff --git a/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/hibernate-resume-generator.c b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/hibernate-resume-generator.c
index 6380c297c2..6774df21c5 100644
--- a/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/hibernate-resume-generator.c
+++ b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/hibernate-resume-generator.c
@@ -20,15 +20,15 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/mkdir.h"
-#include "basic/proc-cmdline.h"
-#include "basic/special.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
-#include "shared/fstab-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/fstab-util.h"
 
 static const char *arg_dest = "/tmp";
 static char *arg_resume_dev = NULL;
diff --git a/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/hibernate-resume.c b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/hibernate-resume.c
index 64d14bf64b..f41c6afef0 100644
--- a/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/hibernate-resume.c
+++ b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/hibernate-resume.c
@@ -21,10 +21,10 @@
 #include <stdio.h>
 #include <sys/stat.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/util.h"
 
 int main(int argc, char *argv[]) {
         struct stat st;
diff --git a/src/grp-initprogs/grp-sleep/systemd-sleep/sleep.c b/src/grp-initprogs/grp-sleep/systemd-sleep/sleep.c
index e9e84bc893..16ae4c7314 100644
--- a/src/grp-initprogs/grp-sleep/systemd-sleep/sleep.c
+++ b/src/grp-initprogs/grp-sleep/systemd-sleep/sleep.c
@@ -24,14 +24,14 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "shared/sleep-config.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/sleep-config.h"
 
 static char* arg_verb = NULL;
 
diff --git a/src/grp-initprogs/systemd-backlight/backlight.c b/src/grp-initprogs/systemd-backlight/backlight.c
index aa8d852024..3fd47ad611 100644
--- a/src/grp-initprogs/systemd-backlight/backlight.c
+++ b/src/grp-initprogs/systemd-backlight/backlight.c
@@ -19,16 +19,16 @@
 
 #include <libudev.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/escape.h"
-#include "basic/fileio.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/udev-util.h"
 
 static struct udev_device *find_pci_or_platform_parent(struct udev_device *device) {
         struct udev_device *parent;
diff --git a/src/grp-initprogs/systemd-binfmt/binfmt.c b/src/grp-initprogs/systemd-binfmt/binfmt.c
index 39bbdb5335..f569d117df 100644
--- a/src/grp-initprogs/systemd-binfmt/binfmt.c
+++ b/src/grp-initprogs/systemd-binfmt/binfmt.c
@@ -25,15 +25,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/conf-files.h"
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 static const char conf_file_dirs[] = CONF_PATHS_NULSTR("binfmt.d");
 
diff --git a/src/grp-initprogs/systemd-detect-virt/detect-virt.c b/src/grp-initprogs/systemd-detect-virt/detect-virt.c
index 06cdab5297..80f4f72fab 100644
--- a/src/grp-initprogs/systemd-detect-virt/detect-virt.c
+++ b/src/grp-initprogs/systemd-detect-virt/detect-virt.c
@@ -22,8 +22,8 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include "basic/util.h"
-#include "basic/virt.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
 
 static bool arg_quiet = false;
 static enum {
diff --git a/src/grp-initprogs/systemd-firstboot/firstboot.c b/src/grp-initprogs/systemd-firstboot/firstboot.c
index 7308e108e8..4ed3c23419 100644
--- a/src/grp-initprogs/systemd-firstboot/firstboot.c
+++ b/src/grp-initprogs/systemd-firstboot/firstboot.c
@@ -22,24 +22,24 @@
 #include <shadow.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/copy.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/hostname-util.h"
-#include "basic/locale-util.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/random-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/time-util.h"
-#include "basic/umask-util.h"
-#include "basic/user-util.h"
-#include "shared/ask-password-api.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/ask-password-api.h"
 
 static char *arg_root = NULL;
 static char *arg_locale = NULL;  /* $LANG */
diff --git a/src/grp-initprogs/systemd-fsck/Makefile b/src/grp-initprogs/systemd-fsck/Makefile
index 8a223a7f70..1f331bca73 100644
--- a/src/grp-initprogs/systemd-fsck/Makefile
+++ b/src/grp-initprogs/systemd-fsck/Makefile
@@ -28,6 +28,7 @@ systemd_fsck_SOURCES = \
 	src/fsck/fsck.c
 
 systemd_fsck_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-initprogs/systemd-fsck/fsck.c b/src/grp-initprogs/systemd-fsck/fsck.c
index 4ca018763f..c33d199ef5 100644
--- a/src/grp-initprogs/systemd-fsck/fsck.c
+++ b/src/grp-initprogs/systemd-fsck/fsck.c
@@ -29,23 +29,23 @@
 
 #include <systemd/sd-bus.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/proc-cmdline.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/socket-util.h"
-#include "basic/special.h"
-#include "basic/stdio-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
+#include "sd-bus/bus-util.h"
 #include "sd-device/device-util.h"
-#include "sd-device/sd-device.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-device.h"
 
 /* exit codes as defined in fsck(8) */
 enum {
diff --git a/src/grp-initprogs/systemd-modules-load/modules-load.c b/src/grp-initprogs/systemd-modules-load/modules-load.c
index d7ea7886c6..13f6ac529d 100644
--- a/src/grp-initprogs/systemd-modules-load/modules-load.c
+++ b/src/grp-initprogs/systemd-modules-load/modules-load.c
@@ -24,15 +24,15 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "basic/conf-files.h"
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/proc-cmdline.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 static char **arg_proc_cmdline_modules = NULL;
 
diff --git a/src/grp-initprogs/systemd-quotacheck/quotacheck.c b/src/grp-initprogs/systemd-quotacheck/quotacheck.c
index 3c2292b0c4..eadd78c9da 100644
--- a/src/grp-initprogs/systemd-quotacheck/quotacheck.c
+++ b/src/grp-initprogs/systemd-quotacheck/quotacheck.c
@@ -23,11 +23,11 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
-#include "basic/proc-cmdline.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 static bool arg_skip = false;
 static bool arg_force = false;
diff --git a/src/grp-initprogs/systemd-random-seed/random-seed.c b/src/grp-initprogs/systemd-random-seed/random-seed.c
index 7fea6069f3..83415ffb4c 100644
--- a/src/grp-initprogs/systemd-random-seed/random-seed.c
+++ b/src/grp-initprogs/systemd-random-seed/random-seed.c
@@ -23,13 +23,13 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/io-util.h"
-#include "basic/log.h"
-#include "basic/mkdir.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #define POOL_SIZE_MIN 512
 
diff --git a/src/grp-initprogs/systemd-rfkill/rfkill.c b/src/grp-initprogs/systemd-rfkill/rfkill.c
index 86779e9ac8..6a463d0f92 100644
--- a/src/grp-initprogs/systemd-rfkill/rfkill.c
+++ b/src/grp-initprogs/systemd-rfkill/rfkill.c
@@ -24,18 +24,18 @@
 #include <libudev.h>
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-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/proc-cmdline.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/alloc-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/proc-cmdline.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/udev-util.h"
 
 #define EXIT_USEC (5 * USEC_PER_SEC)
 
diff --git a/src/grp-initprogs/systemd-sysctl/sysctl.c b/src/grp-initprogs/systemd-sysctl/sysctl.c
index c44aa0aabb..c5d666904d 100644
--- a/src/grp-initprogs/systemd-sysctl/sysctl.c
+++ b/src/grp-initprogs/systemd-sysctl/sysctl.c
@@ -25,17 +25,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/conf-files.h"
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/hashmap.h"
-#include "basic/log.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "shared/sysctl-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/sysctl-util.h"
 
 static char **arg_prefixes = NULL;
 
diff --git a/src/grp-initprogs/systemd-sysusers/sysusers.c b/src/grp-initprogs/systemd-sysusers/sysusers.c
index 55ff36410d..020ddbdf5e 100644
--- a/src/grp-initprogs/systemd-sysusers/sysusers.c
+++ b/src/grp-initprogs/systemd-sysusers/sysusers.c
@@ -24,24 +24,24 @@
 #include <shadow.h>
 #include <utmp.h>
 
-#include "basic/alloc-util.h"
-#include "basic/conf-files.h"
-#include "basic/copy.h"
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/fileio-label.h"
-#include "basic/formats-util.h"
-#include "basic/hashmap.h"
-#include "basic/path-util.h"
-#include "basic/selinux-util.h"
-#include "basic/smack-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
-#include "shared/specifier.h"
-#include "shared/uid-range.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio-label.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/smack-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/specifier.h"
+#include "systemd-shared/uid-range.h"
 
 typedef enum ItemType {
         ADD_USER = 'u',
diff --git a/src/grp-initprogs/systemd-tmpfiles/tmpfiles.c b/src/grp-initprogs/systemd-tmpfiles/tmpfiles.c
index 73f578572f..a371b11734 100644
--- a/src/grp-initprogs/systemd-tmpfiles/tmpfiles.c
+++ b/src/grp-initprogs/systemd-tmpfiles/tmpfiles.c
@@ -37,41 +37,41 @@
 
 #include <linux/fs.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/capability-util.h"
-#include "basic/chattr-util.h"
-#include "basic/conf-files.h"
-#include "basic/copy.h"
-#include "basic/def.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/glob-util.h"
-#include "basic/io-util.h"
-#include "basic/label.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/rm-rf.h"
-#include "basic/selinux-util.h"
-#include "basic/set.h"
-#include "basic/stat-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/umask-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "shared/acl-util.h"
-#include "shared/specifier.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/chattr-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/escape.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/glob-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/acl-util.h"
+#include "systemd-shared/specifier.h"
 
 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates
  * them in the file system. This is intended to be used to create
diff --git a/src/grp-initprogs/systemd-update-done/update-done.c b/src/grp-initprogs/systemd-update-done/update-done.c
index 39d19ec048..79f755b909 100644
--- a/src/grp-initprogs/systemd-update-done/update-done.c
+++ b/src/grp-initprogs/systemd-update-done/update-done.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/fd-util.h"
-#include "basic/io-util.h"
-#include "basic/selinux-util.h"
-#include "basic/util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/util.h"
 
 #define MESSAGE                                                         \
         "This file was created by systemd-update-done. Its only \n"     \
diff --git a/src/grp-initprogs/systemd-update-utmp/Makefile b/src/grp-initprogs/systemd-update-utmp/Makefile
index 506e4840a5..550948589c 100644
--- a/src/grp-initprogs/systemd-update-utmp/Makefile
+++ b/src/grp-initprogs/systemd-update-utmp/Makefile
@@ -35,6 +35,7 @@ systemd_update_utmp_CFLAGS = \
 	$(AUDIT_CFLAGS)
 
 systemd_update_utmp_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la \
 	$(AUDIT_LIBS)
 
diff --git a/src/grp-initprogs/systemd-update-utmp/update-utmp.c b/src/grp-initprogs/systemd-update-utmp/update-utmp.c
index cceb34f60d..ccb8543cfe 100644
--- a/src/grp-initprogs/systemd-update-utmp/update-utmp.c
+++ b/src/grp-initprogs/systemd-update-utmp/update-utmp.c
@@ -27,16 +27,16 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/formats-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/special.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/utmp-wtmp.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/utmp-wtmp.h"
 
 typedef struct Context {
         sd_bus *bus;
diff --git a/src/grp-initprogs/systemd-user-sessions/user-sessions.c b/src/grp-initprogs/systemd-user-sessions/user-sessions.c
index 639c0200e6..3ccb419aee 100644
--- a/src/grp-initprogs/systemd-user-sessions/user-sessions.c
+++ b/src/grp-initprogs/systemd-user-sessions/user-sessions.c
@@ -20,12 +20,12 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "basic/fileio-label.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/selinux-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/fileio-label.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 int main(int argc, char*argv[]) {
 
diff --git a/src/grp-initprogs/systemd-vconsole-setup/vconsole-setup.c b/src/grp-initprogs/systemd-vconsole-setup/vconsole-setup.c
index 87c0c2f066..7edab74051 100644
--- a/src/grp-initprogs/systemd-vconsole-setup/vconsole-setup.c
+++ b/src/grp-initprogs/systemd-vconsole-setup/vconsole-setup.c
@@ -30,19 +30,19 @@
 #include <linux/tiocl.h>
 #include <linux/vt.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/io-util.h"
-#include "basic/locale-util.h"
-#include "basic/log.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
-#include "basic/virt.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
 
 static bool is_vconsole(int fd) {
         unsigned char data[1];
diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
index 1daedbd8dd..723dfa7ac7 100644
--- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
@@ -30,21 +30,12 @@ rootlibexec_PROGRAMS += \
 	systemd-journal-gatewayd
 
 systemd_journal_gatewayd_SOURCES = \
-	src/journal-remote/journal-gatewayd.c \
-	src/journal-remote/microhttpd-util.h \
-	src/journal-remote/microhttpd-util.c
+	src/journal-remote/journal-gatewayd.c
 
 systemd_journal_gatewayd_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la \
-	$(MICROHTTPD_LIBS)
-
-ifneq ($(HAVE_GNUTLS),)
-systemd_journal_gatewayd_LDADD += \
-	$(GNUTLS_LIBS)
-endif # HAVE_GNUTLS
-
-systemd_journal_gatewayd_CFLAGS = \
-	$(MICROHTTPD_CFLAGS)
+	libsystemd-microhttpd.la
 
 systemd_journal_gatewayd_CPPFLAGS = \
 	-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\"
diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c b/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c
index 76b241a14b..b92945455b 100644
--- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c
+++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c
@@ -31,17 +31,17 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-journal.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/hostname-util.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/sigbus.h"
-#include "basic/util.h"
-#include "microhttpd-util.h"
-#include "shared/bus-util.h"
-#include "shared/logs-show.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/sigbus.h"
+#include "systemd-basic/util.h"
+#include "systemd-microhttpd/microhttpd-util.h"
+#include "systemd-shared/logs-show.h"
 
 #define JOURNAL_WAIT_TIMEOUT (10*USEC_PER_SEC)
 
diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
index ebfa101c97..601bad9b5f 100644
--- a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
@@ -36,28 +36,14 @@ systemd_journal_remote_SOURCES = \
 	src/journal-remote/journal-remote.c
 
 systemd_journal_remote_LDADD = \
+	libsystemd-microhttpd.la \
 	libjournal-core.la
 
-systemd_journal_remote_SOURCES += \
-	src/journal-remote/microhttpd-util.h \
-	src/journal-remote/microhttpd-util.c
-
-systemd_journal_remote_CFLAGS = \
-	$(MICROHTTPD_CFLAGS)
-
-systemd_journal_remote_LDADD += \
-	$(MICROHTTPD_LIBS)
-
 ifneq ($(ENABLE_TMPFILES),)
 dist_tmpfiles_DATA += \
 	tmpfiles.d/systemd-remote.conf
 endif # ENABLE_TMPFILES
 
-ifneq ($(HAVE_GNUTLS),)
-systemd_journal_remote_LDADD += \
-	$(GNUTLS_LIBS)
-endif # HAVE_GNUTLS
-
 # systemd-journal-remote make sense mostly with full crypto stack
 dist_systemunit_DATA += \
 	units/systemd-journal-remote.socket
@@ -81,4 +67,7 @@ EXTRA_DIST += \
 	src/journal-remote/log-generator.py
 endif # HAVE_MICROHTTPD
 
+sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+sd.CPPFLAGS += -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.c b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.c
index c71fedd816..fdfa692214 100644
--- a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.c
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.c
@@ -17,11 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
-#include "journald-native.h"
+#include "journal-core/journald-native.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "journal-remote-parse.h"
 
diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.c b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.c
index 4e05eda103..31abdc76d2 100644
--- a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.c
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
+#include "systemd-basic/alloc-util.h"
 
 #include "journal-remote.h"
 
diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.c b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.c
index ac1ba30310..b77abfc184 100644
--- a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.c
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.c
@@ -33,23 +33,23 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/signal-util.h"
-#include "basic/socket-util.h"
-#include "basic/stat-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "journald-native.h"
+#include "journal-core/journald-native.h"
 #include "sd-journal/journal-file.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "journal-remote-write.h"
 #include "journal-remote.h"
diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.h b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.h
index 6abfc1019d..1c090ccdfc 100644
--- a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.h
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.h
@@ -21,8 +21,8 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/hashmap.h"
-#include "microhttpd-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-microhttpd/microhttpd-util.h"
 
 #include "journal-remote-parse.h"
 #include "journal-remote-write.h"
diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
index acfcbd22df..bc272e52da 100644
--- a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
@@ -54,4 +54,7 @@ EXTRA_DIST += \
         units/systemd-journal-upload.service.in \
         src/journal-remote/journal-upload.conf.in
 
+sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+sd.CPPFLAGS += -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload-journal.c b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload-journal.c
index 61d287da97..3a5e450e35 100644
--- a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload-journal.c
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload-journal.c
@@ -22,10 +22,10 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
 
 #include "journal-upload.h"
 
diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.c b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.c
index 82d8331e76..52964bd03a 100644
--- a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.c
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.c
@@ -25,20 +25,20 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/glob-util.h"
-#include "basic/log.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/sigbus.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/glob-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/sigbus.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "journal-upload.h"
 
diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h
index 9eeb8d2123..f1fd95e22c 100644
--- a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h
@@ -6,7 +6,7 @@
 #include <systemd/sd-event.h>
 #include <systemd/sd-journal.h>
 
-#include "basic/time-util.h"
+#include "systemd-basic/time-util.h"
 
 typedef enum {
         ENTRY_CURSOR = 0,           /* Nothing actually written yet. */
diff --git a/src/grp-journal/journalctl/Makefile b/src/grp-journal/journalctl/Makefile
index 11cfe17107..880827b85d 100644
--- a/src/grp-journal/journalctl/Makefile
+++ b/src/grp-journal/journalctl/Makefile
@@ -30,6 +30,7 @@ journalctl_SOURCES = \
 	src/journal/journalctl.c
 
 journalctl_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la \
 	libudev-core.la
 
diff --git a/src/grp-journal/journalctl/journalctl.c b/src/grp-journal/journalctl/journalctl.c
index e50c21d681..4317c05b33 100644
--- a/src/grp-journal/journalctl/journalctl.c
+++ b/src/grp-journal/journalctl/journalctl.c
@@ -37,39 +37,39 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-journal.h>
 
-#include "basic/alloc-util.h"
-#include "basic/chattr-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/glob-util.h"
-#include "basic/hostname-util.h"
-#include "basic/io-util.h"
-#include "basic/locale-util.h"
-#include "basic/log.h"
-#include "basic/mkdir.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 "basic/unit-name.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-error.h"
+#include "sd-bus/bus-util.h"
 #include "sd-journal/catalog.h"
 #include "sd-journal/fsprg.h"
 #include "sd-journal/journal-def.h"
 #include "sd-journal/journal-internal.h"
 #include "sd-journal/journal-vacuum.h"
 #include "sd-journal/journal-verify.h"
-#include "shared/acl-util.h"
-#include "shared/bus-util.h"
-#include "shared/logs-show.h"
-#include "shared/pager.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/chattr-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/glob-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/rlimit-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/sigbus.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/syslog-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/acl-util.h"
+#include "systemd-shared/logs-show.h"
+#include "systemd-shared/pager.h"
+#include "systemd-shared/udev-util.h"
 #include "udev.h"
 
 #include "journal-qrcode.h"
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;
diff --git a/src/grp-journal/systemd-cat/cat.c b/src/grp-journal/systemd-cat/cat.c
index 8ab4febd53..105d42591e 100644
--- a/src/grp-journal/systemd-cat/cat.c
+++ b/src/grp-journal/systemd-cat/cat.c
@@ -26,11 +26,11 @@
 
 #include <systemd/sd-journal.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"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/syslog-util.h"
+#include "systemd-basic/util.h"
 
 static const char *arg_identifier = NULL;
 static int arg_priority = LOG_INFO;
diff --git a/src/grp-journal/catalog/.gitignore b/src/grp-journal/systemd-journald/.gitignore
index ff695342e3..ff695342e3 100644
--- a/src/grp-journal/catalog/.gitignore
+++ b/src/grp-journal/systemd-journald/.gitignore
diff --git a/src/grp-journal/systemd-journald/Makefile b/src/grp-journal/systemd-journald/Makefile
index 4f05218d88..b75a248ea1 100644
--- a/src/grp-journal/systemd-journald/Makefile
+++ b/src/grp-journal/systemd-journald/Makefile
@@ -60,6 +60,7 @@ nodist_catalog_DATA = \
 
 EXTRA_DIST += \
 	$(nodist_catalog_DATA:.catalog=.catalog.in)
+EXTRA_DIST := $(EXTRA_DIST)
 
 # Note that we don't use @@ for replacement markers here, but %%. This is
 # because the catalog uses @@ already for its runtime replacement handling and
diff --git a/src/grp-journal/systemd-journald/journald.c b/src/grp-journal/systemd-journald/journald.c
index cd887feed8..7306b5f43d 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 "basic/formats-util.h"
-#include "basic/sigbus.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 "sd-journal/journal-authenticate.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/sigbus.h"
 
 int main(int argc, char *argv[]) {
         Server server;
diff --git a/src/grp-journal/catalog/systemd.be.catalog.in b/src/grp-journal/systemd-journald/systemd.be.catalog.in
index 5b237f0558..5b237f0558 100644
--- a/src/grp-journal/catalog/systemd.be.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.be.catalog.in
diff --git a/src/grp-journal/catalog/systemd.be@latin.catalog.in b/src/grp-journal/systemd-journald/systemd.be@latin.catalog.in
index fc9f7cad16..fc9f7cad16 100644
--- a/src/grp-journal/catalog/systemd.be@latin.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.be@latin.catalog.in
diff --git a/src/grp-journal/catalog/systemd.bg.catalog.in b/src/grp-journal/systemd-journald/systemd.bg.catalog.in
index 76b0ce8f17..76b0ce8f17 100644
--- a/src/grp-journal/catalog/systemd.bg.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.bg.catalog.in
diff --git a/src/grp-journal/catalog/systemd.catalog.in b/src/grp-journal/systemd-journald/systemd.catalog.in
index 8de8597fe9..8de8597fe9 100644
--- a/src/grp-journal/catalog/systemd.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.catalog.in
diff --git a/src/grp-journal/catalog/systemd.da.catalog.in b/src/grp-journal/systemd-journald/systemd.da.catalog.in
index bc7d94476f..bc7d94476f 100644
--- a/src/grp-journal/catalog/systemd.da.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.da.catalog.in
diff --git a/src/grp-journal/catalog/systemd.fr.catalog.in b/src/grp-journal/systemd-journald/systemd.fr.catalog.in
index 573b288e74..573b288e74 100644
--- a/src/grp-journal/catalog/systemd.fr.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.fr.catalog.in
diff --git a/src/grp-journal/catalog/systemd.hr.catalog.in b/src/grp-journal/systemd-journald/systemd.hr.catalog.in
index 7502aed741..7502aed741 100644
--- a/src/grp-journal/catalog/systemd.hr.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.hr.catalog.in
diff --git a/src/grp-journal/catalog/systemd.hu.catalog.in b/src/grp-journal/systemd-journald/systemd.hu.catalog.in
index f538b7f958..f538b7f958 100644
--- a/src/grp-journal/catalog/systemd.hu.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.hu.catalog.in
diff --git a/src/grp-journal/catalog/systemd.it.catalog.in b/src/grp-journal/systemd-journald/systemd.it.catalog.in
index 86e44a604d..86e44a604d 100644
--- a/src/grp-journal/catalog/systemd.it.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.it.catalog.in
diff --git a/src/grp-journal/catalog/systemd.ko.catalog.in b/src/grp-journal/systemd-journald/systemd.ko.catalog.in
index 8a053254ee..8a053254ee 100644
--- a/src/grp-journal/catalog/systemd.ko.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.ko.catalog.in
diff --git a/src/grp-journal/catalog/systemd.pl.catalog.in b/src/grp-journal/systemd-journald/systemd.pl.catalog.in
index 33c2122974..33c2122974 100644
--- a/src/grp-journal/catalog/systemd.pl.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.pl.catalog.in
diff --git a/src/grp-journal/catalog/systemd.pt_BR.catalog.in b/src/grp-journal/systemd-journald/systemd.pt_BR.catalog.in
index e461c2b2ba..e461c2b2ba 100644
--- a/src/grp-journal/catalog/systemd.pt_BR.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.pt_BR.catalog.in
diff --git a/src/grp-journal/catalog/systemd.ru.catalog.in b/src/grp-journal/systemd-journald/systemd.ru.catalog.in
index df55478592..df55478592 100644
--- a/src/grp-journal/catalog/systemd.ru.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.ru.catalog.in
diff --git a/src/grp-journal/catalog/systemd.sr.catalog.in b/src/grp-journal/systemd-journald/systemd.sr.catalog.in
index 06a0ff648c..06a0ff648c 100644
--- a/src/grp-journal/catalog/systemd.sr.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.sr.catalog.in
diff --git a/src/grp-journal/catalog/systemd.zh_CN.catalog.in b/src/grp-journal/systemd-journald/systemd.zh_CN.catalog.in
index ba7c697c16..ba7c697c16 100644
--- a/src/grp-journal/catalog/systemd.zh_CN.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.zh_CN.catalog.in
diff --git a/src/grp-journal/catalog/systemd.zh_TW.catalog.in b/src/grp-journal/systemd-journald/systemd.zh_TW.catalog.in
index f7b42fa1c7..f7b42fa1c7 100644
--- a/src/grp-journal/catalog/systemd.zh_TW.catalog.in
+++ b/src/grp-journal/systemd-journald/systemd.zh_TW.catalog.in
diff --git a/src/grp-locale/localectl/Makefile b/src/grp-locale/localectl/Makefile
index 9e0e927650..347e68c024 100644
--- a/src/grp-locale/localectl/Makefile
+++ b/src/grp-locale/localectl/Makefile
@@ -29,6 +29,7 @@ localectl_SOURCES = \
 	src/locale/localectl.c
 
 localectl_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 bin_PROGRAMS += \
diff --git a/src/grp-locale/localectl/localectl.c b/src/grp-locale/localectl/localectl.c
index b33ebc1640..491b40c8fa 100644
--- a/src/grp-locale/localectl/localectl.c
+++ b/src/grp-locale/localectl/localectl.c
@@ -27,18 +27,18 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/locale-util.h"
-#include "basic/set.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "basic/virt.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/pager.h"
-#include "shared/spawn-polkit-agent.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/pager.h"
+#include "systemd-shared/spawn-polkit-agent.h"
 
 static bool arg_no_pager = false;
 static bool arg_ask_password = true;
diff --git a/src/grp-locale/systemd-localed/Makefile b/src/grp-locale/systemd-localed/Makefile
index 8017bcc767..5cd9e07936 100644
--- a/src/grp-locale/systemd-localed/Makefile
+++ b/src/grp-locale/systemd-localed/Makefile
@@ -30,6 +30,7 @@ systemd_localed_SOURCES = \
 	src/locale/keymap-util.h
 
 systemd_localed_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la \
 	-ldl
 
diff --git a/src/grp-locale/systemd-localed/keymap-util.c b/src/grp-locale/systemd-localed/keymap-util.c
index 1a99cef5e5..bbaae0d8c8 100644
--- a/src/grp-locale/systemd-localed/keymap-util.c
+++ b/src/grp-locale/systemd-localed/keymap-util.c
@@ -22,16 +22,16 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/def.h"
-#include "basic/env-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio-label.h"
-#include "basic/fileio.h"
-#include "basic/locale-util.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio-label.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
 
 #include "keymap-util.h"
 
diff --git a/src/grp-locale/systemd-localed/keymap-util.h b/src/grp-locale/systemd-localed/keymap-util.h
index 58b6ec4d8f..12bb83acb6 100644
--- a/src/grp-locale/systemd-localed/keymap-util.h
+++ b/src/grp-locale/systemd-localed/keymap-util.h
@@ -18,7 +18,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/locale-util.h"
+#include "systemd-basic/locale-util.h"
 
 typedef struct Context {
         char *locale[_VARIABLE_LC_MAX];
diff --git a/src/grp-locale/systemd-localed/localed.c b/src/grp-locale/systemd-localed/localed.c
index 55fadd78df..91ad61efd8 100644
--- a/src/grp-locale/systemd-localed/localed.c
+++ b/src/grp-locale/systemd-localed/localed.c
@@ -29,18 +29,18 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/locale-util.h"
-#include "basic/macro.h"
-#include "basic/path-util.h"
-#include "basic/selinux-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-message.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
 
 #include "keymap-util.h"
 
diff --git a/src/grp-locale/systemd-localed/test-keymap-util.c b/src/grp-locale/systemd-localed/test-keymap-util.c
index 6c001b2f50..9a7c4c9b53 100644
--- a/src/grp-locale/systemd-localed/test-keymap-util.c
+++ b/src/grp-locale/systemd-localed/test-keymap-util.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/string-util.h"
 
 #include "keymap-util.h"
 
diff --git a/src/grp-login/loginctl/Makefile b/src/grp-login/loginctl/Makefile
index f1a474e1cc..12987f92bc 100644
--- a/src/grp-login/loginctl/Makefile
+++ b/src/grp-login/loginctl/Makefile
@@ -29,6 +29,7 @@ loginctl_SOURCES = \
 	src/login/sysfs-show.c
 
 loginctl_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 rootbin_PROGRAMS += \
diff --git a/src/grp-login/loginctl/loginctl.c b/src/grp-login/loginctl/loginctl.c
index 469bec582f..c0340553b8 100644
--- a/src/grp-login/loginctl/loginctl.c
+++ b/src/grp-login/loginctl/loginctl.c
@@ -25,26 +25,26 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "basic/verbs.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-unit-util.h"
-#include "shared/bus-util.h"
-#include "shared/cgroup-show.h"
-#include "shared/logs-show.h"
-#include "shared/pager.h"
-#include "shared/spawn-polkit-agent.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/verbs.h"
+#include "systemd-shared/bus-unit-util.h"
+#include "systemd-shared/cgroup-show.h"
+#include "systemd-shared/logs-show.h"
+#include "systemd-shared/pager.h"
+#include "systemd-shared/spawn-polkit-agent.h"
 
 #include "sysfs-show.h"
 
diff --git a/src/grp-login/loginctl/sysfs-show.c b/src/grp-login/loginctl/sysfs-show.c
index 12808c3336..ff4babdc74 100644
--- a/src/grp-login/loginctl/sysfs-show.c
+++ b/src/grp-login/loginctl/sysfs-show.c
@@ -22,13 +22,13 @@
 
 #include <libudev.h>
 
-#include "basic/alloc-util.h"
-#include "basic/locale-util.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/udev-util.h"
 
 #include "sysfs-show.h"
 
diff --git a/src/grp-login/pam_systemd/Makefile b/src/grp-login/pam_systemd/Makefile
index 8de05d9b7b..d7f729b0ae 100644
--- a/src/grp-login/pam_systemd/Makefile
+++ b/src/grp-login/pam_systemd/Makefile
@@ -39,7 +39,8 @@ pam_systemd_la_LDFLAGS = \
 	-Wl,--version-script=$(srcdir)/pam_systemd.sym
 
 pam_systemd_la_LIBADD = \
-	libshared.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la \
 	$(PAM_LIBS)
 
 pamlib_LTLIBRARIES = \
diff --git a/src/grp-login/pam_systemd/pam_systemd.c b/src/grp-login/pam_systemd/pam_systemd.c
index 11f527cda0..fe1a2266b7 100644
--- a/src/grp-login/pam_systemd/pam_systemd.c
+++ b/src/grp-login/pam_systemd/pam_systemd.c
@@ -28,23 +28,23 @@
 #include <security/pam_modutil.h>
 #include <sys/file.h>
 
-#include "basic/alloc-util.h"
-#include "basic/audit-util.h"
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/hostname-util.h"
-#include "basic/login-util.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/socket-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/audit-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/login-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
 
 static int parse_argv(
                 pam_handle_t *handle,
diff --git a/src/grp-login/systemd-inhibit/Makefile b/src/grp-login/systemd-inhibit/Makefile
index 8b3b7995d9..41775189d4 100644
--- a/src/grp-login/systemd-inhibit/Makefile
+++ b/src/grp-login/systemd-inhibit/Makefile
@@ -29,6 +29,7 @@ systemd_inhibit_SOURCES = \
 	src/login/inhibit.c
 
 systemd_inhibit_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 rootbin_PROGRAMS += \
diff --git a/src/grp-login/systemd-inhibit/inhibit.c b/src/grp-login/systemd-inhibit/inhibit.c
index 543bdb9e80..c4c14bdffe 100644
--- a/src/grp-login/systemd-inhibit/inhibit.c
+++ b/src/grp-login/systemd-inhibit/inhibit.c
@@ -25,16 +25,16 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 static const char* arg_what = "idle:sleep:shutdown";
 static const char* arg_who = NULL;
diff --git a/src/grp-login/systemd-logind/Makefile b/src/grp-login/systemd-logind/Makefile
index ed2db4e038..0dbbc9733b 100644
--- a/src/grp-login/systemd-logind/Makefile
+++ b/src/grp-login/systemd-logind/Makefile
@@ -32,7 +32,8 @@ nodist_systemd_logind_SOURCES = \
 	src/login/logind-gperf.c
 
 systemd_logind_LDADD = \
-	libshared.la
+	libsystemd-internal.la \
+	libsystemd-shared.la
 
 _liblogind_core_la_SOURCES = \
 	src/login/logind-core.c \
diff --git a/src/grp-login/systemd-logind/logind-acl.c b/src/grp-login/systemd-logind/logind-acl.c
index 44e49c1dad..9261e59122 100644
--- a/src/grp-login/systemd-logind/logind-acl.c
+++ b/src/grp-login/systemd-logind/logind-acl.c
@@ -20,16 +20,16 @@
 #include <errno.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/set.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "shared/acl-util.h"
-#include "shared/udev-util.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/formats-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/acl-util.h"
+#include "systemd-shared/udev-util.h"
 
 #include "logind-acl.h"
 
diff --git a/src/grp-login/systemd-logind/logind-action.c b/src/grp-login/systemd-logind/logind-action.c
index a7c88e7e65..594a7e0039 100644
--- a/src/grp-login/systemd-logind/logind-action.c
+++ b/src/grp-login/systemd-logind/logind-action.c
@@ -19,17 +19,17 @@
 
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/formats-util.h"
-#include "basic/process-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/terminal-util.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/conf-parser.h"
-#include "shared/sleep-config.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/sleep-config.h"
 
 #include "logind-action.h"
 
diff --git a/src/grp-login/systemd-logind/logind-button.c b/src/grp-login/systemd-logind/logind-button.c
index 81c82117fc..912140cc13 100644
--- a/src/grp-login/systemd-logind/logind-button.c
+++ b/src/grp-login/systemd-logind/logind-button.c
@@ -27,10 +27,10 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "logind-button.h"
 
diff --git a/src/grp-login/systemd-logind/logind-core.c b/src/grp-login/systemd-logind/logind-core.c
index b2ae7c2e1a..b4bb502aac 100644
--- a/src/grp-login/systemd-logind/logind-core.c
+++ b/src/grp-login/systemd-logind/logind-core.c
@@ -24,15 +24,15 @@
 
 #include <linux/vt.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fd-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/udev-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/udev-util.h"
 
 #include "logind.h"
 
diff --git a/src/grp-login/systemd-logind/logind-dbus.c b/src/grp-login/systemd-logind/logind-dbus.c
index 282ba64a3d..c4b962ec92 100644
--- a/src/grp-login/systemd-logind/logind-dbus.c
+++ b/src/grp-login/systemd-logind/logind-dbus.c
@@ -24,30 +24,30 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/audit-util.h"
-#include "basic/dirent-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/fileio-label.h"
-#include "basic/formats-util.h"
-#include "basic/fs-util.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/selinux-util.h"
-#include "basic/special.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/efivars.h"
-#include "shared/sleep-config.h"
-#include "shared/udev-util.h"
-#include "shared/utmp-wtmp.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/audit-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio-label.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/efivars.h"
+#include "systemd-shared/sleep-config.h"
+#include "systemd-shared/udev-util.h"
+#include "systemd-shared/utmp-wtmp.h"
 
 #include "logind.h"
 
diff --git a/src/grp-login/systemd-logind/logind-device.c b/src/grp-login/systemd-logind/logind-device.c
index 6165a9ea6e..ac119701a0 100644
--- a/src/grp-login/systemd-logind/logind-device.c
+++ b/src/grp-login/systemd-logind/logind-device.c
@@ -19,8 +19,8 @@
 
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/util.h"
 
 #include "logind-device.h"
 
diff --git a/src/grp-login/systemd-logind/logind-device.h b/src/grp-login/systemd-logind/logind-device.h
index 9e2678d801..11b9bfbecd 100644
--- a/src/grp-login/systemd-logind/logind-device.h
+++ b/src/grp-login/systemd-logind/logind-device.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
+#include "systemd-basic/list.h"
 
 typedef struct Device Device;
 
diff --git a/src/grp-login/systemd-logind/logind-gperf.gperf b/src/grp-login/systemd-logind/logind-gperf.gperf
index 1a39c3bf96..3dcde4cb8f 100644
--- a/src/grp-login/systemd-logind/logind-gperf.gperf
+++ b/src/grp-login/systemd-logind/logind-gperf.gperf
@@ -1,7 +1,7 @@
 %{
 #include <stddef.h>
 
-#include "shared/conf-parser.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "logind.h"
 %}
diff --git a/src/grp-login/systemd-logind/logind-inhibit.c b/src/grp-login/systemd-logind/logind-inhibit.c
index 8a35db0dc8..cea4850a47 100644
--- a/src/grp-login/systemd-logind/logind-inhibit.c
+++ b/src/grp-login/systemd-logind/logind-inhibit.c
@@ -22,17 +22,17 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "logind-inhibit.h"
 
diff --git a/src/grp-login/systemd-logind/logind-seat-dbus.c b/src/grp-login/systemd-logind/logind-seat-dbus.c
index e4febe1ab5..000a96cddc 100644
--- a/src/grp-login/systemd-logind/logind-seat-dbus.c
+++ b/src/grp-login/systemd-logind/logind-seat-dbus.c
@@ -20,13 +20,13 @@
 #include <errno.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-common-errors.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "logind-seat.h"
 #include "logind.h"
diff --git a/src/grp-login/systemd-logind/logind-seat.c b/src/grp-login/systemd-logind/logind-seat.c
index 6525ad5d7b..5bb9ed6226 100644
--- a/src/grp-login/systemd-logind/logind-seat.c
+++ b/src/grp-login/systemd-logind/logind-seat.c
@@ -24,16 +24,16 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/util.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/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
 
 #include "logind-acl.h"
 #include "logind-seat.h"
diff --git a/src/grp-login/systemd-logind/logind-seat.h b/src/grp-login/systemd-logind/logind-seat.h
index 7fbeb5a727..fba08ef5c3 100644
--- a/src/grp-login/systemd-logind/logind-seat.h
+++ b/src/grp-login/systemd-logind/logind-seat.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
+#include "systemd-basic/list.h"
 
 typedef struct Seat Seat;
 
diff --git a/src/grp-login/systemd-logind/logind-session-dbus.c b/src/grp-login/systemd-logind/logind-session-dbus.c
index f79f9b5003..ffcc1c8324 100644
--- a/src/grp-login/systemd-logind/logind-session-dbus.c
+++ b/src/grp-login/systemd-logind/logind-session-dbus.c
@@ -20,14 +20,14 @@
 #include <errno.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.h"
-#include "basic/fd-util.h"
-#include "basic/signal-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
 #include "sd-bus/bus-common-errors.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 #include "logind-session-device.h"
 #include "logind-session.h"
diff --git a/src/grp-login/systemd-logind/logind-session-device.c b/src/grp-login/systemd-logind/logind-session-device.c
index 99528488c0..131e000439 100644
--- a/src/grp-login/systemd-logind/logind-session-device.c
+++ b/src/grp-login/systemd-logind/logind-session-device.c
@@ -26,11 +26,11 @@
 
 #include <libudev.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/missing.h"
-#include "basic/util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/util.h"
 
 #include "logind-session-device.h"
 
diff --git a/src/grp-login/systemd-logind/logind-session-device.h b/src/grp-login/systemd-logind/logind-session-device.h
index 4a22decb1d..4bd0f28695 100644
--- a/src/grp-login/systemd-logind/logind-session-device.h
+++ b/src/grp-login/systemd-logind/logind-session-device.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
+#include "systemd-basic/list.h"
 
 typedef enum DeviceType DeviceType;
 typedef struct SessionDevice SessionDevice;
diff --git a/src/grp-login/systemd-logind/logind-session.c b/src/grp-login/systemd-logind/logind-session.c
index b08db54068..58ac2aeeb7 100644
--- a/src/grp-login/systemd-logind/logind-session.c
+++ b/src/grp-login/systemd-logind/logind-session.c
@@ -29,22 +29,22 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/audit-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/io-util.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/string-table.h"
-#include "basic/terminal-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/audit-util.h"
+#include "systemd-basic/escape.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/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "logind-session.h"
 
diff --git a/src/grp-login/systemd-logind/logind-session.h b/src/grp-login/systemd-logind/logind-session.h
index 976046d847..9b836aacd2 100644
--- a/src/grp-login/systemd-logind/logind-session.h
+++ b/src/grp-login/systemd-logind/logind-session.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
-#include "basic/login-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/login-util.h"
 
 typedef enum KillWho KillWho;
 typedef struct Session Session;
diff --git a/src/grp-login/systemd-logind/logind-user-dbus.c b/src/grp-login/systemd-logind/logind-user-dbus.c
index 57d1c857e6..73e44f8e61 100644
--- a/src/grp-login/systemd-logind/logind-user-dbus.c
+++ b/src/grp-login/systemd-logind/logind-user-dbus.c
@@ -20,12 +20,12 @@
 #include <errno.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/formats-util.h"
-#include "basic/signal-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
 
 #include "logind-user.h"
 #include "logind.h"
diff --git a/src/grp-login/systemd-logind/logind-user.c b/src/grp-login/systemd-logind/logind-user.c
index 5a2750b72b..3c5f5df290 100644
--- a/src/grp-login/systemd-logind/logind-user.c
+++ b/src/grp-login/systemd-logind/logind-user.c
@@ -22,31 +22,31 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
-#include "basic/alloc-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/hashmap.h"
-#include "basic/label.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/rm-rf.h"
-#include "basic/smack-util.h"
-#include "basic/special.h"
-#include "basic/stdio-util.h"
-#include "basic/string-table.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/clean-ipc.h"
-#include "shared/conf-parser.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.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/label.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/smack-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/clean-ipc.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "logind-user.h"
 
diff --git a/src/grp-login/systemd-logind/logind-user.h b/src/grp-login/systemd-logind/logind-user.h
index b23c59fa1d..d93223f6ad 100644
--- a/src/grp-login/systemd-logind/logind-user.h
+++ b/src/grp-login/systemd-logind/logind-user.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
+#include "systemd-basic/list.h"
 
 typedef struct User User;
 
diff --git a/src/grp-login/systemd-logind/logind-utmp.c b/src/grp-login/systemd-logind/logind-utmp.c
index 1e97083f78..319718ca57 100644
--- a/src/grp-login/systemd-logind/logind-utmp.c
+++ b/src/grp-login/systemd-logind/logind-utmp.c
@@ -24,17 +24,17 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/audit-util.h"
-#include "basic/formats-util.h"
-#include "basic/special.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/utmp-wtmp.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/audit-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/utmp-wtmp.h"
 
 #include "logind.h"
 
diff --git a/src/grp-login/systemd-logind/logind.c b/src/grp-login/systemd-logind/logind.c
index 84e23beef0..ccb88d4ead 100644
--- a/src/grp-login/systemd-logind/logind.c
+++ b/src/grp-login/systemd-logind/logind.c
@@ -25,18 +25,18 @@
 #include <libudev.h>
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/selinux-util.h"
-#include "basic/signal-util.h"
-#include "basic/strv.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/conf-parser.h"
-#include "shared/udev-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/udev-util.h"
 
 #include "logind.h"
 
diff --git a/src/grp-login/systemd-logind/logind.h b/src/grp-login/systemd-logind/logind.h
index c637cdfcac..4f1290f9c2 100644
--- a/src/grp-login/systemd-logind/logind.h
+++ b/src/grp-login/systemd-logind/logind.h
@@ -25,9 +25,9 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-#include "basic/hashmap.h"
-#include "basic/list.h"
-#include "basic/set.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/set.h"
 
 typedef struct Manager Manager;
 
diff --git a/src/grp-login/test-inhibit.c b/src/grp-login/test-inhibit.c
index 2451d56446..3cddff0e9d 100644
--- a/src/grp-login/test-inhibit.c
+++ b/src/grp-login/test-inhibit.c
@@ -21,10 +21,10 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/fd-util.h"
-#include "basic/macro.h"
-#include "basic/util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/util.h"
 
 static int inhibit(sd_bus *bus, const char *what) {
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
diff --git a/src/grp-login/test-login-shared.c b/src/grp-login/test-login-shared.c
index 5a9329f7ee..769d7b9915 100644
--- a/src/grp-login/test-login-shared.c
+++ b/src/grp-login/test-login-shared.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/login-util.h"
-#include "basic/macro.h"
+#include "systemd-basic/login-util.h"
+#include "systemd-basic/macro.h"
 
 static void test_session_id_valid(void) {
         assert_se(session_id_valid("c1"));
diff --git a/src/grp-login/test-login-tables.c b/src/grp-login/test-login-tables.c
index 3f2f4f3054..0d9d7ae479 100644
--- a/src/grp-login/test-login-tables.c
+++ b/src/grp-login/test-login-tables.c
@@ -19,7 +19,7 @@
 
 #include "logind-action.h"
 #include "logind-session.h"
-#include "shared/test-tables.h"
+#include "systemd-shared/test-tables.h"
 
 int main(int argc, char **argv) {
         test_table(handle_action, HANDLE_ACTION);
diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile
index 9679410b7b..98e33243b7 100644
--- a/src/grp-machine/Makefile
+++ b/src/grp-machine/Makefile
@@ -24,6 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 nested.subdirs += grp-import
+nested.subdirs += libmachine-core
 nested.subdirs += machinectl
 nested.subdirs += nss-mymachines
 nested.subdirs += systemd-machined
diff --git a/src/grp-machine/grp-import/libimport/Makefile b/src/grp-machine/grp-import/libimport/Makefile
index 5b15c57715..3e8b6b1401 100644
--- a/src/grp-machine/grp-import/libimport/Makefile
+++ b/src/grp-machine/grp-import/libimport/Makefile
@@ -30,7 +30,7 @@ libimport_la_SOURCES = \
         import-common.c \
 	import-compress.c
 
-libimport_la_LIBADD += libbasic.la
+libimport_la_LIBADD += libsystemd-basic.la
 
 manual_tests += \
 	test-qcow2
diff --git a/src/grp-machine/grp-import/libimport/import-common.c b/src/grp-machine/grp-import/libimport/import-common.c
index 9061cd4da1..b0a34d5745 100644
--- a/src/grp-machine/grp-import/libimport/import-common.c
+++ b/src/grp-machine/grp-import/libimport/import-common.c
@@ -22,11 +22,11 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "basic/btrfs-util.h"
-#include "basic/capability-util.h"
-#include "basic/fd-util.h"
-#include "basic/signal-util.h"
-#include "basic/util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/util.h"
 
 #include "import-common.h"
 
diff --git a/src/grp-machine/grp-import/libimport/import-compress.c b/src/grp-machine/grp-import/libimport/import-compress.c
index 4f1a9891e8..2e116df26c 100644
--- a/src/grp-machine/grp-import/libimport/import-compress.c
+++ b/src/grp-machine/grp-import/libimport/import-compress.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-table.h"
-#include "basic/util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/util.h"
 
 #include "import-compress.h"
 
diff --git a/src/grp-machine/grp-import/libimport/import-compress.h b/src/grp-machine/grp-import/libimport/import-compress.h
index 130afb4cd0..025dd030be 100644
--- a/src/grp-machine/grp-import/libimport/import-compress.h
+++ b/src/grp-machine/grp-import/libimport/import-compress.h
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <zlib.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef enum ImportCompressType {
         IMPORT_COMPRESS_UNKNOWN,
diff --git a/src/grp-machine/grp-import/libimport/qcow2-util.c b/src/grp-machine/grp-import/libimport/qcow2-util.c
index bc50b7d0b3..4c81fbebc7 100644
--- a/src/grp-machine/grp-import/libimport/qcow2-util.c
+++ b/src/grp-machine/grp-import/libimport/qcow2-util.c
@@ -19,10 +19,10 @@
 
 #include <zlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/sparse-endian.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-basic/util.h"
 
 #include "qcow2-util.h"
 
diff --git a/src/grp-machine/grp-import/libimport/test-qcow2.c b/src/grp-machine/grp-import/libimport/test-qcow2.c
index 15d7c29aef..7c973970ba 100644
--- a/src/grp-machine/grp-import/libimport/test-qcow2.c
+++ b/src/grp-machine/grp-import/libimport/test-qcow2.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/util.h"
 
 #include "qcow2-util.h"
 
diff --git a/src/grp-machine/grp-import/systemd-export/export-raw.c b/src/grp-machine/grp-import/systemd-export/export-raw.c
index c17fc952d3..bce4cdf3d4 100644
--- a/src/grp-machine/grp-import/systemd-export/export-raw.c
+++ b/src/grp-machine/grp-import/systemd-export/export-raw.c
@@ -27,15 +27,15 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/copy.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/ratelimit.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "import-common.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "export-raw.h"
 
diff --git a/src/grp-machine/grp-import/systemd-export/export-raw.h b/src/grp-machine/grp-import/systemd-export/export-raw.h
index 00f6931d7b..89aef76eed 100644
--- a/src/grp-machine/grp-import/systemd-export/export-raw.h
+++ b/src/grp-machine/grp-import/systemd-export/export-raw.h
@@ -21,11 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/macro.h"
 #include "import-compress.h"
+#include "systemd-basic/macro.h"
 
 typedef struct RawExport RawExport;
-
 typedef void (*RawExportFinished)(RawExport *export, int error, void *userdata);
 
 int raw_export_new(RawExport **export, sd_event *event, RawExportFinished on_finished, void *userdata);
diff --git a/src/grp-machine/grp-import/systemd-export/export-tar.c b/src/grp-machine/grp-import/systemd-export/export-tar.c
index e2b3c5f2e9..701dfaf61d 100644
--- a/src/grp-machine/grp-import/systemd-export/export-tar.c
+++ b/src/grp-machine/grp-import/systemd-export/export-tar.c
@@ -19,15 +19,15 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/process-util.h"
-#include "basic/ratelimit.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "import-common.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "export-tar.h"
 
diff --git a/src/grp-machine/grp-import/systemd-export/export-tar.h b/src/grp-machine/grp-import/systemd-export/export-tar.h
index 9efde8931d..2c50c1e5bf 100644
--- a/src/grp-machine/grp-import/systemd-export/export-tar.h
+++ b/src/grp-machine/grp-import/systemd-export/export-tar.h
@@ -21,11 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/macro.h"
 #include "import-compress.h"
+#include "systemd-basic/macro.h"
 
 typedef struct TarExport TarExport;
-
 typedef void (*TarExportFinished)(TarExport *export, int error, void *userdata);
 
 int tar_export_new(TarExport **export, sd_event *event, TarExportFinished on_finished, void *userdata);
diff --git a/src/grp-machine/grp-import/systemd-export/export.c b/src/grp-machine/grp-import/systemd-export/export.c
index 5db164c7d1..a07273da7c 100644
--- a/src/grp-machine/grp-import/systemd-export/export.c
+++ b/src/grp-machine/grp-import/systemd-export/export.c
@@ -21,15 +21,15 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/hostname-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/verbs.h"
-#include "shared/import-util.h"
-#include "shared/machine-image.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/verbs.h"
+#include "systemd-shared/import-util.h"
+#include "systemd-shared/machine-image.h"
 
 #include "export-raw.h"
 #include "export-tar.h"
diff --git a/src/grp-machine/grp-import/systemd-import/Makefile b/src/grp-machine/grp-import/systemd-import/Makefile
index fe3105914c..51510f4470 100644
--- a/src/grp-machine/grp-import/systemd-import/Makefile
+++ b/src/grp-machine/grp-import/systemd-import/Makefile
@@ -38,6 +38,7 @@ systemd_import_CFLAGS = \
 
 systemd_import_LDADD = \
 	libsystemd-shared.la \
+	libimport.la \
 	$(XZ_LIBS) \
 	$(ZLIB_LIBS) \
 	$(BZIP2_LIBS)
diff --git a/src/grp-machine/grp-import/systemd-import/import-raw.c b/src/grp-machine/grp-import/systemd-import/import-raw.c
index 55a6d044ab..7b7226b843 100644
--- a/src/grp-machine/grp-import/systemd-import/import-raw.c
+++ b/src/grp-machine/grp-import/systemd-import/import-raw.c
@@ -22,25 +22,25 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/chattr-util.h"
-#include "basic/copy.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/hostname-util.h"
-#include "basic/io-util.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/ratelimit.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "import-common.h"
 #include "import-compress.h"
 #include "qcow2-util.h"
-#include "shared/machine-pool.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/chattr-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/machine-pool.h"
 
 #include "import-raw.h"
 
diff --git a/src/grp-machine/grp-import/systemd-import/import-raw.h b/src/grp-machine/grp-import/systemd-import/import-raw.h
index 61ec8cc91e..64c532242d 100644
--- a/src/grp-machine/grp-import/systemd-import/import-raw.h
+++ b/src/grp-machine/grp-import/systemd-import/import-raw.h
@@ -21,11 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/macro.h"
-#include "shared/import-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-shared/import-util.h"
 
 typedef struct RawImport RawImport;
-
 typedef void (*RawImportFinished)(RawImport *import, int error, void *userdata);
 
 int raw_import_new(RawImport **import, sd_event *event, const char *image_root, RawImportFinished on_finished, void *userdata);
diff --git a/src/grp-machine/grp-import/systemd-import/import-tar.c b/src/grp-machine/grp-import/systemd-import/import-tar.c
index 0d61b5f01d..592377a72a 100644
--- a/src/grp-machine/grp-import/systemd-import/import-tar.c
+++ b/src/grp-machine/grp-import/systemd-import/import-tar.c
@@ -22,25 +22,25 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/copy.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/hostname-util.h"
-#include "basic/io-util.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/ratelimit.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "import-common.h"
 #include "import-compress.h"
 #include "qcow2-util.h"
-#include "shared/machine-pool.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/machine-pool.h"
 
 #include "import-tar.h"
 
diff --git a/src/grp-machine/grp-import/systemd-import/import-tar.h b/src/grp-machine/grp-import/systemd-import/import-tar.h
index 35a08fcfc5..01c3f2d542 100644
--- a/src/grp-machine/grp-import/systemd-import/import-tar.h
+++ b/src/grp-machine/grp-import/systemd-import/import-tar.h
@@ -21,11 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/macro.h"
-#include "shared/import-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-shared/import-util.h"
 
 typedef struct TarImport TarImport;
-
 typedef void (*TarImportFinished)(TarImport *import, int error, void *userdata);
 
 int tar_import_new(TarImport **import, sd_event *event, const char *image_root, TarImportFinished on_finished, void *userdata);
diff --git a/src/grp-machine/grp-import/systemd-import/import.c b/src/grp-machine/grp-import/systemd-import/import.c
index 38fe7f8110..d6f772a159 100644
--- a/src/grp-machine/grp-import/systemd-import/import.c
+++ b/src/grp-machine/grp-import/systemd-import/import.c
@@ -21,15 +21,15 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/hostname-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/verbs.h"
-#include "shared/import-util.h"
-#include "shared/machine-image.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/verbs.h"
+#include "systemd-shared/import-util.h"
+#include "systemd-shared/machine-image.h"
 
 #include "import-raw.h"
 #include "import-tar.h"
diff --git a/src/grp-machine/grp-import/systemd-importd/Makefile b/src/grp-machine/grp-import/systemd-importd/Makefile
index 19705a925e..58b760ea86 100644
--- a/src/grp-machine/grp-import/systemd-importd/Makefile
+++ b/src/grp-machine/grp-import/systemd-importd/Makefile
@@ -33,6 +33,7 @@ systemd_importd_CFLAGS = \
 	-D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\"
 
 systemd_importd_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 dist_rootlibexec_DATA += \
diff --git a/src/grp-machine/grp-import/systemd-importd/importd.c b/src/grp-machine/grp-import/systemd-importd/importd.c
index f032f06fcf..ecf130cdd1 100644
--- a/src/grp-machine/grp-import/systemd-importd/importd.c
+++ b/src/grp-machine/grp-import/systemd-importd/importd.c
@@ -21,27 +21,27 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/hostname-util.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-table.h"
-#include "basic/strv.h"
-#include "basic/syslog-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "basic/web-util.h"
 #include "sd-bus/bus-common-errors.h"
-#include "shared/bus-util.h"
-#include "shared/import-util.h"
-#include "shared/machine-pool.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/syslog-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/web-util.h"
+#include "systemd-shared/import-util.h"
+#include "systemd-shared/machine-pool.h"
 
 typedef struct Transfer Transfer;
 typedef struct Manager Manager;
diff --git a/src/grp-machine/grp-import/systemd-pull/curl-util.c b/src/grp-machine/grp-import/systemd-pull/curl-util.c
index 9e0d56e5c3..52d0894018 100644
--- a/src/grp-machine/grp-import/systemd-pull/curl-util.c
+++ b/src/grp-machine/grp-import/systemd-pull/curl-util.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "curl-util.h"
 
diff --git a/src/grp-machine/grp-import/systemd-pull/curl-util.h b/src/grp-machine/grp-import/systemd-pull/curl-util.h
index 296b35d09c..1619aeb18c 100644
--- a/src/grp-machine/grp-import/systemd-pull/curl-util.h
+++ b/src/grp-machine/grp-import/systemd-pull/curl-util.h
@@ -24,7 +24,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/hashmap.h"
+#include "systemd-basic/hashmap.h"
 
 typedef struct CurlGlue CurlGlue;
 
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-common.c b/src/grp-machine/grp-import/systemd-pull/pull-common.c
index bd1623e003..9830d8a10f 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-common.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull-common.c
@@ -19,23 +19,23 @@
 
 #include <sys/prctl.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/capability-util.h"
-#include "basic/copy.h"
-#include "basic/dirent-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/io-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/rm-rf.h"
-#include "basic/signal-util.h"
-#include "basic/siphash24.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "basic/web-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/web-util.h"
 
 #include "pull-common.h"
 #include "pull-job.h"
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-common.h b/src/grp-machine/grp-import/systemd-pull/pull-common.h
index 96198a695a..1eb8f27fe8 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-common.h
+++ b/src/grp-machine/grp-import/systemd-pull/pull-common.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "shared/import-util.h"
+#include "systemd-shared/import-util.h"
 
 #include "pull-job.h"
 
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-job.c b/src/grp-machine/grp-import/systemd-pull/pull-job.c
index 3735304e6d..e51ac6546e 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-job.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull-job.c
@@ -19,15 +19,15 @@
 
 #include <sys/xattr.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/io-util.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/xattr-util.h"
-#include "shared/machine-pool.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/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/xattr-util.h"
+#include "systemd-shared/machine-pool.h"
 
 #include "pull-job.h"
 
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-job.h b/src/grp-machine/grp-import/systemd-pull/pull-job.h
index 296e32bd09..8a99883794 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-job.h
+++ b/src/grp-machine/grp-import/systemd-pull/pull-job.h
@@ -21,8 +21,8 @@
 
 #include <gcrypt.h>
 
-#include "basic/macro.h"
 #include "import-compress.h"
+#include "systemd-basic/macro.h"
 
 #include "curl-util.h"
 
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-raw.c b/src/grp-machine/grp-import/systemd-pull/pull-raw.c
index 9602915a1f..0ed1a83fe4 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-raw.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull-raw.c
@@ -24,26 +24,26 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/chattr-util.h"
-#include "basic/copy.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/hostname-util.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
-#include "basic/web-util.h"
 #include "import-common.h"
 #include "qcow2-util.h"
-#include "shared/import-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/chattr-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/web-util.h"
+#include "systemd-shared/import-util.h"
 
 #include "curl-util.h"
 #include "pull-common.h"
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-raw.h b/src/grp-machine/grp-import/systemd-pull/pull-raw.h
index 47ed499c12..0940cff93b 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-raw.h
+++ b/src/grp-machine/grp-import/systemd-pull/pull-raw.h
@@ -21,11 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/macro.h"
-#include "shared/import-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-shared/import-util.h"
 
 typedef struct RawPull RawPull;
-
 typedef void (*RawPullFinished)(RawPull *pull, int error, void *userdata);
 
 int raw_pull_new(RawPull **pull, sd_event *event, const char *image_root, RawPullFinished on_finished, void *userdata);
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-tar.c b/src/grp-machine/grp-import/systemd-pull/pull-tar.c
index 121ca31dbd..fbc7accaed 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-tar.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull-tar.c
@@ -22,25 +22,25 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/copy.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/hostname-util.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
-#include "basic/web-util.h"
 #include "import-common.h"
-#include "shared/import-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/web-util.h"
+#include "systemd-shared/import-util.h"
 
 #include "curl-util.h"
 #include "pull-common.h"
diff --git a/src/grp-machine/grp-import/systemd-pull/pull-tar.h b/src/grp-machine/grp-import/systemd-pull/pull-tar.h
index a2850fee9e..21d4db5519 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull-tar.h
+++ b/src/grp-machine/grp-import/systemd-pull/pull-tar.h
@@ -21,11 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/macro.h"
-#include "shared/import-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-shared/import-util.h"
 
 typedef struct TarPull TarPull;
-
 typedef void (*TarPullFinished)(TarPull *pull, int error, void *userdata);
 
 int tar_pull_new(TarPull **pull, sd_event *event, const char *image_root, TarPullFinished on_finished, void *userdata);
diff --git a/src/grp-machine/grp-import/systemd-pull/pull.c b/src/grp-machine/grp-import/systemd-pull/pull.c
index 4153c938d8..a6b5ed47a8 100644
--- a/src/grp-machine/grp-import/systemd-pull/pull.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull.c
@@ -21,15 +21,15 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hostname-util.h"
-#include "basic/parse-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/verbs.h"
-#include "basic/web-util.h"
-#include "shared/import-util.h"
-#include "shared/machine-image.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/verbs.h"
+#include "systemd-basic/web-util.h"
+#include "systemd-shared/import-util.h"
+#include "systemd-shared/machine-image.h"
 
 #include "pull-raw.h"
 #include "pull-tar.h"
diff --git a/src/libbasic/include/Makefile b/src/grp-machine/libmachine-core/Makefile
index ac4e6e896a..76e6e9ddee 100644
--- a/src/libbasic/include/Makefile
+++ b/src/grp-machine/libmachine-core/Makefile
@@ -23,6 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-nested.subdirs += basic
+nested.subdirs += src
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/systemd-machined/image-dbus.h b/src/grp-machine/libmachine-core/include/image-dbus.h
index b62da996c6..b62da996c6 100644
--- a/src/grp-machine/systemd-machined/image-dbus.h
+++ b/src/grp-machine/libmachine-core/include/image-dbus.h
diff --git a/src/grp-machine/systemd-machined/machine-dbus.h b/src/grp-machine/libmachine-core/include/machine-dbus.h
index d3faf5cb07..d3faf5cb07 100644
--- a/src/grp-machine/systemd-machined/machine-dbus.h
+++ b/src/grp-machine/libmachine-core/include/machine-dbus.h
diff --git a/src/grp-machine/systemd-machined/machine.h b/src/grp-machine/libmachine-core/include/machine.h
index e93f0cf222..361451b1c8 100644
--- a/src/grp-machine/systemd-machined/machine.h
+++ b/src/grp-machine/libmachine-core/include/machine.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
+#include "systemd-basic/list.h"
 
 typedef enum KillWho KillWho;
 typedef struct Machine Machine;
diff --git a/src/grp-machine/systemd-machined/machined.h b/src/grp-machine/libmachine-core/include/machined.h
index b16ea3ef15..8994097db0 100644
--- a/src/grp-machine/systemd-machined/machined.h
+++ b/src/grp-machine/libmachine-core/include/machined.h
@@ -24,8 +24,8 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-#include "basic/hashmap.h"
-#include "basic/list.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
 
 typedef struct Manager Manager;
 
diff --git a/src/grp-machine/systemd-machined/operation.h b/src/grp-machine/libmachine-core/include/operation.h
index 713ffe88c4..5eed62bd6f 100644
--- a/src/grp-machine/systemd-machined/operation.h
+++ b/src/grp-machine/libmachine-core/include/operation.h
@@ -24,7 +24,7 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-#include "basic/list.h"
+#include "systemd-basic/list.h"
 
 typedef struct Operation Operation;
 
diff --git a/src/grp-machine/libmachine-core/src/Makefile b/src/grp-machine/libmachine-core/src/Makefile
new file mode 100644
index 0000000000..75c196f199
--- /dev/null
+++ b/src/grp-machine/libmachine-core/src/Makefile
@@ -0,0 +1,53 @@
+#  -*- 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
+
+libmachine_core_la_SOURCES = \
+	src/machine/machine.c \
+	src/machine/machine.h \
+	src/machine/machined-dbus.c \
+	src/machine/machine-dbus.c \
+	src/machine/machine-dbus.h \
+	src/machine/image-dbus.c \
+	src/machine/image-dbus.h \
+	src/machine/operation.c \
+	src/machine/operation.h
+
+libmachine_core_la_LIBADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+noinst_LTLIBRARIES += \
+	libmachine-core.la
+
+test_machine_tables_SOURCES = \
+	src/machine/test-machine-tables.c
+
+test_machine_tables_LDADD = \
+	libmachine-core.la
+
+tests += \
+	test-machine-tables
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/systemd-machined/image-dbus.c b/src/grp-machine/libmachine-core/src/image-dbus.c
index 6ab627a710..b8c647eab1 100644
--- a/src/grp-machine/systemd-machined/image-dbus.c
+++ b/src/grp-machine/libmachine-core/src/image-dbus.c
@@ -17,17 +17,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.h"
-#include "basic/fd-util.h"
-#include "basic/io-util.h"
-#include "basic/process-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "shared/bus-util.h"
-#include "shared/machine-image.h"
-
 #include "image-dbus.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/machine-image.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, image_type, ImageType);
 
diff --git a/src/grp-machine/systemd-machined/machine-dbus.c b/src/grp-machine/libmachine-core/src/machine-dbus.c
index 91b5dfa993..5a402e2e95 100644
--- a/src/grp-machine/systemd-machined/machine-dbus.c
+++ b/src/grp-machine/libmachine-core/src/machine-dbus.c
@@ -28,29 +28,28 @@
 #include <libgen.h>
 #undef basename
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.h"
-#include "basic/copy.h"
-#include "basic/env-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/fs-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/user-util.h"
+#include "machine-dbus.h"
+#include "machine.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-internal.h"
+#include "sd-bus/bus-util.h"
 #include "sd-netlink/local-addresses.h"
-#include "shared/bus-util.h"
-
-#include "machine-dbus.h"
-#include "machine.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/env-util.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/in-addr-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
 
 static int property_get_id(
                 sd_bus *bus,
diff --git a/src/grp-machine/systemd-machined/machine.c b/src/grp-machine/libmachine-core/src/machine.c
index 701fec0e67..49eeea2d6b 100644
--- a/src/grp-machine/systemd-machined/machine.c
+++ b/src/grp-machine/libmachine-core/src/machine.c
@@ -23,26 +23,25 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/extract-word.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/hashmap.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
-#include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-
 #include "machine-dbus.h"
 #include "machine.h"
+#include "sd-bus/bus-error.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.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/hashmap.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
 
 Machine* machine_new(Manager *manager, MachineClass class, const char *name) {
         Machine *m;
diff --git a/src/grp-machine/systemd-machined/machined-dbus.c b/src/grp-machine/libmachine-core/src/machined-dbus.c
index 349ffcf298..e0245971a1 100644
--- a/src/grp-machine/systemd-machined/machined-dbus.c
+++ b/src/grp-machine/libmachine-core/src/machined-dbus.c
@@ -23,28 +23,27 @@
 
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/hostname-util.h"
-#include "basic/io-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/stdio-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
-#include "sd-bus/bus-common-errors.h"
-#include "shared/bus-util.h"
-#include "shared/machine-image.h"
-#include "shared/machine-pool.h"
-
 #include "image-dbus.h"
 #include "machine-dbus.h"
 #include "machined.h"
+#include "sd-bus/bus-common-errors.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/machine-image.h"
+#include "systemd-shared/machine-pool.h"
 
 static int property_get_pool_path(
                 sd_bus *bus,
diff --git a/src/grp-machine/systemd-machined/operation.c b/src/grp-machine/libmachine-core/src/operation.c
index f16c38c47a..0d852aba24 100644
--- a/src/grp-machine/systemd-machined/operation.c
+++ b/src/grp-machine/libmachine-core/src/operation.c
@@ -17,11 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/process-util.h"
-
 #include "operation.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/process-util.h"
 
 static int operation_done(sd_event_source *s, const siginfo_t *si, void *userdata) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
diff --git a/src/grp-machine/systemd-machined/test-machine-tables.c b/src/grp-machine/libmachine-core/src/test-machine-tables.c
index 7d44c55a4b..99c3274c20 100644
--- a/src/grp-machine/systemd-machined/test-machine-tables.c
+++ b/src/grp-machine/libmachine-core/src/test-machine-tables.c
@@ -17,9 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "shared/test-tables.h"
-
 #include "machine.h"
+#include "systemd-shared/test-tables.h"
 
 int main(int argc, char **argv) {
         test_table(machine_class, MACHINE_CLASS);
diff --git a/src/grp-machine/machinectl/machinectl.c b/src/grp-machine/machinectl/machinectl.c
index d5304dba37..bf89f00cb8 100644
--- a/src/grp-machine/machinectl/machinectl.c
+++ b/src/grp-machine/machinectl/machinectl.c
@@ -31,35 +31,35 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/copy.h"
-#include "basic/env-util.h"
-#include "basic/fd-util.h"
-#include "basic/hostname-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
-#include "basic/verbs.h"
-#include "basic/web-util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-unit-util.h"
-#include "shared/bus-util.h"
-#include "shared/cgroup-show.h"
-#include "shared/import-util.h"
-#include "shared/logs-show.h"
-#include "shared/pager.h"
-#include "shared/ptyfwd.h"
-#include "shared/spawn-polkit-agent.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/verbs.h"
+#include "systemd-basic/web-util.h"
+#include "systemd-shared/bus-unit-util.h"
+#include "systemd-shared/cgroup-show.h"
+#include "systemd-shared/import-util.h"
+#include "systemd-shared/logs-show.h"
+#include "systemd-shared/pager.h"
+#include "systemd-shared/ptyfwd.h"
+#include "systemd-shared/spawn-polkit-agent.h"
 
 static char **arg_property = NULL;
 static bool arg_all = false;
diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile
index 54d78ed2f1..5e3d878b23 100644
--- a/src/grp-machine/nss-mymachines/Makefile
+++ b/src/grp-machine/nss-mymachines/Makefile
@@ -37,7 +37,7 @@ libnss_mymachines_la_LDFLAGS = \
 
 libnss_mymachines_la_LIBADD = \
 	libsystemd-internal.la \
-	libbasic.la
+	libsystemd-basic.la
 
 lib_LTLIBRARIES += \
 	libnss_mymachines.la
diff --git a/src/grp-machine/nss-mymachines/nss-mymachines.c b/src/grp-machine/nss-mymachines/nss-mymachines.c
index 0bcdd45d37..4299dd7a0b 100644
--- a/src/grp-machine/nss-mymachines/nss-mymachines.c
+++ b/src/grp-machine/nss-mymachines/nss-mymachines.c
@@ -23,16 +23,16 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-login.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hostname-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/macro.h"
-#include "basic/nss-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-common-errors.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/nss-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 NSS_GETHOSTBYNAME_PROTOTYPES(mymachines);
 NSS_GETPW_PROTOTYPES(mymachines);
diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile
index 97fa68c5f9..011e740e02 100644
--- a/src/grp-machine/systemd-machined/Makefile
+++ b/src/grp-machine/systemd-machined/Makefile
@@ -29,39 +29,13 @@ systemd_machined_SOURCES = \
 
 systemd_machined_LDADD = \
 	libsystemd-internal.la \
-	libshared.la \
-	libbasic.la \
+	libsystemd-shared.la \
+	libsystemd-basic.la \
 	libmachine-core.la
 
 rootlibexec_PROGRAMS += \
 	systemd-machined
 
-libmachine_core_la_SOURCES = \
-	src/machine/machine.c \
-	src/machine/machine.h \
-	src/machine/machined-dbus.c \
-	src/machine/machine-dbus.c \
-	src/machine/machine-dbus.h \
-	src/machine/image-dbus.c \
-	src/machine/image-dbus.h \
-	src/machine/operation.c \
-	src/machine/operation.h
-
-libmachine_core_la_LIBADD = \
-	libsystemd-shared.la
-
-noinst_LTLIBRARIES += \
-	libmachine-core.la
-
-test_machine_tables_SOURCES = \
-	src/machine/test-machine-tables.c
-
-test_machine_tables_LDADD = \
-	libmachine-core.la
-
-tests += \
-	test-machine-tables
-
 nodist_systemunit_DATA += \
 	units/systemd-machined.service
 
diff --git a/src/grp-machine/systemd-machined/machined.c b/src/grp-machine/systemd-machined/machined.c
index a01d1820a1..361d85cb3f 100644
--- a/src/grp-machine/systemd-machined/machined.c
+++ b/src/grp-machine/systemd-machined/machined.c
@@ -23,19 +23,18 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/hostname-util.h"
-#include "basic/label.h"
-#include "basic/signal-util.h"
-#include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/machine-image.h"
-
 #include "machined.h"
+#include "sd-bus/bus-error.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-shared/machine-image.h"
 
 Manager *manager_new(void) {
         Manager *m;
diff --git a/src/grp-network/Makefile b/src/grp-network/Makefile
index 7502fcbdde..d5e6d62689 100644
--- a/src/grp-network/Makefile
+++ b/src/grp-network/Makefile
@@ -45,7 +45,7 @@ test_network_LDADD = \
 
 ifneq ($(HAVE_LIBIPTC),)
 test_network_LDADD += \
-	libfirewall.la
+	libsystemd-firewall.la
 endif # HAVE_LIBIPTC
 
 test_network_tables_SOURCES = \
@@ -58,7 +58,7 @@ test_network_tables_LDADD = \
 
 ifneq ($(HAVE_LIBIPTC),)
 test_network_tables_LDADD += \
-	libfirewall.la
+	libsystemd-firewall.la
 endif # HAVE_LIBIPTC
 
 tests += \
diff --git a/src/grp-network/libnetworkd-core/Makefile b/src/grp-network/libnetworkd-core/Makefile
index 740206413e..5afee3d399 100644
--- a/src/grp-network/libnetworkd-core/Makefile
+++ b/src/grp-network/libnetworkd-core/Makefile
@@ -93,7 +93,7 @@ nodist_libnetworkd_core_la_SOURCES = \
 libnetworkd_core_la_LIBADD = \
 	libsystemd-network.la \
 	libsystemd-internal.la \
-	libfirewall.la \
+	libsystemd-firewall.la \
 	libsystemd-shared.la
 
 sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
diff --git a/src/grp-network/libnetworkd-core/networkd-address-pool.c b/src/grp-network/libnetworkd-core/networkd-address-pool.c
index 7b57f6be0e..fa71df4bd5 100644
--- a/src/grp-network/libnetworkd-core/networkd-address-pool.c
+++ b/src/grp-network/libnetworkd-core/networkd-address-pool.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/set.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/string-util.h"
 
 #include "networkd-address-pool.h"
 #include "networkd.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-address-pool.h b/src/grp-network/libnetworkd-core/networkd-address-pool.h
index 5d7020739d..102608fa37 100644
--- a/src/grp-network/libnetworkd-core/networkd-address-pool.h
+++ b/src/grp-network/libnetworkd-core/networkd-address-pool.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/in-addr-util.h"
-#include "basic/list.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/list.h"
 
 typedef struct AddressPool AddressPool;
 typedef struct Manager Manager;
diff --git a/src/grp-network/libnetworkd-core/networkd-address.c b/src/grp-network/libnetworkd-core/networkd-address.c
index cd24bc12f2..4481e57ef2 100644
--- a/src/grp-network/libnetworkd-core/networkd-address.c
+++ b/src/grp-network/libnetworkd-core/networkd-address.c
@@ -19,16 +19,16 @@
 
 #include <net/if.h>
 
-#include "basic/alloc-util.h"
-#include "basic/parse-util.h"
-#include "basic/set.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
-#include "firewall-util.h"
 #include "sd-netlink/netlink-util.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
+#include "systemd-firewall/firewall-util.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "networkd-address.h"
 #include "networkd.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-address.h b/src/grp-network/libnetworkd-core/networkd-address.h
index 9378621580..0a6b8b6b2f 100644
--- a/src/grp-network/libnetworkd-core/networkd-address.h
+++ b/src/grp-network/libnetworkd-core/networkd-address.h
@@ -22,7 +22,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include "basic/in-addr-util.h"
+#include "systemd-basic/in-addr-util.h"
 
 typedef struct Address Address;
 
diff --git a/src/grp-network/libnetworkd-core/networkd-brvlan.c b/src/grp-network/libnetworkd-core/networkd-brvlan.c
index 118a6ed464..21401f6160 100644
--- a/src/grp-network/libnetworkd-core/networkd-brvlan.c
+++ b/src/grp-network/libnetworkd-core/networkd-brvlan.c
@@ -22,11 +22,11 @@
 
 #include <linux/if_bridge.h>
 
-#include "basic/alloc-util.h"
-#include "basic/parse-util.h"
 #include "sd-netlink/netlink-util.h"
-#include "shared/conf-parser.h"
-#include "shared/vlan-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/vlan-util.h"
 
 #include "networkd-brvlan.h"
 #include "networkd.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-conf.c b/src/grp-network/libnetworkd-core/networkd-conf.c
index 44f5170219..9fd1cf8191 100644
--- a/src/grp-network/libnetworkd-core/networkd-conf.c
+++ b/src/grp-network/libnetworkd-core/networkd-conf.c
@@ -19,11 +19,11 @@
 
 #include <ctype.h>
 
-#include "basic/def.h"
-#include "basic/hexdecoct.h"
-#include "basic/string-table.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/string-table.h"
 #include "systemd-network/dhcp-identifier.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "networkd-conf.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp4.c b/src/grp-network/libnetworkd-core/networkd-dhcp4.c
index 2e7858ccd3..d29787b92f 100644
--- a/src/grp-network/libnetworkd-core/networkd-dhcp4.c
+++ b/src/grp-network/libnetworkd-core/networkd-dhcp4.c
@@ -21,8 +21,8 @@
 
 #include <linux/if.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hostname-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hostname-util.h"
 #include "systemd-network/dhcp-lease-internal.h"
 #include "systemd-network/network-internal.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-fdb.c b/src/grp-network/libnetworkd-core/networkd-fdb.c
index 2949def65b..344d38f13a 100644
--- a/src/grp-network/libnetworkd-core/networkd-fdb.c
+++ b/src/grp-network/libnetworkd-core/networkd-fdb.c
@@ -20,11 +20,11 @@
 #include <net/ethernet.h>
 #include <net/if.h>
 
-#include "basic/alloc-util.h"
-#include "basic/util.h"
 #include "sd-netlink/netlink-util.h"
-#include "shared/conf-parser.h"
-#include "shared/vlan-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/vlan-util.h"
 
 #include "networkd-fdb.h"
 #include "networkd.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-fdb.h b/src/grp-network/libnetworkd-core/networkd-fdb.h
index a1ad4183dc..b798f36979 100644
--- a/src/grp-network/libnetworkd-core/networkd-fdb.h
+++ b/src/grp-network/libnetworkd-core/networkd-fdb.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
-#include "basic/macro.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/macro.h"
 
 typedef struct Network Network;
 typedef struct FdbEntry FdbEntry;
diff --git a/src/grp-network/libnetworkd-core/networkd-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-gperf.gperf
index 6588bada51..836063d371 100644
--- a/src/grp-network/libnetworkd-core/networkd-gperf.gperf
+++ b/src/grp-network/libnetworkd-core/networkd-gperf.gperf
@@ -1,7 +1,7 @@
 %{
 #include <stddef.h>
 
-#include "shared/conf-parser.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "networkd-conf.h"
 %}
diff --git a/src/grp-network/libnetworkd-core/networkd-link-bus.c b/src/grp-network/libnetworkd-core/networkd-link-bus.c
index aa352f447a..e690cfa8f4 100644
--- a/src/grp-network/libnetworkd-core/networkd-link-bus.c
+++ b/src/grp-network/libnetworkd-core/networkd-link-bus.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/parse-util.h"
-#include "basic/strv.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/strv.h"
 
 #include "networkd-link.h"
 #include "networkd.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-link.c b/src/grp-network/libnetworkd-core/networkd-link.c
index d73629d679..ec762080b8 100644
--- a/src/grp-network/libnetworkd-core/networkd-link.c
+++ b/src/grp-network/libnetworkd-core/networkd-link.c
@@ -22,20 +22,20 @@
 
 #include <linux/if.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/set.h"
-#include "basic/socket-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-table.h"
-#include "basic/util.h"
-#include "basic/virt.h"
+#include "sd-bus/bus-util.h"
 #include "sd-netlink/netlink-util.h"
-#include "shared/bus-util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
 #include "systemd-network/dhcp-lease-internal.h"
 #include "systemd-network/network-internal.h"
+#include "systemd-shared/udev-util.h"
 
 #include "networkd-lldp-tx.h"
 #include "networkd-ndisc.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-link.h b/src/grp-network/libnetworkd-core/networkd-link.h
index 5c7b64a243..96315fa57f 100644
--- a/src/grp-network/libnetworkd-core/networkd-link.h
+++ b/src/grp-network/libnetworkd-core/networkd-link.h
@@ -23,15 +23,15 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/list.h"
-#include "basic/set.h"
-#include "sd-netlink/sd-netlink.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/set.h"
 #include "systemd-network/sd-dhcp-client.h"
 #include "systemd-network/sd-dhcp-server.h"
 #include "systemd-network/sd-dhcp6-client.h"
 #include "systemd-network/sd-ipv4ll.h"
 #include "systemd-network/sd-lldp.h"
 #include "systemd-network/sd-ndisc.h"
+#include "systemd-staging/sd-netlink.h"
 
 typedef enum LinkState {
         LINK_STATE_PENDING,
diff --git a/src/grp-network/libnetworkd-core/networkd-lldp-tx.c b/src/grp-network/libnetworkd-core/networkd-lldp-tx.c
index 6a015ec24f..abefb5cb9d 100644
--- a/src/grp-network/libnetworkd-core/networkd-lldp-tx.c
+++ b/src/grp-network/libnetworkd-core/networkd-lldp-tx.c
@@ -21,15 +21,15 @@
 #include <inttypes.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/hostname-util.h"
-#include "basic/parse-util.h"
-#include "basic/random-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-#include "basic/unaligned.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unaligned.h"
 
 #include "networkd-lldp-tx.h"
 #include "networkd.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-manager-bus.c b/src/grp-network/libnetworkd-core/networkd-manager-bus.c
index 53652953fe..735bf75510 100644
--- a/src/grp-network/libnetworkd-core/networkd-manager-bus.c
+++ b/src/grp-network/libnetworkd-core/networkd-manager-bus.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
 
 #include "networkd.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-manager.c b/src/grp-network/libnetworkd-core/networkd-manager.c
index 1bf22edcb7..d7d149ebb5 100644
--- a/src/grp-network/libnetworkd-core/networkd-manager.c
+++ b/src/grp-network/libnetworkd-core/networkd-manager.c
@@ -23,22 +23,22 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/ordered-set.h"
-#include "basic/path-util.h"
-#include "basic/set.h"
-#include "basic/virt.h"
 #include "libudev-private.h"
+#include "sd-bus/bus-util.h"
 #include "sd-netlink/local-addresses.h"
 #include "sd-netlink/netlink-util.h"
-#include "sd-netlink/sd-netlink.h"
-#include "shared/bus-util.h"
-#include "shared/conf-parser.h"
-#include "shared/dns-domain.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/ordered-set.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/dns-domain.h"
+#include "systemd-shared/udev-util.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "networkd.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
index 7e7b8f8804..de6210d76a 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
@@ -22,13 +22,13 @@
 
 #include <linux/if_bonding.h>
 
-#include "basic/alloc-util.h"
-#include "basic/extract-word.h"
-#include "basic/missing.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "sd-netlink/sd-netlink.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "networkd-netdev-bond.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bond.h b/src/grp-network/libnetworkd-core/networkd-netdev-bond.h
index 0ffb91b12e..f7f262ef60 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-bond.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/in-addr-util.h"
-#include "basic/list.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/list.h"
 
 #include "networkd-netdev.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c
index 2de2587e36..0f46869008 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c
@@ -20,8 +20,8 @@
 
 #include <net/if.h>
 
-#include "basic/missing.h"
 #include "sd-netlink/netlink-util.h"
+#include "systemd-basic/missing.h"
 
 #include "networkd-netdev-bridge.h"
 #include "networkd.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf
index e478b53f43..8666b56cf1 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf
@@ -1,9 +1,9 @@
 %{
 #include <stddef.h>
 
-#include "shared/conf-parser.h"
-#include "shared/vlan-util.h"
 #include "systemd-network/network-internal.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/vlan-util.h"
 
 #include "networkd-netdev-bond.h"
 #include "networkd-netdev-bridge.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c
index 724fc86f92..2c91316029 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c
@@ -19,8 +19,8 @@
 
 #include <net/if.h>
 
-#include "basic/string-table.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "networkd-netdev-ipvlan.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h
index a7ccd4922a..f9d103126b 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/missing.h"
+#include "systemd-basic/missing.h"
 
 #include "networkd-netdev.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c
index bf559f1b46..1b1ccbc772 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c
@@ -19,8 +19,8 @@
 
 #include <net/if.h>
 
-#include "basic/string-table.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "networkd-netdev-macvlan.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
index e94c19126b..44a6d9f4e9 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
@@ -24,13 +24,13 @@
 #include <linux/if_tunnel.h>
 #include <linux/ip6_tunnel.h>
 
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "sd-netlink/sd-netlink.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "networkd-link.h"
 #include "networkd-netdev-tunnel.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h
index 09bd86656e..bc2a9f7881 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/in-addr-util.h"
+#include "systemd-basic/in-addr-util.h"
 
 #include "networkd-netdev.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c
index ab5b90fcc9..0660dfc1d6 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c
@@ -26,9 +26,9 @@
 
 #include <linux/if_tun.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/user-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/user-util.h"
 
 #include "networkd-netdev-tuntap.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-veth.c b/src/grp-network/libnetworkd-core/networkd-netdev-veth.c
index fb068c75bf..171fe4012a 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-veth.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-veth.c
@@ -21,7 +21,7 @@
 
 #include <linux/veth.h>
 
-#include "sd-netlink/sd-netlink.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "networkd-netdev-veth.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-vlan.c
index 0c24d5e859..a819edc380 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-vlan.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-vlan.c
@@ -19,7 +19,7 @@
 
 #include <net/if.h>
 
-#include "shared/vlan-util.h"
+#include "systemd-shared/vlan-util.h"
 
 #include "networkd-netdev-vlan.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vrf.c b/src/grp-network/libnetworkd-core/networkd-netdev-vrf.c
index 8f91a11757..c9b281d185 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-vrf.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-vrf.c
@@ -19,8 +19,8 @@
 
 #include <net/if.h>
 
-#include "basic/missing.h"
-#include "sd-netlink/sd-netlink.h"
+#include "systemd-basic/missing.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "networkd-netdev-vrf.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c
index 8c611ac5db..a9df6bd89d 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c
@@ -19,12 +19,12 @@
 
 #include <net/if.h>
 
-#include "basic/alloc-util.h"
-#include "basic/extract-word.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "sd-netlink/sd-netlink.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "networkd-link.h"
 #include "networkd-netdev-vxlan.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h
index 7950c867e3..345c3fc3a0 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/in-addr-util.h"
+#include "systemd-basic/in-addr-util.h"
 
 typedef struct VxLan VxLan;
 
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev.c b/src/grp-network/libnetworkd-core/networkd-netdev.c
index 7cc5969cce..b24bcebd36 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev.c
@@ -19,17 +19,17 @@
 
 #include <net/if.h>
 
-#include "basic/alloc-util.h"
-#include "basic/conf-files.h"
-#include "basic/fd-util.h"
-#include "basic/list.h"
-#include "basic/siphash24.h"
-#include "basic/stat-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
 #include "sd-netlink/netlink-util.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
 #include "systemd-network/network-internal.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "networkd-netdev.h"
 #include "networkd.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev.h b/src/grp-network/libnetworkd-core/networkd-netdev.h
index dcec00af47..08397f0c73 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev.h
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
-#include "basic/time-util.h"
-#include "sd-netlink/sd-netlink.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-staging/sd-netlink.h"
 
 typedef struct netdev_join_callback netdev_join_callback;
 typedef struct Link Link;
diff --git a/src/grp-network/libnetworkd-core/networkd-network-bus.c b/src/grp-network/libnetworkd-core/networkd-network-bus.c
index d4cd275ffe..e8eeb454d2 100644
--- a/src/grp-network/libnetworkd-core/networkd-network-bus.c
+++ b/src/grp-network/libnetworkd-core/networkd-network-bus.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
 
 #include "networkd.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf
index e214790436..8bc398d25f 100644
--- a/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf
+++ b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf
@@ -1,9 +1,9 @@
 %{
 #include <stddef.h>
 
-#include "shared/conf-parser.h"
-#include "shared/vlan-util.h"
 #include "systemd-network/network-internal.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/vlan-util.h"
 
 #include "networkd-conf.h"
 #include "networkd.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-network.c b/src/grp-network/libnetworkd-core/networkd-network.c
index 697b748e52..f0c8daa7a7 100644
--- a/src/grp-network/libnetworkd-core/networkd-network.c
+++ b/src/grp-network/libnetworkd-core/networkd-network.c
@@ -20,19 +20,19 @@
 #include <ctype.h>
 #include <net/if.h>
 
-#include "basic/alloc-util.h"
-#include "basic/conf-files.h"
-#include "basic/fd-util.h"
-#include "basic/hostname-util.h"
-#include "basic/parse-util.h"
-#include "basic/set.h"
-#include "basic/stat-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "shared/conf-parser.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/network-internal.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "networkd-network.h"
 #include "networkd.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-network.h b/src/grp-network/libnetworkd-core/networkd-network.h
index 66430a7c45..6b1da36d28 100644
--- a/src/grp-network/libnetworkd-core/networkd-network.h
+++ b/src/grp-network/libnetworkd-core/networkd-network.h
@@ -21,10 +21,10 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/hashmap.h"
-#include "shared/condition.h"
-#include "shared/resolve-util.h"
+#include "systemd-basic/hashmap.h"
 #include "systemd-network/dhcp-identifier.h"
+#include "systemd-shared/condition.h"
+#include "systemd-shared/resolve-util.h"
 #include "udev.h"
 
 #include "networkd-address.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-route.c b/src/grp-network/libnetworkd-core/networkd-route.c
index f6e2d4858e..0ee94d9c9c 100644
--- a/src/grp-network/libnetworkd-core/networkd-route.c
+++ b/src/grp-network/libnetworkd-core/networkd-route.c
@@ -17,14 +17,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/parse-util.h"
-#include "basic/set.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "sd-netlink/netlink-util.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "networkd-route.h"
 #include "networkd.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-util.c b/src/grp-network/libnetworkd-core/networkd-util.c
index e5a5bce8cb..d0569215ab 100644
--- a/src/grp-network/libnetworkd-core/networkd-util.c
+++ b/src/grp-network/libnetworkd-core/networkd-util.c
@@ -17,11 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/parse-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "networkd-util.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-util.h b/src/grp-network/libnetworkd-core/networkd-util.h
index d023782285..49ac1b0dc5 100644
--- a/src/grp-network/libnetworkd-core/networkd-util.h
+++ b/src/grp-network/libnetworkd-core/networkd-util.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef enum AddressFamilyBoolean {
         /* This is a bitmask, though it usually doesn't feel that way! */
diff --git a/src/grp-network/libnetworkd-core/networkd.h b/src/grp-network/libnetworkd-core/networkd.h
index dbc846a07e..c788ad0fcb 100644
--- a/src/grp-network/libnetworkd-core/networkd.h
+++ b/src/grp-network/libnetworkd-core/networkd.h
@@ -24,10 +24,10 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-#include "basic/hashmap.h"
-#include "basic/list.h"
-#include "sd-netlink/sd-netlink.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
 #include "systemd-network/dhcp-identifier.h"
+#include "systemd-staging/sd-netlink.h"
 #include "udev.h"
 
 #include "networkd-address-pool.h"
diff --git a/src/grp-network/networkctl/networkctl.c b/src/grp-network/networkctl/networkctl.c
index bedcca9a0e..ec449d8dcb 100644
--- a/src/grp-network/networkctl/networkctl.c
+++ b/src/grp-network/networkctl/networkctl.c
@@ -21,32 +21,32 @@
 #include <net/if.h>
 #include <stdbool.h>
 
-#include "basic/alloc-util.h"
-#include "basic/arphrd-list.h"
-#include "basic/ether-addr-util.h"
-#include "basic/fd-util.h"
-#include "basic/locale-util.h"
-#include "basic/parse-util.h"
-#include "basic/socket-util.h"
-#include "basic/sparse-endian.h"
-#include "basic/stdio-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/strxcpyx.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
-#include "basic/verbs.h"
 #include "sd-device/device-util.h"
-#include "sd-device/sd-device.h"
 #include "sd-hwdb/hwdb-util.h"
-#include "sd-hwdb/sd-hwdb.h"
 #include "sd-netlink/local-addresses.h"
 #include "sd-netlink/netlink-util.h"
-#include "sd-netlink/sd-netlink.h"
-#include "sd-network/sd-network.h"
-#include "shared/pager.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/arphrd-list.h"
+#include "systemd-basic/ether-addr-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/strxcpyx.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/verbs.h"
 #include "systemd-network/sd-lldp.h"
+#include "systemd-shared/pager.h"
+#include "systemd-staging/sd-device.h"
+#include "systemd-staging/sd-hwdb.h"
+#include "systemd-staging/sd-netlink.h"
+#include "systemd-staging/sd-network.h"
 
 static bool arg_no_pager = false;
 static bool arg_legend = true;
diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c
index 29384baca3..535f4087f8 100644
--- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c
+++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-link.c
@@ -18,9 +18,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
-#include "sd-network/sd-network.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-staging/sd-network.h"
 
 #include "networkd-wait-online-link.h"
 
diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c
index e4f6d68f16..7113479d91 100644
--- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c
+++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c
@@ -22,10 +22,10 @@
 
 #include <linux/if.h>
 
-#include "basic/alloc-util.h"
-#include "basic/time-util.h"
-#include "basic/util.h"
 #include "sd-netlink/netlink-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/network-internal.h"
 
 #include "networkd-wait-online-link.h"
diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c
index feea7c9f34..9b250102dc 100644
--- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c
+++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.c
@@ -22,8 +22,8 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/signal-util.h"
-#include "basic/strv.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
 
 #include "networkd-wait-online.h"
 
diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h
index b0d70a18d0..e8c749b840 100644
--- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h
+++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online.h
@@ -21,9 +21,9 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/hashmap.h"
-#include "sd-netlink/sd-netlink.h"
-#include "sd-network/sd-network.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-staging/sd-netlink.h"
+#include "systemd-staging/sd-network.h"
 
 typedef struct Manager Manager;
 
diff --git a/src/grp-network/systemd-networkd/Makefile b/src/grp-network/systemd-networkd/Makefile
index d6ef3bb91d..9036159c70 100644
--- a/src/grp-network/systemd-networkd/Makefile
+++ b/src/grp-network/systemd-networkd/Makefile
@@ -30,12 +30,12 @@ systemd_networkd_SOURCES = \
 	src/network/networkd.c
 
 systemd_networkd_LDADD = \
-	libbasic.la \
+	libsystemd-basic.la \
 	libnetworkd-core.la
 
 ifneq ($(HAVE_LIBIPTC),)
 systemd_networkd_LDADD += \
-	libfirewall.la
+	libsystemd-firewall.la
 endif # HAVE_LIBIPTC
 
 dist_systemunit_DATA += \
diff --git a/src/grp-network/systemd-networkd/networkd.c b/src/grp-network/systemd-networkd/networkd.c
index 4f79dfd409..369cf91221 100644
--- a/src/grp-network/systemd-networkd/networkd.c
+++ b/src/grp-network/systemd-networkd/networkd.c
@@ -19,11 +19,11 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/capability-util.h"
-#include "basic/signal-util.h"
-#include "basic/user-util.h"
 #include "networkd-conf.h"
 #include "networkd.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/user-util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_manager_free_ Manager *m = NULL;
diff --git a/src/grp-network/test-network-tables.c b/src/grp-network/test-network-tables.c
index 366471e8bd..89c7591778 100644
--- a/src/grp-network/test-network-tables.c
+++ b/src/grp-network/test-network-tables.c
@@ -3,9 +3,9 @@
 #include "networkd-netdev-macvlan.h"
 #include "networkd.h"
 #include "sd-netlink/netlink-internal.h"
-#include "shared/test-tables.h"
 #include "systemd-network/dhcp6-internal.h"
 #include "systemd-network/dhcp6-protocol.h"
+#include "systemd-shared/test-tables.h"
 
 int main(int argc, char **argv) {
         test_table(bond_mode, NETDEV_BOND_MODE);
diff --git a/src/grp-network/test-network.c b/src/grp-network/test-network.c
index a6af304d03..e94aea1765 100644
--- a/src/grp-network/test-network.c
+++ b/src/grp-network/test-network.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
 #include "networkd.h"
+#include "systemd-basic/alloc-util.h"
 #include "systemd-network/dhcp-lease-internal.h"
 #include "systemd-network/network-internal.h"
 
diff --git a/src/grp-network/test-networkd-conf.c b/src/grp-network/test-networkd-conf.c
index d6a24281bb..ca9559b9ce 100644
--- a/src/grp-network/test-networkd-conf.c
+++ b/src/grp-network/test-networkd-conf.c
@@ -17,13 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/ether-addr-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
 #include "networkd-conf.h"
 #include "networkd-network.h"
+#include "systemd-basic/ether-addr-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
 #include "systemd-network/network-internal.h"
 
 static void test_config_parse_duid_type_one(const char *rvalue, int ret, DUIDType expected) {
diff --git a/src/grp-resolve/libbasic-dns/Makefile b/src/grp-resolve/libbasic-dns/Makefile
index e5c32d8539..294283d062 100644
--- a/src/grp-resolve/libbasic-dns/Makefile
+++ b/src/grp-resolve/libbasic-dns/Makefile
@@ -121,7 +121,7 @@ test_dnssec_complex_LDADD = \
 	libsystemd-shared.la
 
 noinst_LTLIBRARIES = libbasic-dns.la
-libbasic_dns_la_LIBADD = libshared.la
+libbasic_dns_la_LIBADD = libsystemd-shared.la
 $(outdir)/dns-type.lo: $(outdir)/dns_type-from-name.h $(outdir)/dns_type-to-name.h
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-resolve/libbasic-dns/dns-type.c b/src/grp-resolve/libbasic-dns/dns-type.c
index eceb72f545..44e4970fbf 100644
--- a/src/grp-resolve/libbasic-dns/dns-type.c
+++ b/src/grp-resolve/libbasic-dns/dns-type.c
@@ -19,8 +19,8 @@
 
 #include <sys/socket.h>
 
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "dns-type.h"
 
diff --git a/src/grp-resolve/libbasic-dns/dns-type.h b/src/grp-resolve/libbasic-dns/dns-type.h
index be548b6073..df1642f85e 100644
--- a/src/grp-resolve/libbasic-dns/dns-type.h
+++ b/src/grp-resolve/libbasic-dns/dns-type.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 /* DNS record types, taken from
  * http://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml.
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-answer.c b/src/grp-resolve/libbasic-dns/resolved-dns-answer.c
index c45505b441..95c1398056 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-answer.c
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-answer.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "resolved-dns-answer.h"
 #include "resolved-dns-dnssec.h"
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-answer.h b/src/grp-resolve/libbasic-dns/resolved-dns-answer.h
index bbb836fc7e..447604d008 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-answer.h
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-answer.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef struct DnsAnswer DnsAnswer;
 typedef struct DnsAnswerItem DnsAnswerItem;
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c
index a53f2daa28..6b14287a51 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c
@@ -21,11 +21,11 @@
 #include <gcrypt.h>
 #endif
 
-#include "basic/alloc-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/string-table.h"
-#include "shared/dns-domain.h"
-#include "shared/gcrypt-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-gcrypt/gcrypt-util.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "resolved-dns-dnssec.h"
 #include "resolved-dns-packet.h"
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h
index b73cc24100..b91abe98ac 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "shared/dns-domain.h"
+#include "systemd-shared/dns-domain.h"
 
 typedef enum DnssecResult DnssecResult;
 typedef enum DnssecVerdict DnssecVerdict;
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-packet.c b/src/grp-resolve/libbasic-dns/resolved-dns-packet.c
index e5a497e0ed..28667bb3e8 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-packet.c
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-packet.c
@@ -17,13 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
-#include "basic/alloc-util.h"
-#include "basic/string-table.h"
-#include "basic/strv.h"
-#include "basic/unaligned.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unaligned.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "resolved-dns-packet.h"
 
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-packet.h b/src/grp-resolve/libbasic-dns/resolved-dns-packet.h
index a9e95ebd75..cb03de8986 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-packet.h
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-packet.h
@@ -22,10 +22,10 @@
 #include <netinet/ip.h>
 #include <netinet/udp.h>
 
-#include "basic/hashmap.h"
-#include "basic/in-addr-util.h"
-#include "basic/macro.h"
-#include "basic/sparse-endian.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/sparse-endian.h"
 
 typedef struct DnsPacket DnsPacket;
 typedef struct DnsPacketHeader DnsPacketHeader;
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-question.c b/src/grp-resolve/libbasic-dns/resolved-dns-question.c
index ee53dbff9d..686bc01a09 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-question.c
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-question.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "dns-type.h"
 #include "resolved-dns-question.h"
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-question.h b/src/grp-resolve/libbasic-dns/resolved-dns-question.h
index fe47a6bd9e..fb1b2d2410 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-question.h
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-question.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef struct DnsQuestion DnsQuestion;
 
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-rr.c b/src/grp-resolve/libbasic-dns/resolved-dns-rr.c
index 73ca3c7fb9..fbe0ff65d6 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-rr.c
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-rr.c
@@ -19,14 +19,14 @@
 
 #include <math.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/hexdecoct.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "dns-type.h"
 #include "resolved-dns-dnssec.h"
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-rr.h b/src/grp-resolve/libbasic-dns/resolved-dns-rr.h
index 13240e57ed..864c7c237f 100644
--- a/src/grp-resolve/libbasic-dns/resolved-dns-rr.h
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-rr.h
@@ -21,11 +21,11 @@
 
 #include <netinet/in.h>
 
-#include "basic/bitmap.h"
-#include "basic/hashmap.h"
-#include "basic/in-addr-util.h"
-#include "basic/list.h"
-#include "basic/string-util.h"
+#include "systemd-basic/bitmap.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/string-util.h"
 
 #include "dns-type.h"
 
diff --git a/src/grp-resolve/libbasic-dns/test-dns-packet.c b/src/grp-resolve/libbasic-dns/test-dns-packet.c
index c9e210fa94..059011513c 100644
--- a/src/grp-resolve/libbasic-dns/test-dns-packet.c
+++ b/src/grp-resolve/libbasic-dns/test-dns-packet.c
@@ -20,14 +20,14 @@
 #include <glob.h>
 #include <net/if.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fileio.h"
-#include "basic/glob-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unaligned.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/glob-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unaligned.h"
 
 #include "resolved-dns-packet.h"
 #include "resolved-dns-rr.h"
diff --git a/src/grp-resolve/libbasic-dns/test-dnssec-complex.c b/src/grp-resolve/libbasic-dns/test-dnssec-complex.c
index ef78cd1ea5..afa01d9858 100644
--- a/src/grp-resolve/libbasic-dns/test-dnssec-complex.c
+++ b/src/grp-resolve/libbasic-dns/test-dnssec-complex.c
@@ -21,12 +21,12 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/af-list.h"
-#include "basic/alloc-util.h"
-#include "basic/random-util.h"
-#include "basic/string-util.h"
-#include "basic/time-util.h"
 #include "sd-bus/bus-common-errors.h"
+#include "systemd-basic/af-list.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/time-util.h"
 
 #include "dns-type.h"
 
diff --git a/src/grp-resolve/libbasic-dns/test-dnssec.c b/src/grp-resolve/libbasic-dns/test-dnssec.c
index 1f05196d8e..1e7b4913b0 100644
--- a/src/grp-resolve/libbasic-dns/test-dnssec.c
+++ b/src/grp-resolve/libbasic-dns/test-dnssec.c
@@ -21,9 +21,9 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/string-util.h"
 
 #include "resolved-dns-dnssec.h"
 #include "resolved-dns-rr.h"
diff --git a/src/grp-resolve/libbasic-dns/test-resolve-tables.c b/src/grp-resolve/libbasic-dns/test-resolve-tables.c
index 0eaab70687..6f96235dec 100644
--- a/src/grp-resolve/libbasic-dns/test-resolve-tables.c
+++ b/src/grp-resolve/libbasic-dns/test-resolve-tables.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "shared/test-tables.h"
+#include "systemd-shared/test-tables.h"
 
 #include "dns-type.h"
 
diff --git a/src/grp-resolve/nss-resolve/Makefile b/src/grp-resolve/nss-resolve/Makefile
index badbacdb3a..f1456dd725 100644
--- a/src/grp-resolve/nss-resolve/Makefile
+++ b/src/grp-resolve/nss-resolve/Makefile
@@ -37,7 +37,7 @@ libnss_resolve_la_LDFLAGS = \
 
 libnss_resolve_la_LIBADD = \
 	libsystemd-internal.la \
-	libbasic.la \
+	libsystemd-basic.la \
         -ldl
 
 lib_LTLIBRARIES += \
diff --git a/src/grp-resolve/nss-resolve/nss-resolve.c b/src/grp-resolve/nss-resolve/nss-resolve.c
index e316803a58..49ca4767e2 100644
--- a/src/grp-resolve/nss-resolve/nss-resolve.c
+++ b/src/grp-resolve/nss-resolve/nss-resolve.c
@@ -26,13 +26,13 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/in-addr-util.h"
-#include "basic/macro.h"
-#include "basic/nss-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-common-errors.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/nss-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 NSS_GETHOSTBYNAME_PROTOTYPES(resolve);
 NSS_GETHOSTBYADDR_PROTOTYPES(resolve);
diff --git a/src/grp-resolve/systemd-resolve/resolve-tool.c b/src/grp-resolve/systemd-resolve/resolve-tool.c
index 433a103b57..6cdf125ca4 100644
--- a/src/grp-resolve/systemd-resolve/resolve-tool.c
+++ b/src/grp-resolve/systemd-resolve/resolve-tool.c
@@ -22,21 +22,21 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/af-list.h"
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/in-addr-util.h"
-#include "basic/parse-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
 #include "resolved-def.h"
 #include "resolved-dns-packet.h"
 #include "sd-bus/bus-error.h"
+#include "sd-bus/bus-util.h"
 #include "sd-netlink/netlink-util.h"
-#include "sd-netlink/sd-netlink.h"
-#include "shared/bus-util.h"
-#include "shared/gcrypt-util.h"
-#include "shared/pager.h"
+#include "systemd-basic/af-list.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-gcrypt/gcrypt-util.h"
+#include "systemd-shared/pager.h"
+#include "systemd-staging/sd-netlink.h"
 
 #define DNS_CALL_TIMEOUT_USEC (45*USEC_PER_SEC)
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-bus.c b/src/grp-resolve/systemd-resolved/resolved-bus.c
index 3c2a8b0892..1bef48a040 100644
--- a/src/grp-resolve/systemd-resolved/resolved-bus.c
+++ b/src/grp-resolve/systemd-resolved/resolved-bus.c
@@ -17,11 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
 #include "resolved-def.h"
 #include "sd-bus/bus-common-errors.h"
-#include "shared/bus-util.h"
-#include "shared/dns-domain.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "resolved-bus.h"
 #include "resolved-dns-synthesize.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-conf.c b/src/grp-resolve/systemd-resolved/resolved-conf.c
index c6d70b5938..49667ec128 100644
--- a/src/grp-resolve/systemd-resolved/resolved-conf.c
+++ b/src/grp-resolve/systemd-resolved/resolved-conf.c
@@ -17,12 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/extract-word.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "resolved-conf.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-cache.c b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
index 690ed6f0c1..fa4a2a42d1 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
@@ -19,12 +19,12 @@
 
 #include <net/if.h>
 
-#include "basic/af-list.h"
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
 #include "resolved-dns-answer.h"
 #include "resolved-dns-packet.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/af-list.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "resolved-dns-cache.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-cache.h b/src/grp-resolve/systemd-resolved/resolved-dns-cache.h
index 7c1581c99b..5c3d850bc8 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-cache.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-cache.h
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/hashmap.h"
-#include "basic/list.h"
-#include "basic/prioq.h"
-#include "basic/time-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/prioq.h"
+#include "systemd-basic/time-util.h"
 
 typedef struct DnsCache {
         Hashmap *by_key;
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-query.c b/src/grp-resolve/systemd-resolved/resolved-dns-query.c
index 3a187ee349..5b5cc8b532 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-query.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.c
@@ -17,12 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/hostname-util.h"
-#include "basic/string-util.h"
 #include "dns-type.h"
 #include "sd-netlink/local-addresses.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "resolved-dns-query.h"
 #include "resolved-dns-synthesize.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-query.h b/src/grp-resolve/systemd-resolved/resolved-dns-query.h
index a501cb1203..04d3034499 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-query.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.h
@@ -22,9 +22,9 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/set.h"
 #include "resolved-dns-answer.h"
 #include "resolved-dns-question.h"
+#include "systemd-basic/set.h"
 
 typedef struct DnsQuery DnsQuery;
 typedef struct DnsQueryCandidate DnsQueryCandidate;
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-scope.c b/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
index 9da091b5e9..9b7883a410 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
@@ -19,15 +19,15 @@
 
 #include <netinet/tcp.h>
 
-#include "basic/af-list.h"
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/hostname-util.h"
-#include "basic/missing.h"
-#include "basic/random-util.h"
-#include "basic/socket-util.h"
-#include "basic/strv.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/af-list.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "resolved-dns-scope.h"
 #include "resolved-llmnr.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-scope.h b/src/grp-resolve/systemd-resolved/resolved-dns-scope.h
index c4bc95da45..6e7d0e5e79 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-scope.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-scope.h
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
 #include "resolved-dns-dnssec.h"
 #include "resolved-dns-packet.h"
+#include "systemd-basic/list.h"
 
 typedef struct DnsScope DnsScope;
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
index 7798c498a0..5ddbc7504e 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "resolved-dns-search-domain.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.h b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.h
index f047941db2..53b4f3207a 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef struct DnsSearchDomain DnsSearchDomain;
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-server.c b/src/grp-resolve/systemd-resolved/resolved-dns-server.c
index bc97d89219..2274eedae2 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-server.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-server.c
@@ -19,10 +19,10 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/siphash24.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
 
 #include "resolved-dns-server.h"
 #include "resolved-dns-stub.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-server.h b/src/grp-resolve/systemd-resolved/resolved-dns-server.h
index e1f0ac5fd9..66acd04085 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-server.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-server.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/in-addr-util.h"
+#include "systemd-basic/in-addr-util.h"
 
 typedef struct DnsServer DnsServer;
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-stream.c b/src/grp-resolve/systemd-resolved/resolved-dns-stream.c
index 4ba5b797b7..353d5f7a45 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-stream.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-stream.c
@@ -19,10 +19,10 @@
 
 #include <netinet/tcp.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/io-util.h"
-#include "basic/missing.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/missing.h"
 
 #include "resolved-dns-stream.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-stream.h b/src/grp-resolve/systemd-resolved/resolved-dns-stream.h
index 6538da457a..7af574411b 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-stream.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-stream.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/socket-util.h"
 #include "resolved-dns-packet.h"
+#include "systemd-basic/socket-util.h"
 
 typedef struct DnsStream DnsStream;
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-stub.c b/src/grp-resolve/systemd-resolved/resolved-dns-stub.c
index 520a67a7b4..e7aa7a1c38 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-stub.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-stub.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/fd-util.h"
-#include "basic/socket-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/socket-util.h"
 
 #include "resolved-dns-stub.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c
index 16e0410f98..53d1940d9e 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/hostname-util.h"
 #include "sd-netlink/local-addresses.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hostname-util.h"
 
 #include "resolved-dns-synthesize.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
index 3cf72e0ff8..a5ae8d0853 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
@@ -19,13 +19,13 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/af-list.h"
-#include "basic/alloc-util.h"
-#include "basic/errno-list.h"
-#include "basic/fd-util.h"
-#include "basic/random-util.h"
-#include "basic/string-table.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/af-list.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/errno-list.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "resolved-dns-cache.h"
 #include "resolved-dns-transaction.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
index c9f221d425..fb0e76b917 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
@@ -19,18 +19,18 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/conf-files.h"
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/hexdecoct.h"
-#include "basic/parse-util.h"
-#include "basic/set.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
 #include "resolved-dns-dnssec.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "resolved-dns-trust-anchor.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h
index ee5cda0748..6d1b2d3655 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/hashmap.h"
 #include "resolved-dns-answer.h"
 #include "resolved-dns-rr.h"
+#include "systemd-basic/hashmap.h"
 
 typedef struct DnsTrustAnchor DnsTrustAnchor;
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-zone.c b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
index d3ef27fefd..4b6f571447 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
@@ -17,11 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/list.h"
-#include "basic/string-util.h"
 #include "resolved-dns-packet.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "resolved-dns-zone.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-zone.h b/src/grp-resolve/systemd-resolved/resolved-dns-zone.h
index 789fe24cde..c5ba404cbf 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-zone.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-zone.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/hashmap.h"
+#include "systemd-basic/hashmap.h"
 
 typedef struct DnsZone {
         Hashmap *by_key;
diff --git a/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c
index 2bab6fdc35..942c06605e 100644
--- a/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c
+++ b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.c
@@ -17,12 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/hostname-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/time-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/time-util.h"
 
 #include "resolved-dns-synthesize.h"
 #include "resolved-etc-hosts.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-gperf.gperf b/src/grp-resolve/systemd-resolved/resolved-gperf.gperf
index f3a7c48abc..6f8df3b533 100644
--- a/src/grp-resolve/systemd-resolved/resolved-gperf.gperf
+++ b/src/grp-resolve/systemd-resolved/resolved-gperf.gperf
@@ -1,7 +1,7 @@
 %{
 #include <stddef.h>
 
-#include "shared/conf-parser.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "resolved-conf.h"
 %}
diff --git a/src/grp-resolve/systemd-resolved/resolved-link-bus.c b/src/grp-resolve/systemd-resolved/resolved-link-bus.c
index 9cbadece42..bea3c35829 100644
--- a/src/grp-resolve/systemd-resolved/resolved-link-bus.c
+++ b/src/grp-resolve/systemd-resolved/resolved-link-bus.c
@@ -17,12 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/parse-util.h"
-#include "basic/strv.h"
 #include "sd-bus/bus-common-errors.h"
-#include "shared/bus-util.h"
-#include "shared/resolve-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-shared/resolve-util.h"
 
 #include "resolved-bus.h"
 #include "resolved-link-bus.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-link.c b/src/grp-resolve/systemd-resolved/resolved-link.c
index d37ebbc419..ccfcc70d1a 100644
--- a/src/grp-resolve/systemd-resolved/resolved-link.c
+++ b/src/grp-resolve/systemd-resolved/resolved-link.c
@@ -19,15 +19,15 @@
 
 #include <net/if.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "sd-network/sd-network.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-staging/sd-network.h"
 
 #include "resolved-link.h"
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-link.h b/src/grp-resolve/systemd-resolved/resolved-link.h
index def8b097e4..0d3d54a620 100644
--- a/src/grp-resolve/systemd-resolved/resolved-link.h
+++ b/src/grp-resolve/systemd-resolved/resolved-link.h
@@ -21,10 +21,10 @@
 
 #include <net/if.h>
 
-#include "basic/in-addr-util.h"
-#include "basic/ratelimit.h"
 #include "resolved-dns-rr.h"
-#include "shared/resolve-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-shared/resolve-util.h"
 
 typedef struct Link Link;
 typedef struct LinkAddress LinkAddress;
diff --git a/src/grp-resolve/systemd-resolved/resolved-llmnr.c b/src/grp-resolve/systemd-resolved/resolved-llmnr.c
index 1092b8b659..2a22f20790 100644
--- a/src/grp-resolve/systemd-resolved/resolved-llmnr.c
+++ b/src/grp-resolve/systemd-resolved/resolved-llmnr.c
@@ -20,7 +20,7 @@
 #include <netinet/in.h>
 #include <resolv.h>
 
-#include "basic/fd-util.h"
+#include "systemd-basic/fd-util.h"
 
 #include "resolved-llmnr.h"
 #include "resolved-manager.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-manager.c b/src/grp-resolve/systemd-resolved/resolved-manager.c
index 0fff82bd98..a7a2916ce9 100644
--- a/src/grp-resolve/systemd-resolved/resolved-manager.c
+++ b/src/grp-resolve/systemd-resolved/resolved-manager.c
@@ -21,22 +21,22 @@
 #include <poll.h>
 #include <sys/ioctl.h>
 
-#include "basic/af-list.h"
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio-label.h"
-#include "basic/hostname-util.h"
-#include "basic/io-util.h"
-#include "basic/ordered-set.h"
-#include "basic/parse-util.h"
-#include "basic/random-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/utf8.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/af-list.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio-label.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/ordered-set.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/utf8.h"
 #include "systemd-network/network-internal.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "resolved-bus.h"
 #include "resolved-conf.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-manager.h b/src/grp-resolve/systemd-resolved/resolved-manager.h
index 6c5274ce56..2e187efeb5 100644
--- a/src/grp-resolve/systemd-resolved/resolved-manager.h
+++ b/src/grp-resolve/systemd-resolved/resolved-manager.h
@@ -21,12 +21,12 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/hashmap.h"
-#include "basic/list.h"
-#include "basic/ordered-set.h"
-#include "sd-netlink/sd-netlink.h"
-#include "sd-network/sd-network.h"
-#include "shared/resolve-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/ordered-set.h"
+#include "systemd-shared/resolve-util.h"
+#include "systemd-staging/sd-netlink.h"
+#include "systemd-staging/sd-network.h"
 
 typedef struct Manager Manager;
 
diff --git a/src/grp-resolve/systemd-resolved/resolved-mdns.c b/src/grp-resolve/systemd-resolved/resolved-mdns.c
index 0c78f7bda5..f810019763 100644
--- a/src/grp-resolve/systemd-resolved/resolved-mdns.c
+++ b/src/grp-resolve/systemd-resolved/resolved-mdns.c
@@ -21,7 +21,7 @@
 #include <netinet/in.h>
 #include <resolv.h>
 
-#include "basic/fd-util.h"
+#include "systemd-basic/fd-util.h"
 
 #include "resolved-manager.h"
 #include "resolved-mdns.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
index 5d6b4203bc..01b6481016 100644
--- a/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
+++ b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
@@ -19,14 +19,14 @@
 
 #include <resolv.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio-label.h"
-#include "basic/fileio.h"
-#include "basic/ordered-set.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio-label.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/ordered-set.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-shared/dns-domain.h"
 
 #include "resolved-conf.h"
 #include "resolved-resolv-conf.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved.c b/src/grp-resolve/systemd-resolved/resolved.c
index 39fa423eeb..7fe9b7edbb 100644
--- a/src/grp-resolve/systemd-resolved/resolved.c
+++ b/src/grp-resolve/systemd-resolved/resolved.c
@@ -20,11 +20,11 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
-#include "basic/capability-util.h"
-#include "basic/mkdir.h"
-#include "basic/selinux-util.h"
-#include "basic/signal-util.h"
-#include "basic/user-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/user-util.h"
 
 #include "resolved-conf.h"
 #include "resolved-manager.h"
diff --git a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c
index e27ae4f5c5..2f5b1e4da3 100644
--- a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c
+++ b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c
@@ -19,15 +19,15 @@
 
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/path-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
 #include "manager.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/pager.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/pager.h"
 
 #include "analyze-verify.h"
 
diff --git a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h
index 7b89007fd0..33b809997a 100644
--- a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h
+++ b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h
@@ -21,6 +21,6 @@
 
 #include <stdbool.h>
 
-#include "shared/path-lookup.h"
+#include "systemd-shared/path-lookup.h"
 
 int verify_units(char **filenames, UnitFileScope scope, bool check_man);
diff --git a/src/grp-system/grp-utils/systemd-analyze/analyze.c b/src/grp-system/grp-utils/systemd-analyze/analyze.c
index e79a109651..ea775c8dd1 100644
--- a/src/grp-system/grp-utils/systemd-analyze/analyze.c
+++ b/src/grp-system/grp-utils/systemd-analyze/analyze.c
@@ -25,22 +25,22 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/glob-util.h"
-#include "basic/hashmap.h"
-#include "basic/locale-util.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/special.h"
-#include "basic/strv.h"
-#include "basic/strxcpyx.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-unit-util.h"
-#include "shared/bus-util.h"
-#include "shared/pager.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/glob-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/strxcpyx.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/bus-unit-util.h"
+#include "systemd-shared/pager.h"
 
 #include "analyze-verify.h"
 
diff --git a/src/grp-system/grp-utils/systemd-delta/delta.c b/src/grp-system/grp-utils/systemd-delta/delta.c
index 5da779624d..0142803b46 100644
--- a/src/grp-system/grp-utils/systemd-delta/delta.c
+++ b/src/grp-system/grp-utils/systemd-delta/delta.c
@@ -24,23 +24,23 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/hashmap.h"
-#include "basic/locale-util.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
-#include "shared/pager.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/pager.h"
 
 static const char prefixes[] =
         "/etc\0"
diff --git a/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c b/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c
index 70866cacda..d4ca2551fa 100644
--- a/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c
+++ b/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c
@@ -23,24 +23,24 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
-#include "basic/virt.h"
-#include "shared/fstab-util.h"
-#include "shared/generator.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/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/fstab-util.h"
+#include "systemd-shared/generator.h"
 
 #include "mount-setup.h"
 
diff --git a/src/grp-system/grp-utils/systemd-run/run.c b/src/grp-system/grp-utils/systemd-run/run.c
index 4aaf446177..a68938fb71 100644
--- a/src/grp-system/grp-utils/systemd-run/run.c
+++ b/src/grp-system/grp-utils/systemd-run/run.c
@@ -23,23 +23,23 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/calendarspec.h"
-#include "basic/env-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/signal-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-unit-util.h"
-#include "shared/bus-util.h"
-#include "shared/ptyfwd.h"
-#include "shared/spawn-polkit-agent.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/calendarspec.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/bus-unit-util.h"
+#include "systemd-shared/ptyfwd.h"
+#include "systemd-shared/spawn-polkit-agent.h"
 
 static bool arg_ask_password = true;
 static bool arg_scope = false;
diff --git a/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c b/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c
index de973034be..873cab1c5c 100644
--- a/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c
+++ b/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c
@@ -23,24 +23,24 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/hashmap.h"
-#include "basic/hexdecoct.h"
-#include "basic/log.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/set.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
-#include "shared/install.h"
-#include "shared/path-lookup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/install.h"
+#include "systemd-shared/path-lookup.h"
 
 static const struct {
         const char *path;
diff --git a/src/grp-system/libcore/audit-fd.c b/src/grp-system/libcore/audit-fd.c
index 8ea525eda3..12509951b7 100644
--- a/src/grp-system/libcore/audit-fd.c
+++ b/src/grp-system/libcore/audit-fd.c
@@ -27,9 +27,9 @@
 #include <libaudit.h>
 #include <stdbool.h>
 
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/util.h"
 
 static bool initialized = false;
 static int audit_fd;
diff --git a/src/grp-system/libcore/automount.c b/src/grp-system/libcore/automount.c
index 30c30469ca..ffe84c0cbb 100644
--- a/src/grp-system/libcore/automount.c
+++ b/src/grp-system/libcore/automount.c
@@ -28,24 +28,24 @@
 #include <linux/auto_dev-ioctl.h>
 #include <linux/auto_fs4.h>
 
-#include "basic/alloc-util.h"
-#include "basic/async.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/io-util.h"
-#include "basic/label.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/special.h"
-#include "basic/stdio-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/async.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
 
 #include "automount.h"
 #include "dbus-automount.h"
diff --git a/src/grp-system/libcore/bus-policy.c b/src/grp-system/libcore/bus-policy.c
index b6dc2f5438..38fcfd5fa9 100644
--- a/src/grp-system/libcore/bus-policy.c
+++ b/src/grp-system/libcore/bus-policy.c
@@ -19,12 +19,12 @@
 
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/string-table.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-kernel.h"
 #include "sd-bus/kdbus.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "bus-policy.h"
 
diff --git a/src/grp-system/libcore/bus-policy.h b/src/grp-system/libcore/bus-policy.h
index 8cb6910c00..a338f29af6 100644
--- a/src/grp-system/libcore/bus-policy.h
+++ b/src/grp-system/libcore/bus-policy.h
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
-#include "basic/macro.h"
 #include "sd-bus/kdbus.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/macro.h"
 
 typedef struct BusNamePolicy BusNamePolicy;
 
diff --git a/src/grp-system/libcore/busname.c b/src/grp-system/libcore/busname.c
index f21a2d23c1..ff05c4194b 100644
--- a/src/grp-system/libcore/busname.c
+++ b/src/grp-system/libcore/busname.c
@@ -19,19 +19,19 @@
 
 #include <sys/mman.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
 #include "sd-bus/bus-internal.h"
 #include "sd-bus/bus-kernel.h"
+#include "sd-bus/bus-util.h"
 #include "sd-bus/kdbus.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
 
 #include "bus-policy.h"
 #include "busname.h"
diff --git a/src/grp-system/libcore/cgroup.c b/src/grp-system/libcore/cgroup.c
index 0c1365f329..e1143d28e1 100644
--- a/src/grp-system/libcore/cgroup.c
+++ b/src/grp-system/libcore/cgroup.c
@@ -20,18 +20,18 @@
 #include <fcntl.h>
 #include <fnmatch.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/special.h"
-#include "basic/stdio-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
 
 #include "cgroup.h"
 
diff --git a/src/grp-system/libcore/cgroup.h b/src/grp-system/libcore/cgroup.h
index bf40c3cc74..0026609570 100644
--- a/src/grp-system/libcore/cgroup.h
+++ b/src/grp-system/libcore/cgroup.h
@@ -21,9 +21,9 @@
 
 #include <stdbool.h>
 
-#include "basic/cgroup-util.h"
-#include "basic/list.h"
-#include "basic/time-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/time-util.h"
 
 typedef struct CGroupContext CGroupContext;
 typedef struct CGroupDeviceAllow CGroupDeviceAllow;
diff --git a/src/grp-system/libcore/dbus-automount.c b/src/grp-system/libcore/dbus-automount.c
index 2949c49a3f..7033c1b1d3 100644
--- a/src/grp-system/libcore/dbus-automount.c
+++ b/src/grp-system/libcore/dbus-automount.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "automount.h"
 #include "dbus-automount.h"
diff --git a/src/grp-system/libcore/dbus-busname.c b/src/grp-system/libcore/dbus-busname.c
index 65815bb826..8db3c67a73 100644
--- a/src/grp-system/libcore/dbus-busname.c
+++ b/src/grp-system/libcore/dbus-busname.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "busname.h"
 #include "dbus-busname.h"
diff --git a/src/grp-system/libcore/dbus-cgroup.c b/src/grp-system/libcore/dbus-cgroup.c
index da1c333043..30afc2f7e4 100644
--- a/src/grp-system/libcore/dbus-cgroup.c
+++ b/src/grp-system/libcore/dbus-cgroup.c
@@ -17,12 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/path-util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/path-util.h"
 
 #include "cgroup.h"
 #include "dbus-cgroup.h"
diff --git a/src/grp-system/libcore/dbus-execute.c b/src/grp-system/libcore/dbus-execute.c
index f7c217efc1..2578ce6552 100644
--- a/src/grp-system/libcore/dbus-execute.c
+++ b/src/grp-system/libcore/dbus-execute.c
@@ -23,29 +23,29 @@
 #include <seccomp.h>
 #endif
 
-#include "basic/af-list.h"
-#include "basic/alloc-util.h"
-#include "basic/capability-util.h"
-#include "basic/env-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/ioprio.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/rlimit-util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/af-list.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/ioprio.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/rlimit-util.h"
 
 #include "dbus-execute.h"
 #include "execute.h"
 #include "namespace.h"
 #ifdef HAVE_SECCOMP
-#include "shared/seccomp-util.h"
+#include "systemd-shared/seccomp-util.h"
 #endif
-#include "basic/strv.h"
-#include "basic/syslog-util.h"
-#include "basic/utf8.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/syslog-util.h"
+#include "systemd-basic/utf8.h"
 
 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput);
 
diff --git a/src/grp-system/libcore/dbus-job.c b/src/grp-system/libcore/dbus-job.c
index ee1774da36..e85d690cd2 100644
--- a/src/grp-system/libcore/dbus-job.c
+++ b/src/grp-system/libcore/dbus-job.c
@@ -19,9 +19,9 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/string-util.h"
 
 #include "dbus-job.h"
 #include "dbus.h"
diff --git a/src/grp-system/libcore/dbus-kill.c b/src/grp-system/libcore/dbus-kill.c
index 44bc2db7e2..e49a2333c1 100644
--- a/src/grp-system/libcore/dbus-kill.c
+++ b/src/grp-system/libcore/dbus-kill.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/signal-util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/signal-util.h"
 
 #include "dbus-kill.h"
 #include "kill.h"
diff --git a/src/grp-system/libcore/dbus-manager.c b/src/grp-system/libcore/dbus-manager.c
index c5684014d3..d38f5814fe 100644
--- a/src/grp-system/libcore/dbus-manager.c
+++ b/src/grp-system/libcore/dbus-manager.c
@@ -21,24 +21,24 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/architecture.h"
-#include "basic/build.h"
-#include "basic/clock-util.h"
-#include "basic/env-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/log.h"
-#include "basic/path-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/syslog-util.h"
-#include "basic/virt.h"
 #include "sd-bus/bus-common-errors.h"
-#include "shared/install.h"
-#include "shared/watchdog.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/architecture.h"
+#include "systemd-basic/build.h"
+#include "systemd-basic/clock-util.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/syslog-util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/install.h"
+#include "systemd-shared/watchdog.h"
 
 #include "dbus-execute.h"
 #include "dbus-job.h"
diff --git a/src/grp-system/libcore/dbus-mount.c b/src/grp-system/libcore/dbus-mount.c
index 837a262f61..9dea002eec 100644
--- a/src/grp-system/libcore/dbus-mount.c
+++ b/src/grp-system/libcore/dbus-mount.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
diff --git a/src/grp-system/libcore/dbus-path.c b/src/grp-system/libcore/dbus-path.c
index d312652be4..835f6d49bf 100644
--- a/src/grp-system/libcore/dbus-path.c
+++ b/src/grp-system/libcore/dbus-path.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "dbus-path.h"
 #include "path.h"
diff --git a/src/grp-system/libcore/dbus-scope.c b/src/grp-system/libcore/dbus-scope.c
index d319597c10..8dc0bd22ed 100644
--- a/src/grp-system/libcore/dbus-scope.c
+++ b/src/grp-system/libcore/dbus-scope.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-internal.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
 
 #include "dbus-cgroup.h"
 #include "dbus-kill.h"
diff --git a/src/grp-system/libcore/dbus-service.c b/src/grp-system/libcore/dbus-service.c
index a3524815bd..2e92caecaf 100644
--- a/src/grp-system/libcore/dbus-service.c
+++ b/src/grp-system/libcore/dbus-service.c
@@ -17,14 +17,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/async.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/async.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
 
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
diff --git a/src/grp-system/libcore/dbus-socket.c b/src/grp-system/libcore/dbus-socket.c
index 4d99628725..14c295959e 100644
--- a/src/grp-system/libcore/dbus-socket.c
+++ b/src/grp-system/libcore/dbus-socket.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
diff --git a/src/grp-system/libcore/dbus-swap.c b/src/grp-system/libcore/dbus-swap.c
index fc911b038f..bb486b9546 100644
--- a/src/grp-system/libcore/dbus-swap.c
+++ b/src/grp-system/libcore/dbus-swap.c
@@ -18,8 +18,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
diff --git a/src/grp-system/libcore/dbus-timer.c b/src/grp-system/libcore/dbus-timer.c
index ce454385f8..14f09b3d0e 100644
--- a/src/grp-system/libcore/dbus-timer.c
+++ b/src/grp-system/libcore/dbus-timer.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/strv.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/strv.h"
 
 #include "dbus-timer.h"
 #include "timer.h"
diff --git a/src/grp-system/libcore/dbus-unit.c b/src/grp-system/libcore/dbus-unit.c
index 7e2a63b434..ef12ad66a3 100644
--- a/src/grp-system/libcore/dbus-unit.c
+++ b/src/grp-system/libcore/dbus-unit.c
@@ -19,18 +19,18 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fd-util.h"
-#include "basic/locale-util.h"
-#include "basic/log.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/special.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-common-errors.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
 
 #include "dbus-unit.h"
 #include "dbus.h"
diff --git a/src/grp-system/libcore/dbus.c b/src/grp-system/libcore/dbus.c
index e8e57e6a89..0c5617ec44 100644
--- a/src/grp-system/libcore/dbus.c
+++ b/src/grp-system/libcore/dbus.c
@@ -23,20 +23,20 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/special.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/strxcpyx.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-internal.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/strxcpyx.h"
+#include "systemd-basic/user-util.h"
 
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
diff --git a/src/grp-system/libcore/device.c b/src/grp-system/libcore/device.c
index 11ee2ad047..038908ba7d 100644
--- a/src/grp-system/libcore/device.c
+++ b/src/grp-system/libcore/device.c
@@ -22,14 +22,14 @@
 
 #include <libudev.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/udev-util.h"
 
 #include "dbus-device.h"
 #include "device.h"
diff --git a/src/grp-system/libcore/execute.c b/src/grp-system/libcore/execute.c
index b73577817f..183fcba0b3 100644
--- a/src/grp-system/libcore/execute.c
+++ b/src/grp-system/libcore/execute.c
@@ -52,53 +52,53 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/af-list.h"
-#include "basic/alloc-util.h"
+#include "systemd-basic/af-list.h"
+#include "systemd-basic/alloc-util.h"
 #ifdef HAVE_APPARMOR
-#include "shared/apparmor-util.h"
+#include "systemd-shared/apparmor-util.h"
 #endif
-#include "basic/async.h"
-#include "basic/barrier.h"
-#include "basic/cap-list.h"
-#include "basic/capability-util.h"
-#include "basic/def.h"
-#include "basic/env-util.h"
-#include "basic/errno-list.h"
-#include "basic/exit-status.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/fs-util.h"
-#include "basic/glob-util.h"
-#include "basic/io-util.h"
-#include "basic/ioprio.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/rlimit-util.h"
-#include "basic/rm-rf.h"
+#include "systemd-basic/async.h"
+#include "systemd-basic/barrier.h"
+#include "systemd-basic/cap-list.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/errno-list.h"
+#include "systemd-basic/exit-status.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/glob-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/ioprio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/rlimit-util.h"
+#include "systemd-basic/rm-rf.h"
 
 #include "execute.h"
 #include "namespace.h"
 #ifdef HAVE_SECCOMP
-#include "shared/seccomp-util.h"
+#include "systemd-shared/seccomp-util.h"
 #endif
-#include "basic/securebits.h"
-#include "basic/selinux-util.h"
-#include "basic/signal-util.h"
-#include "basic/smack-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/syslog-util.h"
-#include "basic/terminal-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "shared/utmp-wtmp.h"
+#include "systemd-basic/securebits.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/smack-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/syslog-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/utmp-wtmp.h"
 
 #include "unit.h"
 
diff --git a/src/grp-system/libcore/execute.h b/src/grp-system/libcore/execute.h
index cf5e7e4617..178adc00ae 100644
--- a/src/grp-system/libcore/execute.h
+++ b/src/grp-system/libcore/execute.h
@@ -24,10 +24,10 @@
 #include <stdio.h>
 #include <sys/capability.h>
 
-#include "basic/cgroup-util.h"
-#include "basic/list.h"
-#include "basic/missing.h"
-#include "shared/fdset.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/missing.h"
+#include "systemd-shared/fdset.h"
 
 typedef struct ExecCommand ExecCommand;
 typedef struct ExecContext ExecContext;
diff --git a/src/grp-system/libcore/failure-action.c b/src/grp-system/libcore/failure-action.c
index e22c71dac6..e7d7e4530d 100644
--- a/src/grp-system/libcore/failure-action.c
+++ b/src/grp-system/libcore/failure-action.c
@@ -22,11 +22,11 @@
 
 #include <linux/reboot.h>
 
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/terminal-util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/terminal-util.h"
 
 #include "failure-action.h"
 
diff --git a/src/grp-system/libcore/failure-action.h b/src/grp-system/libcore/failure-action.h
index 87b091f46e..47c08f4006 100644
--- a/src/grp-system/libcore/failure-action.h
+++ b/src/grp-system/libcore/failure-action.h
@@ -32,7 +32,7 @@ typedef enum FailureAction {
         _FAILURE_ACTION_INVALID = -1
 } FailureAction;
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 #include "manager.h"
 
diff --git a/src/grp-system/libcore/hostname-setup.c b/src/grp-system/libcore/hostname-setup.c
index 71e5649952..a85cb8048a 100644
--- a/src/grp-system/libcore/hostname-setup.c
+++ b/src/grp-system/libcore/hostname-setup.c
@@ -21,13 +21,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fileio.h"
-#include "basic/hostname-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "hostname-setup.h"
 
diff --git a/src/grp-system/libcore/ima-setup.c b/src/grp-system/libcore/ima-setup.c
index 0b283d95f1..3967e6951a 100644
--- a/src/grp-system/libcore/ima-setup.c
+++ b/src/grp-system/libcore/ima-setup.c
@@ -22,10 +22,10 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/util.h"
 
 #include "ima-setup.h"
 
diff --git a/src/grp-system/libcore/job.c b/src/grp-system/libcore/job.c
index 9dc44189e4..803caaf819 100644
--- a/src/grp-system/libcore/job.c
+++ b/src/grp-system/libcore/job.c
@@ -22,20 +22,20 @@
 #include <systemd/sd-id128.h>
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/async.h"
-#include "basic/escape.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/set.h"
-#include "basic/special.h"
-#include "basic/stdio-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/virt.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/async.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/virt.h"
 
 #include "dbus-job.h"
 #include "dbus.h"
diff --git a/src/grp-system/libcore/job.h b/src/grp-system/libcore/job.h
index f88e5a0782..7338601bb7 100644
--- a/src/grp-system/libcore/job.h
+++ b/src/grp-system/libcore/job.h
@@ -23,8 +23,8 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/list.h"
-#include "basic/unit-name.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/unit-name.h"
 
 typedef struct Job Job;
 typedef struct JobDependency JobDependency;
diff --git a/src/grp-system/libcore/kill.c b/src/grp-system/libcore/kill.c
index 9f8b45971f..86363bb1c7 100644
--- a/src/grp-system/libcore/kill.c
+++ b/src/grp-system/libcore/kill.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/signal-util.h"
-#include "basic/string-table.h"
-#include "basic/util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/util.h"
 
 #include "kill.h"
 
diff --git a/src/grp-system/libcore/kill.h b/src/grp-system/libcore/kill.h
index 481ffdf2ff..ad8583b9b0 100644
--- a/src/grp-system/libcore/kill.h
+++ b/src/grp-system/libcore/kill.h
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef struct KillContext KillContext;
 
diff --git a/src/grp-system/libcore/killall.c b/src/grp-system/libcore/killall.c
index 27946f1f84..2841805711 100644
--- a/src/grp-system/libcore/killall.c
+++ b/src/grp-system/libcore/killall.c
@@ -22,16 +22,16 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/set.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
 
 #include "killall.h"
 
diff --git a/src/grp-system/libcore/kmod-setup.c b/src/grp-system/libcore/kmod-setup.c
index c91c280e7d..d58a0455d4 100644
--- a/src/grp-system/libcore/kmod-setup.c
+++ b/src/grp-system/libcore/kmod-setup.c
@@ -24,9 +24,9 @@
 #include <libkmod.h>
 #endif
 
-#include "basic/capability-util.h"
-#include "basic/macro.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/macro.h"
 
 #include "kmod-setup.h"
 
diff --git a/src/grp-system/libcore/load-dropin.c b/src/grp-system/libcore/load-dropin.c
index 9a65b5038b..56d81ed16c 100644
--- a/src/grp-system/libcore/load-dropin.c
+++ b/src/grp-system/libcore/load-dropin.c
@@ -18,10 +18,10 @@
 ***/
 
 
-#include "basic/log.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "load-dropin.h"
 #include "load-fragment.h"
diff --git a/src/grp-system/libcore/load-dropin.h b/src/grp-system/libcore/load-dropin.h
index d91cf05197..d007aec604 100644
--- a/src/grp-system/libcore/load-dropin.h
+++ b/src/grp-system/libcore/load-dropin.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "shared/dropin.h"
+#include "systemd-shared/dropin.h"
 
 #include "unit.h"
 
diff --git a/src/grp-system/libcore/load-fragment.c b/src/grp-system/libcore/load-fragment.c
index 9a6ffc8bff..83fe2fc420 100644
--- a/src/grp-system/libcore/load-fragment.c
+++ b/src/grp-system/libcore/load-fragment.c
@@ -31,41 +31,41 @@
 #include <sys/resource.h>
 #include <sys/stat.h>
 
-#include "basic/af-list.h"
-#include "basic/alloc-util.h"
-#include "basic/cap-list.h"
-#include "basic/capability-util.h"
-#include "basic/cpu-set-util.h"
-#include "basic/env-util.h"
-#include "basic/errno-list.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/ioprio.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/rlimit-util.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-internal.h"
-#include "shared/bus-util.h"
-#include "shared/conf-parser.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/af-list.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cap-list.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/cpu-set-util.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/errno-list.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/ioprio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/rlimit-util.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "cgroup.h"
 #include "load-fragment.h"
 #ifdef HAVE_SECCOMP
-#include "shared/seccomp-util.h"
+#include "systemd-shared/seccomp-util.h"
 #endif
-#include "basic/securebits.h"
-#include "basic/signal-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/utf8.h"
-#include "basic/web-util.h"
+#include "systemd-basic/securebits.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/web-util.h"
 
 #include "unit-printf.h"
 #include "unit.h"
diff --git a/src/grp-system/libcore/locale-setup.c b/src/grp-system/libcore/locale-setup.c
index ed50796c09..1794b474b8 100644
--- a/src/grp-system/libcore/locale-setup.c
+++ b/src/grp-system/libcore/locale-setup.c
@@ -20,13 +20,13 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "basic/env-util.h"
-#include "basic/fileio.h"
-#include "basic/locale-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "basic/virt.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
 
 #include "locale-setup.h"
 
diff --git a/src/grp-system/libcore/loopback-setup.c b/src/grp-system/libcore/loopback-setup.c
index f92e346f8c..37bbbc47ec 100644
--- a/src/grp-system/libcore/loopback-setup.c
+++ b/src/grp-system/libcore/loopback-setup.c
@@ -20,8 +20,8 @@
 #include <net/if.h>
 #include <stdlib.h>
 
-#include "basic/missing.h"
-#include "sd-netlink/sd-netlink.h"
+#include "systemd-basic/missing.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "loopback-setup.h"
 
diff --git a/src/grp-system/libcore/machine-id-setup.c b/src/grp-system/libcore/machine-id-setup.c
index 0b65583686..f9b6b2d2ed 100644
--- a/src/grp-system/libcore/machine-id-setup.c
+++ b/src/grp-system/libcore/machine-id-setup.c
@@ -24,21 +24,21 @@
 
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/umask-util.h"
-#include "basic/util.h"
-#include "basic/virt.h"
 #include "sd-id128/id128-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
 
 #include "machine-id-setup.h"
 
diff --git a/src/grp-system/libcore/manager.c b/src/grp-system/libcore/manager.c
index 26395bc2b3..b8b6cb248e 100644
--- a/src/grp-system/libcore/manager.c
+++ b/src/grp-system/libcore/manager.c
@@ -39,44 +39,44 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/env-util.h"
-#include "basic/escape.h"
-#include "basic/exit-status.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/hashmap.h"
-#include "basic/io-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/ratelimit.h"
-#include "basic/rm-rf.h"
-#include "basic/signal-util.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/time-util.h"
-#include "basic/umask-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
-#include "basic/virt.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-kernel.h"
-#include "shared/boot-timestamps.h"
-#include "shared/bus-util.h"
-#include "shared/path-lookup.h"
-#include "shared/watchdog.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/exit-status.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/boot-timestamps.h"
+#include "systemd-shared/path-lookup.h"
+#include "systemd-shared/watchdog.h"
 
 #include "audit-fd.h"
 #include "dbus-job.h"
diff --git a/src/grp-system/libcore/manager.h b/src/grp-system/libcore/manager.h
index 252919c27f..ae56cf1a9a 100644
--- a/src/grp-system/libcore/manager.h
+++ b/src/grp-system/libcore/manager.h
@@ -26,11 +26,11 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-#include "basic/cgroup-util.h"
-#include "basic/hashmap.h"
-#include "basic/list.h"
-#include "basic/ratelimit.h"
-#include "shared/fdset.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-shared/fdset.h"
 
 /* Enforce upper limit how many names we allow */
 #define MANAGER_MAX_NAMES 131072 /* 128K */
@@ -68,8 +68,8 @@ typedef enum StatusType {
         STATUS_TYPE_EMERGENCY,
 } StatusType;
 
-#include "basic/unit-name.h"
-#include "shared/path-lookup.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/path-lookup.h"
 
 #include "execute.h"
 #include "job.h"
diff --git a/src/grp-system/libcore/mount-setup.c b/src/grp-system/libcore/mount-setup.c
index 0de1c63b3e..761527dd44 100644
--- a/src/grp-system/libcore/mount-setup.c
+++ b/src/grp-system/libcore/mount-setup.c
@@ -23,25 +23,25 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fs-util.h"
-#include "basic/label.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/path-util.h"
-#include "basic/set.h"
-#include "basic/smack-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "basic/virt.h"
-#include "shared/bus-util.h"
-#include "shared/dev-setup.h"
-#include "shared/efivars.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/smack-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/dev-setup.h"
+#include "systemd-shared/efivars.h"
 
 #include "mount-setup.h"
 
diff --git a/src/grp-system/libcore/mount.c b/src/grp-system/libcore/mount.c
index bc5f29692d..a4bc71caae 100644
--- a/src/grp-system/libcore/mount.c
+++ b/src/grp-system/libcore/mount.c
@@ -24,22 +24,22 @@
 
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/exit-status.h"
-#include "basic/formats-util.h"
-#include "basic/log.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "shared/fstab-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/exit-status.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/fstab-util.h"
 
 #include "dbus-mount.h"
 #include "manager.h"
diff --git a/src/grp-system/libcore/namespace.c b/src/grp-system/libcore/namespace.c
index f76a0a7fbf..942bae33b3 100644
--- a/src/grp-system/libcore/namespace.c
+++ b/src/grp-system/libcore/namespace.c
@@ -27,21 +27,21 @@
 
 #include <linux/fs.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/path-util.h"
-#include "basic/selinux-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/umask-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "shared/dev-setup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/dev-setup.h"
 
 #include "loopback-setup.h"
 #include "namespace.h"
diff --git a/src/grp-system/libcore/namespace.h b/src/grp-system/libcore/namespace.h
index 1ae206efd1..89c6225c39 100644
--- a/src/grp-system/libcore/namespace.h
+++ b/src/grp-system/libcore/namespace.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef enum ProtectHome {
         PROTECT_HOME_NO,
diff --git a/src/grp-system/libcore/path.c b/src/grp-system/libcore/path.c
index ee1b9a3480..5e4d82c3e4 100644
--- a/src/grp-system/libcore/path.c
+++ b/src/grp-system/libcore/path.c
@@ -22,18 +22,18 @@
 #include <sys/inotify.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/glob-util.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/glob-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
 
 #include "dbus-path.h"
 #include "path.h"
diff --git a/src/grp-system/libcore/scope.c b/src/grp-system/libcore/scope.c
index 8998f751f5..aa7d591e66 100644
--- a/src/grp-system/libcore/scope.c
+++ b/src/grp-system/libcore/scope.c
@@ -20,13 +20,13 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
 
 #include "dbus-scope.h"
 #include "load-dropin.h"
diff --git a/src/grp-system/libcore/selinux-access.c b/src/grp-system/libcore/selinux-access.c
index f6dbfa64b7..6807af86c1 100644
--- a/src/grp-system/libcore/selinux-access.c
+++ b/src/grp-system/libcore/selinux-access.c
@@ -31,14 +31,14 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/path-util.h"
-#include "basic/selinux-util.h"
-#include "basic/stdio-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 #include "audit-fd.h"
 
diff --git a/src/grp-system/libcore/selinux-access.h b/src/grp-system/libcore/selinux-access.h
index 8d91eea38f..687bf07031 100644
--- a/src/grp-system/libcore/selinux-access.h
+++ b/src/grp-system/libcore/selinux-access.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
 
 #include "manager.h"
 
diff --git a/src/grp-system/libcore/selinux-setup.c b/src/grp-system/libcore/selinux-setup.c
index 08c61af146..0813a7d2ac 100644
--- a/src/grp-system/libcore/selinux-setup.c
+++ b/src/grp-system/libcore/selinux-setup.c
@@ -25,11 +25,11 @@
 #include <selinux/selinux.h>
 #endif
 
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/selinux-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "selinux-setup.h"
 
diff --git a/src/grp-system/libcore/service.c b/src/grp-system/libcore/service.c
index 43d195bbba..eed6efc758 100644
--- a/src/grp-system/libcore/service.c
+++ b/src/grp-system/libcore/service.c
@@ -21,31 +21,31 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/async.h"
-#include "basic/def.h"
-#include "basic/env-util.h"
-#include "basic/escape.h"
-#include "basic/exit-status.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/fs-util.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-kernel.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/async.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/exit-status.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/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
 
 #include "dbus-service.h"
 #include "load-dropin.h"
diff --git a/src/grp-system/libcore/service.h b/src/grp-system/libcore/service.h
index 4dcf5ecf78..8670913dbd 100644
--- a/src/grp-system/libcore/service.h
+++ b/src/grp-system/libcore/service.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/exit-status.h"
-#include "basic/ratelimit.h"
+#include "systemd-basic/exit-status.h"
+#include "systemd-basic/ratelimit.h"
 
 typedef struct Service Service;
 typedef struct ServiceFDStore ServiceFDStore;
diff --git a/src/grp-system/libcore/show-status.c b/src/grp-system/libcore/show-status.c
index bb6889630d..16db8a92a7 100644
--- a/src/grp-system/libcore/show-status.c
+++ b/src/grp-system/libcore/show-status.c
@@ -17,13 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/io-util.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
 
 #include "show-status.h"
 
diff --git a/src/grp-system/libcore/show-status.h b/src/grp-system/libcore/show-status.h
index 56c56eb358..08d6b7f6e1 100644
--- a/src/grp-system/libcore/show-status.h
+++ b/src/grp-system/libcore/show-status.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 /* Manager status */
 
diff --git a/src/grp-system/libcore/slice.c b/src/grp-system/libcore/slice.c
index d646b838ac..a96a94e0ac 100644
--- a/src/grp-system/libcore/slice.c
+++ b/src/grp-system/libcore/slice.c
@@ -19,12 +19,12 @@
 
 #include <errno.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/special.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
 
 #include "dbus-slice.h"
 #include "slice.h"
diff --git a/src/grp-system/libcore/smack-setup.c b/src/grp-system/libcore/smack-setup.c
index ab316b69c9..87d2980fbb 100644
--- a/src/grp-system/libcore/smack-setup.c
+++ b/src/grp-system/libcore/smack-setup.c
@@ -26,14 +26,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-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 "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-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"
 
 #include "smack-setup.h"
 
diff --git a/src/grp-system/libcore/socket.c b/src/grp-system/libcore/socket.c
index 3e0b3e2e49..af3e65ff37 100644
--- a/src/grp-system/libcore/socket.c
+++ b/src/grp-system/libcore/socket.c
@@ -29,31 +29,31 @@
 
 #include <linux/sctp.h>
 
-#include "basic/alloc-util.h"
-#include "basic/copy.h"
-#include "basic/def.h"
-#include "basic/exit-status.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/io-util.h"
-#include "basic/label.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/selinux-util.h"
-#include "basic/signal-util.h"
-#include "basic/smack-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/exit-status.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/label.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/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/smack-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
 
 #include "dbus-socket.h"
 #include "socket.h"
diff --git a/src/grp-system/libcore/socket.h b/src/grp-system/libcore/socket.h
index 232d653fbe..0e3ead5060 100644
--- a/src/grp-system/libcore/socket.h
+++ b/src/grp-system/libcore/socket.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"
 
 typedef struct Socket Socket;
 
diff --git a/src/grp-system/libcore/swap.c b/src/grp-system/libcore/swap.c
index b787fc15a1..942548fb61 100644
--- a/src/grp-system/libcore/swap.c
+++ b/src/grp-system/libcore/swap.c
@@ -24,21 +24,21 @@
 
 #include <libudev.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/exit-status.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
-#include "basic/virt.h"
-#include "shared/fstab-util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/exit-status.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/fstab-util.h"
+#include "systemd-shared/udev-util.h"
 
 #include "dbus-swap.h"
 #include "swap.h"
diff --git a/src/grp-system/libcore/target.c b/src/grp-system/libcore/target.c
index 74af0ced0c..99ed054d0e 100644
--- a/src/grp-system/libcore/target.c
+++ b/src/grp-system/libcore/target.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/log.h"
-#include "basic/special.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
 
 #include "dbus-target.h"
 #include "unit.h"
diff --git a/src/grp-system/libcore/timer.c b/src/grp-system/libcore/timer.c
index 8b9fa71d27..c459999e44 100644
--- a/src/grp-system/libcore/timer.c
+++ b/src/grp-system/libcore/timer.c
@@ -19,18 +19,18 @@
 
 #include <errno.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fs-util.h"
-#include "basic/parse-util.h"
-#include "basic/random-util.h"
-#include "basic/special.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
-#include "basic/virt.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/virt.h"
 
 #include "dbus-timer.h"
 #include "timer.h"
diff --git a/src/grp-system/libcore/timer.h b/src/grp-system/libcore/timer.h
index 710ef126f0..4195423a61 100644
--- a/src/grp-system/libcore/timer.h
+++ b/src/grp-system/libcore/timer.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/calendarspec.h"
+#include "systemd-basic/calendarspec.h"
 
 typedef struct Timer Timer;
 
diff --git a/src/grp-system/libcore/transaction.c b/src/grp-system/libcore/transaction.c
index aa57eee556..2768be914f 100644
--- a/src/grp-system/libcore/transaction.c
+++ b/src/grp-system/libcore/transaction.c
@@ -20,10 +20,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/terminal-util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/terminal-util.h"
 
 #include "dbus-unit.h"
 #include "transaction.h"
diff --git a/src/grp-system/libcore/transaction.h b/src/grp-system/libcore/transaction.h
index 19d8d3d434..355b7bb6e6 100644
--- a/src/grp-system/libcore/transaction.h
+++ b/src/grp-system/libcore/transaction.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/hashmap.h"
+#include "systemd-basic/hashmap.h"
 
 typedef struct Transaction Transaction;
 
diff --git a/src/grp-system/libcore/unit-printf.c b/src/grp-system/libcore/unit-printf.c
index 14c36ab494..4aded4662e 100644
--- a/src/grp-system/libcore/unit-printf.c
+++ b/src/grp-system/libcore/unit-printf.c
@@ -17,15 +17,15 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/formats-util.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
-#include "shared/specifier.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/specifier.h"
 
 #include "unit-printf.h"
 #include "unit.h"
diff --git a/src/grp-system/libcore/unit.c b/src/grp-system/libcore/unit.c
index aff4dbd2ca..3d176e6104 100644
--- a/src/grp-system/libcore/unit.c
+++ b/src/grp-system/libcore/unit.c
@@ -26,32 +26,32 @@
 #include <systemd/sd-id128.h>
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/escape.h"
-#include "basic/fileio-label.h"
-#include "basic/formats-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/set.h"
-#include "basic/signal-util.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/umask-util.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
-#include "basic/virt.h"
 #include "sd-bus/bus-common-errors.h"
-#include "shared/bus-util.h"
-#include "shared/dropin.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fileio-label.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/dropin.h"
 
 #include "dbus-unit.h"
 #include "dbus.h"
diff --git a/src/grp-system/libcore/unit.h b/src/grp-system/libcore/unit.h
index 3e25bfd32a..d57caceb19 100644
--- a/src/grp-system/libcore/unit.h
+++ b/src/grp-system/libcore/unit.h
@@ -23,10 +23,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "basic/list.h"
-#include "basic/unit-name.h"
-#include "shared/condition.h"
-#include "shared/install.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/condition.h"
+#include "systemd-shared/install.h"
 
 typedef struct Unit Unit;
 typedef struct UnitRef UnitRef;
diff --git a/src/grp-system/systemctl/systemctl.c b/src/grp-system/systemctl/systemctl.c
index 0f115db14c..0c7349fc07 100644
--- a/src/grp-system/systemctl/systemctl.c
+++ b/src/grp-system/systemctl/systemctl.c
@@ -36,56 +36,56 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-login.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/copy.h"
-#include "basic/env-util.h"
-#include "basic/exit-status.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/fs-util.h"
-#include "basic/glob-util.h"
-#include "basic/hostname-util.h"
-#include "basic/io-util.h"
-#include "basic/list.h"
-#include "basic/locale-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/rlimit-util.h"
-#include "basic/set.h"
-#include "basic/sigbus.h"
-#include "basic/signal-util.h"
-#include "basic/socket-util.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "basic/verbs.h"
-#include "basic/virt.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-message.h"
-#include "shared/bus-unit-util.h"
-#include "shared/bus-util.h"
-#include "shared/cgroup-show.h"
-#include "shared/dropin.h"
-#include "shared/efivars.h"
-#include "shared/initreq.h"
-#include "shared/install.h"
-#include "shared/logs-show.h"
-#include "shared/pager.h"
-#include "shared/path-lookup.h"
-#include "shared/spawn-ask-password-agent.h"
-#include "shared/spawn-polkit-agent.h"
-#include "shared/utmp-wtmp.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/exit-status.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/glob-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/rlimit-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/sigbus.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/verbs.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/bus-unit-util.h"
+#include "systemd-shared/cgroup-show.h"
+#include "systemd-shared/dropin.h"
+#include "systemd-shared/efivars.h"
+#include "systemd-shared/initreq.h"
+#include "systemd-shared/install.h"
+#include "systemd-shared/logs-show.h"
+#include "systemd-shared/pager.h"
+#include "systemd-shared/path-lookup.h"
+#include "systemd-shared/spawn-ask-password-agent.h"
+#include "systemd-shared/spawn-polkit-agent.h"
+#include "systemd-shared/utmp-wtmp.h"
 
 /* The init script exit status codes
    0       program is running or service is OK
diff --git a/src/grp-system/systemd-shutdown/shutdown.c b/src/grp-system/systemd-shutdown/shutdown.c
index 093b6eea87..4517718f8f 100644
--- a/src/grp-system/systemd-shutdown/shutdown.c
+++ b/src/grp-system/systemd-shutdown/shutdown.c
@@ -30,20 +30,20 @@
 
 #include <linux/reboot.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/def.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
-#include "basic/virt.h"
-#include "shared/switch-root.h"
-#include "shared/watchdog.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/switch-root.h"
+#include "systemd-shared/watchdog.h"
 
 #include "killall.h"
 #include "umount.h"
diff --git a/src/grp-system/systemd-shutdown/umount.c b/src/grp-system/systemd-shutdown/umount.c
index 0079f8ec78..60c7354738 100644
--- a/src/grp-system/systemd-shutdown/umount.c
+++ b/src/grp-system/systemd-shutdown/umount.c
@@ -28,16 +28,16 @@
 
 #include <libudev.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/list.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "basic/virt.h"
-#include "shared/fstab-util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/fstab-util.h"
+#include "systemd-shared/udev-util.h"
 
 #include "mount-setup.h"
 #include "umount.h"
diff --git a/src/grp-system/systemd/main.c b/src/grp-system/systemd/main.c
index c558a4b21c..8fafbf4caf 100644
--- a/src/grp-system/systemd/main.c
+++ b/src/grp-system/systemd/main.c
@@ -38,35 +38,6 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/architecture.h"
-#include "basic/build.h"
-#include "basic/capability-util.h"
-#include "basic/clock-util.h"
-#include "basic/cpu-set-util.h"
-#include "basic/def.h"
-#include "basic/env-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/fs-util.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/process-util.h"
-#include "basic/raw-clone.h"
-#include "basic/rlimit-util.h"
-#include "basic/selinux-util.h"
-#include "basic/signal-util.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/stdio-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/umask-util.h"
-#include "basic/user-util.h"
-#include "basic/virt.h"
 #include "dbus-manager.h"
 #include "hostname-setup.h"
 #include "ima-setup.h"
@@ -78,14 +49,43 @@
 #include "manager.h"
 #include "mount-setup.h"
 #include "sd-bus/bus-error.h"
+#include "sd-bus/bus-util.h"
 #include "selinux-setup.h"
-#include "shared/bus-util.h"
-#include "shared/conf-parser.h"
-#include "shared/fdset.h"
-#include "shared/pager.h"
-#include "shared/switch-root.h"
-#include "shared/watchdog.h"
 #include "smack-setup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/architecture.h"
+#include "systemd-basic/build.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/clock-util.h"
+#include "systemd-basic/cpu-set-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/env-util.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/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/raw-clone.h"
+#include "systemd-basic/rlimit-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/fdset.h"
+#include "systemd-shared/pager.h"
+#include "systemd-shared/switch-root.h"
+#include "systemd-shared/watchdog.h"
 
 static enum {
         ACTION_RUN,
diff --git a/src/grp-timedate/systemd-timedated/timedated.c b/src/grp-timedate/systemd-timedated/timedated.c
index aad94024b8..bddaf71cb0 100644
--- a/src/grp-timedate/systemd-timedated/timedated.c
+++ b/src/grp-timedate/systemd-timedated/timedated.c
@@ -25,19 +25,19 @@
 #include <systemd/sd-event.h>
 #include <systemd/sd-messages.h>
 
-#include "basic/alloc-util.h"
-#include "basic/clock-util.h"
-#include "basic/def.h"
-#include "basic/fileio-label.h"
-#include "basic/fs-util.h"
-#include "basic/path-util.h"
-#include "basic/selinux-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-common-errors.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/clock-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fileio-label.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #define NULL_ADJTIME_UTC "0.0 0 0\n0\nUTC\n"
 #define NULL_ADJTIME_LOCAL "0.0 0 0\n0\nLOCAL\n"
diff --git a/src/grp-timedate/timedatectl/timedatectl.c b/src/grp-timedate/timedatectl/timedatectl.c
index 14d66b557b..ae011a7433 100644
--- a/src/grp-timedate/timedatectl/timedatectl.c
+++ b/src/grp-timedate/timedatectl/timedatectl.c
@@ -25,14 +25,14 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/parse-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/pager.h"
-#include "shared/spawn-polkit-agent.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/pager.h"
+#include "systemd-shared/spawn-polkit-agent.h"
 
 static bool arg_no_pager = false;
 static bool arg_ask_password = true;
diff --git a/src/grp-udev/ata_id/Makefile b/src/grp-udev/ata_id/Makefile
index 00a8c37ac2..d920f9b2aa 100644
--- a/src/grp-udev/ata_id/Makefile
+++ b/src/grp-udev/ata_id/Makefile
@@ -27,7 +27,7 @@ ata_id_SOURCES = \
 	src/udev/ata_id/ata_id.c
 
 ata_id_LDADD = \
-	libshared.la
+	libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
 	ata_id
diff --git a/src/grp-udev/ata_id/ata_id.c b/src/grp-udev/ata_id/ata_id.c
index 4728d72a57..9770afb538 100644
--- a/src/grp-udev/ata_id/ata_id.c
+++ b/src/grp-udev/ata_id/ata_id.c
@@ -40,10 +40,10 @@
 
 #include <libudev.h>
 
-#include "basic/fd-util.h"
-#include "basic/log.h"
 #include "libudev-private.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-shared/udev-util.h"
 
 #define COMMAND_TIMEOUT_MSEC (30 * 1000)
 
diff --git a/src/grp-udev/cdrom_id/Makefile b/src/grp-udev/cdrom_id/Makefile
index a9297413d3..87865dd938 100644
--- a/src/grp-udev/cdrom_id/Makefile
+++ b/src/grp-udev/cdrom_id/Makefile
@@ -27,7 +27,7 @@ cdrom_id_SOURCES = \
 	src/udev/cdrom_id/cdrom_id.c
 
 cdrom_id_LDADD = \
-	libshared.la
+	libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
 	cdrom_id
diff --git a/src/grp-udev/cdrom_id/cdrom_id.c b/src/grp-udev/cdrom_id/cdrom_id.c
index 9a5af6d614..4bd3ab0be0 100644
--- a/src/grp-udev/cdrom_id/cdrom_id.c
+++ b/src/grp-udev/cdrom_id/cdrom_id.c
@@ -37,8 +37,8 @@
 
 #include <libudev.h>
 
-#include "basic/random-util.h"
 #include "libudev-private.h"
+#include "systemd-basic/random-util.h"
 
 /* device info */
 static unsigned int cd_cd_rom;
diff --git a/src/grp-udev/collect/Makefile b/src/grp-udev/collect/Makefile
index 60af3b7627..6692f42878 100644
--- a/src/grp-udev/collect/Makefile
+++ b/src/grp-udev/collect/Makefile
@@ -27,7 +27,7 @@ collect_SOURCES = \
 	src/udev/collect/collect.c
 
 collect_LDADD = \
-	libshared.la
+	libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
 	collect
diff --git a/src/grp-udev/collect/collect.c b/src/grp-udev/collect/collect.c
index 0e8f6b97fe..8ce6176184 100644
--- a/src/grp-udev/collect/collect.c
+++ b/src/grp-udev/collect/collect.c
@@ -24,11 +24,11 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include "basic/alloc-util.h"
-#include "basic/macro.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
 #include "libudev-private.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
 
 #define BUFSIZE 16
 #define UDEV_ALARM_TIMEOUT 180
diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile
index 4323fa96ec..01115354c7 100644
--- a/src/grp-udev/libudev-core/Makefile
+++ b/src/grp-udev/libudev-core/Makefile
@@ -71,8 +71,11 @@ libudev_core_la_CFLAGS = \
 	$(KMOD_CFLAGS)
 
 libudev_core_la_LIBADD = \
+	libsystemd-internal.la \
+	libsystemd-basic.la \
+	libsystemd-shared.la \
 	libsystemd-network.la \
-	libshared.la \
+	libsystemd-staging.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
 
diff --git a/src/grp-udev/libudev-core/net/Makefile b/src/grp-udev/libudev-core/net/Makefile
index 5ccbd00002..5094fa6050 100644
--- a/src/grp-udev/libudev-core/net/Makefile
+++ b/src/grp-udev/libudev-core/net/Makefile
@@ -24,7 +24,10 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-sd.CPPFLAGS += $(libshared.CPPFLAGS)
+sd.CPPFLAGS += $(libsystemd-internal.CPPFLAGS)
+sd.CPPFLAGS += $(libsystemd-basic.CPPFLAGS)
 sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS)
+sd.CPPFLAGS += $(libsystemd-shared.CPPFLAGS)
+sd.CPPFLAGS += $(libsystemd-staging.CPPFLAGS)
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/libudev-core/net/ethtool-util.c b/src/grp-udev/libudev-core/net/ethtool-util.c
index b381284a6b..9c67e807ff 100644
--- a/src/grp-udev/libudev-core/net/ethtool-util.c
+++ b/src/grp-udev/libudev-core/net/ethtool-util.c
@@ -23,11 +23,11 @@
 #include <linux/ethtool.h>
 #include <linux/sockios.h>
 
-#include "basic/log.h"
-#include "basic/string-table.h"
-#include "basic/strxcpyx.h"
-#include "basic/util.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/strxcpyx.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "ethtool-util.h"
 
diff --git a/src/grp-udev/libudev-core/net/ethtool-util.h b/src/grp-udev/libudev-core/net/ethtool-util.h
index 7d103d9f2f..61699d4225 100644
--- a/src/grp-udev/libudev-core/net/ethtool-util.h
+++ b/src/grp-udev/libudev-core/net/ethtool-util.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 /* we can't use DUPLEX_ prefix, as it
  * clashes with <linux/ethtool.h> */
diff --git a/src/grp-udev/libudev-core/net/link-config-gperf.gperf b/src/grp-udev/libudev-core/net/link-config-gperf.gperf
index c84f4599ce..a75f6f8358 100644
--- a/src/grp-udev/libudev-core/net/link-config-gperf.gperf
+++ b/src/grp-udev/libudev-core/net/link-config-gperf.gperf
@@ -1,8 +1,8 @@
 %{
 #include <stddef.h>
 
-#include "shared/conf-parser.h"
 #include "systemd-network/network-internal.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "ethtool-util.h"
 #include "link-config.h"
diff --git a/src/grp-udev/libudev-core/net/link-config.c b/src/grp-udev/libudev-core/net/link-config.c
index f6803e00df..df06447e6c 100644
--- a/src/grp-udev/libudev-core/net/link-config.c
+++ b/src/grp-udev/libudev-core/net/link-config.c
@@ -19,25 +19,25 @@
 
 #include <netinet/ether.h>
 
-#include "basic/alloc-util.h"
-#include "basic/conf-files.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/random-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
 #include "libudev-private.h"
 #include "sd-netlink/netlink-util.h"
-#include "sd-netlink/sd-netlink.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/network-internal.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "ethtool-util.h"
 #include "link-config.h"
diff --git a/src/grp-udev/libudev-core/net/link-config.h b/src/grp-udev/libudev-core/net/link-config.h
index ad5211610a..3fedc60f51 100644
--- a/src/grp-udev/libudev-core/net/link-config.h
+++ b/src/grp-udev/libudev-core/net/link-config.h
@@ -21,8 +21,8 @@
 
 #include <libudev.h>
 
-#include "basic/list.h"
-#include "shared/condition.h"
+#include "systemd-basic/list.h"
+#include "systemd-shared/condition.h"
 
 #include "ethtool-util.h"
 
diff --git a/src/grp-udev/libudev-core/udev-builtin-blkid.c b/src/grp-udev/libudev-core/udev-builtin-blkid.c
index a2784aa03e..b56ffa62a3 100644
--- a/src/grp-udev/libudev-core/udev-builtin-blkid.c
+++ b/src/grp-udev/libudev-core/udev-builtin-blkid.c
@@ -29,11 +29,11 @@
 
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/string-util.h"
-#include "shared/efivars.h"
-#include "shared/gpt.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/efivars.h"
+#include "systemd-shared/gpt.h"
 #include "udev.h"
 
 static void print_property(struct udev_device *dev, bool test, const char *name, const char *value) {
diff --git a/src/grp-udev/libudev-core/udev-builtin-btrfs.c b/src/grp-udev/libudev-core/udev-builtin-btrfs.c
index 333229de55..dbaf65d8f9 100644
--- a/src/grp-udev/libudev-core/udev-builtin-btrfs.c
+++ b/src/grp-udev/libudev-core/udev-builtin-btrfs.c
@@ -25,9 +25,9 @@
 #include <linux/btrfs.h>
 #endif
 
-#include "basic/fd-util.h"
-#include "basic/missing.h"
-#include "basic/string-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/string-util.h"
 #include "udev.h"
 
 static int builtin_btrfs(struct udev_device *dev, int argc, char *argv[], bool test) {
diff --git a/src/grp-udev/libudev-core/udev-builtin-hwdb.c b/src/grp-udev/libudev-core/udev-builtin-hwdb.c
index d2d95bf394..9587845ac2 100644
--- a/src/grp-udev/libudev-core/udev-builtin-hwdb.c
+++ b/src/grp-udev/libudev-core/udev-builtin-hwdb.c
@@ -22,11 +22,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
 #include "sd-hwdb/hwdb-util.h"
-#include "sd-hwdb/sd-hwdb.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/udev-util.h"
+#include "systemd-staging/sd-hwdb.h"
 #include "udev.h"
 
 static sd_hwdb *hwdb;
diff --git a/src/grp-udev/libudev-core/udev-builtin-input_id.c b/src/grp-udev/libudev-core/udev-builtin-input_id.c
index 711ec0b665..e34b761cd1 100644
--- a/src/grp-udev/libudev-core/udev-builtin-input_id.c
+++ b/src/grp-udev/libudev-core/udev-builtin-input_id.c
@@ -31,10 +31,10 @@
 #include <linux/input.h>
 #include <linux/limits.h>
 
-#include "basic/fd-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 #include "udev.h"
 
 /* we must use this kernel-compatible implementation */
diff --git a/src/grp-udev/libudev-core/udev-builtin-keyboard.c b/src/grp-udev/libudev-core/udev-builtin-keyboard.c
index d07eff08d6..22faeb488b 100644
--- a/src/grp-udev/libudev-core/udev-builtin-keyboard.c
+++ b/src/grp-udev/libudev-core/udev-builtin-keyboard.c
@@ -24,10 +24,10 @@
 
 #include <linux/input.h>
 
-#include "basic/fd-util.h"
-#include "basic/parse-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
 #include "udev.h"
 
 static const struct key *keyboard_lookup_key(const char *str, unsigned len);
diff --git a/src/grp-udev/libudev-core/udev-builtin-kmod.c b/src/grp-udev/libudev-core/udev-builtin-kmod.c
index 15d23c0f0e..91732bbfa4 100644
--- a/src/grp-udev/libudev-core/udev-builtin-kmod.c
+++ b/src/grp-udev/libudev-core/udev-builtin-kmod.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "basic/string-util.h"
+#include "systemd-basic/string-util.h"
 #include "udev.h"
 
 static struct kmod_ctx *ctx = NULL;
diff --git a/src/grp-udev/libudev-core/udev-builtin-net_id.c b/src/grp-udev/libudev-core/udev-builtin-net_id.c
index 51f734d2c1..599e8ef091 100644
--- a/src/grp-udev/libudev-core/udev-builtin-net_id.c
+++ b/src/grp-udev/libudev-core/udev-builtin-net_id.c
@@ -99,10 +99,10 @@
 
 #include <linux/pci_regs.h>
 
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
 #include "udev.h"
 
 #define ONBOARD_INDEX_MAX (16*1024-1)
diff --git a/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c b/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c
index 3f3522f5e1..b64ea049ec 100644
--- a/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c
+++ b/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
 #include "udev.h"
 
 #include "net/link-config.h"
diff --git a/src/grp-udev/libudev-core/udev-builtin-path_id.c b/src/grp-udev/libudev-core/udev-builtin-path_id.c
index 4476b90c72..f7802cd905 100644
--- a/src/grp-udev/libudev-core/udev-builtin-path_id.c
+++ b/src/grp-udev/libudev-core/udev-builtin-path_id.c
@@ -30,8 +30,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
 #include "udev.h"
 
 _printf_(2,3)
diff --git a/src/grp-udev/libudev-core/udev-builtin-uaccess.c b/src/grp-udev/libudev-core/udev-builtin-uaccess.c
index aab1c376de..64773b90f5 100644
--- a/src/grp-udev/libudev-core/udev-builtin-uaccess.c
+++ b/src/grp-udev/libudev-core/udev-builtin-uaccess.c
@@ -24,8 +24,8 @@
 
 #include <systemd/sd-login.h>
 
-#include "basic/login-util.h"
-#include "basic/util.h"
+#include "systemd-basic/login-util.h"
+#include "systemd-basic/util.h"
 #include "udev.h"
 
 #include "logind-acl.h"
diff --git a/src/grp-udev/libudev-core/udev-builtin-usb_id.c b/src/grp-udev/libudev-core/udev-builtin-usb_id.c
index fcaf8551d8..68989580f2 100644
--- a/src/grp-udev/libudev-core/udev-builtin-usb_id.c
+++ b/src/grp-udev/libudev-core/udev-builtin-usb_id.c
@@ -29,9 +29,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/string-util.h"
 #include "udev.h"
 
 static void set_usb_iftype(char *to, int if_class_num, size_t len) {
diff --git a/src/grp-udev/libudev-core/udev-builtin.c b/src/grp-udev/libudev-core/udev-builtin.c
index 13d3cd4ee0..fb80e715ad 100644
--- a/src/grp-udev/libudev-core/udev-builtin.c
+++ b/src/grp-udev/libudev-core/udev-builtin.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "basic/string-util.h"
+#include "systemd-basic/string-util.h"
 #include "udev.h"
 
 static bool initialized;
diff --git a/src/grp-udev/libudev-core/udev-ctrl.c b/src/grp-udev/libudev-core/udev-ctrl.c
index 4336aa58ab..f399f2dfa2 100644
--- a/src/grp-udev/libudev-core/udev-ctrl.c
+++ b/src/grp-udev/libudev-core/udev-ctrl.c
@@ -18,10 +18,10 @@
 #include <sys/un.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/socket-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/socket-util.h"
 #include "udev.h"
 
 /* wire protocol magic must match */
diff --git a/src/grp-udev/libudev-core/udev-event.c b/src/grp-udev/libudev-core/udev-event.c
index 5bdf5aad02..f553b8b73d 100644
--- a/src/grp-udev/libudev-core/udev-event.c
+++ b/src/grp-udev/libudev-core/udev-event.c
@@ -30,13 +30,13 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
 #include "sd-netlink/netlink-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
 #include "udev.h"
 
 typedef struct Spawn {
diff --git a/src/grp-udev/libudev-core/udev-node.c b/src/grp-udev/libudev-core/udev-node.c
index 3a2daa89ad..3007dec316 100644
--- a/src/grp-udev/libudev-core/udev-node.c
+++ b/src/grp-udev/libudev-core/udev-node.c
@@ -25,12 +25,12 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "basic/formats-util.h"
-#include "basic/fs-util.h"
-#include "basic/selinux-util.h"
-#include "basic/smack-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/smack-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
 #include "udev.h"
 
 static int node_symlink(struct udev_device *dev, const char *node, const char *slink) {
diff --git a/src/grp-udev/libudev-core/udev-rules.c b/src/grp-udev/libudev-core/udev-rules.c
index 134d269fd8..286d8e136b 100644
--- a/src/grp-udev/libudev-core/udev-rules.c
+++ b/src/grp-udev/libudev-core/udev-rules.c
@@ -29,21 +29,21 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/conf-files.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/glob-util.h"
-#include "basic/path-util.h"
-#include "basic/stat-util.h"
-#include "basic/stdio-util.h"
-#include "basic/strbuf.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "shared/sysctl-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/glob-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/strbuf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/sysctl-util.h"
 #include "udev.h"
 
 #define PREALLOC_TOKEN          2048
diff --git a/src/grp-udev/libudev-core/udev-watch.c b/src/grp-udev/libudev-core/udev-watch.c
index 7dcc71556e..193207d2c2 100644
--- a/src/grp-udev/libudev-core/udev-watch.c
+++ b/src/grp-udev/libudev-core/udev-watch.c
@@ -24,7 +24,7 @@
 #include <sys/inotify.h>
 #include <unistd.h>
 
-#include "basic/stdio-util.h"
+#include "systemd-basic/stdio-util.h"
 #include "udev.h"
 
 static int inotify_fd = -1;
diff --git a/src/grp-udev/mtd_probe/Makefile b/src/grp-udev/mtd_probe/Makefile
index 50703dddda..dc408a7d4e 100644
--- a/src/grp-udev/mtd_probe/Makefile
+++ b/src/grp-udev/mtd_probe/Makefile
@@ -34,6 +34,6 @@ dist_udevrules_DATA += \
 udevlibexec_PROGRAMS += \
 	mtd_probe
 
-mtd_probe_LDADD += libbasic.la
+mtd_probe_LDADD += libsystemd-basic.la
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/mtd_probe/mtd_probe.h b/src/grp-udev/mtd_probe/mtd_probe.h
index 83f241ac94..402d59bd9d 100644
--- a/src/grp-udev/mtd_probe/mtd_probe.h
+++ b/src/grp-udev/mtd_probe/mtd_probe.h
@@ -21,7 +21,7 @@
 
 #include <mtd/mtd-user.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 /* Full oob structure as written on the flash */
 struct sm_oob {
diff --git a/src/grp-udev/scsi_id/Makefile b/src/grp-udev/scsi_id/Makefile
index 7064a864f7..a2d159f052 100644
--- a/src/grp-udev/scsi_id/Makefile
+++ b/src/grp-udev/scsi_id/Makefile
@@ -30,7 +30,7 @@ scsi_id_SOURCES =\
 	src/udev/scsi_id/scsi_id.h
 
 scsi_id_LDADD = \
-	libshared.la
+	libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
 	scsi_id
diff --git a/src/grp-udev/scsi_id/scsi_id.c b/src/grp-udev/scsi_id/scsi_id.c
index 83011e918e..30611137d5 100644
--- a/src/grp-udev/scsi_id/scsi_id.c
+++ b/src/grp-udev/scsi_id/scsi_id.c
@@ -31,10 +31,10 @@
 
 #include <libudev.h>
 
-#include "basic/fd-util.h"
-#include "basic/string-util.h"
 #include "libudev-private.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/udev-util.h"
 
 #include "scsi_id.h"
 
diff --git a/src/grp-udev/scsi_id/scsi_serial.c b/src/grp-udev/scsi_id/scsi_serial.c
index 544fcde108..d2960086d5 100644
--- a/src/grp-udev/scsi_id/scsi_serial.c
+++ b/src/grp-udev/scsi_id/scsi_serial.c
@@ -36,9 +36,9 @@
 
 #include <libudev.h>
 
-#include "basic/random-util.h"
-#include "basic/string-util.h"
 #include "libudev-private.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "scsi.h"
 #include "scsi_id.h"
diff --git a/src/grp-udev/systemd-hwdb/Makefile b/src/grp-udev/systemd-hwdb/Makefile
index 8636cc3270..95b266e851 100644
--- a/src/grp-udev/systemd-hwdb/Makefile
+++ b/src/grp-udev/systemd-hwdb/Makefile
@@ -32,7 +32,7 @@ systemd_hwdb_SOURCES = \
 	src/hwdb/hwdb.c
 
 systemd_hwdb_LDADD = \
-	libshared.la
+	libsystemd-shared.la
 
 rootbin_PROGRAMS += \
 	systemd-hwdb
diff --git a/src/grp-udev/systemd-hwdb/hwdb.c b/src/grp-udev/systemd-hwdb/hwdb.c
index 2e843249ae..120bec1b9f 100644
--- a/src/grp-udev/systemd-hwdb/hwdb.c
+++ b/src/grp-udev/systemd-hwdb/hwdb.c
@@ -22,21 +22,21 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/conf-files.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/label.h"
-#include "basic/mkdir.h"
-#include "basic/selinux-util.h"
-#include "basic/strbuf.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "basic/verbs.h"
 #include "sd-hwdb/hwdb-internal.h"
 #include "sd-hwdb/hwdb-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/strbuf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/verbs.h"
 
 /*
  * Generic udev properties, key/value database based on modalias strings.
diff --git a/src/grp-udev/systemd-udevd/Makefile b/src/grp-udev/systemd-udevd/Makefile
index 0ef78eb339..d32486f2c8 100644
--- a/src/grp-udev/systemd-udevd/Makefile
+++ b/src/grp-udev/systemd-udevd/Makefile
@@ -31,6 +31,6 @@ systemd_udevd_SOURCES = \
 
 systemd_udevd_LDADD = \
 	libudev-core.la \
-	libbasic.la
+	libsystemd-basic.la
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/systemd-udevd/udevd.c b/src/grp-udev/systemd-udevd/udevd.c
index 6ca4069fca..3b94386a38 100644
--- a/src/grp-udev/systemd-udevd/udevd.c
+++ b/src/grp-udev/systemd-udevd/udevd.c
@@ -43,26 +43,26 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/cpu-set-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/io-util.h"
-#include "basic/parse-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/process-util.h"
-#include "basic/selinux-util.h"
-#include "basic/signal-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/user-util.h"
-#include "shared/dev-setup.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/cpu-set-util.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/io-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/dev-setup.h"
+#include "systemd-shared/udev-util.h"
 #include "udev.h"
 
 static bool arg_debug = false;
diff --git a/src/grp-udev/udevadm/Makefile b/src/grp-udev/udevadm/Makefile
index b556d5c9d1..6c59baca19 100644
--- a/src/grp-udev/udevadm/Makefile
+++ b/src/grp-udev/udevadm/Makefile
@@ -41,7 +41,7 @@ udevadm_SOURCES = \
 
 udevadm_LDADD = \
 	libudev-core.la \
-	libbasic.la
+	libsystemd-basic.la
 
 sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
 
diff --git a/src/grp-udev/udevadm/udevadm-control.c b/src/grp-udev/udevadm/udevadm-control.c
index 8aaef5fa14..0b15e660da 100644
--- a/src/grp-udev/udevadm/udevadm-control.c
+++ b/src/grp-udev/udevadm/udevadm-control.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "shared/udev-util.h"
+#include "systemd-shared/udev-util.h"
 #include "udev.h"
 
 static void print_help(void) {
diff --git a/src/grp-udev/udevadm/udevadm-hwdb.c b/src/grp-udev/udevadm/udevadm-hwdb.c
index 2b5444f439..365f23fdff 100644
--- a/src/grp-udev/udevadm/udevadm-hwdb.c
+++ b/src/grp-udev/udevadm/udevadm-hwdb.c
@@ -22,17 +22,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/conf-files.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/label.h"
-#include "basic/mkdir.h"
-#include "basic/strbuf.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "sd-hwdb/hwdb-internal.h"
 #include "sd-hwdb/hwdb-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/strbuf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 #include "udev.h"
 
 /*
diff --git a/src/grp-udev/udevadm/udevadm-info.c b/src/grp-udev/udevadm/udevadm-info.c
index 9746d82aa4..38233de223 100644
--- a/src/grp-udev/udevadm/udevadm-info.c
+++ b/src/grp-udev/udevadm/udevadm-info.c
@@ -26,9 +26,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/string-util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/udev-util.h"
 #include "udev.h"
 
 #include "udevadm-util.h"
diff --git a/src/grp-udev/udevadm/udevadm-monitor.c b/src/grp-udev/udevadm/udevadm-monitor.c
index c6002ce416..3503b19a21 100644
--- a/src/grp-udev/udevadm/udevadm-monitor.c
+++ b/src/grp-udev/udevadm/udevadm-monitor.c
@@ -25,9 +25,9 @@
 #include <sys/time.h>
 #include <time.h>
 
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-shared/udev-util.h"
 #include "udev.h"
 
 static bool udev_exit;
diff --git a/src/grp-udev/udevadm/udevadm-settle.c b/src/grp-udev/udevadm/udevadm-settle.c
index 2a7a150517..1d2ee5ba26 100644
--- a/src/grp-udev/udevadm/udevadm-settle.c
+++ b/src/grp-udev/udevadm/udevadm-settle.c
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/parse-util.h"
-#include "basic/util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/util.h"
 #include "udev.h"
 
 static void help(void) {
diff --git a/src/grp-udev/udevadm/udevadm-test-builtin.c b/src/grp-udev/udevadm/udevadm-test-builtin.c
index a3a66e05d7..1f65b3ed8b 100644
--- a/src/grp-udev/udevadm/udevadm-test-builtin.c
+++ b/src/grp-udev/udevadm/udevadm-test-builtin.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "basic/string-util.h"
+#include "systemd-basic/string-util.h"
 #include "udev.h"
 
 static void help(struct udev *udev) {
diff --git a/src/grp-udev/udevadm/udevadm-test.c b/src/grp-udev/udevadm/udevadm-test.c
index ed919ec244..00b326d2cb 100644
--- a/src/grp-udev/udevadm/udevadm-test.c
+++ b/src/grp-udev/udevadm/udevadm-test.c
@@ -25,8 +25,8 @@
 #include <sys/signalfd.h>
 #include <unistd.h>
 
-#include "basic/string-util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/udev-util.h"
 #include "udev.h"
 
 static void help(void) {
diff --git a/src/grp-udev/udevadm/udevadm-trigger.c b/src/grp-udev/udevadm/udevadm-trigger.c
index 280f348fae..150b1e5a9a 100644
--- a/src/grp-udev/udevadm/udevadm-trigger.c
+++ b/src/grp-udev/udevadm/udevadm-trigger.c
@@ -23,9 +23,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/udev-util.h"
 #include "udev.h"
 
 #include "udevadm-util.h"
diff --git a/src/grp-udev/udevadm/udevadm-util.c b/src/grp-udev/udevadm/udevadm-util.c
index 8dc871cb10..c972959888 100644
--- a/src/grp-udev/udevadm/udevadm-util.c
+++ b/src/grp-udev/udevadm/udevadm-util.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "basic/string-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "udevadm-util.h"
 
diff --git a/src/grp-udev/udevadm/udevadm.c b/src/grp-udev/udevadm/udevadm.c
index 555d269275..4f61722836 100644
--- a/src/grp-udev/udevadm/udevadm.c
+++ b/src/grp-udev/udevadm/udevadm.c
@@ -20,8 +20,8 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include "basic/selinux-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/string-util.h"
 #include "udev.h"
 
 static int adm_version(struct udev *udev, int argc, char *argv[]) {
diff --git a/src/grp-udev/v4l_id/Makefile b/src/grp-udev/v4l_id/Makefile
index 0641af8065..5ba9e88afe 100644
--- a/src/grp-udev/v4l_id/Makefile
+++ b/src/grp-udev/v4l_id/Makefile
@@ -27,7 +27,7 @@ v4l_id_SOURCES = \
 	src/udev/v4l_id/v4l_id.c
 
 v4l_id_LDADD = \
-	libshared.la
+	libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
 	v4l_id
diff --git a/src/grp-udev/v4l_id/v4l_id.c b/src/grp-udev/v4l_id/v4l_id.c
index d1aad403b9..639682a04e 100644
--- a/src/grp-udev/v4l_id/v4l_id.c
+++ b/src/grp-udev/v4l_id/v4l_id.c
@@ -27,8 +27,8 @@
 
 #include <linux/videodev2.h>
 
-#include "basic/fd-util.h"
-#include "basic/util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/util.h"
 
 int main(int argc, char *argv[]) {
         static const struct option options[] = {
diff --git a/src/grp-utils/systemd-ac-power/ac-power.c b/src/grp-utils/systemd-ac-power/ac-power.c
index 945c318f66..4b9190f8c9 100644
--- a/src/grp-utils/systemd-ac-power/ac-power.c
+++ b/src/grp-utils/systemd-ac-power/ac-power.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/util.h"
+#include "systemd-basic/util.h"
 
 int main(int argc, char *argv[]) {
         int r;
diff --git a/src/grp-utils/systemd-escape/escape.c b/src/grp-utils/systemd-escape/escape.c
index 479ea0e87c..5e186d75e2 100644
--- a/src/grp-utils/systemd-escape/escape.c
+++ b/src/grp-utils/systemd-escape/escape.c
@@ -21,11 +21,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
 
 static enum {
         ACTION_ESCAPE,
diff --git a/src/grp-utils/systemd-notify/notify.c b/src/grp-utils/systemd-notify/notify.c
index 4db49508b3..c347c110a9 100644
--- a/src/grp-utils/systemd-notify/notify.c
+++ b/src/grp-utils/systemd-notify/notify.c
@@ -25,14 +25,14 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/env-util.h"
-#include "basic/formats-util.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 static bool arg_ready = false;
 static pid_t arg_pid = 0;
diff --git a/src/grp-utils/systemd-path/Makefile b/src/grp-utils/systemd-path/Makefile
index 9fcae47938..d8abf0f2ee 100644
--- a/src/grp-utils/systemd-path/Makefile
+++ b/src/grp-utils/systemd-path/Makefile
@@ -30,7 +30,7 @@ systemd_path_SOURCES = \
 	src/path/path.c
 
 systemd_path_LDADD = \
-	libbasic.la
+	libsystemd-basic.la
 
 sd.CPPFLAGS += -DLIBDIR=\"$(libdir)\"
 sd.CPPFLAGS += -DROOTLIBDIR=\"$(rootlibdir)\"
diff --git a/src/grp-utils/systemd-path/path.c b/src/grp-utils/systemd-path/path.c
index ed824fa857..3c5323862f 100644
--- a/src/grp-utils/systemd-path/path.c
+++ b/src/grp-utils/systemd-path/path.c
@@ -22,11 +22,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "sd-path.h"
 
diff --git a/src/grp-utils/systemd-path/sd-path.c b/src/grp-utils/systemd-path/sd-path.c
index 2e0a0a7cfd..b36bc34e58 100644
--- a/src/grp-utils/systemd-path/sd-path.c
+++ b/src/grp-utils/systemd-path/sd-path.c
@@ -17,16 +17,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/architecture.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "sd-path.h"
 
diff --git a/src/grp-utils/systemd-socket-activate/activate.c b/src/grp-utils/systemd-socket-activate/activate.c
index 2ad205af17..35a51b2fcc 100644
--- a/src/grp-utils/systemd-socket-activate/activate.c
+++ b/src/grp-utils/systemd-socket-activate/activate.c
@@ -26,15 +26,15 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/signal-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
 
 static char** arg_listen = NULL;
 static bool arg_accept = false;
diff --git a/src/libbasic/include/basic/Makefile b/src/libbasic/include/basic/Makefile
deleted file mode 100644
index b1d41dc79d..0000000000
--- a/src/libbasic/include/basic/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#  -*- 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
-
-$(outdir)/errno-list.txt: | $(outdir)/.deps
-	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
-
-$(outdir)/errno-to-name.h: $(outdir)/errno-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
-
-$(outdir)/af-list.txt:
-	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@
-
-$(outdir)/af-to-name.h: $(outdir)/af-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
-
-$(outdir)/arphrd-list.txt:
-	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
-
-$(outdir)/arphrd-to-name.h: $(outdir)/arphrd-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const arphrd_names[] = { "} !/CISCO/ { printf "[ARPHRD_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
-
-$(outdir)/arphrd-from-name.gperf: $(outdir)/arphrd-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
-
-$(outdir)/cap-list.txt: $(srcdir)/missing.h
-	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include linux/capability.h -include $< - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
-
-$(outdir)/cap-to-name.h: $(outdir)/cap-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@
-
-$(outdir)/cap-from-name.gperf: $(outdir)/cap-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
-
-$(outdir)/cap-from-name.h: $(outdir)/cap-from-name.gperf
-	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
-
-sd.CPPFLAGS += $(libbasic.CPPFLAGS)
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/Makefile b/src/libsystemd-basic/Makefile
index 369b265ff7..369b265ff7 100644
--- a/src/libshared/Makefile
+++ b/src/libsystemd-basic/Makefile
diff --git a/src/libbasic/include/basic/MurmurHash2.h b/src/libsystemd-basic/include/systemd-basic/MurmurHash2.h
index 93362dd485..93362dd485 100644
--- a/src/libbasic/include/basic/MurmurHash2.h
+++ b/src/libsystemd-basic/include/systemd-basic/MurmurHash2.h
diff --git a/src/libbasic/include/basic/af-list.h b/src/libsystemd-basic/include/systemd-basic/af-list.h
index 6a4cc03839..6a4cc03839 100644
--- a/src/libbasic/include/basic/af-list.h
+++ b/src/libsystemd-basic/include/systemd-basic/af-list.h
diff --git a/src/libbasic/include/basic/alloc-util.h b/src/libsystemd-basic/include/systemd-basic/alloc-util.h
index ceeee519b7..ceeee519b7 100644
--- a/src/libbasic/include/basic/alloc-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/alloc-util.h
diff --git a/src/libbasic/include/basic/architecture.h b/src/libsystemd-basic/include/systemd-basic/architecture.h
index b3e4d85906..b3e4d85906 100644
--- a/src/libbasic/include/basic/architecture.h
+++ b/src/libsystemd-basic/include/systemd-basic/architecture.h
diff --git a/src/libbasic/include/basic/arphrd-list.h b/src/libsystemd-basic/include/systemd-basic/arphrd-list.h
index c0f8758dbe..c0f8758dbe 100644
--- a/src/libbasic/include/basic/arphrd-list.h
+++ b/src/libsystemd-basic/include/systemd-basic/arphrd-list.h
diff --git a/src/libbasic/include/basic/async.h b/src/libsystemd-basic/include/systemd-basic/async.h
index 9bd13ff6e0..9bd13ff6e0 100644
--- a/src/libbasic/include/basic/async.h
+++ b/src/libsystemd-basic/include/systemd-basic/async.h
diff --git a/src/libbasic/include/basic/audit-util.h b/src/libsystemd-basic/include/systemd-basic/audit-util.h
index e048503991..e048503991 100644
--- a/src/libbasic/include/basic/audit-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/audit-util.h
diff --git a/src/libbasic/include/basic/barrier.h b/src/libsystemd-basic/include/systemd-basic/barrier.h
index 6347fddc4d..6347fddc4d 100644
--- a/src/libbasic/include/basic/barrier.h
+++ b/src/libsystemd-basic/include/systemd-basic/barrier.h
diff --git a/src/libbasic/include/basic/bitmap.h b/src/libsystemd-basic/include/systemd-basic/bitmap.h
index 63fdbe8bea..63fdbe8bea 100644
--- a/src/libbasic/include/basic/bitmap.h
+++ b/src/libsystemd-basic/include/systemd-basic/bitmap.h
diff --git a/src/libbasic/include/basic/btrfs-ctree.h b/src/libsystemd-basic/include/systemd-basic/btrfs-ctree.h
index 15e6d5582c..15e6d5582c 100644
--- a/src/libbasic/include/basic/btrfs-ctree.h
+++ b/src/libsystemd-basic/include/systemd-basic/btrfs-ctree.h
diff --git a/src/libbasic/include/basic/btrfs-util.h b/src/libsystemd-basic/include/systemd-basic/btrfs-util.h
index db431f5b74..db431f5b74 100644
--- a/src/libbasic/include/basic/btrfs-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/btrfs-util.h
diff --git a/src/libbasic/include/basic/build.h b/src/libsystemd-basic/include/systemd-basic/build.h
index 633c2aaccb..633c2aaccb 100644
--- a/src/libbasic/include/basic/build.h
+++ b/src/libsystemd-basic/include/systemd-basic/build.h
diff --git a/src/libbasic/include/basic/bus-label.h b/src/libsystemd-basic/include/systemd-basic/bus-label.h
index 62fb2c450c..62fb2c450c 100644
--- a/src/libbasic/include/basic/bus-label.h
+++ b/src/libsystemd-basic/include/systemd-basic/bus-label.h
diff --git a/src/libbasic/include/basic/calendarspec.h b/src/libsystemd-basic/include/systemd-basic/calendarspec.h
index f6472c1244..f6472c1244 100644
--- a/src/libbasic/include/basic/calendarspec.h
+++ b/src/libsystemd-basic/include/systemd-basic/calendarspec.h
diff --git a/src/libbasic/include/basic/cap-list.h b/src/libsystemd-basic/include/systemd-basic/cap-list.h
index c1f6b94ad3..c1f6b94ad3 100644
--- a/src/libbasic/include/basic/cap-list.h
+++ b/src/libsystemd-basic/include/systemd-basic/cap-list.h
diff --git a/src/libbasic/include/basic/capability-util.h b/src/libsystemd-basic/include/systemd-basic/capability-util.h
index 35a896e229..35a896e229 100644
--- a/src/libbasic/include/basic/capability-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/capability-util.h
diff --git a/src/libbasic/include/basic/cgroup-util.h b/src/libsystemd-basic/include/systemd-basic/cgroup-util.h
index 14ebde5fc9..14ebde5fc9 100644
--- a/src/libbasic/include/basic/cgroup-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/cgroup-util.h
diff --git a/src/libbasic/include/basic/chattr-util.h b/src/libsystemd-basic/include/systemd-basic/chattr-util.h
index 960cf6d5b3..960cf6d5b3 100644
--- a/src/libbasic/include/basic/chattr-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/chattr-util.h
diff --git a/src/libbasic/include/basic/clock-util.h b/src/libsystemd-basic/include/systemd-basic/clock-util.h
index 8830cd2f38..8830cd2f38 100644
--- a/src/libbasic/include/basic/clock-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/clock-util.h
diff --git a/src/libbasic/include/basic/conf-files.h b/src/libsystemd-basic/include/systemd-basic/conf-files.h
index e00e0e81fb..e00e0e81fb 100644
--- a/src/libbasic/include/basic/conf-files.h
+++ b/src/libsystemd-basic/include/systemd-basic/conf-files.h
diff --git a/src/libbasic/include/basic/copy.h b/src/libsystemd-basic/include/systemd-basic/copy.h
index b5d08ebafe..b5d08ebafe 100644
--- a/src/libbasic/include/basic/copy.h
+++ b/src/libsystemd-basic/include/systemd-basic/copy.h
diff --git a/src/libbasic/include/basic/cpu-set-util.h b/src/libsystemd-basic/include/systemd-basic/cpu-set-util.h
index 6f49d9afb0..6f49d9afb0 100644
--- a/src/libbasic/include/basic/cpu-set-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/cpu-set-util.h
diff --git a/src/libbasic/include/basic/def.h b/src/libsystemd-basic/include/systemd-basic/def.h
index 1a7a0f4928..1a7a0f4928 100644
--- a/src/libbasic/include/basic/def.h
+++ b/src/libsystemd-basic/include/systemd-basic/def.h
diff --git a/src/libbasic/include/basic/device-nodes.h b/src/libsystemd-basic/include/systemd-basic/device-nodes.h
index 94f385abcb..94f385abcb 100644
--- a/src/libbasic/include/basic/device-nodes.h
+++ b/src/libsystemd-basic/include/systemd-basic/device-nodes.h
diff --git a/src/libbasic/include/basic/dirent-util.h b/src/libsystemd-basic/include/systemd-basic/dirent-util.h
index b91d04908f..b91d04908f 100644
--- a/src/libbasic/include/basic/dirent-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/dirent-util.h
diff --git a/src/libbasic/include/basic/env-util.h b/src/libsystemd-basic/include/systemd-basic/env-util.h
index b1fef704c2..b1fef704c2 100644
--- a/src/libbasic/include/basic/env-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/env-util.h
diff --git a/src/libbasic/include/basic/errno-list.h b/src/libsystemd-basic/include/systemd-basic/errno-list.h
index 4eec0cc786..4eec0cc786 100644
--- a/src/libbasic/include/basic/errno-list.h
+++ b/src/libsystemd-basic/include/systemd-basic/errno-list.h
diff --git a/src/libbasic/include/basic/escape.h b/src/libsystemd-basic/include/systemd-basic/escape.h
index 6e58f61e19..6e58f61e19 100644
--- a/src/libbasic/include/basic/escape.h
+++ b/src/libsystemd-basic/include/systemd-basic/escape.h
diff --git a/src/libbasic/include/basic/ether-addr-util.h b/src/libsystemd-basic/include/systemd-basic/ether-addr-util.h
index 74e125a95f..74e125a95f 100644
--- a/src/libbasic/include/basic/ether-addr-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/ether-addr-util.h
diff --git a/src/libbasic/include/basic/exit-status.h b/src/libsystemd-basic/include/systemd-basic/exit-status.h
index 2309f68815..2309f68815 100644
--- a/src/libbasic/include/basic/exit-status.h
+++ b/src/libsystemd-basic/include/systemd-basic/exit-status.h
diff --git a/src/libbasic/include/basic/extract-word.h b/src/libsystemd-basic/include/systemd-basic/extract-word.h
index 21db5ef33f..21db5ef33f 100644
--- a/src/libbasic/include/basic/extract-word.h
+++ b/src/libsystemd-basic/include/systemd-basic/extract-word.h
diff --git a/src/libbasic/include/basic/fd-util.h b/src/libsystemd-basic/include/systemd-basic/fd-util.h
index 34b98d4aec..34b98d4aec 100644
--- a/src/libbasic/include/basic/fd-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/fd-util.h
diff --git a/src/libbasic/include/basic/fileio-label.h b/src/libsystemd-basic/include/systemd-basic/fileio-label.h
index fe7543013d..fe7543013d 100644
--- a/src/libbasic/include/basic/fileio-label.h
+++ b/src/libsystemd-basic/include/systemd-basic/fileio-label.h
diff --git a/src/libbasic/include/basic/fileio.h b/src/libsystemd-basic/include/systemd-basic/fileio.h
index 9ac497d9eb..9ac497d9eb 100644
--- a/src/libbasic/include/basic/fileio.h
+++ b/src/libsystemd-basic/include/systemd-basic/fileio.h
diff --git a/src/libbasic/include/basic/formats-util.h b/src/libsystemd-basic/include/systemd-basic/formats-util.h
index 39a185f59b..39a185f59b 100644
--- a/src/libbasic/include/basic/formats-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/formats-util.h
diff --git a/src/libbasic/include/basic/fs-util.h b/src/libsystemd-basic/include/systemd-basic/fs-util.h
index 075e5942b1..075e5942b1 100644
--- a/src/libbasic/include/basic/fs-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/fs-util.h
diff --git a/src/libbasic/include/basic/glob-util.h b/src/libsystemd-basic/include/systemd-basic/glob-util.h
index 5d8fb47a26..5d8fb47a26 100644
--- a/src/libbasic/include/basic/glob-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/glob-util.h
diff --git a/src/libbasic/include/basic/gunicode.h b/src/libsystemd-basic/include/systemd-basic/gunicode.h
index 5975bc8fc9..5975bc8fc9 100644
--- a/src/libbasic/include/basic/gunicode.h
+++ b/src/libsystemd-basic/include/systemd-basic/gunicode.h
diff --git a/src/libbasic/include/basic/hash-funcs.h b/src/libsystemd-basic/include/systemd-basic/hash-funcs.h
index 299189d143..299189d143 100644
--- a/src/libbasic/include/basic/hash-funcs.h
+++ b/src/libsystemd-basic/include/systemd-basic/hash-funcs.h
diff --git a/src/libbasic/include/basic/hashmap.h b/src/libsystemd-basic/include/systemd-basic/hashmap.h
index 6d1ae48b21..6d1ae48b21 100644
--- a/src/libbasic/include/basic/hashmap.h
+++ b/src/libsystemd-basic/include/systemd-basic/hashmap.h
diff --git a/src/libbasic/include/basic/hexdecoct.h b/src/libsystemd-basic/include/systemd-basic/hexdecoct.h
index 1ba2f69ebd..1ba2f69ebd 100644
--- a/src/libbasic/include/basic/hexdecoct.h
+++ b/src/libsystemd-basic/include/systemd-basic/hexdecoct.h
diff --git a/src/libbasic/include/basic/hostname-util.h b/src/libsystemd-basic/include/systemd-basic/hostname-util.h
index 7af4e6c7ec..7af4e6c7ec 100644
--- a/src/libbasic/include/basic/hostname-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/hostname-util.h
diff --git a/src/libbasic/include/basic/in-addr-util.h b/src/libsystemd-basic/include/systemd-basic/in-addr-util.h
index d60064aef8..d60064aef8 100644
--- a/src/libbasic/include/basic/in-addr-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/in-addr-util.h
diff --git a/src/libbasic/include/basic/io-util.h b/src/libsystemd-basic/include/systemd-basic/io-util.h
index 4684ed3bfc..4684ed3bfc 100644
--- a/src/libbasic/include/basic/io-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/io-util.h
diff --git a/src/libbasic/include/basic/ioprio.h b/src/libsystemd-basic/include/systemd-basic/ioprio.h
index d8bb6eb497..d8bb6eb497 100644
--- a/src/libbasic/include/basic/ioprio.h
+++ b/src/libsystemd-basic/include/systemd-basic/ioprio.h
diff --git a/src/libbasic/include/basic/label.h b/src/libsystemd-basic/include/systemd-basic/label.h
index 3e9251aa71..3e9251aa71 100644
--- a/src/libbasic/include/basic/label.h
+++ b/src/libsystemd-basic/include/systemd-basic/label.h
diff --git a/src/libbasic/include/basic/list.h b/src/libsystemd-basic/include/systemd-basic/list.h
index 5962aa4211..5962aa4211 100644
--- a/src/libbasic/include/basic/list.h
+++ b/src/libsystemd-basic/include/systemd-basic/list.h
diff --git a/src/libbasic/include/basic/locale-util.h b/src/libsystemd-basic/include/systemd-basic/locale-util.h
index 0630a034ab..0630a034ab 100644
--- a/src/libbasic/include/basic/locale-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/locale-util.h
diff --git a/src/libbasic/include/basic/lockfile-util.h b/src/libsystemd-basic/include/systemd-basic/lockfile-util.h
index 22491ee8e1..22491ee8e1 100644
--- a/src/libbasic/include/basic/lockfile-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/lockfile-util.h
diff --git a/src/libbasic/include/basic/log.h b/src/libsystemd-basic/include/systemd-basic/log.h
index d2a22b5829..d2a22b5829 100644
--- a/src/libbasic/include/basic/log.h
+++ b/src/libsystemd-basic/include/systemd-basic/log.h
diff --git a/src/libbasic/include/basic/login-util.h b/src/libsystemd-basic/include/systemd-basic/login-util.h
index b01ee25c88..b01ee25c88 100644
--- a/src/libbasic/include/basic/login-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/login-util.h
diff --git a/src/libbasic/include/basic/macro.h b/src/libsystemd-basic/include/systemd-basic/macro.h
index 6b2aeb933f..6b2aeb933f 100644
--- a/src/libbasic/include/basic/macro.h
+++ b/src/libsystemd-basic/include/systemd-basic/macro.h
diff --git a/src/libbasic/include/basic/memfd-util.h b/src/libsystemd-basic/include/systemd-basic/memfd-util.h
index 46d4989e4c..46d4989e4c 100644
--- a/src/libbasic/include/basic/memfd-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/memfd-util.h
diff --git a/src/libbasic/include/basic/mempool.h b/src/libsystemd-basic/include/systemd-basic/mempool.h
index 0618b8dd22..0618b8dd22 100644
--- a/src/libbasic/include/basic/mempool.h
+++ b/src/libsystemd-basic/include/systemd-basic/mempool.h
diff --git a/src/libbasic/include/basic/missing.h b/src/libsystemd-basic/include/systemd-basic/missing.h
index 8721b075bb..8721b075bb 100644
--- a/src/libbasic/include/basic/missing.h
+++ b/src/libsystemd-basic/include/systemd-basic/missing.h
diff --git a/src/libbasic/include/basic/missing_syscall.h b/src/libsystemd-basic/include/systemd-basic/missing_syscall.h
index 9afba975fb..9afba975fb 100644
--- a/src/libbasic/include/basic/missing_syscall.h
+++ b/src/libsystemd-basic/include/systemd-basic/missing_syscall.h
diff --git a/src/libbasic/include/basic/mkdir.h b/src/libsystemd-basic/include/systemd-basic/mkdir.h
index d564a3547f..d564a3547f 100644
--- a/src/libbasic/include/basic/mkdir.h
+++ b/src/libsystemd-basic/include/systemd-basic/mkdir.h
diff --git a/src/libbasic/include/basic/mount-util.h b/src/libsystemd-basic/include/systemd-basic/mount-util.h
index f46989ebb3..f46989ebb3 100644
--- a/src/libbasic/include/basic/mount-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/mount-util.h
diff --git a/src/libbasic/include/basic/nss-util.h b/src/libsystemd-basic/include/systemd-basic/nss-util.h
index e7844fff96..e7844fff96 100644
--- a/src/libbasic/include/basic/nss-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/nss-util.h
diff --git a/src/libbasic/include/basic/ordered-set.h b/src/libsystemd-basic/include/systemd-basic/ordered-set.h
index e1dfc86380..e1dfc86380 100644
--- a/src/libbasic/include/basic/ordered-set.h
+++ b/src/libsystemd-basic/include/systemd-basic/ordered-set.h
diff --git a/src/libbasic/include/basic/parse-util.h b/src/libsystemd-basic/include/systemd-basic/parse-util.h
index 73441bb6fd..73441bb6fd 100644
--- a/src/libbasic/include/basic/parse-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/parse-util.h
diff --git a/src/libbasic/include/basic/path-util.h b/src/libsystemd-basic/include/systemd-basic/path-util.h
index a27c13fcc3..a27c13fcc3 100644
--- a/src/libbasic/include/basic/path-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/path-util.h
diff --git a/src/libbasic/include/basic/prioq.h b/src/libsystemd-basic/include/systemd-basic/prioq.h
index 113c73d040..113c73d040 100644
--- a/src/libbasic/include/basic/prioq.h
+++ b/src/libsystemd-basic/include/systemd-basic/prioq.h
diff --git a/src/libbasic/include/basic/proc-cmdline.h b/src/libsystemd-basic/include/systemd-basic/proc-cmdline.h
index 452642a2f5..452642a2f5 100644
--- a/src/libbasic/include/basic/proc-cmdline.h
+++ b/src/libsystemd-basic/include/systemd-basic/proc-cmdline.h
diff --git a/src/libbasic/include/basic/process-util.h b/src/libsystemd-basic/include/systemd-basic/process-util.h
index 9f75088796..9f75088796 100644
--- a/src/libbasic/include/basic/process-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/process-util.h
diff --git a/src/libbasic/include/basic/random-util.h b/src/libsystemd-basic/include/systemd-basic/random-util.h
index 3cee4c5014..3cee4c5014 100644
--- a/src/libbasic/include/basic/random-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/random-util.h
diff --git a/src/libbasic/include/basic/ratelimit.h b/src/libsystemd-basic/include/systemd-basic/ratelimit.h
index 9c8dddf5ad..9c8dddf5ad 100644
--- a/src/libbasic/include/basic/ratelimit.h
+++ b/src/libsystemd-basic/include/systemd-basic/ratelimit.h
diff --git a/src/libbasic/include/basic/raw-clone.h b/src/libsystemd-basic/include/systemd-basic/raw-clone.h
index d473828999..d473828999 100644
--- a/src/libbasic/include/basic/raw-clone.h
+++ b/src/libsystemd-basic/include/systemd-basic/raw-clone.h
diff --git a/src/libbasic/include/basic/refcnt.h b/src/libsystemd-basic/include/systemd-basic/refcnt.h
index 1d77a6445a..1d77a6445a 100644
--- a/src/libbasic/include/basic/refcnt.h
+++ b/src/libsystemd-basic/include/systemd-basic/refcnt.h
diff --git a/src/libbasic/include/basic/replace-var.h b/src/libsystemd-basic/include/systemd-basic/replace-var.h
index 78412910b2..78412910b2 100644
--- a/src/libbasic/include/basic/replace-var.h
+++ b/src/libsystemd-basic/include/systemd-basic/replace-var.h
diff --git a/src/libbasic/include/basic/rlimit-util.h b/src/libsystemd-basic/include/systemd-basic/rlimit-util.h
index d4594eccd6..d4594eccd6 100644
--- a/src/libbasic/include/basic/rlimit-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/rlimit-util.h
diff --git a/src/libbasic/include/basic/rm-rf.h b/src/libsystemd-basic/include/systemd-basic/rm-rf.h
index 8d315792ac..8d315792ac 100644
--- a/src/libbasic/include/basic/rm-rf.h
+++ b/src/libsystemd-basic/include/systemd-basic/rm-rf.h
diff --git a/src/libbasic/include/basic/securebits.h b/src/libsystemd-basic/include/systemd-basic/securebits.h
index 98fbe0d433..98fbe0d433 100644
--- a/src/libbasic/include/basic/securebits.h
+++ b/src/libsystemd-basic/include/systemd-basic/securebits.h
diff --git a/src/libbasic/include/basic/selinux-util.h b/src/libsystemd-basic/include/systemd-basic/selinux-util.h
index ce6bc8e44c..ce6bc8e44c 100644
--- a/src/libbasic/include/basic/selinux-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/selinux-util.h
diff --git a/src/libbasic/include/basic/set.h b/src/libsystemd-basic/include/systemd-basic/set.h
index 12f64a8c57..12f64a8c57 100644
--- a/src/libbasic/include/basic/set.h
+++ b/src/libsystemd-basic/include/systemd-basic/set.h
diff --git a/src/libbasic/include/basic/sigbus.h b/src/libsystemd-basic/include/systemd-basic/sigbus.h
index 980243d9ce..980243d9ce 100644
--- a/src/libbasic/include/basic/sigbus.h
+++ b/src/libsystemd-basic/include/systemd-basic/sigbus.h
diff --git a/src/libbasic/include/basic/signal-util.h b/src/libsystemd-basic/include/systemd-basic/signal-util.h
index dfd6eb564d..dfd6eb564d 100644
--- a/src/libbasic/include/basic/signal-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/signal-util.h
diff --git a/src/libbasic/include/basic/siphash24.h b/src/libsystemd-basic/include/systemd-basic/siphash24.h
index 54e2420cc6..54e2420cc6 100644
--- a/src/libbasic/include/basic/siphash24.h
+++ b/src/libsystemd-basic/include/systemd-basic/siphash24.h
diff --git a/src/libbasic/include/basic/smack-util.h b/src/libsystemd-basic/include/systemd-basic/smack-util.h
index f90ba0a027..f90ba0a027 100644
--- a/src/libbasic/include/basic/smack-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/smack-util.h
diff --git a/src/libbasic/include/basic/socket-util.h b/src/libsystemd-basic/include/systemd-basic/socket-util.h
index 2b717a91d4..2b717a91d4 100644
--- a/src/libbasic/include/basic/socket-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/socket-util.h
diff --git a/src/libbasic/include/basic/sparse-endian.h b/src/libsystemd-basic/include/systemd-basic/sparse-endian.h
index c913fda8c5..c913fda8c5 100644
--- a/src/libbasic/include/basic/sparse-endian.h
+++ b/src/libsystemd-basic/include/systemd-basic/sparse-endian.h
diff --git a/src/libbasic/include/basic/special.h b/src/libsystemd-basic/include/systemd-basic/special.h
index 084d3dfa23..084d3dfa23 100644
--- a/src/libbasic/include/basic/special.h
+++ b/src/libsystemd-basic/include/systemd-basic/special.h
diff --git a/src/libbasic/include/basic/stat-util.h b/src/libsystemd-basic/include/systemd-basic/stat-util.h
index 56d28f791e..56d28f791e 100644
--- a/src/libbasic/include/basic/stat-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/stat-util.h
diff --git a/src/libbasic/include/basic/stdio-util.h b/src/libsystemd-basic/include/systemd-basic/stdio-util.h
index bd1144b4c9..bd1144b4c9 100644
--- a/src/libbasic/include/basic/stdio-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/stdio-util.h
diff --git a/src/libbasic/include/basic/strbuf.h b/src/libsystemd-basic/include/systemd-basic/strbuf.h
index a1632da0e8..a1632da0e8 100644
--- a/src/libbasic/include/basic/strbuf.h
+++ b/src/libsystemd-basic/include/systemd-basic/strbuf.h
diff --git a/src/libbasic/include/basic/string-table.h b/src/libsystemd-basic/include/systemd-basic/string-table.h
index 369610efc8..369610efc8 100644
--- a/src/libbasic/include/basic/string-table.h
+++ b/src/libsystemd-basic/include/systemd-basic/string-table.h
diff --git a/src/libbasic/include/basic/string-util.h b/src/libsystemd-basic/include/systemd-basic/string-util.h
index 1209e1e2e1..1209e1e2e1 100644
--- a/src/libbasic/include/basic/string-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/string-util.h
diff --git a/src/libbasic/include/basic/strv.h b/src/libsystemd-basic/include/systemd-basic/strv.h
index 683ce83a2a..683ce83a2a 100644
--- a/src/libbasic/include/basic/strv.h
+++ b/src/libsystemd-basic/include/systemd-basic/strv.h
diff --git a/src/libbasic/include/basic/strxcpyx.h b/src/libsystemd-basic/include/systemd-basic/strxcpyx.h
index 80ff58726b..80ff58726b 100644
--- a/src/libbasic/include/basic/strxcpyx.h
+++ b/src/libsystemd-basic/include/systemd-basic/strxcpyx.h
diff --git a/src/libbasic/include/basic/syslog-util.h b/src/libsystemd-basic/include/systemd-basic/syslog-util.h
index 5cb606a1bf..5cb606a1bf 100644
--- a/src/libbasic/include/basic/syslog-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/syslog-util.h
diff --git a/src/libbasic/include/basic/terminal-util.h b/src/libsystemd-basic/include/systemd-basic/terminal-util.h
index 169ab772ff..169ab772ff 100644
--- a/src/libbasic/include/basic/terminal-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/terminal-util.h
diff --git a/src/libbasic/include/basic/time-util.h b/src/libsystemd-basic/include/systemd-basic/time-util.h
index aef64d2c8d..aef64d2c8d 100644
--- a/src/libbasic/include/basic/time-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/time-util.h
diff --git a/src/libbasic/include/basic/umask-util.h b/src/libsystemd-basic/include/systemd-basic/umask-util.h
index 359d87d27c..359d87d27c 100644
--- a/src/libbasic/include/basic/umask-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/umask-util.h
diff --git a/src/libbasic/include/basic/unaligned.h b/src/libsystemd-basic/include/systemd-basic/unaligned.h
index 7c847a3ccb..7c847a3ccb 100644
--- a/src/libbasic/include/basic/unaligned.h
+++ b/src/libsystemd-basic/include/systemd-basic/unaligned.h
diff --git a/src/libbasic/include/basic/unit-name.h b/src/libsystemd-basic/include/systemd-basic/unit-name.h
index 44eadf0347..44eadf0347 100644
--- a/src/libbasic/include/basic/unit-name.h
+++ b/src/libsystemd-basic/include/systemd-basic/unit-name.h
diff --git a/src/libbasic/include/basic/user-util.h b/src/libsystemd-basic/include/systemd-basic/user-util.h
index 8026eca3f4..8026eca3f4 100644
--- a/src/libbasic/include/basic/user-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/user-util.h
diff --git a/src/libbasic/include/basic/utf8.h b/src/libsystemd-basic/include/systemd-basic/utf8.h
index f9b9c9468b..f9b9c9468b 100644
--- a/src/libbasic/include/basic/utf8.h
+++ b/src/libsystemd-basic/include/systemd-basic/utf8.h
diff --git a/src/libbasic/include/basic/util.h b/src/libsystemd-basic/include/systemd-basic/util.h
index 44497dcd78..44497dcd78 100644
--- a/src/libbasic/include/basic/util.h
+++ b/src/libsystemd-basic/include/systemd-basic/util.h
diff --git a/src/libbasic/include/basic/verbs.h b/src/libsystemd-basic/include/systemd-basic/verbs.h
index 7b5e18510f..7b5e18510f 100644
--- a/src/libbasic/include/basic/verbs.h
+++ b/src/libsystemd-basic/include/systemd-basic/verbs.h
diff --git a/src/libbasic/include/basic/virt.h b/src/libsystemd-basic/include/systemd-basic/virt.h
index a538f07f6b..a538f07f6b 100644
--- a/src/libbasic/include/basic/virt.h
+++ b/src/libsystemd-basic/include/systemd-basic/virt.h
diff --git a/src/libbasic/include/basic/web-util.h b/src/libsystemd-basic/include/systemd-basic/web-util.h
index e6bb6b53f5..e6bb6b53f5 100644
--- a/src/libbasic/include/basic/web-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/web-util.h
diff --git a/src/libbasic/include/basic/xattr-util.h b/src/libsystemd-basic/include/systemd-basic/xattr-util.h
index 6fa097bf7e..6fa097bf7e 100644
--- a/src/libbasic/include/basic/xattr-util.h
+++ b/src/libsystemd-basic/include/systemd-basic/xattr-util.h
diff --git a/src/libbasic/include/basic/xml.h b/src/libsystemd-basic/include/systemd-basic/xml.h
index 41cb69f0dc..41cb69f0dc 100644
--- a/src/libbasic/include/basic/xml.h
+++ b/src/libsystemd-basic/include/systemd-basic/xml.h
diff --git a/src/libbasic/include/basic/.gitignore b/src/libsystemd-basic/src/.gitignore
index e22411e484..e22411e484 100644
--- a/src/libbasic/include/basic/.gitignore
+++ b/src/libsystemd-basic/src/.gitignore
diff --git a/src/libbasic/src/Makefile b/src/libsystemd-basic/src/Makefile
index cac075e617..56fa57e5a9 100644
--- a/src/libbasic/src/Makefile
+++ b/src/libsystemd-basic/src/Makefile
@@ -23,10 +23,10 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-noinst_LTLIBRARIES += \
-	libbasic.la
+rootlibexec_LTLIBRARIES += \
+	libsystemd-basic.la
 
-libbasic_la_SOURCES = \
+libsystemd_basic_la_SOURCES = \
 	src/basic/missing.h \
 	src/basic/missing_syscall.h \
 	src/basic/raw-clone.h \
@@ -217,7 +217,7 @@ libbasic_la_SOURCES = \
 	src/basic/formats-util.h \
 	src/basic/nss-util.h
 
-nodist_libbasic_la_SOURCES = \
+nodist_libsystemd_basic_la_SOURCES = \
 	src/basic/errno-from-name.h \
 	src/basic/errno-to-name.h \
 	src/basic/af-from-name.h \
@@ -227,22 +227,54 @@ nodist_libbasic_la_SOURCES = \
 	src/basic/cap-from-name.h \
 	src/basic/cap-to-name.h
 
-libbasic_la_CFLAGS = \
+libsystemd_basic_la_CFLAGS = \
 	$(SELINUX_CFLAGS) \
 	$(CAP_CFLAGS) \
 	-pthread
 
-libbasic_la_LIBADD = \
+libsystemd_basic_la_LIBADD = \
 	$(SELINUX_LIBS) \
 	$(CAP_LIBS) \
 	-lrt \
 	-lm
 
-_inc = $(call at.path,$(addprefix $(outdir)/../include/basic/,$1))
-$(outdir)/af-list.lo: $(call _inc,af-from-name.h af-to-name.h)
-$(outdir)/arphrd-list.lo: $(call _inc,arphrd-from-name.h arphrd-to-name.h)
-$(outdir)/cap-list.lo: $(call _inc,cap-from-name.h cap-to-name.h)
-$(outdir)/errno-list.lo: $(call _inc,errno-from-name.h errno-to-name.h)
-sd.CPPFLAGS += $(libbasic.CPPFLAGS)
+$(outdir)/errno-list.txt: | $(outdir)/.deps
+	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
+
+$(outdir)/errno-to-name.h: $(outdir)/errno-list.txt
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
+
+$(outdir)/af-list.txt:
+	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@
+
+$(outdir)/af-to-name.h: $(outdir)/af-list.txt
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
+
+$(outdir)/arphrd-list.txt:
+	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
+
+$(outdir)/arphrd-to-name.h: $(outdir)/arphrd-list.txt
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const arphrd_names[] = { "} !/CISCO/ { printf "[ARPHRD_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
+
+$(outdir)/arphrd-from-name.gperf: $(outdir)/arphrd-list.txt
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
+
+$(outdir)/cap-list.txt: $(call at.path,$(srcdir)/../include/systemd-basic/missing.h)
+	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include linux/capability.h -include $< - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
+
+$(outdir)/cap-to-name.h: $(outdir)/cap-list.txt
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@
+
+$(outdir)/cap-from-name.gperf: $(outdir)/cap-list.txt
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
+
+$(outdir)/cap-from-name.h: $(outdir)/cap-from-name.gperf
+	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
+
+$(outdir)/af-list.lo: $(outdir)/af-from-name.h $(outdir)/af-to-name.h
+$(outdir)/arphrd-list.lo: $(outdir)/arphrd-from-name.h $(outdir)/arphrd-to-name.h
+$(outdir)/cap-list.lo: $(outdir)/cap-from-name.h $(outdir)/cap-to-name.h
+$(outdir)/errno-list.lo: $(outdir)/errno-from-name.h $(outdir)/errno-to-name.h
+sd.CPPFLAGS += $(libsystemd-basic.CPPFLAGS)
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libbasic/src/MurmurHash2.c b/src/libsystemd-basic/src/MurmurHash2.c
index 7d43f18f61..9adcfa2eaf 100644
--- a/src/libbasic/src/MurmurHash2.c
+++ b/src/libsystemd-basic/src/MurmurHash2.c
@@ -13,7 +13,7 @@
 // 2. It will not produce the same results on little-endian and big-endian
 //    machines.
 
-#include "basic/MurmurHash2.h"
+#include "systemd-basic/MurmurHash2.h"
 
 //-----------------------------------------------------------------------------
 // Platform-specific functions and macros
diff --git a/src/libbasic/src/af-list.c b/src/libsystemd-basic/src/af-list.c
index 1c75c926bb..4a3c6b5917 100644
--- a/src/libbasic/src/af-list.c
+++ b/src/libsystemd-basic/src/af-list.c
@@ -20,13 +20,13 @@
 #include <string.h>
 #include <sys/socket.h>
 
-#include "basic/af-list.h"
-#include "basic/macro.h"
+#include "systemd-basic/af-list.h"
+#include "systemd-basic/macro.h"
 
 static const struct af_name* lookup_af(register const char *str, register unsigned int len);
 
-#include "basic/af-from-name.h"
-#include "basic/af-to-name.h"
+#include "af-from-name.h"
+#include "af-to-name.h"
 
 const char *af_to_name(int id) {
 
diff --git a/src/libbasic/src/alloc-util.c b/src/libsystemd-basic/src/alloc-util.c
index 4e88a3a3bc..ea4c40f55f 100644
--- a/src/libbasic/src/alloc-util.c
+++ b/src/libsystemd-basic/src/alloc-util.c
@@ -20,9 +20,9 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/macro.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/util.h"
 
 void* memdup(const void *p, size_t l) {
         void *r;
diff --git a/src/libbasic/src/architecture.c b/src/libsystemd-basic/src/architecture.c
index 22815f5353..3363e3fd84 100644
--- a/src/libbasic/src/architecture.c
+++ b/src/libsystemd-basic/src/architecture.c
@@ -19,10 +19,10 @@
 
 #include <sys/utsname.h>
 
-#include "basic/architecture.h"
-#include "basic/macro.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
+#include "systemd-basic/architecture.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
 
 int uname_architecture(void) {
 
diff --git a/src/libbasic/src/arphrd-list.c b/src/libsystemd-basic/src/arphrd-list.c
index 649bd37456..6b54a72378 100644
--- a/src/libbasic/src/arphrd-list.c
+++ b/src/libsystemd-basic/src/arphrd-list.c
@@ -20,13 +20,13 @@
 #include <net/if_arp.h>
 #include <string.h>
 
-#include "basic/arphrd-list.h"
-#include "basic/macro.h"
+#include "systemd-basic/arphrd-list.h"
+#include "systemd-basic/macro.h"
 
 static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len);
 
-#include "basic/arphrd-from-name.h"
-#include "basic/arphrd-to-name.h"
+#include "arphrd-from-name.h"
+#include "arphrd-to-name.h"
 
 const char *arphrd_to_name(int id) {
 
diff --git a/src/libbasic/src/async.c b/src/libsystemd-basic/src/async.c
index 0e2fce6850..152010330e 100644
--- a/src/libbasic/src/async.c
+++ b/src/libsystemd-basic/src/async.c
@@ -22,11 +22,11 @@
 #include <stddef.h>
 #include <unistd.h>
 
-#include "basic/async.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/util.h"
+#include "systemd-basic/async.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/util.h"
 
 int asynchronous_job(void* (*func)(void *p), void *arg) {
         pthread_attr_t a;
diff --git a/src/libbasic/src/audit-util.c b/src/libsystemd-basic/src/audit-util.c
index 0cd8543374..15c2044e7d 100644
--- a/src/libbasic/src/audit-util.c
+++ b/src/libsystemd-basic/src/audit-util.c
@@ -23,14 +23,14 @@
 
 #include <linux/netlink.h>
 
-#include "basic/alloc-util.h"
-#include "basic/audit-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/user-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/audit-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/user-util.h"
 
 int audit_session_from_pid(pid_t pid, uint32_t *id) {
         _cleanup_free_ char *s = NULL;
diff --git a/src/libbasic/src/barrier.c b/src/libsystemd-basic/src/barrier.c
index ad685bb3c1..903cbd56e2 100644
--- a/src/libbasic/src/barrier.c
+++ b/src/libsystemd-basic/src/barrier.c
@@ -27,9 +27,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "basic/barrier.h"
-#include "basic/fd-util.h"
-#include "basic/macro.h"
+#include "systemd-basic/barrier.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/macro.h"
 
 /**
  * Barriers
diff --git a/src/libbasic/src/bitmap.c b/src/libsystemd-basic/src/bitmap.c
index 0b6799ef5a..10731c920e 100644
--- a/src/libbasic/src/bitmap.c
+++ b/src/libsystemd-basic/src/bitmap.c
@@ -23,10 +23,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/bitmap.h"
-#include "basic/hashmap.h"
-#include "basic/macro.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bitmap.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/macro.h"
 
 struct Bitmap {
         uint64_t *bitmaps;
diff --git a/src/libbasic/src/btrfs-util.c b/src/libsystemd-basic/src/btrfs-util.c
index acbcb5f6b9..9782eee336 100644
--- a/src/libbasic/src/btrfs-util.c
+++ b/src/libsystemd-basic/src/btrfs-util.c
@@ -36,23 +36,23 @@
 #include <linux/btrfs.h>
 #endif
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-ctree.h"
-#include "basic/btrfs-util.h"
-#include "basic/copy.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/io-util.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/path-util.h"
-#include "basic/selinux-util.h"
-#include "basic/smack-util.h"
-#include "basic/sparse-endian.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/time-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-ctree.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/smack-util.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/util.h"
 
 /* WARNING: Be careful with file system ioctls! When we get an fd, we
  * need to make sure it either refers to only a regular file or
diff --git a/src/libbasic/src/bus-label.c b/src/libsystemd-basic/src/bus-label.c
index a7fd5a227e..ec25168e32 100644
--- a/src/libbasic/src/bus-label.c
+++ b/src/libsystemd-basic/src/bus-label.c
@@ -19,10 +19,10 @@
 
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.h"
-#include "basic/hexdecoct.h"
-#include "basic/macro.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/macro.h"
 
 char *bus_label_escape(const char *s) {
         char *r, *t;
diff --git a/src/libbasic/src/calendarspec.c b/src/libsystemd-basic/src/calendarspec.c
index de5ef92f80..9ff0265361 100644
--- a/src/libbasic/src/calendarspec.c
+++ b/src/libsystemd-basic/src/calendarspec.c
@@ -25,12 +25,12 @@
 #include <string.h>
 #include <time.h>
 
-#include "basic/alloc-util.h"
-#include "basic/calendarspec.h"
-#include "basic/fileio.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/calendarspec.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
 
 /* Longest valid date/time range is 1970..2199 */
 #define MAX_RANGE_LEN   230
diff --git a/src/libbasic/src/cap-list.c b/src/libsystemd-basic/src/cap-list.c
index 22fc8b9b31..79ad0b39f9 100644
--- a/src/libbasic/src/cap-list.c
+++ b/src/libsystemd-basic/src/cap-list.c
@@ -20,16 +20,16 @@
 #include <errno.h>
 #include <string.h>
 
-#include "basic/cap-list.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/util.h"
+#include "systemd-basic/cap-list.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/util.h"
 
 static const struct capability_name* lookup_capability(register const char *str, register unsigned int len);
 
-#include "basic/cap-from-name.h"
-#include "basic/cap-to-name.h"
+#include "cap-from-name.h"
+#include "cap-to-name.h"
 
 const char *capability_to_name(int id) {
 
diff --git a/src/libbasic/src/capability-util.c b/src/libsystemd-basic/src/capability-util.c
index 6c35ad09e5..4dc918b543 100644
--- a/src/libbasic/src/capability-util.c
+++ b/src/libsystemd-basic/src/capability-util.c
@@ -25,13 +25,13 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/capability-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/util.h"
 
 int have_effective_cap(int value) {
         _cleanup_cap_free_ cap_t cap;
diff --git a/src/libbasic/src/cgroup-util.c b/src/libsystemd-basic/src/cgroup-util.c
index c2abcd079d..a94587dd0b 100644
--- a/src/libbasic/src/cgroup-util.c
+++ b/src/libsystemd-basic/src/cgroup-util.c
@@ -30,32 +30,32 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/def.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/log.h"
-#include "basic/login-util.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/process-util.h"
-#include "basic/set.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/def.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/log.h"
+#include "systemd-basic/login-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
 
 int cg_enumerate_processes(const char *controller, const char *path, FILE **_f) {
         _cleanup_free_ char *fs = NULL;
diff --git a/src/libbasic/src/chattr-util.c b/src/libsystemd-basic/src/chattr-util.c
index 4d349431c8..a5be95c865 100644
--- a/src/libbasic/src/chattr-util.c
+++ b/src/libsystemd-basic/src/chattr-util.c
@@ -24,9 +24,9 @@
 
 #include <linux/fs.h>
 
-#include "basic/chattr-util.h"
-#include "basic/fd-util.h"
-#include "basic/macro.h"
+#include "systemd-basic/chattr-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/macro.h"
 
 int chattr_fd(int fd, unsigned value, unsigned mask) {
         unsigned old_attr, new_attr;
diff --git a/src/libbasic/src/clock-util.c b/src/libsystemd-basic/src/clock-util.c
index b1d0d2e432..959af6c569 100644
--- a/src/libbasic/src/clock-util.c
+++ b/src/libsystemd-basic/src/clock-util.c
@@ -28,11 +28,11 @@
 
 #include <linux/rtc.h>
 
-#include "basic/clock-util.h"
-#include "basic/fd-util.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/clock-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 int clock_get_hwclock(struct tm *tm) {
         _cleanup_close_ int fd = -1;
diff --git a/src/libbasic/src/conf-files.c b/src/libsystemd-basic/src/conf-files.c
index 2bb794e256..39df2c97e4 100644
--- a/src/libbasic/src/conf-files.c
+++ b/src/libsystemd-basic/src/conf-files.c
@@ -24,17 +24,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/conf-files.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/hashmap.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 static int files_add(Hashmap *h, const char *root, const char *path, const char *suffix) {
         _cleanup_closedir_ DIR *dir = NULL;
diff --git a/src/libbasic/src/copy.c b/src/libsystemd-basic/src/copy.c
index ed251f739a..3767dee646 100644
--- a/src/libbasic/src/copy.c
+++ b/src/libsystemd-basic/src/copy.c
@@ -30,22 +30,22 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/chattr-util.h"
-#include "basic/copy.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/io-util.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/time-util.h"
-#include "basic/umask-util.h"
-#include "basic/xattr-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/chattr-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/xattr-util.h"
 
 #define COPY_BUFFER_SIZE (16*1024u)
 
diff --git a/src/libbasic/src/cpu-set-util.c b/src/libsystemd-basic/src/cpu-set-util.c
index 89e012d6e2..b9671b094f 100644
--- a/src/libbasic/src/cpu-set-util.c
+++ b/src/libsystemd-basic/src/cpu-set-util.c
@@ -22,13 +22,13 @@
 #include <stddef.h>
 #include <syslog.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cpu-set-util.h"
-#include "basic/extract-word.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cpu-set-util.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
 
 cpu_set_t* cpu_set_malloc(unsigned *ncpus) {
         cpu_set_t *c;
diff --git a/src/libbasic/src/device-nodes.c b/src/libsystemd-basic/src/device-nodes.c
index e5b2eb637c..3a1bf54189 100644
--- a/src/libbasic/src/device-nodes.c
+++ b/src/libsystemd-basic/src/device-nodes.c
@@ -21,8 +21,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "basic/device-nodes.h"
-#include "basic/utf8.h"
+#include "systemd-basic/device-nodes.h"
+#include "systemd-basic/utf8.h"
 
 int whitelisted_char_for_devnode(char c, const char *white) {
 
diff --git a/src/libbasic/src/dirent-util.c b/src/libsystemd-basic/src/dirent-util.c
index 5bc740b189..72f85ca57b 100644
--- a/src/libbasic/src/dirent-util.c
+++ b/src/libsystemd-basic/src/dirent-util.c
@@ -20,9 +20,9 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-#include "basic/dirent-util.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
 
 int dirent_ensure_type(DIR *d, struct dirent *de) {
         struct stat st;
diff --git a/src/libbasic/src/env-util.c b/src/libsystemd-basic/src/env-util.c
index 67d8261c87..7516bfbba8 100644
--- a/src/libbasic/src/env-util.c
+++ b/src/libsystemd-basic/src/env-util.c
@@ -24,14 +24,14 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/env-util.h"
-#include "basic/extract-word.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/utf8.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/utf8.h"
 
 #define VALID_CHARS_ENV_NAME                    \
         DIGITS LETTERS                          \
diff --git a/src/libbasic/src/errno-list.c b/src/libsystemd-basic/src/errno-list.c
index a40c4efc2e..c39e147f96 100644
--- a/src/libbasic/src/errno-list.c
+++ b/src/libsystemd-basic/src/errno-list.c
@@ -19,14 +19,14 @@
 
 #include <string.h>
 
-#include "basic/errno-list.h"
-#include "basic/macro.h"
+#include "systemd-basic/errno-list.h"
+#include "systemd-basic/macro.h"
 
 static const struct errno_name* lookup_errno(register const char *str,
                                              register unsigned int len);
 
-#include "basic/errno-from-name.h"
-#include "basic/errno-to-name.h"
+#include "errno-from-name.h"
+#include "errno-to-name.h"
 
 const char *errno_to_name(int id) {
 
diff --git a/src/libbasic/src/escape.c b/src/libsystemd-basic/src/escape.c
index 609b68ae53..62200f6e42 100644
--- a/src/libbasic/src/escape.c
+++ b/src/libsystemd-basic/src/escape.c
@@ -21,11 +21,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/hexdecoct.h"
-#include "basic/macro.h"
-#include "basic/utf8.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/utf8.h"
 
 size_t cescape_char(char c, char *buf) {
         char * buf_old = buf;
diff --git a/src/libbasic/src/ether-addr-util.c b/src/libsystemd-basic/src/ether-addr-util.c
index 933b7c9dc7..28523a505e 100644
--- a/src/libbasic/src/ether-addr-util.c
+++ b/src/libsystemd-basic/src/ether-addr-util.c
@@ -21,9 +21,9 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "basic/ether-addr-util.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
+#include "systemd-basic/ether-addr-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
 
 char* ether_addr_to_string(const struct ether_addr *addr, char buffer[ETHER_ADDR_TO_STRING_MAX]) {
         assert(addr);
diff --git a/src/libbasic/src/exit-status.c b/src/libsystemd-basic/src/exit-status.c
index 7bf5752b7b..00c493dfc9 100644
--- a/src/libbasic/src/exit-status.c
+++ b/src/libsystemd-basic/src/exit-status.c
@@ -20,9 +20,9 @@
 #include <signal.h>
 #include <stdlib.h>
 
-#include "basic/exit-status.h"
-#include "basic/macro.h"
-#include "basic/set.h"
+#include "systemd-basic/exit-status.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/set.h"
 
 const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) {
 
diff --git a/src/libbasic/src/extract-word.c b/src/libsystemd-basic/src/extract-word.c
index c38a815592..f1605109db 100644
--- a/src/libbasic/src/extract-word.c
+++ b/src/libsystemd-basic/src/extract-word.c
@@ -26,13 +26,13 @@
 #include <string.h>
 #include <syslog.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/extract-word.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/utf8.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/utf8.h"
 
 int extract_first_word(const char **p, char **ret, const char *separators, ExtractFlags flags) {
         _cleanup_free_ char *s = NULL;
diff --git a/src/libbasic/src/fd-util.c b/src/libsystemd-basic/src/fd-util.c
index 1ac711e66d..6e372274f5 100644
--- a/src/libbasic/src/fd-util.c
+++ b/src/libsystemd-basic/src/fd-util.c
@@ -24,15 +24,15 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/socket-util.h"
-#include "basic/stdio-util.h"
-#include "basic/util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/util.h"
 
 int close_nointr(int fd) {
         assert(fd >= 0);
diff --git a/src/libbasic/src/fileio-label.c b/src/libsystemd-basic/src/fileio-label.c
index 3e0cab1b38..0d0941d599 100644
--- a/src/libbasic/src/fileio-label.c
+++ b/src/libsystemd-basic/src/fileio-label.c
@@ -20,9 +20,9 @@
 
 #include <sys/stat.h>
 
-#include "basic/fileio-label.h"
-#include "basic/fileio.h"
-#include "basic/selinux-util.h"
+#include "systemd-basic/fileio-label.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/selinux-util.h"
 
 int write_string_file_atomic_label(const char *fn, const char *line) {
         int r;
diff --git a/src/libbasic/src/fileio.c b/src/libsystemd-basic/src/fileio.c
index 02a9a02be8..8f6a3c9e24 100644
--- a/src/libbasic/src/fileio.c
+++ b/src/libsystemd-basic/src/fileio.c
@@ -29,23 +29,23 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/random-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/time-util.h"
-#include "basic/umask-util.h"
-#include "basic/utf8.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/utf8.h"
 
 int write_string_stream(FILE *f, const char *line, bool enforce_newline) {
 
diff --git a/src/libbasic/src/fs-util.c b/src/libsystemd-basic/src/fs-util.c
index cd56843f09..07d84f202c 100644
--- a/src/libbasic/src/fs-util.c
+++ b/src/libsystemd-basic/src/fs-util.c
@@ -27,24 +27,24 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/stat-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/time-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 int unlink_noerrno(const char *path) {
         PROTECT_ERRNO;
diff --git a/src/libbasic/src/glob-util.c b/src/libsystemd-basic/src/glob-util.c
index 8762a59bd9..c2d0245db3 100644
--- a/src/libbasic/src/glob-util.c
+++ b/src/libsystemd-basic/src/glob-util.c
@@ -20,9 +20,9 @@
 #include <errno.h>
 #include <glob.h>
 
-#include "basic/glob-util.h"
-#include "basic/macro.h"
-#include "basic/strv.h"
+#include "systemd-basic/glob-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/strv.h"
 
 int glob_exists(const char *path) {
         _cleanup_globfree_ glob_t g = {};
diff --git a/src/libbasic/src/gunicode.c b/src/libsystemd-basic/src/gunicode.c
index 4862021fbb..bc7c7cd7df 100644
--- a/src/libbasic/src/gunicode.c
+++ b/src/libsystemd-basic/src/gunicode.c
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 
-#include "basic/gunicode.h"
+#include "systemd-basic/gunicode.h"
 
 #define unichar uint32_t
 
diff --git a/src/libbasic/src/hash-funcs.c b/src/libsystemd-basic/src/hash-funcs.c
index e82a342063..8989c1c737 100644
--- a/src/libbasic/src/hash-funcs.c
+++ b/src/libsystemd-basic/src/hash-funcs.c
@@ -18,7 +18,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/hash-funcs.h"
+#include "systemd-basic/hash-funcs.h"
 
 void string_hash_func(const void *p, struct siphash *state) {
         siphash24_compress(p, strlen(p) + 1, state);
diff --git a/src/libbasic/src/hashmap.c b/src/libsystemd-basic/src/hashmap.c
index cfd1c14878..84e26976f1 100644
--- a/src/libbasic/src/hashmap.c
+++ b/src/libsystemd-basic/src/hashmap.c
@@ -23,21 +23,21 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hashmap.h"
-#include "basic/macro.h"
-#include "basic/mempool.h"
-#include "basic/process-util.h"
-#include "basic/random-util.h"
-#include "basic/set.h"
-#include "basic/siphash24.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mempool.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 #ifdef ENABLE_DEBUG_HASHMAP
 #include <pthread.h>
 
-#include "basic/list.h"
+#include "systemd-basic/list.h"
 #endif
 
 /*
diff --git a/src/libbasic/src/hexdecoct.c b/src/libsystemd-basic/src/hexdecoct.c
index 060a95b616..3160130ac6 100644
--- a/src/libbasic/src/hexdecoct.c
+++ b/src/libsystemd-basic/src/hexdecoct.c
@@ -22,10 +22,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/macro.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/util.h"
 
 char octchar(int x) {
         return '0' + (x & 7);
diff --git a/src/libbasic/src/hostname-util.c b/src/libsystemd-basic/src/hostname-util.c
index e66f9a2250..5537e8a1ea 100644
--- a/src/libbasic/src/hostname-util.c
+++ b/src/libsystemd-basic/src/hostname-util.c
@@ -24,11 +24,11 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/hostname-util.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
 
 bool hostname_is_set(void) {
         struct utsname u;
diff --git a/src/libbasic/src/in-addr-util.c b/src/libsystemd-basic/src/in-addr-util.c
index 01fc83d6d9..ad9f9fb071 100644
--- a/src/libbasic/src/in-addr-util.c
+++ b/src/libsystemd-basic/src/in-addr-util.c
@@ -24,11 +24,11 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/util.h"
 
 bool in4_addr_is_null(const struct in_addr *a) {
         return a->s_addr == 0;
diff --git a/src/libbasic/src/io-util.c b/src/libsystemd-basic/src/io-util.c
index 800a7044f6..0f16344b8d 100644
--- a/src/libbasic/src/io-util.c
+++ b/src/libsystemd-basic/src/io-util.c
@@ -24,8 +24,8 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "basic/io-util.h"
-#include "basic/time-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/time-util.h"
 
 int flush_fd(int fd) {
         struct pollfd pollfd = {
diff --git a/src/libbasic/src/label.c b/src/libsystemd-basic/src/label.c
index cea374198a..61c621e296 100644
--- a/src/libbasic/src/label.c
+++ b/src/libsystemd-basic/src/label.c
@@ -21,10 +21,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "basic/label.h"
-#include "basic/macro.h"
-#include "basic/selinux-util.h"
-#include "basic/smack-util.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/smack-util.h"
 
 int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
         int r, q;
diff --git a/src/libbasic/src/locale-util.c b/src/libsystemd-basic/src/locale-util.c
index 7cedaae319..4bb35650b0 100644
--- a/src/libbasic/src/locale-util.c
+++ b/src/libsystemd-basic/src/locale-util.c
@@ -30,16 +30,16 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/hashmap.h"
-#include "basic/locale-util.h"
-#include "basic/path-util.h"
-#include "basic/set.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/utf8.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/utf8.h"
 
 static int add_locales_from_archive(Set *locales) {
         /* Stolen from glibc... */
diff --git a/src/libbasic/src/lockfile-util.c b/src/libsystemd-basic/src/lockfile-util.c
index 233627c1a4..127f43ed12 100644
--- a/src/libbasic/src/lockfile-util.c
+++ b/src/libsystemd-basic/src/lockfile-util.c
@@ -24,12 +24,12 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/lockfile-util.h"
-#include "basic/macro.h"
-#include "basic/path-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/lockfile-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/path-util.h"
 
 int make_lock_file(const char *p, int operation, LockFile *ret) {
         _cleanup_close_ int fd = -1;
diff --git a/src/libbasic/src/log.c b/src/libsystemd-basic/src/log.c
index 84a65b7d54..a04fc60afb 100644
--- a/src/libbasic/src/log.c
+++ b/src/libsystemd-basic/src/log.c
@@ -35,25 +35,25 @@
 
 #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/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/process-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/syslog-util.h"
-#include "basic/terminal-util.h"
-#include "basic/time-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/process-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/syslog-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/util.h"
 
 #define SNDBUF_SIZE (8*1024*1024)
 
diff --git a/src/libbasic/src/login-util.c b/src/libsystemd-basic/src/login-util.c
index fe97f66392..38026aea1d 100644
--- a/src/libbasic/src/login-util.c
+++ b/src/libsystemd-basic/src/login-util.c
@@ -19,8 +19,8 @@
 
 #include <string.h>
 
-#include "basic/login-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/login-util.h"
+#include "systemd-basic/string-util.h"
 
 bool session_id_valid(const char *id) {
 
diff --git a/src/libbasic/src/memfd-util.c b/src/libsystemd-basic/src/memfd-util.c
index 810dd37ee7..ccc4488ec0 100644
--- a/src/libbasic/src/memfd-util.c
+++ b/src/libsystemd-basic/src/memfd-util.c
@@ -28,13 +28,13 @@
 #include <sys/mman.h>
 #include <sys/prctl.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/macro.h"
-#include "basic/memfd-util.h"
-#include "basic/missing.h"
-#include "basic/string-util.h"
-#include "basic/utf8.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/memfd-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/utf8.h"
 
 int memfd_new(const char *name) {
         _cleanup_free_ char *g = NULL;
diff --git a/src/libbasic/src/mempool.c b/src/libsystemd-basic/src/mempool.c
index 0a64c1b29c..b4acc1d6e3 100644
--- a/src/libbasic/src/mempool.c
+++ b/src/libsystemd-basic/src/mempool.c
@@ -21,9 +21,9 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "basic/macro.h"
-#include "basic/mempool.h"
-#include "basic/util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mempool.h"
+#include "systemd-basic/util.h"
 
 struct pool {
         struct pool *next;
diff --git a/src/libbasic/src/mkdir-label.c b/src/libsystemd-basic/src/mkdir-label.c
index 83a1e925c6..f0b8cf4eb7 100644
--- a/src/libbasic/src/mkdir-label.c
+++ b/src/libsystemd-basic/src/mkdir-label.c
@@ -22,8 +22,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "basic/label.h"
-#include "basic/mkdir.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/mkdir.h"
 
 int mkdir_safe_label(const char *path, mode_t mode, uid_t uid, gid_t gid) {
         return mkdir_safe_internal(path, mode, uid, gid, mkdir_label);
diff --git a/src/libbasic/src/mkdir.c b/src/libsystemd-basic/src/mkdir.c
index 0a7f432f3e..dee03c1ced 100644
--- a/src/libbasic/src/mkdir.c
+++ b/src/libsystemd-basic/src/mkdir.c
@@ -22,12 +22,12 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "basic/fs-util.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/stat-util.h"
-#include "basic/user-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/user-util.h"
 
 int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, mkdir_func_t _mkdir) {
         struct stat st;
diff --git a/src/libbasic/src/mount-util.c b/src/libsystemd-basic/src/mount-util.c
index feb75a2c04..3eaf7bd4b5 100644
--- a/src/libbasic/src/mount-util.c
+++ b/src/libsystemd-basic/src/mount-util.c
@@ -25,17 +25,17 @@
 #include <sys/statvfs.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/hashmap.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/set.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
 
 static int fd_fdinfo_mnt_id(int fd, const char *filename, int flags, int *mnt_id) {
         char path[strlen("/proc/self/fdinfo/") + DECIMAL_STR_MAX(int)];
diff --git a/src/libbasic/src/ordered-set.c b/src/libsystemd-basic/src/ordered-set.c
index fc6c3c018c..d75a5687a4 100644
--- a/src/libbasic/src/ordered-set.c
+++ b/src/libsystemd-basic/src/ordered-set.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/ordered-set.h"
-#include "basic/strv.h"
+#include "systemd-basic/ordered-set.h"
+#include "systemd-basic/strv.h"
 
 int ordered_set_consume(OrderedSet *s, void *p) {
         int r;
diff --git a/src/libbasic/src/parse-util.c b/src/libsystemd-basic/src/parse-util.c
index 08e555d870..793db3b78d 100644
--- a/src/libbasic/src/parse-util.c
+++ b/src/libsystemd-basic/src/parse-util.c
@@ -25,11 +25,11 @@
 #include <string.h>
 #include <xlocale.h>
 
-#include "basic/alloc-util.h"
-#include "basic/extract-word.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
 
 int parse_boolean(const char *v) {
         assert(v);
diff --git a/src/libbasic/src/path-util.c b/src/libsystemd-basic/src/path-util.c
index 143380dec2..603c93f948 100644
--- a/src/libbasic/src/path-util.c
+++ b/src/libsystemd-basic/src/path-util.c
@@ -31,17 +31,17 @@
 #include <libgen.h>
 #undef basename
 
-#include "basic/alloc-util.h"
-#include "basic/extract-word.h"
-#include "basic/fs-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/path-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/time-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/time-util.h"
 
 bool path_is_absolute(const char *p) {
         return p[0] == '/';
diff --git a/src/libbasic/src/prioq.c b/src/libsystemd-basic/src/prioq.c
index f29c80b5fc..a7a8f6df17 100644
--- a/src/libbasic/src/prioq.c
+++ b/src/libsystemd-basic/src/prioq.c
@@ -30,9 +30,9 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hashmap.h"
-#include "basic/prioq.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/prioq.h"
 
 struct prioq_item {
         void *data;
diff --git a/src/libbasic/src/proc-cmdline.c b/src/libsystemd-basic/src/proc-cmdline.c
index db2acbee75..9f8e923e28 100644
--- a/src/libbasic/src/proc-cmdline.c
+++ b/src/libsystemd-basic/src/proc-cmdline.c
@@ -21,17 +21,17 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/extract-word.h"
-#include "basic/fileio.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/process-util.h"
-#include "basic/special.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "basic/virt.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
 
 int proc_cmdline(char **ret) {
         assert(ret);
diff --git a/src/libbasic/src/process-util.c b/src/libsystemd-basic/src/process-util.c
index 5dd5279374..aa1c31a089 100644
--- a/src/libbasic/src/process-util.c
+++ b/src/libsystemd-basic/src/process-util.c
@@ -38,24 +38,24 @@
 #include <valgrind/valgrind.h>
 #endif
 
-#include "basic/alloc-util.h"
-#include "basic/architecture.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/ioprio.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/process-util.h"
-#include "basic/raw-clone.h"
-#include "basic/signal-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/architecture.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/ioprio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/raw-clone.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 int get_process_state(pid_t pid) {
         const char *p;
diff --git a/src/libbasic/src/random-util.c b/src/libsystemd-basic/src/random-util.c
index 585e7976ac..95731cc884 100644
--- a/src/libbasic/src/random-util.c
+++ b/src/libsystemd-basic/src/random-util.c
@@ -31,11 +31,11 @@
 #include <sys/auxv.h>
 #endif
 
-#include "basic/fd-util.h"
-#include "basic/io-util.h"
-#include "basic/missing.h"
-#include "basic/random-util.h"
-#include "basic/time-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/time-util.h"
 
 int dev_urandom(void *p, size_t n) {
         static int have_syscall = -1;
diff --git a/src/libbasic/src/ratelimit.c b/src/libsystemd-basic/src/ratelimit.c
index 366aeb6d9a..e3db7477e5 100644
--- a/src/libbasic/src/ratelimit.c
+++ b/src/libsystemd-basic/src/ratelimit.c
@@ -20,8 +20,8 @@
 
 #include <sys/time.h>
 
-#include "basic/macro.h"
-#include "basic/ratelimit.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/ratelimit.h"
 
 /* Modelled after Linux' lib/ratelimit.c by Dave Young
  * <hidave.darkstar@gmail.com>, which is licensed GPLv2. */
diff --git a/src/libbasic/src/replace-var.c b/src/libsystemd-basic/src/replace-var.c
index 50e60221ad..f7289b9e0b 100644
--- a/src/libbasic/src/replace-var.c
+++ b/src/libsystemd-basic/src/replace-var.c
@@ -22,10 +22,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/macro.h"
-#include "basic/replace-var.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/replace-var.h"
+#include "systemd-basic/string-util.h"
 
 /*
  * Generic infrastructure for replacing @FOO@ style variables in
diff --git a/src/libbasic/src/rlimit-util.c b/src/libsystemd-basic/src/rlimit-util.c
index 3a8196d9c1..88792292da 100644
--- a/src/libbasic/src/rlimit-util.c
+++ b/src/libsystemd-basic/src/rlimit-util.c
@@ -20,14 +20,14 @@
 #include <errno.h>
 #include <sys/resource.h>
 
-#include "basic/alloc-util.h"
-#include "basic/extract-word.h"
-#include "basic/formats-util.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/rlimit-util.h"
-#include "basic/string-table.h"
-#include "basic/time-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/rlimit-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/time-util.h"
 
 int setrlimit_closest(int resource, const struct rlimit *rlim) {
         struct rlimit highest, fixed;
diff --git a/src/libbasic/src/rm-rf.c b/src/libsystemd-basic/src/rm-rf.c
index b05b512aee..6e78791a95 100644
--- a/src/libbasic/src/rm-rf.c
+++ b/src/libsystemd-basic/src/rm-rf.c
@@ -26,15 +26,15 @@
 #include <sys/statfs.h>
 #include <unistd.h>
 
-#include "basic/btrfs-util.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/mount-util.h"
-#include "basic/path-util.h"
-#include "basic/rm-rf.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
 
 int rm_rf_children(int fd, RemoveFlags flags, struct stat *root_dev) {
         _cleanup_closedir_ DIR *d = NULL;
diff --git a/src/libbasic/src/selinux-util.c b/src/libsystemd-basic/src/selinux-util.c
index d9d230c189..ae7385d745 100644
--- a/src/libbasic/src/selinux-util.c
+++ b/src/libsystemd-basic/src/selinux-util.c
@@ -32,13 +32,13 @@
 #include <selinux/selinux.h>
 #endif
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/path-util.h"
-#include "basic/selinux-util.h"
-#include "basic/time-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/util.h"
 
 #ifdef HAVE_SELINUX
 DEFINE_TRIVIAL_CLEANUP_FUNC(char*, freecon);
diff --git a/src/libbasic/src/sigbus.c b/src/libsystemd-basic/src/sigbus.c
index 7249f812d7..785876c31e 100644
--- a/src/libbasic/src/sigbus.c
+++ b/src/libsystemd-basic/src/sigbus.c
@@ -22,9 +22,9 @@
 #include <stddef.h>
 #include <sys/mman.h>
 
-#include "basic/macro.h"
-#include "basic/sigbus.h"
-#include "basic/util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/sigbus.h"
+#include "systemd-basic/util.h"
 
 #define SIGBUS_QUEUE_MAX 64
 
diff --git a/src/libbasic/src/signal-util.c b/src/libsystemd-basic/src/signal-util.c
index ade7bff364..b28c4a680a 100644
--- a/src/libbasic/src/signal-util.c
+++ b/src/libsystemd-basic/src/signal-util.c
@@ -21,12 +21,12 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/signal-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
 
 int reset_all_signal_handlers(void) {
         static const struct sigaction sa = {
diff --git a/src/libbasic/src/siphash24.c b/src/libsystemd-basic/src/siphash24.c
index f67eff4761..91a789268b 100644
--- a/src/libbasic/src/siphash24.c
+++ b/src/libsystemd-basic/src/siphash24.c
@@ -19,9 +19,9 @@
 
 #include <stdio.h>
 
-#include "basic/macro.h"
-#include "basic/siphash24.h"
-#include "basic/unaligned.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/unaligned.h"
 
 static inline uint64_t rotate_left(uint64_t x, uint8_t b) {
         assert(b < 64);
diff --git a/src/libbasic/src/smack-util.c b/src/libsystemd-basic/src/smack-util.c
index c3ce6bd4ac..2ec415ea7f 100644
--- a/src/libbasic/src/smack-util.c
+++ b/src/libsystemd-basic/src/smack-util.c
@@ -25,15 +25,15 @@
 #include <sys/xattr.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/smack-util.h"
-#include "basic/string-table.h"
-#include "basic/xattr-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/smack-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/xattr-util.h"
 
 #ifdef HAVE_SMACK
 bool mac_smack_use(void) {
diff --git a/src/libbasic/src/socket-label.c b/src/libsystemd-basic/src/socket-label.c
index 75036f451f..c129f30da5 100644
--- a/src/libbasic/src/socket-label.c
+++ b/src/libsystemd-basic/src/socket-label.c
@@ -26,15 +26,15 @@
 #include <sys/un.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/selinux-util.h"
-#include "basic/socket-util.h"
-#include "basic/umask-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/umask-util.h"
 
 int socket_address_listen(
                 const SocketAddress *a,
diff --git a/src/libbasic/src/socket-util.c b/src/libsystemd-basic/src/socket-util.c
index 250d58dfc6..5f76e97a91 100644
--- a/src/libbasic/src/socket-util.c
+++ b/src/libsystemd-basic/src/socket-util.c
@@ -31,22 +31,22 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/utf8.h"
-#include "basic/util.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/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
 
 int socket_address_parse(SocketAddress *a, const char *s) {
         char *e, *n;
diff --git a/src/libbasic/src/stat-util.c b/src/libsystemd-basic/src/stat-util.c
index 9ddede98c9..94bfbae1c7 100644
--- a/src/libbasic/src/stat-util.c
+++ b/src/libsystemd-basic/src/stat-util.c
@@ -27,12 +27,12 @@
 
 #include <linux/magic.h>
 
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
 
 int is_symlink(const char *path) {
         struct stat info;
diff --git a/src/libbasic/src/strbuf.c b/src/libsystemd-basic/src/strbuf.c
index 3b6fafeb30..41535b1d1e 100644
--- a/src/libbasic/src/strbuf.c
+++ b/src/libsystemd-basic/src/strbuf.c
@@ -21,8 +21,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/strbuf.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/strbuf.h"
 
 /*
  * Strbuf stores given strings in a single continuous allocated memory
diff --git a/src/libbasic/src/string-table.c b/src/libsystemd-basic/src/string-table.c
index fae5e944b5..1974ee0513 100644
--- a/src/libbasic/src/string-table.c
+++ b/src/libsystemd-basic/src/string-table.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-table.h"
-#include "basic/string-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
 
 ssize_t string_table_lookup(const char * const *table, size_t len, const char *key) {
         size_t i;
diff --git a/src/libbasic/src/string-util.c b/src/libsystemd-basic/src/string-util.c
index 003a20a41d..6d65067239 100644
--- a/src/libbasic/src/string-util.c
+++ b/src/libsystemd-basic/src/string-util.c
@@ -23,12 +23,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/gunicode.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/gunicode.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
 
 int strcmp_ptr(const char *a, const char *b) {
 
diff --git a/src/libbasic/src/strv.c b/src/libsystemd-basic/src/strv.c
index bb4f49277d..336c46d092 100644
--- a/src/libbasic/src/strv.c
+++ b/src/libsystemd-basic/src/strv.c
@@ -24,13 +24,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/extract-word.h"
-#include "basic/fileio.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 char *strv_find(char **l, const char *name) {
         char **i;
diff --git a/src/libbasic/src/strxcpyx.c b/src/libsystemd-basic/src/strxcpyx.c
index b6225f0e12..525f375f04 100644
--- a/src/libbasic/src/strxcpyx.c
+++ b/src/libsystemd-basic/src/strxcpyx.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "basic/strxcpyx.h"
+#include "systemd-basic/strxcpyx.h"
 
 size_t strpcpy(char **dest, size_t size, const char *src) {
         size_t len;
diff --git a/src/libbasic/src/syslog-util.c b/src/libsystemd-basic/src/syslog-util.c
index 8647f2a2d6..743c8c06d3 100644
--- a/src/libbasic/src/syslog-util.c
+++ b/src/libsystemd-basic/src/syslog-util.c
@@ -20,10 +20,10 @@
 #include <string.h>
 #include <syslog.h>
 
-#include "basic/hexdecoct.h"
-#include "basic/macro.h"
-#include "basic/string-table.h"
-#include "basic/syslog-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/syslog-util.h"
 
 int syslog_parse_priority(const char **p, int *priority, bool with_facility) {
         int a = 0, b = 0, c = 0;
diff --git a/src/libbasic/src/terminal-util.c b/src/libsystemd-basic/src/terminal-util.c
index 225ffa588a..fcb0ffbcc8 100644
--- a/src/libbasic/src/terminal-util.c
+++ b/src/libsystemd-basic/src/terminal-util.c
@@ -39,22 +39,22 @@
 #include <linux/tiocl.h>
 #include <linux/vt.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/io-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/socket-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/time-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/util.h"
 
 static volatile unsigned cached_columns = 0;
 static volatile unsigned cached_lines = 0;
diff --git a/src/libbasic/src/time-util.c b/src/libsystemd-basic/src/time-util.c
index 1352c59295..70516c0d43 100644
--- a/src/libbasic/src/time-util.c
+++ b/src/libsystemd-basic/src/time-util.c
@@ -28,17 +28,17 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/time-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/time-util.h"
 
 static nsec_t timespec_load_nsec(const struct timespec *ts);
 
diff --git a/src/libbasic/src/unit-name.c b/src/libsystemd-basic/src/unit-name.c
index 42c79da536..40418b5b7a 100644
--- a/src/libbasic/src/unit-name.c
+++ b/src/libsystemd-basic/src/unit-name.c
@@ -23,16 +23,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.h"
-#include "basic/glob-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/macro.h"
-#include "basic/path-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/glob-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
 
 /* Characters valid in a unit name. */
 #define VALID_CHARS                             \
diff --git a/src/libbasic/src/user-util.c b/src/libsystemd-basic/src/user-util.c
index 692f2a3db3..e78b476591 100644
--- a/src/libbasic/src/user-util.c
+++ b/src/libsystemd-basic/src/user-util.c
@@ -30,15 +30,15 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/user-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/user-util.h"
 
 bool uid_is_valid(uid_t uid) {
 
diff --git a/src/libbasic/src/utf8.c b/src/libsystemd-basic/src/utf8.c
index b5144b7312..e84048bf2b 100644
--- a/src/libbasic/src/utf8.c
+++ b/src/libsystemd-basic/src/utf8.c
@@ -46,10 +46,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/macro.h"
-#include "basic/utf8.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/utf8.h"
 
 bool unichar_is_valid(char32_t ch) {
 
diff --git a/src/libbasic/src/util.c b/src/libsystemd-basic/src/util.c
index a7831e118a..4a947e624d 100644
--- a/src/libbasic/src/util.c
+++ b/src/libsystemd-basic/src/util.c
@@ -34,31 +34,31 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/build.h"
-#include "basic/cgroup-util.h"
-#include "basic/def.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/hashmap.h"
-#include "basic/hostname-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/set.h"
-#include "basic/signal-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/time-util.h"
-#include "basic/umask-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/build.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 /* Put this test here for a lack of better place */
 assert_cc(EAGAIN == EWOULDBLOCK);
diff --git a/src/libbasic/src/verbs.c b/src/libsystemd-basic/src/verbs.c
index 526e0fc338..fcc6c35987 100644
--- a/src/libbasic/src/verbs.c
+++ b/src/libsystemd-basic/src/verbs.c
@@ -22,11 +22,11 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/verbs.h"
-#include "basic/virt.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/verbs.h"
+#include "systemd-basic/virt.h"
 
 int dispatch_verb(int argc, char *argv[], const Verb verbs[], void *userdata) {
         const Verb *verb;
diff --git a/src/libbasic/src/virt.c b/src/libsystemd-basic/src/virt.c
index 33a74f16cf..74699b0422 100644
--- a/src/libbasic/src/virt.c
+++ b/src/libsystemd-basic/src/virt.c
@@ -23,16 +23,16 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/macro.h"
-#include "basic/process-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/virt.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/virt.h"
 
 static int detect_vm_cpuid(void) {
 
diff --git a/src/libbasic/src/web-util.c b/src/libsystemd-basic/src/web-util.c
index a68813ffb8..7f71b1e6fd 100644
--- a/src/libbasic/src/web-util.c
+++ b/src/libsystemd-basic/src/web-util.c
@@ -19,9 +19,9 @@
 
 #include <stdbool.h>
 
-#include "basic/string-util.h"
-#include "basic/utf8.h"
-#include "basic/web-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/web-util.h"
 
 bool http_etag_is_valid(const char *etag) {
         if (isempty(etag))
diff --git a/src/libbasic/src/xattr-util.c b/src/libsystemd-basic/src/xattr-util.c
index 07f063e10b..df06effbc2 100644
--- a/src/libbasic/src/xattr-util.c
+++ b/src/libsystemd-basic/src/xattr-util.c
@@ -25,13 +25,13 @@
 #include <sys/time.h>
 #include <sys/xattr.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/macro.h"
-#include "basic/sparse-endian.h"
-#include "basic/stdio-util.h"
-#include "basic/time-util.h"
-#include "basic/xattr-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/xattr-util.h"
 
 int getxattr_malloc(const char *path, const char *name, char **value, bool allow_symlink) {
         char *v;
diff --git a/src/libbasic/src/xml.c b/src/libsystemd-basic/src/xml.c
index 273fe51fa9..ced4c1f44a 100644
--- a/src/libbasic/src/xml.c
+++ b/src/libsystemd-basic/src/xml.c
@@ -21,9 +21,9 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/xml.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/xml.h"
 
 enum {
         STATE_NULL,
diff --git a/src/libbasic/include/basic/blkid-util.h b/src/libsystemd-blkid/include/systemd-blkid/blkid-util.h
index 7aa75eb091..f476c313b0 100644
--- a/src/libbasic/include/basic/blkid-util.h
+++ b/src/libsystemd-blkid/include/systemd-blkid/blkid-util.h
@@ -23,7 +23,7 @@
 #include <blkid/blkid.h>
 #endif
 
-#include "util.h"
+#include "systemd-basic/util.h"
 
 #ifdef HAVE_BLKID
 DEFINE_TRIVIAL_CLEANUP_FUNC(blkid_probe, blkid_free_probe);
diff --git a/src/libbasic/Makefile b/src/libsystemd-firewall/Makefile
index 3778a42f06..369b265ff7 100644
--- a/src/libbasic/Makefile
+++ b/src/libsystemd-firewall/Makefile
@@ -23,7 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-nested.subdirs += include
 nested.subdirs += src
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libfirewall/firewall-util.h b/src/libsystemd-firewall/include/systemd-firewall/firewall-util.h
index 1e54dc0ceb..9121718bff 100644
--- a/src/libfirewall/firewall-util.h
+++ b/src/libsystemd-firewall/include/systemd-firewall/firewall-util.h
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "basic/in-addr-util.h"
+#include "systemd-basic/in-addr-util.h"
 
 #ifdef HAVE_LIBIPTC
 
diff --git a/src/libfirewall/Makefile b/src/libsystemd-firewall/src/Makefile
index 4fd3822a6e..577cbb7a9f 100644
--- a/src/libfirewall/Makefile
+++ b/src/libsystemd-firewall/src/Makefile
@@ -20,22 +20,22 @@
 #
 #  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 $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(HAVE_LIBIPTC),)
-noinst_LTLIBRARIES += \
-	libfirewall.la
+rootlibexec_LTLIBRARIES += \
+	libsystemd-firewall.la
 
-libfirewall_la_SOURCES = \
+libsystemd_firewall_la_SOURCES = \
 	src/shared/firewall-util.h \
 	src/shared/firewall-util.c
 
-libfirewall_la_CFLAGS = \
+libsystemd_firewall_la_CFLAGS = \
 	$(LIBIPTC_CFLAGS)
 
-libfirewall_la_LIBADD = \
-	libbasic.la \
+libsystemd_firewall_la_LIBADD = \
+	libsystemd-basic.la \
 	$(LIBIPTC_LIBS)
 endif # HAVE_LIBIPTC
 
diff --git a/src/libfirewall/firewall-util.c b/src/libsystemd-firewall/src/firewall-util.c
index 009cef3e88..5102695c4b 100644
--- a/src/libfirewall/firewall-util.c
+++ b/src/libsystemd-firewall/src/firewall-util.c
@@ -39,12 +39,11 @@
 #include <linux/netfilter/nf_nat.h>
 #include <linux/netfilter/xt_addrtype.h>
 
-#include "basic/alloc-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/macro.h"
-#include "basic/socket-util.h"
-
-#include "firewall-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-firewall/firewall-util.h"
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct xtc_handle*, iptc_free);
 
diff --git a/src/libgcrypt/Makefile b/src/libsystemd-gcrypt/Makefile
index 7184ba255c..369b265ff7 100644
--- a/src/libgcrypt/Makefile
+++ b/src/libsystemd-gcrypt/Makefile
@@ -23,14 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-noinst_LTLIBRARIES += \
-	libgcrypt.la
-
-libgcrypt_la_SOURCES = \
-	src/shared/gcrypt-util.h \
-	src/shared/gcrypt-util.c
-
-libgcrypt_la_LIBADD = \
-	libbasic.la
+nested.subdirs += src
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libgcrypt/gcrypt-util.h b/src/libsystemd-gcrypt/include/systemd-gcrypt/gcrypt-util.h
index cf33b3c59c..cf33b3c59c 100644
--- a/src/libgcrypt/gcrypt-util.h
+++ b/src/libsystemd-gcrypt/include/systemd-gcrypt/gcrypt-util.h
diff --git a/src/libsystemd-gcrypt/src/Makefile b/src/libsystemd-gcrypt/src/Makefile
new file mode 100644
index 0000000000..6ed001dded
--- /dev/null
+++ b/src/libsystemd-gcrypt/src/Makefile
@@ -0,0 +1,40 @@
+#  -*- 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
+
+rootlibexec_LTLIBRARIES += \
+	libsystemd-gcrypt.la
+
+libsystemd_gcrypt_la_SOURCES = \
+	src/shared/gcrypt-util.h \
+	src/shared/gcrypt-util.c
+
+libsystemd_gcrypt_la_CFLAGS = \
+	$(GCRYPT_CFLAGS)
+
+libsystemd_gcrypt_la_LIBADD = \
+	libsystemd-basic.la \
+	$(GCRYPT_LIBS)
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libgcrypt/gcrypt-util.c b/src/libsystemd-gcrypt/src/gcrypt-util.c
index 069134a4be..42b922571f 100644
--- a/src/libgcrypt/gcrypt-util.c
+++ b/src/libsystemd-gcrypt/src/gcrypt-util.c
@@ -22,8 +22,8 @@
 #ifdef HAVE_GCRYPT
 #include <gcrypt.h>
 
-#include "basic/hexdecoct.h"
-#include "shared/gcrypt-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-gcrypt/gcrypt-util.h"
 
 void initialize_libgcrypt(bool secmem) {
         const char *p;
diff --git a/src/libsystemd-microhttpd/Makefile b/src/libsystemd-microhttpd/Makefile
new file mode 100644
index 0000000000..1bc47eb5f1
--- /dev/null
+++ b/src/libsystemd-microhttpd/Makefile
@@ -0,0 +1,28 @@
+#  -*- 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 anor 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 $(topsrcdirbuild-aux/Makefile.head.mk
+
+nested.subdirs += src
+
+include $(topsrcdirbuild-aux/Makefile.tail.mk
diff --git a/src/grp-journal/grp-remote/microhttpd-util.h b/src/libsystemd-microhttpd/include/systemd-microhttpd/microhttpd-util.h
index 178e78f892..b238054556 100644
--- a/src/grp-journal/grp-remote/microhttpd-util.h
+++ b/src/libsystemd-microhttpd/include/systemd-microhttpd/microhttpd-util.h
@@ -5,7 +5,7 @@
 
   Copyright 2012 Zbigniew Jędrzejewski-Szmek
 
-  systemd is free software; you can redistribute it and/or modify it
+  systemd is free software; you can redistribute it anor 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.
@@ -16,15 +16,15 @@
   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/>.
-***/
+  along with systemd; If not, see <http/www.gnu.org/licenses/>.
+**
 
 #include <microhttpd.h>
 #include <stdarg.h>
 
-#include "basic/macro.h"
+#include "systemd-basimacro.h"
 
-/* Compatiblity with libmicrohttpd < 0.9.38 */
+/* Compatiblity with libmicrohttpd < 0.9.38 
 #ifndef MHD_HTTP_NOT_ACCEPTABLE
 #define MHD_HTTP_NOT_ACCEPTABLE MHD_HTTP_METHOD_NOT_ACCEPTABLE
 #endif
@@ -35,7 +35,7 @@
 
 void microhttpd_logger(void *arg, const char *fmt, va_list ap) _printf_(2, 0);
 
-/* respond_oom() must be usable with return, hence this form. */
+/* respond_oom() must be usable with return, hence this form. 
 #define respond_oom(connection) log_oom(), mhd_respond_oom(connection)
 
 int mhd_respondf(struct MHD_Connection *connection,
@@ -56,5 +56,5 @@ int check_permissions(struct MHD_Connection *connection, int *code, char **hostn
  * gnutls categories are additionally filtered by our internal log
  * level, so it should be set fairly high to capture all potentially
  * interesting events without overwhelming detail.
- */
+ 
 int setup_gnutls_logger(char **categories);
diff --git a/src/libsystemd-microhttpd/src/Makefile b/src/libsystemd-microhttpd/src/Makefile
new file mode 100644
index 0000000000..077f7392da
--- /dev/null
+++ b/src/libsystemd-microhttpd/src/Makefile
@@ -0,0 +1,49 @@
+#  -*- 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 anor 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 $(topsrcdirbuild-aux/Makefile.head.mk
+
+ifneq ($(HAVE_MICROHTTPD),)
+
+rootlibexec_LTLIBRARIES += \
+        libsystemd-microhttpd.la
+
+libsystemd_microhttpd_la_SOURCES += \
+	srjournal-remote/microhttpd-util.h \
+	srjournal-remote/microhttpd-util.c
+
+libsystemd_microhttpd_la_CFLAGS = \
+	$(MICROHTTPD_CFLAGS)
+
+libsystemd_microhttpd_la_LIBADD += \
+        libsystemd-basic.la \
+	$(MICROHTTPD_LIBS)
+
+ifneq ($(HAVE_GNUTLS),)
+libsystemd_microhttpd_la_LIBADD += \
+	$(GNUTLS_LIBS)
+endif # HAVE_GNUTLS
+
+endif # HAVE_MICROHTTPD
+
+include $(topsrcdirbuild-aux/Makefile.tail.mk
diff --git a/src/grp-journal/grp-remote/microhttpd-util.c b/src/libsystemd-microhttpd/src/microhttpd-util.c
index 3fc5e13b71..4bf0fe2fb3 100644
--- a/src/grp-journal/grp-remote/microhttpd-util.c
+++ b/src/libsystemd-microhttpd/src/microhttpd-util.c
@@ -4,7 +4,7 @@
   Copyright 2012 Lennart Poettering
   Copyright 2012 Zbigniew Jędrzejewski-Szmek
 
-  systemd is free software; you can redistribute it and/or modify it
+  systemd is free software; you can redistribute it anor 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.
@@ -15,26 +15,25 @@
   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/>.
-***/
+  along with systemd; If not, see <http/www.gnu.org/licenses/>.
+**
 
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 
 #ifdef HAVE_GNUTLS
-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
+#include <gnutlgnutls.h>
+#include <gnutlx509.h>
 #endif
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-
-#include "microhttpd-util.h"
+#include "systemd-basialloc-util.h"
+#include "systemd-basilog.h"
+#include "systemd-basimacro.h"
+#include "systemd-basistring-util.h"
+#include "systemd-basistrv.h"
+#include "systemd-basiutil.h"
+#include "systemd-microhttpmicrohttpd-util.h"
 
 void microhttpd_logger(void *arg, const char *fmt, va_list ap) {
         char *f;
@@ -62,7 +61,7 @@ static int mhd_respond_internal(struct MHD_Connection *connection,
                 return MHD_NO;
 
         log_debug("Queueing response %u: %s", code, buffer);
-        MHD_add_response_header(response, "Content-Type", "text/plain");
+        MHD_add_response_header(response, "Content-Type", "texplain");
         r = MHD_queue_response(connection, code, response);
         MHD_destroy_response(response);
 
@@ -111,11 +110,11 @@ static struct {
         bool enabled;
 } gnutls_log_map[] = {
         { {"0"},                  LOG_DEBUG },
-        { {"1", "audit"},         LOG_WARNING, true}, /* gnutls session audit */
-        { {"2", "assert"},        LOG_DEBUG },        /* gnutls assert log */
-        { {"3", "hsk", "ext"},    LOG_DEBUG },        /* gnutls handshake log */
-        { {"4", "rec"},           LOG_DEBUG },        /* gnutls record log */
-        { {"5", "dtls"},          LOG_DEBUG },        /* gnutls DTLS log */
+        { {"1", "audit"},         LOG_WARNING, true},* gnutls session audit */
+        { {"2", "assert"},        LOG_DEBUG },       * gnutls assert log */
+        { {"3", "hsk", "ext"},    LOG_DEBUG },       * gnutls handshake log */
+        { {"4", "rec"},           LOG_DEBUG },       * gnutls record log */
+        { {"5", "dtls"},          LOG_DEBUG },       * gnutls DTLS log */
         { {"6", "buf"},           LOG_DEBUG },
         { {"7", "write", "read"}, LOG_DEBUG },
         { {"8"},                  LOG_DEBUG },
@@ -127,7 +126,7 @@ static void log_func_gnutls(int level, const char *message) {
 
         if (0 <= level && level < (int) ELEMENTSOF(gnutls_log_map)) {
                 if (gnutls_log_map[level].enabled)
-                        log_internal(gnutls_log_map[level].level, 0, NULL, 0, NULL, "gnutls %d/%s: %s", level, gnutls_log_map[level].names[1], message);
+                        log_internal(gnutls_log_map[level].level, 0, NULL, 0, NULL, "gnutls %%s: %s", level, gnutls_log_map[level].names[1], message);
         } else {
                 log_debug("Received GNUTLS message with unknown level %d.", level);
                 log_internal(LOG_DEBUG, 0, NULL, 0, NULL, "gnutls: %s", message);
@@ -224,8 +223,8 @@ static int get_client_cert(gnutls_session_t session, gnutls_x509_crt_t *client_c
                 return r;
         }
 
-        /* Note that by passing values between 0 and listsize here, you
-           can get access to the CA's certs */
+       * Note that by passing values between 0 and listsize here, you
+           can get access to the CA's certs 
         r = gnutls_x509_crt_import(cert, &pcert[0], GNUTLS_X509_FMT_DER);
         if (r < 0) {
                 log_error("Failed to import client certificate");
diff --git a/src/libsystemd-network/include/systemd-network/arp-util.h b/src/libsystemd-network/include/systemd-network/arp-util.h
index 7540cce95f..790085a05b 100644
--- a/src/libsystemd-network/include/systemd-network/arp-util.h
+++ b/src/libsystemd-network/include/systemd-network/arp-util.h
@@ -21,8 +21,8 @@
 
 #include <netinet/if_ether.h>
 
-#include "basic/socket-util.h"
-#include "basic/sparse-endian.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/sparse-endian.h"
 
 int arp_network_bind_raw_socket(int index, be32_t address, const struct ether_addr *eth_mac);
 
diff --git a/src/libsystemd-network/include/systemd-network/dhcp-identifier.h b/src/libsystemd-network/include/systemd-network/dhcp-identifier.h
index 5045dd9b3d..187780e7b0 100644
--- a/src/libsystemd-network/include/systemd-network/dhcp-identifier.h
+++ b/src/libsystemd-network/include/systemd-network/dhcp-identifier.h
@@ -21,9 +21,9 @@
 
 #include <systemd/sd-id128.h>
 
-#include "basic/macro.h"
-#include "basic/sparse-endian.h"
-#include "basic/unaligned.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-basic/unaligned.h"
 
 typedef enum DUIDType {
         DUID_TYPE_LLT       = 1,
diff --git a/src/libsystemd-network/include/systemd-network/dhcp-internal.h b/src/libsystemd-network/include/systemd-network/dhcp-internal.h
index 8ea7254ff1..f2f44918cb 100644
--- a/src/libsystemd-network/include/systemd-network/dhcp-internal.h
+++ b/src/libsystemd-network/include/systemd-network/dhcp-internal.h
@@ -26,7 +26,7 @@
 
 #include <linux/if_packet.h>
 
-#include "basic/socket-util.h"
+#include "systemd-basic/socket-util.h"
 
 #include "dhcp-protocol.h"
 #include "sd-dhcp-client.h"
diff --git a/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h b/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h
index af66781ac7..92dd668876 100644
--- a/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h
+++ b/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h
@@ -24,8 +24,8 @@
 
 #include <linux/if_packet.h>
 
-#include "basic/list.h"
-#include "basic/util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/util.h"
 
 #include "dhcp-protocol.h"
 #include "sd-dhcp-client.h"
diff --git a/src/libsystemd-network/include/systemd-network/dhcp-protocol.h b/src/libsystemd-network/include/systemd-network/dhcp-protocol.h
index 9c7197b79a..7b083afa8b 100644
--- a/src/libsystemd-network/include/systemd-network/dhcp-protocol.h
+++ b/src/libsystemd-network/include/systemd-network/dhcp-protocol.h
@@ -23,8 +23,8 @@
 #include <netinet/udp.h>
 #include <stdint.h>
 
-#include "basic/macro.h"
-#include "basic/sparse-endian.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/sparse-endian.h"
 
 struct DHCPMessage {
         uint8_t op;
diff --git a/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h b/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h
index 45f5946e59..bdbe63c450 100644
--- a/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h
+++ b/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h
@@ -22,9 +22,9 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/hashmap.h"
-#include "basic/log.h"
-#include "basic/util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/util.h"
 
 #include "dhcp-internal.h"
 #include "sd-dhcp-server.h"
diff --git a/src/libsystemd-network/include/systemd-network/dhcp6-internal.h b/src/libsystemd-network/include/systemd-network/dhcp6-internal.h
index 34cdbed57a..6d3178e2d6 100644
--- a/src/libsystemd-network/include/systemd-network/dhcp6-internal.h
+++ b/src/libsystemd-network/include/systemd-network/dhcp6-internal.h
@@ -24,9 +24,9 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/list.h"
-#include "basic/macro.h"
-#include "basic/sparse-endian.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/sparse-endian.h"
 
 typedef struct DHCP6Address DHCP6Address;
 
diff --git a/src/libsystemd-network/include/systemd-network/dhcp6-protocol.h b/src/libsystemd-network/include/systemd-network/dhcp6-protocol.h
index f54f4ad618..7449b2b20d 100644
--- a/src/libsystemd-network/include/systemd-network/dhcp6-protocol.h
+++ b/src/libsystemd-network/include/systemd-network/dhcp6-protocol.h
@@ -22,8 +22,8 @@
 #include <netinet/ip6.h>
 #include <netinet/udp.h>
 
-#include "basic/macro.h"
-#include "basic/sparse-endian.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/sparse-endian.h"
 
 struct DHCP6Message {
         union {
diff --git a/src/libsystemd-network/include/systemd-network/lldp-internal.h b/src/libsystemd-network/include/systemd-network/lldp-internal.h
index 7992db6158..e28b9702a0 100644
--- a/src/libsystemd-network/include/systemd-network/lldp-internal.h
+++ b/src/libsystemd-network/include/systemd-network/lldp-internal.h
@@ -22,9 +22,9 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/hashmap.h"
-#include "basic/log.h"
-#include "basic/prioq.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/prioq.h"
 
 #include "sd-lldp.h"
 
diff --git a/src/libsystemd-network/include/systemd-network/lldp-neighbor.h b/src/libsystemd-network/include/systemd-network/lldp-neighbor.h
index 142872f2ad..392a0a268b 100644
--- a/src/libsystemd-network/include/systemd-network/lldp-neighbor.h
+++ b/src/libsystemd-network/include/systemd-network/lldp-neighbor.h
@@ -23,8 +23,8 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "basic/hash-funcs.h"
-#include "basic/time-util.h"
+#include "systemd-basic/hash-funcs.h"
+#include "systemd-basic/time-util.h"
 
 #include "lldp-internal.h"
 #include "sd-lldp.h"
diff --git a/src/libsystemd-network/include/systemd-network/ndisc-internal.h b/src/libsystemd-network/include/systemd-network/ndisc-internal.h
index b58d29750e..0f7f69a33d 100644
--- a/src/libsystemd-network/include/systemd-network/ndisc-internal.h
+++ b/src/libsystemd-network/include/systemd-network/ndisc-internal.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/log.h"
+#include "systemd-basic/log.h"
 
 #include "sd-ndisc.h"
 
diff --git a/src/libsystemd-network/include/systemd-network/ndisc-router.h b/src/libsystemd-network/include/systemd-network/ndisc-router.h
index d1b071da7f..2f1df49198 100644
--- a/src/libsystemd-network/include/systemd-network/ndisc-router.h
+++ b/src/libsystemd-network/include/systemd-network/ndisc-router.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/time-util.h"
+#include "systemd-basic/time-util.h"
 
 #include "sd-ndisc.h"
 
diff --git a/src/libsystemd-network/include/systemd-network/network-internal.h b/src/libsystemd-network/include/systemd-network/network-internal.h
index a5cf8e4f1c..3d0554f12c 100644
--- a/src/libsystemd-network/include/systemd-network/network-internal.h
+++ b/src/libsystemd-network/include/systemd-network/network-internal.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "shared/condition.h"
+#include "systemd-shared/condition.h"
 #include "udev.h"
 
 #include "sd-dhcp-lease.h"
diff --git a/src/libsystemd-network/src/Makefile b/src/libsystemd-network/src/Makefile
index 204627a130..3e89f7ca4f 100644
--- a/src/libsystemd-network/src/Makefile
+++ b/src/libsystemd-network/src/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-noinst_LTLIBRARIES += \
+rootlibexec_LTLIBRARIES += \
 	libsystemd-network.la
 
 libsystemd_network_la_CFLAGS = \
@@ -78,10 +78,9 @@ libsystemd_network_la_SOURCES = \
 	src/libsystemd-network/sd-lldp.c
 
 libsystemd_network_la_LIBADD = \
+	libsystemd-basic.la \
+	libsystemd.la \
+	libsystemd-shared.la \
 	$(KMOD_LIBS)
 
-sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS)
-sd.CPPFLAGS += $(libshared.CPPFLAGS)
-sd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src
-
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd-network/src/arp-util.c b/src/libsystemd-network/src/arp-util.c
index bf66a75b16..2edb97be32 100644
--- a/src/libsystemd-network/src/arp-util.c
+++ b/src/libsystemd-network/src/arp-util.c
@@ -22,8 +22,8 @@
 
 #include <linux/filter.h>
 
-#include "basic/fd-util.h"
-#include "basic/util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/arp-util.h"
 
 int arp_network_bind_raw_socket(int ifindex, be32_t address, const struct ether_addr *eth_mac) {
diff --git a/src/libsystemd-network/src/dhcp-identifier.c b/src/libsystemd-network/src/dhcp-identifier.c
index 3edba38bd8..afe0b9a404 100644
--- a/src/libsystemd-network/src/dhcp-identifier.c
+++ b/src/libsystemd-network/src/dhcp-identifier.c
@@ -20,13 +20,13 @@
 #include <libudev.h>
 #include <systemd/sd-id128.h>
 
-#include "basic/siphash24.h"
-#include "basic/sparse-endian.h"
-#include "basic/virt.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-basic/virt.h"
 #include "systemd-network/dhcp-identifier.h"
 #include "systemd-network/dhcp6-protocol.h"
 #include "systemd-network/network-internal.h"
+#include "systemd-shared/udev-util.h"
 
 #define SYSTEMD_PEN 43793
 #define HASH_KEY SD_ID128_MAKE(80,11,8c,c2,fe,4a,03,ee,3e,d6,0c,6f,36,39,14,09)
diff --git a/src/libsystemd-network/src/dhcp-network.c b/src/libsystemd-network/src/dhcp-network.c
index 4984d49ab7..2cdadee730 100644
--- a/src/libsystemd-network/src/dhcp-network.c
+++ b/src/libsystemd-network/src/dhcp-network.c
@@ -28,8 +28,8 @@
 #include <linux/if_infiniband.h>
 #include <linux/if_packet.h>
 
-#include "basic/fd-util.h"
-#include "basic/socket-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/socket-util.h"
 #include "systemd-network/dhcp-internal.h"
 
 static int _bind_raw_socket(int ifindex, union sockaddr_union *link,
diff --git a/src/libsystemd-network/src/dhcp-option.c b/src/libsystemd-network/src/dhcp-option.c
index f47b2ae9e7..a848ed2841 100644
--- a/src/libsystemd-network/src/dhcp-option.c
+++ b/src/libsystemd-network/src/dhcp-option.c
@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/utf8.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/utf8.h"
 #include "systemd-network/dhcp-internal.h"
 
 static int option_append(uint8_t options[], size_t size, size_t *offset,
diff --git a/src/libsystemd-network/src/dhcp6-network.c b/src/libsystemd-network/src/dhcp6-network.c
index 0f7c281ad3..469e3ddfdf 100644
--- a/src/libsystemd-network/src/dhcp6-network.c
+++ b/src/libsystemd-network/src/dhcp6-network.c
@@ -28,8 +28,8 @@
 
 #include <linux/if_packet.h>
 
-#include "basic/fd-util.h"
-#include "basic/socket-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/socket-util.h"
 #include "systemd-network/dhcp6-internal.h"
 #include "systemd-network/dhcp6-protocol.h"
 
diff --git a/src/libsystemd-network/src/dhcp6-option.c b/src/libsystemd-network/src/dhcp6-option.c
index 060a822834..ecbf201661 100644
--- a/src/libsystemd-network/src/dhcp6-option.c
+++ b/src/libsystemd-network/src/dhcp6-option.c
@@ -21,15 +21,15 @@
 #include <netinet/in.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/sparse-endian.h"
-#include "basic/strv.h"
-#include "basic/unaligned.h"
-#include "basic/util.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unaligned.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/dhcp6-internal.h"
 #include "systemd-network/dhcp6-protocol.h"
 #include "systemd-network/sd-dhcp6-client.h"
+#include "systemd-shared/dns-domain.h"
 
 #define DHCP6_OPTION_IA_NA_LEN                  12
 #define DHCP6_OPTION_IA_TA_LEN                  4
diff --git a/src/libsystemd-network/src/icmp6-util.c b/src/libsystemd-network/src/icmp6-util.c
index 39f9f5785f..4280d32e3d 100644
--- a/src/libsystemd-network/src/icmp6-util.c
+++ b/src/libsystemd-network/src/icmp6-util.c
@@ -30,8 +30,8 @@
 
 #include <linux/if_packet.h>
 
-#include "basic/fd-util.h"
-#include "basic/socket-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/socket-util.h"
 #include "systemd-network/icmp6-util.h"
 
 #define IN6ADDR_ALL_ROUTERS_MULTICAST_INIT \
diff --git a/src/libsystemd-network/src/lldp-neighbor.c b/src/libsystemd-network/src/lldp-neighbor.c
index afe2e8d1eb..6509b1479d 100644
--- a/src/libsystemd-network/src/lldp-neighbor.c
+++ b/src/libsystemd-network/src/lldp-neighbor.c
@@ -17,12 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/ether-addr-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/in-addr-util.h"
-#include "basic/unaligned.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/ether-addr-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/unaligned.h"
 #include "systemd-network/lldp-internal.h"
 #include "systemd-network/lldp-neighbor.h"
 
diff --git a/src/libsystemd-network/src/lldp-network.c b/src/libsystemd-network/src/lldp-network.c
index 9d1d592a36..6c9ed81e69 100644
--- a/src/libsystemd-network/src/lldp-network.c
+++ b/src/libsystemd-network/src/lldp-network.c
@@ -22,8 +22,8 @@
 
 #include <linux/filter.h>
 
-#include "basic/fd-util.h"
-#include "basic/socket-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/socket-util.h"
 #include "systemd-network/lldp-network.h"
 
 int lldp_network_bind_raw_socket(int ifindex) {
diff --git a/src/libsystemd-network/src/ndisc-router.c b/src/libsystemd-network/src/ndisc-router.c
index 2fa77d391e..4e7e7d6bfa 100644
--- a/src/libsystemd-network/src/ndisc-router.c
+++ b/src/libsystemd-network/src/ndisc-router.c
@@ -19,14 +19,14 @@
 
 #include <netinet/icmp6.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hostname-util.h"
-#include "basic/missing.h"
-#include "basic/strv.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/strv.h"
 #include "systemd-network/ndisc-internal.h"
 #include "systemd-network/ndisc-router.h"
 #include "systemd-network/sd-ndisc.h"
+#include "systemd-shared/dns-domain.h"
 
 _public_ sd_ndisc_router* sd_ndisc_router_ref(sd_ndisc_router *rt) {
         if (!rt)
diff --git a/src/libsystemd-network/src/network-internal.c b/src/libsystemd-network/src/network-internal.c
index df0d335ca0..13b3bad81b 100644
--- a/src/libsystemd-network/src/network-internal.c
+++ b/src/libsystemd-network/src/network-internal.c
@@ -22,22 +22,22 @@
 
 #include <linux/if.h>
 
-#include "basic/alloc-util.h"
-#include "basic/ether-addr-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/siphash24.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
-#include "shared/condition.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/ether-addr-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/dhcp-lease-internal.h"
 #include "systemd-network/network-internal.h"
 #include "systemd-network/sd-ndisc.h"
+#include "systemd-shared/condition.h"
+#include "systemd-shared/conf-parser.h"
 
 const char *net_get_name(struct udev_device *device) {
         const char *name, *field;
diff --git a/src/libsystemd-network/src/sd-dhcp-client.c b/src/libsystemd-network/src/sd-dhcp-client.c
index 75895f2e58..8d8fb09186 100644
--- a/src/libsystemd-network/src/sd-dhcp-client.c
+++ b/src/libsystemd-network/src/sd-dhcp-client.c
@@ -27,18 +27,18 @@
 
 #include <linux/if_infiniband.h>
 
-#include "basic/alloc-util.h"
-#include "basic/async.h"
-#include "basic/hostname-util.h"
-#include "basic/random-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/async.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/dhcp-identifier.h"
 #include "systemd-network/dhcp-internal.h"
 #include "systemd-network/dhcp-lease-internal.h"
 #include "systemd-network/dhcp-protocol.h"
 #include "systemd-network/sd-dhcp-client.h"
+#include "systemd-shared/dns-domain.h"
 
 #define MAX_CLIENT_ID_LEN (sizeof(uint32_t) + MAX_DUID_LEN)  /* Arbitrary limit */
 #define MAX_MAC_ADDR_LEN CONST_MAX(INFINIBAND_ALEN, ETH_ALEN)
diff --git a/src/libsystemd-network/src/sd-dhcp-lease.c b/src/libsystemd-network/src/sd-dhcp-lease.c
index 0edc075b58..557648debe 100644
--- a/src/libsystemd-network/src/sd-dhcp-lease.c
+++ b/src/libsystemd-network/src/sd-dhcp-lease.c
@@ -24,21 +24,21 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/hexdecoct.h"
-#include "basic/hostname-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/parse-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/unaligned.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unaligned.h"
 #include "systemd-network/dhcp-lease-internal.h"
 #include "systemd-network/dhcp-protocol.h"
 #include "systemd-network/network-internal.h"
 #include "systemd-network/sd-dhcp-lease.h"
+#include "systemd-shared/dns-domain.h"
 
 int sd_dhcp_lease_get_address(sd_dhcp_lease *lease, struct in_addr *addr) {
         assert_return(lease, -EINVAL);
diff --git a/src/libsystemd-network/src/sd-dhcp-server.c b/src/libsystemd-network/src/sd-dhcp-server.c
index 4a6c14e80c..b1d7ea3046 100644
--- a/src/libsystemd-network/src/sd-dhcp-server.c
+++ b/src/libsystemd-network/src/sd-dhcp-server.c
@@ -20,12 +20,12 @@
 
 #include <sys/ioctl.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/siphash24.h"
-#include "basic/string-util.h"
-#include "basic/unaligned.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unaligned.h"
 #include "systemd-network/dhcp-internal.h"
 #include "systemd-network/dhcp-server-internal.h"
 #include "systemd-network/sd-dhcp-server.h"
diff --git a/src/libsystemd-network/src/sd-dhcp6-client.c b/src/libsystemd-network/src/sd-dhcp6-client.c
index af5d91c946..6d2fd37006 100644
--- a/src/libsystemd-network/src/sd-dhcp6-client.c
+++ b/src/libsystemd-network/src/sd-dhcp6-client.c
@@ -23,13 +23,13 @@
 
 #include <linux/if_infiniband.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/random-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-table.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/dhcp-identifier.h"
 #include "systemd-network/dhcp6-internal.h"
 #include "systemd-network/dhcp6-lease-internal.h"
diff --git a/src/libsystemd-network/src/sd-dhcp6-lease.c b/src/libsystemd-network/src/sd-dhcp6-lease.c
index cb53533492..9e028d1ce7 100644
--- a/src/libsystemd-network/src/sd-dhcp6-lease.c
+++ b/src/libsystemd-network/src/sd-dhcp6-lease.c
@@ -20,9 +20,9 @@
 
 #include <errno.h>
 
-#include "basic/alloc-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/dhcp6-lease-internal.h"
 #include "systemd-network/dhcp6-protocol.h"
 
diff --git a/src/libsystemd-network/src/sd-ipv4acd.c b/src/libsystemd-network/src/sd-ipv4acd.c
index 418a686150..d277fd8b2d 100644
--- a/src/libsystemd-network/src/sd-ipv4acd.c
+++ b/src/libsystemd-network/src/sd-ipv4acd.c
@@ -24,15 +24,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/ether-addr-util.h"
-#include "basic/fd-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/list.h"
-#include "basic/random-util.h"
-#include "basic/siphash24.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/ether-addr-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/arp-util.h"
 #include "systemd-network/sd-ipv4acd.h"
 
diff --git a/src/libsystemd-network/src/sd-ipv4ll.c b/src/libsystemd-network/src/sd-ipv4ll.c
index 85c5b20a81..a543d26f34 100644
--- a/src/libsystemd-network/src/sd-ipv4ll.c
+++ b/src/libsystemd-network/src/sd-ipv4ll.c
@@ -24,15 +24,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/ether-addr-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/list.h"
-#include "basic/random-util.h"
-#include "basic/siphash24.h"
-#include "basic/sparse-endian.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/ether-addr-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/sd-ipv4acd.h"
 #include "systemd-network/sd-ipv4ll.h"
 
diff --git a/src/libsystemd-network/src/sd-lldp.c b/src/libsystemd-network/src/sd-lldp.c
index 7a3fcb9472..0d64bdcaa2 100644
--- a/src/libsystemd-network/src/sd-lldp.c
+++ b/src/libsystemd-network/src/sd-lldp.c
@@ -20,10 +20,10 @@
 
 #include <arpa/inet.h>
 
-#include "basic/alloc-util.h"
-#include "basic/ether-addr-util.h"
-#include "basic/fd-util.h"
-#include "basic/socket-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/ether-addr-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/socket-util.h"
 #include "systemd-network/lldp-internal.h"
 #include "systemd-network/lldp-neighbor.h"
 #include "systemd-network/lldp-network.h"
diff --git a/src/libsystemd-network/src/sd-ndisc.c b/src/libsystemd-network/src/sd-ndisc.c
index 91e4467371..67c135cbe3 100644
--- a/src/libsystemd-network/src/sd-ndisc.c
+++ b/src/libsystemd-network/src/sd-ndisc.c
@@ -20,12 +20,12 @@
 #include <netinet/icmp6.h>
 #include <netinet/in.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/icmp6-util.h"
 #include "systemd-network/ndisc-internal.h"
 #include "systemd-network/ndisc-router.h"
diff --git a/src/libsystemd-network/test/test-acd.c b/src/libsystemd-network/test/test-acd.c
index d79e71ab90..26480a2012 100644
--- a/src/libsystemd-network/test/test-acd.c
+++ b/src/libsystemd-network/test/test-acd.c
@@ -26,11 +26,11 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/in-addr-util.h"
-#include "basic/util.h"
 #include "sd-netlink/netlink-util.h"
-#include "sd-netlink/sd-netlink.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/sd-ipv4acd.h"
+#include "systemd-staging/sd-netlink.h"
 
 static void acd_handler(sd_ipv4acd *acd, int event, void *userdata) {
         assert_se(acd);
diff --git a/src/libsystemd-network/test/test-dhcp-client.c b/src/libsystemd-network/test/test-dhcp-client.c
index 2b40ab8f48..e58491293c 100644
--- a/src/libsystemd-network/test/test-dhcp-client.c
+++ b/src/libsystemd-network/test/test-dhcp-client.c
@@ -24,9 +24,9 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/dhcp-identifier.h"
 #include "systemd-network/dhcp-internal.h"
 #include "systemd-network/dhcp-protocol.h"
diff --git a/src/libsystemd-network/test/test-dhcp-option.c b/src/libsystemd-network/test/test-dhcp-option.c
index eda42b0ba5..2dfbb557c0 100644
--- a/src/libsystemd-network/test/test-dhcp-option.c
+++ b/src/libsystemd-network/test/test-dhcp-option.c
@@ -3,9 +3,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/macro.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/dhcp-internal.h"
 #include "systemd-network/dhcp-protocol.h"
 
diff --git a/src/libsystemd-network/test/test-dhcp6-client.c b/src/libsystemd-network/test/test-dhcp6-client.c
index 20019f4bba..84bb9f9013 100644
--- a/src/libsystemd-network/test/test-dhcp6-client.c
+++ b/src/libsystemd-network/test/test-dhcp6-client.c
@@ -26,10 +26,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/fd-util.h"
-#include "basic/macro.h"
-#include "basic/socket-util.h"
-#include "basic/virt.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/virt.h"
 #include "systemd-network/dhcp6-internal.h"
 #include "systemd-network/dhcp6-lease-internal.h"
 #include "systemd-network/dhcp6-protocol.h"
diff --git a/src/libsystemd-network/test/test-ipv4ll-manual.c b/src/libsystemd-network/test/test-ipv4ll-manual.c
index 8dac0b1ca8..f67a8fe16c 100644
--- a/src/libsystemd-network/test/test-ipv4ll-manual.c
+++ b/src/libsystemd-network/test/test-ipv4ll-manual.c
@@ -26,14 +26,14 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "sd-netlink/netlink-util.h"
-#include "sd-netlink/sd-netlink.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/sd-ipv4ll.h"
+#include "systemd-staging/sd-netlink.h"
 
 static void ll_handler(sd_ipv4ll *ll, int event, void *userdata) {
         _cleanup_free_ char *address = NULL;
diff --git a/src/libsystemd-network/test/test-ipv4ll.c b/src/libsystemd-network/test/test-ipv4ll.c
index 6d3e7f35d5..58912a1bf5 100644
--- a/src/libsystemd-network/test/test-ipv4ll.c
+++ b/src/libsystemd-network/test/test-ipv4ll.c
@@ -25,9 +25,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/socket-util.h"
-#include "basic/util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/arp-util.h"
 #include "systemd-network/sd-ipv4ll.h"
 
diff --git a/src/libsystemd-network/test/test-lldp.c b/src/libsystemd-network/test/test-lldp.c
index ad321621e4..27b6711916 100644
--- a/src/libsystemd-network/test/test-lldp.c
+++ b/src/libsystemd-network/test/test-lldp.c
@@ -26,10 +26,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
 #include "systemd-network/lldp-network.h"
 #include "systemd-network/sd-lldp.h"
 
diff --git a/src/libsystemd-network/test/test-ndisc-rs.c b/src/libsystemd-network/test/test-ndisc-rs.c
index ff4b5c72ec..eb2dad5ab8 100644
--- a/src/libsystemd-network/test/test-ndisc-rs.c
+++ b/src/libsystemd-network/test/test-ndisc-rs.c
@@ -20,10 +20,10 @@
 #include <arpa/inet.h>
 #include <netinet/icmp6.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/socket-util.h"
-#include "basic/strv.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/strv.h"
 #include "systemd-network/icmp6-util.h"
 #include "systemd-network/sd-ndisc.h"
 
diff --git a/src/libsystemd-shared/Makefile b/src/libsystemd-shared/Makefile
new file mode 100644
index 0000000000..369b265ff7
--- /dev/null
+++ b/src/libsystemd-shared/Makefile
@@ -0,0 +1,28 @@
+#  -*- 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
+
+nested.subdirs += src
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/include/shared/acl-util.h b/src/libsystemd-shared/include/systemd-shared/acl-util.h
index af5bcb5b4f..8310519aff 100644
--- a/src/libshared/include/shared/acl-util.h
+++ b/src/libsystemd-shared/include/systemd-shared/acl-util.h
@@ -25,7 +25,7 @@
 #include <stdbool.h>
 #include <sys/acl.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry);
 int calc_acl_mask_if_needed(acl_t *acl_p);
diff --git a/src/libshared/include/shared/acpi-fpdt.h b/src/libsystemd-shared/include/systemd-shared/acpi-fpdt.h
index 3da32c08ad..365dd908bb 100644
--- a/src/libshared/include/shared/acpi-fpdt.h
+++ b/src/libsystemd-shared/include/systemd-shared/acpi-fpdt.h
@@ -19,6 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/time-util.h"
+#include "systemd-basic/time-util.h"
 
 int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit);
diff --git a/src/libshared/include/shared/apparmor-util.h b/src/libsystemd-shared/include/systemd-shared/apparmor-util.h
index 524f740152..524f740152 100644
--- a/src/libshared/include/shared/apparmor-util.h
+++ b/src/libsystemd-shared/include/systemd-shared/apparmor-util.h
diff --git a/src/libshared/include/shared/ask-password-api.h b/src/libsystemd-shared/include/systemd-shared/ask-password-api.h
index 770ab1f5c0..cdc18c52ad 100644
--- a/src/libshared/include/shared/ask-password-api.h
+++ b/src/libsystemd-shared/include/systemd-shared/ask-password-api.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "basic/time-util.h"
+#include "systemd-basic/time-util.h"
 
 typedef enum AskPasswordFlags {
         ASK_PASSWORD_ACCEPT_CACHED = 1,
diff --git a/src/libshared/include/shared/base-filesystem.h b/src/libsystemd-shared/include/systemd-shared/base-filesystem.h
index 49599f0a60..49599f0a60 100644
--- a/src/libshared/include/shared/base-filesystem.h
+++ b/src/libsystemd-shared/include/systemd-shared/base-filesystem.h
diff --git a/src/libshared/include/shared/boot-timestamps.h b/src/libsystemd-shared/include/systemd-shared/boot-timestamps.h
index 00ea7e3009..f67d4f25b1 100644
--- a/src/libshared/include/shared/boot-timestamps.h
+++ b/src/libsystemd-shared/include/systemd-shared/boot-timestamps.h
@@ -20,6 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/time-util.h"
+#include "systemd-basic/time-util.h"
 
 int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader);
diff --git a/src/libshared/include/shared/bus-unit-util.h b/src/libsystemd-shared/include/systemd-shared/bus-unit-util.h
index b4b68cc5d2..b4b68cc5d2 100644
--- a/src/libshared/include/shared/bus-unit-util.h
+++ b/src/libsystemd-shared/include/systemd-shared/bus-unit-util.h
diff --git a/src/libshared/include/shared/cgroup-show.h b/src/libsystemd-shared/include/systemd-shared/cgroup-show.h
index 5c1d6e6d98..5c1d6e6d98 100644
--- a/src/libshared/include/shared/cgroup-show.h
+++ b/src/libsystemd-shared/include/systemd-shared/cgroup-show.h
diff --git a/src/libshared/include/shared/clean-ipc.h b/src/libsystemd-shared/include/systemd-shared/clean-ipc.h
index 44a83afcf7..44a83afcf7 100644
--- a/src/libshared/include/shared/clean-ipc.h
+++ b/src/libsystemd-shared/include/systemd-shared/clean-ipc.h
diff --git a/src/libshared/include/shared/condition.h b/src/libsystemd-shared/include/systemd-shared/condition.h
index fd798460d1..a94705768c 100644
--- a/src/libshared/include/shared/condition.h
+++ b/src/libsystemd-shared/include/systemd-shared/condition.h
@@ -22,8 +22,8 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include "basic/list.h"
-#include "basic/macro.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/macro.h"
 
 typedef enum ConditionType {
         CONDITION_ARCHITECTURE,
diff --git a/src/libshared/include/shared/conf-parser.h b/src/libsystemd-shared/include/systemd-shared/conf-parser.h
index f7423d45e7..dfac0a788e 100644
--- a/src/libshared/include/shared/conf-parser.h
+++ b/src/libsystemd-shared/include/systemd-shared/conf-parser.h
@@ -25,9 +25,9 @@
 #include <stdio.h>
 #include <syslog.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
 
 /* An abstract parser for simple, line based, shallow configuration
  * files consisting of variable assignments only. */
diff --git a/src/libshared/include/shared/dev-setup.h b/src/libsystemd-shared/include/systemd-shared/dev-setup.h
index 5766a62060..5766a62060 100644
--- a/src/libshared/include/shared/dev-setup.h
+++ b/src/libsystemd-shared/include/systemd-shared/dev-setup.h
diff --git a/src/libshared/include/shared/dns-domain.h b/src/libsystemd-shared/include/systemd-shared/dns-domain.h
index 72e4cb0104..6a68cbbe9f 100644
--- a/src/libshared/include/shared/dns-domain.h
+++ b/src/libsystemd-shared/include/systemd-shared/dns-domain.h
@@ -24,8 +24,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "basic/hashmap.h"
-#include "basic/in-addr-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/in-addr-util.h"
 
 /* Length of a single label, with all escaping removed, excluding any trailing dot or NUL byte */
 #define DNS_LABEL_MAX 63
diff --git a/src/libshared/include/shared/dropin.h b/src/libsystemd-shared/include/systemd-shared/dropin.h
index 44235405f6..4ce904460d 100644
--- a/src/libshared/include/shared/dropin.h
+++ b/src/libsystemd-shared/include/systemd-shared/dropin.h
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/hashmap.h"
-#include "basic/macro.h"
-#include "basic/set.h"
-#include "basic/unit-name.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/unit-name.h"
 
 int drop_in_file(const char *dir, const char *unit, unsigned level,
                  const char *name, char **_p, char **_q);
diff --git a/src/libshared/include/shared/efivars.h b/src/libsystemd-shared/include/systemd-shared/efivars.h
index 547b161367..2bf245607a 100644
--- a/src/libshared/include/shared/efivars.h
+++ b/src/libsystemd-shared/include/systemd-shared/efivars.h
@@ -25,7 +25,7 @@
 
 #include <systemd/sd-id128.h>
 
-#include "basic/time-util.h"
+#include "systemd-basic/time-util.h"
 
 #define EFI_VENDOR_LOADER SD_ID128_MAKE(4a,67,b0,82,0a,4c,41,cf,b6,c7,44,0b,29,bb,8c,4f)
 #define EFI_VENDOR_GLOBAL SD_ID128_MAKE(8b,e4,df,61,93,ca,11,d2,aa,0d,00,e0,98,03,2b,8c)
diff --git a/src/libshared/include/shared/fdset.h b/src/libsystemd-shared/include/systemd-shared/fdset.h
index 3ff5d519af..0b2a9926e3 100644
--- a/src/libshared/include/shared/fdset.h
+++ b/src/libsystemd-shared/include/systemd-shared/fdset.h
@@ -21,9 +21,9 @@
 
 #include <stdbool.h>
 
-#include "basic/hashmap.h"
-#include "basic/macro.h"
-#include "basic/set.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/set.h"
 
 typedef struct FDSet FDSet;
 
diff --git a/src/libshared/include/shared/fstab-util.h b/src/libsystemd-shared/include/systemd-shared/fstab-util.h
index 3d9e7ab907..3e82d9bb4a 100644
--- a/src/libshared/include/shared/fstab-util.h
+++ b/src/libsystemd-shared/include/systemd-shared/fstab-util.h
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 bool fstab_is_mount_point(const char *mount);
 
diff --git a/src/libshared/include/shared/generator.h b/src/libsystemd-shared/include/systemd-shared/generator.h
index a6017c1b76..a6017c1b76 100644
--- a/src/libshared/include/shared/generator.h
+++ b/src/libsystemd-shared/include/systemd-shared/generator.h
diff --git a/src/libshared/include/shared/gpt.h b/src/libsystemd-shared/include/systemd-shared/gpt.h
index 07153b51f4..07153b51f4 100644
--- a/src/libshared/include/shared/gpt.h
+++ b/src/libsystemd-shared/include/systemd-shared/gpt.h
diff --git a/src/libshared/include/shared/ima-util.h b/src/libsystemd-shared/include/systemd-shared/ima-util.h
index 5be94761fd..5be94761fd 100644
--- a/src/libshared/include/shared/ima-util.h
+++ b/src/libsystemd-shared/include/systemd-shared/ima-util.h
diff --git a/src/libshared/include/shared/import-util.h b/src/libsystemd-shared/include/systemd-shared/import-util.h
index 353fa9045c..a5ceb52b8f 100644
--- a/src/libshared/include/shared/import-util.h
+++ b/src/libsystemd-shared/include/systemd-shared/import-util.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef enum ImportVerify {
         IMPORT_VERIFY_NO,
diff --git a/src/libshared/include/shared/initreq.h b/src/libsystemd-shared/include/systemd-shared/initreq.h
index 710037d84b..710037d84b 100644
--- a/src/libshared/include/shared/initreq.h
+++ b/src/libsystemd-shared/include/systemd-shared/initreq.h
diff --git a/src/libshared/include/shared/install-printf.h b/src/libsystemd-shared/include/systemd-shared/install-printf.h
index 8a570fc265..8a570fc265 100644
--- a/src/libshared/include/shared/install-printf.h
+++ b/src/libsystemd-shared/include/systemd-shared/install-printf.h
diff --git a/src/libshared/include/shared/install.h b/src/libsystemd-shared/include/systemd-shared/install.h
index e056d374b6..52254974c7 100644
--- a/src/libshared/include/shared/install.h
+++ b/src/libsystemd-shared/include/systemd-shared/install.h
@@ -21,10 +21,10 @@
 
 #include <stdbool.h>
 
-#include "basic/hashmap.h"
-#include "basic/macro.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
 
 typedef enum UnitFileChangeType UnitFileChangeType;
 typedef enum UnitFilePresetMode UnitFilePresetMode;
diff --git a/src/libshared/include/shared/logs-show.h b/src/libsystemd-shared/include/systemd-shared/logs-show.h
index f16cb64838..1596a5875a 100644
--- a/src/libshared/include/shared/logs-show.h
+++ b/src/libsystemd-shared/include/systemd-shared/logs-show.h
@@ -26,9 +26,9 @@
 
 #include <systemd/sd-journal.h>
 
-#include "basic/macro.h"
-#include "basic/time-util.h"
-#include "basic/util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/util.h"
 
 #include "output-mode.h"
 
diff --git a/src/libshared/include/shared/machine-image.h b/src/libsystemd-shared/include/systemd-shared/machine-image.h
index 30a005e114..7c46fd6996 100644
--- a/src/libshared/include/shared/machine-image.h
+++ b/src/libsystemd-shared/include/systemd-shared/machine-image.h
@@ -22,12 +22,12 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "basic/hashmap.h"
-#include "basic/lockfile-util.h"
-#include "basic/macro.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/time-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/lockfile-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/time-util.h"
 
 typedef enum ImageType {
         IMAGE_DIRECTORY,
diff --git a/src/libshared/include/shared/machine-pool.h b/src/libsystemd-shared/include/systemd-shared/machine-pool.h
index fe99b7e0ae..fe99b7e0ae 100644
--- a/src/libshared/include/shared/machine-pool.h
+++ b/src/libsystemd-shared/include/systemd-shared/machine-pool.h
diff --git a/src/libshared/include/shared/output-mode.h b/src/libsystemd-shared/include/systemd-shared/output-mode.h
index 9a8d8127d3..2147470bdd 100644
--- a/src/libshared/include/shared/output-mode.h
+++ b/src/libsystemd-shared/include/systemd-shared/output-mode.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef enum OutputMode {
         OUTPUT_SHORT,
diff --git a/src/libshared/include/shared/pager.h b/src/libsystemd-shared/include/systemd-shared/pager.h
index 2a3cbe1721..57bba54d92 100644
--- a/src/libshared/include/shared/pager.h
+++ b/src/libsystemd-shared/include/systemd-shared/pager.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 int pager_open(bool no_pager, bool jump_to_end);
 void pager_close(void);
diff --git a/src/libshared/include/shared/path-lookup.h b/src/libsystemd-shared/include/systemd-shared/path-lookup.h
index ab14bdc267..43179fd9af 100644
--- a/src/libshared/include/shared/path-lookup.h
+++ b/src/libsystemd-shared/include/systemd-shared/path-lookup.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef struct LookupPaths LookupPaths;
 
diff --git a/src/libshared/include/shared/ptyfwd.h b/src/libsystemd-shared/include/systemd-shared/ptyfwd.h
index 8f32184433..ae9ef32d79 100644
--- a/src/libshared/include/shared/ptyfwd.h
+++ b/src/libsystemd-shared/include/systemd-shared/ptyfwd.h
@@ -23,7 +23,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef struct PTYForward PTYForward;
 
diff --git a/src/libshared/include/shared/resolve-util.h b/src/libsystemd-shared/include/systemd-shared/resolve-util.h
index 8df46599ad..2a6173d79a 100644
--- a/src/libshared/include/shared/resolve-util.h
+++ b/src/libsystemd-shared/include/systemd-shared/resolve-util.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef enum ResolveSupport ResolveSupport;
 typedef enum DnssecMode DnssecMode;
diff --git a/src/libshared/include/shared/seccomp-util.h b/src/libsystemd-shared/include/systemd-shared/seccomp-util.h
index be33eecb85..be33eecb85 100644
--- a/src/libshared/include/shared/seccomp-util.h
+++ b/src/libsystemd-shared/include/systemd-shared/seccomp-util.h
diff --git a/src/libshared/include/shared/sleep-config.h b/src/libsystemd-shared/include/systemd-shared/sleep-config.h
index ad10039ff4..ad10039ff4 100644
--- a/src/libshared/include/shared/sleep-config.h
+++ b/src/libsystemd-shared/include/systemd-shared/sleep-config.h
diff --git a/src/libshared/include/shared/spawn-ask-password-agent.h b/src/libsystemd-shared/include/systemd-shared/spawn-ask-password-agent.h
index fb0749b13f..fb0749b13f 100644
--- a/src/libshared/include/shared/spawn-ask-password-agent.h
+++ b/src/libsystemd-shared/include/systemd-shared/spawn-ask-password-agent.h
diff --git a/src/libshared/include/shared/spawn-polkit-agent.h b/src/libsystemd-shared/include/systemd-shared/spawn-polkit-agent.h
index 42b2989ded..42b2989ded 100644
--- a/src/libshared/include/shared/spawn-polkit-agent.h
+++ b/src/libsystemd-shared/include/systemd-shared/spawn-polkit-agent.h
diff --git a/src/libshared/include/shared/specifier.h b/src/libsystemd-shared/include/systemd-shared/specifier.h
index 6b1623ee61..6b1623ee61 100644
--- a/src/libshared/include/shared/specifier.h
+++ b/src/libsystemd-shared/include/systemd-shared/specifier.h
diff --git a/src/libshared/include/shared/switch-root.h b/src/libsystemd-shared/include/systemd-shared/switch-root.h
index a7a080b3e8..a7a080b3e8 100644
--- a/src/libshared/include/shared/switch-root.h
+++ b/src/libsystemd-shared/include/systemd-shared/switch-root.h
diff --git a/src/libshared/include/shared/sysctl-util.h b/src/libsystemd-shared/include/systemd-shared/sysctl-util.h
index 2decb39f58..2decb39f58 100644
--- a/src/libshared/include/shared/sysctl-util.h
+++ b/src/libsystemd-shared/include/systemd-shared/sysctl-util.h
diff --git a/src/libshared/include/shared/test-tables.h b/src/libsystemd-shared/include/systemd-shared/test-tables.h
index bf286bede5..83d3345e68 100644
--- a/src/libshared/include/shared/test-tables.h
+++ b/src/libsystemd-shared/include/systemd-shared/test-tables.h
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 typedef const char* (*lookup_t)(int);
 typedef int (*reverse_t)(const char*);
diff --git a/src/libshared/include/shared/tests.h b/src/libsystemd-shared/include/systemd-shared/tests.h
index 93f09013a1..93f09013a1 100644
--- a/src/libshared/include/shared/tests.h
+++ b/src/libsystemd-shared/include/systemd-shared/tests.h
diff --git a/src/libshared/include/shared/udev-util.h b/src/libsystemd-shared/include/systemd-shared/udev-util.h
index c3db8ab30e..a4cfbf5ba2 100644
--- a/src/libshared/include/shared/udev-util.h
+++ b/src/libsystemd-shared/include/systemd-shared/udev-util.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"
 #include "udev.h"
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev*, udev_unref);
diff --git a/src/libshared/include/shared/uid-range.h b/src/libsystemd-shared/include/systemd-shared/uid-range.h
index 4044eb4c9c..4044eb4c9c 100644
--- a/src/libshared/include/shared/uid-range.h
+++ b/src/libsystemd-shared/include/systemd-shared/uid-range.h
diff --git a/src/libshared/include/shared/utmp-wtmp.h b/src/libsystemd-shared/include/systemd-shared/utmp-wtmp.h
index 50dde37b16..abc9e5dd10 100644
--- a/src/libshared/include/shared/utmp-wtmp.h
+++ b/src/libsystemd-shared/include/systemd-shared/utmp-wtmp.h
@@ -22,8 +22,8 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "basic/time-util.h"
-#include "basic/util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/util.h"
 
 #ifdef HAVE_UTMP
 int utmp_get_runlevel(int *runlevel, int *previous);
diff --git a/src/libshared/include/shared/vlan-util.h b/src/libsystemd-shared/include/systemd-shared/vlan-util.h
index b7c2f03383..b7c2f03383 100644
--- a/src/libshared/include/shared/vlan-util.h
+++ b/src/libsystemd-shared/include/systemd-shared/vlan-util.h
diff --git a/src/libshared/include/shared/watchdog.h b/src/libsystemd-shared/include/systemd-shared/watchdog.h
index 78e1406f5d..fd13cce283 100644
--- a/src/libshared/include/shared/watchdog.h
+++ b/src/libsystemd-shared/include/systemd-shared/watchdog.h
@@ -21,8 +21,8 @@
 
 #include <stdbool.h>
 
-#include "basic/time-util.h"
-#include "basic/util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/util.h"
 
 int watchdog_set_timeout(usec_t *usec);
 int watchdog_ping(void);
diff --git a/src/libshared/src/Makefile b/src/libsystemd-shared/src/Makefile
index 1fee7da878..62fe215e3f 100644
--- a/src/libshared/src/Makefile
+++ b/src/libsystemd-shared/src/Makefile
@@ -23,10 +23,10 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-noinst_LTLIBRARIES += \
-	libshared.la
+rootlibexec_LTLIBRARIES += \
+	libsystemd-shared.la
 
-libshared_la_SOURCES = \
+libsystemd_shared_la_SOURCES = \
 	src/shared/output-mode.h \
 	src/shared/output-mode.c \
 	src/shared/gpt.h \
@@ -94,8 +94,6 @@ libshared_la_SOURCES = \
 	src/shared/import-util.h \
 	src/shared/sysctl-util.c \
 	src/shared/sysctl-util.h \
-	src/shared/bus-util.c \
-	src/shared/bus-util.h \
 	src/shared/logs-show.c \
 	src/shared/logs-show.h \
 	src/shared/machine-image.c \
@@ -114,72 +112,43 @@ libshared_la_SOURCES = \
 	src/shared/fdset.h
 
 ifneq ($(HAVE_UTMP),)
-libshared_la_SOURCES += \
+libsystemd_shared_la_SOURCES += \
 	src/shared/utmp-wtmp.c
 endif # HAVE_UTMP
 
 ifneq ($(HAVE_SECCOMP),)
-libshared_la_SOURCES += \
+libsystemd_shared_la_SOURCES += \
 	src/shared/seccomp-util.h \
 	src/shared/seccomp-util.c
 endif # HAVE_SECCOMP
 
 ifneq ($(HAVE_ACL),)
-libshared_la_SOURCES += \
+libsystemd_shared_la_SOURCES += \
 	src/shared/acl-util.c \
 	src/shared/acl-util.h
 endif # HAVE_ACL
 
-libshared_la_CFLAGS = \
+libsystemd_shared_la_CFLAGS = \
 	$(ACL_CFLAGS) \
 	$(LIBIDN_CFLAGS) \
 	$(SECCOMP_CFLAGS)
 
-libshared_la_LIBADD = \
+libsystemd_shared_la_LIBADD = \
 	libsystemd-internal.la \
-	libbasic.la \
-	libsystemd-journal-internal.la \
 	libudev-internal.la \
 	$(ACL_LIBS) \
 	$(LIBIDN_LIBS) \
 	$(SECCOMP_LIBS)
 
-rootlibexec_LTLIBRARIES += \
-	libsystemd-shared.la
-
-libsystemd_shared_la_SOURCES = \
-	$(libbasic_la_SOURCES) \
-	$(libshared_la_SOURCES) \
-	$(libsystemd_internal_la_SOURCES) \
-	$(libsystemd_journal_internal_la_SOURCES) \
-	$(libudev_internal_la_SOURCES)
-
 libsystemd_shared_la_CFLAGS = \
-	$(libbasic_la_CFLAGS) \
-	$(libshared_la_CFLAGS) \
-	$(libsystemd_internal_la_CFLAGS) \
-	$(libsystemd_journal_internal_la_CFLAGS) \
-	$(libudev_internal_la_CFLAGS) \
 	$(ACL_CFLAGS) \
 	$(LIBIDN_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
 	-fvisibility=default
 
-# We can't use libshared_la_LIBADD here because it would
-# pull in libsystemd*-internal.la
-libsystemd_shared_la_LIBADD = \
-	$(libbasic_la_LIBADD) \
-	$(libsystemd_internal_la_LIBADD) \
-	$(libsystemd_journal_internal_la_LIBADD) \
-	$(libudev_internal_la_LIBADD) \
-	$(ACL_LIBS) \
-	$(LIBIDN_LIBS) \
-	$(SECCOMP_LIBS)
-
 libsystemd_shared_la_LDFLAGS = \
 	-release $(PACKAGE_VERSION)
 
-sd.CPPFLAGS += $(addprefix -I,$(call at.path,$(srcdir)/../include $(srcdir)/../include/shared))
 sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
 sd.CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\"
 sd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\"
diff --git a/src/libshared/src/acl-util.c b/src/libsystemd-shared/src/acl-util.c
index b9af6aca5c..97081c125a 100644
--- a/src/libshared/src/acl-util.c
+++ b/src/libsystemd-shared/src/acl-util.c
@@ -20,12 +20,12 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "shared/acl-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/acl-util.h"
 
 int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) {
         acl_entry_t i;
diff --git a/src/libshared/src/acpi-fpdt.c b/src/libsystemd-shared/src/acpi-fpdt.c
index d3a744acbd..e71c05d488 100644
--- a/src/libshared/src/acpi-fpdt.c
+++ b/src/libsystemd-shared/src/acpi-fpdt.c
@@ -24,11 +24,11 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/time-util.h"
-#include "shared/acpi-fpdt.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-shared/acpi-fpdt.h"
 
 struct acpi_table_header {
         char signature[4];
diff --git a/src/libshared/src/apparmor-util.c b/src/libsystemd-shared/src/apparmor-util.c
index af5498e05e..b43b31095e 100644
--- a/src/libshared/src/apparmor-util.c
+++ b/src/libsystemd-shared/src/apparmor-util.c
@@ -19,10 +19,10 @@
 
 #include <stddef.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fileio.h"
-#include "basic/parse-util.h"
-#include "shared/apparmor-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-shared/apparmor-util.h"
 
 bool mac_apparmor_use(void) {
         static int cached_use = -1;
diff --git a/src/libshared/src/ask-password-api.c b/src/libsystemd-shared/src/ask-password-api.c
index 5848ff5582..f31f5b70ae 100644
--- a/src/libshared/src/ask-password-api.c
+++ b/src/libsystemd-shared/src/ask-password-api.c
@@ -39,26 +39,26 @@
 #include <termios.h>
 #include <unistd.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/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/random-util.h"
-#include "basic/signal-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/time-util.h"
-#include "basic/umask-util.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
-#include "shared/ask-password-api.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/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/ask-password-api.h"
 
 #define KEYRING_TIMEOUT_USEC ((5 * USEC_PER_MINUTE) / 2)
 
diff --git a/src/libshared/src/base-filesystem.c b/src/libsystemd-shared/src/base-filesystem.c
index 881bfb061c..d0a601e918 100644
--- a/src/libshared/src/base-filesystem.c
+++ b/src/libsystemd-shared/src/base-filesystem.c
@@ -25,15 +25,15 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/umask-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "shared/base-filesystem.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/umask-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/base-filesystem.h"
 
 typedef struct BaseFilesystem {
         const char *dir;
diff --git a/src/libshared/src/boot-timestamps.c b/src/libsystemd-shared/src/boot-timestamps.c
index 3e3034f032..e6a4392bd5 100644
--- a/src/libshared/src/boot-timestamps.c
+++ b/src/libsystemd-shared/src/boot-timestamps.c
@@ -18,11 +18,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/macro.h"
-#include "basic/time-util.h"
-#include "shared/acpi-fpdt.h"
-#include "shared/boot-timestamps.h"
-#include "shared/efivars.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-shared/acpi-fpdt.h"
+#include "systemd-shared/boot-timestamps.h"
+#include "systemd-shared/efivars.h"
 
 int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader) {
         usec_t x = 0, y = 0, a;
diff --git a/src/libshared/src/bus-unit-util.c b/src/libsystemd-shared/src/bus-unit-util.c
index eadf2fa14f..f75d82cedd 100644
--- a/src/libshared/src/bus-unit-util.c
+++ b/src/libsystemd-shared/src/bus-unit-util.c
@@ -17,26 +17,26 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/env-util.h"
-#include "basic/escape.h"
-#include "basic/hashmap.h"
-#include "basic/list.h"
-#include "basic/locale-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/rlimit-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/syslog-util.h"
-#include "basic/terminal-util.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
 #include "sd-bus/bus-internal.h"
-#include "shared/bus-unit-util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/rlimit-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/syslog-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/bus-unit-util.h"
 
 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
         assert(message);
diff --git a/src/libshared/src/cgroup-show.c b/src/libsystemd-shared/src/cgroup-show.c
index e8dae923f5..78560e1262 100644
--- a/src/libshared/src/cgroup-show.c
+++ b/src/libsystemd-shared/src/cgroup-show.c
@@ -24,18 +24,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/locale-util.h"
-#include "basic/macro.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "shared/cgroup-show.h"
-#include "shared/output-mode.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-shared/cgroup-show.h"
+#include "systemd-shared/output-mode.h"
 
 static void show_pid_array(
                 pid_t pids[],
diff --git a/src/libshared/src/clean-ipc.c b/src/libsystemd-shared/src/clean-ipc.c
index b9c60c48ae..ab86b69b19 100644
--- a/src/libshared/src/clean-ipc.c
+++ b/src/libsystemd-shared/src/clean-ipc.c
@@ -32,15 +32,15 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "shared/clean-ipc.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-shared/clean-ipc.h"
 
 static int clean_sysvipc_shm(uid_t delete_uid) {
         _cleanup_fclose_ FILE *f = NULL;
diff --git a/src/libshared/src/condition.c b/src/libsystemd-shared/src/condition.c
index 12d5faf493..1a0e68b696 100644
--- a/src/libshared/src/condition.c
+++ b/src/libsystemd-shared/src/condition.c
@@ -29,30 +29,30 @@
 
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/architecture.h"
-#include "basic/audit-util.h"
-#include "basic/cap-list.h"
-#include "basic/extract-word.h"
-#include "basic/fd-util.h"
-#include "basic/glob-util.h"
-#include "basic/hostname-util.h"
-#include "basic/list.h"
-#include "basic/macro.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/selinux-util.h"
-#include "basic/smack-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "basic/virt.h"
-#include "shared/apparmor-util.h"
-#include "shared/condition.h"
-#include "shared/ima-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/architecture.h"
+#include "systemd-basic/audit-util.h"
+#include "systemd-basic/cap-list.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/glob-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/smack-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/apparmor-util.h"
+#include "systemd-shared/condition.h"
+#include "systemd-shared/ima-util.h"
 
 Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) {
         Condition *c;
diff --git a/src/libshared/src/conf-parser.c b/src/libsystemd-shared/src/conf-parser.c
index 18a9b6332b..2a77261170 100644
--- a/src/libshared/src/conf-parser.c
+++ b/src/libsystemd-shared/src/conf-parser.c
@@ -25,24 +25,24 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "basic/alloc-util.h"
-#include "basic/conf-files.h"
-#include "basic/extract-word.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/syslog-util.h"
-#include "basic/time-util.h"
-#include "basic/utf8.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/syslog-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-shared/conf-parser.h"
 
 int config_item_table_lookup(
                 const void *table,
diff --git a/src/libshared/src/dev-setup.c b/src/libsystemd-shared/src/dev-setup.c
index 495099dc28..b8f68fcfd2 100644
--- a/src/libshared/src/dev-setup.c
+++ b/src/libsystemd-shared/src/dev-setup.c
@@ -21,13 +21,13 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/label.h"
-#include "basic/log.h"
-#include "basic/path-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "shared/dev-setup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/dev-setup.h"
 
 int dev_setup(const char *prefix, uid_t uid, gid_t gid) {
         static const char symlinks[] =
diff --git a/src/libshared/src/dns-domain.c b/src/libsystemd-shared/src/dns-domain.c
index 4d9088e78e..dadb1e53a6 100644
--- a/src/libshared/src/dns-domain.c
+++ b/src/libsystemd-shared/src/dns-domain.c
@@ -28,16 +28,16 @@
 #include <string.h>
 #include <sys/socket.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hashmap.h"
-#include "basic/hexdecoct.h"
-#include "basic/in-addr-util.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/utf8.h"
-#include "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-shared/dns-domain.h"
 
 int dns_label_unescape(const char **name, char *dest, size_t sz) {
         const char *n;
diff --git a/src/libshared/src/dropin.c b/src/libsystemd-shared/src/dropin.c
index ed044e0ba4..2fb64a7f2c 100644
--- a/src/libshared/src/dropin.c
+++ b/src/libsystemd-shared/src/dropin.c
@@ -23,21 +23,21 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/conf-files.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/fileio-label.h"
-#include "basic/hashmap.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/set.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "shared/dropin.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio-label.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/dropin.h"
 
 int drop_in_file(const char *dir, const char *unit, unsigned level,
                  const char *name, char **_p, char **_q) {
diff --git a/src/libshared/src/efivars.c b/src/libsystemd-shared/src/efivars.c
index 41247eac03..5bc5870ebf 100644
--- a/src/libshared/src/efivars.c
+++ b/src/libsystemd-shared/src/efivars.c
@@ -29,18 +29,18 @@
 
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/io-util.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/stdio-util.h"
-#include "basic/time-util.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
-#include "basic/virt.h"
-#include "shared/efivars.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-shared/efivars.h"
 
 #ifdef ENABLE_EFI
 
diff --git a/src/libshared/src/fdset.c b/src/libsystemd-shared/src/fdset.c
index 2988e4a9dc..5f89fc631f 100644
--- a/src/libshared/src/fdset.c
+++ b/src/libsystemd-shared/src/fdset.c
@@ -25,13 +25,13 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/set.h"
-#include "shared/fdset.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-shared/fdset.h"
 
 #define MAKE_SET(s) ((Set*) s)
 #define MAKE_FDSET(s) ((FDSet*) s)
diff --git a/src/libshared/src/fstab-util.c b/src/libsystemd-shared/src/fstab-util.c
index 3f301c6fe3..531fcb2f0e 100644
--- a/src/libshared/src/fstab-util.c
+++ b/src/libsystemd-shared/src/fstab-util.c
@@ -23,16 +23,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/device-nodes.h"
-#include "basic/macro.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "shared/fstab-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/device-nodes.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/fstab-util.h"
 
 bool fstab_is_mount_point(const char *mount) {
         _cleanup_endmntent_ FILE *f = NULL;
diff --git a/src/libshared/src/generator.c b/src/libsystemd-shared/src/generator.c
index 7e7c3fd78b..c720094cde 100644
--- a/src/libshared/src/generator.c
+++ b/src/libsystemd-shared/src/generator.c
@@ -20,22 +20,22 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/special.h"
-#include "basic/string-util.h"
-#include "basic/time-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
-#include "shared/dropin.h"
-#include "shared/fstab-util.h"
-#include "shared/generator.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.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/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/dropin.h"
+#include "systemd-shared/fstab-util.h"
+#include "systemd-shared/generator.h"
 
 static int write_fsck_sysroot_service(const char *dir, const char *what) {
         _cleanup_free_ char *device = NULL, *escaped = NULL;
diff --git a/src/libshared/src/ima-util.c b/src/libsystemd-shared/src/ima-util.c
index 74fa5e280d..5b591c0c10 100644
--- a/src/libshared/src/ima-util.c
+++ b/src/libsystemd-shared/src/ima-util.c
@@ -19,7 +19,7 @@
 
 #include <unistd.h>
 
-#include "shared/ima-util.h"
+#include "systemd-shared/ima-util.h"
 
 static int use_ima_cached = -1;
 
diff --git a/src/libshared/src/import-util.c b/src/libsystemd-shared/src/import-util.c
index 286cc1398a..a2f701acb5 100644
--- a/src/libshared/src/import-util.c
+++ b/src/libsystemd-shared/src/import-util.c
@@ -20,15 +20,15 @@
 #include <errno.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/path-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "shared/import-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/import-util.h"
 
 int import_url_last_component(const char *url, char **ret) {
         const char *e, *p;
diff --git a/src/libshared/src/install-printf.c b/src/libsystemd-shared/src/install-printf.c
index 2d62e3dfd2..0684e834fc 100644
--- a/src/libshared/src/install-printf.c
+++ b/src/libsystemd-shared/src/install-printf.c
@@ -22,13 +22,13 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/formats-util.h"
-#include "basic/macro.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
-#include "shared/install-printf.h"
-#include "shared/install.h"
-#include "shared/specifier.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/install-printf.h"
+#include "systemd-shared/install.h"
+#include "systemd-shared/specifier.h"
 
 static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) {
         UnitFileInstallInfo *i = userdata;
diff --git a/src/libshared/src/install.c b/src/libsystemd-shared/src/install.c
index 977fc2e486..eb502d2e41 100644
--- a/src/libshared/src/install.c
+++ b/src/libsystemd-shared/src/install.c
@@ -29,31 +29,31 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/conf-files.h"
-#include "basic/dirent-util.h"
-#include "basic/extract-word.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/hashmap.h"
-#include "basic/locale-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/rm-rf.h"
-#include "basic/set.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "shared/conf-parser.h"
-#include "shared/install-printf.h"
-#include "shared/install.h"
-#include "shared/path-lookup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.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/fs-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/install-printf.h"
+#include "systemd-shared/install.h"
+#include "systemd-shared/path-lookup.h"
 
 #define UNIT_FILE_FOLLOW_SYMLINK_MAX 64
 
diff --git a/src/libshared/src/logs-show.c b/src/libsystemd-shared/src/logs-show.c
index ca145f074d..cf43d2e3db 100644
--- a/src/libshared/src/logs-show.c
+++ b/src/libsystemd-shared/src/logs-show.c
@@ -31,26 +31,26 @@
 #include <systemd/sd-id128.h>
 #include <systemd/sd-journal.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/hashmap.h"
-#include "basic/hostname-util.h"
-#include "basic/io-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/sparse-endian.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/time-util.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
 #include "sd-journal/journal-internal.h"
-#include "shared/logs-show.h"
-#include "shared/output-mode.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-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/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/logs-show.h"
+#include "systemd-shared/output-mode.h"
 
 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */
 #define PRINT_LINE_THRESHOLD 3
diff --git a/src/libshared/src/machine-image.c b/src/libsystemd-shared/src/machine-image.c
index 28b096f538..bcf657d7d0 100644
--- a/src/libshared/src/machine-image.c
+++ b/src/libsystemd-shared/src/machine-image.c
@@ -29,28 +29,28 @@
 
 #include <linux/fs.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/chattr-util.h"
-#include "basic/copy.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/hashmap.h"
-#include "basic/lockfile-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/rm-rf.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/time-util.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
-#include "basic/xattr-util.h"
-#include "shared/machine-image.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/chattr-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/lockfile-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/xattr-util.h"
+#include "systemd-shared/machine-image.h"
 
 static const char image_search_path[] =
         "/var/lib/machines\0"
diff --git a/src/libshared/src/machine-pool.c b/src/libsystemd-shared/src/machine-pool.c
index 176bc24890..239b5233e8 100644
--- a/src/libshared/src/machine-pool.c
+++ b/src/libsystemd-shared/src/machine-pool.c
@@ -37,24 +37,24 @@
 #include <systemd/sd-bus-protocol.h>
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/lockfile-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "shared/machine-pool.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/lockfile-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/machine-pool.h"
 
 #define VAR_LIB_MACHINES_SIZE_START (1024UL*1024UL*500UL)
 #define VAR_LIB_MACHINES_FREE_MIN (1024UL*1024UL*750UL)
diff --git a/src/libshared/src/output-mode.c b/src/libsystemd-shared/src/output-mode.c
index f482b0fa06..bf24222692 100644
--- a/src/libshared/src/output-mode.c
+++ b/src/libsystemd-shared/src/output-mode.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-table.h"
-#include "shared/output-mode.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-shared/output-mode.h"
 
 static const char *const output_mode_table[_OUTPUT_MODE_MAX] = {
         [OUTPUT_SHORT] = "short",
diff --git a/src/libshared/src/pager.c b/src/libsystemd-shared/src/pager.c
index a019cf4ec7..7485771515 100644
--- a/src/libshared/src/pager.c
+++ b/src/libsystemd-shared/src/pager.c
@@ -27,16 +27,16 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
-#include "basic/copy.h"
-#include "basic/fd-util.h"
-#include "basic/locale-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "shared/pager.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-shared/pager.h"
 
 static pid_t pager_pid = 0;
 
diff --git a/src/libshared/src/path-lookup.c b/src/libsystemd-shared/src/path-lookup.c
index 7c692156f5..58a9408b87 100644
--- a/src/libshared/src/path-lookup.c
+++ b/src/libsystemd-shared/src/path-lookup.c
@@ -22,18 +22,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/rm-rf.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "shared/install.h"
-#include "shared/path-lookup.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/install.h"
+#include "systemd-shared/path-lookup.h"
 
 static int user_runtime_dir(char **ret, const char *suffix) {
         const char *e;
diff --git a/src/libshared/src/ptyfwd.c b/src/libsystemd-shared/src/ptyfwd.c
index cd6a360ae4..d98627cee1 100644
--- a/src/libshared/src/ptyfwd.c
+++ b/src/libsystemd-shared/src/ptyfwd.c
@@ -32,12 +32,12 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/time-util.h"
-#include "shared/ptyfwd.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-shared/ptyfwd.h"
 
 struct PTYForward {
         sd_event *event;
diff --git a/src/libshared/src/resolve-util.c b/src/libsystemd-shared/src/resolve-util.c
index 1f031e566d..ff49cdbccd 100644
--- a/src/libshared/src/resolve-util.c
+++ b/src/libsystemd-shared/src/resolve-util.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-table.h"
-#include "shared/conf-parser.h"
-#include "shared/resolve-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/resolve-util.h"
 
 DEFINE_CONFIG_PARSE_ENUM(config_parse_resolve_support, resolve_support, ResolveSupport, "Failed to parse resolve support setting");
 DEFINE_CONFIG_PARSE_ENUM(config_parse_dnssec_mode, dnssec_mode, DnssecMode, "Failed to parse DNSSEC mode setting");
diff --git a/src/libshared/src/seccomp-util.c b/src/libsystemd-shared/src/seccomp-util.c
index 6417df1e88..feaa2bc645 100644
--- a/src/libshared/src/seccomp-util.c
+++ b/src/libsystemd-shared/src/seccomp-util.c
@@ -21,9 +21,9 @@
 #include <seccomp.h>
 #include <stddef.h>
 
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "shared/seccomp-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/seccomp-util.h"
 
 const char* seccomp_arch_to_string(uint32_t c) {
 
diff --git a/src/libshared/src/sleep-config.c b/src/libsystemd-shared/src/sleep-config.c
index fd33763f68..7c23d762a9 100644
--- a/src/libshared/src/sleep-config.c
+++ b/src/libsystemd-shared/src/sleep-config.c
@@ -25,18 +25,18 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/env-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "shared/conf-parser.h"
-#include "shared/sleep-config.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/sleep-config.h"
 
 #define USE(x, y) do { (x) = (y); (y) = NULL; } while (0)
 
diff --git a/src/libshared/src/spawn-ask-password-agent.c b/src/libsystemd-shared/src/spawn-ask-password-agent.c
index 6c8aafcfb1..2ba48157d0 100644
--- a/src/libshared/src/spawn-ask-password-agent.c
+++ b/src/libsystemd-shared/src/spawn-ask-password-agent.c
@@ -21,10 +21,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "basic/log.h"
-#include "basic/process-util.h"
-#include "basic/util.h"
-#include "shared/spawn-ask-password-agent.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/spawn-ask-password-agent.h"
 
 static pid_t agent_pid = 0;
 
diff --git a/src/libshared/src/spawn-polkit-agent.c b/src/libsystemd-shared/src/spawn-polkit-agent.c
index cb191fb6c5..5f4f518abf 100644
--- a/src/libshared/src/spawn-polkit-agent.c
+++ b/src/libsystemd-shared/src/spawn-polkit-agent.c
@@ -23,15 +23,15 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/io-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/process-util.h"
-#include "basic/stdio-util.h"
-#include "basic/time-util.h"
-#include "basic/util.h"
-#include "shared/spawn-polkit-agent.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/spawn-polkit-agent.h"
 
 #ifdef ENABLE_POLKIT
 static pid_t agent_pid = 0;
diff --git a/src/libshared/src/specifier.c b/src/libsystemd-shared/src/specifier.c
index 42bd306e00..8946e08c6a 100644
--- a/src/libshared/src/specifier.c
+++ b/src/libsystemd-shared/src/specifier.c
@@ -26,11 +26,11 @@
 
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hostname-util.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "shared/specifier.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/specifier.h"
 
 /*
  * Generic infrastructure for replacing %x style specifiers in
diff --git a/src/libshared/src/switch-root.c b/src/libsystemd-shared/src/switch-root.c
index d41a114ae1..28bf14fbed 100644
--- a/src/libshared/src/switch-root.c
+++ b/src/libsystemd-shared/src/switch-root.c
@@ -26,18 +26,18 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/rm-rf.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "shared/base-filesystem.h"
-#include "shared/switch-root.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/base-filesystem.h"
+#include "systemd-shared/switch-root.h"
 
 int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot,  unsigned long mountflags) {
 
diff --git a/src/libshared/src/sysctl-util.c b/src/libsystemd-shared/src/sysctl-util.c
index 5dfe32a16b..89f0b51d20 100644
--- a/src/libshared/src/sysctl-util.c
+++ b/src/libsystemd-shared/src/sysctl-util.c
@@ -20,11 +20,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "shared/sysctl-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-shared/sysctl-util.h"
 
 char *sysctl_normalize(char *s) {
         char *n;
diff --git a/src/libshared/src/tests.c b/src/libsystemd-shared/src/tests.c
index 37f57ca18c..72176a36cd 100644
--- a/src/libshared/src/tests.c
+++ b/src/libsystemd-shared/src/tests.c
@@ -19,8 +19,8 @@
 
 #include <stdlib.h>
 
-#include "basic/util.h"
-#include "shared/tests.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/tests.h"
 
 char* setup_fake_runtime_dir(void) {
         char t[] = "/tmp/fake-xdg-runtime-XXXXXX", *p;
diff --git a/src/libshared/src/uid-range.c b/src/libsystemd-shared/src/uid-range.c
index 22cac34c6e..ec08299d02 100644
--- a/src/libshared/src/uid-range.c
+++ b/src/libsystemd-shared/src/uid-range.c
@@ -21,9 +21,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/macro.h"
-#include "basic/user-util.h"
-#include "shared/uid-range.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/uid-range.h"
 
 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) {
         assert(range);
diff --git a/src/libshared/src/utmp-wtmp.c b/src/libsystemd-shared/src/utmp-wtmp.c
index f10d7e9008..e0654ab15a 100644
--- a/src/libshared/src/utmp-wtmp.c
+++ b/src/libsystemd-shared/src/utmp-wtmp.c
@@ -29,17 +29,17 @@
 #include <unistd.h>
 #include <utmpx.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/hostname-util.h"
-#include "basic/macro.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/time-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "shared/utmp-wtmp.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/utmp-wtmp.h"
 
 int utmp_get_runlevel(int *runlevel, int *previous) {
         struct utmpx *found, lookup = { .ut_type = RUN_LVL };
diff --git a/src/libshared/src/vlan-util.c b/src/libsystemd-shared/src/vlan-util.c
index ccf60a0cb0..0b66e577ef 100644
--- a/src/libshared/src/vlan-util.c
+++ b/src/libsystemd-shared/src/vlan-util.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/parse-util.h"
-#include "shared/conf-parser.h"
-#include "shared/vlan-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/vlan-util.h"
 
 int parse_vlanid(const char *p, uint16_t *ret) {
         uint16_t id;
diff --git a/src/libshared/src/watchdog.c b/src/libsystemd-shared/src/watchdog.c
index c4e58c9577..95e327cea0 100644
--- a/src/libshared/src/watchdog.c
+++ b/src/libsystemd-shared/src/watchdog.c
@@ -25,10 +25,10 @@
 
 #include <linux/watchdog.h>
 
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/time-util.h"
-#include "shared/watchdog.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-shared/watchdog.h"
 
 static int watchdog_fd = -1;
 static usec_t watchdog_timeout = USEC_INFINITY;
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
index 7ee4688791..b8b8e01968 100644
--- a/src/libsystemd/Makefile
+++ b/src/libsystemd/Makefile
@@ -48,9 +48,7 @@ libsystemd_la_LDFLAGS = \
 	-Wl,--version-script=$(srcdir)/libsystemd.sym
 
 libsystemd_la_LIBADD = \
-	libsystemd-internal.la \
-	libbasic.la \
-	libsystemd-journal-internal.la
+	libsystemd-internal.la
 
 libsystemd_la_LIBADD = $(libsystemd-internal.DEPENDS)
 
diff --git a/src/libsystemd/src/sd-device/sd-device.h b/src/libsystemd/include-staging/systemd-staging/sd-device.h
index 5e32fc6110..5e32fc6110 100644
--- a/src/libsystemd/src/sd-device/sd-device.h
+++ b/src/libsystemd/include-staging/systemd-staging/sd-device.h
diff --git a/src/libsystemd/src/sd-hwdb/sd-hwdb.h b/src/libsystemd/include-staging/systemd-staging/sd-hwdb.h
index f46d7ad561..f46d7ad561 100644
--- a/src/libsystemd/src/sd-hwdb/sd-hwdb.h
+++ b/src/libsystemd/include-staging/systemd-staging/sd-hwdb.h
diff --git a/src/libsystemd/src/sd-netlink/sd-netlink.h b/src/libsystemd/include-staging/systemd-staging/sd-netlink.h
index 7db35e1756..7db35e1756 100644
--- a/src/libsystemd/src/sd-netlink/sd-netlink.h
+++ b/src/libsystemd/include-staging/systemd-staging/sd-netlink.h
diff --git a/src/libsystemd/src/sd-network/sd-network.h b/src/libsystemd/include-staging/systemd-staging/sd-network.h
index ac2660de45..ac2660de45 100644
--- a/src/libsystemd/src/sd-network/sd-network.h
+++ b/src/libsystemd/include-staging/systemd-staging/sd-network.h
diff --git a/src/libsystemd/src/sd-resolve/sd-resolve.h b/src/libsystemd/include-staging/systemd-staging/sd-resolve.h
index 1996ae401a..1996ae401a 100644
--- a/src/libsystemd/src/sd-resolve/sd-resolve.h
+++ b/src/libsystemd/include-staging/systemd-staging/sd-resolve.h
diff --git a/src/libsystemd/include/systemd/sd-bus.h b/src/libsystemd/include/systemd/sd-bus.h
index 779c4b07d3..4e338a3270 100644
--- a/src/libsystemd/include/systemd/sd-bus.h
+++ b/src/libsystemd/include/systemd/sd-bus.h
@@ -100,10 +100,10 @@ enum {
 /* Callbacks */
 
 typedef int (*sd_bus_message_handler_t)(sd_bus_message *m, void *userdata, sd_bus_error *ret_error);
+typedef int (*sd_bus_node_enumerator_t) (sd_bus *bus, const char *prefix, void *userdata, char ***ret_nodes, sd_bus_error *ret_error);
+typedef int (*sd_bus_object_find_t) (sd_bus *bus, const char *path, const char *interface, void *userdata, void **ret_found, sd_bus_error *ret_error);
 typedef int (*sd_bus_property_get_t) (sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *ret_error);
 typedef int (*sd_bus_property_set_t) (sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *value, void *userdata, sd_bus_error *ret_error);
-typedef int (*sd_bus_object_find_t) (sd_bus *bus, const char *path, const char *interface, void *userdata, void **ret_found, sd_bus_error *ret_error);
-typedef int (*sd_bus_node_enumerator_t) (sd_bus *bus, const char *prefix, void *userdata, char ***ret_nodes, sd_bus_error *ret_error);
 typedef int (*sd_bus_track_handler_t) (sd_bus_track *track, void *userdata);
 
 #include "sd-bus-protocol.h"
diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile
index 4554061f93..5907b378a4 100644
--- a/src/libsystemd/src/Makefile
+++ b/src/libsystemd/src/Makefile
@@ -79,6 +79,8 @@ _libsystemd_internal_la_SOURCES = \
 	src/libsystemd/sd-bus/kdbus.h \
 	src/libsystemd/sd-bus/bus-dump.c \
 	src/libsystemd/sd-bus/bus-dump.h \
+	src/libsystemd/sd-bus/bus-util.c \
+	src/libsystemd/sd-bus/bus-util.h \
 	src/libsystemd/sd-event/sd-event.c \
 	src/libsystemd/sd-netlink/sd-netlink.c \
 	src/libsystemd/sd-netlink/netlink-internal.h \
@@ -114,7 +116,7 @@ _libsystemd_internal_la_SOURCES = \
 libsystemd_internal_la_LIBADD = \
 	-lresolv
 
-noinst_LTLIBRARIES += \
+rootlibexec_LTLIBRARIES += \
 	libsystemd-internal.la
 
 _libsystemd_journal_internal_la_SOURCES = \
@@ -138,9 +140,7 @@ _libsystemd_journal_internal_la_SOURCES = \
 	src/journal/mmap-cache.h \
 	src/journal/compress.c \
 	src/journal/audit-type.h \
-	src/journal/audit-type.c \
-	src/shared/gcrypt-util.h \
-	src/shared/gcrypt-util.c
+	src/journal/audit-type.c
 
 #nodist_libsystemd_journal_internal_la_SOURCES = \
 	src/journal/audit_type-to-name.h
@@ -199,6 +199,10 @@ sd.libsystemd_SOURCES += $(patsubst src/libsystemd/%,%,$(filter %.c,$(_libsystem
 sd.libsystemd_SOURCES += $(addprefix sd-journal/,$(notdir $(filter %.c,$(_libsystemd_journal_internal_la_SOURCES))))
 $(outdir)/libsystemd-internal.la: $(addprefix $(outdir)/,$(sd.libsystemd_SOURCES:.c=.lo))
 
+libsystemd_internal_la_LIBADD += \
+	libsystemd-basic.la \
+	libsystemd-gcrypt.la
+
 nested.subdirs += sd-bus
 nested.subdirs += sd-daemon
 nested.subdirs += sd-device
diff --git a/src/libsystemd/src/sd-bus/Makefile b/src/libsystemd/src/sd-bus/Makefile
index 71a1159ce0..a483e31fd1 120000..100644
--- a/src/libsystemd/src/sd-bus/Makefile
+++ b/src/libsystemd/src/sd-bus/Makefile
@@ -1 +1,30 @@
-../subdir.mk
\ No newline at end of file
+#  -*- 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
+
+sd.CPPFLAGS += $(libsystemd.CPPFLAGS)
+sd.CPPFLAGS += $(libsystemd-basic.CPPFLAGS)
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/sd-bus/bus-bloom.c b/src/libsystemd/src/sd-bus/bus-bloom.c
index 9327fb40c7..7441c1a7aa 100644
--- a/src/libsystemd/src/sd-bus/bus-bloom.c
+++ b/src/libsystemd/src/sd-bus/bus-bloom.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/siphash24.h"
-#include "basic/util.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/util.h"
 
 #include "bus-bloom.h"
 
diff --git a/src/libsystemd/src/sd-bus/bus-container.c b/src/libsystemd/src/sd-bus/bus-container.c
index 43b9d03aa9..2f91ffc8dd 100644
--- a/src/libsystemd/src/sd-bus/bus-container.c
+++ b/src/libsystemd/src/sd-bus/bus-container.c
@@ -20,9 +20,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/process-util.h"
-#include "basic/util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/util.h"
 
 #include "bus-container.h"
 #include "bus-internal.h"
diff --git a/src/libsystemd/src/sd-bus/bus-control.c b/src/libsystemd/src/sd-bus/bus-control.c
index 689b70bc60..606cdc44ba 100644
--- a/src/libsystemd/src/sd-bus/bus-control.c
+++ b/src/libsystemd/src/sd-bus/bus-control.c
@@ -26,18 +26,18 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-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"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
 
 #include "bus-bloom.h"
 #include "bus-control.h"
 #include "bus-internal.h"
 #include "bus-message.h"
+#include "bus-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 f76cbaf3d3..e6a92679cf 100644
--- a/src/libsystemd/src/sd-bus/bus-convenience.c
+++ b/src/libsystemd/src/sd-bus/bus-convenience.c
@@ -17,13 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/string-util.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-signature.h"
 #include "bus-type.h"
+#include "bus-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 bc5a82fac4..3b4ebe9ee0 100644
--- a/src/libsystemd/src/sd-bus/bus-creds.c
+++ b/src/libsystemd/src/sd-bus/bus-creds.c
@@ -21,26 +21,26 @@
 
 #include <linux/capability.h>
 
-#include "basic/alloc-util.h"
-#include "basic/audit-util.h"
-#include "basic/bus-label.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"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/audit-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "bus-creds.h"
 #include "bus-message.h"
+#include "bus-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 cec53d75e5..447aa5d9d7 100644
--- a/src/libsystemd/src/sd-bus/bus-dump.c
+++ b/src/libsystemd/src/sd-bus/bus-dump.c
@@ -17,17 +17,17 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cap-list.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
 
 #include "bus-dump.h"
 #include "bus-internal.h"
diff --git a/src/libsystemd/src/sd-bus/bus-error.c b/src/libsystemd/src/sd-bus/bus-error.c
index 616d784590..d6b45c47bc 100644
--- a/src/libsystemd/src/sd-bus/bus-error.c
+++ b/src/libsystemd/src/sd-bus/bus-error.c
@@ -26,10 +26,10 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/errno-list.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/errno-list.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "bus-error.h"
 
diff --git a/src/libsystemd/src/sd-bus/bus-error.h b/src/libsystemd/src/sd-bus/bus-error.h
index 0693d9c68c..308cf92f24 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 "basic/macro.h"
+#include "systemd-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 d9468ee9a8..45afe01631 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 "basic/macro.h"
+#include "systemd-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 8dc441227a..bd63e453e4 100644
--- a/src/libsystemd/src/sd-bus/bus-internal.c
+++ b/src/libsystemd/src/sd-bus/bus-internal.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/string-util.h"
 
 #include "bus-internal.h"
 #include "bus-message.h"
diff --git a/src/libsystemd/src/sd-bus/bus-internal.h b/src/libsystemd/src/sd-bus/bus-internal.h
index e02df7981d..6e74da3283 100644
--- a/src/libsystemd/src/sd-bus/bus-internal.h
+++ b/src/libsystemd/src/sd-bus/bus-internal.h
@@ -24,12 +24,12 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/hashmap.h"
-#include "basic/list.h"
-#include "basic/prioq.h"
-#include "basic/refcnt.h"
-#include "basic/socket-util.h"
-#include "basic/util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/prioq.h"
+#include "systemd-basic/refcnt.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/util.h"
 
 #include "bus-error.h"
 #include "bus-kernel.h"
diff --git a/src/libsystemd/src/sd-bus/bus-introspect.c b/src/libsystemd/src/sd-bus/bus-introspect.c
index 835b5e3909..85400c865f 100644
--- a/src/libsystemd/src/sd-bus/bus-introspect.c
+++ b/src/libsystemd/src/sd-bus/bus-introspect.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "bus-internal.h"
 #include "bus-introspect.h"
diff --git a/src/libsystemd/src/sd-bus/bus-introspect.h b/src/libsystemd/src/sd-bus/bus-introspect.h
index af4ae10682..4a83e2aa38 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 "basic/set.h"
+#include "systemd-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 9d767340b6..3321a54a51 100644
--- a/src/libsystemd/src/sd-bus/bus-kernel.c
+++ b/src/libsystemd/src/sd-bus/bus-kernel.c
@@ -32,25 +32,25 @@
 #include <libgen.h>
 #undef basename
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.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"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/memfd-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "bus-bloom.h"
 #include "bus-internal.h"
 #include "bus-kernel.h"
 #include "bus-message.h"
+#include "bus-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 185867679e..37a391b46a 100644
--- a/src/libsystemd/src/sd-bus/bus-match.c
+++ b/src/libsystemd/src/sd-bus/bus-match.c
@@ -17,17 +17,17 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/hexdecoct.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
 
 #include "bus-internal.h"
 #include "bus-match.h"
 #include "bus-message.h"
+#include "bus-util.h"
 
 /* Example:
  *
diff --git a/src/libsystemd/src/sd-bus/bus-match.h b/src/libsystemd/src/sd-bus/bus-match.h
index a85abcb377..54b40d5be8 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 "basic/hashmap.h"
+#include "systemd-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 7fa5e822e0..181f6bccb2 100644
--- a/src/libsystemd/src/sd-bus/bus-message.c
+++ b/src/libsystemd/src/sd-bus/bus-message.c
@@ -23,22 +23,22 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-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"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/memfd-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/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"
 
 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 35116c3803..93bbb9b00d 100644
--- a/src/libsystemd/src/sd-bus/bus-message.h
+++ b/src/libsystemd/src/sd-bus/bus-message.h
@@ -25,8 +25,8 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/macro.h"
-#include "basic/time-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/time-util.h"
 
 #include "bus-creds.h"
 #include "bus-protocol.h"
diff --git a/src/libsystemd/src/sd-bus/bus-objects.c b/src/libsystemd/src/sd-bus/bus-objects.c
index a56b7e8d7e..a732a0a928 100644
--- a/src/libsystemd/src/sd-bus/bus-objects.c
+++ b/src/libsystemd/src/sd-bus/bus-objects.c
@@ -17,11 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/set.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
 
 #include "bus-internal.h"
 #include "bus-introspect.h"
@@ -30,6 +29,7 @@
 #include "bus-signature.h"
 #include "bus-slot.h"
 #include "bus-type.h"
+#include "bus-util.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 931dc21c46..732b512d3f 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 "basic/macro.h"
+#include "systemd-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 c11b113186..4e7cf02ec1 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 "basic/util.h"
+#include "systemd-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 ebac784433..ffe992013a 100644
--- a/src/libsystemd/src/sd-bus/bus-slot.c
+++ b/src/libsystemd/src/sd-bus/bus-slot.c
@@ -19,8 +19,8 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "bus-control.h"
 #include "bus-objects.h"
diff --git a/src/libsystemd/src/sd-bus/bus-socket.c b/src/libsystemd/src/sd-bus/bus-socket.c
index b5fd60cf24..9beb7dffb3 100644
--- a/src/libsystemd/src/sd-bus/bus-socket.c
+++ b/src/libsystemd/src/sd-bus/bus-socket.c
@@ -25,19 +25,19 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
 
 #include "bus-internal.h"
 #include "bus-message.h"
diff --git a/src/libsystemd/src/sd-bus/bus-track.c b/src/libsystemd/src/sd-bus/bus-track.c
index 24c3a7050d..86b321bdea 100644
--- a/src/libsystemd/src/sd-bus/bus-track.c
+++ b/src/libsystemd/src/sd-bus/bus-track.c
@@ -19,11 +19,11 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
 
 #include "bus-internal.h"
 #include "bus-track.h"
+#include "bus-util.h"
 
 struct sd_bus_track {
         unsigned n_ref;
diff --git a/src/libsystemd/src/sd-bus/bus-type.h b/src/libsystemd/src/sd-bus/bus-type.h
index d81aa20df3..a9cfa6ef36 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 "basic/macro.h"
+#include "systemd-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/libshared/src/bus-util.c b/src/libsystemd/src/sd-bus/bus-util.c
index d5eb857b85..c82390634e 100644
--- a/src/libshared/src/bus-util.c
+++ b/src/libsystemd/src/sd-bus/bus-util.c
@@ -34,21 +34,22 @@
 #include <systemd/sd-event.h>
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.h"
-#include "basic/def.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/rlimit-util.h"
-#include "basic/stdio-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "sd-bus/bus-internal.h"
-#include "sd-bus/bus-message.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/rlimit-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+
+#include "bus-internal.h"
+#include "bus-message.h"
+#include "bus-util.h"
 
 static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
         sd_event *e = userdata;
diff --git a/src/libshared/include/shared/bus-util.h b/src/libsystemd/src/sd-bus/bus-util.h
index 71237e9fc1..6b45fad3ce 100644
--- a/src/libshared/include/shared/bus-util.h
+++ b/src/libsystemd/src/sd-bus/bus-util.h
@@ -27,9 +27,9 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-#include "basic/hashmap.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
 
 typedef enum BusTransport {
         BUS_TRANSPORT_LOCAL,
diff --git a/src/libsystemd/src/sd-bus/sd-bus.c b/src/libsystemd/src/sd-bus/sd-bus.c
index 83a021e2f5..52d3e8f2b3 100644
--- a/src/libsystemd/src/sd-bus/sd-bus.c
+++ b/src/libsystemd/src/sd-bus/sd-bus.c
@@ -27,20 +27,19 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.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"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 #include "bus-container.h"
 #include "bus-control.h"
@@ -53,6 +52,7 @@
 #include "bus-socket.h"
 #include "bus-track.h"
 #include "bus-type.h"
+#include "bus-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 c8f0d11b84..4561e830c7 100644
--- a/src/libsystemd/src/sd-bus/test-bus-benchmark.c
+++ b/src/libsystemd/src/sd-bus/test-bus-benchmark.c
@@ -21,15 +21,15 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/time-util.h"
-#include "basic/util.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/util.h"
 
 #include "bus-internal.h"
 #include "bus-kernel.h"
+#include "bus-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 8f3e88a7c0..6dc643c173 100644
--- a/src/libsystemd/src/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/src/sd-bus/test-bus-chat.c
@@ -24,17 +24,17 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/util.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/util.h"
 
 #include "bus-error.h"
 #include "bus-internal.h"
 #include "bus-match.h"
+#include "bus-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 f4b9f96c03..1a461032cc 100644
--- a/src/libsystemd/src/sd-bus/test-bus-cleanup.c
+++ b/src/libsystemd/src/sd-bus/test-bus-cleanup.c
@@ -21,11 +21,11 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/refcnt.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/refcnt.h"
 
 #include "bus-internal.h"
 #include "bus-message.h"
+#include "bus-util.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 125d7db810..fd226e06d2 100644
--- a/src/libsystemd/src/sd-bus/test-bus-creds.c
+++ b/src/libsystemd/src/sd-bus/test-bus-creds.c
@@ -19,10 +19,10 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/cgroup-util.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/cgroup-util.h"
 
 #include "bus-dump.h"
+#include "bus-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 2d0aa92c6c..dbc120b4df 100644
--- a/src/libsystemd/src/sd-bus/test-bus-error.c
+++ b/src/libsystemd/src/sd-bus/test-bus-error.c
@@ -19,11 +19,11 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/errno-list.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/errno-list.h"
 
 #include "bus-common-errors.h"
 #include "bus-error.h"
+#include "bus-util.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 5fdf8e661c..ca396bd426 100644
--- a/src/libsystemd/src/sd-bus/test-bus-gvariant.c
+++ b/src/libsystemd/src/sd-bus/test-bus-gvariant.c
@@ -23,15 +23,15 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/macro.h"
-#include "basic/util.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/util.h"
 
 #include "bus-dump.h"
 #include "bus-gvariant.h"
 #include "bus-internal.h"
 #include "bus-message.h"
+#include "bus-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 517e3668ae..76a33fee67 100644
--- a/src/libsystemd/src/sd-bus/test-bus-introspect.c
+++ b/src/libsystemd/src/sd-bus/test-bus-introspect.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/log.h"
+#include "systemd-basic/log.h"
 
 #include "bus-introspect.h"
 
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 cb8c41b792..ace45d770d 100644
--- a/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c
+++ b/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c
@@ -19,13 +19,13 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/util.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/util.h"
 
 #include "bus-kernel.h"
+#include "bus-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 871bf2e62c..040bfe0dcf 100644
--- a/src/libsystemd/src/sd-bus/test-bus-kernel.c
+++ b/src/libsystemd/src/sd-bus/test-bus-kernel.c
@@ -21,14 +21,14 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/util.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/util.h"
 
 #include "bus-dump.h"
 #include "bus-kernel.h"
+#include "bus-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 4d8f22b042..9c66ba4538 100644
--- a/src/libsystemd/src/sd-bus/test-bus-marshal.c
+++ b/src/libsystemd/src/sd-bus/test-bus-marshal.c
@@ -30,16 +30,16 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/bus-label.h"
-#include "basic/fd-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/log.h"
-#include "basic/util.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/bus-label.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/util.h"
 
 #include "bus-dump.h"
 #include "bus-message.h"
+#include "bus-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 e50cebcdc6..bedc4d41bd 100644
--- a/src/libsystemd/src/sd-bus/test-bus-match.c
+++ b/src/libsystemd/src/sd-bus/test-bus-match.c
@@ -17,13 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
 
 #include "bus-match.h"
 #include "bus-message.h"
 #include "bus-slot.h"
+#include "bus-util.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 1c6e28e76e..379c6f85ee 100644
--- a/src/libsystemd/src/sd-bus/test-bus-objects.c
+++ b/src/libsystemd/src/sd-bus/test-bus-objects.c
@@ -22,16 +22,16 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 #include "bus-dump.h"
 #include "bus-internal.h"
 #include "bus-message.h"
+#include "bus-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 9ffefa6cd0..ce78faaefb 100644
--- a/src/libsystemd/src/sd-bus/test-bus-server.c
+++ b/src/libsystemd/src/sd-bus/test-bus-server.c
@@ -22,12 +22,12 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/util.h"
-#include "shared/bus-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/util.h"
 
 #include "bus-internal.h"
+#include "bus-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 c08999b8e1..ae50f50f08 100644
--- a/src/libsystemd/src/sd-bus/test-bus-signature.c
+++ b/src/libsystemd/src/sd-bus/test-bus-signature.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/log.h"
-#include "basic/string-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/string-util.h"
 
 #include "bus-internal.h"
 #include "bus-signature.h"
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 ac453e5887..32ff9c0364 100644
--- a/src/libsystemd/src/sd-bus/test-bus-zero-copy.c
+++ b/src/libsystemd/src/sd-bus/test-bus-zero-copy.c
@@ -21,12 +21,12 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/memfd-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "bus-dump.h"
 #include "bus-kernel.h"
diff --git a/src/libsystemd/src/sd-daemon/sd-daemon.c b/src/libsystemd/src/sd-daemon/sd-daemon.c
index e848c16212..1424d60a78 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 "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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 #define SNDBUF_SIZE (8*1024*1024)
 
diff --git a/src/libsystemd/src/sd-device/device-enumerator-private.h b/src/libsystemd/src/sd-device/device-enumerator-private.h
index eb06f9542d..7bf39d188a 100644
--- a/src/libsystemd/src/sd-device/device-enumerator-private.h
+++ b/src/libsystemd/src/sd-device/device-enumerator-private.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-device.h"
+#include "systemd-staging/sd-device.h"
 
 int device_enumerator_scan_devices(sd_device_enumerator *enumeartor);
 int device_enumerator_scan_subsystems(sd_device_enumerator *enumeartor);
diff --git a/src/libsystemd/src/sd-device/device-enumerator.c b/src/libsystemd/src/sd-device/device-enumerator.c
index 4e0edb6573..b4577a5a39 100644
--- a/src/libsystemd/src/sd-device/device-enumerator.c
+++ b/src/libsystemd/src/sd-device/device-enumerator.c
@@ -18,18 +18,18 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/prioq.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-device.h"
 
 #include "device-enumerator-private.h"
 #include "device-util.h"
-#include "sd-device.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 04384c66c5..c23e329ed4 100644
--- a/src/libsystemd/src/sd-device/device-internal.h
+++ b/src/libsystemd/src/sd-device/device-internal.h
@@ -20,10 +20,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/hashmap.h"
-#include "basic/set.h"
-
-#include "sd-device.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/set.h"
+#include "systemd-staging/sd-device.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 bf028fbbc6..03c04b5eae 100644
--- a/src/libsystemd/src/sd-device/device-private.c
+++ b/src/libsystemd/src/sd-device/device-private.c
@@ -22,28 +22,28 @@
 #include <net/if.h>
 #include <sys/types.h>
 
-#include "basic/alloc-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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/refcnt.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/strxcpyx.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-device.h"
 
 #include "device-internal.h"
 #include "device-private.h"
 #include "device-util.h"
-#include "sd-device.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-private.h b/src/libsystemd/src/sd-device/device-private.h
index 29b3e155fb..504507e3cb 100644
--- a/src/libsystemd/src/sd-device/device-private.h
+++ b/src/libsystemd/src/sd-device/device-private.h
@@ -23,7 +23,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "sd-device.h"
+#include "systemd-staging/sd-device.h"
 
 int device_new_from_nulstr(sd_device **ret, uint8_t *nulstr, size_t len);
 int device_new_from_strv(sd_device **ret, char **strv);
diff --git a/src/libsystemd/src/sd-device/device-util.h b/src/libsystemd/src/sd-device/device-util.h
index a8aca6d8f4..40bfa62de1 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 "basic/util.h"
+#include "systemd-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 79c2c2caeb..3f7e21af96 100644
--- a/src/libsystemd/src/sd-device/sd-device.c
+++ b/src/libsystemd/src/sd-device/sd-device.c
@@ -22,25 +22,25 @@
 #include <net/if.h>
 #include <sys/types.h>
 
-#include "basic/alloc-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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/strxcpyx.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-device.h"
 
 #include "device-internal.h"
 #include "device-private.h"
 #include "device-util.h"
-#include "sd-device.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 495e97eea2..3dcf70999c 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 "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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/prioq.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-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 10395f155f..7c1289423f 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 "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/signal-util.h"
-#include "basic/util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-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/Makefile b/src/libsystemd/src/sd-hwdb/Makefile
index 71a1159ce0..a2696e2976 120000..100644
--- a/src/libsystemd/src/sd-hwdb/Makefile
+++ b/src/libsystemd/src/sd-hwdb/Makefile
@@ -1 +1,32 @@
-../subdir.mk
\ No newline at end of file
+#  -*- 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
+
+sd.CPPFLAGS += $(libsystemd.CPPFLAGS)
+sd.CPPFLAGS += $(libsystemd-staging.CPPFLAGS)
+sd.CPPFLAGS += $(libsystemd-basic.CPPFLAGS)
+sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/sd-hwdb/hwdb-internal.h b/src/libsystemd/src/sd-hwdb/hwdb-internal.h
index 7b32bbd11d..35d4378122 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 "basic/sparse-endian.h"
-#include "basic/util.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-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 c8c0a4938e..5585965c83 100644
--- a/src/libsystemd/src/sd-hwdb/hwdb-util.h
+++ b/src/libsystemd/src/sd-hwdb/hwdb-util.h
@@ -19,8 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/util.h"
-
-#include "sd-hwdb.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-hwdb.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 a48c7af124..0891719604 100644
--- a/src/libsystemd/src/sd-hwdb/sd-hwdb.c
+++ b/src/libsystemd/src/sd-hwdb/sd-hwdb.c
@@ -27,15 +27,15 @@
 #include <string.h>
 #include <sys/mman.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/hashmap.h"
-#include "basic/refcnt.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/refcnt.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-staging/sd-hwdb.h"
 
 #include "hwdb-internal.h"
 #include "hwdb-util.h"
-#include "sd-hwdb.h"
 
 struct sd_hwdb {
         RefCount n_ref;
diff --git a/src/libsystemd/src/sd-id128/id128-util.c b/src/libsystemd/src/sd-id128/id128-util.c
index a9c43f9730..cd32543d0c 100644
--- a/src/libsystemd/src/sd-id128/id128-util.c
+++ b/src/libsystemd/src/sd-id128/id128-util.c
@@ -20,10 +20,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/io-util.h"
-#include "basic/stdio-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/stdio-util.h"
 
 #include "id128-util.h"
 
diff --git a/src/libsystemd/src/sd-id128/id128-util.h b/src/libsystemd/src/sd-id128/id128-util.h
index d45c556746..0c57d693e5 100644
--- a/src/libsystemd/src/sd-id128/id128-util.h
+++ b/src/libsystemd/src/sd-id128/id128-util.h
@@ -23,7 +23,7 @@
 
 #include <systemd/sd-id128.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 char *id128_to_uuid_string(sd_id128_t id, char s[37]);
 
diff --git a/src/libsystemd/src/sd-id128/sd-id128.c b/src/libsystemd/src/sd-id128/sd-id128.c
index 06fbe32f62..9c036fb4cb 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 "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"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/util.h"
 
 #include "id128-util.h"
 
diff --git a/src/libsystemd/src/sd-journal/Makefile b/src/libsystemd/src/sd-journal/Makefile
index f13c2b51fa..38a3458f4b 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/include/basic/missing.h
+audit_list_includes = -include linux/audit.h -include $(topsrcdir)/src/libsystemd-basic/include/systemd-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/include/basic/missing.h)
+$(outdir)/audit_type-list.txt: $(call at.path,$(topsrcdir)/src/libsystemd-basic/include/systemd-basic/missing.h)
 	$(AM_V_GEN)$(CPP) $(sd.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
@@ -37,8 +37,11 @@ $(outdir)/audit_type-to-name.h: $(outdir)/audit_type-list.txt
 # fsprg.c is a drop-in file using void pointer arithmetic
 $(outdir)/fsprg.lo: sd.ALL_CFLAGS += -Wno-pointer-arith
 
-sd.CPPFLAGS += $(libbasic.CPPFLAGS)
-sd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\"
 $(outdir)/audit-type.lo: $(outdir)/audit_type-to-name.h
 
+sd.CPPFLAGS += $(libsystemd.CPPFLAGS)
+sd.CPPFLAGS += $(libsystemd-basic.CPPFLAGS)
+sd.CPPFLAGS += $(libsystemd-gcrypt.CPPFLAGS)
+sd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/sd-journal/audit-type.c b/src/libsystemd/src/sd-journal/audit-type.c
index f4dd1e9417..1644e3f1b1 100644
--- a/src/libsystemd/src/sd-journal/audit-type.c
+++ b/src/libsystemd/src/sd-journal/audit-type.c
@@ -24,8 +24,8 @@
 #  include <libaudit.h>
 #endif
 
-#include "basic/macro.h"
-#include "basic/missing.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
 
 #include "audit-type.h"
 #include "audit_type-to-name.h"
diff --git a/src/libsystemd/src/sd-journal/audit-type.h b/src/libsystemd/src/sd-journal/audit-type.h
index 8b96e2e466..0b4748b01f 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 "basic/macro.h"
+#include "systemd-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 7dc02deb49..fce4649f6f 100644
--- a/src/libsystemd/src/sd-journal/catalog.c
+++ b/src/libsystemd/src/sd-journal/catalog.c
@@ -27,20 +27,20 @@
 
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-basic/strbuf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 #include "catalog.h"
 
diff --git a/src/libsystemd/src/sd-journal/catalog.h b/src/libsystemd/src/sd-journal/catalog.h
index fa60757723..49fec555a4 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 "basic/hashmap.h"
-#include "basic/strbuf.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-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 a96d93c455..c6c5f3c500 100644
--- a/src/libsystemd/src/sd-journal/compress.c
+++ b/src/libsystemd/src/sd-journal/compress.c
@@ -32,14 +32,14 @@
 #include <lz4frame.h>
 #endif
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/io-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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "compress.h"
 #include "journal-def.h"
diff --git a/src/libsystemd/src/sd-journal/fsprg.c b/src/libsystemd/src/sd-journal/fsprg.c
index 612b10f3a9..c0f59b28fd 100644
--- a/src/libsystemd/src/sd-journal/fsprg.c
+++ b/src/libsystemd/src/sd-journal/fsprg.c
@@ -29,8 +29,9 @@
 #include <gcrypt.h>
 #include <string.h>
 
+#include "systemd-gcrypt/gcrypt-util.h"
+
 #include "fsprg.h"
-#include "gcrypt-util.h"
 
 #define ISVALID_SECPAR(secpar) (((secpar) % 16 == 0) && ((secpar) >= 16) && ((secpar) <= 16384))
 #define VALIDATE_SECPAR(secpar) assert(ISVALID_SECPAR(secpar));
diff --git a/src/libsystemd/src/sd-journal/fsprg.h b/src/libsystemd/src/sd-journal/fsprg.h
index ef6d34fb4e..15a4e04fe8 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 "basic/macro.h"
-#include "basic/util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/util.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/libsystemd/src/sd-journal/gcrypt-util.c b/src/libsystemd/src/sd-journal/gcrypt-util.c
deleted file mode 120000
index 56bb2382a6..0000000000
--- a/src/libsystemd/src/sd-journal/gcrypt-util.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../libshared/src/gcrypt-util.c
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-journal/gcrypt-util.h b/src/libsystemd/src/sd-journal/gcrypt-util.h
deleted file mode 120000
index c1168ad265..0000000000
--- a/src/libsystemd/src/sd-journal/gcrypt-util.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../libshared/include/shared/gcrypt-util.h
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-journal/journal-authenticate.c b/src/libsystemd/src/sd-journal/journal-authenticate.c
index 5400d38ffd..f3a207d88d 100644
--- a/src/libsystemd/src/sd-journal/journal-authenticate.c
+++ b/src/libsystemd/src/sd-journal/journal-authenticate.c
@@ -20,11 +20,11 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#include "basic/fd-util.h"
-#include "basic/hexdecoct.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-gcrypt/gcrypt-util.h"
 
 #include "fsprg.h"
-#include "gcrypt-util.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 86c843905a..1c604487fb 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 "basic/macro.h"
-#include "basic/sparse-endian.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/sparse-endian.h"
 
 /*
  * If you change this file you probably should also change its documentation:
@@ -32,20 +32,16 @@
  */
 
 typedef struct Header Header;
-
 typedef struct ObjectHeader ObjectHeader;
 typedef union Object Object;
-
 typedef struct DataObject DataObject;
 typedef struct FieldObject FieldObject;
 typedef struct EntryObject EntryObject;
 typedef struct HashTableObject HashTableObject;
 typedef struct EntryArrayObject EntryArrayObject;
 typedef struct TagObject TagObject;
-
 typedef struct EntryItem EntryItem;
 typedef struct HashItem HashItem;
-
 typedef struct FSSHeader FSSHeader;
 
 /* Object types */
diff --git a/src/libsystemd/src/sd-journal/journal-file.c b/src/libsystemd/src/sd-journal/journal-file.c
index d8f4671617..7910270925 100644
--- a/src/libsystemd/src/sd-journal/journal-file.c
+++ b/src/libsystemd/src/sd-journal/journal-file.c
@@ -30,16 +30,16 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/chattr-util.h"
-#include "basic/fd-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/random-util.h"
-#include "basic/set.h"
-#include "basic/string-util.h"
-#include "basic/xattr-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/chattr-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/xattr-util.h"
 
 #include "compress.h"
 #include "journal-authenticate.h"
diff --git a/src/libsystemd/src/sd-journal/journal-file.h b/src/libsystemd/src/sd-journal/journal-file.h
index daafc8ae0d..054fe5794b 100644
--- a/src/libsystemd/src/sd-journal/journal-file.h
+++ b/src/libsystemd/src/sd-journal/journal-file.h
@@ -28,9 +28,9 @@
 #include <systemd/sd-event.h>
 #include <systemd/sd-id128.h>
 
-#include "basic/hashmap.h"
-#include "basic/macro.h"
-#include "basic/sparse-endian.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/sparse-endian.h"
 
 #include "journal-def.h"
 #include "mmap-cache.h"
diff --git a/src/libsystemd/src/sd-journal/journal-internal.h b/src/libsystemd/src/sd-journal/journal-internal.h
index e249a8b979..83f38b51ed 100644
--- a/src/libsystemd/src/sd-journal/journal-internal.h
+++ b/src/libsystemd/src/sd-journal/journal-internal.h
@@ -26,9 +26,9 @@
 #include <systemd/sd-id128.h>
 #include <systemd/sd-journal.h>
 
-#include "basic/hashmap.h"
-#include "basic/list.h"
-#include "basic/set.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/set.h"
 
 #include "journal-def.h"
 #include "journal-file.h"
diff --git a/src/libsystemd/src/sd-journal/journal-send.c b/src/libsystemd/src/sd-journal/journal-send.c
index 180311009c..c168902e9a 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 "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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/memfd-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-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 a3ebf9b029..4bbe3ee800 100644
--- a/src/libsystemd/src/sd-journal/journal-vacuum.c
+++ b/src/libsystemd/src/sd-journal/journal-vacuum.c
@@ -23,13 +23,13 @@
 
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "basic/xattr-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/xattr-util.h"
 
 #include "journal-def.h"
 #include "journal-file.h"
diff --git a/src/libsystemd/src/sd-journal/journal-vacuum.h b/src/libsystemd/src/sd-journal/journal-vacuum.h
index c7b38e2da9..1e76aa856d 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 "basic/time-util.h"
+#include "systemd-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 bb890273b3..de75cc94ef 100644
--- a/src/libsystemd/src/sd-journal/journal-verify.c
+++ b/src/libsystemd/src/sd-journal/journal-verify.c
@@ -22,13 +22,13 @@
 #include <sys/mman.h>
 #include <unistd.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/terminal-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
 
 #include "compress.h"
 #include "journal-authenticate.h"
diff --git a/src/libsystemd/src/sd-journal/lookup3.h b/src/libsystemd/src/sd-journal/lookup3.h
index 28ab5ca4f5..0c8c0b0ae4 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 "basic/macro.h"
+#include "systemd-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 bda21aed05..2fdb445f3f 100644
--- a/src/libsystemd/src/sd-journal/mmap-cache.c
+++ b/src/libsystemd/src/sd-journal/mmap-cache.c
@@ -21,14 +21,14 @@
 #include <stdlib.h>
 #include <sys/mman.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 "basic/sigbus.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/sigbus.h"
+#include "systemd-basic/util.h"
 
 #include "mmap-cache.h"
 
diff --git a/src/libsystemd/src/sd-journal/sd-journal.c b/src/libsystemd/src/sd-journal/sd-journal.c
index 1a4b0c6418..58307e1626 100644
--- a/src/libsystemd/src/sd-journal/sd-journal.c
+++ b/src/libsystemd/src/sd-journal/sd-journal.c
@@ -30,23 +30,23 @@
 
 #include <systemd/sd-journal.h>
 
-#include "basic/alloc-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 "basic/list.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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/dirent-util.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/list.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/replace-var.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
 
 #include "catalog.h"
 #include "compress.h"
diff --git a/src/libsystemd/src/sd-login/sd-login.c b/src/libsystemd/src/sd-login/sd-login.c
index 2698dc5c2b..9be4ec6c39 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 "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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-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/formats-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/login-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-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 bec645242a..348ce1e790 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 "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"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-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 0baaab557f..6d6ee9c504 100644
--- a/src/libsystemd/src/sd-netlink/local-addresses.c
+++ b/src/libsystemd/src/sd-netlink/local-addresses.c
@@ -18,11 +18,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/macro.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "local-addresses.h"
-#include "sd-netlink.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 5eb0683131..f1e91ccfd2 100644
--- a/src/libsystemd/src/sd-netlink/local-addresses.h
+++ b/src/libsystemd/src/sd-netlink/local-addresses.h
@@ -20,9 +20,8 @@
 ***/
 
 
-#include "basic/in-addr-util.h"
-
-#include "sd-netlink.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-staging/sd-netlink.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 69511f87ad..0df449a43c 100644
--- a/src/libsystemd/src/sd-netlink/netlink-internal.h
+++ b/src/libsystemd/src/sd-netlink/netlink-internal.h
@@ -21,12 +21,12 @@
 
 #include <linux/netlink.h>
 
-#include "basic/list.h"
-#include "basic/prioq.h"
-#include "basic/refcnt.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/prioq.h"
+#include "systemd-basic/refcnt.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "netlink-types.h"
-#include "sd-netlink.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 352df2f35a..73afe876b6 100644
--- a/src/libsystemd/src/sd-netlink/netlink-message.c
+++ b/src/libsystemd/src/sd-netlink/netlink-message.c
@@ -21,17 +21,17 @@
 #include <stdbool.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/formats-util.h"
-#include "basic/missing.h"
-#include "basic/refcnt.h"
-#include "basic/socket-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/refcnt.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "netlink-internal.h"
 #include "netlink-types.h"
 #include "netlink-util.h"
-#include "sd-netlink.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 ec3513bcf8..f9a0df9f20 100644
--- a/src/libsystemd/src/sd-netlink/netlink-socket.c
+++ b/src/libsystemd/src/sd-netlink/netlink-socket.c
@@ -21,17 +21,17 @@
 #include <stdbool.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/formats-util.h"
-#include "basic/missing.h"
-#include "basic/refcnt.h"
-#include "basic/socket-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/refcnt.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "netlink-internal.h"
 #include "netlink-types.h"
 #include "netlink-util.h"
-#include "sd-netlink.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 7aaecd2272..c3f3789fe5 100644
--- a/src/libsystemd/src/sd-netlink/netlink-types.c
+++ b/src/libsystemd/src/sd-netlink/netlink-types.c
@@ -31,10 +31,10 @@
 #include <linux/if_link.h>
 #include <linux/if_tunnel.h>
 
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/string-table.h"
-#include "basic/util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/util.h"
 
 #include "netlink-types.h"
 
diff --git a/src/libsystemd/src/sd-netlink/netlink-types.h b/src/libsystemd/src/sd-netlink/netlink-types.h
index 56b9cb143f..3cd57715c3 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 "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 enum {
         NETLINK_TYPE_UNSPEC,
diff --git a/src/libsystemd/src/sd-netlink/netlink-util.c b/src/libsystemd/src/sd-netlink/netlink-util.c
index 9248aa0b18..4bb99b00af 100644
--- a/src/libsystemd/src/sd-netlink/netlink-util.c
+++ b/src/libsystemd/src/sd-netlink/netlink-util.c
@@ -17,9 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "systemd-staging/sd-netlink.h"
+
 #include "netlink-internal.h"
 #include "netlink-util.h"
-#include "sd-netlink.h"
 
 int rtnl_set_link_name(sd_netlink **rtnl, int ifindex, const char *name) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *message = NULL;
diff --git a/src/libsystemd/src/sd-netlink/netlink-util.h b/src/libsystemd/src/sd-netlink/netlink-util.h
index c9b932f994..9fc80af61d 100644
--- a/src/libsystemd/src/sd-netlink/netlink-util.h
+++ b/src/libsystemd/src/sd-netlink/netlink-util.h
@@ -19,9 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/util.h"
-
-#include "sd-netlink.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-netlink.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 42178e5706..315da4f0ca 100644
--- a/src/libsystemd/src/sd-netlink/rtnl-message.c
+++ b/src/libsystemd/src/sd-netlink/rtnl-message.c
@@ -21,16 +21,16 @@
 #include <stdbool.h>
 #include <unistd.h>
 
-#include "basic/formats-util.h"
-#include "basic/missing.h"
-#include "basic/refcnt.h"
-#include "basic/socket-util.h"
-#include "basic/util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/refcnt.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "netlink-internal.h"
 #include "netlink-types.h"
 #include "netlink-util.h"
-#include "sd-netlink.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 d78777397e..4999f59d24 100644
--- a/src/libsystemd/src/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/src/sd-netlink/sd-netlink.c
@@ -20,17 +20,17 @@
 #include <poll.h>
 #include <sys/socket.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/hashmap.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/socket-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "netlink-internal.h"
 #include "netlink-util.h"
-#include "sd-netlink.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 8755a27182..b08cac9907 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 "basic/af-list.h"
-#include "basic/alloc-util.h"
-#include "basic/in-addr-util.h"
+#include "systemd-basic/af-list.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/in-addr-util.h"
 
 #include "local-addresses.h"
 
diff --git a/src/libsystemd/src/sd-netlink/test-netlink.c b/src/libsystemd/src/sd-netlink/test-netlink.c
index 1fde81778e..b16419a3ab 100644
--- a/src/libsystemd/src/sd-netlink/test-netlink.c
+++ b/src/libsystemd/src/sd-netlink/test-netlink.c
@@ -20,15 +20,15 @@
 #include <net/if.h>
 #include <netinet/ether.h>
 
-#include "basic/ether-addr-util.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/ether-addr-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "netlink-util.h"
-#include "sd-netlink.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 ae3e51ae77..317a7ac804 100644
--- a/src/libsystemd/src/sd-network/network-util.c
+++ b/src/libsystemd/src/sd-network/network-util.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/strv.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/strv.h"
 
 #include "network-util.h"
 
diff --git a/src/libsystemd/src/sd-network/network-util.h b/src/libsystemd/src/sd-network/network-util.h
index 902be2b2e8..253a6b9934 100644
--- a/src/libsystemd/src/sd-network/network-util.h
+++ b/src/libsystemd/src/sd-network/network-util.h
@@ -21,6 +21,6 @@
 
 #include <stdbool.h>
 
-#include "sd-network.h"
+#include "systemd-staging/sd-network.h"
 
 bool network_is_online(void);
diff --git a/src/libsystemd/src/sd-network/sd-network.c b/src/libsystemd/src/sd-network/sd-network.c
index c3755371ff..2467fdb7ff 100644
--- a/src/libsystemd/src/sd-network/sd-network.c
+++ b/src/libsystemd/src/sd-network/sd-network.c
@@ -23,18 +23,17 @@
 #include <string.h>
 #include <sys/inotify.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"
-
-#include "sd-network.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-network.h"
 
 _public_ int sd_network_get_operational_state(char **state) {
         _cleanup_free_ char *s = NULL;
diff --git a/src/libsystemd/src/sd-resolve/sd-resolve.c b/src/libsystemd/src/sd-resolve/sd-resolve.c
index d638a374a1..629eeb7799 100644
--- a/src/libsystemd/src/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/src/sd-resolve/sd-resolve.c
@@ -29,15 +29,14 @@
 #include <sys/prctl.h>
 #include <unistd.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"
-
-#include "sd-resolve.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-resolve.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 d552a48da8..0a5bba81cf 100644
--- a/src/libsystemd/src/sd-resolve/test-resolve.c
+++ b/src/libsystemd/src/sd-resolve/test-resolve.c
@@ -26,12 +26,11 @@
 #include <string.h>
 #include <sys/socket.h>
 
-#include "basic/alloc-util.h"
-#include "basic/macro.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-
-#include "sd-resolve.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-staging/sd-resolve.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/subdir.mk b/src/libsystemd/src/subdir.mk
index 71691e8dac..73c05740ce 100644
--- a/src/libsystemd/src/subdir.mk
+++ b/src/libsystemd/src/subdir.mk
@@ -25,8 +25,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 sd.CPPFLAGS += $(libsystemd.CPPFLAGS)
-sd.CPPFLAGS += $(libbasic.CPPFLAGS)
-sd.CPPFLAGS += $(libshared.CPPFLAGS)
-sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+sd.CPPFLAGS += $(libsystemd-staging.CPPFLAGS)
+sd.CPPFLAGS += $(libsystemd-basic.CPPFLAGS)
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/test.mk b/src/libsystemd/src/test.mk
index e75904d554..1a5917121e 100644
--- a/src/libsystemd/src/test.mk
+++ b/src/libsystemd/src/test.mk
@@ -71,7 +71,7 @@ test_bus_error_SOURCES = \
 
 # Link statically because this test uses BUS_ERROR_MAP_ELF_REGISTER
 test_bus_error_LDADD = \
-	libshared.la
+	libsystemd-shared.la
 
 test_bus_gvariant_SOURCES = \
 	src/libsystemd/sd-bus/test-bus-gvariant.c
diff --git a/src/libudev/Makefile b/src/libudev/Makefile
index 1e42e62d17..cf4745cc7e 100644
--- a/src/libudev/Makefile
+++ b/src/libudev/Makefile
@@ -39,7 +39,7 @@ libudev_la_LDFLAGS = \
 
 libudev_la_LIBADD = \
 	libsystemd-internal.la \
-	libbasic.la
+	libsystemd-basic.la
 
 pkgconfiglib_DATA += \
 	src/libudev/libudev.pc
diff --git a/src/libudev/src/libudev-device-internal.h b/src/libudev/src/libudev-device-internal.h
index 07a73e6b9c..9987f80499 100644
--- a/src/libudev/src/libudev-device-internal.h
+++ b/src/libudev/src/libudev-device-internal.h
@@ -22,7 +22,7 @@
 
 #include <libudev.h>
 
-#include "sd-device/sd-device.h"
+#include "systemd-staging/sd-device.h"
 
 #include "libudev-private.h"
 
diff --git a/src/libudev/src/libudev-device.c b/src/libudev/src/libudev-device.c
index a3a0d473a6..0944c27d39 100644
--- a/src/libudev/src/libudev-device.c
+++ b/src/libudev/src/libudev-device.c
@@ -37,11 +37,11 @@
 
 #include <libudev.h>
 
-#include "basic/alloc-util.h"
-#include "basic/parse-util.h"
 #include "sd-device/device-private.h"
 #include "sd-device/device-util.h"
-#include "sd-device/sd-device.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-staging/sd-device.h"
 
 #include "libudev-device-internal.h"
 #include "libudev-private.h"
diff --git a/src/libudev/src/libudev-enumerate.c b/src/libudev/src/libudev-enumerate.c
index 52b2ccff0b..53de8c1a41 100644
--- a/src/libudev/src/libudev-enumerate.c
+++ b/src/libudev/src/libudev-enumerate.c
@@ -30,10 +30,10 @@
 
 #include <libudev.h>
 
-#include "basic/alloc-util.h"
 #include "sd-device/device-enumerator-private.h"
 #include "sd-device/device-util.h"
-#include "sd-device/sd-device.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-staging/sd-device.h"
 
 #include "libudev-device-internal.h"
 
diff --git a/src/libudev/src/libudev-hwdb.c b/src/libudev/src/libudev-hwdb.c
index 1d47cfaa4e..e381ffc62e 100644
--- a/src/libudev/src/libudev-hwdb.c
+++ b/src/libudev/src/libudev-hwdb.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
 #include "sd-hwdb/hwdb-util.h"
-#include "sd-hwdb/sd-hwdb.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-staging/sd-hwdb.h"
 
 #include "libudev-private.h"
 
diff --git a/src/libudev/src/libudev-list.c b/src/libudev/src/libudev-list.c
index a943dc0cd1..f4eb38af1e 100644
--- a/src/libudev/src/libudev-list.c
+++ b/src/libudev/src/libudev-list.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
+#include "systemd-basic/alloc-util.h"
 
 #include "libudev-private.h"
 
diff --git a/src/libudev/src/libudev-monitor.c b/src/libudev/src/libudev-monitor.c
index 87ee3d2e1b..71703e927e 100644
--- a/src/libudev/src/libudev-monitor.c
+++ b/src/libudev/src/libudev-monitor.c
@@ -31,14 +31,14 @@
 
 #include <libudev.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/missing.h"
-#include "basic/mount-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.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/missing.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "libudev-private.h"
 
diff --git a/src/libudev/src/libudev-private.h b/src/libudev/src/libudev-private.h
index 8dfc8d6fe7..da646370e6 100644
--- a/src/libudev/src/libudev-private.h
+++ b/src/libudev/src/libudev-private.h
@@ -26,10 +26,10 @@
 
 #include <libudev.h>
 
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/strxcpyx.h"
-#include "basic/util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/strxcpyx.h"
+#include "systemd-basic/util.h"
 
 #define READ_END  0
 #define WRITE_END 1
diff --git a/src/libudev/src/libudev-queue.c b/src/libudev/src/libudev-queue.c
index bc89252096..c2a1c55d1c 100644
--- a/src/libudev/src/libudev-queue.c
+++ b/src/libudev/src/libudev-queue.c
@@ -24,9 +24,9 @@
 #include <sys/inotify.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/io-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
 
 #include "libudev-private.h"
 
diff --git a/src/libudev/src/libudev-util.c b/src/libudev/src/libudev-util.c
index 661039ecea..c881dffbc4 100644
--- a/src/libudev/src/libudev-util.c
+++ b/src/libudev/src/libudev-util.c
@@ -26,10 +26,10 @@
 
 #include <libudev.h>
 
-#include "basic/MurmurHash2.h"
-#include "basic/device-nodes.h"
-#include "basic/syslog-util.h"
-#include "basic/utf8.h"
+#include "systemd-basic/MurmurHash2.h"
+#include "systemd-basic/device-nodes.h"
+#include "systemd-basic/syslog-util.h"
+#include "systemd-basic/utf8.h"
 
 #include "libudev-private.h"
 
diff --git a/src/libudev/src/libudev.c b/src/libudev/src/libudev.c
index c1af43e3ca..97d263ef3e 100644
--- a/src/libudev/src/libudev.c
+++ b/src/libudev/src/libudev.c
@@ -26,10 +26,10 @@
 
 #include <libudev.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/missing.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/string-util.h"
 
 #include "libudev-private.h"
 
diff --git a/src/libudev/src/udev.h b/src/libudev/src/udev.h
index 26afe63b55..eeffef86bc 100644
--- a/src/libudev/src/udev.h
+++ b/src/libudev/src/udev.h
@@ -24,11 +24,11 @@
 
 #include <libudev.h>
 
-#include "basic/label.h"
-#include "basic/macro.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "sd-netlink/sd-netlink.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "libudev-private.h"
 
diff --git a/src/nss-myhostname/Makefile b/src/nss-myhostname/Makefile
index 4aa0c45cdd..1266394e46 100644
--- a/src/nss-myhostname/Makefile
+++ b/src/nss-myhostname/Makefile
@@ -38,7 +38,7 @@ libnss_myhostname_la_LDFLAGS = \
 
 libnss_myhostname_la_LIBADD = \
 	libsystemd-internal.la \
-	libbasic.la
+	libsystemd-basic.la
 
 lib_LTLIBRARIES += \
 	libnss_myhostname.la
diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
index 6983587265..862ad2fcb5 100644
--- a/src/nss-myhostname/nss-myhostname.c
+++ b/src/nss-myhostname/nss-myhostname.c
@@ -24,14 +24,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/hostname-util.h"
-#include "basic/macro.h"
-#include "basic/nss-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "sd-netlink/local-addresses.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/nss-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 /* We use 127.0.0.2 as IPv4 address. This has the advantage over
  * 127.0.0.1 that it can be translated back to the local hostname. For
diff --git a/src/systemd-ask-password/ask-password.c b/src/systemd-ask-password/ask-password.c
index a30833b6b3..ee29d1c558 100644
--- a/src/systemd-ask-password/ask-password.c
+++ b/src/systemd-ask-password/ask-password.c
@@ -22,11 +22,11 @@
 #include <stddef.h>
 #include <unistd.h>
 
-#include "basic/def.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/strv.h"
-#include "shared/ask-password-api.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/strv.h"
+#include "systemd-shared/ask-password-api.h"
 
 static const char *arg_icon = NULL;
 static const char *arg_id = NULL;
diff --git a/src/systemd-cgls/cgls.c b/src/systemd-cgls/cgls.c
index 0d2459133d..b8703e7f17 100644
--- a/src/systemd-cgls/cgls.c
+++ b/src/systemd-cgls/cgls.c
@@ -25,18 +25,18 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/path-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/cgroup-show.h"
-#include "shared/output-mode.h"
-#include "shared/pager.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/cgroup-show.h"
+#include "systemd-shared/output-mode.h"
+#include "systemd-shared/pager.h"
 
 static bool arg_no_pager = false;
 static bool arg_kernel_threads = false;
diff --git a/src/systemd-cgroups-agent/cgroups-agent.c b/src/systemd-cgroups-agent/cgroups-agent.c
index a09333d82c..1475334fc1 100644
--- a/src/systemd-cgroups-agent/cgroups-agent.c
+++ b/src/systemd-cgroups-agent/cgroups-agent.c
@@ -20,9 +20,9 @@
 #include <stdlib.h>
 #include <sys/socket.h>
 
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/socket-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/socket-util.h"
 
 int main(int argc, char *argv[]) {
 
diff --git a/src/systemd-cgtop/cgtop.c b/src/systemd-cgtop/cgtop.c
index f23ebf4f57..b5f569c649 100644
--- a/src/systemd-cgtop/cgtop.c
+++ b/src/systemd-cgtop/cgtop.c
@@ -28,20 +28,20 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/hashmap.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/stdio-util.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
 
 typedef struct Group {
         char *path;
diff --git a/src/systemd-cryptsetup/cryptsetup-generator.c b/src/systemd-cryptsetup/cryptsetup-generator.c
index 3ad6d34a98..c335811139 100644
--- a/src/systemd-cryptsetup/cryptsetup-generator.c
+++ b/src/systemd-cryptsetup/cryptsetup-generator.c
@@ -19,22 +19,22 @@
 
 #include <errno.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/hashmap.h"
-#include "basic/log.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
-#include "shared/dropin.h"
-#include "shared/fstab-util.h"
-#include "shared/generator.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/dropin.h"
+#include "systemd-shared/fstab-util.h"
+#include "systemd-shared/generator.h"
 
 typedef struct crypto_device {
         char *uuid;
diff --git a/src/systemd-cryptsetup/cryptsetup.c b/src/systemd-cryptsetup/cryptsetup.c
index eef2b1954c..fbfef1e002 100644
--- a/src/systemd-cryptsetup/cryptsetup.c
+++ b/src/systemd-cryptsetup/cryptsetup.c
@@ -23,19 +23,19 @@
 #include <string.h>
 #include <sys/mman.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
 #include "sd-device/device-util.h"
-#include "sd-device/sd-device.h"
-#include "shared/ask-password-api.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/ask-password-api.h"
+#include "systemd-staging/sd-device.h"
 
 static const char *arg_type = NULL; /* CRYPT_LUKS1, CRYPT_TCRYPT or CRYPT_PLAIN */
 static char *arg_cipher = NULL;
diff --git a/src/systemd-debug-generator/debug-generator.c b/src/systemd-debug-generator/debug-generator.c
index 2db31e5de6..941043c2ce 100644
--- a/src/systemd-debug-generator/debug-generator.c
+++ b/src/systemd-debug-generator/debug-generator.c
@@ -17,15 +17,15 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/mkdir.h"
-#include "basic/parse-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/special.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
 
 static char *arg_default_unit = NULL;
 static const char *arg_dest = "/tmp";
diff --git a/src/systemd-getty-generator/getty-generator.c b/src/systemd-getty-generator/getty-generator.c
index c78fac7694..6e60cbab4f 100644
--- a/src/systemd-getty-generator/getty-generator.c
+++ b/src/systemd-getty-generator/getty-generator.c
@@ -22,18 +22,18 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
-#include "basic/virt.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/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
 
 static const char *arg_dest = "/tmp";
 
diff --git a/src/systemd-gpt-auto-generator/gpt-auto-generator.c b/src/systemd-gpt-auto-generator/gpt-auto-generator.c
index fe598da6e1..a854395bce 100644
--- a/src/systemd-gpt-auto-generator/gpt-auto-generator.c
+++ b/src/systemd-gpt-auto-generator/gpt-auto-generator.c
@@ -25,29 +25,29 @@
 #include <libudev.h>
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/blkid-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/special.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
-#include "basic/virt.h"
-#include "shared/efivars.h"
-#include "shared/fstab-util.h"
-#include "shared/generator.h"
-#include "shared/gpt.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
+#include "systemd-blkid/blkid-util.h"
+#include "systemd-shared/efivars.h"
+#include "systemd-shared/fstab-util.h"
+#include "systemd-shared/generator.h"
+#include "systemd-shared/gpt.h"
+#include "systemd-shared/udev-util.h"
 
 static const char *arg_dest = "/tmp";
 static bool arg_enabled = true;
diff --git a/src/systemd-initctl/initctl.c b/src/systemd-initctl/initctl.c
index 66b40ce6f8..fa91d8f3a0 100644
--- a/src/systemd-initctl/initctl.c
+++ b/src/systemd-initctl/initctl.c
@@ -26,17 +26,17 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/list.h"
-#include "basic/log.h"
-#include "basic/special.h"
-#include "basic/util.h"
 #include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "shared/initreq.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/initreq.h"
 
 #define SERVER_FD_MAX 16
 #define TIMEOUT_MSEC ((int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC))
diff --git a/src/systemd-machine-id-setup/machine-id-setup-main.c b/src/systemd-machine-id-setup/machine-id-setup-main.c
index 9cc90b6efd..deb0656d2f 100644
--- a/src/systemd-machine-id-setup/machine-id-setup-main.c
+++ b/src/systemd-machine-id-setup/machine-id-setup-main.c
@@ -22,9 +22,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "basic/log.h"
-#include "basic/path-util.h"
-#include "basic/util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/util.h"
 
 #include "machine-id-setup.h"
 
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index 6f02aa5f1e..ff55db23e5 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -72,7 +72,7 @@ systemd_nspawn_LDADD = \
 
 ifneq ($(HAVE_LIBIPTC),)
 systemd_nspawn_LDADD += \
-	libfirewall.la
+	libsystemd-firewall.la
 endif # HAVE_LIBIPTC
 
 test_patch_uid_SOURCES = \
diff --git a/src/systemd-nspawn/nspawn-cgroup.c b/src/systemd-nspawn/nspawn-cgroup.c
index 9fa46fadbd..c43d747dc3 100644
--- a/src/systemd-nspawn/nspawn-cgroup.c
+++ b/src/systemd-nspawn/nspawn-cgroup.c
@@ -19,14 +19,14 @@
 
 #include <sys/mount.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/mkdir.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 #include "nspawn-cgroup.h"
 
diff --git a/src/systemd-nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c
index a00e7600aa..efdc845476 100644
--- a/src/systemd-nspawn/nspawn-expose-ports.c
+++ b/src/systemd-nspawn/nspawn-expose-ports.c
@@ -17,16 +17,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/parse-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "firewall-util.h"
 #include "sd-netlink/local-addresses.h"
-#include "sd-netlink/sd-netlink.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-firewall/firewall-util.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "nspawn-expose-ports.h"
 
diff --git a/src/systemd-nspawn/nspawn-expose-ports.h b/src/systemd-nspawn/nspawn-expose-ports.h
index 2c0a5ecc88..61134fcba6 100644
--- a/src/systemd-nspawn/nspawn-expose-ports.h
+++ b/src/systemd-nspawn/nspawn-expose-ports.h
@@ -23,9 +23,9 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/in-addr-util.h"
-#include "basic/list.h"
-#include "sd-netlink/sd-netlink.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-staging/sd-netlink.h"
 
 typedef struct ExposePort {
         int protocol;
diff --git a/src/systemd-nspawn/nspawn-gperf.gperf b/src/systemd-nspawn/nspawn-gperf.gperf
index 332063e19b..0c1dd98ff6 100644
--- a/src/systemd-nspawn/nspawn-gperf.gperf
+++ b/src/systemd-nspawn/nspawn-gperf.gperf
@@ -1,7 +1,7 @@
 %{
 #include <stddef.h>
 
-#include "shared/conf-parser.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "nspawn-expose-ports.h"
 #include "nspawn-settings.h"
diff --git a/src/systemd-nspawn/nspawn-mount.c b/src/systemd-nspawn/nspawn-mount.c
index ea1d591415..10a28ff29b 100644
--- a/src/systemd-nspawn/nspawn-mount.c
+++ b/src/systemd-nspawn/nspawn-mount.c
@@ -21,22 +21,22 @@
 
 #include <linux/magic.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/escape.h"
-#include "basic/fs-util.h"
-#include "basic/label.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/rm-rf.h"
-#include "basic/set.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "nspawn-mount.h"
 
diff --git a/src/systemd-nspawn/nspawn-network.c b/src/systemd-nspawn/nspawn-network.c
index b188491000..2fae23376c 100644
--- a/src/systemd-nspawn/nspawn-network.c
+++ b/src/systemd-nspawn/nspawn-network.c
@@ -24,16 +24,16 @@
 #include <libudev.h>
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/ether-addr-util.h"
-#include "basic/lockfile-util.h"
-#include "basic/siphash24.h"
-#include "basic/socket-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "sd-netlink/sd-netlink.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/ether-addr-util.h"
+#include "systemd-basic/lockfile-util.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/udev-util.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "nspawn-network.h"
 
diff --git a/src/systemd-nspawn/nspawn-patch-uid.c b/src/systemd-nspawn/nspawn-patch-uid.c
index dc703165ff..ef297ed915 100644
--- a/src/systemd-nspawn/nspawn-patch-uid.c
+++ b/src/systemd-nspawn/nspawn-patch-uid.c
@@ -27,15 +27,15 @@
 #include <sys/vfs.h>
 #include <unistd.h>
 
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/missing.h"
-#include "basic/stat-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "shared/acl-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/acl-util.h"
 
 #include "nspawn-patch-uid.h"
 
diff --git a/src/systemd-nspawn/nspawn-register.c b/src/systemd-nspawn/nspawn-register.c
index 12e29153f9..3889445ca5 100644
--- a/src/systemd-nspawn/nspawn-register.c
+++ b/src/systemd-nspawn/nspawn-register.c
@@ -19,12 +19,12 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/stat-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
 #include "sd-bus/bus-error.h" /* for bus_error_message */
-#include "shared/bus-unit-util.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/bus-unit-util.h"
 
 #include "nspawn-register.h"
 
diff --git a/src/systemd-nspawn/nspawn-seccomp.c b/src/systemd-nspawn/nspawn-seccomp.c
index 3efdf16a80..4a62f15bc7 100644
--- a/src/systemd-nspawn/nspawn-seccomp.c
+++ b/src/systemd-nspawn/nspawn-seccomp.c
@@ -27,10 +27,10 @@
 #include <seccomp.h>
 #endif
 
-#include "basic/log.h"
+#include "systemd-basic/log.h"
 
 #ifdef HAVE_SECCOMP
-#include "shared/seccomp-util.h"
+#include "systemd-shared/seccomp-util.h"
 #endif
 
 #include "nspawn-seccomp.h"
diff --git a/src/systemd-nspawn/nspawn-settings.c b/src/systemd-nspawn/nspawn-settings.c
index f05c671946..0886451eb0 100644
--- a/src/systemd-nspawn/nspawn-settings.c
+++ b/src/systemd-nspawn/nspawn-settings.c
@@ -17,16 +17,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/cap-list.h"
-#include "basic/parse-util.h"
-#include "basic/process-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"
-#include "shared/conf-parser.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cap-list.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "nspawn-network.h"
 #include "nspawn-settings.h"
diff --git a/src/systemd-nspawn/nspawn-settings.h b/src/systemd-nspawn/nspawn-settings.h
index 8a88647df2..5274daf80d 100644
--- a/src/systemd-nspawn/nspawn-settings.h
+++ b/src/systemd-nspawn/nspawn-settings.h
@@ -21,7 +21,7 @@
 
 #include <stdio.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 #include "nspawn-expose-ports.h"
 #include "nspawn-mount.h"
diff --git a/src/systemd-nspawn/nspawn-setuid.c b/src/systemd-nspawn/nspawn-setuid.c
index 360781c24c..129d3acc5f 100644
--- a/src/systemd-nspawn/nspawn-setuid.c
+++ b/src/systemd-nspawn/nspawn-setuid.c
@@ -21,14 +21,14 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/mkdir.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "nspawn-setuid.h"
 
diff --git a/src/systemd-nspawn/nspawn-stub-pid1.c b/src/systemd-nspawn/nspawn-stub-pid1.c
index 86783b6136..36d7bfc7c4 100644
--- a/src/systemd-nspawn/nspawn-stub-pid1.c
+++ b/src/systemd-nspawn/nspawn-stub-pid1.c
@@ -21,12 +21,12 @@
 #include <sys/unistd.h>
 #include <sys/wait.h>
 
-#include "basic/def.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/time-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/time-util.h"
 
 #include "nspawn-stub-pid1.h"
 
diff --git a/src/systemd-nspawn/nspawn.c b/src/systemd-nspawn/nspawn.c
index fb25ec7afa..73c71a8892 100644
--- a/src/systemd-nspawn/nspawn.c
+++ b/src/systemd-nspawn/nspawn.c
@@ -44,38 +44,38 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/barrier.h"
-#include "basic/blkid-util.h"
-#include "basic/btrfs-util.h"
-#include "basic/cap-list.h"
-#include "basic/capability-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/copy.h"
-#include "basic/env-util.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/log.h"
-#include "basic/macro.h"
-#include "basic/missing.h"
-#include "basic/mkdir.h"
-#include "basic/mount-util.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/random-util.h"
-#include "basic/raw-clone.h"
-#include "basic/rm-rf.h"
-#include "shared/base-filesystem.h"
-#include "shared/dev-setup.h"
-#include "shared/fdset.h"
-#include "shared/gpt.h"
-#include "shared/machine-image.h"
-#include "shared/ptyfwd.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/barrier.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/cap-list.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/env-util.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/hostname-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/raw-clone.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-blkid/blkid-util.h"
+#include "systemd-shared/base-filesystem.h"
+#include "systemd-shared/dev-setup.h"
+#include "systemd-shared/fdset.h"
+#include "systemd-shared/gpt.h"
+#include "systemd-shared/machine-image.h"
+#include "systemd-shared/ptyfwd.h"
+#include "systemd-shared/udev-util.h"
 
 #include "loopback-setup.h"
 #include "nspawn-cgroup.h"
diff --git a/src/systemd-nspawn/test-patch-uid.c b/src/systemd-nspawn/test-patch-uid.c
index e751e0ec95..4297fea6fe 100644
--- a/src/systemd-nspawn/test-patch-uid.c
+++ b/src/systemd-nspawn/test-patch-uid.c
@@ -19,9 +19,9 @@
 
 #include <stdlib.h>
 
-#include "basic/log.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "nspawn-patch-uid.h"
 
diff --git a/src/systemd-rc-local-generator/rc-local-generator.c b/src/systemd-rc-local-generator/rc-local-generator.c
index 2c2fbd21e1..d51ce61ac3 100644
--- a/src/systemd-rc-local-generator/rc-local-generator.c
+++ b/src/systemd-rc-local-generator/rc-local-generator.c
@@ -22,11 +22,11 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/mkdir.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #ifndef RC_LOCAL_SCRIPT_PATH_START
 #define RC_LOCAL_SCRIPT_PATH_START "/etc/rc.d/rc.local"
diff --git a/src/systemd-remount-fs/remount-fs.c b/src/systemd-remount-fs/remount-fs.c
index 116c370ef7..cae9248477 100644
--- a/src/systemd-remount-fs/remount-fs.c
+++ b/src/systemd-remount-fs/remount-fs.c
@@ -3,7 +3,7 @@
 
   Copyright 2010 Lennart Poettering
 
-  systemd is free software; you can redistribute it and/or modify it
+  systemd is free software; you can redistribute it anor 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.
@@ -14,31 +14,31 @@
   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/>.
-***/
+  along with systemd; If not, see <http/www.gnu.org/licenses/>.
+**
 
 #include <errno.h>
 #include <mntent.h>
 #include <string.h>
-#include <sys/prctl.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
+#include <syprctl.h>
+#include <systat.h>
+#include <sywait.h>
 #include <unistd.h>
 
-#include "basic/exit-status.h"
-#include "basic/log.h"
-#include "basic/mount-util.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basiexit-status.h"
+#include "systemd-basilog.h"
+#include "systemd-basimount-util.h"
+#include "systemd-basipath-util.h"
+#include "systemd-basiprocess-util.h"
+#include "systemd-basisignal-util.h"
+#include "systemd-basistrv.h"
+#include "systemd-basiutil.h"
 
 #include "mount-setup.h"
 
-/* Goes through /etc/fstab and remounts all API file systems, applying
- * options that are in /etc/fstab that systemd might not have
- * respected */
+/* Goes throughetc/fstab and remounts all API file systems, applying
+ * options that are inetc/fstab that systemd might not have
+ * respected 
 
 int main(int argc, char *argv[]) {
         _cleanup_hashmap_free_free_ Hashmap *pids = NULL;
@@ -57,14 +57,14 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        f = setmntent("/etc/fstab", "r");
+        f = setmntent(etc/fstab", "r");
         if (!f) {
                 if (errno == ENOENT) {
                         r = 0;
                         goto finish;
                 }
 
-                r = log_error_errno(errno, "Failed to open /etc/fstab: %m");
+                r = log_error_errno(errno, "Failed to openetc/fstab: %m");
                 goto finish;
         }
 
@@ -79,10 +79,10 @@ int main(int argc, char *argv[]) {
                 int k;
                 char *s;
 
-                /* Remount the root fs, /usr and all API VFS */
+               * Remount the root fs, /usr and all API VFS */
                 if (!mount_point_is_api(me->mnt_dir) &&
-                    !path_equal(me->mnt_dir, "/") &&
-                    !path_equal(me->mnt_dir, "/usr"))
+                    !path_equal(me->mnt_dir, ") &&
+                    !path_equal(me->mnt_dir, usr"))
                         continue;
 
                 log_debug("Remounting %s", me->mnt_dir);
@@ -94,7 +94,7 @@ int main(int argc, char *argv[]) {
                 }
 
                 if (pid == 0) {
-                        /* Child */
+                       * Child */
 
                         (void) reset_all_signal_handlers();
                         (void) reset_signal_mask();
@@ -106,7 +106,7 @@ int main(int argc, char *argv[]) {
                         _exit(EXIT_FAILURE);
                 }
 
-                /* Parent */
+               * Parent */
 
                 s = strdup(me->mnt_dir);
                 if (!s) {
diff --git a/src/systemd-remount-fs/systemd-remount-fs.service.in b/src/systemd-remount-fs/systemd-remount-fs.service.in
index 8d9daacaa5..ffc81b2691 100644
--- a/src/systemd-remount-fs/systemd-remount-fs.service.in
+++ b/src/systemd-remount-fs/systemd-remount-fs.service.in
@@ -1,6 +1,6 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it and/or modify it
+#  systemd is free software; you can redistribute it anor 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.
@@ -8,15 +8,15 @@
 [Unit]
 Description=Remount Root and Kernel File Systems
 Documentation=man:systemd-remount-fs.service(8)
-Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+Documentation=http/www.freedesktop.org/wiki/Software/systemd/APIFileSystems
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-fsck-root.service
 Before=local-fs-pre.target local-fs.target shutdown.target
 Wants=local-fs-pre.target
-ConditionPathExists=/etc/fstab
+ConditionPathExistsetc/fstab
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=@rootlibexecdir@/systemd-remount-fs
+ExecStart=@rootlibexecdirsystemd-remount-fs
diff --git a/src/systemd-remount-fs/systemd-remount-fs.service.xml b/src/systemd-remount-fs/systemd-remount-fs.service.xml
index 176f2b2d20..c2e9f0c721 100644
--- a/src/systemd-remount-fs/systemd-remount-fs.service.xml
+++ b/src/systemd-remount-fs/systemd-remount-fs.service.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "/OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
   Copyright 2012 Lennart Poettering
 
-  systemd is free software; you can redistribute it and/or modify it
+  systemd is free software; you can redistribute it anor 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.
@@ -17,72 +17,72 @@
   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/>.
+  along with systemd; If not, see <http/www.gnu.org/licenses/>.
 -->
 <refentry id="systemd-remount-fs.service">
 
   <refentryinfo>
-    <title>systemd-remount-fs.service</title>
-    <productname>systemd</productname>
+    <title>systemd-remount-fs.servicetitle>
+    <productname>systemdproductname>
 
     <authorgroup>
       <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
+        <contrib>Developercontrib>
+        <firstname>Lennartfirstname>
+        <surname>Poetteringsurname>
+        <email>lennart@poettering.netemail>
+      author>
+    authorgroup>
+  refentryinfo>
 
   <refmeta>
-    <refentrytitle>systemd-remount-fs.service</refentrytitle>
-    <manvolnum>8</manvolnum>
-  </refmeta>
+    <refentrytitle>systemd-remount-fs.servicerefentrytitle>
+    <manvolnum>8manvolnum>
+  refmeta>
 
   <refnamediv>
-    <refname>systemd-remount-fs.service</refname>
-    <refname>systemd-remount-fs</refname>
-    <refpurpose>Remount root and kernel file systems</refpurpose>
-  </refnamediv>
+    <refname>systemd-remount-fs.servicerefname>
+    <refname>systemd-remount-fsrefname>
+    <refpurpose>Remount root and kernel file systemsrefpurpose>
+  refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>systemd-remount-fs.service</filename></para>
-    <para><filename>/usr/lib/systemd/systemd-remount-fs</filename></para>
-  </refsynopsisdiv>
+    <para><filename>systemd-remount-fs.servicefilename></para>
+    <para><filenameusr/lib/systemd/systemd-remount-fs</filename></para>
+  refsynopsisdiv>
 
   <refsect1>
-    <title>Description</title>
+    <title>Descriptiontitle>
 
-    <para><filename>systemd-remount-fs.service</filename> is an
+    <para><filename>systemd-remount-fs.servicefilename> is an
     early boot service that applies mount options listed in
-    <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-    to the root file system, the <filename>/usr</filename> file system,
+    <citerefentry project='man-pages'><refentrytitle>fstabrefentrytitle><manvolnum>5</manvolnum></citerefentry>
+    to the root file system, the <filenameusr</filename> file system,
     and the kernel API file systems. This is required so that the
     mount options of these file systems — which are pre-mounted by
     the kernel, the initial RAM disk, container environments or system
     manager code — are updated to those listed in
-    <filename>/etc/fstab</filename>. This service ignores normal file
+    <filenameetc/fstab</filename>. This service ignores normal file
     systems and only changes the root file system (i.e.
-    <filename>/</filename>), <filename>/usr</filename> and the virtual
-    kernel API file systems such as <filename>/proc</filename>,
-    <filename>/sys</filename> or <filename>/dev</filename>. This
-    service executes no operation if <filename>/etc/fstab</filename>
+    <filename</filename>), <filename>/usr</filename> and the virtual
+    kernel API file systems such as <filenameproc</filename>,
+    <filenamesys</filename> or <filename>/dev</filename>. This
+    service executes no operation if <filenameetc/fstab</filename>
     does not exist or lists no entries for the mentioned file
-    systems.</para>
+    systems.para>
 
     <para>For a longer discussion of kernel API file systems see
-    <ulink url="http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API
-    File Systems</ulink>.</para>
-  </refsect1>
+    <ulink url="http/www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API
+    File Systemsulink>.</para>
+  refsect1>
 
   <refsect1>
-    <title>See Also</title>
+    <title>See Alsotitle>
     <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-    </para>
-  </refsect1>
+      <citerefentry><refentrytitle>systemdrefentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry project='man-pages'><refentrytitle>fstabrefentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry project='man-pages'><refentrytitle>mountrefentrytitle><manvolnum>8</manvolnum></citerefentry>
+    para>
+  refsect1>
 
-</refentry>
+refentry>
diff --git a/src/systemd-reply-password/Makefile b/src/systemd-reply-password/Makefile
index 18514df027..affcbb8ec4 100644
--- a/src/systemd-reply-password/Makefile
+++ b/src/systemd-reply-password/Makefile
@@ -8,7 +8,7 @@
 #  Copyright 2013 David Strauss
 #  Copyright 2016 Luke Shumaker
 #
-#  systemd is free software; you can redistribute it and/or modify it
+#  systemd is free software; you can redistribute it anor 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.
@@ -19,15 +19,15 @@
 #  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
+#  along with systemd; If not, see <http/www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST))../../config.mk
+include $(topsrcdirbuild-aux/Makefile.head.mk
 
 rootlibexec_PROGRAMS += systemd-reply-password
 systemd_reply_password_SOURCES = \
-	src/reply-password/reply-password.c
+	srreply-password/reply-password.c
 
 systemd_reply_password_LDADD = \
 	libsystemd-shared.la
 
-include $(topsrcdir)/build-aux/Makefile.tail.mk
+include $(topsrcdirbuild-aux/Makefile.tail.mk
diff --git a/src/systemd-reply-password/reply-password.c b/src/systemd-reply-password/reply-password.c
index 7a5cea0e1e..f2d95c58bb 100644
--- a/src/systemd-reply-password/reply-password.c
+++ b/src/systemd-reply-password/reply-password.c
@@ -3,7 +3,7 @@
 
   Copyright 2010 Lennart Poettering
 
-  systemd is free software; you can redistribute it and/or modify it
+  systemd is free software; you can redistribute it anor 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.
@@ -14,21 +14,21 @@
   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/>.
-***/
+  along with systemd; If not, see <http/www.gnu.org/licenses/>.
+**
 
 #include <errno.h>
 #include <stddef.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include <sysocket.h>
+#include <syun.h>
+
+#include "systemd-basifd-util.h"
+#include "systemd-basilog.h"
+#include "systemd-basimacro.h"
+#include "systemd-basisocket-util.h"
+#include "systemd-basistring-util.h"
+#include "systemd-basiutil.h"
 
 static int send_on_socket(int fd, const char *socket_name, const void *packet, size_t size) {
         union sockaddr_union sa = {
diff --git a/src/systemd-socket-proxyd/socket-proxyd.c b/src/systemd-socket-proxyd/socket-proxyd.c
index 888850595b..6a11804694 100644
--- a/src/systemd-socket-proxyd/socket-proxyd.c
+++ b/src/systemd-socket-proxyd/socket-proxyd.c
@@ -31,15 +31,15 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/path-util.h"
-#include "basic/set.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "sd-resolve/sd-resolve.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-resolve.h"
 
 #define BUFFER_SIZE (256 * 1024)
 #define CONNECTIONS_MAX 256
diff --git a/src/systemd-stdio-bridge/stdio-bridge.c b/src/systemd-stdio-bridge/stdio-bridge.c
index 33fe2f7e28..9aa17e861c 100644
--- a/src/systemd-stdio-bridge/stdio-bridge.c
+++ b/src/systemd-stdio-bridge/stdio-bridge.c
@@ -27,11 +27,11 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-daemon.h>
 
-#include "basic/build.h"
-#include "basic/log.h"
-#include "basic/util.h"
 #include "sd-bus/bus-internal.h"
-#include "shared/bus-util.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/build.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/util.h"
 
 #define DEFAULT_BUS_PATH "unix:path=/run/dbus/system_bus_socket"
 
diff --git a/src/systemd-system-update-generator/system-update-generator.c b/src/systemd-system-update-generator/system-update-generator.c
index e95ab39bb5..f66993811c 100644
--- a/src/systemd-system-update-generator/system-update-generator.c
+++ b/src/systemd-system-update-generator/system-update-generator.c
@@ -20,10 +20,10 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "basic/fs-util.h"
-#include "basic/log.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 /*
  * Implements the logic described in
diff --git a/src/systemd-timesyncd/timesyncd-conf.c b/src/systemd-timesyncd/timesyncd-conf.c
index f2c6efd8e2..76bcfa5ef7 100644
--- a/src/systemd-timesyncd/timesyncd-conf.c
+++ b/src/systemd-timesyncd/timesyncd-conf.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/extract-word.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/string-util.h"
 
 #include "timesyncd-conf.h"
 #include "timesyncd-manager.h"
diff --git a/src/systemd-timesyncd/timesyncd-conf.h b/src/systemd-timesyncd/timesyncd-conf.h
index c24d54a1e3..580c285271 100644
--- a/src/systemd-timesyncd/timesyncd-conf.h
+++ b/src/systemd-timesyncd/timesyncd-conf.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "shared/conf-parser.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "timesyncd-manager.h"
 
diff --git a/src/systemd-timesyncd/timesyncd-gperf.gperf b/src/systemd-timesyncd/timesyncd-gperf.gperf
index 7e347a033c..8956cc773d 100644
--- a/src/systemd-timesyncd/timesyncd-gperf.gperf
+++ b/src/systemd-timesyncd/timesyncd-gperf.gperf
@@ -1,7 +1,7 @@
 %{
 #include <stddef.h>
 
-#include "shared/conf-parser.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "timesyncd-conf.h"
 %}
diff --git a/src/systemd-timesyncd/timesyncd-manager.c b/src/systemd-timesyncd/timesyncd-manager.c
index 9b10081961..687ef09ff3 100644
--- a/src/systemd-timesyncd/timesyncd-manager.c
+++ b/src/systemd-timesyncd/timesyncd-manager.c
@@ -31,20 +31,20 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/list.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/ratelimit.h"
-#include "basic/socket-util.h"
-#include "basic/sparse-endian.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/time-util.h"
-#include "basic/util.h"
 #include "sd-network/network-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/util.h"
 
 #include "timesyncd-conf.h"
 #include "timesyncd-manager.h"
diff --git a/src/systemd-timesyncd/timesyncd-manager.h b/src/systemd-timesyncd/timesyncd-manager.h
index a70b187089..9012801cd0 100644
--- a/src/systemd-timesyncd/timesyncd-manager.h
+++ b/src/systemd-timesyncd/timesyncd-manager.h
@@ -21,10 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/list.h"
-#include "basic/ratelimit.h"
-#include "sd-network/sd-network.h"
-#include "sd-resolve/sd-resolve.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-staging/sd-network.h"
+#include "systemd-staging/sd-resolve.h"
 
 typedef struct Manager Manager;
 
diff --git a/src/systemd-timesyncd/timesyncd-server.c b/src/systemd-timesyncd/timesyncd-server.c
index 42e5c8e429..b4cac7c6ed 100644
--- a/src/systemd-timesyncd/timesyncd-server.c
+++ b/src/systemd-timesyncd/timesyncd-server.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
+#include "systemd-basic/alloc-util.h"
 
 #include "timesyncd-server.h"
 
diff --git a/src/systemd-timesyncd/timesyncd-server.h b/src/systemd-timesyncd/timesyncd-server.h
index 438146c8f7..0a5c2c8bc4 100644
--- a/src/systemd-timesyncd/timesyncd-server.h
+++ b/src/systemd-timesyncd/timesyncd-server.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
-#include "basic/socket-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/socket-util.h"
 
 typedef struct ServerAddress ServerAddress;
 typedef struct ServerName ServerName;
diff --git a/src/systemd-timesyncd/timesyncd.c b/src/systemd-timesyncd/timesyncd.c
index 7a357c2296..047f455d18 100644
--- a/src/systemd-timesyncd/timesyncd.c
+++ b/src/systemd-timesyncd/timesyncd.c
@@ -20,13 +20,13 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
-#include "basic/capability-util.h"
-#include "basic/clock-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/signal-util.h"
-#include "basic/user-util.h"
 #include "sd-network/network-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/clock-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/user-util.h"
 
 #include "timesyncd-conf.h"
 #include "timesyncd-manager.h"
diff --git a/src/systemd-tty-ask-password-agent/tty-ask-password-agent.c b/src/systemd-tty-ask-password-agent/tty-ask-password-agent.c
index 713f2025a4..9006af7bfd 100644
--- a/src/systemd-tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/systemd-tty-ask-password-agent/tty-ask-password-agent.c
@@ -34,27 +34,27 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/dirent-util.h"
-#include "basic/exit-status.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/hashmap.h"
-#include "basic/io-util.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/process-util.h"
-#include "basic/signal-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
-#include "shared/ask-password-api.h"
-#include "shared/conf-parser.h"
-#include "shared/utmp-wtmp.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/exit-status.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/ask-password-api.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-shared/utmp-wtmp.h"
 
 static enum {
         ACTION_LIST,
diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c
index 1417d596e4..39302135d7 100644
--- a/src/test/test-acl-util.c
+++ b/src/test/test-acl-util.c
@@ -22,11 +22,11 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/string-util.h"
-#include "basic/user-util.h"
-#include "shared/acl-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-shared/acl-util.h"
 
 static void test_add_acls_for_user(void) {
         char fn[] = "/tmp/test-empty.XXXXXX";
diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c
index 21115e677a..a117550e88 100644
--- a/src/test/test-af-list.c
+++ b/src/test/test-af-list.c
@@ -20,15 +20,15 @@
 #include <string.h>
 #include <sys/socket.h>
 
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 static const struct af_name* lookup_af(register const char *str, register unsigned int len);
 
-#include "basic/af-from-name.h"
-#include "basic/af-list.h"
-#include "basic/af-to-name.h"
+#include "af-from-name.h"
+#include "af-to-name.h"
+#include "systemd-basic/af-list.h"
 
 int main(int argc, const char *argv[]) {
 
diff --git a/src/test/test-alloc-util.c b/src/test/test-alloc-util.c
index 520951495d..6ab6a19c3e 100644
--- a/src/test/test-alloc-util.c
+++ b/src/test/test-alloc-util.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/macro.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/util.h"
 
 static void test_alloca(void) {
         static const uint8_t zero[997] = { };
diff --git a/src/test/test-architecture.c b/src/test/test-architecture.c
index 6373b798b0..0f0525436b 100644
--- a/src/test/test-architecture.c
+++ b/src/test/test-architecture.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/architecture.h"
-#include "basic/log.h"
-#include "basic/util.h"
-#include "basic/virt.h"
+#include "systemd-basic/architecture.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
 
 int main(int argc, char *argv[]) {
         int a, v;
diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c
index 976958e733..605607f7bb 100644
--- a/src/test/test-arphrd-list.c
+++ b/src/test/test-arphrd-list.c
@@ -20,15 +20,15 @@
 #include <net/if_arp.h>
 #include <string.h>
 
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len);
 
-#include "basic/arphrd-from-name.h"
-#include "basic/arphrd-list.h"
-#include "basic/arphrd-to-name.h"
+#include "arphrd-from-name.h"
+#include "arphrd-to-name.h"
+#include "systemd-basic/arphrd-list.h"
 
 int main(int argc, const char *argv[]) {
 
diff --git a/src/test/test-ask-password-api.c b/src/test/test-ask-password-api.c
index a93e821c7d..c33f714989 100644
--- a/src/test/test-ask-password-api.c
+++ b/src/test/test-ask-password-api.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "shared/ask-password-api.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-shared/ask-password-api.h"
 
 static void ask_password(void) {
         int r;
diff --git a/src/test/test-async.c b/src/test/test-async.c
index 627768b392..1e4a182dfa 100644
--- a/src/test/test-async.c
+++ b/src/test/test-async.c
@@ -19,10 +19,10 @@
 
 #include <unistd.h>
 
-#include "basic/async.h"
-#include "basic/fileio.h"
-#include "basic/macro.h"
-#include "basic/util.h"
+#include "systemd-basic/async.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/util.h"
 
 static bool test_async = false;
 
diff --git a/src/test/test-barrier.c b/src/test/test-barrier.c
index 1123f33f16..56a0de0e83 100644
--- a/src/test/test-barrier.c
+++ b/src/test/test-barrier.c
@@ -31,8 +31,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "basic/barrier.h"
-#include "basic/util.h"
+#include "systemd-basic/barrier.h"
+#include "systemd-basic/util.h"
 
 /* 20ms to test deadlocks; All timings use multiples of this constant as
  * alarm/sleep timers. If this timeout is too small for slow machines to perform
diff --git a/src/test/test-bitmap.c b/src/test/test-bitmap.c
index b18bcef9ae..ef8470b2e6 100644
--- a/src/test/test-bitmap.c
+++ b/src/test/test-bitmap.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/bitmap.h"
+#include "systemd-basic/bitmap.h"
 
 int main(int argc, const char *argv[]) {
         _cleanup_bitmap_free_ Bitmap *b = NULL, *b2 = NULL;
diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c
index 022d101957..2347547f66 100644
--- a/src/test/test-boot-timestamps.c
+++ b/src/test/test-boot-timestamps.c
@@ -18,11 +18,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/log.h"
-#include "basic/util.h"
-#include "shared/acpi-fpdt.h"
-#include "shared/boot-timestamps.h"
-#include "shared/efivars.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/acpi-fpdt.h"
+#include "systemd-shared/boot-timestamps.h"
+#include "systemd-shared/efivars.h"
 
 static int test_acpi_fpdt(void) {
         usec_t loader_start;
diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c
index eb33a3937f..648fe2296b 100644
--- a/src/test/test-btrfs.c
+++ b/src/test/test-btrfs.c
@@ -19,13 +19,13 @@
 
 #include <fcntl.h>
 
-#include "basic/btrfs-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/btrfs-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 int main(int argc, char *argv[]) {
         BtrfsQuotaInfo quota;
diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c
index c7cbf99cf0..94e755bf3c 100644
--- a/src/test/test-calendarspec.c
+++ b/src/test/test-calendarspec.c
@@ -19,10 +19,10 @@
 
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/calendarspec.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/calendarspec.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 static void test_one(const char *input, const char *output) {
         CalendarSpec *c;
diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c
index 6af0a45b66..2fd1ee75d5 100644
--- a/src/test/test-cap-list.c
+++ b/src/test/test-cap-list.c
@@ -19,12 +19,12 @@
 
 #include <sys/prctl.h>
 
-#include "basic/alloc-util.h"
-#include "basic/cap-list.h"
-#include "basic/capability-util.h"
-#include "basic/fileio.h"
-#include "basic/parse-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cap-list.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/util.h"
 
 /* verify the capability parser */
 static void test_cap_list(void) {
diff --git a/src/test/test-capability.c b/src/test/test-capability.c
index 07e52c2ba8..5bd53246d7 100644
--- a/src/test/test-capability.c
+++ b/src/test/test-capability.c
@@ -25,10 +25,10 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "basic/capability-util.h"
-#include "basic/fd-util.h"
-#include "basic/macro.h"
-#include "basic/util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/util.h"
 
 static uid_t test_uid = -1;
 static gid_t test_gid = -1;
diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c
index 6d889c98d2..28736780d3 100644
--- a/src/test/test-cgroup-mask.c
+++ b/src/test/test-cgroup-mask.c
@@ -19,10 +19,10 @@
 
 #include <stdio.h>
 
-#include "basic/macro.h"
-#include "basic/rm-rf.h"
 #include "manager.h"
-#include "shared/tests.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-shared/tests.h"
 #include "unit.h"
 
 #include "test-helper.h"
diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index 394839bc83..1b3e55083a 100644
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -17,16 +17,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/cgroup-util.h"
-#include "basic/dirent-util.h"
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/string-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/dirent-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "test-helper.h"
 
diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c
index c969185337..4daa59f367 100644
--- a/src/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
@@ -20,10 +20,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/cgroup-util.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/cgroup-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 int main(int argc, char*argv[]) {
         char *path;
diff --git a/src/test/test-clock.c b/src/test/test-clock.c
index c6a8e7aa1c..251e41f8bd 100644
--- a/src/test/test-clock.c
+++ b/src/test/test-clock.c
@@ -20,11 +20,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "basic/clock-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/macro.h"
+#include "systemd-basic/clock-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
 
 static void test_clock_is_localtime(void) {
         char adjtime[] = "/tmp/test-adjtime.XXXXXX";
diff --git a/src/test/test-condition.c b/src/test/test-condition.c
index 9d27a66a95..848de002b0 100644
--- a/src/test/test-condition.c
+++ b/src/test/test-condition.c
@@ -19,18 +19,18 @@
 
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/architecture.h"
-#include "basic/audit-util.h"
-#include "basic/hostname-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/selinux-util.h"
-#include "basic/smack-util.h"
-#include "basic/util.h"
-#include "shared/apparmor-util.h"
-#include "shared/condition.h"
-#include "shared/ima-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/architecture.h"
+#include "systemd-basic/audit-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/smack-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/apparmor-util.h"
+#include "systemd-shared/condition.h"
+#include "systemd-shared/ima-util.h"
 
 static void test_condition_test_path(void) {
         Condition *condition;
diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c
index 336e980e07..0736b55d98 100644
--- a/src/test/test-conf-files.c
+++ b/src/test/test-conf-files.c
@@ -20,16 +20,16 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "basic/alloc-util.h"
-#include "basic/conf-files.h"
-#include "basic/fs-util.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 static void setup_test_dir(char *tmp_dir, const char *files, ...) {
         va_list ap;
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
index 1536e7937d..ff949406e8 100644
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -17,12 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/conf-parser.h"
 
 static void test_config_parse_path_one(const char *rvalue, const char *expected) {
         char *path = NULL;
diff --git a/src/test/test-copy.c b/src/test/test-copy.c
index cd9def191c..fca324c90a 100644
--- a/src/test/test-copy.c
+++ b/src/test/test-copy.c
@@ -19,19 +19,19 @@
 
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/copy.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/copy.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 static void test_copy_file(void) {
         _cleanup_free_ char *buf = NULL;
diff --git a/src/test/test-cpu-set-util.c b/src/test/test-cpu-set-util.c
index 0558f323ea..6fc4ab6404 100644
--- a/src/test/test-cpu-set-util.c
+++ b/src/test/test-cpu-set-util.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/cpu-set-util.h"
-#include "basic/macro.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/cpu-set-util.h"
+#include "systemd-basic/macro.h"
 
 static void test_parse_cpu_set(void) {
         cpu_set_t *c = NULL;
diff --git a/src/test/test-daemon.c b/src/test/test-daemon.c
index 98988e1e31..a3740195ec 100644
--- a/src/test/test-daemon.c
+++ b/src/test/test-daemon.c
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/strv.h"
+#include "systemd-basic/strv.h"
 
 int main(int argc, char*argv[]) {
         _cleanup_strv_free_ char **l = NULL;
diff --git a/src/test/test-date.c b/src/test/test-date.c
index a7a2e9087c..6edc820f38 100644
--- a/src/test/test-date.c
+++ b/src/test/test-date.c
@@ -19,9 +19,9 @@
 
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 static void test_should_pass(const char *p) {
         usec_t t, q;
diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c
index 2310fbb9c3..a13ff0e903 100644
--- a/src/test/test-device-nodes.c
+++ b/src/test/test-device-nodes.c
@@ -19,10 +19,10 @@
 
 #include <sys/types.h>
 
-#include "basic/alloc-util.h"
-#include "basic/device-nodes.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/device-nodes.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 /* helpers for test_encode_devnode_name */
 static char *do_encode_string(const char *in) {
diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c
index 930bd5dd62..c31d09e945 100644
--- a/src/test/test-dns-domain.c
+++ b/src/test/test-dns-domain.c
@@ -17,10 +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 "shared/dns-domain.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/dns-domain.h"
 
 static void test_dns_label_unescape_one(const char *what, const char *expect, size_t buffer_sz, int ret) {
         char buffer[buffer_sz];
diff --git a/src/test/test-ellipsize.c b/src/test/test-ellipsize.c
index 45e95fe597..9ac1669537 100644
--- a/src/test/test-ellipsize.c
+++ b/src/test/test-ellipsize.c
@@ -19,11 +19,11 @@
 
 #include <stdio.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
 
 static void test_one(const char *p) {
         _cleanup_free_ char *t;
diff --git a/src/test/test-engine.c b/src/test/test-engine.c
index 9d21bb5723..73ae386b4d 100644
--- a/src/test/test-engine.c
+++ b/src/test/test-engine.c
@@ -21,10 +21,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "basic/rm-rf.h"
 #include "manager.h"
-#include "shared/bus-util.h"
-#include "shared/tests.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-shared/tests.h"
 
 #include "test-helper.h"
 
diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c
index 30d99fcd51..a6bab469cd 100644
--- a/src/test/test-env-util.c
+++ b/src/test/test-env-util.c
@@ -20,10 +20,10 @@
 
 #include <string.h>
 
-#include "basic/env-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 static void test_strv_env_delete(void) {
         _cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL, **d = NULL;
diff --git a/src/test/test-escape.c b/src/test/test-escape.c
index 874647541c..32abd73a7f 100644
--- a/src/test/test-escape.c
+++ b/src/test/test-escape.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/macro.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/macro.h"
 
 static void test_cescape(void) {
         _cleanup_free_ char *escaped;
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 7cd63168c8..1fe6421314 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -23,14 +23,14 @@
 #include <sys/prctl.h>
 #include <sys/types.h>
 
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/path-util.h"
-#include "basic/rm-rf.h"
-#include "basic/util.h"
 #include "manager.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/util.h"
 #include "unit.h"
 
 #include "test-helper.h"
diff --git a/src/test/test-extract-word.c b/src/test/test-extract-word.c
index 3d6548b7c7..f3a6a6378e 100644
--- a/src/test/test-extract-word.c
+++ b/src/test/test-extract-word.c
@@ -21,9 +21,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/extract-word.h"
-#include "basic/log.h"
-#include "basic/string-util.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/string-util.h"
 
 static void test_extract_first_word(void) {
         const char *p, *original;
diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c
index f6c1f302c1..10577bfbed 100644
--- a/src/test/test-fd-util.c
+++ b/src/test/test-fd-util.c
@@ -20,10 +20,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/macro.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/macro.h"
 
 static void test_close_many(void) {
         int fds[3];
diff --git a/src/test/test-fdset.c b/src/test/test-fdset.c
index 71b155ae8d..5073e0bf17 100644
--- a/src/test/test-fdset.c
+++ b/src/test/test-fdset.c
@@ -20,11 +20,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/macro.h"
-#include "basic/util.h"
-#include "shared/fdset.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/fdset.h"
 
 static void test_fdset_new_fill(void) {
         int fd = -1;
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index f5a99d668d..c58abff8d6 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -22,17 +22,17 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/env-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/io-util.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 static void test_parse_env_file(void) {
         char    t[] = "/tmp/test-fileio-in-XXXXXX",
diff --git a/src/test/test-firewall-util.c b/src/test/test-firewall-util.c
index 28ab25dd78..b1e679e6b1 100644
--- a/src/test/test-firewall-util.c
+++ b/src/test/test-firewall-util.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/log.h"
-#include "firewall-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-firewall/firewall-util.h"
 
 #define MAKE_IN_ADDR_UNION(a,b,c,d) (union in_addr_union) { .in.s_addr = htobe32((uint32_t) (a) << 24 | (uint32_t) (b) << 16 | (uint32_t) (c) << 8 | (uint32_t) (d))}
 
diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
index 30b521c297..e98da45197 100644
--- a/src/test/test-fs-util.c
+++ b/src/test/test-fs-util.c
@@ -19,16 +19,16 @@
 
 #include <unistd.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/mkdir.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 static void test_unlink_noerrno(void) {
         char name[] = "/tmp/test-close_nointr.XXXXXX";
diff --git a/src/test/test-fstab-util.c b/src/test/test-fstab-util.c
index 181ff230e0..7d73384d26 100644
--- a/src/test/test-fstab-util.c
+++ b/src/test/test-fstab-util.c
@@ -17,11 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "shared/fstab-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/fstab-util.h"
 
 /*
 int fstab_filter_options(const char *opts, const char *names,
diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
index fd6dde113a..b5cf10a683 100644
--- a/src/test/test-glob-util.c
+++ b/src/test/test-glob-util.c
@@ -20,10 +20,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fileio.h"
-#include "basic/glob-util.h"
-#include "basic/macro.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/glob-util.h"
+#include "systemd-basic/macro.h"
 
 static void test_glob_exists(void) {
         char name[] = "/tmp/test-glob_exists.XXXXXX";
diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c
index bbb24d885e..d1b3ac527b 100644
--- a/src/test/test-hashmap-plain.c
+++ b/src/test/test-hashmap-plain.c
@@ -17,11 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/hashmap.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 void test_hashmap_funcs(void);
 
diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c
index c927d99079..10de53ff41 100644
--- a/src/test/test-hashmap.c
+++ b/src/test/test-hashmap.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/hashmap.h"
-#include "basic/util.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/util.h"
 
 void test_hashmap_funcs(void);
 void test_ordered_hashmap_funcs(void);
diff --git a/src/test/test-helper.h b/src/test/test-helper.h
index 0b1acde587..d5f44d53e3 100644
--- a/src/test/test-helper.h
+++ b/src/test/test-helper.h
@@ -21,7 +21,7 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 #define TEST_REQ_RUNNING_SYSTEMD(x)                                 \
         if (sd_booted() > 0) {                                      \
diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
index f56035d84a..b3587b6645 100644
--- a/src/test/test-hexdecoct.c
+++ b/src/test/test-hexdecoct.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/hexdecoct.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
 
 static void test_hexchar(void) {
         assert_se(hexchar(0xa) == 'a');
diff --git a/src/test/test-hostname-util.c b/src/test/test-hostname-util.c
index a8e598c58e..62ce59ae4b 100644
--- a/src/test/test-hostname-util.c
+++ b/src/test/test-hostname-util.c
@@ -19,11 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/fileio.h"
-#include "basic/hostname-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 static void test_hostname_is_valid(void) {
         assert_se(hostname_is_valid("foobar", false));
diff --git a/src/test/test-hostname.c b/src/test/test-hostname.c
index 7408d51725..fb9a66a5d8 100644
--- a/src/test/test-hostname.c
+++ b/src/test/test-hostname.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/util.h"
 #include "hostname-setup.h"
+#include "systemd-basic/util.h"
 
 int main(int argc, char* argv[]) {
         int r;
diff --git a/src/test/test-id128.c b/src/test/test-id128.c
index c9240cf40d..ada678a6c9 100644
--- a/src/test/test-id128.c
+++ b/src/test/test-id128.c
@@ -22,13 +22,13 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-id128.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "sd-id128/id128-util.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/string-util.h"
+#include "systemd-basic/util.h"
 
 #define ID128_WALDI SD_ID128_MAKE(01, 02, 03, 04, 05, 06, 07, 08, 09, 0a, 0b, 0c, 0d, 0e, 0f, 10)
 #define STR_WALDI "0102030405060708090a0b0c0d0e0f10"
diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c
index 9a0a48131c..9124c0c73a 100644
--- a/src/test/test-install-root.c
+++ b/src/test/test-install-root.c
@@ -17,12 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/fileio.h"
-#include "basic/mkdir.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "shared/install.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/install.h"
 
 static void test_basic_mask_and_enable(const char *root) {
         const char *p;
diff --git a/src/test/test-install.c b/src/test/test-install.c
index 784bcfdd5f..d9b93c306a 100644
--- a/src/test/test-install.c
+++ b/src/test/test-install.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "shared/install.h"
+#include "systemd-shared/install.h"
 
 static void dump_changes(UnitFileChange *c, unsigned n) {
         unsigned i;
diff --git a/src/test/test-io-util.c b/src/test/test-io-util.c
index 496b58eb95..528517af31 100644
--- a/src/test/test-io-util.c
+++ b/src/test/test-io-util.c
@@ -21,10 +21,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/io-util.h"
-#include "basic/macro.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/io-util.h"
+#include "systemd-basic/macro.h"
 
 static void test_sparse_write_one(int fd, const char *buffer, size_t n) {
         char check[n];
diff --git a/src/test/test-ipcrm.c b/src/test/test-ipcrm.c
index a37aa4a10d..9705884b6c 100644
--- a/src/test/test-ipcrm.c
+++ b/src/test/test-ipcrm.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "shared/clean-ipc.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/clean-ipc.h"
 
 int main(int argc, char *argv[]) {
         uid_t uid;
diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c
index 83c8b81690..a76fbc3877 100644
--- a/src/test/test-libudev.c
+++ b/src/test/test-libudev.c
@@ -24,12 +24,12 @@
 
 #include <libudev.h>
 
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/udev-util.h"
 
 static void print_device(struct udev_device *device) {
         const char *str;
diff --git a/src/test/test-list.c b/src/test/test-list.c
index ec32684d78..542e2ef623 100644
--- a/src/test/test-list.c
+++ b/src/test/test-list.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
-#include "basic/util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/util.h"
 
 int main(int argc, const char *argv[]) {
         size_t i;
diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c
index 702134ca46..2e5aa46f13 100644
--- a/src/test/test-locale-util.c
+++ b/src/test/test-locale-util.c
@@ -18,9 +18,9 @@
 ***/
 
 
-#include "basic/locale-util.h"
-#include "basic/macro.h"
-#include "basic/strv.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/strv.h"
 
 static void test_get_locales(void) {
         _cleanup_strv_free_ char **locales = NULL;
diff --git a/src/test/test-log.c b/src/test/test-log.c
index 7a5f78a3d6..5241ba8183 100644
--- a/src/test/test-log.c
+++ b/src/test/test-log.c
@@ -20,9 +20,9 @@
 #include <stddef.h>
 #include <unistd.h>
 
-#include "basic/formats-util.h"
-#include "basic/log.h"
-#include "basic/util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/util.h"
 
 int main(int argc, char* argv[]) {
 
diff --git a/src/test/test-loopback.c b/src/test/test-loopback.c
index 479f74862f..bc5a5eeb2f 100644
--- a/src/test/test-loopback.c
+++ b/src/test/test-loopback.c
@@ -20,8 +20,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "basic/log.h"
 #include "loopback-setup.h"
+#include "systemd-basic/log.h"
 
 int main(int argc, char* argv[]) {
         int r;
diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c
index d877c61756..d1f55abd5d 100644
--- a/src/test/test-namespace.c
+++ b/src/test/test-namespace.c
@@ -19,12 +19,12 @@
 
 #include <sys/socket.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/process-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "namespace.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/process-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 static void test_tmpdir(const char *id, const char *A, const char *B) {
         _cleanup_free_ char *a, *b;
diff --git a/src/test/test-netlink-manual.c b/src/test/test-netlink-manual.c
index 50c960882c..abe705f58e 100644
--- a/src/test/test-netlink-manual.c
+++ b/src/test/test-netlink-manual.c
@@ -24,9 +24,9 @@
 #include <linux/if_tunnel.h>
 #include <linux/ip.h>
 
-#include "basic/macro.h"
-#include "basic/util.h"
-#include "sd-netlink/sd-netlink.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/util.h"
+#include "systemd-staging/sd-netlink.h"
 
 static int load_module(const char *mod_name) {
         struct kmod_ctx *ctx;
diff --git a/src/test/test-ns.c b/src/test/test-ns.c
index 43cbbb69b0..8db88155c5 100644
--- a/src/test/test-ns.c
+++ b/src/test/test-ns.c
@@ -20,8 +20,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "basic/log.h"
 #include "namespace.h"
+#include "systemd-basic/log.h"
 
 int main(int argc, char *argv[]) {
         const char * const writable[] = {
diff --git a/src/test/test-nss.c b/src/test/test-nss.c
index 5be5c409d5..1ccd0def3f 100644
--- a/src/test/test-nss.c
+++ b/src/test/test-nss.c
@@ -21,19 +21,19 @@
 #include <net/if.h>
 #include <stdlib.h>
 
-#include "basic/af-list.h"
-#include "basic/alloc-util.h"
-#include "basic/errno-list.h"
-#include "basic/hexdecoct.h"
-#include "basic/hostname-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/log.h"
-#include "basic/nss-util.h"
-#include "basic/path-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
 #include "sd-netlink/local-addresses.h"
+#include "systemd-basic/af-list.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/errno-list.h"
+#include "systemd-basic/hexdecoct.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/nss-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/stdio-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
 
 static const char* nss_status_to_string(enum nss_status status, char *buf, size_t buf_len) {
         switch (status) {
diff --git a/src/test/test-parse-util.c b/src/test/test-parse-util.c
index 1e90800a33..20c6fd9b92 100644
--- a/src/test/test-parse-util.c
+++ b/src/test/test-parse-util.c
@@ -21,8 +21,8 @@
 #include <locale.h>
 #include <math.h>
 
-#include "basic/log.h"
-#include "basic/parse-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
 
 static void test_parse_boolean(void) {
         assert_se(parse_boolean("1") == 1);
diff --git a/src/test/test-path-lookup.c b/src/test/test-path-lookup.c
index 6c6315bf2d..0d94971580 100644
--- a/src/test/test-path-lookup.c
+++ b/src/test/test-path-lookup.c
@@ -20,11 +20,11 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#include "basic/log.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "shared/path-lookup.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-shared/path-lookup.h"
 
 static void test_paths(UnitFileScope scope) {
         char template[] = "/tmp/test-path-lookup.XXXXXXX";
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index aa1ed1ec81..852c85d2e6 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -21,15 +21,15 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/macro.h"
-#include "basic/mount-util.h"
-#include "basic/path-util.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mount-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 #define test_path_compare(a, b, result) {                 \
                 assert_se(path_compare(a, b) == result);  \
diff --git a/src/test/test-path.c b/src/test/test-path.c
index 1cd09c89d8..56f19b2d0a 100644
--- a/src/test/test-path.c
+++ b/src/test/test-path.c
@@ -20,17 +20,17 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/macro.h"
-#include "basic/mkdir.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
 #include "manager.h"
-#include "shared/tests.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/tests.h"
 #include "unit.h"
 
 #include "test-helper.h"
diff --git a/src/test/test-prioq.c b/src/test/test-prioq.c
index c0917d2187..1f02df4375 100644
--- a/src/test/test-prioq.c
+++ b/src/test/test-prioq.c
@@ -19,11 +19,11 @@
 
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/prioq.h"
-#include "basic/set.h"
-#include "basic/siphash24.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/prioq.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/util.h"
 
 #define SET_SIZE 1024*4
 
diff --git a/src/test/test-proc-cmdline.c b/src/test/test-proc-cmdline.c
index 35e6541150..1fbe620756 100644
--- a/src/test/test-proc-cmdline.c
+++ b/src/test/test-proc-cmdline.c
@@ -17,13 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/proc-cmdline.h"
-#include "basic/special.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/special.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 static int parse_item(const char *key, const char *value) {
         assert_se(key);
diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index 65dc6a9140..01dcee74b0 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -30,18 +30,18 @@
 #include <valgrind/valgrind.h>
 #endif
 
-#include "basic/alloc-util.h"
-#include "basic/architecture.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/parse-util.h"
-#include "basic/process-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
-#include "basic/virt.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/architecture.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.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"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/virt.h"
 
 static void test_get_process_comm(pid_t pid) {
         struct stat st;
diff --git a/src/test/test-ratelimit.c b/src/test/test-ratelimit.c
index 76bd254694..0b867d6801 100644
--- a/src/test/test-ratelimit.c
+++ b/src/test/test-ratelimit.c
@@ -19,9 +19,9 @@
 
 #include <unistd.h>
 
-#include "basic/macro.h"
-#include "basic/ratelimit.h"
-#include "basic/time-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-basic/time-util.h"
 
 static void test_ratelimit_test(void) {
         int i;
diff --git a/src/test/test-replace-var.c b/src/test/test-replace-var.c
index 5dce1d81d7..fbd6b4fa94 100644
--- a/src/test/test-replace-var.c
+++ b/src/test/test-replace-var.c
@@ -19,10 +19,10 @@
 
 #include <string.h>
 
-#include "basic/macro.h"
-#include "basic/replace-var.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/replace-var.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 static char *lookup(const char *variable, void *userdata) {
         return strjoin("<<<", variable, ">>>", NULL);
diff --git a/src/test/test-rlimit-util.c b/src/test/test-rlimit-util.c
index 7a3ed8354d..6d5733b03d 100644
--- a/src/test/test-rlimit-util.c
+++ b/src/test/test-rlimit-util.c
@@ -17,12 +17,12 @@
 
 #include <sys/resource.h>
 
-#include "basic/alloc-util.h"
-#include "basic/capability-util.h"
-#include "basic/macro.h"
-#include "basic/rlimit-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/rlimit-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 static void test_rlimit_parse_format(int resource, const char *string, rlim_t soft, rlim_t hard, int ret, const char *formatted) {
         _cleanup_free_ char *f = NULL;
diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c
index a0f46ad1c9..d903354049 100644
--- a/src/test/test-sched-prio.c
+++ b/src/test/test-sched-prio.c
@@ -19,10 +19,10 @@
 
 #include <sched.h>
 
-#include "basic/macro.h"
-#include "basic/rm-rf.h"
 #include "manager.h"
-#include "shared/tests.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-shared/tests.h"
 
 #include "test-helper.h"
 
diff --git a/src/test/test-selinux.c b/src/test/test-selinux.c
index 326c24e6c4..244bc218d6 100644
--- a/src/test/test-selinux.c
+++ b/src/test/test-selinux.c
@@ -19,13 +19,13 @@
 
 #include <sys/stat.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/selinux-util.h"
-#include "basic/string-util.h"
-#include "basic/time-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/util.h"
 
 static void test_testing(void) {
         bool b;
diff --git a/src/test/test-set.c b/src/test/test-set.c
index 59f3366b44..7ba5524939 100644
--- a/src/test/test-set.c
+++ b/src/test/test-set.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/set.h"
+#include "systemd-basic/set.h"
 
 static void test_set_steal_first(void) {
         _cleanup_set_free_ Set *m = NULL;
diff --git a/src/test/test-sigbus.c b/src/test/test-sigbus.c
index ecbb0f87ea..8f6bc1ef2f 100644
--- a/src/test/test-sigbus.c
+++ b/src/test/test-sigbus.c
@@ -19,9 +19,9 @@
 
 #include <sys/mman.h>
 
-#include "basic/fd-util.h"
-#include "basic/sigbus.h"
-#include "basic/util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/sigbus.h"
+#include "systemd-basic/util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_close_ int fd = -1;
diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
index 74e34394ab..3feb681645 100644
--- a/src/test/test-signal-util.c
+++ b/src/test/test-signal-util.c
@@ -20,8 +20,8 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "basic/macro.h"
-#include "basic/signal-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/signal-util.h"
 
 static void test_block_signals(void) {
         sigset_t ss;
diff --git a/src/test/test-siphash24.c b/src/test/test-siphash24.c
index 2c40776dd0..6ed4ce6e60 100644
--- a/src/test/test-siphash24.c
+++ b/src/test/test-siphash24.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/siphash24.h"
-#include "basic/util.h"
+#include "systemd-basic/siphash24.h"
+#include "systemd-basic/util.h"
 
 #define ITERATIONS 10000000ULL
 
diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c
index 6869846e98..7330c8ba5b 100644
--- a/src/test/test-sizeof.c
+++ b/src/test/test-sizeof.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/log.h"
-#include "basic/time-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/time-util.h"
 
 /* Print information about various types. Useful when diagnosing
  * gcc diagnostics on an unfamiliar architecture. */
diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c
index b8ddc53ed0..0c78f68ca8 100644
--- a/src/test/test-sleep.c
+++ b/src/test/test-sleep.c
@@ -19,10 +19,10 @@
 
 #include <stdio.h>
 
-#include "basic/log.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "shared/sleep-config.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/sleep-config.h"
 
 static void test_sleep(void) {
         _cleanup_strv_free_ char
diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c
index 44786ee262..85a5ebcced 100644
--- a/src/test/test-socket-util.c
+++ b/src/test/test-socket-util.c
@@ -17,15 +17,15 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/async.h"
-#include "basic/fd-util.h"
-#include "basic/in-addr-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/async.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/in-addr-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 static void test_ifname_valid(void) {
         assert(ifname_valid("foo"));
diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c
index 941a38b1fb..e183ef101f 100644
--- a/src/test/test-stat-util.c
+++ b/src/test/test-stat-util.c
@@ -20,11 +20,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/macro.h"
-#include "basic/stat-util.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/stat-util.h"
 
 static void test_files_same(void) {
         _cleanup_close_ int fd = -1;
diff --git a/src/test/test-strbuf.c b/src/test/test-strbuf.c
index 74b5c03f7b..a9af4bc5a9 100644
--- a/src/test/test-strbuf.c
+++ b/src/test/test-strbuf.c
@@ -20,10 +20,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/strbuf.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/strbuf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 static ssize_t add_string(struct strbuf *sb, const char *s) {
         return strbuf_add_string(sb, s, strlen(s));
diff --git a/src/test/test-string-util.c b/src/test/test-string-util.c
index 7f867a2ced..52bc529a6e 100644
--- a/src/test/test-string-util.c
+++ b/src/test/test-string-util.c
@@ -17,10 +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 "basic/strv.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
 
 static void test_string_erase(void) {
         char *x;
diff --git a/src/test/test-strip-tab-ansi.c b/src/test/test-strip-tab-ansi.c
index a9569e527b..33f06e04ef 100644
--- a/src/test/test-strip-tab-ansi.c
+++ b/src/test/test-strip-tab-ansi.c
@@ -19,9 +19,9 @@
 
 #include <stdio.h>
 
-#include "basic/string-util.h"
-#include "basic/terminal-util.h"
-#include "basic/util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/util.h"
 
 int main(int argc, char *argv[]) {
         char *p;
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index 0ad23ef3bb..ebee80d08e 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -20,11 +20,11 @@
 
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
-#include "shared/specifier.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/specifier.h"
 
 static void test_specifier_printf(void) {
         static const Specifier table[] = {
diff --git a/src/test/test-strxcpyx.c b/src/test/test-strxcpyx.c
index b5c6d5f191..0e9c78d4a3 100644
--- a/src/test/test-strxcpyx.c
+++ b/src/test/test-strxcpyx.c
@@ -19,9 +19,9 @@
 
 #include <string.h>
 
-#include "basic/string-util.h"
-#include "basic/strxcpyx.h"
-#include "basic/util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strxcpyx.h"
+#include "systemd-basic/util.h"
 
 static void test_strpcpy(void) {
         char target[25];
diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index 51ac9632f8..2fd3e00e82 100644
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -18,19 +18,12 @@
 ***/
 
 #include "automount.h"
-#include "basic/architecture.h"
-#include "basic/locale-util.h"
-#include "basic/log.h"
-#include "basic/rlimit-util.h"
-#include "basic/socket-util.h"
-#include "basic/unit-name.h"
-#include "basic/util.h"
 #include "busname.h"
 #include "cgroup.h"
 #include "device.h"
 #include "execute.h"
 #include "job.h"
-#include "journald-server.h"
+#include "journal-core/journald-server.h"
 #include "kill.h"
 #include "link-config.h"
 #include "mount.h"
@@ -38,13 +31,20 @@
 #include "scope.h"
 #include "sd-journal/compress.h"
 #include "service.h"
-#include "shared/condition.h"
-#include "shared/install.h"
-#include "shared/logs-show.h"
-#include "shared/test-tables.h"
 #include "slice.h"
 #include "socket.h"
 #include "swap.h"
+#include "systemd-basic/architecture.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/rlimit-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/condition.h"
+#include "systemd-shared/install.h"
+#include "systemd-shared/logs-show.h"
+#include "systemd-shared/test-tables.h"
 #include "target.h"
 #include "timer.h"
 #include "unit.h"
diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c
index bcdc048196..a8f3d44ece 100644
--- a/src/test/test-terminal-util.c
+++ b/src/test/test-terminal-util.c
@@ -21,12 +21,12 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/terminal-util.h"
-#include "basic/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/terminal-util.h"
+#include "systemd-basic/util.h"
 
 static void test_default_term_for_tty(void) {
         puts(default_term_for_tty("/dev/tty23"));
diff --git a/src/test/test-time.c b/src/test/test-time.c
index d6ff1f958f..77f3474494 100644
--- a/src/test/test-time.c
+++ b/src/test/test-time.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/strv.h"
-#include "basic/time-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/time-util.h"
 
 static void test_parse_sec(void) {
         usec_t u;
diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c
index df262e0b92..1c88434d0b 100644
--- a/src/test/test-tmpfiles.c
+++ b/src/test/test-tmpfiles.c
@@ -22,14 +22,14 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/formats-util.h"
-#include "basic/fs-util.h"
-#include "basic/log.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/fs-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_free_ char *cmd = NULL, *cmd2 = NULL, *ans = NULL, *ans2 = NULL, *d = NULL, *tmp = NULL, *line = NULL;
diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index 1f6dc878c8..042dfbd2fd 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -26,13 +26,13 @@
 #include <sys/signalfd.h>
 #include <unistd.h>
 
-#include "basic/fs-util.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/selinux-util.h"
-#include "basic/signal-util.h"
-#include "basic/string-util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/udev-util.h"
 #include "udev.h"
 
 static int fake_filesystems(void) {
diff --git a/src/test/test-uid-range.c b/src/test/test-uid-range.c
index bb79ae6c3e..6c9a7864f2 100644
--- a/src/test/test-uid-range.c
+++ b/src/test/test-uid-range.c
@@ -19,10 +19,10 @@
 
 #include <stddef.h>
 
-#include "basic/alloc-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "shared/uid-range.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/uid-range.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_free_ UidRange *p = NULL;
diff --git a/src/test/test-unaligned.c b/src/test/test-unaligned.c
index 0568211e0c..14a272c0b7 100644
--- a/src/test/test-unaligned.c
+++ b/src/test/test-unaligned.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/sparse-endian.h"
-#include "basic/unaligned.h"
-#include "basic/util.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-basic/unaligned.h"
+#include "systemd-basic/util.h"
 
 static uint8_t data[] = {
         0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index ba21dbcc83..b94a5f8219 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -25,23 +25,23 @@
 #include <sys/capability.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/capability-util.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/hashmap.h"
-#include "basic/hostname-util.h"
-#include "basic/macro.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
 #include "load-fragment.h"
-#include "shared/install-printf.h"
-#include "shared/install.h"
-#include "shared/specifier.h"
-#include "shared/tests.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/hashmap.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/install-printf.h"
+#include "systemd-shared/install.h"
+#include "systemd-shared/specifier.h"
+#include "systemd-shared/tests.h"
 
 #include "test-helper.h"
 
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index e17355eac1..1bf6b35f7b 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -24,17 +24,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/glob-util.h"
-#include "basic/hostname-util.h"
-#include "basic/macro.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/unit-name.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
 #include "manager.h"
-#include "shared/specifier.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/glob-util.h"
+#include "systemd-basic/hostname-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/unit-name.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/specifier.h"
 #include "unit-printf.h"
 #include "unit.h"
 
diff --git a/src/test/test-user-util.c b/src/test/test-user-util.c
index 8460396b2c..16311d2264 100644
--- a/src/test/test-user-util.c
+++ b/src/test/test-user-util.c
@@ -17,11 +17,11 @@
   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 "basic/user-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 static void test_uid_to_name_one(uid_t uid, const char *name) {
         _cleanup_free_ char *t = NULL;
diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
index e6cfdac8ed..dcaedd632f 100644
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
-#include "basic/utf8.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/utf8.h"
+#include "systemd-basic/util.h"
 
 static void test_utf8_is_printable(void) {
         assert_se(utf8_is_printable("ascii is valid\tunicode", 22));
diff --git a/src/test/test-util.c b/src/test/test-util.c
index c0ac362c9d..45e5bfac18 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -23,14 +23,14 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "basic/def.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/parse-util.h"
-#include "basic/raw-clone.h"
-#include "basic/rm-rf.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/raw-clone.h"
+#include "systemd-basic/rm-rf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 static void test_align_power2(void) {
         unsigned long i, p2;
diff --git a/src/test/test-verbs.c b/src/test/test-verbs.c
index 01a0ded37b..c426f89ded 100644
--- a/src/test/test-verbs.c
+++ b/src/test/test-verbs.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/macro.h"
-#include "basic/strv.h"
-#include "basic/verbs.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/verbs.h"
 
 static int noop_dispatcher(int argc, char *argv[], void *userdata) {
         return 0;
diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c
index 64814fc174..5a918b2658 100644
--- a/src/test/test-watchdog.c
+++ b/src/test/test-watchdog.c
@@ -19,8 +19,8 @@
 
 #include <unistd.h>
 
-#include "basic/log.h"
-#include "shared/watchdog.h"
+#include "systemd-basic/log.h"
+#include "systemd-shared/watchdog.h"
 
 int main(int argc, char *argv[]) {
         usec_t t = 10 * USEC_PER_SEC;
diff --git a/src/test/test-web-util.c b/src/test/test-web-util.c
index 4907a5544c..a95d3c7ec0 100644
--- a/src/test/test-web-util.c
+++ b/src/test/test-web-util.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/macro.h"
-#include "basic/web-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/web-util.h"
 
 static void test_is_valid_documentation_url(void) {
         assert_se(documentation_url_is_valid("http://www.freedesktop.org/wiki/Software/systemd"));
diff --git a/src/test/test-xattr-util.c b/src/test/test-xattr-util.c
index 1a78e54d3c..c067f2eaaf 100644
--- a/src/test/test-xattr-util.c
+++ b/src/test/test-xattr-util.c
@@ -23,12 +23,12 @@
 #include <sys/xattr.h>
 #include <unistd.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/xattr-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/xattr-util.h"
 
 static void test_fgetxattrat_fake(void) {
         char t[] = "/var/tmp/xattrtestXXXXXX";
diff --git a/src/test/test-xml.c b/src/test/test-xml.c
index 22e92b2075..03c32d5102 100644
--- a/src/test/test-xml.c
+++ b/src/test/test-xml.c
@@ -19,10 +19,10 @@
 
 #include <stdarg.h>
 
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "basic/xml.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/xml.h"
 
 static void test_one(const char *data, ...) {
         void *state = NULL;
diff --git a/tools/make-man-rules.py b/tools/make-man-rules.py
index 5e61917d60..0e755151d8 100644
--- a/tools/make-man-rules.py
+++ b/tools/make-man-rules.py
@@ -33,7 +33,7 @@ MANPAGES_ALIAS += \\
 '''
 
 CONDITIONAL = '''\
-if {conditional}
+ifneq ($({conditional}),)
 ''' \
 + SECTION + \
 '''\
diff --git a/tools/notsd-fixup b/tools/notsd-fixup
index 77df56fff4..99ae0981a3 100755
--- a/tools/notsd-fixup
+++ b/tools/notsd-fixup
@@ -22,12 +22,17 @@ fixup_makefiles() (
 )
 
 fixup_includes() (
-	find $(find . -type d -name include) -type d | while read -r dir; do
-		lib="${dir##*/}"
-		pushd "$dir" >/dev/null
-		find . -type f -exec sed -ri -e "s|$lib/||" -- {} +
-		popd >/dev/null
-	done
+	dirs=($(find "$@" -type d -name include))
+	if [[ ${#dirs[@]} -gt 0 ]]; then
+		find "${dirs[@]}" -type d | while read -r dir; do
+			printf '=> libdir %q\n' "$dir"
+			lib="${dir##*/}"
+			find "$dir" -type f | while read -r filename; do
+				printf ' => sed -ir %q %q\n' "s|$lib/||" "$filename"
+				sed -r "s|$lib/||" < "$filename" | build-aux/write-ifchanged "$filename"
+			done
+		done
+	fi
 
 	find "$@" \( -name '*.h' -o -name '*.c' -o -name '*.gperf' \) -type f | while read -r filename; do
 		"$0"--includes "$filename"
diff --git a/tools/notsd-fixup--includes b/tools/notsd-fixup--includes
index 315be32c8d..33218233d5 100755
--- a/tools/notsd-fixup--includes
+++ b/tools/notsd-fixup--includes
@@ -33,7 +33,7 @@ classify() {
 				case "$base" in
 					dns_type)	     d=src/grp-resolve/systemd-resolved;;
 					keyboard-keys)	     d=src/grp-udev/libudev-core;;
-					af|arphrd|cap|errno) d=src/libbasic/include/basic;;
+					af|arphrd|cap|errno) d=src/libsystemd-basic/src;;
 					audit_type)	     d=src/libsystemd/src/sd-journal;;
 					*)
 						>&2 printf 'Unknown gperf base: %q\n' "$base"
@@ -57,7 +57,7 @@ classify() {
 				if [[ "$current_file" = */systemd-boot/* ]]; then
 					out private util.h
 				else
-					out protected basic/util.h
+					out protected systemd-basic/util.h
 				fi
 				;;
 			*)
@@ -77,6 +77,9 @@ classify() {
 						*/include/*)
 							out protected "${file##*/include/}"
 							;;
+						*/include-staging/*)
+							out protected "${file##*/include-staging/}"
+							;;
 						*)
 							if [[ "${current_file%/*}" = "${file%/*}" ]]; then
 								out private "${file##*/}"
@@ -219,7 +222,6 @@ main() {
 	current_file="$1"
 	printf ' => %q %q\n' "$0" "$current_file"
 	set -o pipefail
-	trap 'rm -f -- "$current_file.tmp"' EXIT
 	{
 		IFS=''
 		while read -r line; do
@@ -227,14 +229,7 @@ main() {
 			IFS=''
 		done
 		"$hook"
-	} < "$current_file" > "$current_file.tmp"
-	# I specificially don't use write-ifchanged because I don't want the
-	# temporary file to have the .c suffix.
-	if cmp -s "$current_file.tmp" "$current_file"; then
-		rm -f "$current_file.tmp" || :
-	else
-		mv -Tf "$current_file.tmp" "$current_file"
-	fi
+	} < "$current_file" | build-aux/write-ifchanged "$current_file"
 }
 
 main "$@"