14 files changed, 33 insertions, 26 deletions
diff --git a/src/grp-system/libcore/automount.c b/src/grp-system/libcore/automount.c
index ca5deece11..f0d544b4d6 100644
--- a/src/grp-system/libcore/automount.c
+++ b/src/grp-system/libcore/automount.c
@@ -20,12 +20,14 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-#include <linux/auto_fs4.h>
 #include <sys/epoll.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <linux/auto_fs4.h>
+#include <linux/auto_dev-ioctl.h>
+
 #include "basic/alloc-util.h"
 #include "basic/async.h"
 #include "basic/fd-util.h"
@@ -47,7 +49,6 @@
 
 #include "automount.h"
 #include "dbus-automount.h"
-#include "linux/auto_dev-ioctl.h"
 #include "mount.h"
 #include "unit.h"
 
diff --git a/src/grp-system/libcore/execute.h b/src/grp-system/libcore/execute.h
index 38f21125cb..73292dd086 100644
--- a/src/grp-system/libcore/execute.h
+++ b/src/grp-system/libcore/execute.h
@@ -19,12 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-typedef struct ExecStatus ExecStatus;
-typedef struct ExecCommand ExecCommand;
-typedef struct ExecContext ExecContext;
-typedef struct ExecRuntime ExecRuntime;
-typedef struct ExecParameters ExecParameters;
-
 #include <sched.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -34,6 +28,12 @@ typedef struct ExecParameters ExecParameters;
 #include "basic/list.h"
 #include "basic/missing.h"
 
+typedef struct ExecCommand ExecCommand;
+typedef struct ExecContext ExecContext;
+typedef struct ExecParameters ExecParameters;
+typedef struct ExecRuntime ExecRuntime;
+typedef struct ExecStatus ExecStatus;
+
 #include "namespace.h"
 
 typedef enum ExecUtmpMode {
diff --git a/src/grp-system/libcore/failure-action.c b/src/grp-system/libcore/failure-action.c
index ee6025e7e2..e22c71dac6 100644
--- a/src/grp-system/libcore/failure-action.c
+++ b/src/grp-system/libcore/failure-action.c
@@ -18,9 +18,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/reboot.h>
 #include <sys/reboot.h>
 
+#include <linux/reboot.h>
+
 #include "basic/special.h"
 #include "basic/string-table.h"
 #include "basic/terminal-util.h"
diff --git a/src/grp-system/libcore/kill.h b/src/grp-system/libcore/kill.h
index 529e4c5377..481ffdf2ff 100644
--- a/src/grp-system/libcore/kill.h
+++ b/src/grp-system/libcore/kill.h
@@ -19,13 +19,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-typedef struct KillContext KillContext;
-
 #include <stdbool.h>
 #include <stdio.h>
 
 #include "basic/macro.h"
 
+typedef struct KillContext KillContext;
+
 typedef enum KillMode {
         /* The kill mode is a property of a unit. */
         KILL_CONTROL_GROUP = 0,
diff --git a/src/grp-system/libcore/load-fragment.c b/src/grp-system/libcore/load-fragment.c
index 6d9100b189..0f17dc85c2 100644
--- a/src/grp-system/libcore/load-fragment.c
+++ b/src/grp-system/libcore/load-fragment.c
@@ -20,6 +20,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+
 #include <linux/fs.h>
 #include <linux/oom.h>
 #ifdef HAVE_SECCOMP
diff --git a/src/grp-system/libcore/manager.c b/src/grp-system/libcore/manager.c
index 9019967300..2637296c9b 100644
--- a/src/grp-system/libcore/manager.c
+++ b/src/grp-system/libcore/manager.c
@@ -20,7 +20,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <linux/kd.h>
 #include <signal.h>
 #include <string.h>
 #include <sys/epoll.h>
@@ -31,6 +30,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include <linux/kd.h>
+
 #ifdef HAVE_AUDIT
 #include <libaudit.h>
 #endif
diff --git a/src/grp-system/libcore/namespace.c b/src/grp-system/libcore/namespace.c
index 5af026ff99..db60336a60 100644
--- a/src/grp-system/libcore/namespace.c
+++ b/src/grp-system/libcore/namespace.c
@@ -24,6 +24,7 @@
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <unistd.h>
+
 #include <linux/fs.h>
 
 #include "basic/alloc-util.h"
diff --git a/src/grp-system/libcore/service.h b/src/grp-system/libcore/service.h
index e67e242ab1..ba9086d8cd 100644
--- a/src/grp-system/libcore/service.h
+++ b/src/grp-system/libcore/service.h
@@ -19,12 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-typedef struct Service Service;
-typedef struct ServiceFDStore ServiceFDStore;
-
 #include "basic/exit-status.h"
 #include "basic/ratelimit.h"
 
+typedef struct Service Service;
+typedef struct ServiceFDStore ServiceFDStore;
+
 #include "kill.h"
 #include "path.h"
 
diff --git a/src/grp-system/libcore/socket.c b/src/grp-system/libcore/socket.c
index cb2cb884d0..051cbdab8b 100644
--- a/src/grp-system/libcore/socket.c
+++ b/src/grp-system/libcore/socket.c
@@ -20,7 +20,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <linux/sctp.h>
 #include <mqueue.h>
 #include <netinet/tcp.h>
 #include <signal.h>
@@ -28,6 +27,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <linux/sctp.h>
+
 #include "basic/alloc-util.h"
 #include "basic/copy.h"
 #include "basic/def.h"
diff --git a/src/grp-system/libcore/socket.h b/src/grp-system/libcore/socket.h
index 6e485f51c3..3b214946e0 100644
--- a/src/grp-system/libcore/socket.h
+++ b/src/grp-system/libcore/socket.h
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-typedef struct Socket Socket;
-
 #include "basic/socket-util.h"
 
+typedef struct Socket Socket;
+
 #include "mount.h"
 #include "service.h"
 
diff --git a/src/grp-system/libcore/timer.h b/src/grp-system/libcore/timer.h
index 3773ec47e1..99b47c3880 100644
--- a/src/grp-system/libcore/timer.h
+++ b/src/grp-system/libcore/timer.h
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-typedef struct Timer Timer;
-
 #include "basic/calendarspec.h"
 
+typedef struct Timer Timer;
+
 typedef enum TimerBase {
         TIMER_ACTIVE,
         TIMER_BOOT,
diff --git a/src/grp-system/libcore/transaction.h b/src/grp-system/libcore/transaction.h
index e89dad99bf..19d8d3d434 100644
--- a/src/grp-system/libcore/transaction.h
+++ b/src/grp-system/libcore/transaction.h
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-typedef struct Transaction Transaction;
-
 #include "basic/hashmap.h"
 
+typedef struct Transaction Transaction;
+
 #include "job.h"
 #include "manager.h"
 #include "unit.h"
diff --git a/src/grp-system/libcore/unit.h b/src/grp-system/libcore/unit.h
index 79de5a8a89..9321537fe6 100644
--- a/src/grp-system/libcore/unit.h
+++ b/src/grp-system/libcore/unit.h
@@ -23,15 +23,15 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "shared/condition.h"
-#include "shared/install.h"
 #include "basic/list.h"
 #include "basic/unit-name.h"
+#include "shared/condition.h"
+#include "shared/install.h"
 
 typedef struct Unit Unit;
-typedef struct UnitVTable UnitVTable;
 typedef struct UnitRef UnitRef;
 typedef struct UnitStatusMessageFormats UnitStatusMessageFormats;
+typedef struct UnitVTable UnitVTable;
 
 #include "failure-action.h"
 
diff --git a/src/grp-system/systemctl/systemctl.c b/src/grp-system/systemctl/systemctl.c
index 0808ecafe3..63818d07b8 100644
--- a/src/grp-system/systemctl/systemctl.c
+++ b/src/grp-system/systemctl/systemctl.c
@@ -21,7 +21,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <linux/reboot.h>
 #include <locale.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -31,6 +30,8 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
+#include <linux/reboot.h>
+
 #include <systemd/sd-bus.h>
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-login.h>