diff --git a/extern/ceres/CMakeLists.txt b/extern/ceres/CMakeLists.txt
index 47bb3af6ec6..3f83cd09637 100644
--- a/extern/ceres/CMakeLists.txt
+++ b/extern/ceres/CMakeLists.txt
@@ -306,6 +306,9 @@ set(SRC
 
   internal/ceres/generated/partitioned_matrix_view_d_d_d.cc
   internal/ceres/generated/schur_eliminator_d_d_d.cc
+
+  config/ceres/internal/config.h
+  config/ceres/internal/export.h
 )
 
 set(LIB
diff --git a/extern/draco/CMakeLists.txt b/extern/draco/CMakeLists.txt
index 46bb79fe1bf..628d2b8389b 100644
--- a/extern/draco/CMakeLists.txt
+++ b/extern/draco/CMakeLists.txt
@@ -5,18 +5,19 @@
 # Build Draco library.
 add_subdirectory(draco)
 
+set(INC
+  draco/src
+)
+
 # Build Draco-Blender bridging module.
 set(SRC
   src/common.cpp
-  src/common.h
   src/decoder.cpp
-  src/decoder.h
   src/encoder.cpp
-  src/encoder.h
-)
 
-set(INC
-  draco/src
+  src/common.h
+  src/decoder.h
+  src/encoder.h
 )
 
 set(LIB
diff --git a/extern/draco/draco/CMakeLists.txt b/extern/draco/draco/CMakeLists.txt
index 14050fc1d69..ea327c1684e 100644
--- a/extern/draco/draco/CMakeLists.txt
+++ b/extern/draco/draco/CMakeLists.txt
@@ -4,7 +4,12 @@
 
 remove_strict_flags()
 
+set(INC
+  src
+)
+
 set(SRC
+
   src/draco/animation/keyframe_animation.cc
   src/draco/animation/keyframe_animation.h
   src/draco/animation/keyframe_animation_decoder.cc
@@ -232,6 +237,7 @@ set(SRC
   src/draco/core/varint_decoding.h
   src/draco/core/varint_encoding.h
   src/draco/core/vector_d.h
+  src/draco/draco_features.h
   src/draco/mesh/corner_table.cc
   src/draco/mesh/corner_table.h
   src/draco/mesh/corner_table_iterators.h
@@ -267,8 +273,4 @@ set(SRC
 set(LIB
 )
 
-set(INC
-  src
-)
-
 blender_add_lib(draco "${SRC}" "${INC}" "" "${LIB}")
diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt
index 94441277ee5..53b0913a48e 100644
--- a/extern/glog/CMakeLists.txt
+++ b/extern/glog/CMakeLists.txt
@@ -67,6 +67,7 @@ if(WIN32)
     src/windows/glog/vlog_is_on.h
     src/windows/glog/logging.h
     src/windows/glog/log_severity.h
+    src/windows/glog/stl_logging.h
     src/windows/port.h
     src/windows/config.h
   )
@@ -87,6 +88,7 @@ else()
     include/glog/logging.h
     include/glog/log_severity.h
     include/glog/raw_logging.h
+    include/glog/stl_logging.h
     include/glog/vlog_is_on.h
   )
 endif()
diff --git a/extern/hipew/CMakeLists.txt b/extern/hipew/CMakeLists.txt
index 70382dc8816..ee216b78beb 100644
--- a/extern/hipew/CMakeLists.txt
+++ b/extern/hipew/CMakeLists.txt
@@ -26,7 +26,9 @@ if(HIPRT_INCLUDE_DIR)
 
   list(APPEND SRC
     src/hiprtew.cc
+
     include/hiprtew.h
+    src/util.h
   )
 endif()
 
diff --git a/extern/quadriflow/CMakeLists.txt b/extern/quadriflow/CMakeLists.txt
index d918fbfe950..8c0938ca730 100644
--- a/extern/quadriflow/CMakeLists.txt
+++ b/extern/quadriflow/CMakeLists.txt
@@ -83,6 +83,7 @@ set(SRC
   src/parametrizer-scale.cpp
   src/parametrizer-sing.cpp
   src/parametrizer.hpp
+  src/post-solver.hpp
   src/serialize.hpp
   src/subdivide.cpp
   src/subdivide.hpp
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index a40b476eec1..75fcfd2aecf 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -94,6 +94,7 @@ set(SRC_DNA_INC
 )
 
 set(SRC_DNA_DEFAULTS_INC
+  ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_action_defaults.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_armature_defaults.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_asset_defaults.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_brush_defaults.h
@@ -130,6 +131,11 @@ set(SRC_DNA_DEFAULTS_INC
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_world_defaults.h
 )
 
+# Utility & other headers.
+set(SRC_DNA_OTHER_INC
+  ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_array_utils.hh
+)
+
 add_subdirectory(datatoc)
 add_subdirectory(editors)
 add_subdirectory(windowmanager)
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index fc4204579e2..12afb0e044b 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -337,6 +337,7 @@ set(SRC
   BKE_attribute.hh
   BKE_attribute_math.hh
   BKE_autoexec.hh
+  BKE_bake_data_block_id.hh
   BKE_bake_data_block_map.hh
   BKE_bake_geometry_nodes_modifier.hh
   BKE_bake_items.hh
@@ -398,6 +399,7 @@ set(SRC
   BKE_fluid.h
   BKE_freestyle.h
   BKE_geometry_fields.hh
+  BKE_geometry_nodes_gizmos_transforms.hh
   BKE_geometry_set.hh
   BKE_geometry_set_instances.hh
   BKE_global.hh
@@ -521,6 +523,8 @@ set(SRC
   BKE_volume_enums.hh
   BKE_volume_grid.hh
   BKE_volume_grid_file_cache.hh
+  BKE_volume_grid_fwd.hh
+  BKE_volume_grid_type_traits.hh
   BKE_volume_openvdb.hh
   BKE_volume_render.hh
   BKE_volume_to_mesh.hh
diff --git a/source/blender/blenlib/tests/performance/CMakeLists.txt b/source/blender/blenlib/tests/performance/CMakeLists.txt
index f75e7964402..b45fc149083 100644
--- a/source/blender/blenlib/tests/performance/CMakeLists.txt
+++ b/source/blender/blenlib/tests/performance/CMakeLists.txt
@@ -18,4 +18,8 @@ set(LIB
   PRIVATE bf::intern::atomic
 )
 
-blender_add_test_performance_executable(BLI_map_performance "BLI_map_performance_test.cc" "${INC}" "${INC_SYS}" "${LIB}")
+set(SRC
+  BLI_map_performance_test.cc
+)
+
+blender_add_test_performance_executable(BLI_map_performance "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 1e579872cc1..30044bcf566 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -293,6 +293,7 @@ set(SRC
   engines/overlay/overlay_next_empty.hh
   engines/overlay/overlay_next_grid.hh
   engines/overlay/overlay_next_instance.hh
+  engines/overlay/overlay_next_lattice.hh
   engines/overlay/overlay_next_metaball.hh
   engines/overlay/overlay_next_prepass.hh
   engines/overlay/overlay_next_private.hh
diff --git a/source/blender/geometry/CMakeLists.txt b/source/blender/geometry/CMakeLists.txt
index 28aca44ee37..f692c3386db 100644
--- a/source/blender/geometry/CMakeLists.txt
+++ b/source/blender/geometry/CMakeLists.txt
@@ -90,6 +90,7 @@ set(SRC
   GEO_trim_curves.hh
   GEO_uv_pack.hh
   GEO_uv_parametrizer.hh
+  GEO_volume_grid_resample.hh
 )
 
 set(LIB
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 1c4b2eed3ef..5be7ca0d2b2 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -101,6 +101,7 @@ set(SRC
   GPU_material.hh
   GPU_matrix.hh
   GPU_platform.hh
+  GPU_platform_backend_enum.h
   GPU_primitive.hh
   GPU_select.hh
   GPU_shader.hh
@@ -274,6 +275,7 @@ set(VULKAN_SRC
   vulkan/render_graph/nodes/vk_copy_buffer_to_image_node.hh
   vulkan/render_graph/nodes/vk_copy_image_node.hh
   vulkan/render_graph/nodes/vk_copy_image_to_buffer_node.hh
+  vulkan/render_graph/nodes/vk_dispatch_indirect_node.hh
   vulkan/render_graph/nodes/vk_dispatch_node.hh
   vulkan/render_graph/nodes/vk_draw_indexed_indirect_node.hh
   vulkan/render_graph/nodes/vk_draw_indexed_node.hh
@@ -953,6 +955,8 @@ if(WITH_GTESTS)
       vulkan/render_graph/tests/vk_render_graph_test_render.cc
       vulkan/render_graph/tests/vk_render_graph_test_scheduler.cc
       vulkan/render_graph/tests/vk_render_graph_test_transfer.cc
+
+      vulkan/render_graph/tests/vk_render_graph_test_types.hh
     )
   endif()
 
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index a2101f7cc83..8069ed4e8b4 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -156,6 +156,7 @@ set(INC_SYS
 set(SRC
   ${SRC_BLENLIB}
   ${SRC_DNA_DEFAULTS_INC}
+  ${SRC_DNA_OTHER_INC}
 )
 
 set(LIB
diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt
index 7a2bbfb81f2..b1c67bb830d 100644
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@ -226,6 +226,7 @@ set(SRC
   nodes/node_geo_volume_to_mesh.cc
 
   include/NOD_geo_bake.hh
+  include/NOD_geo_capture_attribute.hh
   include/NOD_geo_index_switch.hh
   include/NOD_geo_menu_switch.hh
   include/NOD_geo_repeat.hh
diff --git a/tools/check_source/check_cmake_consistency.py b/tools/check_source/check_cmake_consistency.py
index 70274e3b7bf..7cc670a362e 100755
--- a/tools/check_source/check_cmake_consistency.py
+++ b/tools/check_source/check_cmake_consistency.py
@@ -262,6 +262,8 @@ def cmake_get_src(f: str) -> None:
                             pass
                         elif new_file.endswith(".glsl"):
                             pass
+                        elif new_file.endswith(".natvis"):
+                            pass
                         else:
                             raise Exception("unknown file type - not c or h %s -> %s" % (f, new_file))
 
diff --git a/tools/check_source/check_cmake_consistency_config.py b/tools/check_source/check_cmake_consistency_config.py
index 8b78c715a2d..44f89d173cb 100644
--- a/tools/check_source/check_cmake_consistency_config.py
+++ b/tools/check_source/check_cmake_consistency_config.py
@@ -3,9 +3,11 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 import os
+from typing import (
+    Tuple,
+)
 
 IGNORE_SOURCE = (
-    "/scripts/",
     "/test/",
     "/tests/gtests/",
 
@@ -96,16 +98,17 @@ IGNORE_SOURCE = (
     "intern/libmv/libmv/multiview/test_data_sets.h",
 )
 
-# Ignore cmake file, path pairs.
-IGNORE_SOURCE_MISSING = (
-    (   # Use for `WITH_NANOVDB`.
-        "intern/cycles/kernel/CMakeLists.txt", (
-            "nanovdb/util/CSampleFromVoxels.h",
-            "nanovdb/util/SampleFromVoxels.h",
-            "nanovdb/NanoVDB.h",
-            "nanovdb/CNanoVDB.h",
-        ),
-    ),
+# Ignore cmake file, path pairs,
+# NOTE: keep commented block to show the intended format.
+IGNORE_SOURCE_MISSING: Tuple[Tuple[str, Tuple[str, ...]], ...] = (
+    # (   # Use for `WITH_NANOVDB`.
+    #     "intern/cycles/kernel/CMakeLists.txt", (
+    #         "nanovdb/util/CSampleFromVoxels.h",
+    #         "nanovdb/util/SampleFromVoxels.h",
+    #         "nanovdb/NanoVDB.h",
+    #         "nanovdb/CNanoVDB.h",
+    #     ),
+    # ),
 )
 
 IGNORE_CMAKE = (