diff --git a/common/stringop.c b/common/stringop.c
index c503143ae..b497caec2 100644
--- a/common/stringop.c
+++ b/common/stringop.c
@@ -1,6 +1,5 @@
 #define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
-#include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/include/cairo_util.h b/include/cairo_util.h
index dc049c6dc..6fd0adc99 100644
--- a/include/cairo_util.h
+++ b/include/cairo_util.h
@@ -1,9 +1,9 @@
 #ifndef _SWAY_CAIRO_UTIL_H
 #define _SWAY_CAIRO_UTIL_H
-#include "config.h"
-#include <stdint.h>
 #include <cairo.h>
+#include <stdint.h>
 #include <wayland-client-protocol.h>
+#include "config.h"
 
 void cairo_set_source_u32(cairo_t *cairo, uint32_t color);
 cairo_subpixel_order_t to_cairo_subpixel_order(enum wl_output_subpixel subpixel);
diff --git a/include/ipc-client.h b/include/ipc-client.h
index 9c5712d73..6d2f56db7 100644
--- a/include/ipc-client.h
+++ b/include/ipc-client.h
@@ -7,7 +7,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/time.h>
-
 #include "ipc.h"
 
 /**
diff --git a/include/log.h b/include/log.h
index 41399a9fa..f96e5a37d 100644
--- a/include/log.h
+++ b/include/log.h
@@ -1,10 +1,10 @@
 #ifndef _SWAY_LOG_H
 #define _SWAY_LOG_H
 
-#include <stdbool.h>
-#include <stdarg.h>
-#include <string.h>
 #include <errno.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <string.h>
 
 typedef enum {
 	SWAY_SILENT = 0,
diff --git a/include/pango.h b/include/pango.h
index 228e39cfa..05da23110 100644
--- a/include/pango.h
+++ b/include/pango.h
@@ -1,9 +1,9 @@
 #ifndef _SWAY_PANGO_H
 #define _SWAY_PANGO_H
+#include <cairo.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <cairo.h>
 #include <pango/pangocairo.h>
 #include "stringop.h"
 
diff --git a/include/pool-buffer.h b/include/pool-buffer.h
index b7a95afe9..eab8d9bf7 100644
--- a/include/pool-buffer.h
+++ b/include/pool-buffer.h
@@ -1,10 +1,10 @@
 #ifndef _SWAY_BUFFERS_H
 #define _SWAY_BUFFERS_H
 #include <cairo.h>
-#include <pango/pangocairo.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <wayland-client.h>
+#include <pango/pangocairo.h>
 
 struct pool_buffer {
 	struct wl_buffer *buffer;
diff --git a/include/stringop.h b/include/stringop.h
index 19a50f237..89a0f12f5 100644
--- a/include/stringop.h
+++ b/include/stringop.h
@@ -1,6 +1,7 @@
 #ifndef _SWAY_STRINGOP_H
 #define _SWAY_STRINGOP_H
 
+#include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include "list.h"
diff --git a/include/sway/config.h b/include/sway/config.h
index f9da19675..d4ecaa7e9 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -4,21 +4,21 @@
 #include <stdint.h>
 #include <string.h>
 #include <time.h>
+#include <xf86drmMode.h>
+#include <pango/pangocairo.h>
 #include <wlr/interfaces/wlr_switch.h>
 #include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/util/box.h>
 #include <xkbcommon/xkbcommon.h>
-#include <xf86drmMode.h>
-#include "../include/config.h"
 #include "gesture.h"
 #include "list.h"
 #include "stringop.h"
 #include "swaynag.h"
-#include "tree/container.h"
+#include "../include/config.h"
 #include "sway/input/tablet.h"
 #include "sway/tree/root.h"
+#include "tree/container.h"
 #include "wlr-layer-shell-unstable-v1-protocol.h"
-#include <pango/pangocairo.h>
 
 // TODO: Refactor this shit
 
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index 1e21c66fe..ea5209789 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -2,11 +2,11 @@
 #define _SWAY_INPUT_CURSOR_H
 #include <stdbool.h>
 #include <stdint.h>
+#include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>
 #include <wlr/types/wlr_pointer_gestures_v1.h>
-#include <wlr/types/wlr_compositor.h>
-#include "sway/input/seat.h"
 #include "config.h"
+#include "sway/input/seat.h"
 
 #define SWAY_CURSOR_PRESSED_BUTTONS_CAP 32
 
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h
index 145edd4b6..437af130c 100644
--- a/include/sway/input/input-manager.h
+++ b/include/sway/input/input-manager.h
@@ -4,9 +4,9 @@
 #include <wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h>
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
 #include <wlr/types/wlr_virtual_pointer_v1.h>
-#include "sway/server.h"
-#include "sway/config.h"
 #include "list.h"
+#include "sway/config.h"
+#include "sway/server.h"
 
 struct sway_input_device {
 	char *identifier;
diff --git a/include/sway/input/text_input.h b/include/sway/input/text_input.h
index 214e61d12..0f04485af 100644
--- a/include/sway/input/text_input.h
+++ b/include/sway/input/text_input.h
@@ -1,9 +1,9 @@
 #ifndef _SWAY_INPUT_TEXT_INPUT_H
 #define _SWAY_INPUT_TEXT_INPUT_H
 
-#include <wlr/types/wlr_text_input_v3.h>
-#include <wlr/types/wlr_input_method_v2.h>
 #include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_input_method_v2.h>
+#include <wlr/types/wlr_text_input_v3.h>
 
 /**
  * The relay structure manages the relationship between text-input and
diff --git a/include/sway/ipc-json.h b/include/sway/ipc-json.h
index bc9f49856..fa9739cb0 100644
--- a/include/sway/ipc-json.h
+++ b/include/sway/ipc-json.h
@@ -2,8 +2,8 @@
 #define _SWAY_IPC_JSON_H
 #include <json.h>
 #include "sway/output.h"
-#include "sway/tree/container.h"
 #include "sway/input/input-manager.h"
+#include "sway/tree/container.h"
 
 json_object *ipc_json_get_version(void);
 
diff --git a/include/sway/ipc-server.h b/include/sway/ipc-server.h
index d4c009427..79997db29 100644
--- a/include/sway/ipc-server.h
+++ b/include/sway/ipc-server.h
@@ -1,10 +1,10 @@
 #ifndef _SWAY_IPC_SERVER_H
 #define _SWAY_IPC_SERVER_H
 #include <sys/socket.h>
+#include "ipc.h"
 #include "sway/config.h"
 #include "sway/input/input-manager.h"
 #include "sway/tree/container.h"
-#include "ipc.h"
 
 struct sway_server;
 
diff --git a/include/sway/server.h b/include/sway/server.h
index bf195706b..97b17cb0a 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -7,16 +7,16 @@
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_input_method_v2.h>
-#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
 #include <wlr/types/wlr_drm_lease_v1.h>
+#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
+#include <wlr/types/wlr_input_method_v2.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_output_management_v1.h>
 #include <wlr/types/wlr_output_power_management_v1.h>
 #include <wlr/types/wlr_presentation_time.h>
 #include <wlr/types/wlr_relative_pointer_v1.h>
-#include <wlr/types/wlr_session_lock_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
+#include <wlr/types/wlr_session_lock_v1.h>
 #include <wlr/types/wlr_text_input_v3.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include "config.h"
diff --git a/include/sway/tree/node.h b/include/sway/tree/node.h
index 03a389a48..2a069b00f 100644
--- a/include/sway/tree/node.h
+++ b/include/sway/tree/node.h
@@ -1,7 +1,7 @@
 #ifndef _SWAY_NODE_H
 #define _SWAY_NODE_H
-#include <wayland-server-core.h>
 #include <stdbool.h>
+#include <wayland-server-core.h>
 #include "list.h"
 
 #define MIN_SANE_W 100
diff --git a/include/sway/tree/root.h b/include/sway/tree/root.h
index b3dda12f9..33c5b23b0 100644
--- a/include/sway/tree/root.h
+++ b/include/sway/tree/root.h
@@ -2,12 +2,12 @@
 #define _SWAY_ROOT_H
 #include <wayland-server-core.h>
 #include <wayland-util.h>
-#include <wlr/types/wlr_output_layout.h>
 #include <wlr/render/wlr_texture.h>
-#include "sway/tree/container.h"
-#include "sway/tree/node.h"
+#include <wlr/types/wlr_output_layout.h>
 #include "config.h"
 #include "list.h"
+#include "sway/tree/container.h"
+#include "sway/tree/node.h"
 
 extern struct sway_root *root;
 
diff --git a/include/swaybar/config.h b/include/swaybar/config.h
index 361acd991..fc630496d 100644
--- a/include/swaybar/config.h
+++ b/include/swaybar/config.h
@@ -3,10 +3,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <wayland-client.h>
-#include "../include/config.h"
+#include <pango/pangocairo.h>
 #include "list.h"
 #include "util.h"
-#include <pango/pangocairo.h>
+#include "../include/config.h"
 
 struct box_colors {
 	uint32_t border;
diff --git a/include/swaybar/input.h b/include/swaybar/input.h
index 8ea88a69a..cc4a22957 100644
--- a/include/swaybar/input.h
+++ b/include/swaybar/input.h
@@ -1,8 +1,8 @@
 #ifndef _SWAYBAR_INPUT_H
 #define _SWAYBAR_INPUT_H
 
-#include <wayland-client.h>
 #include <stdbool.h>
+#include <wayland-client.h>
 #include "list.h"
 
 #define SWAY_SCROLL_UP KEY_MAX + 1
diff --git a/include/swaybar/status_line.h b/include/swaybar/status_line.h
index 65c3a7969..d84bd88be 100644
--- a/include/swaybar/status_line.h
+++ b/include/swaybar/status_line.h
@@ -1,9 +1,9 @@
 #ifndef _SWAYBAR_STATUS_LINE_H
 #define _SWAYBAR_STATUS_LINE_H
 #include <json.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdbool.h>
 #include "bar.h"
 
 enum status_protocol {
diff --git a/include/swaybar/tray/item.h b/include/swaybar/tray/item.h
index 73937a0cc..bf1586d8f 100644
--- a/include/swaybar/tray/item.h
+++ b/include/swaybar/tray/item.h
@@ -5,8 +5,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <wayland-util.h>
-#include "swaybar/tray/tray.h"
 #include "list.h"
+#include "swaybar/tray/tray.h"
 
 struct swaybar_output;
 
diff --git a/include/swaybar/tray/watcher.h b/include/swaybar/tray/watcher.h
index 8f276da8e..397c98900 100644
--- a/include/swaybar/tray/watcher.h
+++ b/include/swaybar/tray/watcher.h
@@ -1,8 +1,8 @@
 #ifndef _SWAYBAR_TRAY_WATCHER_H
 #define _SWAYBAR_TRAY_WATCHER_H
 
-#include "swaybar/tray/tray.h"
 #include "list.h"
+#include "swaybar/tray/tray.h"
 
 struct swaybar_watcher {
 	char *interface;
diff --git a/include/swaynag/config.h b/include/swaynag/config.h
index 0d8889de0..d11190c59 100644
--- a/include/swaynag/config.h
+++ b/include/swaynag/config.h
@@ -1,7 +1,7 @@
 #ifndef _SWAYNAG_CONFIG_H
 #define _SWAYNAG_CONFIG_H
-#include "swaynag/swaynag.h"
 #include "list.h"
+#include "swaynag/swaynag.h"
 
 int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
 		list_t *types, struct swaynag_type *type, char **config, bool *debug);
diff --git a/include/swaynag/swaynag.h b/include/swaynag/swaynag.h
index fb9e9c218..5b5d97b7f 100644
--- a/include/swaynag/swaynag.h
+++ b/include/swaynag/swaynag.h
@@ -4,9 +4,8 @@
 #include <strings.h>
 #include "list.h"
 #include "pool-buffer.h"
-#include "cursor-shape-v1-client-protocol.h"
-
 #include "swaynag/types.h"
+#include "cursor-shape-v1-client-protocol.h"
 
 #define SWAYNAG_MAX_HEIGHT 500
 
diff --git a/include/util.h b/include/util.h
index f887d4895..67fbd2d6f 100644
--- a/include/util.h
+++ b/include/util.h
@@ -1,8 +1,8 @@
 #ifndef _SWAY_UTIL_H
 #define _SWAY_UTIL_H
 
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <wayland-server-protocol.h>
 
 enum movement_unit {
diff --git a/sway/commands.c b/sway/commands.c
index 55eda183c..23ef45018 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -1,19 +1,19 @@
 #define _POSIX_C_SOURCE 200809
 #include <ctype.h>
+#include <json.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <stdio.h>
-#include <json.h>
+#include "log.h"
+#include "stringop.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/criteria.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
 #include "sway/tree/view.h"
-#include "stringop.h"
-#include "log.h"
 
 // Returns error object, or NULL if check succeeds.
 struct cmd_results *checkarg(int argc, const char *name, enum expected_args type, int val) {
diff --git a/sway/commands/assign.c b/sway/commands/assign.c
index f7d911f77..8f8f4abec 100644
--- a/sway/commands/assign.c
+++ b/sway/commands/assign.c
@@ -1,11 +1,11 @@
 #define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <string.h>
-#include "sway/commands.h"
-#include "sway/criteria.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"
+#include "sway/commands.h"
+#include "sway/criteria.h"
 
 struct cmd_results *cmd_assign(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar.c b/sway/commands/bar.c
index 22756acbf..df1b5b74f 100644
--- a/sway/commands/bar.c
+++ b/sway/commands/bar.c
@@ -2,10 +2,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/ipc-server.h"
-#include "log.h"
 
 // Must be in alphabetical order for bsearch
 static const struct cmd_handler bar_handlers[] = {
diff --git a/sway/commands/bar/bind.c b/sway/commands/bar/bind.c
index 8a837e3f1..72c103bb3 100644
--- a/sway/commands/bar/bind.c
+++ b/sway/commands/bar/bind.c
@@ -1,13 +1,13 @@
-#include <libevdev/libevdev.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include "sway/commands.h"
-#include "sway/config.h"
-#include "sway/input/cursor.h"
+#include <libevdev/libevdev.h>
 #include "list.h"
 #include "log.h"
 #include "stringop.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/cursor.h"
 
 static struct cmd_results *binding_add(struct bar_binding *binding,
 		list_t *mode_bindings) {
diff --git a/sway/commands/bar/binding_mode_indicator.c b/sway/commands/bar/binding_mode_indicator.c
index b58d8a838..67222f733 100644
--- a/sway/commands/bar/binding_mode_indicator.c
+++ b/sway/commands/bar/binding_mode_indicator.c
@@ -1,8 +1,8 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/commands.h"
 #include "log.h"
 #include "util.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_binding_mode_indicator(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/colors.c b/sway/commands/bar/colors.c
index 275fa3c64..43c95bd3b 100644
--- a/sway/commands/bar/colors.c
+++ b/sway/commands/bar/colors.c
@@ -1,7 +1,7 @@
 #include <string.h>
-#include "sway/commands.h"
 #include "log.h"
 #include "util.h"
+#include "sway/commands.h"
 
 // Must be in alphabetical order for bsearch
 static const struct cmd_handler bar_colors_handlers[] = {
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c
index 891c87af8..2255c171c 100644
--- a/sway/commands/bar/font.c
+++ b/sway/commands/bar/font.c
@@ -1,8 +1,8 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
-#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_font(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/gaps.c b/sway/commands/bar/gaps.c
index 9fa3e756a..112abd475 100644
--- a/sway/commands/bar/gaps.c
+++ b/sway/commands/bar/gaps.c
@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/ipc-server.h"
-#include "log.h"
 
 struct cmd_results *bar_cmd_gaps(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/height.c b/sway/commands/bar/height.c
index 945eb7071..6124ec8c5 100644
--- a/sway/commands/bar/height.c
+++ b/sway/commands/bar/height.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
-#include "sway/commands.h"
 #include "log.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_height(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/hidden_state.c b/sway/commands/bar/hidden_state.c
index 8b661e3a1..afa50d158 100644
--- a/sway/commands/bar/hidden_state.c
+++ b/sway/commands/bar/hidden_state.c
@@ -1,10 +1,10 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/ipc-server.h"
-#include "log.h"
 
 static struct cmd_results *bar_set_hidden_state(struct bar_config *bar,
 		const char *hidden_state) {
diff --git a/sway/commands/bar/icon_theme.c b/sway/commands/bar/icon_theme.c
index 6ac07843d..7c67d6baf 100644
--- a/sway/commands/bar/icon_theme.c
+++ b/sway/commands/bar/icon_theme.c
@@ -1,9 +1,9 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "config.h"
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
-#include "log.h"
 
 struct cmd_results *bar_cmd_icon_theme(int argc, char **argv) {
 #if HAVE_TRAY
diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c
index a9a617430..1fedb1062 100644
--- a/sway/commands/bar/id.c
+++ b/sway/commands/bar/id.c
@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
-#include "sway/commands.h"
 #include "log.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_id(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c
index 7c2f423bb..acc5392e0 100644
--- a/sway/commands/bar/mode.c
+++ b/sway/commands/bar/mode.c
@@ -1,10 +1,10 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/ipc-server.h"
-#include "log.h"
 
 static struct cmd_results *bar_set_mode(struct bar_config *bar, const char *mode) {
 	char *old_mode = bar->mode;
diff --git a/sway/commands/bar/modifier.c b/sway/commands/bar/modifier.c
index 983d21795..9c4fa5706 100644
--- a/sway/commands/bar/modifier.c
+++ b/sway/commands/bar/modifier.c
@@ -1,8 +1,8 @@
 #include <string.h>
-#include "sway/commands.h"
-#include "sway/input/keyboard.h"
 #include "log.h"
 #include "stringop.h"
+#include "sway/commands.h"
+#include "sway/input/keyboard.h"
 
 struct cmd_results *bar_cmd_modifier(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/output.c b/sway/commands/bar/output.c
index cac1d0568..378040d90 100644
--- a/sway/commands/bar/output.c
+++ b/sway/commands/bar/output.c
@@ -1,9 +1,9 @@
 #define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <string.h>
-#include "sway/commands.h"
 #include "list.h"
 #include "log.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_output(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/pango_markup.c b/sway/commands/bar/pango_markup.c
index ee51390da..03b459d04 100644
--- a/sway/commands/bar/pango_markup.c
+++ b/sway/commands/bar/pango_markup.c
@@ -1,8 +1,8 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/commands.h"
 #include "log.h"
 #include "util.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/position.c b/sway/commands/bar/position.c
index b207de0bf..22bfa639e 100644
--- a/sway/commands/bar/position.c
+++ b/sway/commands/bar/position.c
@@ -1,8 +1,8 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
-#include "sway/commands.h"
 #include "log.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_position(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/separator_symbol.c b/sway/commands/bar/separator_symbol.c
index 6737d4d24..3471acbdc 100644
--- a/sway/commands/bar/separator_symbol.c
+++ b/sway/commands/bar/separator_symbol.c
@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
-#include "sway/commands.h"
 #include "log.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_separator_symbol(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/status_command.c b/sway/commands/bar/status_command.c
index bb92e8e07..70025bcb7 100644
--- a/sway/commands/bar/status_command.c
+++ b/sway/commands/bar/status_command.c
@@ -1,7 +1,7 @@
 #include <string.h>
-#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_status_command(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/status_edge_padding.c b/sway/commands/bar/status_edge_padding.c
index 75ef86f09..52bba2c8e 100644
--- a/sway/commands/bar/status_edge_padding.c
+++ b/sway/commands/bar/status_edge_padding.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
-#include "sway/commands.h"
 #include "log.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_status_edge_padding(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/status_padding.c b/sway/commands/bar/status_padding.c
index 0c65e516e..c2e8df619 100644
--- a/sway/commands/bar/status_padding.c
+++ b/sway/commands/bar/status_padding.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
-#include "sway/commands.h"
 #include "log.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_status_padding(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/strip_workspace_name.c b/sway/commands/bar/strip_workspace_name.c
index 764321a89..43e8e7c45 100644
--- a/sway/commands/bar/strip_workspace_name.c
+++ b/sway/commands/bar/strip_workspace_name.c
@@ -1,8 +1,8 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/commands.h"
 #include "log.h"
 #include "util.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_strip_workspace_name(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/strip_workspace_numbers.c b/sway/commands/bar/strip_workspace_numbers.c
index 2d7fe1a7f..912f24639 100644
--- a/sway/commands/bar/strip_workspace_numbers.c
+++ b/sway/commands/bar/strip_workspace_numbers.c
@@ -1,8 +1,8 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/commands.h"
 #include "log.h"
 #include "util.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_strip_workspace_numbers(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/swaybar_command.c b/sway/commands/bar/swaybar_command.c
index 0892a898a..c91cd93d1 100644
--- a/sway/commands/bar/swaybar_command.c
+++ b/sway/commands/bar/swaybar_command.c
@@ -1,7 +1,7 @@
 #include <string.h>
-#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_swaybar_command(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/tray_bind.c b/sway/commands/bar/tray_bind.c
index 3dc9bc4cc..80f0261f8 100644
--- a/sway/commands/bar/tray_bind.c
+++ b/sway/commands/bar/tray_bind.c
@@ -1,9 +1,9 @@
 #include <strings.h>
 #include "config.h"
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/input/cursor.h"
-#include "log.h"
 
 static struct cmd_results *tray_bind(int argc, char **argv, bool code) {
 #if HAVE_TRAY
diff --git a/sway/commands/bar/tray_output.c b/sway/commands/bar/tray_output.c
index eb3b486e2..b135e5a76 100644
--- a/sway/commands/bar/tray_output.c
+++ b/sway/commands/bar/tray_output.c
@@ -1,10 +1,10 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "config.h"
-#include "sway/commands.h"
-#include "sway/config.h"
 #include "list.h"
 #include "log.h"
+#include "sway/commands.h"
+#include "sway/config.h"
 
 struct cmd_results *bar_cmd_tray_output(int argc, char **argv) {
 #if HAVE_TRAY
diff --git a/sway/commands/bar/tray_padding.c b/sway/commands/bar/tray_padding.c
index f90b6003f..bc28be7fe 100644
--- a/sway/commands/bar/tray_padding.c
+++ b/sway/commands/bar/tray_padding.c
@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <strings.h>
 #include "config.h"
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
-#include "log.h"
 
 struct cmd_results *bar_cmd_tray_padding(int argc, char **argv) {
 #if HAVE_TRAY
diff --git a/sway/commands/bar/workspace_buttons.c b/sway/commands/bar/workspace_buttons.c
index 6bfb16165..0619d24ba 100644
--- a/sway/commands/bar/workspace_buttons.c
+++ b/sway/commands/bar/workspace_buttons.c
@@ -1,8 +1,8 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/commands.h"
 #include "log.h"
 #include "util.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/workspace_min_width.c b/sway/commands/bar/workspace_min_width.c
index 8d65592ca..48d6161ad 100644
--- a/sway/commands/bar/workspace_min_width.c
+++ b/sway/commands/bar/workspace_min_width.c
@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <strings.h>
 #include "config.h"
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
-#include "log.h"
 
 struct cmd_results *bar_cmd_workspace_min_width(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/wrap_scroll.c b/sway/commands/bar/wrap_scroll.c
index f57e393df..fa636fc50 100644
--- a/sway/commands/bar/wrap_scroll.c
+++ b/sway/commands/bar/wrap_scroll.c
@@ -1,8 +1,8 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/commands.h"
 #include "log.h"
 #include "util.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_wrap_scroll(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index 979e178fd..d2370a475 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -1,21 +1,21 @@
 #define _POSIX_C_SOURCE 200809L
-#include <libevdev/libevdev.h>
-#include <linux/input-event-codes.h>
 #include <string.h>
 #include <strings.h>
-#include <xkbcommon/xkbcommon.h>
-#include <xkbcommon/xkbcommon-names.h>
+#include <libevdev/libevdev.h>
+#include <linux/input-event-codes.h>
 #include <wlr/types/wlr_cursor.h>
-#include "sway/commands.h"
-#include "sway/config.h"
-#include "sway/desktop/transaction.h"
-#include "sway/input/cursor.h"
-#include "sway/input/keyboard.h"
-#include "sway/ipc-server.h"
+#include <xkbcommon/xkbcommon-names.h>
+#include <xkbcommon/xkbcommon.h>
 #include "list.h"
 #include "log.h"
 #include "stringop.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/ipc-server.h"
+#include "sway/desktop/transaction.h"
+#include "sway/input/cursor.h"
+#include "sway/input/keyboard.h"
 
 int binding_order = 0;
 
diff --git a/sway/commands/client.c b/sway/commands/client.c
index 772631456..c519a5d6f 100644
--- a/sway/commands/client.c
+++ b/sway/commands/client.c
@@ -1,9 +1,9 @@
 #include "log.h"
+#include "util.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/output.h"
 #include "sway/tree/container.h"
-#include "util.h"
 
 static void rebuild_textures_iterator(struct sway_container *con, void *data) {
 	container_update_marks_textures(con);
diff --git a/sway/commands/exec.c b/sway/commands/exec.c
index 2c6f3d2d5..ab85aff53 100644
--- a/sway/commands/exec.c
+++ b/sway/commands/exec.c
@@ -1,8 +1,8 @@
 #include <string.h>
-#include "sway/commands.h"
-#include "sway/config.h"
 #include "log.h"
 #include "stringop.h"
+#include "sway/commands.h"
+#include "sway/config.h"
 
 struct cmd_results *cmd_exec(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index 8fca19093..ed9dcd7c9 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -1,10 +1,12 @@
 #define _POSIX_C_SOURCE 200809L
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <unistd.h>
 #include <signal.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/wait.h>
+#include "log.h"
+#include "stringop.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/server.h"
@@ -12,8 +14,6 @@
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
 #include "sway/tree/workspace.h"
-#include "log.h"
-#include "stringop.h"
 
 struct cmd_results *cmd_exec_validate(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/floating.c b/sway/commands/floating.c
index 74f6522c7..719a7194c 100644
--- a/sway/commands/floating.c
+++ b/sway/commands/floating.c
@@ -1,15 +1,15 @@
 #include <string.h>
 #include <strings.h>
+#include "list.h"
+#include "util.h"
 #include "sway/commands.h"
-#include "sway/input/seat.h"
 #include "sway/ipc-server.h"
 #include "sway/output.h"
+#include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "list.h"
-#include "util.h"
 
 struct cmd_results *cmd_floating(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/floating_minmax_size.c b/sway/commands/floating_minmax_size.c
index e8c24ace2..5b6e57620 100644
--- a/sway/commands/floating_minmax_size.c
+++ b/sway/commands/floating_minmax_size.c
@@ -4,8 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include "sway/commands.h"
 #include "log.h"
+#include "sway/commands.h"
 
 static const char min_usage[] =
 	"Expected 'floating_minimum_size <width> x <height>'";
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index facd82de7..232220823 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -2,17 +2,17 @@
 #include <strings.h>
 #include <wlr/types/wlr_output_layout.h>
 #include "log.h"
+#include "stringop.h"
+#include "util.h"
 #include "sway/commands.h"
-#include "sway/input/input-manager.h"
-#include "sway/input/cursor.h"
-#include "sway/input/seat.h"
 #include "sway/output.h"
+#include "sway/input/cursor.h"
+#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/root.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "stringop.h"
-#include "util.h"
 
 static bool get_direction_from_next_prev(struct sway_container *container,
 		struct sway_seat *seat, const char *name, enum wlr_direction *out) {
diff --git a/sway/commands/focus_follows_mouse.c b/sway/commands/focus_follows_mouse.c
index 7afb5f623..cded1654d 100644
--- a/sway/commands/focus_follows_mouse.c
+++ b/sway/commands/focus_follows_mouse.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/commands.h"
 #include "util.h"
+#include "sway/commands.h"
 
 struct cmd_results *cmd_focus_follows_mouse(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/focus_wrapping.c b/sway/commands/focus_wrapping.c
index d3901cb8f..adc1115ed 100644
--- a/sway/commands/focus_wrapping.c
+++ b/sway/commands/focus_wrapping.c
@@ -1,7 +1,7 @@
 #include <strings.h>
+#include "util.h"
 #include "sway/commands.h"
 #include "sway/config.h"
-#include "util.h"
 
 struct cmd_results *cmd_focus_wrapping(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/font.c b/sway/commands/font.c
index 74bb6b9f4..cd9d98190 100644
--- a/sway/commands/font.c
+++ b/sway/commands/font.c
@@ -1,10 +1,10 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
-#include "sway/commands.h"
-#include "sway/config.h"
+#include <pango/pangocairo.h>
 #include "log.h"
 #include "stringop.h"
-#include <pango/pangocairo.h>
+#include "sway/commands.h"
+#include "sway/config.h"
 
 struct cmd_results *cmd_font(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/for_window.c b/sway/commands/for_window.c
index 905e67767..f5136f096 100644
--- a/sway/commands/for_window.c
+++ b/sway/commands/for_window.c
@@ -1,9 +1,9 @@
 #include <string.h>
-#include "sway/commands.h"
-#include "sway/criteria.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"
+#include "sway/commands.h"
+#include "sway/criteria.h"
 
 struct cmd_results *cmd_for_window(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/force_display_urgency_hint.c b/sway/commands/force_display_urgency_hint.c
index 3d432cba9..d5d4cb34a 100644
--- a/sway/commands/force_display_urgency_hint.c
+++ b/sway/commands/force_display_urgency_hint.c
@@ -1,6 +1,6 @@
+#include <errno.h>
 #include "sway/commands.h"
 #include "sway/config.h"
-#include <errno.h>
 
 struct cmd_results *cmd_force_display_urgency_hint(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/force_focus_wrapping.c b/sway/commands/force_focus_wrapping.c
index fafc1c3ef..e11c66821 100644
--- a/sway/commands/force_focus_wrapping.c
+++ b/sway/commands/force_focus_wrapping.c
@@ -1,7 +1,7 @@
-#include "sway/commands.h"
-#include "sway/config.h"
 #include "log.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
 
 struct cmd_results *cmd_force_focus_wrapping(int argc, char **argv) {
 	sway_log(SWAY_INFO, "Warning: force_focus_wrapping is deprecated. "
diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c
index 21c1e9a09..a5a54c0bc 100644
--- a/sway/commands/fullscreen.c
+++ b/sway/commands/fullscreen.c
@@ -1,12 +1,12 @@
 #include <strings.h>
 #include "log.h"
+#include "util.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "util.h"
 
 // fullscreen [enable|disable|toggle] [global]
 struct cmd_results *cmd_fullscreen(int argc, char **argv) {
diff --git a/sway/commands/gaps.c b/sway/commands/gaps.c
index 1deeb56e1..75deb1c9b 100644
--- a/sway/commands/gaps.c
+++ b/sway/commands/gaps.c
@@ -1,12 +1,12 @@
+#include <math.h>
 #include <string.h>
 #include <strings.h>
+#include "log.h"
+#include "stringop.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/workspace.h"
-#include "log.h"
-#include "stringop.h"
-#include <math.h>
 
 enum gaps_op {
 	GAPS_OP_SET,
diff --git a/sway/commands/gesture.c b/sway/commands/gesture.c
index d4442cc35..0f661b84a 100644
--- a/sway/commands/gesture.c
+++ b/sway/commands/gesture.c
@@ -1,10 +1,9 @@
 #define _POSIX_C_SOURCE 200809L
-#include "sway/config.h"
-
 #include "gesture.h"
 #include "log.h"
 #include "stringop.h"
 #include "sway/commands.h"
+#include "sway/config.h"
 
 void free_gesture_binding(struct sway_gesture_binding *binding) {
 	if (!binding) {
diff --git a/sway/commands/input.c b/sway/commands/input.c
index 306c40f74..f99af6f97 100644
--- a/sway/commands/input.c
+++ b/sway/commands/input.c
@@ -1,10 +1,10 @@
 #include <string.h>
 #include <strings.h>
+#include "log.h"
+#include "stringop.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/keyboard.h"
-#include "log.h"
-#include "stringop.h"
 
 // must be in order for the bsearch
 static const struct cmd_handler input_handlers[] = {
diff --git a/sway/commands/input/accel_profile.c b/sway/commands/input/accel_profile.c
index 08f324cca..cb18d3cbf 100644
--- a/sway/commands/input/accel_profile.c
+++ b/sway/commands/input/accel_profile.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
 #include "sway/commands.h"
+#include "sway/config.h"
 #include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_accel_profile(int argc, char **argv) {
diff --git a/sway/commands/input/calibration_matrix.c b/sway/commands/input/calibration_matrix.c
index 38749fbb9..3bf71f5d3 100644
--- a/sway/commands/input/calibration_matrix.c
+++ b/sway/commands/input/calibration_matrix.c
@@ -1,12 +1,12 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "log.h"
 #include "stringop.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_calibration_matrix(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c
index 919c7cb7d..f9f19f988 100644
--- a/sway/commands/input/click_method.c
+++ b/sway/commands/input/click_method.c
@@ -1,9 +1,9 @@
 #include <string.h>
 #include <strings.h>
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/input/input-manager.h"
-#include "log.h"
 
 struct cmd_results *input_cmd_click_method(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/drag.c b/sway/commands/input/drag.c
index 062357d4f..a8e7f7199 100644
--- a/sway/commands/input/drag.c
+++ b/sway/commands/input/drag.c
@@ -1,9 +1,9 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_drag(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/drag_lock.c b/sway/commands/input/drag_lock.c
index 24c548e2d..19b543156 100644
--- a/sway/commands/input/drag_lock.c
+++ b/sway/commands/input/drag_lock.c
@@ -1,9 +1,9 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_drag_lock(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/dwt.c b/sway/commands/input/dwt.c
index a7a4e4943..27531eff9 100644
--- a/sway/commands/input/dwt.c
+++ b/sway/commands/input/dwt.c
@@ -1,9 +1,9 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_dwt(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/dwtp.c b/sway/commands/input/dwtp.c
index 232e2b261..60d5bc916 100644
--- a/sway/commands/input/dwtp.c
+++ b/sway/commands/input/dwtp.c
@@ -1,9 +1,9 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_dwtp(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c
index 08d99bf0b..6929f58d8 100644
--- a/sway/commands/input/events.c
+++ b/sway/commands/input/events.c
@@ -2,10 +2,10 @@
 #include <string.h>
 #include <strings.h>
 #include <wlr/config.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "log.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 #if WLR_HAS_LIBINPUT_BACKEND
 #include <wlr/backend/libinput.h>
diff --git a/sway/commands/input/left_handed.c b/sway/commands/input/left_handed.c
index 93d8d56d8..32303a4e3 100644
--- a/sway/commands/input/left_handed.c
+++ b/sway/commands/input/left_handed.c
@@ -1,9 +1,9 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_left_handed(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/map_to_output.c b/sway/commands/input/map_to_output.c
index f60fb7d57..087f0cd22 100644
--- a/sway/commands/input/map_to_output.c
+++ b/sway/commands/input/map_to_output.c
@@ -1,10 +1,10 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "log.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_map_to_output(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/middle_emulation.c b/sway/commands/input/middle_emulation.c
index 9f32692e0..adc9c48b0 100644
--- a/sway/commands/input/middle_emulation.c
+++ b/sway/commands/input/middle_emulation.c
@@ -1,9 +1,9 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_middle_emulation(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/natural_scroll.c b/sway/commands/input/natural_scroll.c
index dec32a5ba..6eafe4f5e 100644
--- a/sway/commands/input/natural_scroll.c
+++ b/sway/commands/input/natural_scroll.c
@@ -1,9 +1,9 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_natural_scroll(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/pointer_accel.c b/sway/commands/input/pointer_accel.c
index e214b32f8..7ab1aa66e 100644
--- a/sway/commands/input/pointer_accel.c
+++ b/sway/commands/input/pointer_accel.c
@@ -1,10 +1,10 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_pointer_accel(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/repeat_delay.c b/sway/commands/input/repeat_delay.c
index 5b787fe63..ac026e162 100644
--- a/sway/commands/input/repeat_delay.c
+++ b/sway/commands/input/repeat_delay.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
-#include "sway/config.h"
 #include "sway/commands.h"
+#include "sway/config.h"
 #include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_repeat_delay(int argc, char **argv) {
diff --git a/sway/commands/input/repeat_rate.c b/sway/commands/input/repeat_rate.c
index 79c5efe22..dae0d7938 100644
--- a/sway/commands/input/repeat_rate.c
+++ b/sway/commands/input/repeat_rate.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
-#include "sway/config.h"
 #include "sway/commands.h"
+#include "sway/config.h"
 #include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_repeat_rate(int argc, char **argv) {
diff --git a/sway/commands/input/rotation_angle.c b/sway/commands/input/rotation_angle.c
index 5e278fff7..a93f97868 100644
--- a/sway/commands/input/rotation_angle.c
+++ b/sway/commands/input/rotation_angle.c
@@ -1,10 +1,10 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_rotation_angle(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/scroll_button.c b/sway/commands/input/scroll_button.c
index 81f69a6df..bb41d063d 100644
--- a/sway/commands/input/scroll_button.c
+++ b/sway/commands/input/scroll_button.c
@@ -1,6 +1,6 @@
 #include <libevdev/libevdev.h>
-#include "sway/config.h"
 #include "sway/commands.h"
+#include "sway/config.h"
 #include "sway/input/cursor.h"
 
 struct cmd_results *input_cmd_scroll_button(int argc, char **argv) {
diff --git a/sway/commands/input/scroll_button_lock.c b/sway/commands/input/scroll_button_lock.c
index f96b65145..ca1cfe5cd 100644
--- a/sway/commands/input/scroll_button_lock.c
+++ b/sway/commands/input/scroll_button_lock.c
@@ -1,10 +1,10 @@
 #include <libinput.h>
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_scroll_button_lock(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/scroll_factor.c b/sway/commands/input/scroll_factor.c
index 4b72b6fa8..02ab8d840 100644
--- a/sway/commands/input/scroll_factor.c
+++ b/sway/commands/input/scroll_factor.c
@@ -2,10 +2,10 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_scroll_factor(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/scroll_method.c b/sway/commands/input/scroll_method.c
index cd8b5f7a7..51165c059 100644
--- a/sway/commands/input/scroll_method.c
+++ b/sway/commands/input/scroll_method.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
 #include "sway/commands.h"
+#include "sway/config.h"
 #include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_scroll_method(int argc, char **argv) {
diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c
index 443fd49d7..ab5daf592 100644
--- a/sway/commands/input/tap.c
+++ b/sway/commands/input/tap.c
@@ -1,10 +1,10 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "log.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_tap(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/tap_button_map.c b/sway/commands/input/tap_button_map.c
index 77ac6de7b..61dedea4b 100644
--- a/sway/commands/input/tap_button_map.c
+++ b/sway/commands/input/tap_button_map.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
 #include "sway/commands.h"
+#include "sway/config.h"
 #include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_tap_button_map(int argc, char **argv) {
diff --git a/sway/commands/input/xkb_capslock.c b/sway/commands/input/xkb_capslock.c
index 7ce98ebbe..7287b7a16 100644
--- a/sway/commands/input/xkb_capslock.c
+++ b/sway/commands/input/xkb_capslock.c
@@ -1,9 +1,9 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct cmd_results *input_cmd_xkb_capslock(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/xkb_file.c b/sway/commands/input/xkb_file.c
index 493f94fbd..59457ee7c 100644
--- a/sway/commands/input/xkb_file.c
+++ b/sway/commands/input/xkb_file.c
@@ -1,10 +1,10 @@
 #define _POSIX_C_SOURCE 200809L
-#include <unistd.h>
 #include <errno.h>
-#include "sway/config.h"
-#include "sway/commands.h"
+#include <unistd.h>
 #include "log.h"
 #include "stringop.h"
+#include "sway/commands.h"
+#include "sway/config.h"
 
 struct cmd_results *input_cmd_xkb_file(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/xkb_layout.c b/sway/commands/input/xkb_layout.c
index 226265175..6a0480f86 100644
--- a/sway/commands/input/xkb_layout.c
+++ b/sway/commands/input/xkb_layout.c
@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
-#include "sway/config.h"
-#include "sway/commands.h"
 #include "log.h"
+#include "sway/commands.h"
+#include "sway/config.h"
 
 struct cmd_results *input_cmd_xkb_layout(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/xkb_model.c b/sway/commands/input/xkb_model.c
index f4a33de3e..df0fcbba0 100644
--- a/sway/commands/input/xkb_model.c
+++ b/sway/commands/input/xkb_model.c
@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
-#include "sway/config.h"
-#include "sway/commands.h"
 #include "log.h"
+#include "sway/commands.h"
+#include "sway/config.h"
 
 struct cmd_results *input_cmd_xkb_model(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/xkb_numlock.c b/sway/commands/input/xkb_numlock.c
index 87d3e60c1..d2653ceff 100644
--- a/sway/commands/input/xkb_numlock.c
+++ b/sway/commands/input/xkb_numlock.c
@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
-#include "sway/config.h"
-#include "sway/commands.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
 
 struct cmd_results *input_cmd_xkb_numlock(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/xkb_options.c b/sway/commands/input/xkb_options.c
index d609293f7..3a3cd9a65 100644
--- a/sway/commands/input/xkb_options.c
+++ b/sway/commands/input/xkb_options.c
@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
-#include "sway/config.h"
-#include "sway/commands.h"
 #include "log.h"
+#include "sway/commands.h"
+#include "sway/config.h"
 
 struct cmd_results *input_cmd_xkb_options(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/xkb_rules.c b/sway/commands/input/xkb_rules.c
index 3b59622c4..3198a7893 100644
--- a/sway/commands/input/xkb_rules.c
+++ b/sway/commands/input/xkb_rules.c
@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
-#include "sway/config.h"
-#include "sway/commands.h"
 #include "log.h"
+#include "sway/commands.h"
+#include "sway/config.h"
 
 struct cmd_results *input_cmd_xkb_rules(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/xkb_switch_layout.c b/sway/commands/input/xkb_switch_layout.c
index 3cce4ec8d..e819e785c 100644
--- a/sway/commands/input/xkb_switch_layout.c
+++ b/sway/commands/input/xkb_switch_layout.c
@@ -1,10 +1,10 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <wlr/interfaces/wlr_keyboard.h>
-#include "sway/config.h"
-#include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "log.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
 
 struct xkb_switch_layout_action {
 	struct wlr_keyboard *keyboard;
diff --git a/sway/commands/input/xkb_variant.c b/sway/commands/input/xkb_variant.c
index d0e21d778..88b1f145e 100644
--- a/sway/commands/input/xkb_variant.c
+++ b/sway/commands/input/xkb_variant.c
@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
-#include "sway/config.h"
-#include "sway/commands.h"
 #include "log.h"
+#include "sway/commands.h"
+#include "sway/config.h"
 
 struct cmd_results *input_cmd_xkb_variant(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/kill.c b/sway/commands/kill.c
index f1e95e4bb..926d1b00b 100644
--- a/sway/commands/kill.c
+++ b/sway/commands/kill.c
@@ -1,10 +1,10 @@
 #include "log.h"
+#include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "sway/commands.h"
 
 static void close_container_iterator(struct sway_container *con, void *data) {
 	if (con->view) {
diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index 12ce48398..db1a8c6ff 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -1,12 +1,12 @@
 #include <stdbool.h>
 #include <string.h>
 #include <strings.h>
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/output.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/workspace.h"
-#include "log.h"
 
 static enum sway_container_layout parse_layout_string(char *s) {
 	if (strcasecmp(s, "splith") == 0) {
diff --git a/sway/commands/mark.c b/sway/commands/mark.c
index aa5f185c8..a68397d64 100644
--- a/sway/commands/mark.c
+++ b/sway/commands/mark.c
@@ -1,11 +1,11 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
-#include "sway/commands.h"
-#include "sway/config.h"
-#include "sway/tree/view.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/tree/view.h"
 
 // mark foo                      Same as mark --replace foo
 // mark --add foo                Add this mark to view's list
diff --git a/sway/commands/mode.c b/sway/commands/mode.c
index 7263efcba..61f99b220 100644
--- a/sway/commands/mode.c
+++ b/sway/commands/mode.c
@@ -1,12 +1,12 @@
 #define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <string.h>
-#include "sway/commands.h"
-#include "sway/config.h"
-#include "sway/ipc-server.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/ipc-server.h"
 
 // Must be in order for the bsearch
 static const struct cmd_handler mode_handlers[] = {
diff --git a/sway/commands/move.c b/sway/commands/move.c
index 69ed06c0b..ca515dce6 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -7,19 +7,19 @@
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_layout.h>
+#include "list.h"
+#include "log.h"
+#include "stringop.h"
+#include "util.h"
 #include "sway/commands.h"
-#include "sway/input/cursor.h"
-#include "sway/input/seat.h"
 #include "sway/ipc-server.h"
 #include "sway/output.h"
+#include "sway/input/cursor.h"
+#include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
 #include "sway/tree/workspace.h"
-#include "stringop.h"
-#include "list.h"
-#include "log.h"
-#include "util.h"
 
 static const char expected_syntax[] =
 	"Expected 'move <left|right|up|down> <[px] px>' or "
diff --git a/sway/commands/no_focus.c b/sway/commands/no_focus.c
index ccfdec824..45f552151 100644
--- a/sway/commands/no_focus.c
+++ b/sway/commands/no_focus.c
@@ -1,8 +1,8 @@
 #include <string.h>
-#include "sway/commands.h"
-#include "sway/criteria.h"
 #include "list.h"
 #include "log.h"
+#include "sway/commands.h"
+#include "sway/criteria.h"
 
 struct cmd_results *cmd_no_focus(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/opacity.c b/sway/commands/opacity.c
index 96e6228ed..e6d54ad02 100644
--- a/sway/commands/opacity.c
+++ b/sway/commands/opacity.c
@@ -1,9 +1,9 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <strings.h>
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/tree/view.h"
-#include "log.h"
 
 struct cmd_results *cmd_opacity(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/output.c b/sway/commands/output.c
index df32c6731..b98c038a1 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -1,9 +1,9 @@
 #include <strings.h>
+#include "list.h"
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/output.h"
-#include "list.h"
-#include "log.h"
 
 // must be in order for the bsearch
 static const struct cmd_handler output_handlers[] = {
diff --git a/sway/commands/output/adaptive_sync.c b/sway/commands/output/adaptive_sync.c
index 7382e2ee3..ee88f5d04 100644
--- a/sway/commands/output/adaptive_sync.c
+++ b/sway/commands/output/adaptive_sync.c
@@ -1,6 +1,6 @@
+#include "util.h"
 #include "sway/commands.h"
 #include "sway/config.h"
-#include "util.h"
 
 struct cmd_results *output_cmd_adaptive_sync(int argc, char **argv) {
 	if (!config->handler_context.output_config) {
diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c
index d691295f4..b92d83502 100644
--- a/sway/commands/output/background.c
+++ b/sway/commands/output/background.c
@@ -1,15 +1,15 @@
 #define _POSIX_C_SOURCE 200809L
+#include <errno.h>
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
-#include <errno.h>
+#include "log.h"
+#include "stringop.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/swaynag.h"
-#include "log.h"
-#include "stringop.h"
 
 static const char *bg_options[] = {
 	"stretch",
diff --git a/sway/commands/output/power.c b/sway/commands/output/power.c
index e6ae28520..d65ed6bad 100644
--- a/sway/commands/output/power.c
+++ b/sway/commands/output/power.c
@@ -1,8 +1,8 @@
 #include <strings.h>
+#include "util.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/output.h"
-#include "util.h"
 
 struct cmd_results *output_cmd_power(int argc, char **argv) {
 	if (!config->handler_context.output_config) {
diff --git a/sway/commands/output/transform.c b/sway/commands/output/transform.c
index 8db71bb30..3af9d7310 100644
--- a/sway/commands/output/transform.c
+++ b/sway/commands/output/transform.c
@@ -1,8 +1,8 @@
 #include <string.h>
 #include <wlr/util/transform.h>
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
-#include "log.h"
 #include "sway/output.h"
 
 static enum wl_output_transform invert_rotation_direction(
diff --git a/sway/commands/primary_selection.c b/sway/commands/primary_selection.c
index 585b079d4..cf2259bed 100644
--- a/sway/commands/primary_selection.c
+++ b/sway/commands/primary_selection.c
@@ -1,8 +1,8 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/config.h"
-#include "sway/commands.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
 
 struct cmd_results *cmd_primary_selection(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/reload.c b/sway/commands/reload.c
index 76f14bba3..c44d38666 100644
--- a/sway/commands/reload.c
+++ b/sway/commands/reload.c
@@ -1,13 +1,13 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
+#include "list.h"
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/ipc-server.h"
 #include "sway/server.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/view.h"
-#include "list.h"
-#include "log.h"
 
 static void rebuild_textures_iterator(struct sway_container *con, void *data) {
 	container_update_marks_textures(con);
diff --git a/sway/commands/rename.c b/sway/commands/rename.c
index 0d36cc21e..a73d64182 100644
--- a/sway/commands/rename.c
+++ b/sway/commands/rename.c
@@ -9,8 +9,8 @@
 #include "sway/output.h"
 #include "sway/desktop/launcher.h"
 #include "sway/tree/container.h"
-#include "sway/tree/workspace.h"
 #include "sway/tree/root.h"
+#include "sway/tree/workspace.h"
 
 static const char expected_syntax[] =
 	"Expected 'rename workspace <old_name> to <new_name>' or "
diff --git a/sway/commands/resize.c b/sway/commands/resize.c
index 32b746eaf..6d97ec932 100644
--- a/sway/commands/resize.c
+++ b/sway/commands/resize.c
@@ -6,12 +6,12 @@
 #include <string.h>
 #include <strings.h>
 #include <wlr/util/edges.h>
+#include "log.h"
+#include "util.h"
 #include "sway/commands.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "log.h"
-#include "util.h"
 
 #define AXIS_HORIZONTAL (WLR_EDGE_LEFT | WLR_EDGE_RIGHT)
 #define AXIS_VERTICAL   (WLR_EDGE_TOP | WLR_EDGE_BOTTOM)
diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c
index c995f2f08..d7432d451 100644
--- a/sway/commands/scratchpad.c
+++ b/sway/commands/scratchpad.c
@@ -1,9 +1,9 @@
 #include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
+#include "sway/ipc-server.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
-#include "sway/ipc-server.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
 #include "sway/tree/workspace.h"
diff --git a/sway/commands/seat.c b/sway/commands/seat.c
index 2d197b692..13cafaef3 100644
--- a/sway/commands/seat.c
+++ b/sway/commands/seat.c
@@ -1,10 +1,10 @@
 #include <string.h>
 #include <strings.h>
+#include "log.h"
+#include "stringop.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
-#include "log.h"
-#include "stringop.h"
 
 // must be in order for the bsearch
 // these handlers perform actions on the seat
diff --git a/sway/commands/seat/attach.c b/sway/commands/seat/attach.c
index 00bfdab69..adeba172d 100644
--- a/sway/commands/seat/attach.c
+++ b/sway/commands/seat/attach.c
@@ -1,8 +1,8 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
+#include "stringop.h"
 #include "sway/commands.h"
 #include "sway/config.h"
-#include "stringop.h"
 
 struct cmd_results *seat_cmd_attach(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/seat/cursor.c b/sway/commands/seat/cursor.c
index 5a8a3bc8f..afbf6c5e2 100644
--- a/sway/commands/seat/cursor.c
+++ b/sway/commands/seat/cursor.c
@@ -1,7 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
-#include <linux/input-event-codes.h>
-
 #include <strings.h>
+#include <linux/input-event-codes.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_pointer.h>
 #include "sway/commands.h"
diff --git a/sway/commands/seat/fallback.c b/sway/commands/seat/fallback.c
index 0330c3537..a4de21069 100644
--- a/sway/commands/seat/fallback.c
+++ b/sway/commands/seat/fallback.c
@@ -1,6 +1,6 @@
-#include "sway/config.h"
-#include "sway/commands.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
 
 struct cmd_results *seat_cmd_fallback(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/seat/hide_cursor.c b/sway/commands/seat/hide_cursor.c
index e09b82d99..f5e417771 100644
--- a/sway/commands/seat/hide_cursor.c
+++ b/sway/commands/seat/hide_cursor.c
@@ -1,12 +1,12 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
-#include "sway/commands.h"
-#include "sway/config.h"
-#include "sway/input/seat.h"
-#include "sway/input/cursor.h"
-#include "sway/server.h"
 #include "stringop.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/server.h"
+#include "sway/input/cursor.h"
+#include "sway/input/seat.h"
 
 struct cmd_results *seat_cmd_hide_cursor(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/seat/idle.c b/sway/commands/seat/idle.c
index 62b94db21..50f79c313 100644
--- a/sway/commands/seat/idle.c
+++ b/sway/commands/seat/idle.c
@@ -1,8 +1,8 @@
 #define _POSIX_C_SOURCE 200809L
 #include <limits.h>
+#include <stdint.h>
 #include <string.h>
 #include <strings.h>
-#include <stdint.h>
 #include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
diff --git a/sway/commands/seat/keyboard_grouping.c b/sway/commands/seat/keyboard_grouping.c
index 5ad0f4081..0203dea22 100644
--- a/sway/commands/seat/keyboard_grouping.c
+++ b/sway/commands/seat/keyboard_grouping.c
@@ -1,7 +1,7 @@
 #include <string.h>
+#include "stringop.h"
 #include "sway/commands.h"
 #include "sway/config.h"
-#include "stringop.h"
 
 struct cmd_results *seat_cmd_keyboard_grouping(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/seat/shortcuts_inhibitor.c b/sway/commands/seat/shortcuts_inhibitor.c
index 7c7f99cf0..21e5317e7 100644
--- a/sway/commands/seat/shortcuts_inhibitor.c
+++ b/sway/commands/seat/shortcuts_inhibitor.c
@@ -1,8 +1,8 @@
 #include "log.h"
-#include "sway/commands.h"
-#include "sway/input/seat.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
 
 static struct cmd_results *handle_action(struct seat_config *sc,
 		struct sway_seat *seat, const char *action) {
diff --git a/sway/commands/set.c b/sway/commands/set.c
index c539e9fc7..8c951ddd1 100644
--- a/sway/commands/set.c
+++ b/sway/commands/set.c
@@ -2,11 +2,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
-#include "sway/commands.h"
-#include "sway/config.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"
+#include "sway/commands.h"
+#include "sway/config.h"
 
 // sort in order of longest->shortest
 static int compare_set_qsort(const void *_l, const void *_r) {
diff --git a/sway/commands/show_marks.c b/sway/commands/show_marks.c
index 0d373b80c..5aa7f551d 100644
--- a/sway/commands/show_marks.c
+++ b/sway/commands/show_marks.c
@@ -1,14 +1,14 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
-#include "sway/commands.h"
-#include "sway/config.h"
-#include "sway/tree/root.h"
-#include "sway/tree/view.h"
-#include "sway/output.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/output.h"
+#include "sway/tree/root.h"
+#include "sway/tree/view.h"
 
 static void rebuild_marks_iterator(struct sway_container *con, void *data) {
 	container_update_marks_textures(con);
diff --git a/sway/commands/smart_borders.c b/sway/commands/smart_borders.c
index 738786799..f769520a2 100644
--- a/sway/commands/smart_borders.c
+++ b/sway/commands/smart_borders.c
@@ -1,8 +1,8 @@
+#include "util.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/view.h"
-#include "util.h"
 
 struct cmd_results *cmd_smart_borders(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/smart_gaps.c b/sway/commands/smart_gaps.c
index a6d165dc3..400014523 100644
--- a/sway/commands/smart_gaps.c
+++ b/sway/commands/smart_gaps.c
@@ -1,12 +1,12 @@
 #include <string.h>
-#include "sway/commands.h"
-#include "sway/config.h"
-#include "sway/tree/arrange.h"
-#include "sway/tree/view.h"
-#include "sway/tree/container.h"
 #include "log.h"
 #include "stringop.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/tree/arrange.h"
+#include "sway/tree/container.h"
+#include "sway/tree/view.h"
 
 struct cmd_results *cmd_smart_gaps(int argc, char **argv) {
 	struct cmd_results *error = checkarg(argc, "smart_gaps", EXPECTED_AT_LEAST, 1);
diff --git a/sway/commands/split.c b/sway/commands/split.c
index 500a497db..3d5ac1b48 100644
--- a/sway/commands/split.c
+++ b/sway/commands/split.c
@@ -1,13 +1,13 @@
 #include <string.h>
 #include <strings.h>
+#include "log.h"
 #include "sway/commands.h"
+#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "sway/input/input-manager.h"
-#include "sway/input/seat.h"
-#include "log.h"
 
 static struct cmd_results *do_split(int layout) {
 	struct sway_container *con = config->handler_context.container;
diff --git a/sway/commands/sticky.c b/sway/commands/sticky.c
index 9b09a0f9d..1027a5272 100644
--- a/sway/commands/sticky.c
+++ b/sway/commands/sticky.c
@@ -1,16 +1,16 @@
 #include <string.h>
 #include <strings.h>
+#include "list.h"
+#include "log.h"
+#include "util.h"
 #include "sway/commands.h"
-#include "sway/input/seat.h"
 #include "sway/ipc-server.h"
 #include "sway/output.h"
+#include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "list.h"
-#include "log.h"
-#include "util.h"
 
 struct cmd_results *cmd_sticky(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/swap.c b/sway/commands/swap.c
index d44eb006c..0114b2463 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -2,6 +2,7 @@
 #include <strings.h>
 #include "config.h"
 #include "log.h"
+#include "stringop.h"
 #include "sway/commands.h"
 #include "sway/output.h"
 #include "sway/tree/arrange.h"
@@ -9,7 +10,6 @@
 #include "sway/tree/root.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "stringop.h"
 
 static const char expected_syntax[] =
 	"Expected 'swap container with id|con_id|mark <arg>'";
diff --git a/sway/commands/swaybg_command.c b/sway/commands/swaybg_command.c
index 92e9bdfd6..1e2d5a68e 100644
--- a/sway/commands/swaybg_command.c
+++ b/sway/commands/swaybg_command.c
@@ -1,7 +1,7 @@
 #include <string.h>
-#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
+#include "sway/commands.h"
 
 struct cmd_results *cmd_swaybg_command(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/swaynag_command.c b/sway/commands/swaynag_command.c
index f851d2234..379e2d2b3 100644
--- a/sway/commands/swaynag_command.c
+++ b/sway/commands/swaynag_command.c
@@ -1,7 +1,7 @@
 #include <string.h>
-#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
+#include "sway/commands.h"
 
 struct cmd_results *cmd_swaynag_command(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/tiling_drag.c b/sway/commands/tiling_drag.c
index e95526e80..9f574d6a4 100644
--- a/sway/commands/tiling_drag.c
+++ b/sway/commands/tiling_drag.c
@@ -1,5 +1,5 @@
-#include "sway/commands.h"
 #include "util.h"
+#include "sway/commands.h"
 
 struct cmd_results *cmd_tiling_drag(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/tiling_drag_threshold.c b/sway/commands/tiling_drag_threshold.c
index f11911182..855fa491e 100644
--- a/sway/commands/tiling_drag_threshold.c
+++ b/sway/commands/tiling_drag_threshold.c
@@ -1,7 +1,7 @@
 #include <string.h>
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
-#include "log.h"
 
 struct cmd_results *cmd_tiling_drag_threshold(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/title_format.c b/sway/commands/title_format.c
index a2446b7e4..958bbe5a2 100644
--- a/sway/commands/title_format.c
+++ b/sway/commands/title_format.c
@@ -1,10 +1,10 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
+#include "log.h"
+#include "stringop.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/tree/view.h"
-#include "log.h"
-#include "stringop.h"
 
 struct cmd_results *cmd_title_format(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/titlebar_border_thickness.c b/sway/commands/titlebar_border_thickness.c
index 7c27c163a..f4bc017a4 100644
--- a/sway/commands/titlebar_border_thickness.c
+++ b/sway/commands/titlebar_border_thickness.c
@@ -1,9 +1,9 @@
 #include <string.h>
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/output.h"
 #include "sway/tree/arrange.h"
-#include "log.h"
 
 struct cmd_results *cmd_titlebar_border_thickness(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/titlebar_padding.c b/sway/commands/titlebar_padding.c
index 29ce59ff0..0ceda4312 100644
--- a/sway/commands/titlebar_padding.c
+++ b/sway/commands/titlebar_padding.c
@@ -1,9 +1,9 @@
 #include <string.h>
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/output.h"
 #include "sway/tree/arrange.h"
-#include "log.h"
 
 struct cmd_results *cmd_titlebar_padding(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/unmark.c b/sway/commands/unmark.c
index 19274dfbf..59e86877e 100644
--- a/sway/commands/unmark.c
+++ b/sway/commands/unmark.c
@@ -1,12 +1,12 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
+#include "list.h"
+#include "log.h"
+#include "stringop.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/tree/root.h"
 #include "sway/tree/view.h"
-#include "list.h"
-#include "log.h"
-#include "stringop.h"
 
 static void remove_all_marks_iterator(struct sway_container *con, void *data) {
 	container_clear_marks(con);
diff --git a/sway/commands/urgent.c b/sway/commands/urgent.c
index 3a2b00ed5..a584d0045 100644
--- a/sway/commands/urgent.c
+++ b/sway/commands/urgent.c
@@ -1,10 +1,10 @@
 #include "log.h"
+#include "util.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
-#include "util.h"
 
 struct cmd_results *cmd_urgent(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index 03e488ba9..9e2ca703a 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -3,13 +3,13 @@
 #include <limits.h>
 #include <string.h>
 #include <strings.h>
+#include "list.h"
+#include "log.h"
+#include "stringop.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/input/seat.h"
 #include "sway/tree/workspace.h"
-#include "list.h"
-#include "log.h"
-#include "stringop.h"
 
 static struct workspace_config *workspace_config_find_or_create(char *ws_name) {
 	struct workspace_config *wsc = workspace_find_config(ws_name);
diff --git a/sway/commands/ws_auto_back_and_forth.c b/sway/commands/ws_auto_back_and_forth.c
index e4411c8ed..de005e11d 100644
--- a/sway/commands/ws_auto_back_and_forth.c
+++ b/sway/commands/ws_auto_back_and_forth.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <strings.h>
-#include "sway/commands.h"
 #include "util.h"
+#include "sway/commands.h"
 
 struct cmd_results *cmd_ws_auto_back_and_forth(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/xwayland.c b/sway/commands/xwayland.c
index 6ca269231..10926fffa 100644
--- a/sway/commands/xwayland.c
+++ b/sway/commands/xwayland.c
@@ -1,8 +1,8 @@
-#include "sway/config.h"
 #include "log.h"
-#include "sway/commands.h"
-#include "sway/server.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/server.h"
 
 struct cmd_results *cmd_xwayland(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/config.c b/sway/config.c
index 4b51dc73f..c193f7bff 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -1,37 +1,37 @@
 #define _XOPEN_SOURCE 700 // for realpath
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <dirent.h>
 #include <libgen.h>
-#include <wordexp.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <signal.h>
 #include <libinput.h>
 #include <limits.h>
-#include <dirent.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <strings.h>
+#include <unistd.h>
+#include <wordexp.h>
 #include <linux/input-event-codes.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <wlr/types/wlr_output.h>
-#include "sway/input/input-manager.h"
-#include "sway/input/seat.h"
-#include "sway/input/switch.h"
+#include "cairo_util.h"
+#include "list.h"
+#include "log.h"
+#include "pango.h"
+#include "stringop.h"
+#include "util.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/criteria.h"
-#include "sway/desktop/transaction.h"
 #include "sway/swaynag.h"
+#include "sway/desktop/transaction.h"
+#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
+#include "sway/input/switch.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/root.h"
 #include "sway/tree/workspace.h"
-#include "cairo_util.h"
-#include "pango.h"
-#include "stringop.h"
-#include "list.h"
-#include "log.h"
-#include "util.h"
 
 struct sway_config *config = NULL;
 
diff --git a/sway/config/bar.c b/sway/config/bar.c
index a8389244f..85f3f1b6e 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -4,20 +4,20 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
+#include <unistd.h>
+#include <wordexp.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
-#include <wordexp.h>
-#include "sway/config.h"
-#include "sway/input/keyboard.h"
-#include "sway/output.h"
 #include "config.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"
 #include "util.h"
+#include "sway/config.h"
+#include "sway/output.h"
+#include "sway/input/keyboard.h"
 
 void free_bar_binding(struct bar_binding *binding) {
 	if (!binding) {
diff --git a/sway/config/input.c b/sway/config/input.c
index 44c2be289..1092045ca 100644
--- a/sway/config/input.c
+++ b/sway/config/input.c
@@ -1,10 +1,10 @@
 #define _POSIX_C_SOURCE 200809L
-#include <stdlib.h>
-#include <limits.h>
 #include <float.h>
+#include <limits.h>
+#include <stdlib.h>
+#include "log.h"
 #include "sway/config.h"
 #include "sway/input/keyboard.h"
-#include "log.h"
 
 struct input_config *new_input_config(const char* identifier) {
 	struct input_config *input = calloc(1, sizeof(struct input_config));
diff --git a/sway/config/output.c b/sway/config/output.c
index 3316085a7..7e3d6fd96 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -3,19 +3,19 @@
 #include <drm_fourcc.h>
 #include <stdbool.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
-#include <unistd.h>
 #include <wlr/config.h>
 #include <wlr/types/wlr_cursor.h>
-#include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
-#include "sway/config.h"
-#include "sway/input/cursor.h"
-#include "sway/output.h"
-#include "sway/tree/root.h"
+#include <wlr/types/wlr_output_layout.h>
 #include "log.h"
 #include "util.h"
+#include "sway/config.h"
+#include "sway/output.h"
+#include "sway/input/cursor.h"
+#include "sway/tree/root.h"
 
 #if WLR_HAS_DRM_BACKEND
 #include <wlr/backend/drm.h>
diff --git a/sway/config/seat.c b/sway/config/seat.c
index 6d5d91ae4..444cc5363 100644
--- a/sway/config/seat.c
+++ b/sway/config/seat.c
@@ -2,8 +2,8 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include "sway/config.h"
 #include "log.h"
+#include "sway/config.h"
 
 struct seat_config *new_seat_config(const char* name) {
 	struct seat_config *seat = calloc(1, sizeof(struct seat_config));
diff --git a/sway/criteria.c b/sway/criteria.c
index 78ea8b8a4..bbed59a9c 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
-#include <stdlib.h>
-#include <stdio.h>
 #include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <strings.h>
 #define PCRE2_CODE_UNIT_WIDTH 8
 #include <pcre2.h>
diff --git a/sway/decoration.c b/sway/decoration.c
index 849fa89c9..89abcd32b 100644
--- a/sway/decoration.c
+++ b/sway/decoration.c
@@ -1,10 +1,10 @@
 #include <stdlib.h>
+#include "log.h"
 #include "sway/decoration.h"
-#include "sway/desktop/transaction.h"
 #include "sway/server.h"
+#include "sway/desktop/transaction.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/view.h"
-#include "log.h"
 
 static void server_decoration_handle_destroy(struct wl_listener *listener,
 		void *data) {
diff --git a/sway/desktop/desktop.c b/sway/desktop/desktop.c
index c8d4502cd..75f52384d 100644
--- a/sway/desktop/desktop.c
+++ b/sway/desktop/desktop.c
@@ -1,6 +1,6 @@
-#include "sway/tree/container.h"
 #include "sway/desktop.h"
 #include "sway/output.h"
+#include "sway/tree/container.h"
 
 void desktop_damage_surface(struct wlr_surface *surface, double lx, double ly,
 		bool whole) {
diff --git a/sway/desktop/idle_inhibit_v1.c b/sway/desktop/idle_inhibit_v1.c
index f3af7aa1b..e41be8835 100644
--- a/sway/desktop/idle_inhibit_v1.c
+++ b/sway/desktop/idle_inhibit_v1.c
@@ -1,11 +1,11 @@
 #include <stdlib.h>
 #include <wlr/types/wlr_idle_notify_v1.h>
 #include "log.h"
+#include "sway/server.h"
 #include "sway/desktop/idle_inhibit_v1.h"
 #include "sway/input/seat.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
-#include "sway/server.h"
 
 
 static void destroy_inhibitor(struct sway_idle_inhibitor_v1 *inhibitor) {
diff --git a/sway/desktop/launcher.c b/sway/desktop/launcher.c
index 00a7e38a6..6bf7645fb 100644
--- a/sway/desktop/launcher.c
+++ b/sway/desktop/launcher.c
@@ -2,14 +2,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wlr/types/wlr_xdg_activation_v1.h>
-#include "sway/input/seat.h"
+#include "log.h"
 #include "sway/output.h"
 #include "sway/desktop/launcher.h"
-#include "sway/tree/node.h"
+#include "sway/input/seat.h"
 #include "sway/tree/container.h"
-#include "sway/tree/workspace.h"
+#include "sway/tree/node.h"
 #include "sway/tree/root.h"
-#include "log.h"
+#include "sway/tree/workspace.h"
 
 /**
  * Get the pid of a parent process given the pid of a child process.
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index 979c44497..a9a7f2dad 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -6,14 +6,14 @@
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_subcompositor.h>
 #include "log.h"
-#include "sway/desktop/transaction.h"
-#include "sway/input/cursor.h"
-#include "sway/input/input-manager.h"
-#include "sway/input/seat.h"
 #include "sway/layers.h"
 #include "sway/output.h"
 #include "sway/server.h"
 #include "sway/surface.h"
+#include "sway/desktop/transaction.h"
+#include "sway/input/cursor.h"
+#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/workspace.h"
 
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index d9328701c..a7cff8f44 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -9,25 +9,25 @@
 #include <wlr/render/swapchain.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_buffer.h>
+#include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_gamma_control_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/types/wlr_presentation_time.h>
-#include <wlr/types/wlr_compositor.h>
 #include <wlr/util/region.h>
 #include <wlr/util/transform.h>
 #include "config.h"
 #include "log.h"
 #include "sway/config.h"
-#include "sway/desktop/transaction.h"
-#include "sway/input/input-manager.h"
-#include "sway/input/seat.h"
 #include "sway/ipc-server.h"
 #include "sway/layers.h"
 #include "sway/output.h"
 #include "sway/server.h"
 #include "sway/surface.h"
+#include "sway/desktop/transaction.h"
+#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 9cfdea842..ca74c94bc 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -7,21 +7,21 @@
 #include <wlr/config.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_buffer.h>
+#include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_damage_ring.h>
 #include <wlr/types/wlr_matrix.h>
-#include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
-#include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_output_layout.h>
 #include <wlr/util/region.h>
 #include <wlr/util/transform.h>
-#include "log.h"
 #include "config.h"
+#include "log.h"
 #include "sway/config.h"
-#include "sway/input/input-manager.h"
-#include "sway/input/seat.h"
 #include "sway/layers.h"
 #include "sway/output.h"
 #include "sway/server.h"
+#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
diff --git a/sway/desktop/surface.c b/sway/desktop/surface.c
index 5932eaa23..e66da2f88 100644
--- a/sway/desktop/surface.c
+++ b/sway/desktop/surface.c
@@ -3,9 +3,9 @@
 #include <time.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_fractional_scale_v1.h>
+#include "sway/output.h"
 #include "sway/server.h"
 #include "sway/surface.h"
-#include "sway/output.h"
 
 static void handle_destroy(struct wl_listener *listener, void *data) {
 	struct sway_surface *surface = wl_container_of(listener, surface, destroy);
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index 6947e1384..07768a9c7 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -4,19 +4,19 @@
 #include <string.h>
 #include <time.h>
 #include <wlr/types/wlr_buffer.h>
+#include "list.h"
+#include "log.h"
 #include "sway/config.h"
 #include "sway/desktop.h"
+#include "sway/output.h"
 #include "sway/desktop/idle_inhibit_v1.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
-#include "sway/output.h"
 #include "sway/tree/container.h"
 #include "sway/tree/node.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "list.h"
-#include "log.h"
 
 struct sway_transaction {
 	struct wl_event_source *timer;
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 63a0835bf..c2282c15e 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -8,16 +8,16 @@
 #include "log.h"
 #include "sway/decoration.h"
 #include "sway/desktop.h"
+#include "sway/output.h"
+#include "sway/xdg_decoration.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
-#include "sway/output.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "sway/xdg_decoration.h"
 
 static const struct sway_view_child_impl popup_impl;
 
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 2c6184fde..76b79bed6 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -3,21 +3,21 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_output_layout.h>
-#include <wlr/types/wlr_output.h>
-#include <wlr/types/wlr_xdg_activation_v1.h>
 #include <wlr/xwayland.h>
+#include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_xdg_activation_v1.h>
 #include <xcb/xcb_icccm.h>
 #include "log.h"
 #include "sway/desktop.h"
+#include "sway/output.h"
+#include "sway/server.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
-#include "sway/output.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
-#include "sway/server.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
 
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 36aab93e2..853c87547 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -1,18 +1,18 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
+#include <errno.h>
 #include <math.h>
+#include <strings.h>
+#include <time.h>
 #include <libevdev/libevdev.h>
 #include <linux/input-event-codes.h>
-#include <errno.h>
-#include <time.h>
-#include <strings.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_cursor_shape_v1.h>
 #include <wlr/types/wlr_pointer.h>
-#include <wlr/types/wlr_touch.h>
-#include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_tablet_pad.h>
 #include <wlr/types/wlr_tablet_tool.h>
+#include <wlr/types/wlr_tablet_v2.h>
+#include <wlr/types/wlr_touch.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/util/region.h>
 #include "config.h"
@@ -20,11 +20,11 @@
 #include "util.h"
 #include "sway/commands.h"
 #include "sway/desktop.h"
+#include "sway/layers.h"
+#include "sway/output.h"
 #include "sway/input/cursor.h"
 #include "sway/input/keyboard.h"
 #include "sway/input/tablet.h"
-#include "sway/layers.h"
-#include "sway/output.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
 #include "sway/tree/view.h"
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index 4febc3334..083829cd8 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -1,25 +1,25 @@
 #define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
+#include <math.h>
 #include <stdio.h>
 #include <string.h>
-#include <math.h>
 #include <wlr/config.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_keyboard_group.h>
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
 #include <wlr/types/wlr_virtual_pointer_v1.h>
+#include "list.h"
+#include "log.h"
+#include "stringop.h"
 #include "sway/config.h"
+#include "sway/ipc-server.h"
+#include "sway/server.h"
 #include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/keyboard.h"
 #include "sway/input/libinput.h"
 #include "sway/input/seat.h"
-#include "sway/ipc-server.h"
-#include "sway/server.h"
 #include "sway/tree/view.h"
-#include "stringop.h"
-#include "list.h"
-#include "log.h"
 
 #if WLR_HAS_LIBINPUT_BACKEND
 #include <wlr/backend/libinput.h>
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 8927287fb..b94ea172f 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -7,13 +7,13 @@
 #include <wlr/types/wlr_keyboard.h>
 #include <wlr/types/wlr_keyboard_group.h>
 #include <xkbcommon/xkbcommon-names.h>
+#include "log.h"
 #include "sway/commands.h"
+#include "sway/ipc-server.h"
+#include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/keyboard.h"
 #include "sway/input/seat.h"
-#include "sway/input/cursor.h"
-#include "sway/ipc-server.h"
-#include "log.h"
 
 #if WLR_HAS_SESSION
 #include <wlr/backend/session.h>
diff --git a/sway/input/libinput.c b/sway/input/libinput.c
index 43875634f..87f86dd17 100644
--- a/sway/input/libinput.c
+++ b/sway/input/libinput.c
@@ -5,9 +5,9 @@
 #include <wlr/backend/libinput.h>
 #include "log.h"
 #include "sway/config.h"
+#include "sway/ipc-server.h"
 #include "sway/output.h"
 #include "sway/input/input-manager.h"
-#include "sway/ipc-server.h"
 
 static void log_status(enum libinput_config_status status) {
 	if (status != LIBINPUT_CONFIG_STATUS_SUCCESS) {
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 0fd0e8e65..c1b43075e 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -1,9 +1,9 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
-#include <linux/input-event-codes.h>
 #include <string.h>
 #include <strings.h>
 #include <time.h>
+#include <linux/input-event-codes.h>
 #include <wlr/config.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_data_device.h>
@@ -19,6 +19,10 @@
 #include "log.h"
 #include "sway/config.h"
 #include "sway/desktop.h"
+#include "sway/ipc-server.h"
+#include "sway/layers.h"
+#include "sway/output.h"
+#include "sway/server.h"
 #include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/keyboard.h"
@@ -26,10 +30,6 @@
 #include "sway/input/seat.h"
 #include "sway/input/switch.h"
 #include "sway/input/tablet.h"
-#include "sway/ipc-server.h"
-#include "sway/layers.h"
-#include "sway/output.h"
-#include "sway/server.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c
index 1dce6dae2..787336d78 100644
--- a/sway/input/seatop_default.c
+++ b/sway/input/seatop_default.c
@@ -6,15 +6,15 @@
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include "gesture.h"
+#include "log.h"
+#include "sway/layers.h"
+#include "sway/output.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/input/tablet.h"
-#include "sway/layers.h"
-#include "sway/output.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "log.h"
 #if HAVE_XWAYLAND
 #include "sway/xwayland.h"
 #endif
diff --git a/sway/input/seatop_down.c b/sway/input/seatop_down.c
index 36f9bb608..d9a53ade6 100644
--- a/sway/input/seatop_down.c
+++ b/sway/input/seatop_down.c
@@ -3,11 +3,11 @@
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_touch.h>
+#include "log.h"
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/tree/view.h"
-#include "sway/desktop/transaction.h"
-#include "log.h"
 
 struct seatop_touch_point_event {
 	double ref_lx, ref_ly;         // touch's x/y at start of op
diff --git a/sway/input/seatop_move_tiling.c b/sway/input/seatop_move_tiling.c
index 26704d0d9..c948f67cb 100644
--- a/sway/input/seatop_move_tiling.c
+++ b/sway/input/seatop_move_tiling.c
@@ -3,11 +3,11 @@
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/util/edges.h>
 #include "sway/desktop.h"
+#include "sway/ipc-server.h"
+#include "sway/output.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
-#include "sway/ipc-server.h"
-#include "sway/output.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/node.h"
 #include "sway/tree/view.h"
diff --git a/sway/input/seatop_resize_floating.c b/sway/input/seatop_resize_floating.c
index df6830266..f08ea5a90 100644
--- a/sway/input/seatop_resize_floating.c
+++ b/sway/input/seatop_resize_floating.c
@@ -6,9 +6,9 @@
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
+#include "sway/tree/container.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "sway/tree/container.h"
 
 struct seatop_resize_floating_event {
 	struct sway_container *con;
diff --git a/sway/input/switch.c b/sway/input/switch.c
index 7a5398014..dfc3ea3cb 100644
--- a/sway/input/switch.c
+++ b/sway/input/switch.c
@@ -1,6 +1,6 @@
+#include "log.h"
 #include "sway/config.h"
 #include "sway/input/switch.h"
-#include "log.h"
 
 struct sway_switch *sway_switch_create(struct sway_seat *seat,
 		struct sway_seat_device *device) {
diff --git a/sway/input/tablet.c b/sway/input/tablet.c
index 902cb7eda..d61217d1e 100644
--- a/sway/input/tablet.c
+++ b/sway/input/tablet.c
@@ -1,9 +1,9 @@
 #define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <wlr/config.h>
-#include <wlr/types/wlr_tablet_v2.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 "log.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 58356d4ea..b0fc3001b 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -1,8 +1,8 @@
 #include <ctype.h>
 #include <float.h>
 #include <json.h>
-#include <libevdev/libevdev.h>
 #include <stdio.h>
+#include <libevdev/libevdev.h>
 #include <wlr/config.h>
 #include <wlr/types/wlr_content_type_v1.h>
 #include <wlr/types/wlr_output.h>
@@ -11,15 +11,15 @@
 #include "log.h"
 #include "sway/config.h"
 #include "sway/ipc-json.h"
+#include "sway/output.h"
+#include "sway/desktop/idle_inhibit_v1.h"
+#include "sway/input/cursor.h"
+#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "sway/output.h"
-#include "sway/input/input-manager.h"
-#include "sway/input/cursor.h"
-#include "sway/input/seat.h"
 #include "wlr-layer-shell-unstable-v1-protocol.h"
-#include "sway/desktop/idle_inhibit_v1.h"
 
 #if WLR_HAS_LIBINPUT_BACKEND
 #include <wlr/backend/libinput.h>
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 9692a77fd..2cb77e8e0 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -1,6 +1,5 @@
 // See https://i3wm.org/docs/ipc.html for protocol information
 #define _POSIX_C_SOURCE 200112L
-#include <linux/input-event-codes.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -10,27 +9,28 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/un.h>
 #include <unistd.h>
 #include <wayland-server-core.h>
+#include <linux/input-event-codes.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include "list.h"
+#include "log.h"
+#include "util.h"
 #include "sway/commands.h"
 #include "sway/config.h"
-#include "sway/desktop/transaction.h"
 #include "sway/ipc-json.h"
 #include "sway/ipc-server.h"
 #include "sway/output.h"
 #include "sway/server.h"
+#include "sway/desktop/transaction.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/keyboard.h"
 #include "sway/input/seat.h"
 #include "sway/tree/root.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "list.h"
-#include "log.h"
-#include "util.h"
 
 static int ipc_socket = -1;
 static struct wl_event_source *ipc_event_source =  NULL;
diff --git a/sway/lock.c b/sway/lock.c
index 199624fc4..f6be0b1c8 100644
--- a/sway/lock.c
+++ b/sway/lock.c
@@ -1,12 +1,12 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include "log.h"
-#include "sway/input/cursor.h"
-#include "sway/input/keyboard.h"
-#include "sway/input/seat.h"
 #include "sway/output.h"
 #include "sway/server.h"
 #include "sway/surface.h"
+#include "sway/input/cursor.h"
+#include "sway/input/keyboard.h"
+#include "sway/input/seat.h"
 
 struct sway_session_lock_surface {
 	struct wlr_session_lock_surface_v1 *lock_surface;
diff --git a/sway/main.c b/sway/main.c
index 98aba7f20..6df411f8a 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -1,30 +1,30 @@
 #define _POSIX_C_SOURCE 200809L
 #include <getopt.h>
-#include <pango/pangocairo.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include <pango/pangocairo.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/wait.h>
 #include <sys/un.h>
-#include <unistd.h>
-#include <wlr/util/log.h>
+#include <sys/wait.h>
 #include <wlr/version.h>
-#include "sway/commands.h"
-#include "sway/config.h"
-#include "sway/server.h"
-#include "sway/swaynag.h"
-#include "sway/desktop/transaction.h"
-#include "sway/tree/root.h"
-#include "sway/ipc-server.h"
+#include <wlr/util/log.h>
 #include "ipc-client.h"
 #include "log.h"
 #include "stringop.h"
 #include "util.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/ipc-server.h"
+#include "sway/server.h"
+#include "sway/swaynag.h"
+#include "sway/desktop/transaction.h"
+#include "sway/tree/root.h"
 
 static bool terminate_request = false;
 static int exit_value = 0;
diff --git a/sway/realtime.c b/sway/realtime.c
index 11154af0e..933aa44ae 100644
--- a/sway/realtime.c
+++ b/sway/realtime.c
@@ -1,9 +1,9 @@
-#include <sys/resource.h>
+#include <pthread.h>
 #include <sched.h>
 #include <unistd.h>
-#include <pthread.h>
-#include "sway/server.h"
+#include <sys/resource.h>
 #include "log.h"
+#include "sway/server.h"
 
 static void child_fork_callback(void) {
 	struct sched_param param;
diff --git a/sway/server.c b/sway/server.c
index d173581f3..55d335517 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -5,9 +5,9 @@
 #include <string.h>
 #include <wayland-server-core.h>
 #include <wlr/backend.h>
+#include <wlr/config.h>
 #include <wlr/backend/headless.h>
 #include <wlr/backend/multi.h>
-#include <wlr/config.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_content_type_v1.h>
@@ -42,11 +42,11 @@
 #include "list.h"
 #include "log.h"
 #include "sway/config.h"
-#include "sway/desktop/idle_inhibit_v1.h"
-#include "sway/input/input-manager.h"
 #include "sway/output.h"
 #include "sway/server.h"
+#include "sway/desktop/idle_inhibit_v1.h"
 #include "sway/input/cursor.h"
+#include "sway/input/input-manager.h"
 #include "sway/tree/root.h"
 
 #if HAVE_XWAYLAND
diff --git a/sway/swaynag.c b/sway/swaynag.c
index 6031174d2..e70094095 100644
--- a/sway/swaynag.c
+++ b/sway/swaynag.c
@@ -1,16 +1,16 @@
 #define _POSIX_C_SOURCE 200809L
 #include <signal.h>
 #include <stdbool.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
 #include "log.h"
+#include "util.h"
 #include "sway/server.h"
 #include "sway/swaynag.h"
-#include "util.h"
 
 static void handle_swaynag_client_destroy(struct wl_listener *listener,
 		void *data) {
diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c
index af925d054..77c5a4ab6 100644
--- a/sway/tree/arrange.c
+++ b/sway/tree/arrange.c
@@ -5,13 +5,13 @@
 #include <string.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_layout.h>
-#include "sway/tree/arrange.h"
-#include "sway/tree/container.h"
-#include "sway/output.h"
-#include "sway/tree/workspace.h"
-#include "sway/tree/view.h"
 #include "list.h"
 #include "log.h"
+#include "sway/output.h"
+#include "sway/tree/arrange.h"
+#include "sway/tree/container.h"
+#include "sway/tree/view.h"
+#include "sway/tree/workspace.h"
 
 static void apply_horiz_layout(list_t *children, struct wlr_box *parent) {
 	if (!children->length) {
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 8c344a6d4..288ea68ef 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -7,25 +7,25 @@
 #include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_subcompositor.h>
-#include "linux-dmabuf-unstable-v1-protocol.h"
 #include "cairo_util.h"
+#include "list.h"
+#include "log.h"
 #include "pango.h"
+#include "stringop.h"
 #include "sway/config.h"
 #include "sway/desktop.h"
-#include "sway/desktop/transaction.h"
-#include "sway/input/input-manager.h"
-#include "sway/input/seat.h"
 #include "sway/ipc-server.h"
 #include "sway/output.h"
 #include "sway/server.h"
 #include "sway/surface.h"
+#include "sway/xdg_decoration.h"
+#include "sway/desktop/transaction.h"
+#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "sway/xdg_decoration.h"
-#include "list.h"
-#include "log.h"
-#include "stringop.h"
+#include "linux-dmabuf-unstable-v1-protocol.h"
 
 struct sway_container *container_create(struct sway_view *view) {
 	struct sway_container *c = calloc(1, sizeof(struct sway_container));
diff --git a/sway/tree/node.c b/sway/tree/node.c
index 12361c75b..cb3425d01 100644
--- a/sway/tree/node.c
+++ b/sway/tree/node.c
@@ -1,11 +1,11 @@
 #define _POSIX_C_SOURCE 200809L
+#include "log.h"
 #include "sway/output.h"
 #include "sway/server.h"
 #include "sway/tree/container.h"
 #include "sway/tree/node.h"
 #include "sway/tree/root.h"
 #include "sway/tree/workspace.h"
-#include "log.h"
 
 void node_init(struct sway_node *node, enum sway_node_type type, void *thing) {
 	static size_t next_id = 1;
diff --git a/sway/tree/output.c b/sway/tree/output.c
index 4aa3a7fea..ba270f25a 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -3,14 +3,14 @@
 #include <ctype.h>
 #include <string.h>
 #include <strings.h>
+#include "log.h"
+#include "util.h"
 #include "sway/ipc-server.h"
 #include "sway/layers.h"
 #include "sway/output.h"
+#include "sway/server.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/workspace.h"
-#include "sway/server.h"
-#include "log.h"
-#include "util.h"
 
 enum wlr_direction opposite_direction(enum wlr_direction d) {
 	switch (d) {
diff --git a/sway/tree/root.c b/sway/tree/root.c
index dc51c3beb..0b45fd5f1 100644
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@@ -4,17 +4,17 @@
 #include <string.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/util/transform.h>
-#include "sway/desktop/transaction.h"
-#include "sway/input/seat.h"
+#include "list.h"
+#include "log.h"
+#include "util.h"
 #include "sway/ipc-server.h"
 #include "sway/output.h"
+#include "sway/desktop/transaction.h"
+#include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
 #include "sway/tree/workspace.h"
-#include "list.h"
-#include "log.h"
-#include "util.h"
 
 struct sway_root *root;
 
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 18218768b..a66935eec 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -2,23 +2,23 @@
 #include <ctype.h>
 #include <limits.h>
 #include <stdbool.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <strings.h>
+#include "list.h"
+#include "log.h"
 #include "stringop.h"
-#include "sway/input/input-manager.h"
-#include "sway/input/cursor.h"
-#include "sway/input/seat.h"
+#include "util.h"
 #include "sway/ipc-server.h"
 #include "sway/output.h"
+#include "sway/input/cursor.h"
+#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/node.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
-#include "list.h"
-#include "log.h"
-#include "util.h"
 
 struct workspace_config *workspace_find_config(const char *ws_name) {
 	for (int i = 0; i < config->workspace_configs->length; ++i) {
diff --git a/sway/xdg_decoration.c b/sway/xdg_decoration.c
index fa8c6279c..6333e6274 100644
--- a/sway/xdg_decoration.c
+++ b/sway/xdg_decoration.c
@@ -1,10 +1,10 @@
 #include <stdlib.h>
-#include "sway/desktop/transaction.h"
+#include "log.h"
 #include "sway/server.h"
+#include "sway/xdg_decoration.h"
+#include "sway/desktop/transaction.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/view.h"
-#include "sway/xdg_decoration.h"
-#include "log.h"
 
 static void xdg_decoration_handle_destroy(struct wl_listener *listener,
 		void *data) {