11 files changed, 29 insertions, 27 deletions
diff --git a/src/grp-udev/udevadm/Makefile b/src/grp-udev/udevadm/Makefile
index ba3b466935..ef173b234b 100644
--- a/src/grp-udev/udevadm/Makefile
+++ b/src/grp-udev/udevadm/Makefile
@@ -42,4 +42,6 @@ udevadm_SOURCES = \
 udevadm_LDADD = \
 	libudev-core.la
 
+systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/udevadm/udevadm-control.c b/src/grp-udev/udevadm/udevadm-control.c
index 989decbe95..8aaef5fa14 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 "udev-util.h"
+#include "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 948ad0f5a5..264e8027e2 100644
--- a/src/grp-udev/udevadm/udevadm-hwdb.c
+++ b/src/grp-udev/udevadm/udevadm-hwdb.c
@@ -22,16 +22,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "alloc-util.h"
-#include "conf-files.h"
-#include "fileio.h"
-#include "fs-util.h"
-#include "hwdb-internal.h"
-#include "hwdb-util.h"
-#include "strbuf.h"
-#include "string-util.h"
+#include "basic/alloc-util.h"
+#include "basic/conf-files.h"
+#include "basic/fileio.h"
+#include "basic/fs-util.h"
+#include "sd-hwdb/hwdb-internal.h"
+#include "sd-hwdb/hwdb-util.h"
+#include "basic/strbuf.h"
+#include "basic/string-util.h"
 #include "udev.h"
-#include "util.h"
+#include "basic/util.h"
 
 /*
  * Generic udev properties, key/value database based on modalias strings.
diff --git a/src/grp-udev/udevadm/udevadm-info.c b/src/grp-udev/udevadm/udevadm-info.c
index 7182668f23..9694a991ec 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 "fd-util.h"
-#include "string-util.h"
-#include "udev-util.h"
+#include "basic/fd-util.h"
+#include "basic/string-util.h"
+#include "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 c0ef073476..01f322f721 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 "fd-util.h"
-#include "formats-util.h"
-#include "udev-util.h"
+#include "basic/fd-util.h"
+#include "basic/formats-util.h"
+#include "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 6a5dc6e9e4..8b32e58a0c 100644
--- a/src/grp-udev/udevadm/udevadm-settle.c
+++ b/src/grp-udev/udevadm/udevadm-settle.c
@@ -26,9 +26,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "parse-util.h"
+#include "basic/parse-util.h"
 #include "udev.h"
-#include "util.h"
+#include "basic/util.h"
 
 static void help(void) {
         printf("%s settle OPTIONS\n\n"
diff --git a/src/grp-udev/udevadm/udevadm-test-builtin.c b/src/grp-udev/udevadm/udevadm-test-builtin.c
index 0b180d03eb..a3a66e05d7 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 "string-util.h"
+#include "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 702dbe5282..ed919ec244 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 "string-util.h"
-#include "udev-util.h"
+#include "basic/string-util.h"
+#include "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 9d52345d92..89ca90d01b 100644
--- a/src/grp-udev/udevadm/udevadm-trigger.c
+++ b/src/grp-udev/udevadm/udevadm-trigger.c
@@ -23,11 +23,11 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "string-util.h"
-#include "udev-util.h"
+#include "basic/string-util.h"
+#include "shared/udev-util.h"
 #include "udev.h"
 #include "udevadm-util.h"
-#include "util.h"
+#include "basic/util.h"
 
 static int verbose;
 static int dry_run;
diff --git a/src/grp-udev/udevadm/udevadm-util.c b/src/grp-udev/udevadm/udevadm-util.c
index 3539c1d6ab..4ae5e6c7ef 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 "string-util.h"
+#include "basic/string-util.h"
 #include "udevadm-util.h"
 
 struct udev_device *find_device(struct udev *udev,
diff --git a/src/grp-udev/udevadm/udevadm.c b/src/grp-udev/udevadm/udevadm.c
index a6a873e5de..555d269275 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 "selinux-util.h"
-#include "string-util.h"
+#include "basic/selinux-util.h"
+#include "basic/string-util.h"
 #include "udev.h"
 
 static int adm_version(struct udev *udev, int argc, char *argv[]) {