terminal: fix include ordering

src/libsystemd-terminal/grdev-drm.c

@@ -27,8 +27,6 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/types.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
 #include <unistd.h>
 
 /* Yuck! DRM headers need system headers included first.. but we have to
@@ -37,12 +35,14 @@
 #include <drm_fourcc.h>
 #include <drm_mode.h>
 
-#include "bus-util.h"
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "hashmap.h"
-#include "grdev.h"
-#include "grdev-internal.h"
 #include "macro.h"
 #include "util.h"
+#include "bus-util.h"
+#include "grdev.h"
+#include "grdev-internal.h"
 
 #define GRDRM_MAX_TRIES (16)
 

src/libsystemd-terminal/grdev-internal.h

@@ -25,12 +25,12 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
-#include "grdev.h"
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "hashmap.h"
 #include "list.h"
 #include "util.h"
+#include "grdev.h"
 
 typedef struct grdev_tile               grdev_tile;
 typedef struct grdev_display_cache      grdev_display_cache;

src/libsystemd-terminal/grdev.c

@@ -22,14 +22,14 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
-#include "grdev.h"
-#include "grdev-internal.h"
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "hashmap.h"
 #include "login-shared.h"
 #include "macro.h"
 #include "util.h"
+#include "grdev.h"
+#include "grdev-internal.h"
 
 static void pipe_enable(grdev_pipe *pipe);
 static void pipe_disable(grdev_pipe *pipe);

src/libsystemd-terminal/grdev.h

@@ -56,8 +56,8 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "util.h"
 
 typedef struct grdev_fb                 grdev_fb;

src/libsystemd-terminal/idev-evdev.c

@@ -24,13 +24,13 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
+#include "sd-bus.h"
+#include "sd-event.h"
+#include "macro.h"
+#include "util.h"
 #include "bus-util.h"
 #include "idev.h"
 #include "idev-internal.h"
-#include "macro.h"
-#include "util.h"
 
 typedef struct idev_evdev idev_evdev;
 typedef struct unmanaged_evdev unmanaged_evdev;

src/libsystemd-terminal/idev-internal.h

@@ -26,13 +26,13 @@
 #include <linux/input.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
 #include <xkbcommon/xkbcommon.h>
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "hashmap.h"
-#include "idev.h"
 #include "list.h"
 #include "util.h"
+#include "idev.h"
 
 typedef struct idev_link                idev_link;
 typedef struct idev_device_vtable       idev_device_vtable;

src/libsystemd-terminal/idev-keyboard.c

@@ -21,17 +21,17 @@
 
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
 #include <xkbcommon/xkbcommon.h>
 #include <xkbcommon/xkbcommon-compose.h>
-#include "bus-util.h"
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "hashmap.h"
+#include "macro.h"
+#include "util.h"
+#include "bus-util.h"
 #include "idev.h"
 #include "idev-internal.h"
-#include "macro.h"
 #include "term-internal.h"
-#include "util.h"
 
 typedef struct kbdtbl kbdtbl;
 typedef struct kbdmap kbdmap;

src/libsystemd-terminal/idev.c

@@ -22,14 +22,14 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "hashmap.h"
-#include "idev.h"
-#include "idev-internal.h"
 #include "login-shared.h"
 #include "macro.h"
 #include "util.h"
+#include "idev.h"
+#include "idev-internal.h"
 
 static void element_open(idev_element *e);
 static void element_close(idev_element *e);

src/libsystemd-terminal/idev.h

@@ -28,9 +28,9 @@
 #include <libudev.h>
 #include <linux/input.h>
 #include <stdbool.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
 #include <xkbcommon/xkbcommon.h>
+#include "sd-bus.h"
+#include "sd-event.h"
 
 typedef struct idev_data                idev_data;
 typedef struct idev_data_evdev          idev_data_evdev;

src/libsystemd-terminal/sysview-internal.h

@@ -25,13 +25,13 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "hashmap.h"
 #include "list.h"
 #include "macro.h"
-#include "sysview.h"
 #include "util.h"
+#include "sysview.h"
 
 /*
  * Devices

src/libsystemd-terminal/sysview.c

@@ -23,15 +23,15 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
-#include <systemd/sd-login.h>
-#include "bus-util.h"
+#include "sd-bus.h"
+#include "sd-event.h"
+#include "sd-login.h"
 #include "macro.h"
-#include "sysview.h"
-#include "sysview-internal.h"
 #include "udev-util.h"
 #include "util.h"
+#include "bus-util.h"
+#include "sysview.h"
+#include "sysview-internal.h"
 
 static int context_raise_session_control(sysview_context *c, sysview_session *session, int error);
 

src/libsystemd-terminal/sysview.h

@@ -37,8 +37,8 @@
 #pragma once
 
 #include <stdbool.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
+#include "sd-bus.h"
+#include "sd-event.h"
 
 typedef struct sysview_event            sysview_event;
 typedef struct sysview_device           sysview_device;