12 files changed, 43 insertions, 41 deletions
diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile
index ed606315e1..77fc1fe6aa 100644
--- a/src/libudev/src/Makefile
+++ b/src/libudev/src/Makefile
@@ -67,9 +67,9 @@ noinst_LTLIBRARIES += \
 libudev_internal_la_SOURCES =\
 	$(libudev_la_SOURCES)
 
-test-libudev-sym.c: \
-		src/libudev/libudev.sym \
-		src/udev/udev.h
+$(outdir)/test-libudev-sym.c: \
+		$(srcdir)/libudev.sym \
+		$(srcdir)/udev.h
 	$(generate-sym-test)
 
 nodist_test_libudev_sym_SOURCES = \
@@ -80,4 +80,6 @@ test_libudev_sym_CFLAGS = \
 test_libudev_sym_LDADD = \
 	libudev.la
 
+systemd.sed_files += libudev.pc
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libudev/src/libudev-device-private.c b/src/libudev/src/libudev-device-private.c
index 2aae0726c1..bd18d60c1e 100644
--- a/src/libudev/src/libudev-device-private.c
+++ b/src/libudev/src/libudev-device-private.c
@@ -20,7 +20,7 @@
 
 #include "libudev.h"
 
-#include "device-private.h"
+#include "sd-device/device-private.h"
 #include "libudev-device-internal.h"
 #include "libudev-private.h"
 
diff --git a/src/libudev/src/libudev-device.c b/src/libudev/src/libudev-device.c
index 6536f4cfbb..3ad59176b3 100644
--- a/src/libudev/src/libudev-device.c
+++ b/src/libudev/src/libudev-device.c
@@ -37,12 +37,12 @@
 #include "libudev.h"
 #include <systemd/sd-device.h>
 
-#include "alloc-util.h"
-#include "device-private.h"
-#include "device-util.h"
+#include "basic/alloc-util.h"
+#include "sd-device/device-private.h"
+#include "sd-device/device-util.h"
 #include "libudev-device-internal.h"
 #include "libudev-private.h"
-#include "parse-util.h"
+#include "basic/parse-util.h"
 
 /**
  * SECTION:libudev-device
diff --git a/src/libudev/src/libudev-enumerate.c b/src/libudev/src/libudev-enumerate.c
index 9910cea957..a58779866e 100644
--- a/src/libudev/src/libudev-enumerate.c
+++ b/src/libudev/src/libudev-enumerate.c
@@ -31,9 +31,9 @@
 #include "libudev.h"
 #include <systemd/sd-device.h>
 
-#include "alloc-util.h"
-#include "device-enumerator-private.h"
-#include "device-util.h"
+#include "basic/alloc-util.h"
+#include "sd-device/device-enumerator-private.h"
+#include "sd-device/device-util.h"
 #include "libudev-device-internal.h"
 
 /**
diff --git a/src/libudev/src/libudev-hwdb.c b/src/libudev/src/libudev-hwdb.c
index 8c4b488086..436e2ccb67 100644
--- a/src/libudev/src/libudev-hwdb.c
+++ b/src/libudev/src/libudev-hwdb.c
@@ -19,8 +19,8 @@
 
 #include <systemd/sd-hwdb.h>
 
-#include "alloc-util.h"
-#include "hwdb-util.h"
+#include "basic/alloc-util.h"
+#include "sd-hwdb/hwdb-util.h"
 #include "libudev-private.h"
 
 /**
diff --git a/src/libudev/src/libudev-list.c b/src/libudev/src/libudev-list.c
index da496ed456..ed40ab2600 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 "alloc-util.h"
+#include "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 f870eba9eb..b15869ea2e 100644
--- a/src/libudev/src/libudev-monitor.c
+++ b/src/libudev/src/libudev-monitor.c
@@ -30,15 +30,15 @@
 
 #include "libudev.h"
 
-#include "alloc-util.h"
-#include "fd-util.h"
-#include "fileio.h"
-#include "formats-util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "basic/fileio.h"
+#include "basic/formats-util.h"
 #include "libudev-private.h"
-#include "missing.h"
-#include "mount-util.h"
-#include "socket-util.h"
-#include "string-util.h"
+#include "basic/missing.h"
+#include "basic/mount-util.h"
+#include "basic/socket-util.h"
+#include "basic/string-util.h"
 
 /**
  * SECTION:libudev-monitor
diff --git a/src/libudev/src/libudev-private.h b/src/libudev/src/libudev-private.h
index 52c5075110..717601766c 100644
--- a/src/libudev/src/libudev-private.h
+++ b/src/libudev/src/libudev-private.h
@@ -26,10 +26,10 @@
 
 #include "libudev.h"
 
-#include "macro.h"
-#include "mkdir.h"
-#include "strxcpyx.h"
-#include "util.h"
+#include "basic/macro.h"
+#include "basic/mkdir.h"
+#include "basic/strxcpyx.h"
+#include "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 e3dffa6925..31386282b7 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 "alloc-util.h"
-#include "fd-util.h"
-#include "io-util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
+#include "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 574cfeac85..be1b851aa4 100644
--- a/src/libudev/src/libudev-util.c
+++ b/src/libudev/src/libudev-util.c
@@ -26,11 +26,11 @@
 
 #include "libudev.h"
 
-#include "MurmurHash2.h"
-#include "device-nodes.h"
+#include "basic/MurmurHash2.h"
+#include "basic/device-nodes.h"
 #include "libudev-private.h"
-#include "syslog-util.h"
-#include "utf8.h"
+#include "basic/syslog-util.h"
+#include "basic/utf8.h"
 
 /**
  * SECTION:libudev-util
diff --git a/src/libudev/src/libudev.c b/src/libudev/src/libudev.c
index 63fb05547d..bdb26d8873 100644
--- a/src/libudev/src/libudev.c
+++ b/src/libudev/src/libudev.c
@@ -26,11 +26,11 @@
 
 #include "libudev.h"
 
-#include "alloc-util.h"
-#include "fd-util.h"
+#include "basic/alloc-util.h"
+#include "basic/fd-util.h"
 #include "libudev-private.h"
-#include "missing.h"
-#include "string-util.h"
+#include "basic/missing.h"
+#include "basic/string-util.h"
 
 /**
  * SECTION:libudev
diff --git a/src/libudev/src/udev.h b/src/libudev/src/udev.h
index 00de88972a..7b5a308e58 100644
--- a/src/libudev/src/udev.h
+++ b/src/libudev/src/udev.h
@@ -25,11 +25,11 @@
 #include "libudev.h"
 #include <systemd/sd-netlink.h>
 
-#include "label.h"
+#include "basic/label.h"
 #include "libudev-private.h"
-#include "macro.h"
-#include "strv.h"
-#include "util.h"
+#include "basic/macro.h"
+#include "basic/strv.h"
+#include "basic/util.h"
 
 struct udev_event {
         struct udev *udev;