nspawn: Clean up includes

Split out of #37344.

diff --git a/src/nspawn/fuzz-nspawn-oci.c b/src/nspawn/fuzz-nspawn-oci.c
index daa478e83ccffe8ade350ff190595d0734b574bf..ceb17275ca9a6eb5543ce3c8db41fef21a7e0fc5 100644 (file)
--- a/src/nspawn/fuzz-nspawn-oci.c
+++ b/src/nspawn/fuzz-nspawn-oci.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "alloc-util.h"
 #include "fd-util.h"
 #include "fuzz.h"
 #include "nspawn-oci.h"

diff --git a/src/nspawn/fuzz-nspawn-settings.c b/src/nspawn/fuzz-nspawn-settings.c
index e45bfd8fdd8b088611156112668f1fe8536602cd..2da93999be148d0c6807012eedecea883a221840 100644 (file)
--- a/src/nspawn/fuzz-nspawn-settings.c
+++ b/src/nspawn/fuzz-nspawn-settings.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "alloc-util.h"
 #include "fd-util.h"
 #include "fuzz.h"
 #include "nspawn-settings.h"

diff --git a/src/nspawn/nspawn-bind-user.c b/src/nspawn/nspawn-bind-user.c
index d142ec5803768e2090d2377778681bdf8292455a..da927347c6a0f1ac6d0d58be7898c2001dcbb0ec 100644 (file)
--- a/src/nspawn/nspawn-bind-user.c
+++ b/src/nspawn/nspawn-bind-user.c
@@ -1,5 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <grp.h>
+#include <pwd.h>
+#include <unistd.h>
+
 #include "alloc-util.h"
 #include "chase.h"
 #include "fd-util.h"
@@ -7,9 +11,12 @@
 #include "format-util.h"
 #include "json-util.h"
 #include "log.h"
+#include "nspawn-mount.h"
 #include "nspawn.h"
 #include "nspawn-bind-user.h"
 #include "path-util.h"
+#include "string-util.h"
+#include "strv.h"
 #include "user-util.h"
 #include "userdb.h"
 

diff --git a/src/nspawn/nspawn-bind-user.h b/src/nspawn/nspawn-bind-user.h
index 1ee0597b4123f73b749d33d144f700600dd12822..b6d4e1e4ad055a1bec39f772f74a389a9c3cada6 100644 (file)
--- a/src/nspawn/nspawn-bind-user.h
+++ b/src/nspawn/nspawn-bind-user.h
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "group-record.h"
-#include "nspawn-mount.h"
-#include "user-record.h"
+#include "forward.h"
+
+typedef struct CustomMount CustomMount;
 
 typedef struct BindUserData {
         /* The host's user/group records */

diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
index 9ec6f277b9ae9b1b6bb329b37c72a4e45342b412..98450b6f1dcfefb381e0e764a1a0a3643c752280 100644 (file)
--- a/src/nspawn/nspawn-cgroup.c
+++ b/src/nspawn/nspawn-cgroup.c
@@ -1,14 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <sys/mount.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "cgroup-setup.h"
 #include "chase.h"
 #include "fd-util.h"
 #include "format-util.h"
-#include "fs-util.h"
-#include "mkdir.h"
+#include "log.h"
 #include "mount-setup.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
@@ -16,6 +16,7 @@
 #include "nsresource.h"
 #include "path-util.h"
 #include "string-util.h"
+#include "strv.h"
 
 static int chown_cgroup_path(const char *path, uid_t uid_shift) {
         _cleanup_close_ int fd = -EBADF;

diff --git a/src/nspawn/nspawn-cgroup.h b/src/nspawn/nspawn-cgroup.h
index 125bbf5f8032cc8b6263747ef76cfafeea0377e4..57c973772881a9223883ba1514601933d75503bb 100644 (file)
--- a/src/nspawn/nspawn-cgroup.h
+++ b/src/nspawn/nspawn-cgroup.h
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-#include <sys/types.h>
-
+#include "forward.h"
 #include "nspawn-settings.h"
 
 int create_subcgroup(

diff --git a/src/nspawn/nspawn-expose-ports.c b/src/nspawn/nspawn-expose-ports.c
index 564406844675c430b410c0cc659de6842922134c..9a194089da4dae21ad6391507fbdfd2893f57c81 100644 (file)
--- a/src/nspawn/nspawn-expose-ports.c
+++ b/src/nspawn/nspawn-expose-ports.c
@@ -8,7 +8,7 @@
 #include "firewall-util.h"
 #include "in-addr-util.h"
 #include "local-addresses.h"
-#include "netlink-util.h"
+#include "log.h"
 #include "nspawn-expose-ports.h"
 #include "parse-util.h"
 #include "socket-util.h"

diff --git a/src/nspawn/nspawn-expose-ports.h b/src/nspawn/nspawn-expose-ports.h
index 27cfccf015267e5a5c1cf14abd2fbc597429c827..4f1ecc22991d7e786807c251d1a9f8a5ba8b985b 100644 (file)
--- a/src/nspawn/nspawn-expose-ports.h
+++ b/src/nspawn/nspawn-expose-ports.h
@@ -1,13 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <inttypes.h>
-
-#include "sd-event.h"
-#include "sd-netlink.h"
-
 #include "firewall-util.h"
-#include "in-addr-util.h"
+#include "forward.h"
 #include "list.h"
 
 typedef struct ExposePort {

diff --git a/src/nspawn/nspawn-gperf.gperf b/src/nspawn/nspawn-gperf.gperf
index 4356e0f4fade2efd6fd67a166c5aee2c93ad64de..883ca97bc89d04e48cf9e5deb16e66e26ed46747 100644 (file)
--- a/src/nspawn/nspawn-gperf.gperf
+++ b/src/nspawn/nspawn-gperf.gperf
@@ -7,7 +7,6 @@ _Pragma("GCC diagnostic ignored \"-Wzero-as-null-pointer-constant\"")
 #include <stddef.h>
 #include "conf-parser.h"
 #include "nspawn-settings.h"
-#include "nspawn-expose-ports.h"
 %}
 struct ConfigPerfItem;
 %null_strings

diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c
index d1a9ced8ea4ffcbf9c6e10e7798c230408270a97..96647b5ae492fa37a85260122ce8cff52c8b998d 100644 (file)
--- a/src/nspawn/nspawn-mount.c
+++ b/src/nspawn/nspawn-mount.c
@@ -6,26 +6,23 @@
 #include "alloc-util.h"
 #include "chase.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "fs-util.h"
-#include "label-util.h"
 #include "log.h"
 #include "mkdir-label.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
 #include "namespace-util.h"
 #include "nspawn-mount.h"
-#include "parse-util.h"
 #include "path-util.h"
 #include "rm-rf.h"
-#include "set.h"
 #include "sort-util.h"
 #include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "tmpfile-util.h"
-#include "user-util.h"
 
 CustomMount* custom_mount_add(CustomMount **l, size_t *n, CustomMountType t) {
         CustomMount *ret;

diff --git a/src/nspawn/nspawn-mount.h b/src/nspawn/nspawn-mount.h
index a1819f08373040cdc8287e945d30473c4745ad12..26b2380dcb9d6dba7e5f8c565a74a0d95e020cc3 100644 (file)
--- a/src/nspawn/nspawn-mount.h
+++ b/src/nspawn/nspawn-mount.h
@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-#include <stddef.h>
-#include <sys/types.h>
-
+#include "forward.h"
 #include "volatile-util.h"
 
 typedef enum MountSettingsMask {

diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index f29dfc0f5a33780ef6a829415660ad0cb5f80e67..afd5294d04a12e1627420efaec679252c3136505 100644 (file)
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -17,20 +17,14 @@
 #include "ether-addr-util.h"
 #include "extract-word.h"
 #include "fd-util.h"
-#include "hexdecoct.h"
 #include "lock-util.h"
-#include "missing_network.h"
 #include "mkdir.h"
 #include "mount-util.h"
 #include "namespace-util.h"
-#include "netif-naming-scheme.h"
 #include "netif-util.h"
 #include "netlink-util.h"
 #include "nspawn-network.h"
-#include "parse-util.h"
 #include "process-util.h"
-#include "siphash24.h"
-#include "socket-netlink.h"
 #include "socket-util.h"
 #include "stat-util.h"
 #include "string-util.h"

diff --git a/src/nspawn/nspawn-network.h b/src/nspawn/nspawn-network.h
index ed08c983472f495faf94b28ae8e4b7b81f926b1d..4bf3dab52b410003da0a443eab0f488792433b0d 100644 (file)
--- a/src/nspawn/nspawn-network.h
+++ b/src/nspawn/nspawn-network.h
@@ -1,11 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <net/if.h>
-#include <stdbool.h>
-#include <sys/types.h>
+#include <linux/if.h>
 
-#include "ether-addr-util.h"
+#include "forward.h"
 
 int test_network_interfaces_initialized(char **iface_pairs);
 int resolve_network_interface_names(char **iface_pairs);

diff --git a/src/nspawn/nspawn-oci.c b/src/nspawn/nspawn-oci.c
index 430af7b8a23fa5cb68727ba02df6456e305d3375..f891ea07420e83cd9bcce607dcaab6e77dbb32f2 100644 (file)
--- a/src/nspawn/nspawn-oci.c
+++ b/src/nspawn/nspawn-oci.c
@@ -1,29 +1,28 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/oom.h>
+#include <sys/stat.h>
 
+#include "sd-bus.h"
 #include "sd-json.h"
 
 #include "alloc-util.h"
 #include "bus-util.h"
 #include "cap-list.h"
+#include "cgroup-util.h"
 #include "cpu-set-util.h"
 #include "device-util.h"
 #include "devnum-util.h"
 #include "env-util.h"
-#include "format-util.h"
-#include "fs-util.h"
 #include "hostname-util.h"
 #include "json-util.h"
-#include "missing_sched.h"
+#include "nspawn-mount.h"
 #include "nspawn-oci.h"
 #include "path-util.h"
 #include "rlimit-util.h"
-#include "seccomp-util.h"
-#include "stdio-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "user-util.h"
+#include "time-util.h"
 
 /* TODO:
  * OCI runtime tool implementation

diff --git a/src/nspawn/nspawn-oci.h b/src/nspawn/nspawn-oci.h
index ee72c917321cd3a2f0099a56a1b7771847aab9b9..cb97c33853d05f2297743f2adcffc0ea42b18548 100644 (file)
--- a/src/nspawn/nspawn-oci.h
+++ b/src/nspawn/nspawn-oci.h
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "forward.h"
 #include "nspawn-settings.h"
 
 int oci_load(FILE *f, const char *path, Settings **ret);

diff --git a/src/nspawn/nspawn-register.c b/src/nspawn/nspawn-register.c
index 36cd2066e54611d14f0494a8fc97d83fd66affe4..e2350e5267ac1156dd47d6b42cb76c2e3ecf20cd 100644 (file)
--- a/src/nspawn/nspawn-register.c
+++ b/src/nspawn/nspawn-register.c
@@ -8,11 +8,14 @@
 #include "bus-unit-util.h"
 #include "bus-util.h"
 #include "bus-wait-for-jobs.h"
+#include "nspawn-mount.h"
 #include "nspawn-register.h"
 #include "nspawn-settings.h"
+#include "pidref.h"
 #include "special.h"
 #include "stat-util.h"
-#include "strv.h"
+#include "string-util.h"
+#include "unit-name.h"
 
 static int append_machine_properties(
                 sd_bus_message *m,

diff --git a/src/nspawn/nspawn-register.h b/src/nspawn/nspawn-register.h
index 89e35f02a781688273e45ba40d96679a307d0264..83c134dc6e67b909dd7cab5fd36a6c5e5cb10e0f 100644 (file)
--- a/src/nspawn/nspawn-register.h
+++ b/src/nspawn/nspawn-register.h
@@ -1,11 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/types.h>
-
-#include "sd-id128.h"
-
-#include "nspawn-mount.h"
+#include "forward.h"
 #include "nspawn-settings.h"
 
 typedef enum RegisterMachineFlags {

diff --git a/src/nspawn/nspawn-seccomp.c b/src/nspawn/nspawn-seccomp.c
index e7d18a317eec547c0fdda7f439fe7b8ba1c7e26b..710c874ddd20d231821060358ee8f12316915afc 100644 (file)
--- a/src/nspawn/nspawn-seccomp.c
+++ b/src/nspawn/nspawn-seccomp.c
@@ -1,16 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
+#include <linux/capability.h>
 #include <linux/netlink.h>
-#include <sys/capability.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 
-#include "alloc-util.h"
 #include "log.h"
 #include "nspawn-seccomp.h"
 #include "seccomp-util.h"
-#include "string-util.h"
 #include "strv.h"
 
 #if HAVE_SECCOMP

diff --git a/src/nspawn/nspawn-seccomp.h b/src/nspawn/nspawn-seccomp.h
index a2fa9a61c6568992e584c2920625e4de36c17f5d..03c378505d2d35a2f1962c2571d7c76a3ac5bb38 100644 (file)
--- a/src/nspawn/nspawn-seccomp.h
+++ b/src/nspawn/nspawn-seccomp.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdint.h>
+#include "forward.h"
 
 int setup_seccomp(uint64_t cap_list_retain, char **syscall_allow_list, char **syscall_deny_list);

diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
index 2d883e21968e37d687c4aaf5baf279a2564daf32..7c04bf6147cdac18625c3126da1d2517f89691c1 100644 (file)
--- a/src/nspawn/nspawn-settings.c
+++ b/src/nspawn/nspawn-settings.c
@@ -1,11 +1,15 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "cap-list.h"
 #include "conf-parser.h"
 #include "cpu-set-util.h"
-#include "hostname-util.h"
+#include "extract-word.h"
 #include "namespace-util.h"
+#include "nspawn-expose-ports.h"
+#include "nspawn-mount.h"
 #include "nspawn-network.h"
 #include "nspawn-settings.h"
 #include "parse-util.h"

diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h
index e057fc123d808d89ce76e0443594da1a96ec4938..f1c43f50f723f0902506e7b24fff4942c9c134c0 100644 (file)
--- a/src/nspawn/nspawn-settings.h
+++ b/src/nspawn/nspawn-settings.h
@@ -1,21 +1,18 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sched.h>
-#include <stdio.h>
-
-#include "sd-bus.h"
 #include "sd-id128.h"
 
 #include "capability-util.h"
-#include "conf-parser.h"
+#include "conf-parser-forward.h"
 #include "cpu-set-util.h"
-#include "macro.h"
-#include "nspawn-expose-ports.h"
-#include "nspawn-mount.h"
+#include "forward.h"
 #include "rlimit-util.h"
 #include "seccomp-util.h"
-#include "time-util.h"
+#include "volatile-util.h"
+
+typedef struct CustomMount CustomMount;
+typedef struct ExposePort ExposePort;
 
 typedef enum StartMode {
         START_PID1, /* Run parameters as command line as process 1 */

diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c
index 51db3cade343ed3319c9a72d74199c54af02b117..342a9b9212ebedf297da424e678a2ae620d9458d 100644 (file)
--- a/src/nspawn/nspawn-setuid.c
+++ b/src/nspawn/nspawn-setuid.c
@@ -1,11 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "constants.h"
 #include "errno.h"
 #include "extract-word.h"
 #include "fd-util.h"
@@ -14,7 +12,6 @@
 #include "mkdir.h"
 #include "nspawn-setuid.h"
 #include "process-util.h"
-#include "signal-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"

diff --git a/src/nspawn/nspawn-setuid.h b/src/nspawn/nspawn-setuid.h
index 2dc9a696065a2a34872bf99e8b410b6b991f05b6..740375a43e77d4f9a4e18c91638667591137faed 100644 (file)
--- a/src/nspawn/nspawn-setuid.h
+++ b/src/nspawn/nspawn-setuid.h
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-#include <sys/types.h>
+#include "forward.h"
 
 int change_uid_gid_raw(uid_t uid, gid_t gid, const gid_t *supplementary_gids, size_t n_supplementary_gids, bool chown_stdio);
 int change_uid_gid(const char *user, bool chown_stdio, char **ret_home);

diff --git a/src/nspawn/nspawn-stub-pid1.h b/src/nspawn/nspawn-stub-pid1.h
index e0810fee12e274092998464a83466b21ae191c6f..c7889583f4c1d7641721cef6dbd51a0867477176 100644 (file)
--- a/src/nspawn/nspawn-stub-pid1.h
+++ b/src/nspawn/nspawn-stub-pid1.h
@@ -3,4 +3,6 @@
 
 #include "sd-id128.h"
 
+#include "forward.h"
+
 int stub_pid1(sd_id128_t uuid);

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 33397fd759786c4a4806c4978c3fc7c18dfa9d94..c89f8723e6538aa92123a6eb842a528ca4f3ee19 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1,20 +1,17 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
-#include <linux/fs.h>
-#include <linux/fuse.h>
 #include <linux/loop.h>
+#include <net/if.h>
 #include <stdlib.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/personality.h>
 #include <sys/prctl.h>
-#include <sys/types.h>
 #include <sys/wait.h>
-#include <termios.h>
 #include <unistd.h>
+#include "constants.h"
 
 #if HAVE_SELINUX
 #include <selinux/selinux.h>
@@ -22,7 +19,9 @@
 
 #include "sd-bus.h"
 #include "sd-daemon.h"
+#include "sd-event.h"
 #include "sd-id128.h"
+#include "sd-netlink.h"
 
 #include "alloc-util.h"
 #include "barrier.h"
@@ -37,7 +36,6 @@
 #include "cgroup-setup.h"
 #include "cgroup-util.h"
 #include "chase.h"
-#include "chattr-util.h"
 #include "common-signal.h"
 #include "copy.h"
 #include "cpu-set-util.h"
@@ -48,29 +46,33 @@
 #include "env-util.h"
 #include "escape.h"
 #include "ether-addr-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fdset.h"
 #include "fileio.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "gpt.h"
+#include "group-record.h"
 #include "hexdecoct.h"
 #include "hostname-setup.h"
 #include "hostname-util.h"
 #include "id128-util.h"
+#include "image-policy.h"
+#include "in-addr-util.h"
 #include "io-util.h"
 #include "log.h"
 #include "loop-util.h"
 #include "loopback-setup.h"
 #include "machine-credential.h"
-#include "macro.h"
 #include "main-func.h"
+#include "missing_keyctl.h"
+#include "missing_syscall.h"
 #include "mkdir.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
 #include "namespace-util.h"
 #include "notify-recv.h"
-#include "nspawn.h"
 #include "nspawn-bind-user.h"
 #include "nspawn-cgroup.h"
 #include "nspawn-expose-ports.h"
@@ -82,13 +84,15 @@
 #include "nspawn-settings.h"
 #include "nspawn-setuid.h"
 #include "nspawn-stub-pid1.h"
+#include "nspawn.h"
 #include "nsresource.h"
-#include "nulstr-util.h"
 #include "os-util.h"
 #include "osc-context.h"
 #include "pager.h"
 #include "parse-argument.h"
 #include "parse-util.h"
+#include "path-util.h"
+#include "pidref.h"
 #include "pretty-print.h"
 #include "process-util.h"
 #include "ptyfwd.h"
@@ -97,9 +101,11 @@
 #include "resolve-util.h"
 #include "rlimit-util.h"
 #include "rm-rf.h"
+#include "runtime-scope.h"
 #include "seccomp-util.h"
 #include "shift-uid.h"
 #include "signal-util.h"
+#include "siphash24.h"
 #include "socket-util.h"
 #include "stat-util.h"
 #include "stdio-util.h"
@@ -112,6 +118,7 @@
 #include "uid-classification.h"
 #include "umask-util.h"
 #include "unit-name.h"
+#include "user-record.h"
 #include "user-util.h"
 #include "vpick.h"
 

diff --git a/src/nspawn/nspawn.h b/src/nspawn/nspawn.h
index 556f8ee1aff07d081699a52ba114357ef98ac53b..8f1e812087e60bf844827533feab6d803ac787a7 100644 (file)
--- a/src/nspawn/nspawn.h
+++ b/src/nspawn/nspawn.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/types.h>
+#include "forward.h"
 
 int userns_lchown(const char *p, uid_t uid, gid_t gid);
 int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid_t gid);