diff --git a/cagebreak.c b/cagebreak.c
index 0591591..ef1e145 100644
--- a/cagebreak.c
+++ b/cagebreak.c
@@ -10,17 +10,14 @@
 
 #include "config.h"
 
-#include <fcntl.h>
 #include <fontconfig/fontconfig.h>
-#include <getopt.h>
+#include <unistd.h>
 #include <pango.h>
 #include <pango/pangocairo.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/wait.h>
-#include <unistd.h>
 #include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/render/wlr_renderer.h>
@@ -31,7 +28,6 @@
 #include <wlr/types/wlr_gamma_control_v1.h>
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_idle_inhibit_v1.h>
-#include <wlr/types/wlr_output_damage.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_screencopy_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
@@ -54,7 +50,6 @@
 #include "parse.h"
 #include "seat.h"
 #include "server.h"
-#include "view.h"
 #include "xdg_shell.h"
 #if CG_HAS_XWAYLAND
 #include "xwayland.h"
diff --git a/idle_inhibit_v1.c b/idle_inhibit_v1.c
index 17c0041..7da2dd7 100644
--- a/idle_inhibit_v1.c
+++ b/idle_inhibit_v1.c
@@ -7,7 +7,6 @@
  * See the LICENSE file accompanying this file.
  */
 
-#include <stdlib.h>
 #include <wayland-server-core.h>
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_idle_inhibit_v1.h>
diff --git a/idle_inhibit_v1.h b/idle_inhibit_v1.h
index 04c585f..cd1a58d 100644
--- a/idle_inhibit_v1.h
+++ b/idle_inhibit_v1.h
@@ -1,7 +1,7 @@
 #ifndef CG_IDLE_INHIBIT_H
 #define CG_IDLE_INHIBIT_H
 
-#include <wayland-server-core.h>
+struct wl_listener;
 
 void
 handle_idle_inhibitor_v1_new(struct wl_listener *listener, void *data);
diff --git a/ipc_server.h b/ipc_server.h
index 5e66ea4..60339df 100644
--- a/ipc_server.h
+++ b/ipc_server.h
@@ -3,8 +3,8 @@
 
 #include "config.h"
 
-#include <inttypes.h>
-#include <sys/types.h>
+#include <stdint.h>
+#include <stdlib.h>
 #include <wayland-server-core.h>
 
 struct cg_server;
diff --git a/keybinding.c b/keybinding.c
index 2add7bd..d750f96 100644
--- a/keybinding.c
+++ b/keybinding.c
@@ -1,13 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
 
-#include <signal.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/sysmacros.h>
-#include <sys/types.h>
-#include <sys/wait.h>
 #include <unistd.h>
+#include <string.h>
 #include <wayland-server-core.h>
 #include <wlr/backend/multi.h>
 #include <wlr/backend/session.h>
@@ -22,7 +16,6 @@
 #include "server.h"
 #include "view.h"
 #include "workspace.h"
-#include "xdg_shell.h"
 
 int
 keybinding_resize(struct keybinding_list *list) {
diff --git a/keybinding.h b/keybinding.h
index 03ff491..705a4ab 100644
--- a/keybinding.h
+++ b/keybinding.h
@@ -4,8 +4,8 @@
 
 #include "config.h"
 
-#include <sys/types.h>
-#include <wlr/types/wlr_keyboard.h>
+#include <stdint.h>
+#include <xkbcommon/xkbcommon.h>
 
 struct cg_server;
 
diff --git a/message.c b/message.c
index 8ada1f8..14e0ba0 100644
--- a/message.c
+++ b/message.c
@@ -1,7 +1,5 @@
-#include "pango.h"
 #include <cairo/cairo.h>
 #include <pango/pangocairo.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <wlr/backend.h>
 #include <wlr/render/wlr_renderer.h>
@@ -9,7 +7,7 @@
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/util/log.h>
 
-#include "cairo.h"
+#include "pango.h"
 #include "message.h"
 #include "output.h"
 #include "server.h"
diff --git a/output.c b/output.c
index 53f7b25..f59b42c 100644
--- a/output.c
+++ b/output.c
@@ -13,25 +13,23 @@
 #include "config.h"
 #include <wlr/config.h>
 
-#include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
 #include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/wayland.h>
 #if WLR_HAS_X11_BACKEND
 #include <wlr/backend/x11.h>
 #endif
-#include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_damage.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_xcursor_manager.h>
-#include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>
 #include <wlr/util/region.h>
+#include <wlr/xwayland.h>
 
 #include "keybinding.h"
 #include "message.h"
@@ -40,7 +38,6 @@
 #include "seat.h"
 #include "server.h"
 #include "util.h"
-#include "view.h"
 #include "workspace.h"
 #if CG_HAS_XWAYLAND
 #include "xwayland.h"
diff --git a/pango.c b/pango.c
index ef3df10..c1ca414 100644
--- a/pango.c
+++ b/pango.c
@@ -2,11 +2,7 @@
 #include <cairo/cairo.h>
 #include <pango/pangocairo.h>
 #include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <wlr/util/log.h>
 
 char *
diff --git a/pango.h b/pango.h
index b4c6b55..fed8371 100644
--- a/pango.h
+++ b/pango.h
@@ -1,7 +1,6 @@
 #ifndef _SWAY_PANGO_H
 #define _SWAY_PANGO_H
 #include <cairo/cairo.h>
-#include <stdbool.h>
 
 void
 get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
diff --git a/parse.c b/parse.c
index c7cccb4..940e49e 100644
--- a/parse.c
+++ b/parse.c
@@ -1,15 +1,13 @@
 #define _POSIX_C_SOURCE 200812L
 
-#include <limits.h>
-#include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 #include <wlr/util/log.h>
 
 #include "keybinding.h"
 #include "output.h"
 #include "parse.h"
 #include "server.h"
-#include "workspace.h"
 
 char *
 malloc_vsprintf(const char *fmt, va_list ap) {
diff --git a/render.c b/render.c
index e1ca1c1..6aadf50 100644
--- a/render.c
+++ b/render.c
@@ -16,7 +16,6 @@
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_damage.h>
-#include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/util/log.h>
 #include <wlr/util/region.h>
diff --git a/seat.c b/seat.c
index 7f3c24f..9c7739a 100644
--- a/seat.c
+++ b/seat.c
@@ -12,10 +12,8 @@
 #include "config.h"
 
 #include <linux/input-event-codes.h>
-#include <stdlib.h>
-#include <wayland-client-core.h>
-#include <wayland-client-protocol.h>
-#include <wayland-cursor.h>
+#include <stdint.h>
+#include <string.h>
 #include <wayland-server-core.h>
 #include <wayland-server-protocol.h>
 #include <wlr/backend.h>
@@ -28,7 +26,6 @@
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/util/log.h>
-#include <xdg_shell.h>
 #if CG_HAS_XWAYLAND
 #include <wlr/xwayland.h>
 #endif
diff --git a/server.c b/server.c
index bfb59a7..c82296f 100644
--- a/server.c
+++ b/server.c
@@ -9,23 +9,11 @@
 
 #define _POSIX_C_SOURCE 200809L
 
-#include <stdbool.h>
-#include <stdlib.h>
 #include <string.h>
 #include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
-#include <wlr/types/wlr_output.h>
-#include <wlr/types/wlr_surface.h>
 
-#include "output.h"
-#include "seat.h"
 #include "server.h"
-#include "view.h"
-#include "workspace.h"
-#include "xdg_shell.h"
-#if CG_HAS_XWAYLAND
-#include "xwayland.h"
-#endif
 
 void
 display_terminate(struct cg_server *server) {
diff --git a/view.c b/view.c
index a975d73..5aadd2a 100644
--- a/view.c
+++ b/view.c
@@ -10,14 +10,12 @@
 #define _POSIX_C_SOURCE 200809L
 
 #include <stdbool.h>
-#include <stdlib.h>
 #include <string.h>
 #include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_damage.h>
-#include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_surface.h>
 
 #include "output.h"
@@ -25,7 +23,6 @@
 #include "server.h"
 #include "view.h"
 #include "workspace.h"
-#include "xdg_shell.h"
 #if CG_HAS_XWAYLAND
 #include "xwayland.h"
 #endif
diff --git a/view.h b/view.h
index 8ddfa0b..c4d6b47 100644
--- a/view.h
+++ b/view.h
@@ -4,12 +4,11 @@
 #include "config.h"
 
 #include <stdbool.h>
-#include <wayland-server-core.h>
 #include <wlr/types/wlr_surface.h>
+#include <wayland-server-core.h>
 
 struct cg_server;
 struct wlr_box;
-struct wlr_surface;
 
 enum cg_view_type {
 	CG_XDG_SHELL_VIEW,
diff --git a/workspace.c b/workspace.c
index fcc7650..36bea40 100644
--- a/workspace.c
+++ b/workspace.c
@@ -17,7 +17,6 @@
 #include "message.h"
 #include "output.h"
 #include "server.h"
-#include "view.h"
 #include "workspace.h"
 
 #if CG_HAS_FANALYZE
diff --git a/xdg_shell.c b/xdg_shell.c
index 94506a8..5d97272 100644
--- a/xdg_shell.c
+++ b/xdg_shell.c
@@ -10,7 +10,6 @@
 #define _POSIX_C_SOURCE 200809L
 
 #include <stdbool.h>
-#include <stdlib.h>
 #include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output_layout.h>
diff --git a/xwayland.c b/xwayland.c
index 774bb4e..34b7fba 100644
--- a/xwayland.c
+++ b/xwayland.c
@@ -9,14 +9,12 @@
 
 #include <X11/Xutil.h>
 #include <stdbool.h>
-#include <stdlib.h>
 #include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output_damage.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/util/log.h>
 #include <wlr/xwayland.h>
-#include <xcb/xproto.h>
 
 #include "output.h"
 #include "server.h"
diff --git a/xwayland.h b/xwayland.h
index 78317ea..4dfaac4 100644
--- a/xwayland.h
+++ b/xwayland.h
@@ -2,8 +2,6 @@
 #define CG_XWAYLAND_H
 
 #include "view.h"
-#include <wayland-server-core.h>
-#include <wlr/xwayland.h>
 
 struct cg_xwayland_view {
 	struct cg_view view;