From ab2c57984bd66b19dde6bf4c24f62faac9e8bd4d Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@anderso.nz>
Date: Sun, 11 Nov 2018 11:58:14 +1300
Subject: backend/x11: Make header order consistent

---
 backend/x11/backend.c      | 19 ++++++++++++-------
 backend/x11/input_device.c | 15 ++++++++++-----
 backend/x11/output.c       |  3 +++
 3 files changed, 25 insertions(+), 12 deletions(-)

(limited to 'backend/x11')

diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index a9914879..2422b8e8 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -1,25 +1,30 @@
 #define _POSIX_C_SOURCE 200112L
+
 #include <assert.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
+
+#include <wlr/config.h>
+
+#include <X11/Xlib-xcb.h>
 #include <wayland-server.h>
+#include <xcb/xcb.h>
+#if WLR_HAS_XCB_XKB
+#include <xcb/xkb.h>
+#endif
+
 #include <wlr/backend/interface.h>
 #include <wlr/backend/x11.h>
-#include <wlr/config.h>
 #include <wlr/interfaces/wlr_input_device.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/render/egl.h>
-#include <wlr/render/gles2.h>
+#include <wlr/render/wlr_renderer.h>
 #include <wlr/util/log.h>
-#include <X11/Xlib-xcb.h>
-#include <xcb/xcb.h>
-#if WLR_HAS_XCB_XKB
-#include <xcb/xkb.h>
-#endif
+
 #include "backend/x11.h"
 #include "util/signal.h"
 
diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c
index b64151e0..fa19221f 100644
--- a/backend/x11/input_device.c
+++ b/backend/x11/input_device.c
@@ -1,18 +1,23 @@
 #include <stdlib.h>
+
 #include <wlr/config.h>
-#include <wlr/interfaces/wlr_input_device.h>
-#include <wlr/interfaces/wlr_keyboard.h>
-#include <wlr/interfaces/wlr_pointer.h>
-#include <wlr/util/log.h>
-#include <xcb/xcb.h>
+
 #ifdef __linux__
 #include <linux/input-event-codes.h>
 #elif __FreeBSD__
 #include <dev/evdev/input-event-codes.h>
 #endif
+
+#include <xcb/xcb.h>
 #if WLR_HAS_XCB_XKB
 #include <xcb/xkb.h>
 #endif
+
+#include <wlr/interfaces/wlr_input_device.h>
+#include <wlr/interfaces/wlr_keyboard.h>
+#include <wlr/interfaces/wlr_pointer.h>
+#include <wlr/util/log.h>
+
 #include "backend/x11.h"
 #include "util/signal.h"
 
diff --git a/backend/x11/output.c b/backend/x11/output.c
index 92eeca66..8cb4b3eb 100644
--- a/backend/x11/output.c
+++ b/backend/x11/output.c
@@ -1,10 +1,13 @@
 #define _POSIX_C_SOURCE 200809L
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/util/log.h>
+
 #include "backend/x11.h"
 #include "util/signal.h"
 
-- 
cgit v1.2.3