10 files changed, 21 insertions, 18 deletions
diff --git a/src/grp-login/liblogind-core/logind-button.c b/src/grp-login/liblogind-core/logind-button.c
index 428e6e91a0..81c82117fc 100644
--- a/src/grp-login/liblogind-core/logind-button.c
+++ b/src/grp-login/liblogind-core/logind-button.c
@@ -19,11 +19,12 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <linux/input.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#include <linux/input.h>
+
 #include <systemd/sd-messages.h>
 
 #include "basic/alloc-util.h"
diff --git a/src/grp-login/liblogind-core/logind-button.h b/src/grp-login/liblogind-core/logind-button.h
index f30cba2959..876e4d3cdf 100644
--- a/src/grp-login/liblogind-core/logind-button.h
+++ b/src/grp-login/liblogind-core/logind-button.h
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-typedef struct Button Button;
-
 #include "logind.h"
 
+typedef struct Button Button;
+
 struct Button {
         Manager *manager;
 
diff --git a/src/grp-login/liblogind-core/logind-core.c b/src/grp-login/liblogind-core/logind-core.c
index 0a9e45bb22..1d6475f8d7 100644
--- a/src/grp-login/liblogind-core/logind-core.c
+++ b/src/grp-login/liblogind-core/logind-core.c
@@ -18,11 +18,12 @@
 ***/
 
 #include <fcntl.h>
-#include <linux/vt.h>
 #include <pwd.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
+#include <linux/vt.h>
+
 #include "basic/alloc-util.h"
 #include "basic/cgroup-util.h"
 #include "basic/fd-util.h"
diff --git a/src/grp-login/liblogind-core/logind-device.h b/src/grp-login/liblogind-core/logind-device.h
index 23dfcd1964..9e2678d801 100644
--- a/src/grp-login/liblogind-core/logind-device.h
+++ b/src/grp-login/liblogind-core/logind-device.h
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-typedef struct Device Device;
-
 #include "basic/list.h"
 
+typedef struct Device Device;
+
 #include "logind-seat.h"
 #include "logind-session-device.h"
 
diff --git a/src/grp-login/liblogind-core/logind-seat.h b/src/grp-login/liblogind-core/logind-seat.h
index a2aeb58687..7fbeb5a727 100644
--- a/src/grp-login/liblogind-core/logind-seat.h
+++ b/src/grp-login/liblogind-core/logind-seat.h
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-typedef struct Seat Seat;
-
 #include "basic/list.h"
 
+typedef struct Seat Seat;
+
 #include "logind-session.h"
 
 struct Seat {
diff --git a/src/grp-login/liblogind-core/logind-session-device.c b/src/grp-login/liblogind-core/logind-session-device.c
index 1bdb188f05..99528488c0 100644
--- a/src/grp-login/liblogind-core/logind-session-device.c
+++ b/src/grp-login/liblogind-core/logind-session-device.c
@@ -18,11 +18,12 @@
 ***/
 
 #include <fcntl.h>
-#include <linux/input.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
+#include <linux/input.h>
+
 #include <libudev.h>
 
 #include "basic/alloc-util.h"
diff --git a/src/grp-login/liblogind-core/logind-session-device.h b/src/grp-login/liblogind-core/logind-session-device.h
index 152bf75d7a..c20962f21c 100644
--- a/src/grp-login/liblogind-core/logind-session-device.h
+++ b/src/grp-login/liblogind-core/logind-session-device.h
@@ -20,11 +20,11 @@
 ***/
 
 typedef enum DeviceType DeviceType;
-typedef struct SessionDevice SessionDevice;
-
 #include "basic/list.h"
 #include "logind.h"
 
+typedef struct SessionDevice SessionDevice;
+
 enum DeviceType {
         DEVICE_TYPE_UNKNOWN,
         DEVICE_TYPE_DRM,
diff --git a/src/grp-login/liblogind-core/logind-session.c b/src/grp-login/liblogind-core/logind-session.c
index ef451d900a..928f4a6314 100644
--- a/src/grp-login/liblogind-core/logind-session.c
+++ b/src/grp-login/liblogind-core/logind-session.c
@@ -19,13 +19,14 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <linux/kd.h>
-#include <linux/vt.h>
 #include <signal.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#include <linux/kd.h>
+#include <linux/vt.h>
+
 #include <systemd/sd-messages.h>
 
 #include "basic/alloc-util.h"
diff --git a/src/grp-login/liblogind-core/logind-user.h b/src/grp-login/liblogind-core/logind-user.h
index 227976f036..8663be3994 100644
--- a/src/grp-login/liblogind-core/logind-user.h
+++ b/src/grp-login/liblogind-core/logind-user.h
@@ -19,11 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-typedef struct User User;
-
 #include "basic/list.h"
 #include "logind.h"
 
+typedef struct User User;
+
 typedef enum UserState {
         USER_OFFLINE,    /* Not logged in at all */
         USER_OPENING,    /* Is logging in */
diff --git a/src/grp-login/systemd-logind/logind.h b/src/grp-login/systemd-logind/logind.h
index effc498118..378e86a31f 100644
--- a/src/grp-login/systemd-logind/logind.h
+++ b/src/grp-login/systemd-logind/logind.h
@@ -28,14 +28,13 @@
 #include "basic/hashmap.h"
 #include "basic/list.h"
 #include "basic/set.h"
-
-typedef struct Manager Manager;
-
 #include "logind-action.h"
 #include "logind-button.h"
 #include "logind-device.h"
 #include "logind-inhibit.h"
 
+typedef struct Manager Manager;
+
 struct Manager {
         sd_event *event;
         sd_bus *bus;