From e1475a1e47b5cde159c82f081c70b36876bc0d98 Mon Sep 17 00:00:00 2001
From: John Lindgren <john@jlindgren.net>
Date: Mon, 28 Jul 2025 01:22:10 -0400
Subject: [PATCH] include: reduce global includes in labwc.h

---
 include/labwc.h            | 45 ++------------------------------------
 src/action.c               |  1 +
 src/config/keybind.c       |  1 +
 src/decorations/kde-deco.c |  1 +
 src/desktop.c              |  3 +++
 src/input/cursor.c         |  8 ++++++-
 src/input/ime.c            |  3 +++
 src/input/keyboard.c       |  3 +++
 src/input/tablet-pad.c     |  1 +
 src/input/touch.c          |  2 ++
 src/layers.c               |  1 +
 src/magnifier.c            |  2 ++
 src/main.c                 |  4 +---
 src/menu/menu.c            |  1 +
 src/output.c               |  5 +++++
 src/overlay.c              |  1 +
 src/seat.c                 |  7 ++++++
 src/server.c               | 20 +++++++++++++----
 src/ssd/ssd-border.c       |  1 +
 src/ssd/ssd-extents.c      |  1 +
 src/ssd/ssd-shadow.c       |  2 +-
 src/ssd/ssd.c              |  1 +
 src/tearing.c              |  1 +
 src/theme.c                |  1 +
 src/view.c                 |  4 ++++
 src/workspaces.c           |  1 +
 src/xdg-popup.c            |  1 +
 src/xdg.c                  |  2 ++
 src/xwayland-unmanaged.c   |  3 +++
 src/xwayland.c             |  3 +++
 30 files changed, 78 insertions(+), 52 deletions(-)

diff --git a/include/labwc.h b/include/labwc.h
index 642cf4cb..b05d519d 100644
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -2,53 +2,10 @@
 #ifndef LABWC_H
 #define LABWC_H
 #include "config.h"
-#include <getopt.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-#include <wayland-server-core.h>
-#include <wlr/backend.h>
-#include <wlr/render/allocator.h>
-#include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_compositor.h>
-#include <wlr/types/wlr_buffer.h>
-#include <wlr/types/wlr_cursor.h>
-#include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_gamma_control_v1.h>
-#include <wlr/types/wlr_input_device.h>
-#include <wlr/types/wlr_keyboard.h>
-#include <wlr/types/wlr_keyboard_group.h>
-#include <wlr/types/wlr_layer_shell_v1.h>
-#include <wlr/types/wlr_output.h>
-#include <wlr/types/wlr_output_management_v1.h>
-#include <wlr/types/wlr_output_power_management_v1.h>
-#include <wlr/types/wlr_output_layout.h>
-#include <wlr/types/wlr_scene.h>
-#include <wlr/types/wlr_relative_pointer_v1.h>
-#include <wlr/types/wlr_pointer.h>
-#include <wlr/types/wlr_pointer_constraints_v1.h>
-#include <wlr/types/wlr_seat.h>
-#include <wlr/types/wlr_subcompositor.h>
-#include <wlr/types/wlr_xcursor_manager.h>
-#include <wlr/types/wlr_xdg_activation_v1.h>
-#include <wlr/types/wlr_xdg_shell.h>
-#include <wlr/types/wlr_drm_lease_v1.h>
-#include <wlr/types/wlr_virtual_pointer_v1.h>
-#include <wlr/types/wlr_virtual_keyboard_v1.h>
-#include <wlr/types/wlr_tearing_control_v1.h>
-#include <wlr/types/wlr_text_input_v3.h>
-#include <wlr/types/wlr_input_method_v2.h>
-#include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/util/log.h>
 #include "common/set.h"
-#include "config/keybind.h"
-#include "config/rcxml.h"
 #include "input/cursor.h"
 #include "overlay.h"
-#include "regions.h"
-#include "session-lock.h"
 #if HAVE_NLS
 #include <libintl.h>
 #include <locale.h>
@@ -60,6 +17,8 @@
 #define XCURSOR_DEFAULT "left_ptr"
 #define XCURSOR_SIZE 24
 
+struct wlr_xdg_popup;
+
 enum input_mode {
 	LAB_INPUT_STATE_PASSTHROUGH = 0,
 	LAB_INPUT_STATE_MOVE,
diff --git a/src/action.c b/src/action.c
index ec1914c4..c4fd131a 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_scene.h>
 #include <wlr/util/log.h>
 #include "common/macros.h"
 #include "common/list.h"
diff --git a/src/config/keybind.c b/src/config/keybind.c
index 7560cb16..9003e5ee 100644
--- a/src/config/keybind.c
+++ b/src/config/keybind.c
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <wlr/types/wlr_keyboard_group.h>
 #include <wlr/util/log.h>
 #include "common/list.h"
 #include "common/mem.h"
diff --git a/src/decorations/kde-deco.c b/src/decorations/kde-deco.c
index a615811b..123173df 100644
--- a/src/decorations/kde-deco.c
+++ b/src/decorations/kde-deco.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <assert.h>
 #include <wlr/types/wlr_server_decoration.h>
+#include <wlr/types/wlr_xdg_shell.h>
 #include "common/list.h"
 #include "common/mem.h"
 #include "decorations.h"
diff --git a/src/desktop.c b/src/desktop.c
index 739cc3ef..a7cd86a2 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -1,6 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "config.h"
 #include <assert.h>
+#include <wlr/types/wlr_seat.h>
+#include <wlr/types/wlr_subcompositor.h>
+#include <wlr/types/wlr_xdg_shell.h>
 #include "common/scene-helpers.h"
 #include "common/surface-helpers.h"
 #include "dnd.h"
diff --git a/src/input/cursor.c b/src/input/cursor.c
index d7eabb75..852eca3f 100644
--- a/src/input/cursor.c
+++ b/src/input/cursor.c
@@ -7,7 +7,14 @@
 #include <time.h>
 #include <wlr/backend/libinput.h>
 #include <wlr/types/wlr_cursor_shape_v1.h>
+#include <wlr/types/wlr_data_device.h>
+#include <wlr/types/wlr_pointer_constraints_v1.h>
 #include <wlr/types/wlr_primary_selection.h>
+#include <wlr/types/wlr_relative_pointer_v1.h>
+#include <wlr/types/wlr_scene.h>
+#include <wlr/types/wlr_subcompositor.h>
+#include <wlr/types/wlr_xcursor_manager.h>
+#include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/region.h>
 #include "action.h"
 #include "common/macros.h"
@@ -15,7 +22,6 @@
 #include "common/scene-helpers.h"
 #include "common/surface-helpers.h"
 #include "config/mousebind.h"
-#include "config/tablet-tool.h"
 #include "dnd.h"
 #include "idle.h"
 #include "input/gestures.h"
diff --git a/src/input/ime.c b/src/input/ime.c
index 1e4cddc4..bbb8723a 100644
--- a/src/input/ime.c
+++ b/src/input/ime.c
@@ -3,6 +3,9 @@
 
 #include "input/ime.h"
 #include <assert.h>
+#include <wlr/types/wlr_layer_shell_v1.h>
+#include <wlr/types/wlr_virtual_keyboard_v1.h>
+#include <wlr/types/wlr_xdg_shell.h>
 #include "common/mem.h"
 #include "node.h"
 #include "output.h"
diff --git a/src/input/keyboard.c b/src/input/keyboard.c
index 4c2a0704..8d1b9ae3 100644
--- a/src/input/keyboard.c
+++ b/src/input/keyboard.c
@@ -6,9 +6,11 @@
 #include <wlr/backend/multi.h>
 #include <wlr/backend/session.h>
 #include <wlr/interfaces/wlr_keyboard.h>
+#include <wlr/types/wlr_keyboard_group.h>
 #include "action.h"
 #include "common/macros.h"
 #include "common/three-state.h"
+#include "config/keybind.h"
 #include "idle.h"
 #include "input/ime.h"
 #include "input/key-state.h"
@@ -16,6 +18,7 @@
 #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 19127058..c2992ef9 100644
--- a/src/input/tablet-pad.c
+++ b/src/input/tablet-pad.c
@@ -3,6 +3,7 @@
 #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>
diff --git a/src/input/touch.c b/src/input/touch.c
index 2cc79784..c0745f37 100644
--- a/src/input/touch.c
+++ b/src/input/touch.c
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "input/touch.h"
 #include <wayland-util.h>
+#include <wlr/types/wlr_scene.h>
+#include <wlr/types/wlr_seat.h>
 #include <wlr/types/wlr_touch.h>
 #include <linux/input-event-codes.h>
 #include "common/macros.h"
diff --git a/src/layers.c b/src/layers.c
index 7ed3f84d..d22c16ad 100644
--- a/src/layers.c
+++ b/src/layers.c
@@ -15,6 +15,7 @@
 #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>
 #include <wlr/util/log.h>
 #include "common/macros.h"
 #include "common/mem.h"
diff --git a/src/magnifier.c b/src/magnifier.c
index 49499211..d9704c80 100644
--- a/src/magnifier.c
+++ b/src/magnifier.c
@@ -2,8 +2,10 @@
 
 #include "magnifier.h"
 #include <assert.h>
+#include <wlr/render/allocator.h>
 #include <wlr/render/swapchain.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/util/transform.h>
 #include "common/box.h"
 #include "labwc.h"
diff --git a/src/main.c b/src/main.c
index ef093112..c69090bc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,13 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #define _POSIX_C_SOURCE 200809L
+#include <getopt.h>
 #include <pango/pangocairo.h>
 #include <signal.h>
-#include <string.h>
 #include <unistd.h>
-#include "common/dir.h"
 #include "common/fd-util.h"
 #include "common/font.h"
-#include "common/mem.h"
 #include "common/spawn.h"
 #include "config/session.h"
 #include "labwc.h"
diff --git a/src/menu/menu.c b/src/menu/menu.c
index f8695a2a..dd902bc2 100644
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#include <unistd.h>
 #include <wayland-server-core.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>
diff --git a/src/output.c b/src/output.c
index 99c1b847..5288b6e9 100644
--- a/src/output.c
+++ b/src/output.c
@@ -14,7 +14,11 @@
 #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>
+#include <wlr/types/wlr_output_power_management_v1.h>
+#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>
@@ -31,6 +35,7 @@
 #include "protocols/cosmic-workspaces.h"
 #include "protocols/ext-workspace.h"
 #include "regions.h"
+#include "session-lock.h"
 #include "view.h"
 #include "xwayland.h"
 
diff --git a/src/overlay.c b/src/overlay.c
index cf7b96b1..4b1c33cd 100644
--- a/src/overlay.c
+++ b/src/overlay.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "overlay.h"
 #include <assert.h>
+#include <wlr/types/wlr_scene.h>
 #include "common/lab-scene-rect.h"
 #include "labwc.h"
 #include "output.h"
diff --git a/src/seat.c b/src/seat.c
index 1b3b7a3f..a932b903 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -5,8 +5,14 @@
 #include <wlr/backend/libinput.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_keyboard.h>
+#include <wlr/types/wlr_keyboard_group.h>
+#include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_pointer.h>
+#include <wlr/types/wlr_pointer_constraints_v1.h>
 #include <wlr/types/wlr_touch.h>
+#include <wlr/types/wlr_virtual_keyboard_v1.h>
+#include <wlr/types/wlr_virtual_pointer_v1.h>
+#include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>
 #include "common/macros.h"
 #include "common/mem.h"
@@ -18,6 +24,7 @@
 #include "input/key-state.h"
 #include "labwc.h"
 #include "output.h"
+#include "session-lock.h"
 #include "view.h"
 
 static void
diff --git a/src/server.c b/src/server.c
index ca24392a..a9e021dc 100644
--- a/src/server.c
+++ b/src/server.c
@@ -6,25 +6,36 @@
 #include <sys/wait.h>
 #include <wlr/backend/headless.h>
 #include <wlr/backend/multi.h>
+#include <wlr/render/allocator.h>
 #include <wlr/types/wlr_alpha_modifier_v1.h>
 #include <wlr/types/wlr_data_control_v1.h>
-#include <wlr/types/wlr_ext_data_control_v1.h>
+#include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_drm.h>
+#include <wlr/types/wlr_drm_lease_v1.h>
 #include <wlr/types/wlr_export_dmabuf_v1.h>
+#include <wlr/types/wlr_ext_data_control_v1.h>
 #include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h>
+#include <wlr/types/wlr_ext_image_capture_source_v1.h>
+#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>
+#include <wlr/types/wlr_pointer_constraints_v1.h>
 #include <wlr/types/wlr_presentation_time.h>
 #include <wlr/types/wlr_primary_selection_v1.h>
+#include <wlr/types/wlr_relative_pointer_v1.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_screencopy_v1.h>
-#include <wlr/types/wlr_ext_image_capture_source_v1.h>
-#include <wlr/types/wlr_ext_image_copy_capture_v1.h>
 #include <wlr/types/wlr_security_context_v1.h>
 #include <wlr/types/wlr_single_pixel_buffer_v1.h>
-#include <wlr/types/wlr_viewporter.h>
+#include <wlr/types/wlr_subcompositor.h>
 #include <wlr/types/wlr_tablet_v2.h>
+#include <wlr/types/wlr_tearing_control_v1.h>
+#include <wlr/types/wlr_text_input_v3.h>
+#include <wlr/types/wlr_viewporter.h>
 #include <wlr/types/wlr_xdg_foreign_registry.h>
 #include <wlr/types/wlr_xdg_foreign_v1.h>
 #include <wlr/types/wlr_xdg_foreign_v2.h>
@@ -52,6 +63,7 @@
 #include "output-virtual.h"
 #include "regions.h"
 #include "resize-indicator.h"
+#include "session-lock.h"
 #include "theme.h"
 #include "view.h"
 #include "workspaces.h"
diff --git a/src/ssd/ssd-border.c b/src/ssd/ssd-border.c
index e96c65c6..26216ed6 100644
--- a/src/ssd/ssd-border.c
+++ b/src/ssd/ssd-border.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
 #include <assert.h>
+#include <wlr/types/wlr_scene.h>
 #include "common/scene-helpers.h"
 #include "labwc.h"
 #include "ssd-internal.h"
diff --git a/src/ssd/ssd-extents.c b/src/ssd/ssd-extents.c
index 90f12ce6..f8fdd9f0 100644
--- a/src/ssd/ssd-extents.c
+++ b/src/ssd/ssd-extents.c
@@ -2,6 +2,7 @@
 
 #include <assert.h>
 #include <pixman.h>
+#include <wlr/types/wlr_scene.h>
 #include "common/scene-helpers.h"
 #include "config/rcxml.h"
 #include "labwc.h"
diff --git a/src/ssd/ssd-shadow.c b/src/ssd/ssd-shadow.c
index 29ee1ca2..8c1f8839 100644
--- a/src/ssd/ssd-shadow.c
+++ b/src/ssd/ssd-shadow.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
 #include <assert.h>
-#include "common/scene-helpers.h"
+#include <wlr/types/wlr_scene.h>
 #include "labwc.h"
 #include "buffer.h"
 #include "ssd-internal.h"
diff --git a/src/ssd/ssd.c b/src/ssd/ssd.c
index 48d416b9..ac37f15b 100644
--- a/src/ssd/ssd.c
+++ b/src/ssd/ssd.c
@@ -8,6 +8,7 @@
 
 #include <assert.h>
 #include <strings.h>
+#include <wlr/types/wlr_scene.h>
 #include "common/mem.h"
 #include "common/scene-helpers.h"
 #include "labwc.h"
diff --git a/src/tearing.c b/src/tearing.c
index 50b0611c..eaba51a0 100644
--- a/src/tearing.c
+++ b/src/tearing.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
+#include <wlr/types/wlr_tearing_control_v1.h>
 #include "common/mem.h"
 #include "labwc.h"
 #include "view.h"
diff --git a/src/theme.c b/src/theme.c
index 961c640b..2d5ac12b 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <wlr/util/box.h>
 #include <wlr/util/log.h>
 #include <wlr/render/pixman.h>
diff --git a/src/view.c b/src/view.c
index 45b87458..d6ac89b9 100644
--- a/src/view.c
+++ b/src/view.c
@@ -2,8 +2,11 @@
 #include "view.h"
 #include <assert.h>
 #include <strings.h>
+#include <wlr/types/wlr_keyboard_group.h>
 #include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_security_context_v1.h>
+#include <wlr/types/wlr_xdg_shell.h>
 #include "action.h"
 #include "buffer.h"
 #include "common/box.h"
@@ -21,6 +24,7 @@
 #include "placement.h"
 #include "regions.h"
 #include "resize-indicator.h"
+#include "session-lock.h"
 #include "snap-constraints.h"
 #include "snap.h"
 #include "ssd.h"
diff --git a/src/workspaces.c b/src/workspaces.c
index 2057adf0..70215b80 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_scene.h>
 #include "buffer.h"
 #include "common/font.h"
 #include "common/graphic-helpers.h"
diff --git a/src/xdg-popup.c b/src/xdg-popup.c
index 23942b69..cc14d920 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_xdg_shell.h>
 #include "common/macros.h"
 #include "common/mem.h"
 #include "labwc.h"
diff --git a/src/xdg.c b/src/xdg.c
index f551c204..5a7a6176 100644
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -2,6 +2,8 @@
 
 #include <assert.h>
 #include <wlr/types/wlr_fractional_scale_v1.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>
 #include "buffer.h"
 #include "common/array.h"
diff --git a/src/xwayland-unmanaged.c b/src/xwayland-unmanaged.c
index 2fc15cfe..b003e4ec 100644
--- a/src/xwayland-unmanaged.c
+++ b/src/xwayland-unmanaged.c
@@ -1,5 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <assert.h>
+#include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_scene.h>
+#include <wlr/types/wlr_seat.h>
 #include <wlr/xwayland.h>
 #include "common/list.h"
 #include "common/macros.h"
diff --git a/src/xwayland.c b/src/xwayland.c
index 097fc731..e793916f 100644
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -3,6 +3,9 @@
 #include "xwayland.h"
 #include <assert.h>
 #include <stdlib.h>
+#include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_seat.h>
+#include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/xwayland.h>
 #include "buffer.h"
 #include "common/array.h"