9 files changed, 47 insertions, 37 deletions
diff --git a/src/grp-system/libcore/dbus-execute.c b/src/grp-system/libcore/dbus-execute.c
index b5530d945e..fe1d9da440 100644
--- a/src/grp-system/libcore/dbus-execute.c
+++ b/src/grp-system/libcore/dbus-execute.c
@@ -25,20 +25,21 @@
 
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
-#include "shared/bus-util.h"
 #include "basic/capability-util.h"
-#include "dbus-execute.h"
 #include "basic/env-util.h"
-#include "execute.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/ioprio.h"
 #include "basic/missing.h"
-#include "namespace.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
 #include "basic/rlimit-util.h"
+#include "shared/bus-util.h"
+
+#include "dbus-execute.h"
+#include "execute.h"
+#include "namespace.h"
 #ifdef HAVE_SECCOMP
 #include "shared/seccomp-util.h"
 #endif
diff --git a/src/grp-system/libcore/execute.c b/src/grp-system/libcore/execute.c
index e7628bceb3..b19473c6a5 100644
--- a/src/grp-system/libcore/execute.c
+++ b/src/grp-system/libcore/execute.c
@@ -63,7 +63,6 @@
 #include "basic/def.h"
 #include "basic/env-util.h"
 #include "basic/errno-list.h"
-#include "execute.h"
 #include "basic/exit-status.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
@@ -76,12 +75,14 @@
 #include "basic/macro.h"
 #include "basic/missing.h"
 #include "basic/mkdir.h"
-#include "namespace.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
 #include "basic/rlimit-util.h"
 #include "basic/rm-rf.h"
+
+#include "execute.h"
+#include "namespace.h"
 #ifdef HAVE_SECCOMP
 #include "shared/seccomp-util.h"
 #endif
@@ -94,11 +95,12 @@
 #include "basic/strv.h"
 #include "basic/syslog-util.h"
 #include "basic/terminal-util.h"
-#include "unit.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
 #include "shared/utmp-wtmp.h"
 
+#include "unit.h"
+
 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC)
 #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC)
 
diff --git a/src/grp-system/libcore/execute.h b/src/grp-system/libcore/execute.h
index 73292dd086..18d6f0e4a3 100644
--- a/src/grp-system/libcore/execute.h
+++ b/src/grp-system/libcore/execute.h
@@ -201,6 +201,7 @@ struct ExecContext {
 };
 
 #include "basic/cgroup-util.h"
+
 #include "cgroup.h"
 
 struct ExecParameters {
diff --git a/src/grp-system/libcore/kmod-setup.c b/src/grp-system/libcore/kmod-setup.c
index 6ddf1137ec..a6fa6a32fb 100644
--- a/src/grp-system/libcore/kmod-setup.c
+++ b/src/grp-system/libcore/kmod-setup.c
@@ -24,10 +24,11 @@
 #include <libkmod.h>
 #endif
 
-#include "shared/bus-util.h"
 #include "basic/capability-util.h"
-#include "kmod-setup.h"
 #include "basic/macro.h"
+#include "shared/bus-util.h"
+
+#include "kmod-setup.h"
 
 #ifdef HAVE_KMOD
 static void systemd_kmod_log(
diff --git a/src/grp-system/libcore/load-fragment.c b/src/grp-system/libcore/load-fragment.c
index 0f17dc85c2..bb12b6cbfe 100644
--- a/src/grp-system/libcore/load-fragment.c
+++ b/src/grp-system/libcore/load-fragment.c
@@ -33,13 +33,8 @@
 
 #include "basic/af-list.h"
 #include "basic/alloc-util.h"
-#include "sd-bus/bus-error.h"
-#include "sd-bus/bus-internal.h"
-#include "shared/bus-util.h"
 #include "basic/cap-list.h"
 #include "basic/capability-util.h"
-#include "cgroup.h"
-#include "shared/conf-parser.h"
 #include "basic/cpu-set-util.h"
 #include "basic/env-util.h"
 #include "basic/errno-list.h"
@@ -47,13 +42,19 @@
 #include "basic/fd-util.h"
 #include "basic/fs-util.h"
 #include "basic/ioprio.h"
-#include "load-fragment.h"
 #include "basic/log.h"
 #include "basic/missing.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
 #include "basic/rlimit-util.h"
+#include "sd-bus/bus-error.h"
+#include "sd-bus/bus-internal.h"
+#include "shared/bus-util.h"
+#include "shared/conf-parser.h"
+
+#include "cgroup.h"
+#include "load-fragment.h"
 #ifdef HAVE_SECCOMP
 #include "shared/seccomp-util.h"
 #endif
@@ -63,11 +64,12 @@
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/unit-name.h"
-#include "unit-printf.h"
-#include "unit.h"
 #include "basic/utf8.h"
 #include "basic/web-util.h"
 
+#include "unit-printf.h"
+#include "unit.h"
+
 int config_parse_warn_compat(
                 const char *unit,
                 const char *filename,
diff --git a/src/grp-system/libcore/manager.c b/src/grp-system/libcore/manager.c
index 2637296c9b..29dbf092d7 100644
--- a/src/grp-system/libcore/manager.c
+++ b/src/grp-system/libcore/manager.c
@@ -40,16 +40,6 @@
 #include <systemd/sd-messages.h>
 
 #include "basic/alloc-util.h"
-#include "audit-fd.h"
-#include "shared/boot-timestamps.h"
-#include "sd-bus/bus-common-errors.h"
-#include "sd-bus/bus-error.h"
-#include "sd-bus/bus-kernel.h"
-#include "shared/bus-util.h"
-#include "dbus-job.h"
-#include "dbus-manager.h"
-#include "dbus-unit.h"
-#include "dbus.h"
 #include "basic/dirent-util.h"
 #include "basic/env-util.h"
 #include "basic/escape.h"
@@ -59,15 +49,11 @@
 #include "basic/fs-util.h"
 #include "basic/hashmap.h"
 #include "basic/io-util.h"
-#include "locale-setup.h"
 #include "basic/log.h"
 #include "basic/macro.h"
-#include "manager.h"
 #include "basic/missing.h"
 #include "basic/mkdir.h"
-#include "basic/mkdir.h"
 #include "basic/parse-util.h"
-#include "shared/path-lookup.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
 #include "basic/ratelimit.h"
@@ -80,13 +66,27 @@
 #include "basic/strv.h"
 #include "basic/terminal-util.h"
 #include "basic/time-util.h"
-#include "transaction.h"
 #include "basic/umask-util.h"
 #include "basic/unit-name.h"
 #include "basic/util.h"
 #include "basic/virt.h"
+#include "sd-bus/bus-common-errors.h"
+#include "sd-bus/bus-error.h"
+#include "sd-bus/bus-kernel.h"
+#include "shared/boot-timestamps.h"
+#include "shared/bus-util.h"
+#include "shared/path-lookup.h"
 #include "shared/watchdog.h"
 
+#include "audit-fd.h"
+#include "dbus-job.h"
+#include "dbus-manager.h"
+#include "dbus-unit.h"
+#include "dbus.h"
+#include "locale-setup.h"
+#include "manager.h"
+#include "transaction.h"
+
 #define NOTIFY_RCVBUF_SIZE (8*1024*1024)
 #define CGROUPS_AGENT_RCVBUF_SIZE (8*1024*1024)
 
diff --git a/src/grp-system/libcore/manager.h b/src/grp-system/libcore/manager.h
index 87186b6e40..fedf39ddcd 100644
--- a/src/grp-system/libcore/manager.h
+++ b/src/grp-system/libcore/manager.h
@@ -68,11 +68,12 @@ typedef enum StatusType {
         STATUS_TYPE_EMERGENCY,
 } StatusType;
 
+#include "basic/unit-name.h"
+#include "shared/path-lookup.h"
+
 #include "execute.h"
 #include "job.h"
-#include "shared/path-lookup.h"
 #include "show-status.h"
-#include "basic/unit-name.h"
 
 struct Manager {
         /* Note that the set of units we know of is allowed to be
diff --git a/src/grp-system/libcore/selinux-access.c b/src/grp-system/libcore/selinux-access.c
index a259e128c1..ce2ef2db1c 100644
--- a/src/grp-system/libcore/selinux-access.c
+++ b/src/grp-system/libcore/selinux-access.c
@@ -32,14 +32,15 @@
 #include <systemd/sd-bus.h>
 
 #include "basic/alloc-util.h"
-#include "audit-fd.h"
-#include "shared/bus-util.h"
 #include "basic/log.h"
 #include "basic/path-util.h"
 #include "basic/selinux-util.h"
 #include "basic/stdio-util.h"
 #include "basic/strv.h"
 #include "basic/util.h"
+#include "shared/bus-util.h"
+
+#include "audit-fd.h"
 
 static bool initialized = false;
 
diff --git a/src/grp-system/libcore/selinux-setup.c b/src/grp-system/libcore/selinux-setup.c
index 37a143bce4..314d8edbaa 100644
--- a/src/grp-system/libcore/selinux-setup.c
+++ b/src/grp-system/libcore/selinux-setup.c
@@ -27,11 +27,12 @@
 
 #include "basic/log.h"
 #include "basic/macro.h"
-#include "selinux-setup.h"
 #include "basic/selinux-util.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
 
+#include "selinux-setup.h"
+
 #ifdef HAVE_SELINUX
 _printf_(2,3)
 static int null_log(int type, const char *fmt, ...) {