diff --git a/src/journal-remote/journal-upload.h b/src/journal-remote/journal-upload.h
index 5711905f86..4994cd8391 100644
--- a/src/journal-remote/journal-upload.h
+++ b/src/journal-remote/journal-upload.h
@@ -4,6 +4,7 @@
 
 #include "sd-event.h"
 #include "sd-journal.h"
+
 #include "time-util.h"
 
 typedef enum {
diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c
index 9e51bf74f5..546b5d02c4 100644
--- a/src/libsystemd-network/sd-dhcp-server.c
+++ b/src/libsystemd-network/sd-dhcp-server.c
@@ -6,6 +6,7 @@
 #include <sys/ioctl.h>
 
 #include "sd-dhcp-server.h"
+#include "sd-id128.h"
 
 #include "alloc-util.h"
 #include "dhcp-internal.h"
@@ -13,7 +14,6 @@
 #include "fd-util.h"
 #include "in-addr-util.h"
 #include "io-util.h"
-#include "sd-id128.h"
 #include "siphash24.h"
 #include "string-util.h"
 #include "unaligned.h"
diff --git a/src/shared/bus-wait-for-jobs.h b/src/shared/bus-wait-for-jobs.h
index 8f21eb9cd6..614a2c9de9 100644
--- a/src/shared/bus-wait-for-jobs.h
+++ b/src/shared/bus-wait-for-jobs.h
@@ -2,6 +2,7 @@
 #pragma once
 
 #include "sd-bus.h"
+
 #include "macro.h"
 
 typedef struct BusWaitForJobs BusWaitForJobs;
diff --git a/src/shared/journal-importer.h b/src/shared/journal-importer.h
index b2e3c817f5..783edff5d3 100644
--- a/src/shared/journal-importer.h
+++ b/src/shared/journal-importer.h
@@ -6,8 +6,9 @@
 #include <stdbool.h>
 #include <sys/uio.h>
 
-#include "io-util.h"
 #include "sd-id128.h"
+
+#include "io-util.h"
 #include "time-util.h"
 
 /* Make sure not to make this smaller than the maximum coredump size.
diff --git a/src/sulogin-shell/sulogin-shell.c b/src/sulogin-shell/sulogin-shell.c
index 9f90981e71..4cf9d22c87 100644
--- a/src/sulogin-shell/sulogin-shell.c
+++ b/src/sulogin-shell/sulogin-shell.c
@@ -6,13 +6,14 @@
 #include <errno.h>
 #include <sys/prctl.h>
 
+#include "sd-bus.h"
+
 #include "bus-util.h"
 #include "bus-error.h"
 #include "def.h"
 #include "env-util.h"
 #include "log.h"
 #include "process-util.h"
-#include "sd-bus.h"
 #include "signal-util.h"
 #include "special.h"