15 files changed, 26 insertions, 9 deletions
diff --git a/src/journal/cat.c b/src/journal/cat.c
index ff1887604a..95a1868b93 100644
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -29,6 +29,7 @@
 #include "sd-journal.h"
 
 #include "fd-util.h"
+#include "parse-util.h"
 #include "string-util.h"
 #include "util.h"
 
diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index 7336db219b..92f598464a 100644
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -47,6 +47,7 @@
 #include "log.h"
 #include "macro.h"
 #include "mkdir.h"
+#include "parse-util.h"
 #include "process-util.h"
 #include "special.h"
 #include "stacktrace.h"
diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c
index f891ddffc6..fecccd4eb9 100644
--- a/src/journal/coredumpctl.c
+++ b/src/journal/coredumpctl.c
@@ -34,6 +34,7 @@
 #include "log.h"
 #include "macro.h"
 #include "pager.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "set.h"
@@ -41,8 +42,8 @@
 #include "signal-util.h"
 #include "string-util.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "user-util.h"
+#include "util.h"
 
 static enum {
         ACTION_NONE,
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index f193cb90ce..c33e278cbe 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -35,6 +35,7 @@
 #include "journal-def.h"
 #include "journal-file.h"
 #include "lookup3.h"
+#include "parse-util.h"
 #include "random-util.h"
 #include "string-util.h"
 
diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
index dca5bf5000..026dca4901 100644
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -29,6 +29,7 @@
 #include "journal-def.h"
 #include "journal-file.h"
 #include "journal-vacuum.h"
+#include "parse-util.h"
 #include "string-util.h"
 #include "util.h"
 
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 6e452a4d51..c13b674e15 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -56,6 +56,7 @@
 #include "logs-show.h"
 #include "mkdir.h"
 #include "pager.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "set.h"
 #include "sigbus.h"
diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
index 5f3eb05275..4a5e07ec5d 100644
--- a/src/journal/journald-console.c
+++ b/src/journal/journald-console.c
@@ -23,13 +23,14 @@
 #include <fcntl.h>
 #include <sys/socket.h>
 
+#include "fd-util.h"
 #include "fileio.h"
-#include "journald-server.h"
-#include "journald-console.h"
 #include "formats-util.h"
+#include "journald-console.h"
+#include "journald-server.h"
+#include "parse-util.h"
 #include "process-util.h"
 #include "terminal-util.h"
-#include "fd-util.h"
 
 static bool prefix_timestamp(void) {
 
diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
index 5a05632e56..e680aafafe 100644
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -34,6 +34,7 @@
 #include "journald-kmsg.h"
 #include "journald-server.h"
 #include "journald-syslog.h"
+#include "parse-util.h"
 #include "process-util.h"
 #include "string-util.h"
 
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index 7d4aac687e..ae229ecaf5 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -32,6 +32,7 @@
 #include "journald-syslog.h"
 #include "journald-wall.h"
 #include "memfd-util.h"
+#include "parse-util.h"
 #include "path-util.h"
 #include "selinux-util.h"
 #include "socket-util.h"
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 7cefea323e..f286e3030f 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -54,6 +54,7 @@
 #include "journald-syslog.h"
 #include "missing.h"
 #include "mkdir.h"
+#include "parse-util.h"
 #include "process-util.h"
 #include "rm-rf.h"
 #include "selinux-util.h"
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index 0dd511519c..6745864da1 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -39,6 +39,7 @@
 #include "journald-syslog.h"
 #include "journald-wall.h"
 #include "mkdir.h"
+#include "parse-util.h"
 #include "selinux-util.h"
 #include "socket-util.h"
 #include "string-util.h"
diff --git a/src/journal/test-compress-benchmark.c b/src/journal/test-compress-benchmark.c
index 0a9ab7f52c..5a2f0564ca 100644
--- a/src/journal/test-compress-benchmark.c
+++ b/src/journal/test-compress-benchmark.c
@@ -21,6 +21,7 @@
 
 #include "compress.h"
 #include "macro.h"
+#include "parse-util.h"
 #include "random-util.h"
 #include "string-util.h"
 #include "util.h"
diff --git a/src/journal/test-journal-init.c b/src/journal/test-journal-init.c
index 717b703d19..142da85041 100644
--- a/src/journal/test-journal-init.c
+++ b/src/journal/test-journal-init.c
@@ -22,6 +22,7 @@
 #include "sd-journal.h"
 
 #include "log.h"
+#include "parse-util.h"
 #include "rm-rf.h"
 #include "util.h"
 
diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
index 8069339c1f..3c8b0268a4 100644
--- a/src/journal/test-journal-interleaving.c
+++ b/src/journal/test-journal-interleaving.c
@@ -24,11 +24,13 @@
 #include <fcntl.h>
 
 #include "sd-journal.h"
+
 #include "journal-file.h"
 #include "journal-vacuum.h"
-#include "util.h"
 #include "log.h"
+#include "parse-util.h"
 #include "rm-rf.h"
+#include "util.h"
 
 /* This program tests skipping around in a multi-file journal.
  */
diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c
index b5ecf2f375..b8482743a2 100644
--- a/src/journal/test-journal-stream.c
+++ b/src/journal/test-journal-stream.c
@@ -19,16 +19,18 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <unistd.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #include "sd-journal.h"
-#include "util.h"
+
+#include "journal-file.h"
+#include "journal-internal.h"
 #include "log.h"
 #include "macro.h"
+#include "parse-util.h"
 #include "rm-rf.h"
-#include "journal-file.h"
-#include "journal-internal.h"
+#include "util.h"
 
 #define N_ENTRIES 200