busctl: Clean up includes

Split out of #37344.

diff --git a/src/busctl/busctl-introspect.c b/src/busctl/busctl-introspect.c
index 92dca84b99c89dd575b938b4d769dcf858a648ea..aa6f5cadf322bb145438d50912ad358eb3072d85 100644 (file)
--- a/src/busctl/busctl-introspect.c
+++ b/src/busctl/busctl-introspect.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "sd-bus.h"
+#include "sd-bus-vtable.h"
 
 #include "alloc-util.h"
 #include "busctl-introspect.h"

diff --git a/src/busctl/busctl-introspect.h b/src/busctl/busctl-introspect.h
index 720a0df79a19f8bd1462ab1f2659bd41d8be0422..374ab53a19a1aab9ace29839ca06178ce9eaef08 100644 (file)
--- a/src/busctl/busctl-introspect.h
+++ b/src/busctl/busctl-introspect.h
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-#include <stdint.h>
+#include "forward.h"
 
 typedef struct XMLIntrospectOps {
         int (*on_path)(const char *path, void *userdata);

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 8091a44705d03ef1132d0a74b13ed1a3cbb69f32..8fe28ef015e76a472fda7b358a6788307ffbdf14 100644 (file)
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -1,29 +1,31 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
+#include <unistd.h>
 
 #include "sd-bus.h"
 #include "sd-daemon.h"
+#include "sd-event.h"
 #include "sd-json.h"
 
 #include "alloc-util.h"
 #include "bitfield.h"
 #include "build.h"
 #include "bus-dump.h"
+#include "bus-error.h"
 #include "bus-internal.h"
-#include "bus-message.h"
 #include "bus-signature.h"
 #include "bus-type.h"
 #include "bus-util.h"
 #include "busctl-introspect.h"
 #include "capsule-util.h"
+#include "errno-util.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "fdset.h"
 #include "fileio.h"
 #include "format-table.h"
 #include "glyph-util.h"
-#include "json-util.h"
 #include "log.h"
 #include "logarithm.h"
 #include "main-func.h"
@@ -36,9 +38,10 @@
 #include "pretty-print.h"
 #include "runtime-scope.h"
 #include "set.h"
-#include "sort-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "user-util.h"
 #include "verbs.h"
 #include "version.h"

diff --git a/src/busctl/test-busctl-introspect.c b/src/busctl/test-busctl-introspect.c
index 859ca7143514af20a09f6dfc3504c3ca3c262450..9f68636033c11bc0a5101e58fecfcfdd444848b6 100644 (file)
--- a/src/busctl/test-busctl-introspect.c
+++ b/src/busctl/test-busctl-introspect.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "busctl-introspect.h"
 #include "set.h"
 #include "strv.h"