diff --git a/backend/backend.c b/backend/backend.c
index 1e57e8321..6612119a5 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -5,12 +5,11 @@
 #include <string.h>
 #include <unistd.h>
 #include <wayland-server-core.h>
-
+#include <wlr/config.h>
 #include <wlr/backend/headless.h>
 #include <wlr/backend/interface.h>
 #include <wlr/backend/multi.h>
 #include <wlr/backend/wayland.h>
-#include <wlr/config.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/util/log.h>
 #include "backend/backend.h"
diff --git a/backend/drm/atomic.c b/backend/drm/atomic.c
index 618a9f43a..c0acceee5 100644
--- a/backend/drm/atomic.c
+++ b/backend/drm/atomic.c
@@ -1,10 +1,10 @@
 #define _POSIX_C_SOURCE 200809L
 #include <drm_fourcc.h>
-#include <stdlib.h>
 #include <stdio.h>
-#include <wlr/util/log.h>
+#include <stdlib.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
+#include <wlr/util/log.h>
 #include "backend/drm/drm.h"
 #include "backend/drm/iface.h"
 #include "backend/drm/util.h"
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 40597daeb..94fca3527 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -1,16 +1,16 @@
 #include <assert.h>
-#include <errno.h>
 #include <drm_fourcc.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <wayland-server-core.h>
+#include <xf86drm.h>
 #include <wlr/backend/interface.h>
 #include <wlr/backend/session.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/log.h>
-#include <xf86drm.h>
 #include "backend/drm/drm.h"
 
 struct wlr_drm_backend *get_drm_backend_from_backend(
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 5d9013527..d5ec4896b 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -13,6 +13,8 @@
 #include <time.h>
 #include <wayland-server-core.h>
 #include <wayland-util.h>
+#include <xf86drm.h>
+#include <xf86drmMode.h>
 #include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/render/wlr_renderer.h>
@@ -20,16 +22,14 @@
 #include <wlr/util/box.h>
 #include <wlr/util/log.h>
 #include <wlr/util/transform.h>
-#include <xf86drm.h>
-#include <xf86drmMode.h>
+#include "config.h"
 #include "backend/drm/drm.h"
 #include "backend/drm/iface.h"
 #include "backend/drm/util.h"
-#include "render/pixel_format.h"
 #include "render/drm_format_set.h"
+#include "render/pixel_format.h"
 #include "render/wlr_renderer.h"
 #include "util/env.h"
-#include "config.h"
 
 #if HAVE_LIBLIFTOFF
 #include <libliftoff.h>
diff --git a/backend/drm/legacy.c b/backend/drm/legacy.c
index 117fb9e51..67ee75cc0 100644
--- a/backend/drm/legacy.c
+++ b/backend/drm/legacy.c
@@ -1,8 +1,8 @@
 #include <assert.h>
 #include <stdlib.h>
-#include <wlr/util/log.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
+#include <wlr/util/log.h>
 #include "backend/drm/drm.h"
 #include "backend/drm/iface.h"
 #include "backend/drm/util.h"
diff --git a/backend/drm/libliftoff.c b/backend/drm/libliftoff.c
index cafae807c..9f93a56b7 100644
--- a/backend/drm/libliftoff.c
+++ b/backend/drm/libliftoff.c
@@ -1,10 +1,9 @@
 #define _POSIX_C_SOURCE 200809L
 #include <fcntl.h>
 #include <libliftoff.h>
-#include <sys/stat.h>
 #include <unistd.h>
+#include <sys/stat.h>
 #include <wlr/util/log.h>
-
 #include "backend/drm/drm.h"
 #include "backend/drm/iface.h"
 
diff --git a/backend/drm/monitor.c b/backend/drm/monitor.c
index 939a00ffb..df693bbb7 100644
--- a/backend/drm/monitor.c
+++ b/backend/drm/monitor.c
@@ -1,7 +1,7 @@
-#include <wlr/util/log.h>
 #include <stdlib.h>
-#include "backend/drm/monitor.h"
+#include <wlr/util/log.h>
 #include "backend/multi.h"
+#include "backend/drm/monitor.h"
 #include "backend/session/session.h"
 
 static void drm_backend_monitor_destroy(struct wlr_drm_backend_monitor* monitor) {
diff --git a/backend/drm/properties.c b/backend/drm/properties.c
index 4f4951771..569c3be66 100644
--- a/backend/drm/properties.c
+++ b/backend/drm/properties.c
@@ -4,9 +4,9 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <wlr/util/log.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
+#include <wlr/util/log.h>
 #include "backend/drm/properties.h"
 
 /*
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index f98cc8690..c3cbe92f4 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -14,9 +14,9 @@
 #include "backend/drm/drm.h"
 #include "backend/drm/util.h"
 #include "render/drm_format_set.h"
-#include "render/allocator/allocator.h"
 #include "render/pixel_format.h"
 #include "render/wlr_renderer.h"
+#include "render/allocator/allocator.h"
 
 bool init_drm_renderer(struct wlr_drm_backend *drm,
 		struct wlr_drm_renderer *renderer) {
diff --git a/backend/drm/util.c b/backend/drm/util.c
index 0e7f3f8b1..bee5a09ef 100644
--- a/backend/drm/util.c
+++ b/backend/drm/util.c
@@ -1,14 +1,14 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
+#include <drm.h>
 #include <drm_fourcc.h>
 #include <drm_mode.h>
-#include <drm.h>
-#include <libdisplay-info/cvt.h>
-#include <libdisplay-info/edid.h>
-#include <libdisplay-info/info.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <libdisplay-info/cvt.h>
+#include <libdisplay-info/edid.h>
+#include <libdisplay-info/info.h>
 #include <wlr/util/log.h>
 #include "backend/drm/drm.h"
 #include "backend/drm/util.h"
diff --git a/backend/headless/output.c b/backend/headless/output.c
index b3ac279ec..0aaa38927 100644
--- a/backend/headless/output.c
+++ b/backend/headless/output.c
@@ -1,6 +1,6 @@
 #include <assert.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/types/wlr_output_layer.h>
 #include <wlr/util/log.h>
diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c
index cbdf8b72e..f9d6fd2a8 100644
--- a/backend/libinput/backend.c
+++ b/backend/libinput/backend.c
@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <libinput.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <wlr/backend/interface.h>
 #include <wlr/backend/session.h>
 #include <wlr/util/log.h>
diff --git a/backend/libinput/events.c b/backend/libinput/events.c
index 4726e32b2..fc2302c0b 100644
--- a/backend/libinput/events.c
+++ b/backend/libinput/events.c
@@ -5,10 +5,10 @@
 #include <wlr/backend/session.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_pointer.h>
-#include <wlr/interfaces/wlr_touch.h>
-#include <wlr/interfaces/wlr_tablet_tool.h>
-#include <wlr/interfaces/wlr_tablet_pad.h>
 #include <wlr/interfaces/wlr_switch.h>
+#include <wlr/interfaces/wlr_tablet_pad.h>
+#include <wlr/interfaces/wlr_tablet_tool.h>
+#include <wlr/interfaces/wlr_touch.h>
 #include <wlr/util/log.h>
 #include "backend/libinput.h"
 
diff --git a/backend/libinput/tablet_pad.c b/backend/libinput/tablet_pad.c
index 2e74022a5..aea2b3154 100644
--- a/backend/libinput/tablet_pad.c
+++ b/backend/libinput/tablet_pad.c
@@ -1,8 +1,8 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
-#include <string.h>
 #include <libinput.h>
 #include <stdlib.h>
+#include <string.h>
 #include <wlr/interfaces/wlr_tablet_pad.h>
 #include <wlr/util/log.h>
 #include "backend/libinput.h"
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c
index 1c85d08bc..b8841edb6 100644
--- a/backend/libinput/tablet_tool.c
+++ b/backend/libinput/tablet_tool.c
@@ -1,8 +1,8 @@
 #define _POSIX_C_SOURCE 200809L
-#include <string.h>
 #include <assert.h>
 #include <libinput.h>
 #include <stdlib.h>
+#include <string.h>
 #include <wlr/interfaces/wlr_tablet_tool.h>
 #include <wlr/util/log.h>
 #include "backend/libinput.h"
diff --git a/backend/session/session.c b/backend/session/session.c
index 52b2654b7..f44c0c55c 100644
--- a/backend/session/session.c
+++ b/backend/session/session.c
@@ -1,25 +1,24 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
+#include <libseat.h>
 #include <libudev.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <wayland-server-core.h>
-#include <wlr/backend/session.h>
-#include <wlr/config.h>
-#include <wlr/util/log.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <wlr/config.h>
+#include <wlr/backend/session.h>
+#include <wlr/util/log.h>
 #include "backend/session/session.h"
 #include "util/time.h"
 
-#include <libseat.h>
-
 #define WAIT_GPU_TIMEOUT 10000 // ms
 
 static void handle_enable_seat(struct libseat *seat, void *data) {
diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c
index 9f78b6f1b..ff98479e5 100644
--- a/backend/wayland/backend.c
+++ b/backend/wayland/backend.c
@@ -1,35 +1,31 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
+#include <drm_fourcc.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <sys/mman.h>
-#include <sys/types.h>
 #include <unistd.h>
-
-#include <drm_fourcc.h>
 #include <wayland-server-core.h>
 #include <xf86drm.h>
-
+#include <sys/mman.h>
+#include <sys/types.h>
 #include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/log.h>
-
 #include "backend/wayland.h"
 #include "render/drm_format_set.h"
 #include "render/pixel_format.h"
-
 #include "drm-client-protocol.h"
 #include "linux-dmabuf-unstable-v1-client-protocol.h"
 #include "pointer-gestures-unstable-v1-client-protocol.h"
 #include "presentation-time-client-protocol.h"
+#include "relative-pointer-unstable-v1-client-protocol.h"
+#include "tablet-unstable-v2-client-protocol.h"
+#include "viewporter-client-protocol.h"
 #include "xdg-activation-v1-client-protocol.h"
 #include "xdg-decoration-unstable-v1-client-protocol.h"
 #include "xdg-shell-client-protocol.h"
-#include "tablet-unstable-v2-client-protocol.h"
-#include "relative-pointer-unstable-v1-client-protocol.h"
-#include "viewporter-client-protocol.h"
 
 struct wlr_wl_linux_dmabuf_feedback_v1 {
 	struct wlr_wl_backend *backend;
diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index c7c6d2d03..d4808da20 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -1,26 +1,22 @@
 #include <assert.h>
+#include <drm_fourcc.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include <wayland-client.h>
 #include <sys/mman.h>
 #include <sys/types.h>
-#include <unistd.h>
-
-#include <drm_fourcc.h>
-#include <wayland-client.h>
-
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_output_layer.h>
 #include <wlr/util/log.h>
-
 #include "backend/wayland.h"
 #include "render/pixel_format.h"
 #include "render/wlr_renderer.h"
 #include "types/wlr_output.h"
-
 #include "linux-dmabuf-unstable-v1-client-protocol.h"
 #include "presentation-time-client-protocol.h"
 #include "viewporter-client-protocol.h"
diff --git a/backend/wayland/seat.c b/backend/wayland/seat.c
index d88a370f3..8c7ab0e34 100644
--- a/backend/wayland/seat.c
+++ b/backend/wayland/seat.c
@@ -6,17 +6,14 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-
 #include <wayland-client.h>
-
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_output.h>
-#include <wlr/interfaces/wlr_touch.h>
-#include <wlr/interfaces/wlr_tablet_tool.h>
 #include <wlr/interfaces/wlr_tablet_pad.h>
+#include <wlr/interfaces/wlr_tablet_tool.h>
+#include <wlr/interfaces/wlr_touch.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/util/log.h>
-
 #include "backend/wayland.h"
 #include "util/time.h"
 
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index fcaab6186..874d2f3d7 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -1,5 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
+#include <drm_fourcc.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stdbool.h>
@@ -7,27 +8,22 @@
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
-#include <xf86drm.h>
-
-#include <wlr/config.h>
-
-#include <drm_fourcc.h>
 #include <wayland-server-core.h>
-#include <xcb/xcb.h>
-#include <xcb/dri3.h>
-#include <xcb/present.h>
-#include <xcb/render.h>
-#include <xcb/shm.h>
-#include <xcb/xcb_renderutil.h>
-#include <xcb/xfixes.h>
-#include <xcb/xinput.h>
-
+#include <xf86drm.h>
+#include <wlr/config.h>
 #include <wlr/backend/interface.h>
 #include <wlr/backend/x11.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/util/log.h>
-
+#include <xcb/dri3.h>
+#include <xcb/present.h>
+#include <xcb/render.h>
+#include <xcb/shm.h>
+#include <xcb/xcb.h>
+#include <xcb/xcb_renderutil.h>
+#include <xcb/xfixes.h>
+#include <xcb/xinput.h>
 #include "backend/x11.h"
 #include "render/drm_format_set.h"
 
diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c
index b3bd77da1..7bd82e53b 100644
--- a/backend/x11/input_device.c
+++ b/backend/x11/input_device.c
@@ -1,20 +1,14 @@
 #include <stdlib.h>
-
-#include <wlr/config.h>
-
 #include <linux/input-event-codes.h>
-
-#include <wayland-server-protocol.h>
-
-#include <xcb/xcb.h>
-#include <xcb/xfixes.h>
-#include <xcb/xinput.h>
-
+#include <wlr/config.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/interfaces/wlr_touch.h>
 #include <wlr/util/log.h>
-
+#include <xcb/xcb.h>
+#include <xcb/xfixes.h>
+#include <xcb/xinput.h>
+#include <wayland-server-protocol.h>
 #include "backend/x11.h"
 
 static void send_key_event(struct wlr_x11_backend *x11, uint32_t key,
diff --git a/backend/x11/output.c b/backend/x11/output.c
index 634424e5c..40a566da5 100644
--- a/backend/x11/output.c
+++ b/backend/x11/output.c
@@ -1,28 +1,25 @@
 #define _POSIX_C_SOURCE 200809L
 
 #include <assert.h>
+#include <drm_fourcc.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>
-
-#include <drm_fourcc.h>
-#include <xcb/dri3.h>
-#include <xcb/present.h>
-#include <xcb/render.h>
-#include <xcb/shm.h>
-#include <xcb/xcb.h>
-#include <xcb/xinput.h>
-
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/interfaces/wlr_touch.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/util/log.h>
-
+#include <xcb/dri3.h>
+#include <xcb/present.h>
+#include <xcb/render.h>
+#include <xcb/shm.h>
+#include <xcb/xcb.h>
+#include <xcb/xinput.h>
 #include "backend/x11.h"
-#include "util/time.h"
 #include "types/wlr_output.h"
+#include "util/time.h"
 
 static const uint32_t SUPPORTED_OUTPUT_STATE =
 	WLR_OUTPUT_STATE_BACKEND_OPTIONAL |
diff --git a/examples/cairo-buffer.c b/examples/cairo-buffer.c
index d92a2f13a..934acffd1 100644
--- a/examples/cairo-buffer.c
+++ b/examples/cairo-buffer.c
@@ -1,18 +1,18 @@
 #define _POSIX_C_SOURCE 200112L
 
+#include <cairo.h>
+#include <drm_fourcc.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <time.h>
-#include <cairo.h>
-#include <drm_fourcc.h>
 #include <wayland-server-core.h>
 #include <wlr/backend.h>
+#include <wlr/interfaces/wlr_buffer.h>
 #include <wlr/render/allocator.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/util/log.h>
-#include <wlr/interfaces/wlr_buffer.h>
 
 /* Simple scene-graph example with a custom buffer drawn by Cairo.
  *
diff --git a/examples/embedded.c b/examples/embedded.c
index 1e52e892c..7e8e6a08d 100644
--- a/examples/embedded.c
+++ b/examples/embedded.c
@@ -1,20 +1,19 @@
 #define _POSIX_C_SOURCE 200112L
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <GLES2/gl2.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-client.h>
 #include <wayland-egl.h>
 #include <wayland-server.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <GLES2/gl2.h>
 #include <wlr/backend/wayland.h>
 #include <wlr/render/allocator.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>
-
 #include "xdg-shell-client-protocol.h"
 
 static struct wl_display *remote_display = NULL;
diff --git a/examples/fullscreen-shell.c b/examples/fullscreen-shell.c
index 35be46e2c..79a6016d5 100644
--- a/examples/fullscreen-shell.c
+++ b/examples/fullscreen-shell.c
@@ -12,8 +12,8 @@
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_fullscreen_shell_v1.h>
 #include <wlr/types/wlr_matrix.h>
-#include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_output_layout.h>
 #include <wlr/util/box.h>
 #include <wlr/util/log.h>
 #include <wlr/util/transform.h>
diff --git a/examples/output-layout.c b/examples/output-layout.c
index 7d02dc9c5..1dfe35895 100644
--- a/examples/output-layout.c
+++ b/examples/output-layout.c
@@ -13,11 +13,11 @@
 #include <wlr/backend/session.h>
 #include <wlr/render/allocator.h>
 #include <wlr/render/wlr_renderer.h>
+#include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_keyboard.h>
 #include <wlr/types/wlr_matrix.h>
-#include <wlr/types/wlr_input_device.h>
-#include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_output_layout.h>
 #include <wlr/util/box.h>
 #include <wlr/util/log.h>
 #include <xkbcommon/xkbcommon.h>
diff --git a/examples/rotation.c b/examples/rotation.c
index 203b208e2..efe6764f5 100644
--- a/examples/rotation.c
+++ b/examples/rotation.c
@@ -12,10 +12,10 @@
 #include <wlr/backend.h>
 #include <wlr/render/allocator.h>
 #include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_keyboard.h>
-#include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_input_device.h>
+#include <wlr/types/wlr_keyboard.h>
 #include <wlr/types/wlr_matrix.h>
+#include <wlr/types/wlr_output.h>
 #include <wlr/util/log.h>
 #include <xkbcommon/xkbcommon.h>
 #include "cat.h"
diff --git a/examples/simple.c b/examples/simple.c
index 8fe494609..d2da5968a 100644
--- a/examples/simple.c
+++ b/examples/simple.c
@@ -9,9 +9,9 @@
 #include <wlr/backend/session.h>
 #include <wlr/render/allocator.h>
 #include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_keyboard.h>
+#include <wlr/types/wlr_output.h>
 #include <wlr/util/log.h>
 #include <xkbcommon/xkbcommon.h>
 
diff --git a/examples/tablet.c b/examples/tablet.c
index c253526d3..fe27209b0 100644
--- a/examples/tablet.c
+++ b/examples/tablet.c
@@ -10,10 +10,10 @@
 #include <wlr/backend/session.h>
 #include <wlr/render/allocator.h>
 #include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_matrix.h>
-#include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_keyboard.h>
+#include <wlr/types/wlr_matrix.h>
+#include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_tablet_pad.h>
 #include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/util/box.h>
diff --git a/examples/touch.c b/examples/touch.c
index 53def6242..5f836be01 100644
--- a/examples/touch.c
+++ b/examples/touch.c
@@ -12,10 +12,10 @@
 #include <wlr/backend/session.h>
 #include <wlr/render/allocator.h>
 #include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_keyboard.h>
 #include <wlr/types/wlr_matrix.h>
+#include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_touch.h>
 #include <wlr/util/log.h>
 #include <xkbcommon/xkbcommon.h>
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h
index 88eacc6e9..537f7017d 100644
--- a/include/backend/drm/drm.h
+++ b/include/backend/drm/drm.h
@@ -6,11 +6,11 @@
 #include <stdint.h>
 #include <wayland-server-core.h>
 #include <wayland-util.h>
+#include <xf86drmMode.h>
 #include <wlr/backend/drm.h>
 #include <wlr/backend/session.h>
 #include <wlr/render/drm_format_set.h>
 #include <wlr/types/wlr_output_layer.h>
-#include <xf86drmMode.h>
 #include "backend/drm/iface.h"
 #include "backend/drm/properties.h"
 #include "backend/drm/renderer.h"
diff --git a/include/backend/drm/iface.h b/include/backend/drm/iface.h
index dbe4c9086..1f89ce8ba 100644
--- a/include/backend/drm/iface.h
+++ b/include/backend/drm/iface.h
@@ -1,9 +1,9 @@
 #ifndef BACKEND_DRM_IFACE_H
 #define BACKEND_DRM_IFACE_H
 
+#include <pixman.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <pixman.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index d6796b448..2fd823d38 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -2,18 +2,16 @@
 #define BACKEND_WAYLAND_H
 
 #include <stdbool.h>
-
 #include <wayland-client.h>
 #include <wayland-server-core.h>
-
 #include <wlr/backend/wayland.h>
+#include <wlr/render/drm_format_set.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_keyboard.h>
 #include <wlr/types/wlr_pointer.h>
 #include <wlr/types/wlr_tablet_pad.h>
 #include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/types/wlr_touch.h>
-#include <wlr/render/drm_format_set.h>
 
 struct wlr_wl_backend {
 	struct wlr_backend backend;
diff --git a/include/backend/x11.h b/include/backend/x11.h
index 06834c1cb..e3db375eb 100644
--- a/include/backend/x11.h
+++ b/include/backend/x11.h
@@ -1,22 +1,18 @@
 #ifndef BACKEND_X11_H
 #define BACKEND_X11_H
 
-#include <wlr/config.h>
-
-#include <stdbool.h>
-
-#include <wayland-server-core.h>
-#include <xcb/xcb.h>
-#include <xcb/present.h>
-
 #include <pixman.h>
+#include <stdbool.h>
+#include <wayland-server-core.h>
+#include <wlr/config.h>
 #include <wlr/backend/x11.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/interfaces/wlr_touch.h>
-#include <wlr/types/wlr_pointer.h>
 #include <wlr/render/drm_format_set.h>
-
+#include <wlr/types/wlr_pointer.h>
+#include <xcb/present.h>
+#include <xcb/xcb.h>
 #include "config.h"
 
 #if HAVE_XCB_ERRORS
diff --git a/include/render/gles2.h b/include/render/gles2.h
index 930cf07d7..599d47e6f 100644
--- a/include/render/gles2.h
+++ b/include/render/gles2.h
@@ -1,12 +1,12 @@
 #ifndef RENDER_GLES2_H
 #define RENDER_GLES2_H
 
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 #include <time.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
 #include <wlr/render/egl.h>
 #include <wlr/render/gles2.h>
 #include <wlr/render/interface.h>
diff --git a/include/render/vulkan.h b/include/render/vulkan.h
index 3e0c395f0..ad6122098 100644
--- a/include/render/vulkan.h
+++ b/include/render/vulkan.h
@@ -1,14 +1,14 @@
 #ifndef RENDER_VULKAN_H
 #define RENDER_VULKAN_H
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
-#include <stdbool.h>
 #include <vulkan/vulkan.h>
-#include <wlr/render/wlr_renderer.h>
-#include <wlr/render/wlr_texture.h>
 #include <wlr/render/drm_format_set.h>
 #include <wlr/render/interface.h>
+#include <wlr/render/wlr_renderer.h>
+#include <wlr/render/wlr_texture.h>
 #include <wlr/util/addon.h>
 #include "util/rect_union.h"
 
diff --git a/include/types/wlr_tablet_v2.h b/include/types/wlr_tablet_v2.h
index 2e54adcb7..ddcc60724 100644
--- a/include/types/wlr_tablet_v2.h
+++ b/include/types/wlr_tablet_v2.h
@@ -1,9 +1,9 @@
 #ifndef TYPES_WLR_TABLET_V2_H
 #define TYPES_WLR_TABLET_V2_H
 
-#include "tablet-unstable-v2-protocol.h"
 #include <wayland-server-core.h>
 #include <wlr/types/wlr_tablet_v2.h>
+#include "tablet-unstable-v2-protocol.h"
 
 struct wlr_tablet_seat_v2 {
 	struct wl_list link; // wlr_tablet_manager_v2.seats
diff --git a/include/util/array.h b/include/util/array.h
index a51bdb640..7310e00a9 100644
--- a/include/util/array.h
+++ b/include/util/array.h
@@ -1,8 +1,8 @@
 #ifndef UTIL_ARRAY_H
 #define UTIL_ARRAY_H
 
-#include <stdlib.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include <wayland-util.h>
 
 /**
diff --git a/include/util/rect_union.h b/include/util/rect_union.h
index 2d74f94d5..8a93d16b0 100644
--- a/include/util/rect_union.h
+++ b/include/util/rect_union.h
@@ -1,9 +1,9 @@
 #ifndef UTIL_RECT_UNION_H
 #define UTIL_RECT_UNION_H
 
-#include <stdlib.h>
-#include <stdbool.h>
 #include <pixman.h>
+#include <stdbool.h>
+#include <stdlib.h>
 #include <wayland-util.h>
 
 /**
diff --git a/include/util/set.h b/include/util/set.h
index d6330108a..03b718354 100644
--- a/include/util/set.h
+++ b/include/util/set.h
@@ -1,8 +1,8 @@
 #ifndef UTIL_SET_H
 #define UTIL_SET_H
 
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <sys/types.h>
 
 /**
diff --git a/include/wlr/backend/session.h b/include/wlr/backend/session.h
index b61de8525..5bde206f4 100644
--- a/include/wlr/backend/session.h
+++ b/include/wlr/backend/session.h
@@ -2,8 +2,8 @@
 #define WLR_BACKEND_SESSION_H
 
 #include <stdbool.h>
-#include <sys/types.h>
 #include <wayland-server-core.h>
+#include <sys/types.h>
 
 struct libseat;
 
diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h
index 9bf1b8019..c9659eaf0 100644
--- a/include/wlr/render/egl.h
+++ b/include/wlr/render/egl.h
@@ -16,13 +16,12 @@
 #define EGL_NO_PLATFORM_SPECIFIC_TYPES
 #endif
 
-#include <wlr/config.h>
-
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
 #include <pixman.h>
 #include <stdbool.h>
 #include <wayland-server-core.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <wlr/config.h>
 #include <wlr/render/dmabuf.h>
 #include <wlr/render/drm_format_set.h>
 
diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h
index e8191ac2b..799981204 100644
--- a/include/wlr/render/interface.h
+++ b/include/wlr/render/interface.h
@@ -11,10 +11,10 @@
 
 #include <stdbool.h>
 #include <wayland-server-core.h>
+#include <wlr/render/dmabuf.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/render/wlr_texture.h>
 #include <wlr/types/wlr_output.h>
-#include <wlr/render/dmabuf.h>
 
 struct wlr_box;
 struct wlr_fbox;
diff --git a/include/wlr/types/wlr_cursor.h b/include/wlr/types/wlr_cursor.h
index 004be0f1d..c79866b44 100644
--- a/include/wlr/types/wlr_cursor.h
+++ b/include/wlr/types/wlr_cursor.h
@@ -10,8 +10,8 @@
 #define WLR_TYPES_WLR_CURSOR_H
 
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_output_layout.h>
 
 struct wlr_input_device;
 struct wlr_xcursor_manager;
diff --git a/include/wlr/types/wlr_damage_ring.h b/include/wlr/types/wlr_damage_ring.h
index d503a502a..dafd397f4 100644
--- a/include/wlr/types/wlr_damage_ring.h
+++ b/include/wlr/types/wlr_damage_ring.h
@@ -9,10 +9,10 @@
 #ifndef WLR_TYPES_WLR_DAMAGE_RING_H
 #define WLR_TYPES_WLR_DAMAGE_RING_H
 
+#include <pixman.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <pixman.h>
 
 /* For triple buffering, a history of two frames is required. */
 #define WLR_DAMAGE_RING_PREVIOUS_LEN 2
diff --git a/include/wlr/types/wlr_drm.h b/include/wlr/types/wlr_drm.h
index d28c7b8f2..13570b40b 100644
--- a/include/wlr/types/wlr_drm.h
+++ b/include/wlr/types/wlr_drm.h
@@ -9,9 +9,9 @@
 #ifndef WLR_TYPES_WLR_DRM_H
 #define WLR_TYPES_WLR_DRM_H
 
-#include <wayland-server-protocol.h>
 #include <wlr/render/drm_format_set.h>
 #include <wlr/types/wlr_buffer.h>
+#include <wayland-server-protocol.h>
 
 struct wlr_renderer;
 
diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h
index abc4edf6c..52accc5ac 100644
--- a/include/wlr/types/wlr_keyboard.h
+++ b/include/wlr/types/wlr_keyboard.h
@@ -12,9 +12,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <wayland-server-core.h>
-#include <wayland-server-protocol.h>
 #include <wlr/types/wlr_input_device.h>
 #include <xkbcommon/xkbcommon.h>
+#include <wayland-server-protocol.h>
 
 #define WLR_LED_COUNT 3
 
diff --git a/include/wlr/types/wlr_linux_dmabuf_v1.h b/include/wlr/types/wlr_linux_dmabuf_v1.h
index e39c09934..c2588b546 100644
--- a/include/wlr/types/wlr_linux_dmabuf_v1.h
+++ b/include/wlr/types/wlr_linux_dmabuf_v1.h
@@ -10,11 +10,11 @@
 #define WLR_TYPES_WLR_LINUX_DMABUF_H
 
 #include <stdint.h>
-#include <sys/stat.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_buffer.h>
+#include <sys/stat.h>
 #include <wlr/render/dmabuf.h>
 #include <wlr/render/drm_format_set.h>
+#include <wlr/types/wlr_buffer.h>
 
 struct wlr_surface;
 
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index c86c28920..58bc62ac7 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -12,11 +12,11 @@
 #include <pixman.h>
 #include <stdbool.h>
 #include <time.h>
-#include <wayland-server-protocol.h>
 #include <wayland-util.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_buffer.h>
 #include <wlr/util/addon.h>
+#include <wayland-server-protocol.h>
 
 enum wlr_output_mode_aspect_ratio {
 	WLR_OUTPUT_MODE_ASPECT_RATIO_NONE,
diff --git a/include/wlr/types/wlr_output_layer.h b/include/wlr/types/wlr_output_layer.h
index f4aef0582..5e762c069 100644
--- a/include/wlr/types/wlr_output_layer.h
+++ b/include/wlr/types/wlr_output_layer.h
@@ -11,8 +11,8 @@
 
 #include <wlr/render/drm_format_set.h>
 #include <wlr/types/wlr_output.h>
-#include <wlr/util/box.h>
 #include <wlr/util/addon.h>
+#include <wlr/util/box.h>
 
 /**
  * An output layer.
diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h
index 16aed1dc7..db0ed7a51 100644
--- a/include/wlr/types/wlr_pointer.h
+++ b/include/wlr/types/wlr_pointer.h
@@ -11,8 +11,8 @@
 
 #include <stdint.h>
 #include <wayland-server-core.h>
-#include <wayland-server-protocol.h>
 #include <wlr/types/wlr_input_device.h>
+#include <wayland-server-protocol.h>
 
 struct wlr_pointer_impl;
 
diff --git a/include/wlr/types/wlr_pointer_constraints_v1.h b/include/wlr/types/wlr_pointer_constraints_v1.h
index 21280ff2d..59b673201 100644
--- a/include/wlr/types/wlr_pointer_constraints_v1.h
+++ b/include/wlr/types/wlr_pointer_constraints_v1.h
@@ -9,9 +9,9 @@
 #ifndef WLR_TYPES_WLR_POINTER_CONSTRAINTS_V1_H
 #define WLR_TYPES_WLR_POINTER_CONSTRAINTS_V1_H
 
+#include <pixman.h>
 #include <stdint.h>
 #include <wayland-server-core.h>
-#include <pixman.h>
 #include <wlr/types/wlr_seat.h>
 #include "pointer-constraints-unstable-v1-protocol.h"
 
diff --git a/include/wlr/types/wlr_tearing_control_v1.h b/include/wlr/types/wlr_tearing_control_v1.h
index 31cc5bef5..d429e7635 100644
--- a/include/wlr/types/wlr_tearing_control_v1.h
+++ b/include/wlr/types/wlr_tearing_control_v1.h
@@ -11,9 +11,8 @@
 
 #include <stdint.h>
 #include <wayland-server-core.h>
-#include <wayland-server-protocol.h>
 #include <wlr/types/wlr_compositor.h>
-
+#include <wayland-server-protocol.h>
 #include "tearing-control-v1-protocol.h"
 
 struct wlr_tearing_control_v1 {
diff --git a/include/wlr/types/wlr_touch.h b/include/wlr/types/wlr_touch.h
index 82c4b8618..e5c69bc4b 100644
--- a/include/wlr/types/wlr_touch.h
+++ b/include/wlr/types/wlr_touch.h
@@ -10,8 +10,8 @@
 #define WLR_TYPES_WLR_TOUCH_H
 
 #include <stdint.h>
-#include <wlr/types/wlr_input_device.h>
 #include <wayland-server-core.h>
+#include <wlr/types/wlr_input_device.h>
 
 struct wlr_touch_impl;
 
diff --git a/include/wlr/types/wlr_virtual_pointer_v1.h b/include/wlr/types/wlr_virtual_pointer_v1.h
index a05268547..4f8a97195 100644
--- a/include/wlr/types/wlr_virtual_pointer_v1.h
+++ b/include/wlr/types/wlr_virtual_pointer_v1.h
@@ -10,9 +10,9 @@
 #define WLR_TYPES_WLR_VIRTUAL_POINTER_V1_H
 
 #include <wayland-server-core.h>
-#include <wayland-server-protocol.h>
-#include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/interfaces/wlr_output.h>
+#include <wlr/interfaces/wlr_pointer.h>
+#include <wayland-server-protocol.h>
 
 struct wlr_virtual_pointer_manager_v1 {
 	struct wl_global *global;
diff --git a/include/wlr/util/log.h b/include/wlr/util/log.h
index 587104cc8..a9d1a01ed 100644
--- a/include/wlr/util/log.h
+++ b/include/wlr/util/log.h
@@ -16,10 +16,10 @@
 #ifndef WLR_UTIL_LOG_H
 #define WLR_UTIL_LOG_H
 
-#include <stdbool.h>
-#include <stdarg.h>
-#include <string.h>
 #include <errno.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <string.h>
 
 enum wlr_log_importance {
 	WLR_SILENT = 0,
diff --git a/include/wlr/util/region.h b/include/wlr/util/region.h
index 948307a18..9e5bb88f6 100644
--- a/include/wlr/util/region.h
+++ b/include/wlr/util/region.h
@@ -16,8 +16,8 @@
 #ifndef WLR_UTIL_REGION_H
 #define WLR_UTIL_REGION_H
 
-#include <stdbool.h>
 #include <pixman.h>
+#include <stdbool.h>
 #include <wayland-server-protocol.h>
 
 /**
diff --git a/include/wlr/xwayland/server.h b/include/wlr/xwayland/server.h
index fa16a3b00..8c8cdc61a 100644
--- a/include/wlr/xwayland/server.h
+++ b/include/wlr/xwayland/server.h
@@ -10,9 +10,9 @@
 #define WLR_XWAYLAND_SERVER_H
 
 #include <stdbool.h>
-#include <sys/types.h>
 #include <time.h>
 #include <wayland-server-core.h>
+#include <sys/types.h>
 
 struct wlr_xwayland_server_options {
 	bool lazy;
diff --git a/include/wlr/xwayland/xwayland.h b/include/wlr/xwayland/xwayland.h
index cb9e35f05..5ab15016c 100644
--- a/include/wlr/xwayland/xwayland.h
+++ b/include/wlr/xwayland/xwayland.h
@@ -11,10 +11,10 @@
 
 #include <stdbool.h>
 #include <wayland-server-core.h>
+#include <wlr/util/addon.h>
 #include <xcb/xcb.h>
 #include <xcb/xcb_ewmh.h>
 #include <xcb/xcb_icccm.h>
-#include <wlr/util/addon.h>
 
 struct wlr_box;
 struct wlr_xwm;
diff --git a/include/xwayland/selection.h b/include/xwayland/selection.h
index 308310232..87f10b59e 100644
--- a/include/xwayland/selection.h
+++ b/include/xwayland/selection.h
@@ -2,8 +2,8 @@
 #define XWAYLAND_SELECTION_H
 
 #include <stdbool.h>
-#include <xcb/xfixes.h>
 #include <wayland-util.h>
+#include <xcb/xfixes.h>
 
 #define INCR_CHUNK_SIZE (64 * 1024)
 
diff --git a/render/allocator/allocator.c b/render/allocator/allocator.c
index f71902f27..a41c19715 100644
--- a/render/allocator/allocator.c
+++ b/render/allocator/allocator.c
@@ -3,17 +3,17 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <xf86drm.h>
+#include <xf86drmMode.h>
 #include <wlr/config.h>
 #include <wlr/interfaces/wlr_buffer.h>
 #include <wlr/render/allocator.h>
 #include <wlr/util/log.h>
-#include <xf86drm.h>
-#include <xf86drmMode.h>
 #include "backend/backend.h"
+#include "render/wlr_renderer.h"
 #include "render/allocator/allocator.h"
 #include "render/allocator/drm_dumb.h"
 #include "render/allocator/shm.h"
-#include "render/wlr_renderer.h"
 
 #if WLR_HAS_GBM_ALLOCATOR
 #include "render/allocator/gbm.h"
diff --git a/render/allocator/drm_dumb.c b/render/allocator/drm_dumb.c
index 6de44f402..1d1ee65af 100644
--- a/render/allocator/drm_dumb.c
+++ b/render/allocator/drm_dumb.c
@@ -5,20 +5,19 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/mman.h>
 #include <unistd.h>
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+#include <sys/mman.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/interfaces/wlr_buffer.h>
 #include <wlr/render/allocator.h>
 #include <wlr/render/drm_format_set.h>
 #include <wlr/util/log.h>
-#include <xf86drm.h>
-#include <xf86drmMode.h>
-
-#include "render/allocator/drm_dumb.h"
 #include "render/drm_format_set.h"
 #include "render/pixel_format.h"
+#include "render/allocator/drm_dumb.h"
 
 static const struct wlr_buffer_impl buffer_impl;
 
diff --git a/render/allocator/gbm.c b/render/allocator/gbm.c
index 25ddbbae4..8566a24cc 100644
--- a/render/allocator/gbm.c
+++ b/render/allocator/gbm.c
@@ -4,15 +4,14 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <xf86drm.h>
 #include <wlr/interfaces/wlr_buffer.h>
 #include <wlr/render/allocator.h>
 #include <wlr/render/drm_format_set.h>
 #include <wlr/util/log.h>
-#include <xf86drm.h>
-
 #include "config.h"
-#include "render/allocator/gbm.h"
 #include "render/drm_format_set.h"
+#include "render/allocator/gbm.h"
 
 static const struct wlr_buffer_impl buffer_impl;
 
diff --git a/render/allocator/shm.c b/render/allocator/shm.c
index 2622f99aa..c9bc57b8d 100644
--- a/render/allocator/shm.c
+++ b/render/allocator/shm.c
@@ -1,13 +1,12 @@
 #include <assert.h>
 #include <drm_fourcc.h>
 #include <stdlib.h>
-#include <sys/mman.h>
 #include <unistd.h>
+#include <sys/mman.h>
 #include <wlr/interfaces/wlr_buffer.h>
 #include <wlr/render/allocator.h>
 #include <wlr/render/drm_format_set.h>
 #include <wlr/util/log.h>
-
 #include "render/pixel_format.h"
 #include "render/allocator/shm.h"
 #include "util/shm.h"
diff --git a/render/dmabuf_linux.c b/render/dmabuf_linux.c
index cf06229c5..2ba15e4d0 100644
--- a/render/dmabuf_linux.c
+++ b/render/dmabuf_linux.c
@@ -1,10 +1,9 @@
+#include <stdlib.h>
+#include <xf86drm.h>
 #include <linux/dma-buf.h>
 #include <linux/version.h>
-#include <stdlib.h>
 #include <sys/utsname.h>
 #include <wlr/util/log.h>
-#include <xf86drm.h>
-
 #include "render/dmabuf.h"
 
 bool dmabuf_check_sync_file_import_export(void) {
diff --git a/render/egl.c b/render/egl.c
index 8a1e6daed..134b8c301 100644
--- a/render/egl.c
+++ b/render/egl.c
@@ -2,14 +2,14 @@
 #include <assert.h>
 #include <drm_fourcc.h>
 #include <fcntl.h>
+#include <gbm.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <gbm.h>
+#include <xf86drm.h>
 #include <wlr/render/egl.h>
 #include <wlr/util/log.h>
 #include <wlr/util/region.h>
-#include <xf86drm.h>
 #include "render/egl.h"
 #include "util/env.h"
 
diff --git a/render/gles2/pass.c b/render/gles2/pass.c
index 4adad49f4..2d8f88228 100644
--- a/render/gles2/pass.c
+++ b/render/gles2/pass.c
@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 199309L
-#include <stdlib.h>
 #include <assert.h>
 #include <pixman.h>
+#include <stdlib.h>
 #include <time.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/util/transform.h>
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
index e61c276c7..3319ed897 100644
--- a/render/gles2/renderer.c
+++ b/render/gles2/renderer.c
@@ -1,33 +1,32 @@
 #define _POSIX_C_SOURCE 199309L
 #include <assert.h>
 #include <drm_fourcc.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server-protocol.h>
 #include <wayland-util.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
 #include <wlr/render/egl.h>
 #include <wlr/render/interface.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/util/box.h>
 #include <wlr/util/log.h>
+#include <wayland-server-protocol.h>
+#include "common_vert_src.h"
+#include "quad_frag_src.h"
+#include "tex_external_frag_src.h"
+#include "tex_rgba_frag_src.h"
+#include "tex_rgbx_frag_src.h"
 #include "render/egl.h"
 #include "render/gles2.h"
 #include "render/pixel_format.h"
 #include "types/wlr_matrix.h"
 #include "util/time.h"
 
-#include "common_vert_src.h"
-#include "quad_frag_src.h"
-#include "tex_rgba_frag_src.h"
-#include "tex_rgbx_frag_src.h"
-#include "tex_external_frag_src.h"
-
 static const struct wlr_renderer_impl renderer_impl;
 static const struct wlr_render_timer_impl render_timer_impl;
 
diff --git a/render/gles2/texture.c b/render/gles2/texture.c
index b444745cb..25dc8a6b5 100644
--- a/render/gles2/texture.c
+++ b/render/gles2/texture.c
@@ -1,16 +1,16 @@
 #include <assert.h>
 #include <drm_fourcc.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <wayland-server-protocol.h>
 #include <wayland-util.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
 #include <wlr/render/egl.h>
 #include <wlr/render/interface.h>
 #include <wlr/render/wlr_texture.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/util/log.h>
+#include <wayland-server-protocol.h>
 #include "render/egl.h"
 #include "render/gles2.h"
 #include "render/pixel_format.h"
diff --git a/render/swapchain.c b/render/swapchain.c
index a2b6373b8..f95c7153c 100644
--- a/render/swapchain.c
+++ b/render/swapchain.c
@@ -1,10 +1,10 @@
 #include <assert.h>
 #include <stdlib.h>
-#include <wlr/util/log.h>
 #include <wlr/render/swapchain.h>
 #include <wlr/types/wlr_buffer.h>
-#include "render/allocator/allocator.h"
+#include <wlr/util/log.h>
 #include "render/drm_format_set.h"
+#include "render/allocator/allocator.h"
 
 static void swapchain_handle_allocator_destroy(struct wl_listener *listener,
 		void *data) {
diff --git a/render/vulkan/pixel_format.c b/render/vulkan/pixel_format.c
index ced6eb24f..86d27ba88 100644
--- a/render/vulkan/pixel_format.c
+++ b/render/vulkan/pixel_format.c
@@ -1,9 +1,9 @@
 #include <drm_fourcc.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <xf86drm.h>
 #include <vulkan/vulkan.h>
 #include <wlr/util/log.h>
-#include <xf86drm.h>
 #include "render/pixel_format.h"
 #include "render/vulkan.h"
 
diff --git a/render/vulkan/renderer.c b/render/vulkan/renderer.c
index ceaafd66c..409dc6b6b 100644
--- a/render/vulkan/renderer.c
+++ b/render/vulkan/renderer.c
@@ -1,31 +1,30 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
+#include <drm_fourcc.h>
 #include <fcntl.h>
 #include <math.h>
 #include <poll.h>
-#include <stdlib.h>
 #include <stdint.h>
-#include <sys/types.h>
+#include <stdlib.h>
 #include <unistd.h>
-#include <drm_fourcc.h>
+#include <xf86drm.h>
+#include <sys/types.h>
 #include <vulkan/vulkan.h>
+#include <wlr/backend/interface.h>
 #include <wlr/render/interface.h>
+#include <wlr/render/vulkan.h>
 #include <wlr/types/wlr_drm.h>
+#include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/util/box.h>
 #include <wlr/util/log.h>
-#include <wlr/render/vulkan.h>
-#include <wlr/backend/interface.h>
-#include <wlr/types/wlr_linux_dmabuf_v1.h>
-#include <xf86drm.h>
-
 #include "render/dmabuf.h"
 #include "render/pixel_format.h"
 #include "render/vulkan.h"
 #include "render/vulkan/shaders/common.vert.h"
-#include "render/vulkan/shaders/texture.frag.h"
-#include "render/vulkan/shaders/quad.frag.h"
 #include "render/vulkan/shaders/output.frag.h"
+#include "render/vulkan/shaders/quad.frag.h"
+#include "render/vulkan/shaders/texture.frag.h"
 #include "types/wlr_buffer.h"
 #include "types/wlr_matrix.h"
 
diff --git a/render/vulkan/texture.c b/render/vulkan/texture.c
index 65ea22bac..d53835055 100644
--- a/render/vulkan/texture.c
+++ b/render/vulkan/texture.c
@@ -5,12 +5,12 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
 #include <unistd.h>
-#include <wlr/render/wlr_texture.h>
-#include <wlr/render/vulkan.h>
-#include <wlr/util/log.h>
 #include <xf86drm.h>
+#include <sys/stat.h>
+#include <wlr/render/vulkan.h>
+#include <wlr/render/wlr_texture.h>
+#include <wlr/util/log.h>
 #include "render/pixel_format.h"
 #include "render/vulkan.h"
 
diff --git a/render/vulkan/vulkan.c b/render/vulkan/vulkan.c
index b8ba0b480..581e7c1d0 100644
--- a/render/vulkan/vulkan.c
+++ b/render/vulkan/vulkan.c
@@ -4,16 +4,16 @@
 #include <assert.h>
 #include <fcntl.h>
 #include <math.h>
-#include <stdlib.h>
 #include <stdint.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <xf86drm.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <vulkan/vulkan.h>
-#include <wlr/util/log.h>
-#include <wlr/version.h>
 #include <wlr/config.h>
+#include <wlr/version.h>
+#include <wlr/util/log.h>
 #include "render/dmabuf.h"
 #include "render/vulkan.h"
 
diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c
index 449d96415..a6331c4ed 100644
--- a/render/wlr_renderer.c
+++ b/render/wlr_renderer.c
@@ -4,6 +4,8 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <xf86drm.h>
+#include <wlr/config.h>
 #include <wlr/render/interface.h>
 #include <wlr/render/pixman.h>
 #include <wlr/render/wlr_renderer.h>
@@ -13,9 +15,6 @@
 #include <wlr/types/wlr_shm.h>
 #include <wlr/util/box.h>
 #include <wlr/util/log.h>
-#include <xf86drm.h>
-
-#include <wlr/config.h>
 
 #if WLR_HAS_GLES2_RENDERER
 #include <wlr/render/egl.h>
diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c
index 1dfca1706..5d4558730 100644
--- a/tinywl/tinywl.c
+++ b/tinywl/tinywl.c
@@ -2,16 +2,16 @@
 #include <assert.h>
 #include <getopt.h>
 #include <stdbool.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
 #include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/render/allocator.h>
 #include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_keyboard.h>
diff --git a/types/output/output.c b/types/output/output.c
index f28fd7996..52e411fc4 100644
--- a/types/output/output.c
+++ b/types/output/output.c
@@ -1,8 +1,8 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
-#include <backend/backend.h>
 #include <drm_fourcc.h>
 #include <stdlib.h>
+#include <backend/backend.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/render/swapchain.h>
 #include <wlr/types/wlr_compositor.h>
diff --git a/types/output/render.c b/types/output/render.c
index acc6f6b07..be1a6f29d 100644
--- a/types/output/render.c
+++ b/types/output/render.c
@@ -1,16 +1,16 @@
 #include <assert.h>
 #include <drm_fourcc.h>
 #include <stdlib.h>
+#include <xf86drm.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/render/interface.h>
 #include <wlr/render/swapchain.h>
 #include <wlr/util/log.h>
-#include <xf86drm.h>
 #include "backend/backend.h"
-#include "render/allocator/allocator.h"
 #include "render/drm_format_set.h"
-#include "render/wlr_renderer.h"
 #include "render/pixel_format.h"
+#include "render/wlr_renderer.h"
+#include "render/allocator/allocator.h"
 #include "types/wlr_output.h"
 
 bool wlr_output_init_render(struct wlr_output *output,
diff --git a/types/output/swapchain.c b/types/output/swapchain.c
index 5a16610d8..dff781857 100644
--- a/types/output/swapchain.c
+++ b/types/output/swapchain.c
@@ -1,11 +1,10 @@
 #include <assert.h>
 #include <drm_fourcc.h>
 #include <stdlib.h>
+#include <xf86drm.h>
 #include <wlr/render/allocator.h>
 #include <wlr/render/swapchain.h>
 #include <wlr/util/log.h>
-#include <xf86drm.h>
-
 #include "render/drm_format_set.h"
 #include "types/wlr_output.h"
 
diff --git a/types/scene/drag_icon.c b/types/scene/drag_icon.c
index b508487e0..982330ea0 100644
--- a/types/scene/drag_icon.c
+++ b/types/scene/drag_icon.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
-#include "wlr/types/wlr_compositor.h"
-#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_data_device.h>
+#include <wlr/types/wlr_scene.h>
+#include "wlr/types/wlr_compositor.h"
 
 struct wlr_scene_drag_icon {
 	struct wlr_scene_tree *tree;
diff --git a/types/scene/layer_shell_v1.c b/types/scene/layer_shell_v1.c
index 67fdda287..842050c71 100644
--- a/types/scene/layer_shell_v1.c
+++ b/types/scene/layer_shell_v1.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
-#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
+#include <wlr/types/wlr_scene.h>
 
 static void scene_layer_surface_handle_tree_destroy(
 		struct wl_listener *listener, void *data) {
diff --git a/types/scene/surface.c b/types/scene/surface.c
index 1a2b31af2..d3595e4f5 100644
--- a/types/scene/surface.c
+++ b/types/scene/surface.c
@@ -1,9 +1,9 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <wlr/types/wlr_compositor.h>
-#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_presentation_time.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/util/transform.h>
 #include "types/wlr_scene.h"
 
diff --git a/types/scene/wlr_scene.c b/types/scene/wlr_scene.c
index f83f72746..d8a38ef71 100644
--- a/types/scene/wlr_scene.c
+++ b/types/scene/wlr_scene.c
@@ -7,8 +7,8 @@
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_damage_ring.h>
-#include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_linux_dmabuf_v1.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_presentation_time.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/util/log.h>
diff --git a/types/seat/wlr_seat.c b/types/seat/wlr_seat.c
index 9e91c9b08..fb7d84c2e 100644
--- a/types/seat/wlr_seat.c
+++ b/types/seat/wlr_seat.c
@@ -4,10 +4,10 @@
 #include <string.h>
 #include <time.h>
 #include <wayland-server-core.h>
+#include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_primary_selection.h>
 #include <wlr/types/wlr_seat.h>
-#include <wlr/types/wlr_compositor.h>
 #include <wlr/util/log.h>
 #include "types/wlr_seat.h"
 #include "util/global.h"
diff --git a/types/tablet_v2/wlr_tablet_v2_pad.c b/types/tablet_v2/wlr_tablet_v2_pad.c
index bf8fb7044..8ba507020 100644
--- a/types/tablet_v2/wlr_tablet_v2_pad.c
+++ b/types/tablet_v2/wlr_tablet_v2_pad.c
@@ -4,11 +4,11 @@
 
 #include <assert.h>
 #include <stdlib.h>
-#include <types/wlr_tablet_v2.h>
 #include <wayland-util.h>
+#include <types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_compositor.h>
-#include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/types/wlr_tablet_pad.h>
+#include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/util/log.h>
 #include "tablet-unstable-v2-protocol.h"
diff --git a/types/tablet_v2/wlr_tablet_v2_tablet.c b/types/tablet_v2/wlr_tablet_v2_tablet.c
index af374b6f0..4b793f9c2 100644
--- a/types/tablet_v2/wlr_tablet_v2_tablet.c
+++ b/types/tablet_v2/wlr_tablet_v2_tablet.c
@@ -4,13 +4,12 @@
 
 #include <assert.h>
 #include <stdlib.h>
-#include <types/wlr_tablet_v2.h>
 #include <wayland-util.h>
+#include <types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/util/log.h>
-
 #include "tablet-unstable-v2-protocol.h"
 
 void destroy_tablet_v2(struct wl_resource *resource) {
diff --git a/types/tablet_v2/wlr_tablet_v2_tool.c b/types/tablet_v2/wlr_tablet_v2_tool.c
index a5a45485f..5db01567f 100644
--- a/types/tablet_v2/wlr_tablet_v2_tool.c
+++ b/types/tablet_v2/wlr_tablet_v2_tool.c
@@ -4,8 +4,8 @@
 
 #include <assert.h>
 #include <stdlib.h>
-#include <types/wlr_tablet_v2.h>
 #include <wayland-util.h>
+#include <types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/types/wlr_tablet_v2.h>
diff --git a/types/wlr_compositor.c b/types/wlr_compositor.c
index ef05f8bb4..c12169230 100644
--- a/types/wlr_compositor.c
+++ b/types/wlr_compositor.c
@@ -5,9 +5,9 @@
 #include <wlr/types/wlr_buffer.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_matrix.h>
+#include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_region.h>
 #include <wlr/types/wlr_subcompositor.h>
-#include <wlr/types/wlr_output.h>
 #include <wlr/util/log.h>
 #include <wlr/util/region.h>
 #include <wlr/util/transform.h>
diff --git a/types/wlr_content_type_v1.c b/types/wlr_content_type_v1.c
index 36996ce98..01e038cc5 100644
--- a/types/wlr_content_type_v1.c
+++ b/types/wlr_content_type_v1.c
@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdlib.h>
-#include <wlr/types/wlr_content_type_v1.h>
 #include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_content_type_v1.h>
 
 #define CONTENT_TYPE_VERSION 1
 
diff --git a/types/wlr_cursor.c b/types/wlr_cursor.c
index 40528f138..4505d431a 100644
--- a/types/wlr_cursor.c
+++ b/types/wlr_cursor.c
@@ -5,12 +5,12 @@
 #include <math.h>
 #include <stdlib.h>
 #include <wayland-server-core.h>
+#include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_input_device.h>
-#include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_pointer.h>
-#include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/types/wlr_touch.h>
 #include <wlr/types/wlr_xcursor_manager.h>
diff --git a/types/wlr_damage_ring.c b/types/wlr_damage_ring.c
index 439cceb4b..471d0e551 100644
--- a/types/wlr_damage_ring.c
+++ b/types/wlr_damage_ring.c
@@ -1,7 +1,7 @@
 #include <limits.h>
+#include <pixman.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pixman.h>
 #include <wlr/types/wlr_damage_ring.h>
 #include <wlr/util/box.h>
 
diff --git a/types/wlr_drm.c b/types/wlr_drm.c
index a75f3042e..3641bc39e 100644
--- a/types/wlr_drm.c
+++ b/types/wlr_drm.c
@@ -10,8 +10,8 @@
 #include <wlr/types/wlr_buffer.h>
 #include <wlr/types/wlr_drm.h>
 #include <wlr/util/log.h>
-#include "drm-protocol.h"
 #include "render/drm_format_set.h"
+#include "drm-protocol.h"
 
 #define WLR_DRM_VERSION 2
 
diff --git a/types/wlr_drm_lease_v1.c b/types/wlr_drm_lease_v1.c
index 74de857dc..2f7e0dc6e 100644
--- a/types/wlr_drm_lease_v1.c
+++ b/types/wlr_drm_lease_v1.c
@@ -1,15 +1,15 @@
 #include <assert.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <wlr/backend/drm.h>
 #include <wlr/backend/multi.h>
 #include <wlr/types/wlr_drm_lease_v1.h>
 #include <wlr/util/log.h>
 #include "backend/drm/drm.h"
-#include "drm-lease-v1-protocol.h"
 #include "util/global.h"
+#include "drm-lease-v1-protocol.h"
 
 #define DRM_LEASE_DEVICE_V1_VERSION 1
 
diff --git a/types/wlr_foreign_toplevel_management_v1.c b/types/wlr_foreign_toplevel_management_v1.c
index 80b1fc5a6..9667285db 100644
--- a/types/wlr_foreign_toplevel_management_v1.c
+++ b/types/wlr_foreign_toplevel_management_v1.c
@@ -1,8 +1,8 @@
 #define _POSIX_C_SOURCE 200809L
 
 #include <assert.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_foreign_toplevel_management_v1.h>
 #include <wlr/types/wlr_seat.h>
diff --git a/types/wlr_input_method_v2.c b/types/wlr_input_method_v2.c
index 0e6a18ba8..b0c2f0373 100644
--- a/types/wlr_input_method_v2.c
+++ b/types/wlr_input_method_v2.c
@@ -3,15 +3,15 @@
 #endif
 #include <assert.h>
 #include <string.h>
-#include <sys/mman.h>
 #include <unistd.h>
 #include <wayland-util.h>
+#include <sys/mman.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_input_method_v2.h>
 #include <wlr/util/log.h>
 #include <xkbcommon/xkbcommon.h>
-#include "input-method-unstable-v2-protocol.h"
 #include "util/shm.h"
+#include "input-method-unstable-v2-protocol.h"
 
 // Note: zwp_input_popup_surface_v2 and zwp_input_method_keyboard_grab_v2 objects
 // become inert when the corresponding zwp_input_method_v2 is destroyed
diff --git a/types/wlr_keyboard.c b/types/wlr_keyboard.c
index 6aea09db6..4e9e522e9 100644
--- a/types/wlr_keyboard.c
+++ b/types/wlr_keyboard.c
@@ -1,9 +1,9 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/mman.h>
 #include <unistd.h>
 #include <wayland-server-core.h>
+#include <sys/mman.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/util/log.h>
 #include "interfaces/wlr_input_device.h"
diff --git a/types/wlr_keyboard_group.c b/types/wlr_keyboard_group.c
index b4c7e552e..77d49346e 100644
--- a/types/wlr_keyboard_group.c
+++ b/types/wlr_keyboard_group.c
@@ -1,11 +1,11 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <time.h>
 #include <wayland-server-core.h>
-#include <wayland-server-protocol.h>
 #include <xkbcommon/xkbcommon.h>
+#include <wayland-server-protocol.h>
 #include "types/wlr_keyboard.h"
 #include "wlr/interfaces/wlr_keyboard.h"
 #include "wlr/types/wlr_keyboard.h"
diff --git a/types/wlr_linux_dmabuf_v1.c b/types/wlr_linux_dmabuf_v1.c
index d018d7738..eb4159c43 100644
--- a/types/wlr_linux_dmabuf_v1.c
+++ b/types/wlr_linux_dmabuf_v1.c
@@ -3,8 +3,9 @@
 #include <drm_fourcc.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#include <sys/mman.h>
 #include <unistd.h>
+#include <xf86drm.h>
+#include <sys/mman.h>
 #include <wlr/backend.h>
 #include <wlr/interfaces/wlr_buffer.h>
 #include <wlr/render/wlr_renderer.h>
@@ -12,10 +13,9 @@
 #include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_output_layer.h>
 #include <wlr/util/log.h>
-#include <xf86drm.h>
-#include "linux-dmabuf-unstable-v1-protocol.h"
 #include "render/drm_format_set.h"
 #include "util/shm.h"
+#include "linux-dmabuf-unstable-v1-protocol.h"
 
 #define LINUX_DMABUF_VERSION 4
 
diff --git a/types/wlr_matrix.c b/types/wlr_matrix.c
index 7b6671f57..41bdd65ca 100644
--- a/types/wlr_matrix.c
+++ b/types/wlr_matrix.c
@@ -1,9 +1,9 @@
 #include <math.h>
 #include <string.h>
-#include <wayland-server-protocol.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/util/box.h>
+#include <wayland-server-protocol.h>
 #include "types/wlr_matrix.h"
 
 void wlr_matrix_identity(float mat[static 9]) {
diff --git a/types/wlr_output_layout.c b/types/wlr_output_layout.c
index fa96e74a7..11671b577 100644
--- a/types/wlr_output_layout.c
+++ b/types/wlr_output_layout.c
@@ -2,8 +2,8 @@
 #include <float.h>
 #include <limits.h>
 #include <stdlib.h>
-#include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_output_layout.h>
 #include <wlr/util/box.h>
 #include <wlr/util/log.h>
 
diff --git a/types/wlr_output_power_management_v1.c b/types/wlr_output_power_management_v1.c
index 763d0d6af..087950941 100644
--- a/types/wlr_output_power_management_v1.c
+++ b/types/wlr_output_power_management_v1.c
@@ -4,8 +4,8 @@
 #include <unistd.h>
 #include <wayland-server-core.h>
 #include <wlr/interfaces/wlr_output.h>
-#include <wlr/types/wlr_output_power_management_v1.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_output_power_management_v1.h>
 #include <wlr/util/log.h>
 #include "wlr-output-power-management-unstable-v1-protocol.h"
 
diff --git a/types/wlr_primary_selection_v1.c b/types/wlr_primary_selection_v1.c
index af232ef7c..204056620 100644
--- a/types/wlr_primary_selection_v1.c
+++ b/types/wlr_primary_selection_v1.c
@@ -4,8 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <wlr/types/wlr_primary_selection_v1.h>
 #include <wlr/types/wlr_primary_selection.h>
+#include <wlr/types/wlr_primary_selection_v1.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/util/log.h>
 #include "primary-selection-unstable-v1-protocol.h"
diff --git a/types/wlr_region.c b/types/wlr_region.c
index a88682785..c6ae7d5b5 100644
--- a/types/wlr_region.c
+++ b/types/wlr_region.c
@@ -2,8 +2,8 @@
 #include <pixman.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <wayland-server-protocol.h>
 #include <wlr/types/wlr_region.h>
+#include <wayland-server-protocol.h>
 #include "types/wlr_region.h"
 
 static const struct wl_region_interface region_impl;
diff --git a/types/wlr_screencopy_v1.c b/types/wlr_screencopy_v1.c
index 0e91abe17..942eed284 100644
--- a/types/wlr_screencopy_v1.c
+++ b/types/wlr_screencopy_v1.c
@@ -1,18 +1,18 @@
 #include <assert.h>
-#include <stdlib.h>
 #include <drm_fourcc.h>
+#include <stdlib.h>
+#include <wlr/backend.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/render/allocator.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_screencopy_v1.h>
-#include <wlr/backend.h>
 #include <wlr/util/box.h>
 #include <wlr/util/log.h>
 #include <wlr/util/transform.h>
-#include "wlr-screencopy-unstable-v1-protocol.h"
 #include "render/pixel_format.h"
 #include "render/wlr_renderer.h"
+#include "wlr-screencopy-unstable-v1-protocol.h"
 
 #define SCREENCOPY_MANAGER_VERSION 3
 
diff --git a/types/wlr_security_context_v1.c b/types/wlr_security_context_v1.c
index c675e9b80..ed70a0676 100644
--- a/types/wlr_security_context_v1.c
+++ b/types/wlr_security_context_v1.c
@@ -2,9 +2,9 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <wlr/types/wlr_security_context_v1.h>
 #include <wlr/util/log.h>
 #include "security-context-v1-protocol.h"
diff --git a/types/wlr_session_lock_v1.c b/types/wlr_session_lock_v1.c
index b2c297ed6..5e8db321f 100644
--- a/types/wlr_session_lock_v1.c
+++ b/types/wlr_session_lock_v1.c
@@ -2,9 +2,9 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_session_lock_v1.h>
-#include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_session_lock_v1.h>
 #include <wlr/util/log.h>
 #include "ext-session-lock-v1-protocol.h"
 
diff --git a/types/wlr_shm.c b/types/wlr_shm.c
index ac41e87e8..aeea3fcab 100644
--- a/types/wlr_shm.c
+++ b/types/wlr_shm.c
@@ -4,9 +4,9 @@
 #include <signal.h>
 #include <stdatomic.h>
 #include <stdlib.h>
-#include <sys/mman.h>
 #include <unistd.h>
 #include <wayland-server.h>
+#include <sys/mman.h>
 #include <wlr/interfaces/wlr_buffer.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_shm.h>
diff --git a/types/wlr_text_input_v3.c b/types/wlr_text_input_v3.c
index 11944f26a..6f2efbbce 100644
--- a/types/wlr_text_input_v3.c
+++ b/types/wlr_text_input_v3.c
@@ -2,8 +2,8 @@
 #define _POSIX_C_SOURCE 200809L
 #endif
 #include <assert.h>
-#include <stdlib.h>
 #include <stddef.h>
+#include <stdlib.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_text_input_v3.h>
 #include <wlr/util/log.h>
diff --git a/types/wlr_virtual_pointer_v1.c b/types/wlr_virtual_pointer_v1.c
index 6fcd0e940..c7b50bd70 100644
--- a/types/wlr_virtual_pointer_v1.c
+++ b/types/wlr_virtual_pointer_v1.c
@@ -1,9 +1,9 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <wlr/interfaces/wlr_pointer.h>
+#include <wlr/types/wlr_pointer.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/types/wlr_virtual_pointer_v1.h>
-#include <wlr/types/wlr_pointer.h>
 #include <wlr/util/log.h>
 #include "wlr-virtual-pointer-unstable-v1-protocol.h"
 
diff --git a/types/wlr_xdg_foreign_registry.c b/types/wlr_xdg_foreign_registry.c
index c27d84069..9d86fc9f1 100644
--- a/types/wlr_xdg_foreign_registry.c
+++ b/types/wlr_xdg_foreign_registry.c
@@ -1,8 +1,8 @@
-#include <wlr/types/wlr_xdg_foreign_registry.h>
-#include "util/token.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <wlr/types/wlr_xdg_foreign_registry.h>
+#include "util/token.h"
 
 bool wlr_xdg_foreign_exported_init(
 		struct wlr_xdg_foreign_exported *exported,
diff --git a/types/wlr_xdg_foreign_v1.c b/types/wlr_xdg_foreign_v1.c
index d4bcc6a73..b4ade4bc3 100644
--- a/types/wlr_xdg_foreign_v1.c
+++ b/types/wlr_xdg_foreign_v1.c
@@ -1,8 +1,8 @@
 #define _POSIX_C_SOURCE 200809L
 
 #include <assert.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <wlr/types/wlr_xdg_foreign_v1.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>
diff --git a/types/wlr_xdg_foreign_v2.c b/types/wlr_xdg_foreign_v2.c
index f600d5337..8f3636de9 100644
--- a/types/wlr_xdg_foreign_v2.c
+++ b/types/wlr_xdg_foreign_v2.c
@@ -1,8 +1,8 @@
 #define _POSIX_C_SOURCE 200809L
 
 #include <assert.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <wlr/types/wlr_xdg_foreign_v2.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>
diff --git a/types/wlr_xdg_output_v1.c b/types/wlr_xdg_output_v1.c
index 895a0f0aa..dce2f3811 100644
--- a/types/wlr_xdg_output_v1.c
+++ b/types/wlr_xdg_output_v1.c
@@ -1,8 +1,8 @@
 #include <assert.h>
-#include <stdlib.h>
 #include <stdio.h>
-#include <wlr/types/wlr_output_layout.h>
+#include <stdlib.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_xdg_output_v1.h>
 #include <wlr/util/log.h>
 #include "xdg-output-unstable-v1-protocol.h"
diff --git a/types/xdg_shell/wlr_xdg_toplevel.c b/types/xdg_shell/wlr_xdg_toplevel.c
index 3fe49c5a4..a4f5c83f2 100644
--- a/types/xdg_shell/wlr_xdg_toplevel.c
+++ b/types/xdg_shell/wlr_xdg_toplevel.c
@@ -2,8 +2,8 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wlr/util/log.h>
 #include <wlr/util/edges.h>
+#include <wlr/util/log.h>
 #include "types/wlr_xdg_shell.h"
 #include "util/utf8.h"
 
diff --git a/util/array.c b/util/array.c
index ec16a7b13..1eacaccd8 100644
--- a/util/array.c
+++ b/util/array.c
@@ -1,6 +1,6 @@
-#include "util/array.h"
 #include <assert.h>
 #include <string.h>
+#include "util/array.h"
 
 void array_remove_at(struct wl_array *arr, size_t offset, size_t size) {
 	assert(arr->size >= offset + size);
diff --git a/util/region.c b/util/region.c
index b74c55e54..5c16afeae 100644
--- a/util/region.c
+++ b/util/region.c
@@ -1,6 +1,6 @@
 #include <assert.h>
-#include <math.h>
 #include <limits.h>
+#include <math.h>
 #include <stdlib.h>
 #include <wlr/util/region.h>
 
diff --git a/util/shm.c b/util/shm.c
index 6fddebbb8..ce66b5ca2 100644
--- a/util/shm.c
+++ b/util/shm.c
@@ -2,10 +2,10 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
 #include <wlr/config.h>
 #include "util/shm.h"
 
diff --git a/util/token.c b/util/token.c
index 09702e55f..018ae3cea 100644
--- a/util/token.c
+++ b/util/token.c
@@ -1,15 +1,14 @@
 #define _POSIX_C_SOURCE 200809L
-#include "util/token.h"
-#include "wlr/util/log.h"
-
 #include <fcntl.h>
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include "util/token.h"
+#include "wlr/util/log.h"
 
 bool generate_token(char out[static TOKEN_SIZE]) {
 	static FILE *urandom = NULL;
diff --git a/xcursor/wlr_xcursor.c b/xcursor/wlr_xcursor.c
index a946efdf3..0b1594cb9 100644
--- a/xcursor/wlr_xcursor.c
+++ b/xcursor/wlr_xcursor.c
@@ -28,8 +28,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wlr/util/log.h>
 #include <wlr/xcursor.h>
+#include <wlr/util/log.h>
 #include "xcursor/xcursor.h"
 
 static void xcursor_destroy(struct wlr_xcursor *cursor) {
diff --git a/xcursor/xcursor.c b/xcursor/xcursor.c
index 7e1f310fc..e6b829200 100644
--- a/xcursor/xcursor.c
+++ b/xcursor/xcursor.c
@@ -24,11 +24,11 @@
  */
 
 #define _DEFAULT_SOURCE
+#include <dirent.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <dirent.h>
 #include "config.h"
 #include "xcursor/xcursor.h"
 
diff --git a/xwayland/selection/dnd.c b/xwayland/selection/dnd.c
index 1c053e5e5..72cde63be 100644
--- a/xwayland/selection/dnd.c
+++ b/xwayland/selection/dnd.c
@@ -6,8 +6,8 @@
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/util/log.h>
 #include <xcb/xfixes.h>
-#include "xwayland/xwm.h"
 #include "xwayland/selection.h"
+#include "xwayland/xwm.h"
 
 static xcb_atom_t data_device_manager_dnd_action_to_atom(
 		struct wlr_xwm *xwm, enum wl_data_device_manager_dnd_action action) {
diff --git a/xwayland/server.c b/xwayland/server.c
index fde3d610b..134a7f153 100644
--- a/xwayland/server.c
+++ b/xwayland/server.c
@@ -5,16 +5,15 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdlib.h>
 #include <stdnoreturn.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
 #include <wayland-server-core.h>
-#include <wlr/util/log.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <wlr/xwayland.h>
+#include <wlr/util/log.h>
 #include "config.h"
 #include "sockets.h"
 
diff --git a/xwayland/sockets.c b/xwayland/sockets.c
index 873fde8db..3ca88e2e6 100644
--- a/xwayland/sockets.c
+++ b/xwayland/sockets.c
@@ -6,11 +6,11 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/un.h>
-#include <unistd.h>
 #include <wlr/util/log.h>
 #include "sockets.h"
 
diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c
index 0ffc1fefe..254be3950 100644
--- a/xwayland/xwayland.c
+++ b/xwayland/xwayland.c
@@ -5,12 +5,11 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <time.h>
-#include <unistd.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/util/log.h>
 #include <wlr/xwayland/shell.h>
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index e744565ad..51f02fa03 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -5,12 +5,12 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <wlr/config.h>
+#include <wlr/xcursor.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_primary_selection.h>
 #include <wlr/util/edges.h>
 #include <wlr/util/log.h>
-#include <wlr/xcursor.h>
 #include <wlr/xwayland/shell.h>
 #include <wlr/xwayland/xwayland.h>
 #include <xcb/composite.h>