diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
index 55f8ce7140..05c40a7885 100644
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -10,6 +10,7 @@
 #include "iovec-util.h"
 #include "journal-internal.h"
 #include "journald-audit.h"
+#include "journald-server.h"
 #include "missing_audit.h"
 #include "string-util.h"
 
diff --git a/src/journal/journald-audit.h b/src/journal/journald-audit.h
index 79f3da90c1..49223dbf4a 100644
--- a/src/journal/journald-audit.h
+++ b/src/journal/journald-audit.h
@@ -1,9 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "journald-server.h"
 #include "socket-util.h"
 
+typedef struct Server Server;
+
 void server_process_audit_message(Server *s, const void *buffer, size_t buffer_size, const struct ucred *ucred, const union sockaddr_union *sa, socklen_t salen);
 
 void process_audit_string(Server *s, int type, const char *data, size_t size);
diff --git a/src/journal/journald-client.c b/src/journal/journald-client.c
index fdba70c3d5..771b51b9c1 100644
--- a/src/journal/journald-client.c
+++ b/src/journal/journald-client.c
@@ -3,6 +3,8 @@
 #include "cgroup-util.h"
 #include "errno-util.h"
 #include "journald-client.h"
+#include "journald-context.h"
+#include "log.h"
 #include "nulstr-util.h"
 #include "pcre2-util.h"
 #include "strv.h"
diff --git a/src/journal/journald-client.h b/src/journal/journald-client.h
index 629cd41c7d..700b43db7d 100644
--- a/src/journal/journald-client.h
+++ b/src/journal/journald-client.h
@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "journald-context.h"
+#include <stddef.h>
+
+typedef struct ClientContext ClientContext;
 
 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.h b/src/journal/journald-console.h
index 0a26f9c876..a4894ce4a5 100644
--- a/src/journal/journald-console.h
+++ b/src/journal/journald-console.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "journald-server.h"
+#include <sys/socket.h>
+
+typedef struct Server Server;
 
 void server_forward_console(Server *s, 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 1d5aca1d87..79e52be279 100644
--- a/src/journal/journald-context.c
+++ b/src/journal/journald-context.c
@@ -16,6 +16,7 @@
 #include "journal-util.h"
 #include "journald-client.h"
 #include "journald-context.h"
+#include "journald-server.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
diff --git a/src/journal/journald-context.h b/src/journal/journald-context.h
index 34637f85e4..e908540eb4 100644
--- a/src/journal/journald-context.h
+++ b/src/journal/journald-context.h
@@ -4,6 +4,7 @@
 #include <inttypes.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <syslog.h>
 
 #include "sd-id128.h"
 
@@ -11,11 +12,9 @@
 #include "set.h"
 #include "time-util.h"
 
-typedef struct ClientContext ClientContext;
+typedef struct Server Server;
 
-#include "journald-server.h"
-
-struct ClientContext {
+typedef struct ClientContext {
         unsigned n_ref;
         unsigned lru_index;
         usec_t timestamp;
@@ -60,7 +59,7 @@ struct ClientContext {
 
         Set *log_filter_allowed_patterns;
         Set *log_filter_denied_patterns;
-};
+} ClientContext;
 
 int client_context_get(
                 Server *s,
diff --git a/src/journal/journald-kmsg.h b/src/journal/journald-kmsg.h
index bd288c57a2..dcbe0b510c 100644
--- a/src/journal/journald-kmsg.h
+++ b/src/journal/journald-kmsg.h
@@ -1,7 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "journald-server.h"
+#include <stddef.h>
+#include <sys/socket.h>
+
+typedef struct Server Server;
 
 int server_open_dev_kmsg(Server *s);
 int server_flush_dev_kmsg(Server *s);
diff --git a/src/journal/journald-native.h b/src/journal/journald-native.h
index 10db267966..3807b2ca97 100644
--- a/src/journal/journald-native.h
+++ b/src/journal/journald-native.h
@@ -1,7 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "journald-server.h"
+#include <stddef.h>
+#include <sys/socket.h>
+
+typedef struct Server Server;
 
 void server_process_native_message(
                 Server *s,
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 4397ef6e3f..6a8c850540 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -23,6 +23,7 @@
 #include "event-util.h"
 #include "extract-word.h"
 #include "fd-util.h"
+#include "fdset.h"
 #include "fileio.h"
 #include "format-util.h"
 #include "fs-util.h"
diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
index ea3bf8b3f0..e565769779 100644
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -7,8 +7,6 @@
 #include "sd-event.h"
 #include "sd-varlink.h"
 
-typedef struct Server Server;
-
 #include "common-signal.h"
 #include "conf-parser.h"
 #include "hashmap.h"
@@ -68,7 +66,7 @@ typedef struct SeqnumData {
         uint64_t seqnum;
 } SeqnumData;
 
-struct Server {
+typedef struct Server {
         char *namespace;
 
         int syslog_fd;
@@ -185,7 +183,7 @@ struct Server {
         ClientContext *pid1_context; /* the context of PID 1 */
 
         sd_varlink_server *varlink_server;
-};
+} Server;
 
 #define SERVER_MACHINE_ID(s) ((s)->machine_id_field + STRLEN("_MACHINE_ID="))
 
diff --git a/src/journal/journald-socket.c b/src/journal/journald-socket.c
index a079624f3c..9f419d393a 100644
--- a/src/journal/journald-socket.c
+++ b/src/journal/journald-socket.c
@@ -6,6 +6,7 @@
 
 #include "fd-util.h"
 #include "iovec-util.h"
+#include "journald-server.h"
 #include "journald-socket.h"
 #include "log.h"
 #include "macro.h"
diff --git a/src/journal/journald-socket.h b/src/journal/journald-socket.h
index 23739538c8..3cddace166 100644
--- a/src/journal/journald-socket.h
+++ b/src/journal/journald-socket.h
@@ -1,7 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "journald-server.h"
-#include "socket-util.h"
+#include <sys/socket.h>
+
+#include "time-util.h"
+
+typedef struct Server Server;
 
 int server_forward_socket(Server *s, 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 e45765df0c..71b0db639d 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -16,6 +16,7 @@
 #include "errno-util.h"
 #include "escape.h"
 #include "fd-util.h"
+#include "fdset.h"
 #include "fileio.h"
 #include "fs-util.h"
 #include "iovec-util.h"
diff --git a/src/journal/journald-stream.h b/src/journal/journald-stream.h
index 71d3394ed9..4bb4cbbe2f 100644
--- a/src/journal/journald-stream.h
+++ b/src/journal/journald-stream.h
@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-typedef struct StdoutStream StdoutStream;
-
 #include "fdset.h"
-#include "journald-server.h"
+
+typedef struct Server Server;
+typedef struct StdoutStream StdoutStream;
 
 int server_open_stdout_socket(Server *s, const char *stdout_socket);
 int server_restore_streams(Server *s, FDSet *fds);
diff --git a/src/journal/journald-syslog.h b/src/journal/journald-syslog.h
index 3bc3ffddb8..ccb913d2ca 100644
--- a/src/journal/journald-syslog.h
+++ b/src/journal/journald-syslog.h
@@ -1,7 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "journald-server.h"
+#include <sys/socket.h>
+
+#include "macro.h"
+
+typedef struct Server Server;
 
 int syslog_fixup_facility(int priority) _const_;
 
diff --git a/src/journal/journald-varlink.c b/src/journal/journald-varlink.c
index 5e98b5e5b8..d2ba34c747 100644
--- a/src/journal/journald-varlink.c
+++ b/src/journal/journald-varlink.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "journald-server.h"
 #include "journald-varlink.h"
 #include "varlink-io.systemd.Journal.h"
 #include "varlink-io.systemd.service.h"
diff --git a/src/journal/journald-varlink.h b/src/journal/journald-varlink.h
index 55c7405af1..ab34e01117 100644
--- a/src/journal/journald-varlink.h
+++ b/src/journal/journald-varlink.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "journald-server.h"
+typedef struct Server Server;
 
 int server_open_varlink(Server *s, const char *socket, int fd);
diff --git a/src/journal/journald-wall.h b/src/journal/journald-wall.h
index 3f98c35bde..8c19e496f4 100644
--- a/src/journal/journald-wall.h
+++ b/src/journal/journald-wall.h
@@ -3,6 +3,6 @@
 
 #include <sys/socket.h>
 
-#include "journald-server.h"
+typedef struct Server Server;
 
 void server_forward_wall(Server *s, int priority, const char *identifier, const char *message, const struct ucred *ucred);