diff --git a/include/config/keybind.h b/include/config/keybind.h
index 3d923530..bef3e189 100644
--- a/include/config/keybind.h
+++ b/include/config/keybind.h
@@ -2,7 +2,8 @@
 #ifndef LABWC_KEYBIND_H
 #define LABWC_KEYBIND_H
 
-#include <wlr/types/wlr_keyboard.h>
+#include <stdbool.h>
+#include <wayland-util.h>
 #include <xkbcommon/xkbcommon.h>
 
 #define MAX_KEYSYMS 32
diff --git a/include/input/cursor.h b/include/input/cursor.h
index e6cfb448..5afa831b 100644
--- a/include/input/cursor.h
+++ b/include/input/cursor.h
@@ -2,13 +2,15 @@
 #ifndef LABWC_CURSOR_H
 #define LABWC_CURSOR_H
 
-#include <wlr/types/wlr_cursor.h>
+#include <wayland-server-protocol.h>
 #include "common/edge.h"
 #include "common/node-type.h"
 
 struct view;
 struct seat;
 struct server;
+struct wlr_input_device;
+struct wlr_cursor;
 struct wlr_surface;
 struct wlr_scene_node;
 
diff --git a/include/input/ime.h b/include/input/ime.h
index ebf30c36..046e0926 100644
--- a/include/input/ime.h
+++ b/include/input/ime.h
@@ -3,10 +3,10 @@
 #ifndef LABWC_IME_H
 #define LABWC_IME_H
 
-#include <wlr/types/wlr_text_input_v3.h>
-#include <wlr/types/wlr_input_method_v2.h>
+#include <wayland-server-core.h>
 
 struct keyboard;
+struct wlr_keyboard_key_event;
 
 /*
  * The relay structure manages the relationship between text-inputs and
diff --git a/include/input/tablet-pad.h b/include/input/tablet-pad.h
index 3ada7634..e8be74f5 100644
--- a/include/input/tablet-pad.h
+++ b/include/input/tablet-pad.h
@@ -3,7 +3,6 @@
 #define LABWC_TABLET_PAD_H
 
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_tablet_v2.h>
 
 struct seat;
 struct wlr_device;
diff --git a/include/input/tablet.h b/include/input/tablet.h
index 094dad9a..eb3234f4 100644
--- a/include/input/tablet.h
+++ b/include/input/tablet.h
@@ -3,7 +3,6 @@
 #define LABWC_TABLET_H
 
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_tablet_v2.h>
 #include "config/types.h"
 
 struct seat;
diff --git a/include/labwc.h b/include/labwc.h
index 2509292e..72dbe687 100644
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -2,6 +2,7 @@
 #ifndef LABWC_H
 #define LABWC_H
 #include "config.h"
+#include <wlr/util/box.h>
 #include <wlr/util/log.h>
 #include "common/set.h"
 #include "input/cursor.h"
diff --git a/include/layers.h b/include/layers.h
index b995fc8b..da1bdb86 100644
--- a/include/layers.h
+++ b/include/layers.h
@@ -1,8 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef LABWC_LAYERS_H
 #define LABWC_LAYERS_H
-#include <wayland-server.h>
-#include <wlr/types/wlr_layer_shell_v1.h>
+
+#include <wayland-server-core.h>
+#include <wlr/util/box.h>
 
 struct server;
 struct output;
diff --git a/include/node.h b/include/node.h
index 7e8b6b50..52ebed96 100644
--- a/include/node.h
+++ b/include/node.h
@@ -1,9 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef LABWC_NODE_DESCRIPTOR_H
 #define LABWC_NODE_DESCRIPTOR_H
-#include <wlr/types/wlr_scene.h>
+
+#include <wayland-server-core.h>
 #include "common/node-type.h"
 
+struct wlr_scene_node;
+
 struct node_descriptor {
 	enum lab_node_type type;
 	struct view *view;
diff --git a/include/session-lock.h b/include/session-lock.h
index 715c859f..207f0393 100644
--- a/include/session-lock.h
+++ b/include/session-lock.h
@@ -2,7 +2,7 @@
 #ifndef LABWC_SESSION_LOCK_H
 #define LABWC_SESSION_LOCK_H
 
-#include <wlr/types/wlr_session_lock_v1.h>
+#include <wayland-server-core.h>
 
 struct output;
 struct server;
diff --git a/include/theme.h b/include/theme.h
index 0df661e5..797b5072 100644
--- a/include/theme.h
+++ b/include/theme.h
@@ -9,7 +9,7 @@
 #define LABWC_THEME_H
 
 #include <cairo.h>
-#include <wlr/render/wlr_renderer.h>
+#include <stdbool.h>
 #include "common/node-type.h"
 
 struct lab_img;
diff --git a/src/action.c b/src/action.c
index d02bf541..60c57b33 100644
--- a/src/action.c
+++ b/src/action.c
@@ -6,6 +6,7 @@
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/util/log.h>
 #include "action-prompt-codes.h"
diff --git a/src/desktop.c b/src/desktop.c
index 7bfb2cbb..099c493b 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -1,6 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "config.h"
 #include <assert.h>
+#include <wlr/types/wlr_cursor.h>
+#include <wlr/types/wlr_layer_shell_v1.h>
+#include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/types/wlr_subcompositor.h>
 #include <wlr/types/wlr_xdg_shell.h>
diff --git a/src/edges.c b/src/edges.c
index bdd1ef45..56fb8bfa 100644
--- a/src/edges.c
+++ b/src/edges.c
@@ -3,6 +3,8 @@
 #include <assert.h>
 #include <limits.h>
 #include <pixman.h>
+#include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/util/box.h>
 #include "common/border.h"
 #include "common/box.h"
diff --git a/src/input/cursor.c b/src/input/cursor.c
index a24235cc..36a9046b 100644
--- a/src/input/cursor.c
+++ b/src/input/cursor.c
@@ -4,8 +4,10 @@
 #include <assert.h>
 #include <time.h>
 #include <wlr/backend/libinput.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_cursor_shape_v1.h>
 #include <wlr/types/wlr_data_device.h>
+#include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>
 #include <wlr/types/wlr_primary_selection.h>
 #include <wlr/types/wlr_relative_pointer_v1.h>
diff --git a/src/input/gestures.c b/src/input/gestures.c
index 5a0365fe..b40da82c 100644
--- a/src/input/gestures.c
+++ b/src/input/gestures.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "input/gestures.h"
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_pointer_gestures_v1.h>
 #include "common/macros.h"
 #include "labwc.h"
diff --git a/src/input/ime.c b/src/input/ime.c
index 18fb252f..92d88ffe 100644
--- a/src/input/ime.c
+++ b/src/input/ime.c
@@ -3,7 +3,12 @@
 
 #include "input/ime.h"
 #include <assert.h>
+#include <wlr/types/wlr_input_method_v2.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
+#include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_scene.h>
+#include <wlr/types/wlr_seat.h>
+#include <wlr/types/wlr_text_input_v3.h>
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include "common/mem.h"
diff --git a/src/input/keyboard.c b/src/input/keyboard.c
index 3ca616e1..ae92e73f 100644
--- a/src/input/keyboard.c
+++ b/src/input/keyboard.c
@@ -6,6 +6,7 @@
 #include <wlr/backend/session.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/types/wlr_keyboard_group.h>
+#include <wlr/types/wlr_seat.h>
 #include "action.h"
 #include "common/macros.h"
 #include "config/keybind.h"
diff --git a/src/input/tablet-pad.c b/src/input/tablet-pad.c
index 5d9e6dd9..230b6e6b 100644
--- a/src/input/tablet-pad.c
+++ b/src/input/tablet-pad.c
@@ -4,6 +4,7 @@
 #include <wlr/backend/libinput.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_tablet_pad.h>
+#include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/util/log.h>
 #include "common/macros.h"
 #include "common/mem.h"
diff --git a/src/input/tablet.c b/src/input/tablet.c
index 4b12579a..319c06b3 100644
--- a/src/input/tablet.c
+++ b/src/input/tablet.c
@@ -2,7 +2,9 @@
 #include "input/tablet.h"
 #include <stdlib.h>
 #include <linux/input-event-codes.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_tablet_tool.h>
+#include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/util/log.h>
 #include <wlr/types/wlr_scene.h>
 #include "common/macros.h"
diff --git a/src/input/touch.c b/src/input/touch.c
index 9f4f1eca..d6557014 100644
--- a/src/input/touch.c
+++ b/src/input/touch.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "input/touch.h"
 #include <wayland-util.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/types/wlr_touch.h>
diff --git a/src/interactive.c b/src/interactive.c
index 2dc4faa1..f66a66b3 100644
--- a/src/interactive.c
+++ b/src/interactive.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <assert.h>
+#include <wlr/types/wlr_cursor.h>
 #include "config/rcxml.h"
 #include "edges.h"
 #include "input/keyboard.h"
diff --git a/src/layers.c b/src/layers.c
index c8f8e953..f26208ef 100644
--- a/src/layers.c
+++ b/src/layers.c
@@ -11,8 +11,10 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <strings.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>
 #include "common/macros.h"
diff --git a/src/magnifier.c b/src/magnifier.c
index 3764ad16..424865c9 100644
--- a/src/magnifier.c
+++ b/src/magnifier.c
@@ -4,6 +4,7 @@
 #include <assert.h>
 #include <wlr/render/allocator.h>
 #include <wlr/render/swapchain.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/util/transform.h>
diff --git a/src/menu/menu.c b/src/menu/menu.c
index 5cbd5804..e7a7b90c 100644
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
-#include <wayland-server-core.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>
 #include "action.h"
diff --git a/src/node.c b/src/node.c
index e5132e7c..046fa5e2 100644
--- a/src/node.c
+++ b/src/node.c
@@ -2,6 +2,7 @@
 #include "node.h"
 #include <assert.h>
 #include <stdlib.h>
+#include <wlr/types/wlr_scene.h>
 #include "common/mem.h"
 #include "ssd.h"
 
diff --git a/src/osd/osd.c b/src/osd/osd.c
index 8500eaf1..df1b7ad9 100644
--- a/src/osd/osd.c
+++ b/src/osd/osd.c
@@ -3,6 +3,7 @@
 #include <assert.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/util/box.h>
+#include <wlr/util/log.h>
 #include "common/array.h"
 #include "common/lab-scene-rect.h"
 #include "common/scene-helpers.h"
diff --git a/src/output-virtual.c b/src/output-virtual.c
index 164be7b6..f3a40e10 100644
--- a/src/output-virtual.c
+++ b/src/output-virtual.c
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <wlr/backend/headless.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_output_layout.h>
 #include "common/string-helpers.h"
 #include "labwc.h"
 #include "output.h"
diff --git a/src/output.c b/src/output.c
index c561f0f7..98da25ad 100644
--- a/src/output.c
+++ b/src/output.c
@@ -12,6 +12,7 @@
 #include <strings.h>
 #include <wlr/backend/drm.h>
 #include <wlr/backend/wayland.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_gamma_control_v1.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_management_v1.h>
diff --git a/src/overlay.c b/src/overlay.c
index 4cf6c4fd..508a531a 100644
--- a/src/overlay.c
+++ b/src/overlay.c
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "overlay.h"
 #include <assert.h>
+#include <wlr/types/wlr_cursor.h>
+#include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_scene.h>
 #include "common/lab-scene-rect.h"
 #include "config/rcxml.h"
diff --git a/src/regions.c b/src/regions.c
index bb0ecb23..a5170d4f 100644
--- a/src/regions.c
+++ b/src/regions.c
@@ -6,6 +6,7 @@
 #include <float.h>
 #include <math.h>
 #include <string.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/util/box.h>
 #include "common/list.h"
 #include "common/mem.h"
diff --git a/src/seat.c b/src/seat.c
index 25d8fc57..05f5a006 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -3,6 +3,7 @@
 #include <stdbool.h>
 #include <strings.h>
 #include <wlr/backend/libinput.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_keyboard.h>
 #include <wlr/types/wlr_keyboard_group.h>
diff --git a/src/session-lock.c b/src/session-lock.c
index 277233cc..a370241e 100644
--- a/src/session-lock.c
+++ b/src/session-lock.c
@@ -2,6 +2,9 @@
 #define _POSIX_C_SOURCE 200809L
 #include "session-lock.h"
 #include <assert.h>
+#include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_scene.h>
+#include <wlr/types/wlr_session_lock_v1.h>
 #include "common/mem.h"
 #include "labwc.h"
 #include "node.h"
diff --git a/src/ssd/ssd-button.c b/src/ssd/ssd-button.c
index af209f89..50131a12 100644
--- a/src/ssd/ssd-button.c
+++ b/src/ssd/ssd-button.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
 #include <assert.h>
+#include <wlr/types/wlr_scene.h>
 #include "config/rcxml.h"
 #include "common/list.h"
 #include "common/mem.h"
diff --git a/src/ssd/ssd-titlebar.c b/src/ssd/ssd-titlebar.c
index b9f95202..595a203d 100644
--- a/src/ssd/ssd-titlebar.c
+++ b/src/ssd/ssd-titlebar.c
@@ -4,6 +4,7 @@
 #include <assert.h>
 #include <string.h>
 #include <wlr/render/pixman.h>
+#include <wlr/types/wlr_scene.h>
 #include "buffer.h"
 #include "common/mem.h"
 #include "common/string-helpers.h"
diff --git a/src/ssd/ssd.c b/src/ssd/ssd.c
index ca3f10a9..0e900a65 100644
--- a/src/ssd/ssd.c
+++ b/src/ssd/ssd.c
@@ -9,6 +9,7 @@
 #include "ssd.h"
 #include <assert.h>
 #include <strings.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_scene.h>
 #include "common/mem.h"
 #include "config/rcxml.h"
diff --git a/src/view.c b/src/view.c
index 1f93d140..ef871313 100644
--- a/src/view.c
+++ b/src/view.c
@@ -2,6 +2,7 @@
 #include "view.h"
 #include <assert.h>
 #include <strings.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_keyboard_group.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_scene.h>
diff --git a/src/workspaces.c b/src/workspaces.c
index 5345f69d..43f19b18 100644
--- a/src/workspaces.c
+++ b/src/workspaces.c
@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_scene.h>
 #include "buffer.h"
 #include "common/font.h"
diff --git a/src/xdg-popup.c b/src/xdg-popup.c
index 722a32ff..aded80b5 100644
--- a/src/xdg-popup.c
+++ b/src/xdg-popup.c
@@ -7,6 +7,7 @@
  *	- keeping non-layer-shell xdg-popups outside the layers.c code
  */
 
+#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include "common/macros.h"
 #include "common/mem.h"
diff --git a/src/xdg.c b/src/xdg.c
index f25a0e84..1e09dd99 100644
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
 #include <assert.h>
+#include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_fractional_scale_v1.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_xdg_activation_v1.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/types/wlr_xdg_toplevel_icon_v1.h>
diff --git a/src/xwayland.c b/src/xwayland.c
index 2127bd52..0604dcaf 100644
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -4,6 +4,8 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/xwayland.h>