busctl: Clean up includes

Split out of #37344.

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"

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);

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"

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"