diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index c8faca4175c..4d09c240f1e 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -115,7 +115,7 @@ endif()
 if(WITH_OPENVDB)
   add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS})
   list(APPEND INC
-    ../../../intern/openvdb
+    ../../openvdb
   )
   list(APPEND INC_SYS
     ${OPENVDB_INCLUDE_DIRS}
diff --git a/intern/slim/CMakeLists.txt b/intern/slim/CMakeLists.txt
index 55ac25447a3..3168a8ea65a 100644
--- a/intern/slim/CMakeLists.txt
+++ b/intern/slim/CMakeLists.txt
@@ -5,9 +5,9 @@
 # Derived from `libigl`, a simple C++ geometry processing library.
 
 set(INC
-  ./
+  .
   ../../source/blender/blenlib
-  ../../intern/guardedalloc
+  ../guardedalloc
 )
 
 set(INC_SYS
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 634d5cefa54..f8cd13a62ed 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -289,6 +289,7 @@ set(SRC
   engines/image/image_usage.hh
   engines/overlay/overlay_engine.h
   engines/overlay/overlay_next_antialiasing.hh
+  engines/overlay/overlay_next_armature.hh
   engines/overlay/overlay_next_background.hh
   engines/overlay/overlay_next_bounds.hh
   engines/overlay/overlay_next_camera.hh
diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt
index 67232446033..b167e59e5ea 100644
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -126,7 +126,9 @@ set(SRC
   grease_pencil_trace_util.hh
   grease_pencil_weight_paint.hh
   mesh_brush_common.hh
+  paint_hide.hh
   paint_intern.hh
+  paint_mask.hh
   sculpt_automask.hh
   sculpt_boundary.hh
   sculpt_cloth.hh
diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt
index 1191c2f27c8..b5ec90da570 100644
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@ -231,6 +231,7 @@ set(SRC
 
   include/NOD_geo_bake.hh
   include/NOD_geo_capture_attribute.hh
+  include/NOD_geo_foreach_geometry_element.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_config.py b/tools/check_source/check_cmake_consistency_config.py
index 800f3518aae..2d99a9a27d2 100644
--- a/tools/check_source/check_cmake_consistency_config.py
+++ b/tools/check_source/check_cmake_consistency_config.py
@@ -15,7 +15,6 @@ IGNORE_SOURCE = (
     # Specific source files.
     "extern/audaspace/",
     "extern/quadriflow/3rd/",
-    "extern/sdlew/include/",
     "extern/mantaflow/",
     "extern/Eigen3/",
 
@@ -100,22 +99,31 @@ IGNORE_SOURCE = (
 )
 
 # Ignore cmake file, path pairs,
-# NOTE: keep commented block to show the intended format.
-"""
+# NOTE: keep commented block to show the intended format (even when unused).
 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",
+            "hiprt/impl/Aabb.h",
+            "hiprt/impl/BvhNode.h",
+            "hiprt/impl/Geometry.h",
+            "hiprt/impl/hiprt_device_impl.h",
+            "hiprt/impl/hiprt_kernels_bitcode.h",
+            "hiprt/impl/Instance.h",
+            "hiprt/impl/Math.h",
+            "hiprt/impl/QrDecomposition.h",
+            "hiprt/impl/Quaternion.h",
+            "hiprt/impl/Scene.h",
+            "hiprt/impl/Transform.h",
+            "hiprt/impl/Triangle.h",
+
+            "hiprt/hiprt_common.h",
+            "hiprt/hiprt_device.h",
+            "hiprt/hiprt_types.h",
+            "hiprt/hiprt_vec.h",
         ),
     ),
-)
-"""
-IGNORE_SOURCE_MISSING: Tuple[Tuple[str, Tuple[str, ...]], ...] = (
-)
 
+)
 
 IGNORE_CMAKE = (
     "extern/audaspace/CMakeLists.txt",