treewide: Sort includes

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);

include/ipc-client.h

@@ -7,7 +7,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/time.h>
-
 #include "ipc.h"
 
 /**

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,

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"
 

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;

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
 

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
 

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;

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

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);
 

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;
 

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"

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

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 <wlr/types/wlr_output_layout.h>
-#include "sway/tree/node.h"
 #include "config.h"
 #include "list.h"
+#include "sway/tree/container.h"
+#include "sway/tree/node.h"
 
 extern struct sway_root *root;
 

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;

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

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 {

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;
 

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;

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);

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
 

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 {

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 "log.h"
-#include <json.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) {

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;

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[] = {

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 <libevdev/libevdev.h>
-#include "sway/config.h"
-#include "sway/input/cursor.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) {

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;

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[] = {

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;

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;

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;

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) {

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

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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

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

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

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;

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;

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;

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 <libevdev/libevdev.h>
-#include <xkbcommon/xkbcommon-names.h>
+#include <linux/input-event-codes.h>
 #include <wlr/types/wlr_cursor.h>
-#include "sway/commands.h"
+#include <xkbcommon/xkbcommon-names.h>
-#include "sway/config.h"
+#include <xkbcommon/xkbcommon.h>
-#include "sway/desktop/transaction.h"
-#include "sway/input/cursor.h"
-#include "sway/input/keyboard.h"
-#include "sway/ipc-server.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;
 

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);

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;

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;

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;

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>'";

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) {

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;

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;

sway/commands/font.c

@@ -1,10 +1,10 @@
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
-#include "sway/commands.h"
+#include <pango/pangocairo.h>
-#include "sway/config.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;

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;

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;

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. "

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) {

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,

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) {

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[] = {

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) {

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;

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;

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;

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;

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;

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;

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>

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;

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;

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;

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;

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;

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) {

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) {

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;

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) {

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;

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;

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) {

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;

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) {

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;

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 <unistd.h>
-#include "sway/commands.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;

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;

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;

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;

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;

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;

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;

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;