vmspawn: Clean up includes

Split out of #37344

src/vmspawn/test-vmspawn-util.c

@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <stdbool.h>
-
 #include "alloc-util.h"
 #include "string-util.h"
 #include "tests.h"

src/vmspawn/vmspawn-mount.c

@@ -2,8 +2,6 @@
 
 #include "alloc-util.h"
 #include "extract-word.h"
-#include "macro.h"
-#include "parse-argument.h"
 #include "path-util.h"
 #include "stat-util.h"
 #include "string-util.h"

src/vmspawn/vmspawn-mount.h

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-#include <stddef.h>
+#include "forward.h"
 
 typedef struct RuntimeMount {
         bool read_only;

src/vmspawn/vmspawn-register.c

@@ -9,9 +9,8 @@
 
 #include "bus-error.h"
 #include "bus-locator.h"
-#include "json-util.h"
+#include "errno-util.h"
 #include "log.h"
-#include "macro.h"
 #include "process-util.h"
 #include "socket-util.h"
 #include "string-util.h"

src/vmspawn/vmspawn-register.h

@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <stdbool.h>
-
-#include "sd-bus.h"
-#include "sd-id128.h"
+#include "forward.h"
 
 int register_machine(
                 sd_bus *bus,

src/vmspawn/vmspawn-scope.c

@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <stdio.h>
-
 #include "sd-bus.h"
 
 #include "bus-error.h"
@@ -11,13 +9,11 @@
 #include "bus-wait-for-jobs.h"
 #include "escape.h"
 #include "log.h"
-#include "macro.h"
-#include "process-util.h"
+#include "pidref.h"
 #include "random-util.h"
 #include "socket-util.h"
+#include "string-util.h"
 #include "strv.h"
-#include "unit-def.h"
-#include "unit-name.h"
 #include "vmspawn-scope.h"
 
 int start_transient_scope(sd_bus *bus, const char *machine_name, bool allow_pidfd, char **ret_scope) {

src/vmspawn/vmspawn-scope.h

@@ -1,11 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-
-#include "sd-bus.h"
-
-#include "macro.h"
+#include "forward.h"
 
 typedef struct SocketServicePair {
         char **exec_start_pre;

src/vmspawn/vmspawn-settings.h

@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <errno.h>
-#include <stdint.h>
-
-#include "macro.h"
+#include "forward.h"
 
 typedef enum ConsoleMode {
         CONSOLE_INTERACTIVE,    /* ptyfwd */

src/vmspawn/vmspawn-util.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/vhost.h>
+#include <linux/vm_sockets.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
@@ -10,20 +11,14 @@
 #include "architecture.h"
 #include "conf-files.h"
 #include "errno-util.h"
-#include "escape.h"
 #include "fd-util.h"
-#include "fileio.h"
+#include "hashmap.h"
 #include "json-util.h"
 #include "log.h"
-#include "macro.h"
-#include "memory-util.h"
 #include "path-lookup.h"
 #include "path-util.h"
 #include "random-util.h"
-#include "recurse-dir.h"
 #include "siphash24.h"
-#include "socket-util.h"
-#include "sort-util.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"

src/vmspawn/vmspawn-util.h

@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-
-#include "assert-util.h"
-#include "memory-util.h"
+#include "forward.h"
 
 #if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__)
 #  define ARCHITECTURE_SUPPORTS_SMBIOS 1

src/vmspawn/vmspawn.c

@@ -3,13 +3,13 @@
 #include <getopt.h>
 #include <linux/if.h>
 #include <net/if.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "sd-bus.h"
 #include "sd-daemon.h"
 #include "sd-event.h"
 #include "sd-id128.h"
@@ -18,16 +18,14 @@
 #include "architecture.h"
 #include "bootspec.h"
 #include "build.h"
+#include "bus-error.h"
 #include "bus-internal.h"
 #include "bus-locator.h"
 #include "bus-util.h"
 #include "bus-wait-for-jobs.h"
 #include "capability-util.h"
-#include "chase.h"
 #include "common-signal.h"
 #include "copy.h"
-#include "creds-util.h"
-#include "dirent-util.h"
 #include "discover-image.h"
 #include "dissect-image.h"
 #include "escape.h"
@@ -35,18 +33,15 @@
 #include "event-util.h"
 #include "extract-word.h"
 #include "fd-util.h"
-#include "fileio.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "gpt.h"
 #include "hexdecoct.h"
 #include "hostname-setup.h"
 #include "hostname-util.h"
-#include "io-util.h"
-#include "kernel-image.h"
+#include "id128-util.h"
 #include "log.h"
 #include "machine-credential.h"
-#include "macro.h"
 #include "main-func.h"
 #include "mkdir.h"
 #include "namespace-util.h"
@@ -66,15 +61,13 @@
 #include "rm-rf.h"
 #include "signal-util.h"
 #include "socket-util.h"
-#include "stat-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "sync-util.h"
-#include "time-util.h"
+#include "terminal-util.h"
 #include "tmpfile-util.h"
 #include "unit-name.h"
-#include "user-util.h"
 #include "utf8.h"
 #include "vmspawn-mount.h"
 #include "vmspawn-register.h"