journal: Clean up includes

Split out of #37344.

diff --git a/src/journal/bsod.c b/src/journal/bsod.c
index 68361b084a6e6a16f9dba8872481343fe898daa5..12a032efe73df8ba81fdc89d421e7c37dea39f84 100644 (file)
--- a/src/journal/bsod.c
+++ b/src/journal/bsod.c
@@ -1,12 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
 #include <linux/vt.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
 
-#include "sd-id128.h"
 #include "sd-journal.h"
 
 #include "alloc-util.h"
@@ -21,7 +19,7 @@
 #include "pretty-print.h"
 #include "qrcode-util.h"
 #include "signal-util.h"
-#include "sysctl-util.h"
+#include "stdio-util.h"
 #include "terminal-util.h"
 
 static bool arg_continuous = false;

diff --git a/src/journal/cat.c b/src/journal/cat.c
index 20a08b1b2951f9a6aad8bfd4f5e93a476d644eff..5a60414b5612eb041bb9d2102282bd3ba73e25df 100644 (file)
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -1,10 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
@@ -18,11 +16,9 @@
 #include "log.h"
 #include "main-func.h"
 #include "parse-argument.h"
-#include "parse-util.h"
 #include "pretty-print.h"
 #include "string-util.h"
 #include "syslog-util.h"
-#include "terminal-util.h"
 
 static const char *arg_identifier = NULL;
 static const char *arg_namespace = NULL;

diff --git a/src/journal/fuzz-journald-native-fd.c b/src/journal/fuzz-journald-native-fd.c
index f970acb62328436d6ba07491e2a7faf18b084786..0b8a4a233479c8d0b292f973a840c4d9afc390d0 100644 (file)
--- a/src/journal/fuzz-journald-native-fd.c
+++ b/src/journal/fuzz-journald-native-fd.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "fd-util.h"
-#include "fs-util.h"
 #include "fuzz.h"
 #include "fuzz-journald.h"
 #include "journald-native.h"

diff --git a/src/journal/fuzz-journald-stream.c b/src/journal/fuzz-journald-stream.c
index cc79ed31bcd667b67f32870b2f81fe540c31cb10..cc3298f0dded76b13281da4f051fd5750174584c 100644 (file)
--- a/src/journal/fuzz-journald-stream.c
+++ b/src/journal/fuzz-journald-stream.c
@@ -4,6 +4,8 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#include "sd-event.h"
+
 #include "fd-util.h"
 #include "fuzz.h"
 #include "fuzz-journald.h"

diff --git a/src/journal/journalctl-authenticate.c b/src/journal/journalctl-authenticate.c
index 667c4f4a14137ba1131bb2cdf43d0e1dd4402d59..7b2d8714ad8a15e96b5572d3bced21f17b317779 100644 (file)
--- a/src/journal/journalctl-authenticate.c
+++ b/src/journal/journalctl-authenticate.c
@@ -1,7 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <unistd.h>
+
 #include "sd-json.h"
 
+#include "alloc-util.h"
 #include "ansi-color.h"
 #include "chattr-util.h"
 #include "errno-util.h"
@@ -11,7 +14,7 @@
 #include "hostname-setup.h"
 #include "hostname-util.h"
 #include "io-util.h"
-#include "journal-authenticate.h"
+#include "journal-def.h"
 #include "journalctl.h"
 #include "journalctl-authenticate.h"
 #include "log.h"
@@ -20,7 +23,9 @@
 #include "qrcode-util.h"
 #include "random-util.h"
 #include "stat-util.h"
+#include "string-util.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "tmpfile-util.h"
 
 #if HAVE_GCRYPT

diff --git a/src/journal/journalctl-catalog.c b/src/journal/journalctl-catalog.c
index a35b0a64a38bde564062824923b497b94bfc6950..0481dd51301188cf2743894da8ac33e844299474 100644 (file)
--- a/src/journal/journalctl-catalog.c
+++ b/src/journal/journalctl-catalog.c
@@ -1,10 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdlib.h>
+
 #include "alloc-util.h"
 #include "catalog.h"
 #include "journalctl.h"
 #include "journalctl-catalog.h"
 #include "log.h"
+#include "pager.h"
 #include "path-util.h"
 
 int action_update_catalog(void) {

diff --git a/src/journal/journalctl-filter.c b/src/journal/journalctl-filter.c
index 7e739be594fe5e6e01fad2994845820ed313e911..d29237e43b58cc86f19e957b183534775ab1b0a0 100644 (file)
--- a/src/journal/journalctl-filter.c
+++ b/src/journal/journalctl-filter.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "sd-device.h"
+#include "sd-journal.h"
 
 #include "alloc-util.h"
 #include "chase.h"
@@ -15,6 +16,9 @@
 #include "logs-show.h"
 #include "missing_sched.h"
 #include "path-util.h"
+#include "set.h"
+#include "stat-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "unit-name.h"
 

diff --git a/src/journal/journalctl-filter.h b/src/journal/journalctl-filter.h
index c752c0c632115991619770559af81722c8b3ce27..d5966ab5f6e0c49e92c02a31f1ec06f2e5de8ef5 100644 (file)
--- a/src/journal/journalctl-filter.h
+++ b/src/journal/journalctl-filter.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-journal.h"
+#include "forward.h"
 
 int add_filters(sd_journal *j, char **matches);

diff --git a/src/journal/journalctl-misc.c b/src/journal/journalctl-misc.c
index e8dc135e77120189ddb5f90ce9a985a541f7c239..c69ddd4985fa2ea3a8f17cb41472ce249fddb37c 100644 (file)
--- a/src/journal/journalctl-misc.c
+++ b/src/journal/journalctl-misc.c
@@ -1,10 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-journal.h"
+
 #include "alloc-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "format-table.h"
 #include "format-util.h"
+#include "hashmap.h"
 #include "journal-internal.h"
 #include "journal-verify.h"
 #include "journalctl.h"
@@ -14,6 +17,7 @@
 #include "logs-show.h"
 #include "strv.h"
 #include "syslog-util.h"
+#include "time-util.h"
 
 int action_print_header(void) {
         _cleanup_(sd_journal_closep) sd_journal *j = NULL;

diff --git a/src/journal/journalctl-misc.h b/src/journal/journalctl-misc.h
index 72036890a81f7fef04ae05304bd9fba0896e7f24..0da319079cf3df3e840e5c712be4a78067f64966 100644 (file)
--- a/src/journal/journalctl-misc.h
+++ b/src/journal/journalctl-misc.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
+#include "forward.h"
 
 int action_print_header(void);
 int action_verify(void);

diff --git a/src/journal/journalctl-show.c b/src/journal/journalctl-show.c
index 4a704314ad9873fa332d280cb050af5b6bdf276b..13f0fd07c076d51f177efaa4901583eac449caca 100644 (file)
--- a/src/journal/journalctl-show.c
+++ b/src/journal/journalctl-show.c
@@ -4,8 +4,9 @@
 
 #include "sd-daemon.h"
 #include "sd-event.h"
-#include "sd-varlink.h"
+#include "sd-journal.h"
 
+#include "alloc-util.h"
 #include "ansi-color.h"
 #include "fileio.h"
 #include "journalctl.h"
@@ -13,8 +14,12 @@
 #include "journalctl-show.h"
 #include "journalctl-util.h"
 #include "journalctl-varlink.h"
+#include "log.h"
 #include "logs-show.h"
+#include "pager.h"
+#include "string-util.h"
 #include "terminal-util.h"
+#include "time-util.h"
 
 #define PROCESS_INOTIFY_INTERVAL 1024   /* Every 1024 messages processed */
 

diff --git a/src/journal/journalctl-util.c b/src/journal/journalctl-util.c
index 0e85c520caa8b95e7c4e88128539307e06bd7e82..dd6026e9f27644c920827846c74b8d84c5187fd6 100644 (file)
--- a/src/journal/journalctl-util.c
+++ b/src/journal/journalctl-util.c
@@ -12,9 +12,10 @@
 #include "log.h"
 #include "logs-show.h"
 #include "nulstr-util.h"
-#include "rlimit-util.h"
+#include "set.h"
+#include "string-util.h"
 #include "strv.h"
-#include "terminal-util.h"
+#include "time-util.h"
 #include "unit-name.h"
 
 char* format_timestamp_maybe_utc(char *buf, size_t l, usec_t t) {

diff --git a/src/journal/journalctl-util.h b/src/journal/journalctl-util.h
index 14cdfb51361bb74a2c1deec97e50b52799dbecd5..4571c285408aafca564df1c4970a04bd379d9192 100644 (file)
--- a/src/journal/journalctl-util.h
+++ b/src/journal/journalctl-util.h
@@ -1,11 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-journal.h"
-
+#include "forward.h"
 #include "logs-show.h"
-#include "set.h"
-#include "time-util.h"
 
 /* The lists below are supposed to return the superset of unit names possibly matched by rules added with
  * add_matches_for_unit() and add_matches_for_user_unit(). */

diff --git a/src/journal/journalctl-varlink.c b/src/journal/journalctl-varlink.c
index 5c5f5827ba9c85913f69418729b803d02b8caa7f..c278bc3365724405254c859917d131a9612005a6 100644 (file)
--- a/src/journal/journalctl-varlink.c
+++ b/src/journal/journalctl-varlink.c
@@ -1,14 +1,19 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <unistd.h>
+
+#include "sd-journal.h"
 #include "sd-varlink.h"
 
 #include "errno-util.h"
+#include "hashmap.h"
 #include "journal-internal.h"
 #include "journal-vacuum.h"
 #include "journalctl.h"
 #include "journalctl-util.h"
 #include "journalctl-varlink.h"
 #include "log.h"
+#include "string-util.h"
 #include "varlink-util.h"
 
 int varlink_connect_journal(sd_varlink **ret) {

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 13ebfda579c815188cfbba36db032202ded15053..7d138df03a0df50f5c89f1338b97bd62e87c0dac 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1,10 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
+#include <locale.h>
 
 #include "sd-journal.h"
 
 #include "build.h"
+#include "dissect-image.h"
+#include "extract-word.h"
 #include "glob-util.h"
 #include "id128-print.h"
 #include "image-policy.h"
@@ -14,16 +17,24 @@
 #include "journalctl-misc.h"
 #include "journalctl-show.h"
 #include "journalctl-varlink.h"
-#include "locale-util.h"
+#include "log.h"
+#include "loop-util.h"
 #include "main-func.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
+#include "output-mode.h"
+#include "pager.h"
 #include "parse-argument.h"
 #include "parse-util.h"
+#include "pcre2-util.h"
 #include "pretty-print.h"
+#include "set.h"
 #include "static-destruct.h"
 #include "string-table.h"
+#include "string-util.h"
+#include "strv.h"
 #include "syslog-util.h"
+#include "time-util.h"
 
 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
 

diff --git a/src/journal/journalctl.h b/src/journal/journalctl.h
index 25b9c9c3eb45dbc5c41e1dd72200d37a04c5d12e..b78d617b7ca71585e021eb3a36148adb52fdf0a1 100644 (file)
--- a/src/journal/journalctl.h
+++ b/src/journal/journalctl.h
@@ -1,18 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <inttypes.h>
-#include <stdbool.h>
-
-#include "sd-id128.h"
-#include "sd-json.h"
-
-#include "image-policy.h"
-#include "output-mode.h"
-#include "pager.h"
+#include "forward.h"
 #include "pcre2-util.h"
-#include "set.h"
-#include "time-util.h"
 
 typedef enum JournalctlAction {
         ACTION_SHOW,

diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
index fb04074fdc1f0fbd9f367b492639d6b013db7fb1..41336321b7d510bbc5d108637dec5bab4217776e 100644 (file)
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <malloc.h>
+#include "sd-event.h"
 
 #include "alloc-util.h"
 #include "audit-type.h"
@@ -11,8 +11,11 @@
 #include "journal-internal.h"
 #include "journald-audit.h"
 #include "journald-manager.h"
+#include "log.h"
 #include "missing_audit.h"
+#include "stdio-util.h"
 #include "string-util.h"
+#include "time-util.h"
 
 typedef struct MapField {
         const char *audit_field;

diff --git a/src/journal/journald-audit.h b/src/journal/journald-audit.h
index 754bf488bc81e692e66fca94fdb4afaff9eacb43..eb4fe3e613890f2beeb11297e6cc6455af428e84 100644 (file)
--- a/src/journal/journald-audit.h
+++ b/src/journal/journald-audit.h
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "socket-util.h"
-
-typedef struct Manager Manager;
+#include "journald-forward.h"
 
 void manager_process_audit_message(Manager *m, const void *buffer, size_t buffer_size, const struct ucred *ucred, const union sockaddr_union *sa, socklen_t salen);
 

diff --git a/src/journal/journald-client.c b/src/journal/journald-client.c
index 25c6401b8f98cb8abfff23549b09f7a7be78c7e1..1611395e947c778d6933ae8f8b3350971e1d8c8a 100644 (file)
--- a/src/journal/journald-client.c
+++ b/src/journal/journald-client.c
@@ -8,6 +8,7 @@
 #include "log.h"
 #include "nulstr-util.h"
 #include "pcre2-util.h"
+#include "set.h"
 #include "strv.h"
 
 /* This consumes both `allow_list` and `deny_list` arguments. Hence, those arguments are not owned by the

diff --git a/src/journal/journald-client.h b/src/journal/journald-client.h
index 700b43db7d519c6e3c5b19a54dfcd3568c72c886..c036720efe0f499806c4fa810de903b7b02e31fa 100644 (file)
--- a/src/journal/journald-client.h
+++ b/src/journal/journald-client.h
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stddef.h>
-
-typedef struct ClientContext ClientContext;
+#include "journald-forward.h"
 
 int client_context_read_log_filter_patterns(ClientContext *c, const char *cgroup);
 int client_context_check_keep_log(ClientContext *c, const char *message, size_t len);

diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
index 19ccec1ab5a86674d1408ca1a7ca498c9c31496a..887b59b2690cd3b27e7c3df2e1e533356cad8d15 100644 (file)
--- a/src/journal/journald-console.c
+++ b/src/journal/journald-console.c
@@ -11,10 +11,12 @@
 #include "iovec-util.h"
 #include "journald-console.h"
 #include "journald-manager.h"
+#include "log.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "stdio-util.h"
 #include "terminal-util.h"
+#include "time-util.h"
 
 static bool prefix_timestamp(void) {
 

diff --git a/src/journal/journald-console.h b/src/journal/journald-console.h
index 7830a0401e23449c57aec42b40312bce17442447..40558dd9db22ea06fd87c3566a3a67036b0b93fa 100644 (file)
--- a/src/journal/journald-console.h
+++ b/src/journal/journald-console.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/socket.h>
-
-typedef struct Manager Manager;
+#include "journald-forward.h"
 
 void manager_forward_console(Manager *m, int priority, const char *identifier, const char *message, const struct ucred *ucred);

diff --git a/src/journal/journald-context.c b/src/journal/journald-context.c
index cb80e9250898fadeca5393fb5b95336c99e75f53..70c0a2a1eedf8aefb65ae1dd8c53c5dc2ebadc0e 100644 (file)
--- a/src/journal/journald-context.c
+++ b/src/journal/journald-context.c
@@ -4,6 +4,8 @@
 #include <selinux/selinux.h>
 #endif
 
+#include <sys/stat.h>
+
 #include "alloc-util.h"
 #include "audit-util.h"
 #include "cgroup-util.h"
@@ -13,16 +15,20 @@
 #include "fs-util.h"
 #include "iovec-util.h"
 #include "journal-internal.h"
-#include "journal-util.h"
 #include "journald-client.h"
 #include "journald-context.h"
 #include "journald-manager.h"
+#include "log.h"
 #include "parse-util.h"
 #include "path-util.h"
+#include "pidref.h"
+#include "prioq.h"
 #include "process-util.h"
 #include "procfs-util.h"
+#include "set.h"
 #include "string-util.h"
 #include "syslog-util.h"
+#include "time-util.h"
 #include "unaligned.h"
 #include "user-util.h"
 

diff --git a/src/journal/journald-context.h b/src/journal/journald-context.h
index c784378b85c1e3b7532b5f47aca8e95a62c44711..b728e3987618a939ff73a24fed851850fb80d1d5 100644 (file)
--- a/src/journal/journald-context.h
+++ b/src/journal/journald-context.h
@@ -1,18 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <inttypes.h>
-#include <sys/socket.h>
-#include <sys/types.h>
 #include <syslog.h>
 
 #include "sd-id128.h"
 
 #include "capability-util.h"
-#include "set.h"
-#include "time-util.h"
-
-typedef struct Manager Manager;
+#include "journald-forward.h"
 
 typedef struct ClientContext {
         unsigned n_ref;

diff --git a/src/journal/journald-forward.h b/src/journal/journald-forward.h
new file mode 100644 (file)
index 0000000..41214b8
--- /dev/null
+++ b/src/journal/journald-forward.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+#pragma once
+
+#include "conf-parser-forward.h"    /* IWYU pragma: export */
+#include "forward.h"                /* IWYU pragma: export */
+
+typedef struct Manager Manager;
+typedef struct StreamSyncReq StreamSyncReq;
+typedef struct SyncReq SyncReq;
+typedef struct ClientContext ClientContext;
+typedef struct StdoutStream StdoutStream;

diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf
index b65faa419963032211a3a687d92056246a79c41f..b2cfde3ade64fc13e8420cb67f59f3d6628f0d07 100644 (file)
--- a/src/journal/journald-gperf.gperf
+++ b/src/journal/journald-gperf.gperf
@@ -5,7 +5,6 @@ _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"")
 _Pragma("GCC diagnostic ignored \"-Wzero-as-null-pointer-constant\"")
 #endif
 #include <stddef.h>
-#include <sys/socket.h>
 #include "conf-parser.h"
 #include "journald-manager.h"
 %}

diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
index bfd32cbdc44469c2ef68750129d4f31482714b18..fe69f77e017d2d07a15cb7b400f822e7dfbe87bf 100644 (file)
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -1,24 +1,25 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
-#include <sys/epoll.h>
 #include <sys/mman.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
 #include "sd-device.h"
+#include "sd-event.h"
 #include "sd-messages.h"
 
 #include "alloc-util.h"
 #include "device-util.h"
+#include "errno-util.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "format-util.h"
-#include "fs-util.h"
 #include "iovec-util.h"
 #include "journal-internal.h"
 #include "journald-kmsg.h"
 #include "journald-manager.h"
+#include "journald-sync.h"
 #include "journald-syslog.h"
 #include "log.h"
 #include "parse-util.h"

diff --git a/src/journal/journald-kmsg.h b/src/journal/journald-kmsg.h
index fa33e897a4728db31fed185408502d324ddbd15b..e1f2114a8adf1e73c9c4986aa4c2521c83c966e7 100644 (file)
--- a/src/journal/journald-kmsg.h
+++ b/src/journal/journald-kmsg.h
@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stddef.h>
-#include <sys/socket.h>
-
-typedef struct Manager Manager;
+#include "journald-forward.h"
 
 int manager_open_dev_kmsg(Manager *m);
 int manager_flush_dev_kmsg(Manager *m);

diff --git a/src/journal/journald-manager.c b/src/journal/journald-manager.c
index 33a79cefb29d6472fb69a26317291fc9a66f8235..8f239a14f561b881de67275403c7b5fede39ecb4 100644 (file)
--- a/src/journal/journald-manager.c
+++ b/src/journal/journald-manager.c
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/sockios.h>
-#if HAVE_SELINUX
-#include <selinux/selinux.h>
-#endif
+#include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/signalfd.h>
@@ -12,6 +10,7 @@
 #include "sd-daemon.h"
 #include "sd-journal.h"
 #include "sd-messages.h"
+#include "sd-varlink.h"
 
 #include "acl-util.h"
 #include "alloc-util.h"
@@ -21,8 +20,8 @@
 #include "creds-util.h"
 #include "daemon-util.h"
 #include "dirent-util.h"
+#include "errno-util.h"
 #include "event-util.h"
-#include "extract-word.h"
 #include "fd-util.h"
 #include "fdset.h"
 #include "fileio.h"
@@ -30,8 +29,6 @@
 #include "fs-util.h"
 #include "hashmap.h"
 #include "hostname-setup.h"
-#include "hostname-util.h"
-#include "id128-util.h"
 #include "initrd-util.h"
 #include "iovec-util.h"
 #include "journal-authenticate.h"
@@ -46,6 +43,7 @@
 #include "journald-rate-limit.h"
 #include "journald-socket.h"
 #include "journald-stream.h"
+#include "journald-sync.h"
 #include "journald-syslog.h"
 #include "journald-varlink.h"
 #include "log.h"
@@ -54,17 +52,19 @@
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"
+#include "prioq.h"
 #include "proc-cmdline.h"
 #include "process-util.h"
 #include "rm-rf.h"
-#include "selinux-util.h"
-#include "signal-util.h"
+#include "set.h"
 #include "socket-netlink.h"
 #include "socket-util.h"
 #include "stdio-util.h"
 #include "string-table.h"
 #include "string-util.h"
+#include "strv.h"
 #include "syslog-util.h"
+#include "time-util.h"
 #include "uid-classification.h"
 #include "user-util.h"
 

diff --git a/src/journal/journald-manager.h b/src/journal/journald-manager.h
index ceaa11801cb477d389a20e11a6dfd1e3704a3ae2..dda1184e25b35528ac61eea497ca7ea8809051e3 100644 (file)
--- a/src/journal/journald-manager.h
+++ b/src/journal/journald-manager.h
@@ -1,24 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-#include <sys/types.h>
-
-#include "sd-event.h"
-#include "sd-varlink.h"
-
 #include "common-signal.h"
-#include "conf-parser.h"
-#include "hashmap.h"
 #include "journal-file.h"
-#include "journald-context.h"
-#include "journald-stream.h"
-#include "journald-sync.h"
+#include "journald-forward.h"
 #include "list.h"
-#include "prioq.h"
 #include "ratelimit.h"
 #include "socket-util.h"
-#include "time-util.h"
 
 typedef enum Storage {
         STORAGE_AUTO,

diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index db1131d5d81f78821b099ebb3bf3eb9b19718f39..2ae755b737100dee9d9d3d2899f72d884bd54895 100644 (file)
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -1,25 +1,26 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <stddef.h>
-#include <sys/epoll.h>
 #include <sys/mman.h>
 #include <sys/statvfs.h>
 #include <unistd.h>
 
+#include "sd-event.h"
+
 #include "alloc-util.h"
 #include "fd-util.h"
-#include "fs-util.h"
+#include "format-util.h"
 #include "iovec-util.h"
 #include "journal-importer.h"
 #include "journal-internal.h"
-#include "journal-util.h"
 #include "journald-client.h"
 #include "journald-console.h"
+#include "journald-context.h"
 #include "journald-kmsg.h"
 #include "journald-manager.h"
 #include "journald-native.h"
 #include "journald-syslog.h"
 #include "journald-wall.h"
+#include "log.h"
 #include "memfd-util.h"
 #include "memory-util.h"
 #include "parse-util.h"
@@ -29,7 +30,6 @@
 #include "socket-util.h"
 #include "stat-util.h"
 #include "string-util.h"
-#include "strv.h"
 #include "unaligned.h"
 
 static bool allow_object_pid(const struct ucred *ucred) {

diff --git a/src/journal/journald-native.h b/src/journal/journald-native.h
index ac8801f9de8b303c1a294190a7815585e2017771..6c44ddac7637c80bca7ea85e24ffd383899ea168 100644 (file)
--- a/src/journal/journald-native.h
+++ b/src/journal/journald-native.h
@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stddef.h>
-#include <sys/socket.h>
-
-typedef struct Manager Manager;
+#include "journald-forward.h"
 
 void manager_process_native_message(
                 Manager *m,

diff --git a/src/journal/journald-rate-limit.c b/src/journal/journald-rate-limit.c
index 227d8608076b6491deeba35015e4b60b52aa5ed6..5bb85146172bf8f645fd5fe7d59b7dc08f9abd5b 100644 (file)
--- a/src/journal/journald-rate-limit.c
+++ b/src/journal/journald-rate-limit.c
@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <syslog.h>
+
 #include "alloc-util.h"
 #include "hashmap.h"
 #include "journald-rate-limit.h"
-#include "log.h"
 #include "logarithm.h"
-#include "string-util.h"
 #include "time-util.h"
 
 #define POOLS_MAX 5

diff --git a/src/journal/journald-rate-limit.h b/src/journal/journald-rate-limit.h
index 566bba4be21da0b4f9d480cfc5d2c21ed36be706..6b83d3a0679b613fd034237758c562238bf99a12 100644 (file)
--- a/src/journal/journald-rate-limit.h
+++ b/src/journal/journald-rate-limit.h
@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <inttypes.h>
-
-#include "hashmap.h"
-#include "time-util.h"
+#include "journald-forward.h"
 
 int journal_ratelimit_test(
                 OrderedHashmap **groups_by_id,

diff --git a/src/journal/journald-socket.c b/src/journal/journald-socket.c
index a46b355fc5faaa12cceb8d64a5ed98509d5f2257..ba3c37e45b7db8ebdf84becf66cff447cdf2e362 100644 (file)
--- a/src/journal/journald-socket.c
+++ b/src/journal/journald-socket.c
@@ -4,15 +4,16 @@
 #include <sys/socket.h>
 #include <sys/uio.h>
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "iovec-util.h"
 #include "journald-manager.h"
 #include "journald-socket.h"
 #include "log.h"
-#include "macro.h"
-#include "process-util.h"
+#include "stdio-util.h"
 #include "socket-util.h"
 #include "sparse-endian.h"
+#include "time-util.h"
 
 static int manager_open_forward_socket(Manager *m) {
         _cleanup_close_ int socket_fd = -EBADF;

diff --git a/src/journal/journald-socket.h b/src/journal/journald-socket.h
index ee1813d5dff5e5051b7dbc39ca7e18f67ee7e937..835c2459b81dd7a5a3597b58395b6b2185ee8041 100644 (file)
--- a/src/journal/journald-socket.h
+++ b/src/journal/journald-socket.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/socket.h>
-
-#include "time-util.h"
-
-typedef struct Manager Manager;
+#include "journald-forward.h"
 
 int manager_forward_socket(Manager *m, const struct iovec *iovec, size_t n, const dual_timestamp *ts, int priority);

diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index be8edc0e4453f2ad59ad81aaf2ca6eb94bd4a82f..88a6233bcb79e7e3bde80f6ccb18d6a7c8e545ef 100644 (file)
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -1,13 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <stddef.h>
 #include <unistd.h>
+#include <sys/stat.h>
 
-#if HAVE_SELINUX
-#include <selinux/selinux.h>
-#endif
-
-#include "sd-daemon.h"
 #include "sd-event.h"
 
 #include "alloc-util.h"
@@ -27,8 +22,10 @@
 #include "journald-kmsg.h"
 #include "journald-manager.h"
 #include "journald-stream.h"
+#include "journald-sync.h"
 #include "journald-syslog.h"
 #include "journald-wall.h"
+#include "log.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "process-util.h"
@@ -39,7 +36,6 @@
 #include "syslog-util.h"
 #include "tmpfile-util.h"
 #include "unit-name.h"
-#include "user-util.h"
 
 #define STDOUT_STREAMS_MAX (64*1024)
 

diff --git a/src/journal/journald-stream.h b/src/journal/journald-stream.h
index cb55970059d6b4a76784cbde81f6341ae760f558..517ee46b32fec17f7c9a02b45b68b6d0e7474f3a 100644 (file)
--- a/src/journal/journald-stream.h
+++ b/src/journal/journald-stream.h
@@ -3,17 +3,11 @@
 
 #include <sys/socket.h>
 
-#include "sd-event.h"
 #include "sd-id128.h"
 
-#include "fdset.h"
+#include "journald-forward.h"
 #include "list.h"
 
-typedef struct ClientContext ClientContext;
-typedef struct Manager Manager;
-typedef struct StdoutStream StdoutStream;
-typedef struct StreamSyncReq StreamSyncReq;
-
 typedef enum StdoutStreamState {
         STDOUT_STREAM_IDENTIFIER,
         STDOUT_STREAM_UNIT_ID,
@@ -25,7 +19,7 @@ typedef enum StdoutStreamState {
         STDOUT_STREAM_RUNNING,
 } StdoutStreamState;
 
-struct StdoutStream {
+typedef struct StdoutStream {
         Manager *manager;
         StdoutStreamState state;
 
@@ -59,7 +53,7 @@ struct StdoutStream {
         char id_field[STRLEN("_STREAM_ID=") + SD_ID128_STRING_MAX];
 
         LIST_HEAD(StreamSyncReq, stream_sync_reqs);
-};
+} StdoutStream;
 
 int manager_open_stdout_socket(Manager *m, const char *stdout_socket);
 int manager_restore_streams(Manager *m, FDSet *fds);

diff --git a/src/journal/journald-sync.c b/src/journal/journald-sync.c
index 11f02ea5da651495f2d5f15726377f688ca206dc..b22cb54b1258ffb028a95c304223f101ffc6f81a 100644 (file)
--- a/src/journal/journald-sync.c
+++ b/src/journal/journald-sync.c
@@ -2,14 +2,18 @@
 
 #include <linux/sockios.h>
 #include <sys/ioctl.h>
+#include <sys/poll.h>
 
 #include "sd-varlink.h"
 
+#include "alloc-util.h"
 #include "io-util.h"
 #include "journald-manager.h"
 #include "journald-stream.h"
 #include "journald-sync.h"
 #include "journald-varlink.h"
+#include "log.h"
+#include "prioq.h"
 #include "socket-netlink.h"
 #include "time-util.h"
 

diff --git a/src/journal/journald-sync.h b/src/journal/journald-sync.h
index ae796a53bb55f05d0dfcb23fd1884697637f706f..e1172611e952a4704d52e6d5d17918fa19520c61 100644 (file)
--- a/src/journal/journald-sync.h
+++ b/src/journal/journald-sync.h
@@ -1,19 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-varlink.h"
-
-#include "journald-stream.h"
+#include "journald-forward.h"
 #include "list.h"
-#include "macro.h"
-
-typedef struct Manager Manager;
-typedef struct StreamSyncReq StreamSyncReq;
-typedef struct SyncReq SyncReq;
 
 /* Encapsulates the synchronization request data we need to keep per STDOUT stream. Primarily a byte counter
  * to count down. */
-struct StreamSyncReq {
+typedef struct StreamSyncReq {
         SyncReq *req;
         StdoutStream *stream;
 
@@ -21,10 +14,10 @@ struct StreamSyncReq {
 
         LIST_FIELDS(StreamSyncReq, by_sync_req);
         LIST_FIELDS(StreamSyncReq, by_stdout_stream);
-};
+} StreamSyncReq;
 
 /* Encapsulates a synchronization request */
-struct SyncReq {
+typedef struct SyncReq {
         Manager *manager;
         sd_varlink *link;
 
@@ -42,7 +35,7 @@ struct SyncReq {
 
         unsigned realtime_prioq_idx;
         unsigned boottime_prioq_idx;
-};
+} SyncReq;
 
 StreamSyncReq *stream_sync_req_free(StreamSyncReq *ssr);
 DEFINE_TRIVIAL_CLEANUP_FUNC(StreamSyncReq*, stream_sync_req_free);

diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 24e0755cc52be59ca7fd527529deac8ff3c1ea22..1aacf2fd19ff52fd81b88cef1b1c84f26c6f075d 100644 (file)
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <stddef.h>
-#include <sys/epoll.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
+#include "sd-event.h"
 #include "sd-messages.h"
 
 #include "alloc-util.h"
@@ -13,16 +13,19 @@
 #include "journal-internal.h"
 #include "journald-client.h"
 #include "journald-console.h"
+#include "journald-context.h"
 #include "journald-kmsg.h"
 #include "journald-manager.h"
 #include "journald-syslog.h"
 #include "journald-wall.h"
+#include "log.h"
 #include "process-util.h"
 #include "selinux-util.h"
 #include "socket-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
 #include "syslog-util.h"
+#include "time-util.h"
 
 /* Warn once every 30s if we missed syslog message */
 #define WARN_FORWARD_SYSLOG_MISSED_USEC (30 * USEC_PER_SEC)

diff --git a/src/journal/journald-syslog.h b/src/journal/journald-syslog.h
index 71bfbcbc6c33553892dd8831db2b6f54931d7ef1..bea49c1e81f06c696e4f6f8cae807d153371b771 100644 (file)
--- a/src/journal/journald-syslog.h
+++ b/src/journal/journald-syslog.h
@@ -1,11 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/socket.h>
-
-#include "macro.h"
-
-typedef struct Manager Manager;
+#include "journald-forward.h"
 
 int syslog_fixup_facility(int priority) _const_;
 

diff --git a/src/journal/journald-varlink.c b/src/journal/journald-varlink.c
index 63aed28d0bb2a7cd0c30f17b6ba4598d9c7fe09c..81682ea855314450e110f76ab7973391c42892f2 100644 (file)
--- a/src/journal/journald-varlink.c
+++ b/src/journal/journald-varlink.c
@@ -1,8 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-event.h"
+
 #include "journald-manager.h"
 #include "journald-sync.h"
 #include "journald-varlink.h"
+#include "log.h"
 #include "varlink-io.systemd.Journal.h"
 #include "varlink-io.systemd.service.h"
 #include "varlink-util.h"

diff --git a/src/journal/journald-varlink.h b/src/journal/journald-varlink.h
index 352fef1f840a1b9fc7753af0c6971c1e65d08054..85d95cd038f672855b809aa8fa6609fc1ba92a6e 100644 (file)
--- a/src/journal/journald-varlink.h
+++ b/src/journal/journald-varlink.h
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "journald-manager.h"
-#include "journald-sync.h"
+#include "journald-forward.h"
 
 int manager_open_varlink(Manager *m, const char *socket, int fd);
 

diff --git a/src/journal/journald-wall.c b/src/journal/journald-wall.c
index b700b86a96e2b54d06d06bb0450d9cf9cb3fa53f..375b03a65496e7dceff254b427d2859094d1faab 100644 (file)
--- a/src/journal/journald-wall.c
+++ b/src/journal/journald-wall.c
@@ -4,6 +4,7 @@
 #include "format-util.h"
 #include "journald-manager.h"
 #include "journald-wall.h"
+#include "log.h"
 #include "process-util.h"
 #include "string-util.h"
 #include "wall.h"

diff --git a/src/journal/journald-wall.h b/src/journal/journald-wall.h
index c9979ce6f5efaeaf617f1791811d325144e179a6..deadba198cc464be3b38bf54168108157425ad0e 100644 (file)
--- a/src/journal/journald-wall.h
+++ b/src/journal/journald-wall.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/socket.h>
-
-typedef struct Manager Manager;
+#include "journald-forward.h"
 
 void manager_forward_wall(Manager *m, int priority, const char *identifier, const char *message, const struct ucred *ucred);

diff --git a/src/journal/journald.c b/src/journal/journald.c
index 3c53063c3958850c558a569b3dd116237fbd9252..1fcae98f70bcffe530a5832d60641aa094b4ce9a 100644 (file)
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -1,8 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <sys/stat.h>
 #include <unistd.h>
 
-#include "sd-daemon.h"
+#include "sd-event.h"
 #include "sd-messages.h"
 
 #include "format-util.h"
@@ -10,10 +11,13 @@
 #include "journald-kmsg.h"
 #include "journald-manager.h"
 #include "journald-syslog.h"
+#include "log.h"
 #include "main-func.h"
 #include "process-util.h"
 #include "sigbus.h"
+#include "string-util.h"
 #include "terminal-util.h"
+#include "time-util.h"
 
 static int run(int argc, char *argv[]) {
         _cleanup_(manager_freep) Manager *m = NULL;

diff --git a/src/journal/test-journald-config.c b/src/journal/test-journald-config.c
index 25433827e0c0f2bce6441e8bb7616d1c34184cd5..89e748182eb79870beb8887c51048322bddc6bac 100644 (file)
--- a/src/journal/test-journald-config.c
+++ b/src/journal/test-journald-config.c
@@ -1,13 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
-#include <stdbool.h>
 #include <string.h>
 #include <sys/un.h>
 
+#include "alloc-util.h"
 #include "journald-manager.h"
 #include "log.h"
-#include "path-util.h"
 #include "socket-util.h"
 #include "sparse-endian.h"
 #include "tests.h"

diff --git a/src/journal/test-journald-rate-limit.c b/src/journal/test-journald-rate-limit.c
index a08fabab26e01c1dff6b44125690b2867d4b45af..7ad22a885c8c3cb5630e90457fbf20a2227639c1 100644 (file)
--- a/src/journal/test-journald-rate-limit.c
+++ b/src/journal/test-journald-rate-limit.c
@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "hashmap.h"
 #include "journald-rate-limit.h"
 #include "tests.h"
+#include "time-util.h"
 
 TEST(journal_ratelimit_test) {
         _cleanup_ordered_hashmap_free_ OrderedHashmap *rl = NULL;

diff --git a/src/journal/test-journald-syslog.c b/src/journal/test-journald-syslog.c
index 84cfcefc3a2a0b37603f7f3bff322b07a16f2efe..e8e75f0edaeed37ec824e3f9ab17301d87e8b3ce 100644 (file)
--- a/src/journal/test-journald-syslog.c
+++ b/src/journal/test-journald-syslog.c
@@ -2,8 +2,6 @@
 
 #include "alloc-util.h"
 #include "journald-syslog.h"
-#include "macro.h"
-#include "string-util.h"
 #include "syslog-util.h"
 #include "tests.h"