11 files changed, 21 insertions, 15 deletions
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
index e98425841f..6c2233e430 100644
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -24,9 +24,10 @@
 #include <unistd.h>
 
 #include "fd-util.h"
-#include "libudev-private.h"
+#include "libudev-util.h"
 #include "log.h"
 #include "udev-util.h"
+#include "util.h"
 
 #define COMMAND_TIMEOUT_MSEC (30 * 1000)
 
diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
index 2cace552f2..e50edb20b3 100644
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -19,9 +19,10 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
-#include "libudev-private.h"
+#include "libudev-util.h"
 #include "scsi_id.h"
 #include "string-util.h"
+#include "strxcpyx.h"
 #include "udev-util.h"
 
 static const struct option options[] = {
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index e8581a4869..94f2740592 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -18,7 +18,7 @@
 #include "alloc-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"
-#include "libudev-private.h"
+#include "libudev-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "sysexits.h"
diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
index 73f53b31a4..3525d25048 100644
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -18,8 +18,9 @@
 #include "alloc-util.h"
 #include "device-util.h"
 #include "fd-util.h"
-#include "libudev-private.h"
+#include "libudev-util.h"
 #include "string-util.h"
+#include "strxcpyx.h"
 #include "udev-builtin.h"
 
 static void set_usb_iftype(char *to, int if_class_num, size_t len) {
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 40f4dac05e..cc7efbb81e 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -16,13 +16,15 @@
 #include "device-util.h"
 #include "fd-util.h"
 #include "format-util.h"
-#include "libudev-private.h"
+#include "libudev-util.h"
 #include "netlink-util.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "signal-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
+#include "strv.h"
+#include "strxcpyx.h"
 #include "udev-builtin.h"
 #include "udev-node.h"
 #include "udev-watch.h"
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index 94bebd69c7..648a102265 100644
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -17,12 +17,14 @@
 #include "fd-util.h"
 #include "format-util.h"
 #include "fs-util.h"
-#include "libudev-private.h"
+#include "libudev-util.h"
+#include "mkdir.h"
 #include "path-util.h"
 #include "selinux-util.h"
 #include "smack-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
+#include "strxcpyx.h"
 #include "udev-node.h"
 
 static int node_symlink(sd_device *dev, const char *node, const char *slink) {
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index c52f93af1c..c470338807 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -23,7 +23,8 @@
 #include "fileio.h"
 #include "fs-util.h"
 #include "glob-util.h"
-#include "libudev-private.h"
+#include "libudev-util.h"
+#include "mkdir.h"
 #include "path-util.h"
 #include "proc-cmdline.h"
 #include "stat-util.h"
@@ -31,6 +32,7 @@
 #include "strbuf.h"
 #include "string-util.h"
 #include "strv.h"
+#include "strxcpyx.h"
 #include "sysctl-util.h"
 #include "udev-builtin.h"
 #include "udev.h"
diff --git a/src/udev/udev.h b/src/udev/udev.h
index 9de5280ffa..320f9a1534 100644
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -5,18 +5,11 @@
  * Copyright © 2003 Greg Kroah-Hartman <greg@kroah.com>
  */
 
-#include <sys/param.h>
-#include <sys/sysmacros.h>
-#include <sys/types.h>
-
 #include "sd-device.h"
 #include "sd-netlink.h"
 
 #include "hashmap.h"
-#include "label.h"
-#include "libudev-private.h"
 #include "macro.h"
-#include "strv.h"
 #include "udev-util.h"
 #include "util.h"
 
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index 6960324516..a2a8893870 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -13,7 +13,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "libudev-private.h"
+#include "libudev-util.h"
 #include "time-util.h"
 #include "udevadm.h"
 #include "udev-ctrl.h"
diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c
index 6f3b6099a9..2ee78da51b 100644
--- a/src/udev/udevadm-test.c
+++ b/src/udev/udevadm-test.c
@@ -16,7 +16,9 @@
 
 #include "device-private.h"
 #include "device-util.h"
+#include "libudev-util.h"
 #include "string-util.h"
+#include "strxcpyx.h"
 #include "udev-builtin.h"
 #include "udev.h"
 #include "udevadm.h"
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index a6d6bbf5fd..516453877f 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -46,6 +46,7 @@
 #include "io-util.h"
 #include "libudev-device-internal.h"
 #include "list.h"
+#include "mkdir.h"
 #include "netlink-util.h"
 #include "parse-util.h"
 #include "proc-cmdline.h"
@@ -54,6 +55,7 @@
 #include "signal-util.h"
 #include "socket-util.h"
 #include "string-util.h"
+#include "strxcpyx.h"
 #include "syslog-util.h"
 #include "terminal-util.h"
 #include "udev-builtin.h"