From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 21 May 2025 12:10:20 +0000 (+0200)
Subject: systemctl: Clean up includes
X-Git-Tag: v258-rc1~548
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bbd8e18ed21e891aac6b4b292a59005ab84c143;p=thirdparty%2Fsystemd.git

systemctl: Clean up includes

Split out of #37344.
---

diff --git a/src/systemctl/fuzz-systemctl-parse-argv.c b/src/systemctl/fuzz-systemctl-parse-argv.c
index 99cf6c297f8..d30b9d8fed0 100644
--- a/src/systemctl/fuzz-systemctl-parse-argv.c
+++ b/src/systemctl/fuzz-systemctl-parse-argv.c
@@ -1,15 +1,16 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <getopt.h>
 #include <stdio.h>
-#include <unistd.h>
 
+#include "bus-util.h"
 #include "env-util.h"
 #include "fd-util.h"
 #include "fuzz.h"
 #include "nulstr-util.h"
+#include "pager.h"
 #include "selinux-util.h"
 #include "static-destruct.h"
-#include "stdio-util.h"
 #include "strv.h"
 #include "systemctl.h"
 #include "systemctl-util.h"
diff --git a/src/systemctl/systemctl-add-dependency.c b/src/systemctl/systemctl-add-dependency.c
index 741280b302f..9393bc4d6a4 100644
--- a/src/systemctl/systemctl-add-dependency.c
+++ b/src/systemctl/systemctl-add-dependency.c
@@ -1,12 +1,21 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "bus-unit-util.h"
+#include "bus-util.h"
+#include "install.h"
+#include "log.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-add-dependency.h"
 #include "systemctl-daemon-reload.h"
 #include "systemctl-util.h"
+#include "unit-name.h"
 
 int verb_add_dependency(int argc, char *argv[], void *userdata) {
         _cleanup_strv_free_ char **names = NULL;
diff --git a/src/systemctl/systemctl-cancel-job.c b/src/systemctl/systemctl-cancel-job.c
index 214fbc3c8a3..63459820f96 100644
--- a/src/systemctl/systemctl-cancel-job.c
+++ b/src/systemctl/systemctl-cancel-job.c
@@ -1,9 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "errno-util.h"
+#include "log.h"
 #include "parse-util.h"
-#include "systemctl.h"
+#include "strv.h"
 #include "systemctl-cancel-job.h"
 #include "systemctl-trivial-method.h"
 #include "systemctl-util.h"
diff --git a/src/systemctl/systemctl-clean-or-freeze.c b/src/systemctl/systemctl-clean-or-freeze.c
index ccd4772bb53..4870074e8c0 100644
--- a/src/systemctl/systemctl-clean-or-freeze.c
+++ b/src/systemctl/systemctl-clean-or-freeze.c
@@ -1,8 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "bus-util.h"
 #include "bus-wait-for-units.h"
+#include "log.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-clean-or-freeze.h"
 #include "systemctl-util.h"
diff --git a/src/systemctl/systemctl-compat-halt.c b/src/systemctl/systemctl-compat-halt.c
index 8f8ede23c87..0b05fe6702c 100644
--- a/src/systemctl/systemctl-compat-halt.c
+++ b/src/systemctl/systemctl-compat-halt.c
@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
-#include <unistd.h>
 
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
+#include "log.h"
 #include "pretty-print.h"
 #include "process-util.h"
 #include "reboot-util.h"
@@ -15,7 +15,6 @@
 #include "systemctl-logind.h"
 #include "systemctl-start-unit.h"
 #include "systemctl-util.h"
-#include "terminal-util.h"
 #include "utmp-wtmp.h"
 
 static int halt_help(void) {
diff --git a/src/systemctl/systemctl-compat-runlevel.c b/src/systemctl/systemctl-compat-runlevel.c
index 7c64715bac6..e31bfd408b8 100644
--- a/src/systemctl/systemctl-compat-runlevel.c
+++ b/src/systemctl/systemctl-compat-runlevel.c
@@ -3,10 +3,9 @@
 #include <getopt.h>
 
 #include "alloc-util.h"
+#include "log.h"
 #include "pretty-print.h"
-#include "systemctl.h"
 #include "systemctl-compat-runlevel.h"
-#include "terminal-util.h"
 #include "utmp-wtmp.h"
 
 static int runlevel_help(void) {
diff --git a/src/systemctl/systemctl-compat-shutdown.c b/src/systemctl/systemctl-compat-shutdown.c
index 0bb752db956..4084a4fa20c 100644
--- a/src/systemctl/systemctl-compat-shutdown.c
+++ b/src/systemctl/systemctl-compat-shutdown.c
@@ -3,13 +3,13 @@
 #include <getopt.h>
 
 #include "alloc-util.h"
+#include "log.h"
 #include "pretty-print.h"
 #include "reboot-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-compat-shutdown.h"
-#include "systemctl-logind.h"
 #include "systemctl-sysv-compat.h"
-#include "terminal-util.h"
 
 static int shutdown_help(void) {
         _cleanup_free_ char *link = NULL;
diff --git a/src/systemctl/systemctl-compat-telinit.c b/src/systemctl/systemctl-compat-telinit.c
index d0f869fc7c7..bc0e7a29185 100644
--- a/src/systemctl/systemctl-compat-telinit.c
+++ b/src/systemctl/systemctl-compat-telinit.c
@@ -1,17 +1,16 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
-#include <unistd.h>
+#include <signal.h>
 
 #include "alloc-util.h"
+#include "log.h"
 #include "pretty-print.h"
-#include "rlimit-util.h"
 #include "systemctl.h"
 #include "systemctl-compat-telinit.h"
 #include "systemctl-daemon-reload.h"
 #include "systemctl-start-unit.h"
 #include "systemctl-sysv-compat.h"
-#include "terminal-util.h"
 
 static int telinit_help(void) {
         _cleanup_free_ char *link = NULL;
diff --git a/src/systemctl/systemctl-daemon-reload.c b/src/systemctl/systemctl-daemon-reload.c
index 2e924b75b1a..48606dd77f0 100644
--- a/src/systemctl/systemctl-daemon-reload.c
+++ b/src/systemctl/systemctl-daemon-reload.c
@@ -1,8 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "bus-util.h"
 #include "constants.h"
+#include "string-util.h"
 #include "systemctl.h"
 #include "systemctl-daemon-reload.h"
 #include "systemctl-util.h"
diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c
index 563b192d980..53bc57186a2 100644
--- a/src/systemctl/systemctl-edit.c
+++ b/src/systemctl/systemctl-edit.c
@@ -1,18 +1,24 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <unistd.h>
+
 #include "alloc-util.h"
-#include "bus-error.h"
+#include "bus-util.h"
 #include "edit-util.h"
-#include "fs-util.h"
+#include "hashmap.h"
+#include "label-util.h"
 #include "pager.h"
+#include "path-lookup.h"
 #include "path-util.h"
 #include "pretty-print.h"
-#include "selinux-util.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-daemon-reload.h"
 #include "systemctl-edit.h"
 #include "systemctl-util.h"
 #include "terminal-util.h"
+#include "unit-name.h"
 
 int verb_cat(int argc, char *argv[], void *userdata) {
         _cleanup_hashmap_free_ Hashmap *cached_id_map = NULL, *cached_name_map = NULL;
diff --git a/src/systemctl/systemctl-enable.c b/src/systemctl/systemctl-enable.c
index beb7dc2cc70..f4afb53890e 100644
--- a/src/systemctl/systemctl-enable.c
+++ b/src/systemctl/systemctl-enable.c
@@ -1,15 +1,26 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "bus-unit-util.h"
+#include "bus-util.h"
+#include "glyph-util.h"
+#include "install.h"
+#include "log.h"
 #include "path-util.h"
+#include "string-util.h"
+#include "strv-fundamental.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-daemon-reload.h"
 #include "systemctl-enable.h"
 #include "systemctl-start-unit.h"
 #include "systemctl-sysv-compat.h"
 #include "systemctl-util.h"
+#include "unit-name.h"
 #include "verbs.h"
 
 static int normalize_link_paths(char **paths) {
diff --git a/src/systemctl/systemctl-is-active.c b/src/systemctl/systemctl-is-active.c
index 484dcbfbe66..efb18cbb650 100644
--- a/src/systemctl/systemctl-is-active.c
+++ b/src/systemctl/systemctl-is-active.c
@@ -1,14 +1,19 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-locator.h"
-#include "pretty-print.h"
-#include "syslog-util.h"
+#include "bus-unit-util.h"
+#include "log.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-is-active.h"
 #include "systemctl-sysv-compat.h"
 #include "systemctl-util.h"
+#include "unit-def.h"
 
 static int check_unit_generic(int code, const UnitActiveState good_states[], size_t nb_states, char **args) {
         _cleanup_strv_free_ char **names = NULL;
diff --git a/src/systemctl/systemctl-is-enabled.c b/src/systemctl/systemctl-is-enabled.c
index a6d7dec882e..58d0d27fd7b 100644
--- a/src/systemctl/systemctl-is-enabled.c
+++ b/src/systemctl/systemctl-is-enabled.c
@@ -1,7 +1,15 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdlib.h>
+
+#include "sd-bus.h"
+
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "bus-util.h"
+#include "install.h"
+#include "log.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-is-enabled.h"
 #include "systemctl-sysv-compat.h"
diff --git a/src/systemctl/systemctl-is-system-running.c b/src/systemctl/systemctl-is-system-running.c
index a6495e68cde..943d4aa6d7a 100644
--- a/src/systemctl/systemctl-is-system-running.c
+++ b/src/systemctl/systemctl-is-system-running.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
 #include "sd-daemon.h"
 #include "sd-event.h"
 
@@ -7,6 +8,8 @@
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-util.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-is-system-running.h"
 #include "systemctl-util.h"
diff --git a/src/systemctl/systemctl-kill.c b/src/systemctl/systemctl-kill.c
index a72163c3432..efeff44e0f8 100644
--- a/src/systemctl/systemctl-kill.c
+++ b/src/systemctl/systemctl-kill.c
@@ -1,9 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "alloc-util.h"
+#include "sd-bus.h"
+
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-wait-for-units.h"
+#include "errno-util.h"
+#include "log.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-kill.h"
 #include "systemctl-util.h"
diff --git a/src/systemctl/systemctl-list-dependencies.c b/src/systemctl/systemctl-list-dependencies.c
index a5f8a407fe5..5fdd442e880 100644
--- a/src/systemctl/systemctl-list-dependencies.c
+++ b/src/systemctl/systemctl-list-dependencies.c
@@ -1,14 +1,23 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdio.h>
+
 #include "alloc-util.h"
 #include "ansi-color.h"
-#include "locale-util.h"
+#include "bus-unit-util.h"
+#include "glyph-util.h"
+#include "log.h"
+#include "pager.h"
 #include "sort-util.h"
 #include "special.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-list-dependencies.h"
 #include "systemctl-util.h"
 #include "terminal-util.h"
+#include "unit-def.h"
+#include "unit-name.h"
 
 static int list_dependencies_print(const char *name, UnitActiveState state, int level, unsigned branches, bool last) {
         _cleanup_free_ char *n = NULL;
diff --git a/src/systemctl/systemctl-list-jobs.c b/src/systemctl/systemctl-list-jobs.c
index 6b7e0597cee..9049873bbe3 100644
--- a/src/systemctl/systemctl-list-jobs.c
+++ b/src/systemctl/systemctl-list-jobs.c
@@ -2,15 +2,20 @@
 
 #include <fnmatch.h>
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "ansi-color.h"
 #include "bus-error.h"
 #include "bus-locator.h"
-#include "locale-util.h"
+#include "bus-util.h"
+#include "format-table.h"
+#include "glyph-util.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-list-jobs.h"
 #include "systemctl-util.h"
-#include "terminal-util.h"
 
 static int output_waiting_jobs(sd_bus *bus, Table *table, uint32_t id, const char *method, const char *prefix) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
diff --git a/src/systemctl/systemctl-list-machines.c b/src/systemctl/systemctl-list-machines.c
index 60d10131273..ea83f43a737 100644
--- a/src/systemctl/systemctl-list-machines.c
+++ b/src/systemctl/systemctl-list-machines.c
@@ -3,20 +3,23 @@
 #include <fnmatch.h>
 #include <unistd.h>
 
+#include "sd-bus.h"
 #include "sd-login.h"
 
 #include "alloc-util.h"
 #include "ansi-color.h"
 #include "bus-map-properties.h"
+#include "format-table.h"
+#include "glyph-util.h"
 #include "hostname-setup.h"
-#include "hostname-util.h"
-#include "locale-util.h"
+#include "log.h"
 #include "memory-util.h"
 #include "sort-util.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-list-machines.h"
 #include "systemctl-util.h"
-#include "terminal-util.h"
 
 const struct bus_properties_map machine_info_property_map[] = {
         /* Might good to keep same order here as in bus_manager_vtable[], server side */
diff --git a/src/systemctl/systemctl-list-machines.h b/src/systemctl/systemctl-list-machines.h
index 95a685970b0..660c50cab05 100644
--- a/src/systemctl/systemctl-list-machines.h
+++ b/src/systemctl/systemctl-list-machines.h
@@ -1,11 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <inttypes.h>
-#include <stdbool.h>
-
 #include "bus-map-properties.h"
-#include "time-util.h"
+#include "forward.h"
 
 int verb_list_machines(int argc, char *argv[], void *userdata);
 
diff --git a/src/systemctl/systemctl-list-unit-files.c b/src/systemctl/systemctl-list-unit-files.c
index cf36e944120..bd42fb7a300 100644
--- a/src/systemctl/systemctl-list-unit-files.c
+++ b/src/systemctl/systemctl-list-unit-files.c
@@ -2,15 +2,22 @@
 
 #include <fnmatch.h>
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "ansi-color.h"
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "bus-util.h"
+#include "format-table.h"
+#include "hashmap.h"
+#include "install.h"
 #include "sort-util.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-list-unit-files.h"
 #include "systemctl-util.h"
-#include "terminal-util.h"
 
 static int compare_unit_file_list(const UnitFileList *a, const UnitFileList *b) {
         const char *d1, *d2;
diff --git a/src/systemctl/systemctl-list-units.c b/src/systemctl/systemctl-list-units.c
index ec9c517c190..17b5bb7709c 100644
--- a/src/systemctl/systemctl-list-units.c
+++ b/src/systemctl/systemctl-list-units.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
 #include "sd-login.h"
 
 #include "alloc-util.h"
@@ -7,15 +8,19 @@
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-message-util.h"
+#include "bus-unit-util.h"
+#include "bus-util.h"
 #include "format-table.h"
-#include "locale-util.h"
+#include "glyph-util.h"
 #include "path-util.h"
 #include "set.h"
 #include "sort-util.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-list-units.h"
 #include "systemctl-util.h"
-#include "terminal-util.h"
+#include "unit-name.h"
 
 static int get_unit_list_recursive(
                 sd_bus *bus,
diff --git a/src/systemctl/systemctl-log-setting.c b/src/systemctl/systemctl-log-setting.c
index 8b6e58cbc47..1ea3d7abefa 100644
--- a/src/systemctl/systemctl-log-setting.c
+++ b/src/systemctl/systemctl-log-setting.c
@@ -1,13 +1,17 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "bus-error.h"
-#include "bus-locator.h"
+#include "log.h"
 #include "pretty-print.h"
-#include "syslog-util.h"
+#include "string-util.h"
 #include "systemctl.h"
 #include "systemctl-log-setting.h"
 #include "systemctl-util.h"
+#include "unit-def.h"
+#include "unit-name.h"
 #include "verb-log-control.h"
 
 static void give_log_control1_hint(const char *name) {
diff --git a/src/systemctl/systemctl-logind.c b/src/systemctl/systemctl-logind.c
index f915ff9ac15..42eefabcbbf 100644
--- a/src/systemctl/systemctl-logind.c
+++ b/src/systemctl/systemctl-logind.c
@@ -2,18 +2,28 @@
 
 #include <unistd.h>
 
+#include "sd-bus.h"
 #include "sd-login.h"
 
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "bus-util.h"
+#include "env-util.h"
+#include "errno-util.h"
+#include "format-util.h"
+#include "log.h"
 #include "login-util.h"
 #include "mountpoint-util.h"
 #include "process-util.h"
+#include "runtime-scope.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-logind.h"
 #include "systemctl-start-unit.h"
 #include "systemctl-util.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "user-util.h"
 
 static int logind_set_wall_message(sd_bus *bus) {
diff --git a/src/systemctl/systemctl-main.c b/src/systemctl/systemctl-main.c
index 48c083e5e57..cde07ab8cb4 100644
--- a/src/systemctl/systemctl-main.c
+++ b/src/systemctl/systemctl-main.c
@@ -2,7 +2,6 @@
 
 #include <getopt.h>
 #include <locale.h>
-#include <unistd.h>
 
 #include "dissect-image.h"
 #include "glyph-util.h"
diff --git a/src/systemctl/systemctl-mount.c b/src/systemctl/systemctl-mount.c
index 058aaad9250..bc4aa92260f 100644
--- a/src/systemctl/systemctl-mount.c
+++ b/src/systemctl/systemctl-mount.c
@@ -1,13 +1,18 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-locator.h"
-#include "dissect-image.h"
+#include "bus-util.h"
 #include "extract-word.h"
+#include "gpt.h"
+#include "log.h"
 #include "systemctl.h"
 #include "systemctl-mount.h"
 #include "systemctl-util.h"
+#include "unit-name.h"
 
 int verb_bind(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
diff --git a/src/systemctl/systemctl-preset-all.c b/src/systemctl/systemctl-preset-all.c
index f0928e60849..20079d10048 100644
--- a/src/systemctl/systemctl-preset-all.c
+++ b/src/systemctl/systemctl-preset-all.c
@@ -1,7 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "bus-unit-util.h"
+#include "install.h"
+#include "log.h"
 #include "systemctl.h"
 #include "systemctl-daemon-reload.h"
 #include "systemctl-preset-all.h"
diff --git a/src/systemctl/systemctl-reset-failed.c b/src/systemctl/systemctl-reset-failed.c
index f3f6fab7c35..18ca1905178 100644
--- a/src/systemctl/systemctl-reset-failed.c
+++ b/src/systemctl/systemctl-reset-failed.c
@@ -1,8 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "bus-error.h"
 #include "bus-locator.h"
-#include "systemctl.h"
+#include "log.h"
+#include "strv.h"
 #include "systemctl-reset-failed.h"
 #include "systemctl-trivial-method.h"
 #include "systemctl-util.h"
diff --git a/src/systemctl/systemctl-service-watchdogs.c b/src/systemctl/systemctl-service-watchdogs.c
index d5a537d215a..632345b4056 100644
--- a/src/systemctl/systemctl-service-watchdogs.c
+++ b/src/systemctl/systemctl-service-watchdogs.c
@@ -1,9 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "log.h"
 #include "parse-util.h"
-#include "systemctl.h"
+#include "string-util.h"
 #include "systemctl-service-watchdogs.h"
 #include "systemctl-util.h"
 
diff --git a/src/systemctl/systemctl-set-default.c b/src/systemctl/systemctl-set-default.c
index ae434dc357e..ca0f2575cdc 100644
--- a/src/systemctl/systemctl-set-default.c
+++ b/src/systemctl/systemctl-set-default.c
@@ -1,13 +1,22 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "bus-unit-util.h"
+#include "bus-util.h"
+#include "install.h"
+#include "log.h"
 #include "proc-cmdline.h"
+#include "string-util.h"
 #include "systemctl.h"
 #include "systemctl-daemon-reload.h"
 #include "systemctl-set-default.h"
 #include "systemctl-util.h"
+#include "unit-file.h"
+#include "unit-name.h"
 
 static int parse_proc_cmdline_item(const char *key, const char *value, void *data) {
         char **ret = data;
diff --git a/src/systemctl/systemctl-set-environment.c b/src/systemctl/systemctl-set-environment.c
index 3aed41eccd5..7e04f5a8673 100644
--- a/src/systemctl/systemctl-set-environment.c
+++ b/src/systemctl/systemctl-set-environment.c
@@ -1,10 +1,20 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <unistd.h>
+
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "bus-util.h"
 #include "env-util.h"
 #include "escape.h"
+#include "log.h"
+#include "output-mode.h"
+#include "pager.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-set-environment.h"
 #include "systemctl-util.h"
diff --git a/src/systemctl/systemctl-set-property.c b/src/systemctl/systemctl-set-property.c
index 45b14f43ee8..e84e3d580f0 100644
--- a/src/systemctl/systemctl-set-property.c
+++ b/src/systemctl/systemctl-set-property.c
@@ -1,10 +1,18 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "bus-unit-util.h"
+#include "bus-util.h"
+#include "errno-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-set-property.h"
 #include "systemctl-util.h"
+#include "unit-def.h"
+#include "unit-name.h"
 
 static int set_property_one(sd_bus *bus, const char *name, char **properties) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c
index 47d519a4ab7..958b2a5657c 100644
--- a/src/systemctl/systemctl-show.c
+++ b/src/systemctl/systemctl-show.c
@@ -2,41 +2,48 @@
 
 #include <sys/mount.h>
 
+#include "sd-bus.h"
+#include "sd-journal.h"
+
 #include "af-list.h"
 #include "bus-error.h"
-#include "bus-locator.h"
 #include "bus-map-properties.h"
 #include "bus-print-properties.h"
 #include "bus-unit-procs.h"
+#include "bus-unit-util.h"
+#include "bus-util.h"
 #include "cgroup-show.h"
 #include "cpu-set-util.h"
 #include "errno-util.h"
 #include "exec-util.h"
 #include "exit-status.h"
-#include "fd-util.h"
 #include "format-util.h"
 #include "hexdecoct.h"
 #include "hostname-setup.h"
-#include "hostname-util.h"
 #include "in-addr-util.h"
+#include "install.h"
 #include "ip-protocol-list.h"
 #include "journal-file.h"
 #include "list.h"
-#include "locale-util.h"
+#include "logs-show.h"
 #include "memory-util.h"
 #include "numa-util.h"
 #include "open-file.h"
+#include "pager.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
 #include "process-util.h"
+#include "set.h"
 #include "signal-util.h"
 #include "sort-util.h"
 #include "special.h"
+#include "systemctl-list-units.h"
 #include "string-table.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-list-machines.h"
-#include "systemctl-list-units.h"
 #include "systemctl-show.h"
 #include "systemctl-sysv-compat.h"
 #include "systemctl-util.h"
diff --git a/src/systemctl/systemctl-start-special.c b/src/systemctl/systemctl-start-special.c
index c17e8ae4800..78cbceed7e1 100644
--- a/src/systemctl/systemctl-start-special.c
+++ b/src/systemctl/systemctl-start-special.c
@@ -2,14 +2,19 @@
 
 #include <unistd.h>
 
+#include "sd-bus.h"
+
 #include "bootspec.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "efivars.h"
+#include "log.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "reboot-util.h"
+#include "runtime-scope.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-logind.h"
 #include "systemctl-start-special.h"
diff --git a/src/systemctl/systemctl-start-unit.c b/src/systemctl/systemctl-start-unit.c
index 1cb2a6db467..7ff5548ba85 100644
--- a/src/systemctl/systemctl-start-unit.c
+++ b/src/systemctl/systemctl-start-unit.c
@@ -11,13 +11,14 @@
 #include "bus-wait-for-jobs.h"
 #include "bus-wait-for-units.h"
 #include "fork-journal.h"
-#include "macro.h"
+#include "pidref.h"
+#include "runtime-scope.h"
 #include "special.h"
 #include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-start-unit.h"
 #include "systemctl-util.h"
-#include "terminal-util.h"
 
 static const struct {
         const char *verb;      /* systemctl verb */
diff --git a/src/systemctl/systemctl-switch-root.c b/src/systemctl/systemctl-switch-root.c
index 45e8f8a750e..62aebe886e6 100644
--- a/src/systemctl/systemctl-switch-root.c
+++ b/src/systemctl/systemctl-switch-root.c
@@ -1,17 +1,20 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "alloc-util.h"
 #include "argv-util.h"
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "bus-util.h"
 #include "chase.h"
 #include "fd-util.h"
 #include "initrd-util.h"
-#include "parse-util.h"
 #include "path-util.h"
 #include "proc-cmdline.h"
 #include "signal-util.h"
 #include "stat-util.h"
+#include "string-util.h"
 #include "systemctl.h"
 #include "systemctl-switch-root.h"
 #include "systemctl-util.h"
diff --git a/src/systemctl/systemctl-sysv-compat.c b/src/systemctl/systemctl-sysv-compat.c
index 5686b0a1cd5..b805bbe9ab3 100644
--- a/src/systemctl/systemctl-sysv-compat.c
+++ b/src/systemctl/systemctl-sysv-compat.c
@@ -1,20 +1,22 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <stdlib.h>
 
 #include "env-util.h"
 #include "fd-util.h"
 #include "initreq.h"
 #include "install.h"
 #include "io-util.h"
+#include "log.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "systemctl.h"
 #include "systemctl-sysv-compat.h"
+#include "time-util.h"
 
 int talk_initctl(char rl) {
 #if HAVE_SYSV_COMPAT
diff --git a/src/systemctl/systemctl-sysv-compat.h b/src/systemctl/systemctl-sysv-compat.h
index 05db6ec6f22..159d0e2be70 100644
--- a/src/systemctl/systemctl-sysv-compat.h
+++ b/src/systemctl/systemctl-sysv-compat.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "time-util.h"
+#include "forward.h"
 
 int talk_initctl(char runlevel);
 
diff --git a/src/systemctl/systemctl-trivial-method.c b/src/systemctl/systemctl-trivial-method.c
index 4d4f2627269..3fa1272c665 100644
--- a/src/systemctl/systemctl-trivial-method.c
+++ b/src/systemctl/systemctl-trivial-method.c
@@ -1,7 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-bus.h"
+
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "log.h"
+#include "string-util.h"
 #include "systemctl.h"
 #include "systemctl-trivial-method.h"
 #include "systemctl-util.h"
diff --git a/src/systemctl/systemctl-util.c b/src/systemctl/systemctl-util.c
index f81ca267ad5..43d36ebca86 100644
--- a/src/systemctl/systemctl-util.c
+++ b/src/systemctl/systemctl-util.c
@@ -16,19 +16,25 @@
 #include "dropin.h"
 #include "env-util.h"
 #include "exit-status.h"
-#include "fs-util.h"
+#include "format-table.h"
+#include "format-util.h"
 #include "glob-util.h"
-#include "macro.h"
+#include "install.h"
+#include "output-mode.h"
+#include "path-lookup.h"
 #include "path-util.h"
 #include "pidref.h"
 #include "polkit-agent.h"
 #include "process-util.h"
 #include "reboot-util.h"
+#include "runtime-scope.h"
 #include "set.h"
-#include "stat-util.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-util.h"
-#include "terminal-util.h"
+#include "unit-file.h"
+#include "unit-name.h"
 #include "verbs.h"
 
 static sd_bus *buses[_BUS_FOCUS_MAX] = {};
diff --git a/src/systemctl/systemctl-util.h b/src/systemctl/systemctl-util.h
index 96543a7b5ea..644cd1e7d99 100644
--- a/src/systemctl/systemctl-util.h
+++ b/src/systemctl/systemctl-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-bus.h"
-
-#include "bus-unit-util.h"
-#include "format-table.h"
 #include "systemctl.h"
 
 typedef enum BusFocus {
diff --git a/src/systemctl/systemctl-whoami.c b/src/systemctl/systemctl-whoami.c
index c8976c5d61a..64fb1d6d3aa 100644
--- a/src/systemctl/systemctl-whoami.c
+++ b/src/systemctl/systemctl-whoami.c
@@ -1,8 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdio.h>
+
 #include "alloc-util.h"
-#include "format-util.h"
+#include "bus-util.h"
+#include "errno-util.h"
 #include "parse-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-util.h"
 #include "systemctl-whoami.h"
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index cffaae5c393..cf36c2bfee3 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1,58 +1,34 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
-#include <locale.h>
+#include <signal.h>
 #include <unistd.h>
 
-#include "sd-daemon.h"
-
 #include "argv-util.h"
 #include "build.h"
+#include "bus-print-properties.h"
 #include "bus-util.h"
 #include "capsule-util.h"
 #include "dissect-image.h"
+#include "extract-word.h"
+#include "image-policy.h"
 #include "install.h"
-#include "logs-show.h"
-#include "main-func.h"
-#include "mount-util.h"
 #include "output-mode.h"
 #include "pager.h"
 #include "parse-argument.h"
 #include "parse-util.h"
-#include "path-util.h"
 #include "pretty-print.h"
-#include "process-util.h"
-#include "reboot-util.h"
-#include "rlimit-util.h"
-#include "signal-util.h"
-#include "stat-util.h"
+#include "static-destruct.h"
 #include "string-table.h"
+#include "string-util.h"
+#include "strv.h"
 #include "systemctl.h"
 #include "systemctl-compat-halt.h"
 #include "systemctl-compat-runlevel.h"
 #include "systemctl-compat-shutdown.h"
 #include "systemctl-compat-telinit.h"
 #include "systemctl-logind.h"
-#include "systemctl-mount.h"
-#include "systemctl-preset-all.h"
-#include "systemctl-reset-failed.h"
-#include "systemctl-service-watchdogs.h"
-#include "systemctl-set-default.h"
-#include "systemctl-set-environment.h"
-#include "systemctl-set-property.h"
-#include "systemctl-show.h"
-#include "systemctl-start-special.h"
-#include "systemctl-start-unit.h"
-#include "systemctl-switch-root.h"
-#include "systemctl-sysv-compat.h"
-#include "systemctl-trivial-method.h"
-#include "systemctl-util.h"
-#include "systemctl-whoami.h"
-#include "terminal-util.h"
 #include "time-util.h"
-#include "user-util.h"
-#include "verbs.h"
-#include "virt.h"
 
 char **arg_types = NULL;
 char **arg_states = NULL;
diff --git a/src/systemctl/systemctl.h b/src/systemctl/systemctl.h
index 7bdca74bedb..40b207ad318 100644
--- a/src/systemctl/systemctl.h
+++ b/src/systemctl/systemctl.h
@@ -1,14 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-
-#include "bus-print-properties.h"
-#include "bus-util.h"
-#include "image-policy.h"
-#include "install.h"
-#include "output-mode.h"
-#include "pager.h"
+#include "forward.h"
 
 enum action {
         ACTION_SYSTEMCTL,