test: drop bus-util.h from sd-bus

To drop src/shared from include directories to build libsystemd.so later.

src/libsystemd/sd-bus/bus-control.c

@@ -13,7 +13,6 @@
 #include "bus-control.h"
 #include "bus-internal.h"
 #include "bus-message.h"
-#include "bus-util.h"
 #include "capability-util.h"
 #include "process-util.h"
 #include "stdio-util.h"

src/libsystemd/sd-bus/bus-convenience.c

@@ -7,7 +7,6 @@
 #include "bus-message.h"
 #include "bus-signature.h"
 #include "bus-type.h"
-#include "bus-util.h"
 #include "string-util.h"
 
 _public_ int sd_bus_emit_signalv(

src/libsystemd/sd-bus/bus-creds.c

@@ -8,7 +8,6 @@
 #include "bus-creds.h"
 #include "bus-label.h"
 #include "bus-message.h"
-#include "bus-util.h"
 #include "capability-util.h"
 #include "cgroup-util.h"
 #include "errno-util.h"

src/libsystemd/sd-bus/bus-kernel.c

@@ -20,7 +20,6 @@
 #include "bus-kernel.h"
 #include "bus-label.h"
 #include "bus-message.h"
-#include "bus-util.h"
 #include "capability-util.h"
 #include "fd-util.h"
 #include "fileio.h"

src/libsystemd/sd-bus/bus-match.c

@@ -4,7 +4,6 @@
 #include "bus-internal.h"
 #include "bus-match.h"
 #include "bus-message.h"
-#include "bus-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "hexdecoct.h"

src/libsystemd/sd-bus/bus-message.c

@@ -12,7 +12,6 @@
 #include "bus-message.h"
 #include "bus-signature.h"
 #include "bus-type.h"
-#include "bus-util.h"
 #include "fd-util.h"
 #include "io-util.h"
 #include "memfd-util.h"

src/libsystemd/sd-bus/bus-objects.c

@@ -8,7 +8,6 @@
 #include "bus-signature.h"
 #include "bus-slot.h"
 #include "bus-type.h"
-#include "bus-util.h"
 #include "missing_capability.h"
 #include "set.h"
 #include "string-util.h"

src/libsystemd/sd-bus/bus-track.c

@@ -5,7 +5,6 @@
 #include "alloc-util.h"
 #include "bus-internal.h"
 #include "bus-track.h"
-#include "bus-util.h"
 #include "string-util.h"
 
 struct track_item {

src/libsystemd/sd-bus/sd-bus.c

@@ -26,7 +26,6 @@
 #include "bus-socket.h"
 #include "bus-track.h"
 #include "bus-type.h"
-#include "bus-util.h"
 #include "cgroup-util.h"
 #include "def.h"
 #include "errno-util.h"

src/libsystemd/sd-bus/test-bus-benchmark.c

@@ -8,10 +8,10 @@
 #include "alloc-util.h"
 #include "bus-internal.h"
 #include "bus-kernel.h"
-#include "bus-util.h"
 #include "def.h"
 #include "fd-util.h"
 #include "missing_resource.h"
+#include "string-util.h"
 #include "time-util.h"
 #include "util.h"
 

src/libsystemd/sd-bus/test-bus-chat.c

@@ -11,12 +11,12 @@
 #include "bus-error.h"
 #include "bus-internal.h"
 #include "bus-match.h"
-#include "bus-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "log.h"
 #include "macro.h"
+#include "string-util.h"
 #include "tests.h"
 #include "util.h"
 

src/libsystemd/sd-bus/test-bus-cleanup.c

@@ -6,7 +6,6 @@
 
 #include "bus-internal.h"
 #include "bus-message.h"
-#include "bus-util.h"
 #include "tests.h"
 
 static bool use_system_bus = false;

src/libsystemd/sd-bus/test-bus-creds.c

@@ -3,7 +3,6 @@
 #include "sd-bus.h"
 
 #include "bus-dump.h"
-#include "bus-util.h"
 #include "cgroup-util.h"
 #include "tests.h"
 

src/libsystemd/sd-bus/test-bus-error.c

@@ -2,11 +2,12 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
-#include "bus-util.h"
 #include "errno-list.h"
 #include "errno-util.h"
+#include "string-util.h"
 
 static void test_error(void) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL, second = SD_BUS_ERROR_NULL;

src/libsystemd/sd-bus/test-bus-gvariant.c

@@ -11,7 +11,6 @@
 #include "bus-gvariant.h"
 #include "bus-internal.h"
 #include "bus-message.h"
-#include "bus-util.h"
 #include "macro.h"
 #include "tests.h"
 #include "util.h"

src/libsystemd/sd-bus/test-bus-match.c

@@ -3,7 +3,6 @@
 #include "bus-match.h"
 #include "bus-message.h"
 #include "bus-slot.h"
-#include "bus-util.h"
 #include "log.h"
 #include "macro.h"
 #include "memory-util.h"

src/libsystemd/sd-bus/test-bus-objects.c

@@ -9,7 +9,6 @@
 #include "bus-dump.h"
 #include "bus-internal.h"
 #include "bus-message.h"
-#include "bus-util.h"
 #include "log.h"
 #include "macro.h"
 #include "strv.h"

src/libsystemd/sd-bus/test-bus-server.c

@@ -6,10 +6,10 @@
 #include "sd-bus.h"
 
 #include "bus-internal.h"
-#include "bus-util.h"
 #include "log.h"
 #include "macro.h"
 #include "memory-util.h"
+#include "string-util.h"
 
 struct context {
         int fds[2];