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 99cf6c297f8dda4d76f6eda6f5f5c215bc074b90..d30b9d8fed0408999a89c478fd7a58befee33bc6 100644 (file)
--- 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 741280b302f0da43a8be8c709e1803606eba646e..9393bc4d6a49ec0af9357cb3fba818d243b4137e 100644 (file)
--- 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 214fbc3c8a3c6091284c9fae4efe4228d0dce526..63459820f9698ee5d986f5d9b327f6397a0642cf 100644 (file)
--- 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 ccd4772bb537fdec577176f9d4a900a7901514b4..4870074e8c0149018448df19c85b4de8a29e7ae4 100644 (file)
--- 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 8f8ede23c87ba7256efdb26ec25d6e35e5c3a9e4..0b05fe6702c4513c597334f62e6f948239aca388 100644 (file)
--- 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 7c64715bac634e5e1a33aaaaad1abc2bebb0f51a..e31bfd408b85ff769e913e7dbc5babf7e900a151 100644 (file)
--- 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 0bb752db9565467a786c0d0c9722d358316c5a49..4084a4fa20ccb73455390e6ca03dccc2d8bcaec3 100644 (file)
--- 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 d0f869fc7c7869886eaddb950767ae27d4fc9741..bc0e7a291853c20a26c9e7b2f90242d888b3af5a 100644 (file)
--- 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 2e924b75b1ac54212df610f9015ec8c5f26ba7fa..48606dd77f0cb49097efbd4f526b6dae1804ac20 100644 (file)
--- 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 563b192d9804ce691229f4a283a2485d7e87ab1f..53bc57186a20a88e68abceebe23d9db8fedb7233 100644 (file)
--- 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 beb7dc2cc7097811b3e42e35dd77d926d042ce6c..f4afb53890ebb042781f849510743d04ca67fad9 100644 (file)
--- 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 484dcbfbe661d06ba25ad9f7f0a02990177fda34..efb18cbb6502048a6b7f82787794e5c6fae4c1da 100644 (file)
--- 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 a6d7dec882eb17d7cb30c9106e173e8578f54fda..58d0d27fd7b032dc2e9e8f3d61c6bb5feefcd175 100644 (file)
--- 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 a6495e68cde7102e419c65df2efe3db872092da1..943d4aa6d7a77d1d8a54fa82afdebd6b8deaffba 100644 (file)
--- 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 a72163c3432f88a6c3b0433c46adf5849474501c..efeff44e0f84b5e092dd65d1f2555d448971f42a 100644 (file)
--- 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 a5f8a407fe5c9807da98e84d00504f0884d7572d..5fdd442e8804c5bb6a71a50c5e6219080b4b7d2c 100644 (file)
--- 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 6b7e0597ceeac01cf595b27c5deaab76ccba8837..9049873bbe32976828ad989a8a8faf14ac7992ce 100644 (file)
--- 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 60d101312736134dad2f7c8d229b529b7bc9a10a..ea83f43a737fa086950b884c30aae76d4686b2c0 100644 (file)
--- 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 95a685970b0662e84c9f130ec1d98d3248590e5b..660c50cab052c76920d87ff10da5cd44b1435aa1 100644 (file)
--- 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 cf36e9441201f913ab38db0087982e5c3b1ae2e3..bd42fb7a300e2e3ed24b409c8821acbfca144af1 100644 (file)
--- 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 ec9c517c1901b5f3d867fe3b094ec4603f7b0531..17b5bb7709c1d55447e44561acc1c01d21783258 100644 (file)
--- 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 8b6e58cbc47b125c8693a993640106e8be5f0a94..1ea3d7abefad4666ddb527804580105c4e9ce9d9 100644 (file)
--- 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 f915ff9ac155468fc56d610fbf30798b2be856a4..42eefabcbbf2befc7084f098519b51f34d71f9be 100644 (file)
--- 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 48c083e5e57dc61c8bad1f44e4af763116b827e1..cde07ab8cb400d8691c414a336aaf05f112946c0 100644 (file)
--- 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 058aaad92506a2669345902adfbdfdaa0f7386f5..bc4aa92260f833094da97f9600dbcb578b219084 100644 (file)
--- 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 f0928e608493b2ffef67a38768dfd3173dc08d38..20079d10048cf78129d92b9d7ade280a64a156be 100644 (file)
--- 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 f3f6fab7c35a47865523cf13721d3606fefbe237..18ca190517844e862a2321e0bb1f157a92f55644 100644 (file)
--- 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 d5a537d215aabde0aa35c05be7bad7dde65f6f49..632345b405654f266d6d5d00b2a9a7c050ae40ba 100644 (file)
--- 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 ae434dc357edca95e99f432a4ae3f59edecf966e..ca0f2575cdc6d8b6e7bafc255767b0fff2aebc4d 100644 (file)
--- 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 3aed41eccd5bf3d937e26d567ae3fa09549985b7..7e04f5a8673376edc3e1f21529b48d2ab76227e8 100644 (file)
--- 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 45b14f43ee87b8fea80d8604841f32a3e365b41e..e84e3d580f0f6ddc4535514b4ac0efcd8d09ff61 100644 (file)
--- 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 47d519a4ab7cadbdc2b69228e3af91f8aa97b954..958b2a5657c52a47f37f919355e801ff93538859 100644 (file)
--- 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 c17e8ae4800d4867b213c2dc65ff87fc8e8c9da7..78cbceed7e1bf3cdc8127958d31d2448f2db1668 100644 (file)
--- 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 1cb2a6db467990a3f59a6d09f143ba148861128c..7ff5548ba85c6418dd67fabcb42192dcebc1e8c3 100644 (file)
--- 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 45e8f8a750e413a2841ed944f5805e22ce04aad2..62aebe886e611f24db90f014d93cd499eef31a1f 100644 (file)
--- 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 5686b0a1cd5972c5d5ef65d0aec948a9ad216a4b..b805bbe9ab352ecb1e730cbd91b0c2260d3a9f6a 100644 (file)
--- 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 05db6ec6f2276aca63e941b6f4f964a4c070580b..159d0e2be700351e216698d53e38cc01adee9d35 100644 (file)
--- 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 4d4f262726947ad1138f9e284a01b0aa86532f1c..3fa1272c665c2dd2b0555ccfaa85a2d7e443b3ed 100644 (file)
--- 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 f81ca267ad5d39c690c1bd9a2c21d6bc96a322c6..43d36ebca862a1fe4b3295bf9c04eec2d4646d33 100644 (file)
--- 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 96543a7b5eaf3aea5417441aaa8a40ed37e9a723..644cd1e7d991a7a1c658f34bc5dcc3f0844d6960 100644 (file)
--- 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 c8976c5d61aa12bb6a967ac0ff7fb8d10fc39c0d..64fb1d6d3aaf4820782e9c6073c0a23d479b7657 100644 (file)
--- 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 cffaae5c393921ab33365f8a3f88458419ec7df8..cf36c2bfee3129789ed95756961b53ced68bc378 100644 (file)
--- 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 7bdca74bedbdc2e74d3c6547c1bf6eafd2098675..40b207ad318f089265e9f43dfbebd7a7e8dddb77 100644 (file)
--- 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,