diff --git a/sway/criteria.c b/sway/criteria.c
index 48899125c..39d300ea6 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -270,9 +270,9 @@ enum criteria_token {
 	T_CON_ID,
 	T_CON_MARK,
 	T_FLOATING,
-  #ifdef HAVE_XWAYLAND
+#ifdef HAVE_XWAYLAND
 	T_ID,
-  #endif
+#endif
 	T_INSTANCE,
 	T_SHELL,
 	T_TILING,
diff --git a/sway/tree/view.c b/sway/tree/view.c
index f672417e4..beeb81448 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -3,12 +3,12 @@
 #include <wayland-server.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_output_layout.h>
+#include "config.h"
 #ifdef HAVE_XWAYLAND
 #include <wlr/xwayland.h>
 #endif
 #include "list.h"
 #include "log.h"
-#include "config.h"
 #include "sway/criteria.h"
 #include "sway/commands.h"
 #include "sway/ipc-server.h"