wip

52 files changed, 185 insertions, 179 deletions

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[] = {