diff --git a/include/sway/config.h b/include/sway/config.h
index 254fbad00..b8327e9cc 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -5,8 +5,8 @@
 #include <string.h>
 #include <time.h>
 #include <wlr/interfaces/wlr_switch.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_tablet_tool.h>
+#include <wlr/util/box.h>
 #include <xkbcommon/xkbcommon.h>
 #include "../include/config.h"
 #include "list.h"
diff --git a/include/sway/layers.h b/include/sway/layers.h
index 457634c24..82ac53680 100644
--- a/include/sway/layers.h
+++ b/include/sway/layers.h
@@ -1,7 +1,6 @@
 #ifndef _SWAY_LAYERS_H
 #define _SWAY_LAYERS_H
 #include <stdbool.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 
diff --git a/include/sway/output.h b/include/sway/output.h
index 0ebcc77da..5dfe0fff9 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -3,7 +3,6 @@
 #include <time.h>
 #include <unistd.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
 #include "config.h"
 #include "sway/tree/node.h"
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index ddb2d683d..38ee68bd2 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -2,7 +2,6 @@
 #define _SWAY_CONTAINER_H
 #include <stdint.h>
 #include <sys/types.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
 #include "list.h"
 #include "sway/tree/node.h"
diff --git a/sway/commands/input/map_to_region.c b/sway/commands/input/map_to_region.c
index e85495e53..284b57d0c 100644
--- a/sway/commands/input/map_to_region.c
+++ b/sway/commands/input/map_to_region.c
@@ -1,7 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <string.h>
-#include <wlr/types/wlr_box.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index 197189910..cadc702ab 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_output_damage.h>
 #include <wlr/types/wlr_output.h>
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index aa1482907..2f2ab4bc1 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -5,7 +5,6 @@
 #include <time.h>
 #include <wayland-server-core.h>
 #include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_buffer.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_output_damage.h>
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index bf1b8666c..a5bd8a5fc 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -7,7 +7,6 @@
 #include <wayland-server-core.h>
 #include <wlr/render/gles2.h>
 #include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_buffer.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_output_damage.h>
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index c89d5166f..95edf7be0 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -6,7 +6,6 @@
 #include <errno.h>
 #include <time.h>
 #include <strings.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_pointer.h>
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 6c438424d..1b64f86e1 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -1,8 +1,11 @@
+#include <ctype.h>
 #include <float.h>
 #include <json.h>
 #include <libevdev/libevdev.h>
 #include <stdio.h>
-#include <ctype.h>
+#include <wlr/backend/libinput.h>
+#include <wlr/types/wlr_output.h>
+#include <xkbcommon/xkbcommon.h>
 #include "config.h"
 #include "log.h"
 #include "sway/config.h"
@@ -14,10 +17,6 @@
 #include "sway/input/input-manager.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
-#include <wlr/backend/libinput.h>
-#include <wlr/types/wlr_box.h>
-#include <wlr/types/wlr_output.h>
-#include <xkbcommon/xkbcommon.h>
 #include "wlr-layer-shell-unstable-v1-protocol.h"
 #include "sway/desktop/idle_inhibit_v1.h"