diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt
index c17550531f2..980b86b87f0 100644
--- a/intern/opensubdiv/CMakeLists.txt
+++ b/intern/opensubdiv/CMakeLists.txt
@@ -61,6 +61,7 @@ if(WITH_OPENSUBDIV)
     internal/evaluator/gpu_compute_evaluator.h
     internal/evaluator/gpu_patch_table.cc
     internal/evaluator/gpu_patch_table.hh
+    internal/evaluator/gpu_vertex_buffer_wrapper.hh
     internal/evaluator/patch_map.cc
     internal/evaluator/patch_map.h
 
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 90c2790749f..699100ce1ca 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -87,6 +87,7 @@ set(SRC_DNA_INC
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_view3d_types.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_viewer_path_types.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_volume_types.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_windowmanager_enums.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_windowmanager_types.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_workspace_types.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_world_types.h
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 330dde63405..21e9923341d 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -219,14 +219,15 @@ set(SRC
   engines/eevee/eevee_volume.hh
   engines/eevee/eevee_world.hh
   engines/external/external_engine.h
-  engines/gpencil/gpencil_engine_private.hh
   engines/gpencil/gpencil_engine.hh
+  engines/gpencil/gpencil_engine_private.hh
   engines/gpencil/gpencil_shader.hh
   engines/image/image_batches.hh
   engines/image/image_buffer_cache.hh
   engines/image/image_drawing_mode.hh
   engines/image/image_engine.h
   engines/image/image_enums.hh
+  engines/image/image_instance.hh
   engines/image/image_partial_updater.hh
   engines/image/image_private.hh
   engines/image/image_shader.hh
@@ -244,6 +245,7 @@ set(SRC
   engines/overlay/overlay_next_attribute_viewer.hh
   engines/overlay/overlay_next_axes.hh
   engines/overlay/overlay_next_background.hh
+  engines/overlay/overlay_next_base.hh
   engines/overlay/overlay_next_bounds.hh
   engines/overlay/overlay_next_camera.hh
   engines/overlay/overlay_next_cursor.hh
diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt
index 554bb97c06b..5a1d6bb428e 100644
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -207,8 +207,8 @@ endif()
 
 if(WITH_GTESTS)
   set(TEST_SRC
-    paint_test.cc
     mesh_brush_common_tests.cc
+    paint_test.cc
     sculpt_detail_test.cc
   )
   set(TEST_INC
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 777d6801af3..fbc7e6ba825 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -222,8 +222,8 @@ set(VULKAN_SRC
   vulkan/vk_descriptor_pools.cc
   vulkan/vk_descriptor_set.cc
   vulkan/vk_descriptor_set_layouts.cc
-  vulkan/vk_device_submission.cc
   vulkan/vk_device.cc
+  vulkan/vk_device_submission.cc
   vulkan/vk_fence.cc
   vulkan/vk_framebuffer.cc
   vulkan/vk_image_view.cc