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

journal: Clean up includes

Split out of #37344.
---

diff --git a/src/journal/bsod.c b/src/journal/bsod.c
index 68361b084a6..12a032efe73 100644
--- 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 20a08b1b295..5a60414b561 100644
--- 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 f970acb6232..0b8a4a23347 100644
--- 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 cc79ed31bcd..cc3298f0dde 100644
--- 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 667c4f4a141..7b2d8714ad8 100644
--- 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 a35b0a64a38..0481dd51301 100644
--- 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 7e739be594f..d29237e43b5 100644
--- 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 c752c0c6321..d5966ab5f6e 100644
--- 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 e8dc135e771..c69ddd4985f 100644
--- 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 72036890a81..0da319079cf 100644
--- 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 4a704314ad9..13f0fd07c07 100644
--- 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 0e85c520caa..dd6026e9f27 100644
--- 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 14cdfb51361..4571c285408 100644
--- 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 5c5f5827ba9..c278bc33657 100644
--- 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 13ebfda579c..7d138df03a0 100644
--- 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 25b9c9c3eb4..b78d617b7ca 100644
--- 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 fb04074fdc1..41336321b7d 100644
--- 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 754bf488bc8..eb4fe3e6138 100644
--- 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 25c6401b8f9..1611395e947 100644
--- 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 700b43db7d5..c036720efe0 100644
--- 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 19ccec1ab5a..887b59b2690 100644
--- 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 7830a0401e2..40558dd9db2 100644
--- 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 cb80e925089..70c0a2a1eed 100644
--- 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 c784378b85c..b728e398761 100644
--- 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
index 00000000000..41214b87f69
--- /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 b65faa41996..b2cfde3ade6 100644
--- 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 bfd32cbdc44..fe69f77e017 100644
--- 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 fa33e897a47..e1f2114a8ad 100644
--- 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 33a79cefb29..8f239a14f56 100644
--- 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 ceaa11801cb..dda1184e25b 100644
--- 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 db1131d5d81..2ae755b7371 100644
--- 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 ac8801f9de8..6c44ddac763 100644
--- 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 227d8608076..5bb85146172 100644
--- 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 566bba4be21..6b83d3a0679 100644
--- 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 a46b355fc5f..ba3c37e45b7 100644
--- 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 ee1813d5dff..835c2459b81 100644
--- 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 be8edc0e445..88a6233bcb7 100644
--- 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 cb55970059d..517ee46b32f 100644
--- 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 11f02ea5da6..b22cb54b125 100644
--- 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 ae796a53bb5..e1172611e95 100644
--- 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 24e0755cc52..1aacf2fd19f 100644
--- 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 71bfbcbc6c3..bea49c1e81f 100644
--- 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 63aed28d0bb..81682ea8553 100644
--- 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 352fef1f840..85d95cd038f 100644
--- 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 b700b86a96e..375b03a6549 100644
--- 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 c9979ce6f5e..deadba198cc 100644
--- 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 3c53063c395..1fcae98f70b 100644
--- 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 25433827e0c..89e748182eb 100644
--- 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 a08fabab26e..7ad22a885c8 100644
--- 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 84cfcefc3a2..e8e75f0edae 100644
--- 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"