From 6e86b24db3c5490b5c05b1ca5e440a2deec25481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 28 Nov 2019 09:14:22 +0100
Subject: [PATCH] tree-wide: normalize includes of public headers

They are supposed to go into a sectinon of their own.
---
 src/journal-remote/journal-upload.h     | 1 +
 src/libsystemd-network/sd-dhcp-server.c | 2 +-
 src/shared/bus-wait-for-jobs.h          | 1 +
 src/shared/journal-importer.h           | 3 ++-
 src/sulogin-shell/sulogin-shell.c       | 3 ++-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/journal-remote/journal-upload.h b/src/journal-remote/journal-upload.h
index 5711905f86f..4994cd8391d 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 9e51bf74f58..546b5d02c4c 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 8f21eb9cd66..614a2c9de95 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 b2e3c817f5a..783edff5d32 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 9f90981e718..4cf9d22c87c 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"