12 files changed, 38 insertions, 38 deletions
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"