device-util: Reduce transitive includes

src/libsystemd/sd-device/device-util.c

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "device-private.h"
 #include "device-util.h"
 #include "devnum-util.h"

src/libsystemd/sd-device/device-util.h

@@ -10,7 +10,6 @@
 #include "alloc-util.h"
 #include "log.h"
 #include "macro.h"
-#include "strv.h"
 
 #define device_unref_and_replace(a, b)                                  \
         unref_and_replace_full(a, b, sd_device_ref, sd_device_unref)
@@ -107,4 +106,4 @@ char** device_make_log_fields(sd_device *device);
 bool device_in_subsystem(sd_device *device, const char *subsystem);
 bool device_is_devtype(sd_device *device, const char *devtype);
 
-bool device_property_can_set(const char *property);
+bool device_property_can_set(const char *property) _pure_;

src/shared/blockdev-list.c

@@ -7,6 +7,7 @@
 #include "blockdev-util.h"
 #include "device-util.h"
 #include "macro.h"
+#include "strv.h"
 #include "terminal-util.h"
 
 int blockdev_list(BlockDevListFlags flags) {

src/shared/netif-util.c

@@ -3,6 +3,7 @@
 #include <linux/if.h>
 #include <linux/if_arp.h>
 
+#include "alloc-util.h"
 #include "arphrd-util.h"
 #include "device-util.h"
 #include "hexdecoct.h"

src/shared/udev-util.c

@@ -19,6 +19,7 @@
 #include "signal-util.h"
 #include "stat-util.h"
 #include "string-util.h"
+#include "strv.h"
 #include "udev-util.h"
 #include "utf8.h"
 

src/sleep/battery-capacity.c

@@ -2,6 +2,7 @@
 
 #include "sd-device.h"
 
+#include "alloc-util.h"
 #include "battery-capacity.h"
 #include "battery-util.h"
 #include "device-private.h"

src/storagetm/storagetm.c

@@ -28,6 +28,7 @@
 #include "random-util.h"
 #include "recurse-dir.h"
 #include "socket-util.h"
+#include "strv.h"
 #include "terminal-util.h"
 #include "udev-util.h"
 

src/sysupdate/sysupdate-resource.c

@@ -24,6 +24,7 @@
 #include "process-util.h"
 #include "sort-util.h"
 #include "string-table.h"
+#include "strv.h"
 #include "sysupdate.h"
 #include "sysupdate-cache.h"
 #include "sysupdate-instance.h"

src/udev/iocost/iocost.c

@@ -17,6 +17,7 @@
 #include "path-util.h"
 #include "pretty-print.h"
 #include "string-util.h"
+#include "strv.h"
 #include "udev-util.h"
 #include "verbs.h"
 

src/udev/udev-builtin.c

@@ -3,6 +3,7 @@
 #include <getopt.h>
 #include <stdio.h>
 
+#include "alloc-util.h"
 #include "bitfield.h"
 #include "device-private.h"
 #include "device-util.h"

src/udev/udev-dump.c

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "alloc-util.h"
 #include "ansi-color.h"
 #include "device-private.h"
 #include "device-util.h"
@@ -8,6 +9,7 @@
 #include "fs-util.h"
 #include "json-util.h"
 #include "parse-util.h"
+#include "strv.h"
 #include "udev-builtin.h"
 #include "udev-dump.h"
 #include "udev-event.h"

src/udev/udev-manager.c

@@ -21,6 +21,7 @@
 #include "signal-util.h"
 #include "socket-util.h"
 #include "string-util.h"
+#include "strv.h"
 #include "syslog-util.h"
 #include "udev-builtin.h"
 #include "udev-config.h"

src/udev/udev-node.c

@@ -24,6 +24,7 @@
 #include "smack-util.h"
 #include "stat-util.h"
 #include "string-util.h"
+#include "strv.h"
 #include "udev-node.h"
 #include "user-util.h"
 

src/udev/udev-worker.c

@@ -18,6 +18,7 @@
 #include "process-util.h"
 #include "signal-util.h"
 #include "string-util.h"
+#include "strv.h"
 #include "udev-error.h"
 #include "udev-event.h"
 #include "udev-rules.h"

src/udev/udevadm-info.c

@@ -30,6 +30,7 @@
 #include "static-destruct.h"
 #include "string-table.h"
 #include "string-util.h"
+#include "strv.h"
 #include "terminal-util.h"
 #include "udev-util.h"
 #include "udevadm.h"

src/validatefs/validatefs.c

@@ -16,6 +16,7 @@
 #include "path-util.h"
 #include "pretty-print.h"
 #include "string-util.h"
+#include "strv.h"
 #include "utf8.h"
 #include "xattr-util.h"