From 54604efdfd2b9892894128b109ee2dedda9b9c73 Mon Sep 17 00:00:00 2001
From: Ray Molenkamp <github@lazydodo.com>
Date: Tue, 24 Dec 2024 22:40:38 +0100
Subject: [PATCH] Cleanup: CMake: Modernize bf_windowmanager dependencies

Pretty straightforward

- Remove any bf_windowmanager paths from INC
- Add a dependency though LIB when missing

context: https://devtalk.blender.org/t/cmake-cleanup/30260

Pull Request: https://projects.blender.org/blender/blender/pulls/132310
---
 source/blender/animrig/CMakeLists.txt                   | 2 +-
 source/blender/blenloader/CMakeLists.txt                | 2 +-
 source/blender/depsgraph/CMakeLists.txt                 | 2 +-
 source/blender/draw/CMakeLists.txt                      | 3 +--
 source/blender/editors/animation/CMakeLists.txt         | 2 +-
 source/blender/editors/armature/CMakeLists.txt          | 2 +-
 source/blender/editors/asset/CMakeLists.txt             | 2 +-
 source/blender/editors/curve/CMakeLists.txt             | 2 +-
 source/blender/editors/curves/CMakeLists.txt            | 2 +-
 source/blender/editors/geometry/CMakeLists.txt          | 3 +--
 source/blender/editors/gizmo_library/CMakeLists.txt     | 2 +-
 source/blender/editors/gpencil_legacy/CMakeLists.txt    | 2 +-
 source/blender/editors/grease_pencil/CMakeLists.txt     | 2 +-
 source/blender/editors/id_management/CMakeLists.txt     | 3 +--
 source/blender/editors/interface/CMakeLists.txt         | 2 +-
 source/blender/editors/io/CMakeLists.txt                | 2 +-
 source/blender/editors/lattice/CMakeLists.txt           | 2 +-
 source/blender/editors/mask/CMakeLists.txt              | 2 +-
 source/blender/editors/mesh/CMakeLists.txt              | 3 +--
 source/blender/editors/metaball/CMakeLists.txt          | 2 +-
 source/blender/editors/object/CMakeLists.txt            | 3 +--
 source/blender/editors/physics/CMakeLists.txt           | 2 +-
 source/blender/editors/render/CMakeLists.txt            | 2 +-
 source/blender/editors/scene/CMakeLists.txt             | 2 +-
 source/blender/editors/screen/CMakeLists.txt            | 2 +-
 source/blender/editors/sculpt_paint/CMakeLists.txt      | 2 +-
 source/blender/editors/sound/CMakeLists.txt             | 2 +-
 source/blender/editors/space_action/CMakeLists.txt      | 2 +-
 source/blender/editors/space_api/CMakeLists.txt         | 2 +-
 source/blender/editors/space_buttons/CMakeLists.txt     | 2 +-
 source/blender/editors/space_clip/CMakeLists.txt        | 2 +-
 source/blender/editors/space_console/CMakeLists.txt     | 2 +-
 source/blender/editors/space_file/CMakeLists.txt        | 2 +-
 source/blender/editors/space_graph/CMakeLists.txt       | 2 +-
 source/blender/editors/space_image/CMakeLists.txt       | 2 +-
 source/blender/editors/space_info/CMakeLists.txt        | 2 +-
 source/blender/editors/space_nla/CMakeLists.txt         | 2 +-
 source/blender/editors/space_node/CMakeLists.txt        | 2 +-
 source/blender/editors/space_outliner/CMakeLists.txt    | 2 +-
 source/blender/editors/space_script/CMakeLists.txt      | 2 +-
 source/blender/editors/space_sequencer/CMakeLists.txt   | 2 +-
 source/blender/editors/space_spreadsheet/CMakeLists.txt | 2 +-
 source/blender/editors/space_statusbar/CMakeLists.txt   | 2 +-
 source/blender/editors/space_text/CMakeLists.txt        | 2 +-
 source/blender/editors/space_topbar/CMakeLists.txt      | 2 +-
 source/blender/editors/space_userpref/CMakeLists.txt    | 3 +--
 source/blender/editors/space_view3d/CMakeLists.txt      | 2 +-
 source/blender/editors/transform/CMakeLists.txt         | 2 +-
 source/blender/editors/undo/CMakeLists.txt              | 2 +-
 source/blender/editors/util/CMakeLists.txt              | 2 +-
 source/blender/editors/uvedit/CMakeLists.txt            | 2 +-
 source/blender/io/alembic/CMakeLists.txt                | 2 +-
 source/blender/io/collada/CMakeLists.txt                | 2 +-
 source/blender/io/grease_pencil/CMakeLists.txt          | 2 +-
 source/blender/io/ply/CMakeLists.txt                    | 2 +-
 source/blender/io/stl/CMakeLists.txt                    | 2 +-
 source/blender/io/usd/CMakeLists.txt                    | 2 +-
 source/blender/io/wavefront_obj/CMakeLists.txt          | 2 +-
 source/blender/modifiers/CMakeLists.txt                 | 2 +-
 source/blender/nodes/CMakeLists.txt                     | 2 +-
 source/blender/nodes/composite/CMakeLists.txt           | 2 +-
 source/blender/nodes/function/CMakeLists.txt            | 2 +-
 source/blender/nodes/geometry/CMakeLists.txt            | 2 +-
 source/blender/nodes/shader/CMakeLists.txt              | 2 +-
 source/blender/nodes/texture/CMakeLists.txt             | 2 +-
 source/blender/python/intern/CMakeLists.txt             | 2 +-
 source/blender/render/CMakeLists.txt                    | 2 +-
 source/blender/sequencer/CMakeLists.txt                 | 2 +-
 source/blender/shader_fx/CMakeLists.txt                 | 2 +-
 source/blender/windowmanager/CMakeLists.txt             | 3 ++-
 source/creator/CMakeLists.txt                           | 3 +--
 71 files changed, 72 insertions(+), 78 deletions(-)

diff --git a/source/blender/animrig/CMakeLists.txt b/source/blender/animrig/CMakeLists.txt
index 8f601524af7..4fae7431e50 100644
--- a/source/blender/animrig/CMakeLists.txt
+++ b/source/blender/animrig/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../blentranslation
   ../editors/include
   ../makesrna
-  ../windowmanager
   ../../../extern/fmtlib/include
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -67,6 +66,7 @@ set(LIB
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::intern::atomic
   PRIVATE bf::intern::clog
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_animrig "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index b4bdea68203..0cffdb05b75 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
   ../nodes
   ../render
   ../sequencer
-  ../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -67,6 +66,7 @@ set(LIB
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::extern::fmtlib
   PRIVATE bf::intern::memutil
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_BUILDINFO)
diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index 3a349eb1b19..5220173025e 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
   ../makesrna
   ../modifiers
   ../sequencer
-  ../windowmanager
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -156,6 +155,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::intern::atomic
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_PYTHON)
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 35c917b4637..76171267a30 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -20,7 +20,6 @@ set(INC
   ../compositor
   ../compositor/algorithms
   ../compositor/cached_resources
-  ../windowmanager
 
   ../../../intern/opensubdiv
 )
@@ -311,7 +310,7 @@ set(LIB
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
   bf_compositor
-  bf_windowmanager
+  PRIVATE bf::windowmanager
   PRIVATE bf::intern::atomic
   PRIVATE bf::extern::fmtlib
 )
diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt
index 6a306c7cc41..1724c00862e 100644
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blentranslation
   ../../makesrna
   ../../sequencer
-  ../../windowmanager
   ../../../../extern/fmtlib/include
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -48,6 +47,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_PYTHON)
diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt
index 7e1985b7950..21f9602f1bf 100644
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../makesrna
-  ../../windowmanager
   ../../../../intern/eigen
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -51,6 +50,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 
diff --git a/source/blender/editors/asset/CMakeLists.txt b/source/blender/editors/asset/CMakeLists.txt
index 0eb6c036019..c185b1edbf4 100644
--- a/source/blender/editors/asset/CMakeLists.txt
+++ b/source/blender/editors/asset/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../makesrna
-  ../../windowmanager
   # dna_type_offsets.h
   ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
   # RNA_prototypes.hh
@@ -62,6 +61,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_editor_asset "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt
index 721e0b8f2af..77a14e2dda8 100644
--- a/source/blender/editors/curve/CMakeLists.txt
+++ b/source/blender/editors/curve/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
   ../include
   ../../blentranslation
   ../../makesrna
-  ../../windowmanager
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -39,6 +38,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_editor_curve "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/curves/CMakeLists.txt b/source/blender/editors/curves/CMakeLists.txt
index 78a45849a6b..33dba65bd76 100644
--- a/source/blender/editors/curves/CMakeLists.txt
+++ b/source/blender/editors/curves/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../../functions
   ../../geometry
   ../../makesrna
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -42,6 +41,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_TBB)
diff --git a/source/blender/editors/geometry/CMakeLists.txt b/source/blender/editors/geometry/CMakeLists.txt
index f6cfb37048d..8c3400f9154 100644
--- a/source/blender/editors/geometry/CMakeLists.txt
+++ b/source/blender/editors/geometry/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../../functions
   ../../makesrna
   ../../nodes
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -36,7 +35,7 @@ set(LIB
   bf_editor_object
   PRIVATE bf::extern::fmtlib
   PRIVATE bf::intern::guardedalloc
-  bf_windowmanager
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_editor_geometry "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/gizmo_library/CMakeLists.txt b/source/blender/editors/gizmo_library/CMakeLists.txt
index 40a91e0fc2f..7122a34b745 100644
--- a/source/blender/editors/gizmo_library/CMakeLists.txt
+++ b/source/blender/editors/gizmo_library/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
   ../include
   ../../blentranslation
   ../../makesrna
-  ../../windowmanager
   ../../../../intern/eigen
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -44,6 +43,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 
diff --git a/source/blender/editors/gpencil_legacy/CMakeLists.txt b/source/blender/editors/gpencil_legacy/CMakeLists.txt
index 36cbfcee67a..f3f1f13037a 100644
--- a/source/blender/editors/gpencil_legacy/CMakeLists.txt
+++ b/source/blender/editors/gpencil_legacy/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blentranslation
   ../../imbuf
   ../../makesrna
-  ../../windowmanager
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -38,6 +37,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 
diff --git a/source/blender/editors/grease_pencil/CMakeLists.txt b/source/blender/editors/grease_pencil/CMakeLists.txt
index f2d6da01b60..2b467ceefb8 100644
--- a/source/blender/editors/grease_pencil/CMakeLists.txt
+++ b/source/blender/editors/grease_pencil/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blentranslation
   ../../imbuf
   ../../makesrna
-  ../../windowmanager
   ../../../../extern/curve_fit_nd
   ../../geometry
   ../sculpt_paint
@@ -53,6 +52,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::intern::clog
+  PRIVATE bf::windowmanager
   extern_curve_fit_nd
   extern_fmtlib
 )
diff --git a/source/blender/editors/id_management/CMakeLists.txt b/source/blender/editors/id_management/CMakeLists.txt
index eb76e484e18..67b16923cd4 100644
--- a/source/blender/editors/id_management/CMakeLists.txt
+++ b/source/blender/editors/id_management/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
   ../include
   ../../makesrna
-  ../../windowmanager
 )
 
 set(INC_SYS
@@ -17,7 +16,7 @@ set(SRC
 
 set(LIB
   PRIVATE bf::blenkernel
-  bf_windowmanager
+  PRIVATE bf::windowmanager
   PRIVATE bf::blenlib
   PRIVATE bf::dna
   PRIVATE bf::intern::clog
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index c7d0a8feab5..3e3ee23e80c 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -17,7 +17,6 @@ set(INC
   ../../nodes
   ../../python
   ../../render
-  ../../windowmanager
   ../../../../intern/ghost
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -110,6 +109,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::animrig
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_INTERNATIONAL)
diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt
index 80b2faa11aa..2ba0eead4d2 100644
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -14,7 +14,6 @@ set(INC
   ../../io/usd
   ../../io/wavefront_obj
   ../../makesrna
-  ../../windowmanager
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -57,6 +56,7 @@ set(LIB
   PRIVATE bf::extern::fmtlib
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::intern::clog
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_OPENCOLLADA)
diff --git a/source/blender/editors/lattice/CMakeLists.txt b/source/blender/editors/lattice/CMakeLists.txt
index 533b2aa004a..061c8b029d1 100644
--- a/source/blender/editors/lattice/CMakeLists.txt
+++ b/source/blender/editors/lattice/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
   ../include
   ../../makesrna
   ../../render
-  ../../windowmanager
 )
 
 set(INC_SYS
@@ -29,6 +28,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_editor_lattice "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/mask/CMakeLists.txt b/source/blender/editors/mask/CMakeLists.txt
index 33e0267dc36..db022091f80 100644
--- a/source/blender/editors/mask/CMakeLists.txt
+++ b/source/blender/editors/mask/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
   ../include
   ../../blentranslation
   ../../makesrna
-  ../../windowmanager
 )
 
 set(INC_SYS
@@ -34,6 +33,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::animrig
+  PRIVATE bf::windowmanager
 )
 
 
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index c8b873fddac..e064018f4b4 100644
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
   ../../imbuf
   ../../makesrna
   ../../render
-  ../../windowmanager
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -69,7 +68,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
-  bf_windowmanager
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_FREESTYLE)
diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt
index b2c7ce70668..7cafabde1d1 100644
--- a/source/blender/editors/metaball/CMakeLists.txt
+++ b/source/blender/editors/metaball/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blentranslation
   ../../makesrna
   ../../render
-  ../../windowmanager
 )
 
 set(INC_SYS
@@ -30,6 +29,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_editor_metaball "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index ad15e5a9ba1..7bf6dda2d4e 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -15,7 +15,6 @@ set(INC
   ../../python
   ../../render
   ../../shader_fx
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -72,7 +71,7 @@ set(LIB
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
   bf_render
-  bf_windowmanager
+  PRIVATE bf::windowmanager
 )
 
 
diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt
index 14a57eb79c9..6d643e2f7e0 100644
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
   ../include
   ../../blentranslation
   ../../makesrna
-  ../../windowmanager
   ../../../../intern/mantaflow/extern
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -40,6 +39,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_MOD_FLUID)
diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt
index f48fa09088c..e15ab57f1de 100644
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
   ../../nodes
   ../../render
   ../../sequencer
-  ../../windowmanager
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -43,6 +42,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::animrig
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_HEADLESS)
diff --git a/source/blender/editors/scene/CMakeLists.txt b/source/blender/editors/scene/CMakeLists.txt
index 7227b749551..7f4dd2336fd 100644
--- a/source/blender/editors/scene/CMakeLists.txt
+++ b/source/blender/editors/scene/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blentranslation
   ../../makesrna
   ../../sequencer
-  ../../windowmanager
 )
 
 set(INC_SYS
@@ -25,6 +24,7 @@ set(LIB
   PRIVATE bf::depsgraph
   PRIVATE bf::dna
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index 2fffe0d2994..c42b820f12b 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
   ../../imbuf
   ../../makesrna
   ../../sequencer
-  ../../windowmanager
   ../../../../extern/fmtlib/include
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -52,6 +51,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_HEADLESS)
diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt
index 97e61129cf9..6b705bfa919 100644
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -19,7 +19,6 @@ set(INC
   ../../makesrna
   ../../nodes
   ../../render
-  ../../windowmanager
   ../../../../intern/eigen
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -188,6 +187,7 @@ set(LIB
   PRIVATE bf::intern::atomic
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_POTRACE)
diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt
index 6848d1a2663..5aebffebffb 100644
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
   ../include
   ../../makesrna
   ../../sequencer
-  ../../windowmanager
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -27,6 +26,7 @@ set(LIB
   PRIVATE bf::depsgraph
   PRIVATE bf::dna
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_AUDASPACE)
diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt
index 4c412fb0698..dab676590a9 100644
--- a/source/blender/editors/space_action/CMakeLists.txt
+++ b/source/blender/editors/space_action/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../../blentranslation
   ../../makesrna
   ../../modifiers
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -38,6 +37,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::animrig
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_editor_space_action "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt
index 66cb2d2b303..9713a5a4434 100644
--- a/source/blender/editors/space_api/CMakeLists.txt
+++ b/source/blender/editors/space_api/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../io
   ../../asset_system
   ../../makesrna
-  ../../windowmanager
 )
 
 set(INC_SYS
@@ -44,6 +43,7 @@ set(LIB
   bf_editor_space_view3d
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_editor_space_api "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt
index 2a431c9079f..cd4b9529bb9 100644
--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../makesrna
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -32,6 +31,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 
diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt
index ef83f1067da..745ae56851d 100644
--- a/source/blender/editors/space_clip/CMakeLists.txt
+++ b/source/blender/editors/space_clip/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../../imbuf
   ../../imbuf/movie
   ../../makesrna
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -51,6 +50,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_editor_space_clip "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt
index 5ee8bc4546c..a1581f96a8e 100644
--- a/source/blender/editors/space_console/CMakeLists.txt
+++ b/source/blender/editors/space_console/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
   ../include
   ../../blenloader
   ../../makesrna
-  ../../windowmanager
 
 )
 
@@ -28,6 +27,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_PYTHON)
diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt
index e7de51e288e..bdfa3d271a5 100644
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
   ../../imbuf/movie
   ../../makesrna
   ../../render
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -51,6 +50,7 @@ set(LIB
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::extern::fmtlib
   PRIVATE bf::intern::atomic
+  PRIVATE bf::windowmanager
 )
 
 if(WIN32)
diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt
index a20940e2956..27e15380fb9 100644
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../makesrna
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -38,6 +37,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::animrig
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_AUDASPACE)
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt
index 1dab44a938a..d44805eddfc 100644
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
   ../../imbuf/movie
   ../../makesrna
   ../../render
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -44,6 +43,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_IMAGE_OPENJPEG)
diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt
index f6c43995eac..e65c7328c3a 100644
--- a/source/blender/editors/space_info/CMakeLists.txt
+++ b/source/blender/editors/space_info/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../../blentranslation
   ../../imbuf
   ../../makesrna
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -39,6 +38,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )
 
 
diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt
index 3c84c6a73cc..d2020246ed8 100644
--- a/source/blender/editors/space_nla/CMakeLists.txt
+++ b/source/blender/editors/space_nla/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../makesrna
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -36,6 +35,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_editor_space_nla "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt
index f986d2b7851..b42affb1675 100644
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -16,7 +16,6 @@ set(INC
   ../../makesrna
   ../../nodes
   ../../render
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -60,6 +59,7 @@ set(LIB
   PRIVATE bf::intern::guardedalloc
   bf_compositor
   PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_OPENIMAGEDENOISE)
diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt
index 29d89941626..86ef72d03c3 100644
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
   ../../imbuf
   ../../makesrna
   ../../sequencer
-  ../../windowmanager
 
   ../../../../extern/fmtlib/include
 
@@ -142,6 +141,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
   extern_fmtlib
 )
 
diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt
index 08ee7a011d8..9b3498bd0f1 100644
--- a/source/blender/editors/space_script/CMakeLists.txt
+++ b/source/blender/editors/space_script/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../makesrna
-  ../../windowmanager
 
 )
 
@@ -28,6 +27,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_PYTHON)
diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt
index 3f52ae0fe3d..6bababfddf1 100644
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
   ../../imbuf/movie
   ../../makesrna
   ../../sequencer
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -63,6 +62,7 @@ set(LIB
   PRIVATE bf::intern::atomic
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::animrig
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_AUDASPACE)
diff --git a/source/blender/editors/space_spreadsheet/CMakeLists.txt b/source/blender/editors/space_spreadsheet/CMakeLists.txt
index 78b30de3a4c..a7b7c6d96d7 100644
--- a/source/blender/editors/space_spreadsheet/CMakeLists.txt
+++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../../functions
   ../../makesrna
   ../../nodes
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -55,6 +54,7 @@ set(LIB
   PRIVATE bf::extern::fmtlib
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_OPENVDB)
diff --git a/source/blender/editors/space_statusbar/CMakeLists.txt b/source/blender/editors/space_statusbar/CMakeLists.txt
index 4068e87d78e..fb709deb62f 100644
--- a/source/blender/editors/space_statusbar/CMakeLists.txt
+++ b/source/blender/editors/space_statusbar/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../makesrna
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -26,6 +25,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 
diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt
index a08fed5c4db..b391c64b76a 100644
--- a/source/blender/editors/space_text/CMakeLists.txt
+++ b/source/blender/editors/space_text/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../makesrna
-  ../../windowmanager
 
 )
 
@@ -39,6 +38,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 
diff --git a/source/blender/editors/space_topbar/CMakeLists.txt b/source/blender/editors/space_topbar/CMakeLists.txt
index 2a41d084dad..45b85b1d4ed 100644
--- a/source/blender/editors/space_topbar/CMakeLists.txt
+++ b/source/blender/editors/space_topbar/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../makesrna
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -26,6 +25,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 
diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt
index 5ad0675b28e..4b14d27168e 100644
--- a/source/blender/editors/space_userpref/CMakeLists.txt
+++ b/source/blender/editors/space_userpref/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../makesrna
-  ../../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -31,7 +30,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::extern::fmtlib
   PRIVATE bf::intern::guardedalloc
-  bf_windowmanager
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index d57a9e6a2c1..b18ad9ce84b 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -15,7 +15,6 @@ set(INC
   ../../modifiers
   ../../nodes
   ../../render
-  ../../windowmanager
   ../../../../intern/mantaflow/extern
 
   # RNA_prototypes.hh
@@ -91,6 +90,7 @@ set(LIB
   bf_editor_mesh
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_PYTHON)
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index d878f29ba88..47aea72c7ee 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../../makesrna
   ../../render
   ../../sequencer
-  ../../windowmanager
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -120,6 +119,7 @@ set(LIB
   bf_editor_mask
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_editor_transform "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/undo/CMakeLists.txt b/source/blender/editors/undo/CMakeLists.txt
index 7824c416d8b..2bef04f40ae 100644
--- a/source/blender/editors/undo/CMakeLists.txt
+++ b/source/blender/editors/undo/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
   ../../blenloader
   ../../blentranslation
   ../../makesrna
-  ../../windowmanager
 )
 
 set(INC_SYS
@@ -29,6 +28,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_editor_undo "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index fc34fe4eab9..99b5730662c 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
   ../../imbuf
   ../../makesrna
   ../../sequencer
-  ../../windowmanager
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -116,6 +115,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 
diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt
index 6e0d2bfe9f1..c1dcb22dc49 100644
--- a/source/blender/editors/uvedit/CMakeLists.txt
+++ b/source/blender/editors/uvedit/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   ../../blentranslation
   ../../geometry
   ../../makesrna
-  ../../windowmanager
   ../../../../intern/eigen
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -41,6 +40,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_UV_SLIM)
diff --git a/source/blender/io/alembic/CMakeLists.txt b/source/blender/io/alembic/CMakeLists.txt
index 682c7b970f7..bc88a2b53f6 100644
--- a/source/blender/io/alembic/CMakeLists.txt
+++ b/source/blender/io/alembic/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../../blentranslation
   ../../editors/include
   ../../makesrna
-  ../../windowmanager
   ../../../../intern/utfconv
 )
 
@@ -93,6 +92,7 @@ set(LIB
 
   ${ALEMBIC_LIBRARIES}
   ${OPENEXR_LIBRARIES}
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_BOOST)
diff --git a/source/blender/io/collada/CMakeLists.txt b/source/blender/io/collada/CMakeLists.txt
index bf849f2ea6d..5114a03708e 100644
--- a/source/blender/io/collada/CMakeLists.txt
+++ b/source/blender/io/collada/CMakeLists.txt
@@ -26,7 +26,6 @@ set(INC
   ../../ikplugin
   ../../imbuf
   ../../makesrna
-  ../../windowmanager
   ../../../../intern/iksolver/extern
 )
 
@@ -118,6 +117,7 @@ set(LIB
   PRIVATE bf::depsgraph
   PRIVATE bf::dna
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_BUILDINFO)
diff --git a/source/blender/io/grease_pencil/CMakeLists.txt b/source/blender/io/grease_pencil/CMakeLists.txt
index 597ba772ada..415ff55d1d3 100644
--- a/source/blender/io/grease_pencil/CMakeLists.txt
+++ b/source/blender/io/grease_pencil/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
   ../../geometry
   ../../makesdna
   ../../makesrna
-  ../../windowmanager
   ../../../../intern/guardedalloc
   ../../../../intern/utfconv
   ../../../../extern/fmtlib/include
@@ -37,6 +36,7 @@ set(LIB
   PRIVATE bf::extern::nanosvg
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
   PRIVATE extern_fmtlib
   bf_io_common
 )
diff --git a/source/blender/io/ply/CMakeLists.txt b/source/blender/io/ply/CMakeLists.txt
index 254df6d6653..f62cefe2dc8 100644
--- a/source/blender/io/ply/CMakeLists.txt
+++ b/source/blender/io/ply/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
   ../common
   ../../geometry
   ../../makesrna
-  ../../windowmanager
 )
 
 set(INC_SYS
@@ -57,6 +56,7 @@ set(LIB
   PRIVATE bf::intern::guardedalloc
   bf_io_common
   PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_io_ply "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/io/stl/CMakeLists.txt b/source/blender/io/stl/CMakeLists.txt
index 440f5514c7e..4ded38a5ed0 100644
--- a/source/blender/io/stl/CMakeLists.txt
+++ b/source/blender/io/stl/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
   ../common
   ../../editors/include
   ../../makesrna
-  ../../windowmanager
 )
 
 set(INC_SYS
@@ -47,6 +46,7 @@ set(LIB
   PRIVATE bf::intern::guardedalloc
   bf_io_common
   PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_io_stl "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt
index fdb1b6c46c3..083d601aa17 100644
--- a/source/blender/io/usd/CMakeLists.txt
+++ b/source/blender/io/usd/CMakeLists.txt
@@ -51,7 +51,6 @@ set(INC
   ../../makesrna
   ../../nodes
   ../../python/intern
-  ../../windowmanager
   ../../../../intern/utfconv
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -204,6 +203,7 @@ set(LIB
   PRIVATE bf::intern::guardedalloc
   bf_io_common
   PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )
 
 list(APPEND LIB
diff --git a/source/blender/io/wavefront_obj/CMakeLists.txt b/source/blender/io/wavefront_obj/CMakeLists.txt
index b322b5a2769..ad3c7d1ee66 100644
--- a/source/blender/io/wavefront_obj/CMakeLists.txt
+++ b/source/blender/io/wavefront_obj/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
   ../../editors/include
   ../../makesrna
   ../../nodes
-  ../../windowmanager
 )
 
 set(INC_SYS
@@ -60,6 +59,7 @@ set(LIB
   PRIVATE bf::intern::guardedalloc
   bf_io_common
   PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_io_wavefront_obj "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index c52359022ab..acdbe564bce 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -14,7 +14,6 @@ set(INC
   ../makesrna
   ../nodes
   ../render
-  ../windowmanager
   ../../../intern/eigen
 
   # RNA_prototypes.hh
@@ -146,6 +145,7 @@ set(LIB
   PUBLIC bf::dna
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_ALEMBIC)
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 7e827e7d074..f028ae9302a 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -64,7 +64,6 @@ set(INC
   ../makesrna
   ../modifiers
   ../render
-  ../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -153,6 +152,7 @@ set(LIB
   bf_nodes_texture
   PRIVATE bf::extern::fmtlib
   PRIVATE bf::extern::xxhash
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_BULLET)
diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt
index db9608af7dd..f2e6ddf71a5 100644
--- a/source/blender/nodes/composite/CMakeLists.txt
+++ b/source/blender/nodes/composite/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
   ../../imbuf
   ../../makesrna
   ../../render
-  ../../windowmanager
   ../../compositor
   ../../compositor/algorithms
   ../../compositor/cached_resources
@@ -134,6 +133,7 @@ set(LIB
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::extern::fmtlib
   bf_compositor
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_OPENCOLORIO)
diff --git a/source/blender/nodes/function/CMakeLists.txt b/source/blender/nodes/function/CMakeLists.txt
index 8a9890fb58f..b72aeccbbf7 100644
--- a/source/blender/nodes/function/CMakeLists.txt
+++ b/source/blender/nodes/function/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
   ../../editors/include
   ../../functions
   ../../makesrna
-  ../../windowmanager
 )
 
 set(INC_SYS
@@ -73,6 +72,7 @@ set(LIB
   PRIVATE bf::dna
   bf_functions
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 add_node_discovery(
diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt
index 305d8dea445..2ab65714d62 100644
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@ -17,7 +17,6 @@ set(INC
   ../../makesrna
   ../../modifiers
   ../../render
-  ../../windowmanager
   ../../io/common
   ../../io/ply
   ../../io/stl
@@ -258,6 +257,7 @@ set(LIB
   PRIVATE bf::intern::atomic
   PRIVATE bf::extern::fmtlib
   PRIVATE bf::extern::xxhash
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_IO_STL)
diff --git a/source/blender/nodes/shader/CMakeLists.txt b/source/blender/nodes/shader/CMakeLists.txt
index 975612aa007..edcfcdfe776 100644
--- a/source/blender/nodes/shader/CMakeLists.txt
+++ b/source/blender/nodes/shader/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
   ../../imbuf
   ../../makesrna
   ../../render
-  ../../windowmanager
   ../../../../intern/sky/include
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -137,6 +136,7 @@ set(LIB
   PRIVATE bf::intern::guardedalloc
   bf_intern_sky
   bf_nodes
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_MATERIALX)
diff --git a/source/blender/nodes/texture/CMakeLists.txt b/source/blender/nodes/texture/CMakeLists.txt
index 67399fbb2ad..a0b646529b1 100644
--- a/source/blender/nodes/texture/CMakeLists.txt
+++ b/source/blender/nodes/texture/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
   ../../imbuf
   ../../makesrna
   ../../render
-  ../../windowmanager
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -62,6 +61,7 @@ set(LIB
   PRIVATE bf::dna
   PRIVATE bf::intern::guardedalloc
   bf_nodes
+  PRIVATE bf::windowmanager
 )
 
 blender_add_lib(bf_nodes_texture "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index 269b571bd03..c9e2292bd3c 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
   ../../imbuf
   ../../imbuf/intern/oiio
   ../../makesrna
-  ../../windowmanager
   ../../../../intern/mantaflow/extern
   ../../../../intern/opencolorio
   # RNA_prototypes.hh
@@ -133,6 +132,7 @@ set(LIB
 
   ${PYTHON_LINKFLAGS}
   ${PYTHON_LIBRARIES}
+  PRIVATE bf::windowmanager
 )
 
 # Only to check if `buildinfo` is available.
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 0e2fb6f1a6e..a849c89e8a9 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -18,7 +18,6 @@ set(INC
   ../nodes
   ../sequencer
   ../simulation
-  ../windowmanager
   ../../../intern/mikktspace
   ../../../intern/mantaflow/extern
 )
@@ -68,6 +67,7 @@ set(LIB
   PRIVATE bf::intern::guardedalloc
   bf_compositor
   PRIVATE bf::intern::atomic
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_PYTHON)
diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt
index 30d2f3311ad..338524ac829 100644
--- a/source/blender/sequencer/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
   ../imbuf/movie
   ../makesrna
   ../render
-  ../windowmanager
 
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -91,6 +90,7 @@ set(LIB
   PRIVATE bf::intern::atomic
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 if(WITH_AUDASPACE)
diff --git a/source/blender/shader_fx/CMakeLists.txt b/source/blender/shader_fx/CMakeLists.txt
index f0f835bb2ab..c0c0b036d46 100644
--- a/source/blender/shader_fx/CMakeLists.txt
+++ b/source/blender/shader_fx/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../editors/include
   ../makesrna
   ../render
-  ../windowmanager
   ../../../intern/eigen
   # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -46,6 +45,7 @@ set(LIB
   PRIVATE bf::depsgraph
   PRIVATE bf::dna
   PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )
 
 
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 30896feafaf..5143a8068a0 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 set(INC
-  .
+  PUBLIC .
   gizmo
   gizmo/intern
   ../asset_system
@@ -204,6 +204,7 @@ if(WITH_XR_OPENXR)
 endif()
 
 blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+add_library(bf::windowmanager ALIAS bf_windowmanager)
 
 # RNA_prototypes.hh
 add_dependencies(bf_windowmanager bf_rna)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 242f55f23ef..f3b591984ad 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
   ../blender/io/usd
   ../blender/makesrna
   ../blender/render
-  ../blender/windowmanager
 )
 
 set(LIB
@@ -21,7 +20,7 @@ set(LIB
   PRIVATE bf::gpu
   PRIVATE bf::intern::clog
   PRIVATE bf::intern::guardedalloc
-  bf_windowmanager
+  PRIVATE bf::windowmanager
 )
 
 if(HAVE_FEENABLEEXCEPT)