From: John Lindgren <john@jlindgren.net>
Date: Wed, 3 Sep 2025 03:19:38 +0000 (-0400)
Subject: src: remove unused #includes (via include-what-you-use)
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=b00873a988d7a94a94a62351735117b53761f194;p=proto%2Flabwc.git

src: remove unused #includes (via include-what-you-use)
---

diff --git a/clients/labnag.c b/clients/labnag.c
index 92eda9cb..20fb1dbe 100644
--- a/clients/labnag.c
+++ b/clients/labnag.c
@@ -16,17 +16,14 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <strings.h>
 #ifdef __FreeBSD__
 #include <sys/event.h> /* For signalfd() */
 #endif
 #include <sys/signalfd.h>
-#include <sys/stat.h>
 #include <sys/timerfd.h>
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-client.h>
 #include <wayland-cursor.h>
 #include <wlr/util/log.h>
 #include "action-prompt-codes.h"
@@ -62,8 +59,6 @@ struct conf {
 	ssize_t button_padding;
 };
 
-struct nag;
-
 struct pointer {
 	struct wl_pointer *pointer;
 	uint32_t serial;
diff --git a/clients/pool-buffer.c b/clients/pool-buffer.c
index 5dabc8aa..35e86033 100644
--- a/clients/pool-buffer.c
+++ b/clients/pool-buffer.c
@@ -5,18 +5,14 @@
  * Copyright (C) 2016-2017 Drew DeVault
  */
 #define _POSIX_C_SOURCE 200809L
-#include <assert.h>
 #include <cairo.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <pango/pangocairo.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/mman.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-client.h>
 #include "pool-buffer.h"
 
 static int anonymous_shm_open(void)
diff --git a/src/common/box.c b/src/common/box.c
index 84db600d..2520f733 100644
--- a/src/common/box.c
+++ b/src/common/box.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "common/box.h"
-#include <assert.h>
 #include "common/macros.h"
 
 bool
diff --git a/src/common/dir.c b/src/common/dir.c
index a76d5c74..76b4e65e 100644
--- a/src/common/dir.c
+++ b/src/common/dir.c
@@ -7,16 +7,13 @@
 #include "common/dir.h"
 #include <assert.h>
 #include <glib.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include "common/buf.h"
 #include "common/list.h"
 #include "common/mem.h"
 #include "common/string-helpers.h"
 #include "config/rcxml.h"
-#include "labwc.h"
 
 struct dir {
 	const char *prefix;
diff --git a/src/common/font.c b/src/common/font.c
index 8823f445..81784ea8 100644
--- a/src/common/font.c
+++ b/src/common/font.c
@@ -1,14 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "common/font.h"
 #include <cairo.h>
-#include <drm_fourcc.h>
 #include <pango/pangocairo.h>
-#include <wlr/render/wlr_renderer.h>
-#include <wlr/util/box.h>
 #include <wlr/util/log.h>
 #include "common/graphic-helpers.h"
 #include "common/string-helpers.h"
-#include "labwc.h"
 #include "buffer.h"
 
 PangoFontDescription *
diff --git a/src/common/graphic-helpers.c b/src/common/graphic-helpers.c
index 602507a9..bc0adbc4 100644
--- a/src/common/graphic-helpers.c
+++ b/src/common/graphic-helpers.c
@@ -3,7 +3,7 @@
 #include "common/graphic-helpers.h"
 #include <cairo.h>
 #include <glib.h> /* g_ascii_strcasecmp */
-#include <wlr/types/wlr_scene.h>
+#include <wlr/util/box.h>
 #include "common/macros.h"
 #include "xcolor-table.h"
 
diff --git a/src/common/parse-double.c b/src/common/parse-double.c
index 0e32ef3e..a41e57f2 100644
--- a/src/common/parse-double.c
+++ b/src/common/parse-double.c
@@ -2,7 +2,6 @@
 #include "common/parse-double.h"
 #include <locale.h>
 #include <stdlib.h>
-#include <string.h>
 #include <wlr/util/log.h>
 #include "common/mem.h"
 
diff --git a/src/common/scene-helpers.c b/src/common/scene-helpers.c
index 5f8a8139..517789c0 100644
--- a/src/common/scene-helpers.c
+++ b/src/common/scene-helpers.c
@@ -5,12 +5,8 @@
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/util/log.h>
-#include <wlr/util/region.h>
-#include <wlr/util/transform.h>
-#include "labwc.h"
 #include "magnifier.h"
 #include "output.h"
-#include "output-state.h"
 
 struct wlr_surface *
 lab_wlr_surface_from_node(struct wlr_scene_node *node)
diff --git a/src/common/spawn.c b/src/common/spawn.c
index 51de6b4a..898c4800 100644
--- a/src/common/spawn.c
+++ b/src/common/spawn.c
@@ -6,7 +6,6 @@
 #include <glib.h>
 #include <signal.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <wlr/util/log.h>
diff --git a/src/config/keybind.c b/src/config/keybind.c
index 2635b7bc..1705983a 100644
--- a/src/config/keybind.c
+++ b/src/config/keybind.c
@@ -3,7 +3,6 @@
 #include "config/keybind.h"
 #include <assert.h>
 #include <glib.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wlr/types/wlr_keyboard_group.h>
diff --git a/src/config/mousebind.c b/src/config/mousebind.c
index 7460dfad..6b5254f3 100644
--- a/src/config/mousebind.c
+++ b/src/config/mousebind.c
@@ -4,7 +4,6 @@
 #include <assert.h>
 #include <linux/input-event-codes.h>
 #include <strings.h>
-#include <unistd.h>
 #include <wlr/util/log.h>
 #include "common/list.h"
 #include "common/mem.h"
diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 08a70edf..35195345 100644
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -2,17 +2,13 @@
 #define _POSIX_C_SOURCE 200809L
 #include "config/rcxml.h"
 #include <assert.h>
-#include <fcntl.h>
 #include <glib.h>
 #include <libxml/parser.h>
-#include <libxml/tree.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <unistd.h>
-#include <wayland-server-core.h>
 #include <wlr/util/box.h>
 #include <wlr/util/log.h>
 #include "action.h"
diff --git a/src/config/session.c b/src/config/session.c
index c90c655d..515b6803 100644
--- a/src/config/session.c
+++ b/src/config/session.c
@@ -8,14 +8,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <wlr/backend/drm.h>
 #include <wlr/backend/multi.h>
 #include <wlr/util/log.h>
 #include "common/buf.h"
 #include "common/dir.h"
 #include "common/file-helpers.h"
-#include "common/mem.h"
 #include "common/parse-bool.h"
 #include "common/spawn.h"
 #include "common/string-helpers.h"
diff --git a/src/config/touch.c b/src/config/touch.c
index fde785e1..05592a46 100644
--- a/src/config/touch.c
+++ b/src/config/touch.c
@@ -3,7 +3,6 @@
 #include "config/touch.h"
 #include <strings.h>
 #include <wlr/util/log.h>
-#include "common/list.h"
 #include "config/rcxml.h"
 
 static struct touch_config_entry *
diff --git a/src/desktop-entry.c b/src/desktop-entry.c
index 67b85e1d..60cff28e 100644
--- a/src/desktop-entry.c
+++ b/src/desktop-entry.c
@@ -7,12 +7,10 @@
 #include <string.h>
 #include <strings.h>
 #include <wlr/util/log.h>
-#include "common/macros.h"
 #include "common/mem.h"
 #include "common/string-helpers.h"
 #include "config/rcxml.h"
 #include "img/img.h"
-
 #include "labwc.h"
 
 static const char *debug_libsfdo;
diff --git a/src/desktop.c b/src/desktop.c
index bb9b5dfd..7bfb2cbb 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -10,13 +10,10 @@
 #include "labwc.h"
 #include "layers.h"
 #include "node.h"
-#include "osd.h"
 #include "output.h"
 #include "ssd.h"
 #include "view.h"
-#include "window-rules.h"
 #include "workspaces.h"
-#include "xwayland.h"
 
 #if HAVE_XWAYLAND
 #include <wlr/xwayland.h>
diff --git a/src/edges.c b/src/edges.c
index 79532226..bdd1ef45 100644
--- a/src/edges.c
+++ b/src/edges.c
@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <limits.h>
 #include <pixman.h>
-#include <wlr/util/edges.h>
 #include <wlr/util/box.h>
 #include "common/border.h"
 #include "common/box.h"
diff --git a/src/img/img-png.c b/src/img/img-png.c
index 5e151f21..29eba44d 100644
--- a/src/img/img-png.c
+++ b/src/img/img-png.c
@@ -4,12 +4,10 @@
  */
 #define _POSIX_C_SOURCE 200809L
 #include "img/img-png.h"
-#include <assert.h>
 #include <cairo.h>
 #include <png.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <wlr/util/log.h>
 #include "buffer.h"
 #include "common/string-helpers.h"
diff --git a/src/img/img-svg.c b/src/img/img-svg.c
index ad2d2916..1c12bde3 100644
--- a/src/img/img-svg.c
+++ b/src/img/img-svg.c
@@ -6,13 +6,10 @@
 #include "img/img-svg.h"
 #include <cairo.h>
 #include <librsvg/rsvg.h>
-#include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <wlr/util/log.h>
 #include "buffer.h"
 #include "common/string-helpers.h"
-#include "labwc.h"
 
 RsvgHandle *
 img_svg_load(const char *filename)
diff --git a/src/img/img-xbm.c b/src/img/img-xbm.c
index ca433cad..6ecbbc9a 100644
--- a/src/img/img-xbm.c
+++ b/src/img/img-xbm.c
@@ -8,13 +8,10 @@
 #define _POSIX_C_SOURCE 200809L
 #include "img/img-xbm.h"
 #include <assert.h>
-#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <drm_fourcc.h>
-#include "img/img.h"
 #include "common/grab-file.h"
 #include "common/mem.h"
 #include "common/string-helpers.h"
diff --git a/src/img/img.c b/src/img/img.c
index d062022e..41bda9e4 100644
--- a/src/img/img.c
+++ b/src/img/img.c
@@ -2,7 +2,6 @@
 
 #include "img/img.h"
 #include <assert.h>
-#include <wlr/util/log.h>
 #include "buffer.h"
 #include "config.h"
 #include "common/box.h"
diff --git a/src/input/cursor.c b/src/input/cursor.c
index 42757128..a24235cc 100644
--- a/src/input/cursor.c
+++ b/src/input/cursor.c
@@ -2,8 +2,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include "input/cursor.h"
 #include <assert.h>
-#include <linux/input-event-codes.h>
-#include <sys/time.h>
 #include <time.h>
 #include <wlr/backend/libinput.h>
 #include <wlr/types/wlr_cursor_shape_v1.h>
@@ -19,7 +17,6 @@
 #include "action.h"
 #include "common/macros.h"
 #include "common/mem.h"
-#include "common/scene-helpers.h"
 #include "common/surface-helpers.h"
 #include "config/mousebind.h"
 #include "config/rcxml.h"
@@ -33,7 +30,6 @@
 #include "layers.h"
 #include "menu/menu.h"
 #include "output.h"
-#include "regions.h"
 #include "resistance.h"
 #include "resize-outlines.h"
 #include "ssd.h"
diff --git a/src/input/ime.c b/src/input/ime.c
index 36bc8252..18fb252f 100644
--- a/src/input/ime.c
+++ b/src/input/ime.c
@@ -11,7 +11,6 @@
 #include "labwc.h"
 #include "node.h"
 #include "output.h"
-#include "view.h"
 
 #define SAME_CLIENT(wlr_obj1, wlr_obj2) \
 	(wl_resource_get_client((wlr_obj1)->resource) \
diff --git a/src/input/key-state.c b/src/input/key-state.c
index 12992615..def6b72c 100644
--- a/src/input/key-state.c
+++ b/src/input/key-state.c
@@ -4,8 +4,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <wlr/util/log.h>
 #include "common/set.h"
 
 static struct lab_set pressed, bound, pressed_sent;
diff --git a/src/input/keyboard.c b/src/input/keyboard.c
index 0050b860..3ca616e1 100644
--- a/src/input/keyboard.c
+++ b/src/input/keyboard.c
@@ -3,7 +3,6 @@
 #include "input/keyboard.h"
 #include <assert.h>
 #include <stdlib.h>
-#include <wlr/backend/multi.h>
 #include <wlr/backend/session.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/types/wlr_keyboard_group.h>
@@ -17,7 +16,6 @@
 #include "labwc.h"
 #include "menu/menu.h"
 #include "osd.h"
-#include "regions.h"
 #include "session-lock.h"
 #include "view.h"
 #include "workspaces.h"
diff --git a/src/input/tablet-pad.c b/src/input/tablet-pad.c
index 06e00f4e..5d9e6dd9 100644
--- a/src/input/tablet-pad.c
+++ b/src/input/tablet-pad.c
@@ -1,11 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "input/tablet-pad.h"
-#include <assert.h>
 #include <stdlib.h>
 #include <wlr/backend/libinput.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_tablet_pad.h>
-#include <wlr/types/wlr_tablet_tool.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 11a5a7d5..4b12579a 100644
--- a/src/input/tablet.c
+++ b/src/input/tablet.c
@@ -1,9 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "input/tablet.h"
-#include <assert.h>
 #include <stdlib.h>
 #include <linux/input-event-codes.h>
-#include <wlr/types/wlr_tablet_pad.h>
 #include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/util/log.h>
 #include <wlr/types/wlr_scene.h>
diff --git a/src/interactive.c b/src/interactive.c
index 061fe07a..2dc4faa1 100644
--- a/src/interactive.c
+++ b/src/interactive.c
@@ -7,7 +7,6 @@
 #include "output.h"
 #include "regions.h"
 #include "resize-indicator.h"
-#include "snap.h"
 #include "view.h"
 #include "window-rules.h"
 
diff --git a/src/layers.c b/src/layers.c
index 685f8973..c8f8e953 100644
--- a/src/layers.c
+++ b/src/layers.c
@@ -10,9 +10,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <string.h>
 #include <strings.h>
-#include <wayland-server.h>
 #include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_xdg_shell.h>
diff --git a/src/menu/menu.c b/src/menu/menu.c
index e55f7626..5cbd5804 100644
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -3,7 +3,6 @@
 #include "menu/menu.h"
 #include <assert.h>
 #include <libxml/parser.h>
-#include <libxml/tree.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -20,7 +19,6 @@
 #include "common/lab-scene-rect.h"
 #include "common/list.h"
 #include "common/mem.h"
-#include "common/scene-helpers.h"
 #include "common/spawn.h"
 #include "common/string-helpers.h"
 #include "common/xml.h"
diff --git a/src/osd/osd-classic.c b/src/osd/osd-classic.c
index 501a86a2..be740f2f 100644
--- a/src/osd/osd-classic.c
+++ b/src/osd/osd-classic.c
@@ -1,24 +1,20 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <assert.h>
-#include <cairo.h>
-#include <wlr/util/log.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/util/box.h>
+#include <wlr/util/log.h>
 #include "common/array.h"
 #include "common/buf.h"
 #include "common/font.h"
 #include "common/lab-scene-rect.h"
-#include "common/scene-helpers.h"
 #include "common/string-helpers.h"
 #include "config/rcxml.h"
 #include "labwc.h"
-#include "node.h"
 #include "osd.h"
 #include "output.h"
 #include "scaled-buffer/scaled-font-buffer.h"
 #include "scaled-buffer/scaled-icon-buffer.h"
 #include "theme.h"
-#include "view.h"
-#include "window-rules.h"
 #include "workspaces.h"
 
 struct osd_classic_scene_item {
diff --git a/src/osd/osd-thumbnail.c b/src/osd/osd-thumbnail.c
index 9804d1ec..0345582a 100644
--- a/src/osd/osd-thumbnail.c
+++ b/src/osd/osd-thumbnail.c
@@ -2,7 +2,6 @@
 #include <assert.h>
 #include <wlr/render/swapchain.h>
 #include <wlr/types/wlr_scene.h>
-#include <wlr/types/wlr_compositor.h>
 #include <wlr/render/allocator.h>
 #include "config/rcxml.h"
 #include "common/array.h"
diff --git a/src/osd/osd.c b/src/osd/osd.c
index e8d32348..8500eaf1 100644
--- a/src/osd/osd.c
+++ b/src/osd/osd.c
@@ -1,23 +1,19 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "osd.h"
 #include <assert.h>
-#include <cairo.h>
-#include <wlr/util/log.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/util/box.h>
 #include "common/array.h"
 #include "common/lab-scene-rect.h"
 #include "common/scene-helpers.h"
 #include "config/rcxml.h"
 #include "labwc.h"
-#include "node.h"
 #include "output.h"
 #include "scaled-buffer/scaled-font-buffer.h"
 #include "scaled-buffer/scaled-icon-buffer.h"
 #include "ssd.h"
 #include "theme.h"
 #include "view.h"
-#include "window-rules.h"
-#include "workspaces.h"
 
 static void update_osd(struct server *server);
 
diff --git a/src/output.c b/src/output.c
index c5c88dfc..c561f0f7 100644
--- a/src/output.c
+++ b/src/output.c
@@ -12,8 +12,6 @@
 #include <strings.h>
 #include <wlr/backend/drm.h>
 #include <wlr/backend/wayland.h>
-#include <wlr/types/wlr_buffer.h>
-#include <wlr/types/wlr_drm_lease_v1.h>
 #include <wlr/types/wlr_gamma_control_v1.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_management_v1.h>
@@ -21,7 +19,6 @@
 #include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/types/wlr_xdg_output_v1.h>
 #include <wlr/types/wlr_scene.h>
-#include <wlr/util/region.h>
 #include <wlr/util/log.h>
 #include "common/macros.h"
 #include "common/mem.h"
diff --git a/src/protocols/cosmic_workspaces/cosmic-workspaces.c b/src/protocols/cosmic_workspaces/cosmic-workspaces.c
index 20d8b822..d12611cb 100644
--- a/src/protocols/cosmic_workspaces/cosmic-workspaces.c
+++ b/src/protocols/cosmic_workspaces/cosmic-workspaces.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <assert.h>
-#include <wlr/types/wlr_output.h>
 #include <wlr/util/log.h>
 #include "common/array.h"
 #include "common/mem.h"
diff --git a/src/protocols/ext-workspace/ext-workspace.c b/src/protocols/ext-workspace/ext-workspace.c
index eb02e3dc..30875811 100644
--- a/src/protocols/ext-workspace/ext-workspace.c
+++ b/src/protocols/ext-workspace/ext-workspace.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <assert.h>
-#include <wlr/types/wlr_output.h>
 #include <wlr/util/log.h>
-#include "common/array.h"
 #include "common/mem.h"
 #include "common/list.h"
 #include "ext-workspace-v1-protocol.h"
diff --git a/src/regions.c b/src/regions.c
index c06698b9..bb0ecb23 100644
--- a/src/regions.c
+++ b/src/regions.c
@@ -6,9 +6,7 @@
 #include <float.h>
 #include <math.h>
 #include <string.h>
-#include <wlr/types/wlr_scene.h>
 #include <wlr/util/box.h>
-#include <wlr/util/log.h>
 #include "common/list.h"
 #include "common/mem.h"
 #include "config/rcxml.h"
diff --git a/src/resistance.c b/src/resistance.c
index 4566c5d0..12cbec90 100644
--- a/src/resistance.c
+++ b/src/resistance.c
@@ -1,9 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "resistance.h"
 #include <assert.h>
-#include <limits.h>
 #include "common/border.h"
-#include "common/macros.h"
 #include "config/rcxml.h"
 #include "edges.h"
 #include "labwc.h"
diff --git a/src/scaled-buffer/scaled-font-buffer.c b/src/scaled-buffer/scaled-font-buffer.c
index 7b252481..61fd5db3 100644
--- a/src/scaled-buffer/scaled-font-buffer.c
+++ b/src/scaled-buffer/scaled-font-buffer.c
@@ -4,9 +4,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wayland-server-core.h>
 #include <wlr/util/log.h>
-#include "buffer.h"
 #include "common/font.h"
 #include "common/graphic-helpers.h"
 #include "common/mem.h"
diff --git a/src/scaled-buffer/scaled-icon-buffer.c b/src/scaled-buffer/scaled-icon-buffer.c
index b8f08efc..b7124336 100644
--- a/src/scaled-buffer/scaled-icon-buffer.c
+++ b/src/scaled-buffer/scaled-icon-buffer.c
@@ -5,7 +5,6 @@
 #include <string.h>
 #include <wlr/util/log.h>
 #include "buffer.h"
-#include "common/macros.h"
 #include "common/mem.h"
 #include "common/string-helpers.h"
 #include "config.h"
diff --git a/src/scaled-buffer/scaled-img-buffer.c b/src/scaled-buffer/scaled-img-buffer.c
index 488c861c..4ce9618a 100644
--- a/src/scaled-buffer/scaled-img-buffer.c
+++ b/src/scaled-buffer/scaled-img-buffer.c
@@ -2,9 +2,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include "scaled-buffer/scaled-img-buffer.h"
 #include <assert.h>
-#include <wayland-server-core.h>
-#include <wlr/types/wlr_scene.h>
-#include "buffer.h"
 #include "common/mem.h"
 #include "img/img.h"
 #include "node.h"
diff --git a/src/server.c b/src/server.c
index 7560986d..56f091b9 100644
--- a/src/server.c
+++ b/src/server.c
@@ -19,7 +19,6 @@
 #include <wlr/types/wlr_ext_image_copy_capture_v1.h>
 #include <wlr/types/wlr_foreign_toplevel_management_v1.h>
 #include <wlr/types/wlr_fractional_scale_v1.h>
-#include <wlr/types/wlr_gamma_control_v1.h>
 #include <wlr/types/wlr_input_method_v2.h>
 #include <wlr/types/wlr_linux_drm_syncobj_v1.h>
 #include <wlr/types/wlr_output_power_management_v1.h>
@@ -45,7 +44,6 @@
 #include "xwayland-shell-v1-protocol.h"
 #endif
 
-#include "drm-lease-v1-protocol.h"
 #include "action.h"
 #include "common/macros.h"
 #include "config/rcxml.h"
@@ -59,7 +57,6 @@
 #include "magnifier.h"
 #include "menu/menu.h"
 #include "output.h"
-#include "output-state.h"
 #include "output-virtual.h"
 #include "regions.h"
 #include "resize-indicator.h"
diff --git a/src/snap-constraints.c b/src/snap-constraints.c
index d579a387..fd1f09cd 100644
--- a/src/snap-constraints.c
+++ b/src/snap-constraints.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "snap-constraints.h"
 #include <assert.h>
+#include <string.h>
 #include <wlr/util/box.h>
 #include "common/macros.h"
-#include "labwc.h"
 #include "view.h"
 
 /*
diff --git a/src/ssd/ssd-border.c b/src/ssd/ssd-border.c
index 54ef73e9..f0db4fff 100644
--- a/src/ssd/ssd-border.c
+++ b/src/ssd/ssd-border.c
@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <wlr/types/wlr_scene.h>
 #include "common/macros.h"
-#include "common/scene-helpers.h"
 #include "labwc.h"
 #include "ssd.h"
 #include "ssd-internal.h"
diff --git a/src/ssd/ssd-extents.c b/src/ssd/ssd-extents.c
index 8a38c39e..bc1ed9f7 100644
--- a/src/ssd/ssd-extents.c
+++ b/src/ssd/ssd-extents.c
@@ -1,9 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
-#include <assert.h>
 #include <pixman.h>
 #include <wlr/types/wlr_scene.h>
-#include "common/scene-helpers.h"
 #include "config/rcxml.h"
 #include "labwc.h"
 #include "output.h"
diff --git a/src/ssd/ssd-shadow.c b/src/ssd/ssd-shadow.c
index a535112e..53c6631d 100644
--- a/src/ssd/ssd-shadow.c
+++ b/src/ssd/ssd-shadow.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
 #include <assert.h>
-#include <cairo.h>
 #include <wlr/types/wlr_scene.h>
 #include "buffer.h"
 #include "config/rcxml.h"
diff --git a/src/ssd/ssd-titlebar.c b/src/ssd/ssd-titlebar.c
index 84dd527a..b9f95202 100644
--- a/src/ssd/ssd-titlebar.c
+++ b/src/ssd/ssd-titlebar.c
@@ -6,11 +6,8 @@
 #include <wlr/render/pixman.h>
 #include "buffer.h"
 #include "common/mem.h"
-#include "common/scene-helpers.h"
 #include "common/string-helpers.h"
 #include "config/rcxml.h"
-#include "desktop-entry.h"
-#include "img/img.h"
 #include "labwc.h"
 #include "node.h"
 #include "scaled-buffer/scaled-font-buffer.h"
diff --git a/src/ssd/ssd.c b/src/ssd/ssd.c
index afdbcdf9..ca3f10a9 100644
--- a/src/ssd/ssd.c
+++ b/src/ssd/ssd.c
@@ -11,7 +11,6 @@
 #include <strings.h>
 #include <wlr/types/wlr_scene.h>
 #include "common/mem.h"
-#include "common/scene-helpers.h"
 #include "config/rcxml.h"
 #include "labwc.h"
 #include "node.h"
diff --git a/src/theme.c b/src/theme.c
index a8a3227d..f0b48158 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -7,7 +7,6 @@
 
 #define _POSIX_C_SOURCE 200809L
 #include "theme.h"
-#include "config.h"
 #include <assert.h>
 #include <cairo.h>
 #include <drm_fourcc.h>
diff --git a/src/view-impl-common.c b/src/view-impl-common.c
index 377d8c76..d529941a 100644
--- a/src/view-impl-common.c
+++ b/src/view-impl-common.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /* view-impl-common.c: common code for shell view->impl functions */
 #include "view-impl-common.h"
-#include <strings.h>
 #include "foreign-toplevel/foreign.h"
 #include "labwc.h"
 #include "view.h"
diff --git a/src/view.c b/src/view.c
index 92e5db92..1f93d140 100644
--- a/src/view.c
+++ b/src/view.c
@@ -13,7 +13,6 @@
 #include "common/list.h"
 #include "common/match.h"
 #include "common/mem.h"
-#include "common/scene-helpers.h"
 #include "config/rcxml.h"
 #include "foreign-toplevel/foreign.h"
 #include "input/keyboard.h"
@@ -33,7 +32,6 @@
 #include "window-rules.h"
 #include "wlr/util/log.h"
 #include "workspaces.h"
-#include "xwayland.h"
 
 #if HAVE_XWAYLAND
 #include <wlr/xwayland.h>
diff --git a/src/window-rules.c b/src/window-rules.c
index 8283e801..0b8f1101 100644
--- a/src/window-rules.c
+++ b/src/window-rules.c
@@ -3,12 +3,8 @@
 #include "window-rules.h"
 #include <assert.h>
 #include <stdbool.h>
-#include <cairo.h>
-#include <glib.h>
 #include <strings.h>
-#include <wlr/util/log.h>
 #include "action.h"
-#include "common/match.h"
 #include "config/rcxml.h"
 #include "labwc.h"
 #include "view.h"