diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 6fa6ee6a090..db18ac24e61 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -4,8 +4,8 @@
 
 set(INC
   PUBLIC .
-  ../../source/blender/imbuf
   ../../source/blender/gpu
+  ../../source/blender/imbuf
   ../guardedalloc
 )
 
diff --git a/source/blender/asset_system/CMakeLists.txt b/source/blender/asset_system/CMakeLists.txt
index e3499fe3886..89c1db2d941 100644
--- a/source/blender/asset_system/CMakeLists.txt
+++ b/source/blender/asset_system/CMakeLists.txt
@@ -23,8 +23,8 @@ set(SRC
   intern/asset_representation.cc
   intern/library_types/all_library.cc
   intern/library_types/essentials_library.cc
-  intern/library_types/preferences_on_disk_library.cc
   intern/library_types/on_disk_library.cc
+  intern/library_types/preferences_on_disk_library.cc
   intern/library_types/runtime_library.cc
   intern/utils.cc
 
@@ -39,8 +39,8 @@ set(SRC
   intern/asset_library_service.hh
   intern/library_types/all_library.hh
   intern/library_types/essentials_library.hh
-  intern/library_types/preferences_on_disk_library.hh
   intern/library_types/on_disk_library.hh
+  intern/library_types/preferences_on_disk_library.hh
   intern/library_types/runtime_library.hh
   intern/utils.hh
 )
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 7834bcf095c..299b51ef851 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -135,6 +135,7 @@ set(SRC
   intern/fluid.cc
   intern/fmodifier.cc
   intern/freestyle.cc
+  intern/geometry_compare.cc
   intern/geometry_component_curves.cc
   intern/geometry_component_edit_data.cc
   intern/geometry_component_grease_pencil.cc
@@ -200,7 +201,6 @@ set(SRC
   intern/mesh.cc
   intern/mesh_attributes.cc
   intern/mesh_calc_edges.cc
-  intern/geometry_compare.cc
   intern/mesh_convert.cc
   intern/mesh_data_update.cc
   intern/mesh_debug.cc
@@ -403,6 +403,7 @@ set(SRC
   BKE_file_handler.hh
   BKE_fluid.h
   BKE_freestyle.h
+  BKE_geometry_compare.hh
   BKE_geometry_fields.hh
   BKE_geometry_nodes_gizmos_transforms.hh
   BKE_geometry_nodes_reference_set.hh
@@ -449,7 +450,6 @@ set(SRC
   BKE_mball_tessellate.hh
   BKE_mesh.h
   BKE_mesh.hh
-  BKE_geometry_compare.hh
   BKE_mesh_fair.hh
   BKE_mesh_iterators.hh
   BKE_mesh_legacy_convert.hh
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index d8925264f46..3e261d1719d 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -108,8 +108,8 @@ set(SRC
   intern/math_interp.cc
   intern/math_matrix.cc
   intern/math_matrix_c.cc
-  intern/math_rotation_c.cc
   intern/math_rotation.cc
+  intern/math_rotation_c.cc
   intern/math_solvers.cc
   intern/math_statistics.cc
   intern/math_time.cc
@@ -121,8 +121,8 @@ set(SRC
   intern/memory_utils.cc
   intern/mesh_boolean.cc
   intern/mesh_intersect.cc
-  intern/noise_c.cc
   intern/noise.cc
+  intern/noise_c.cc
   intern/offset_indices.cc
   intern/ordered_edge.cc
   intern/path_utils.cc
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 47d83b344c5..5d305cf9e69 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -101,8 +101,8 @@ set(SRC
   intern/draw_view_data.cc
   intern/draw_volume.cc
   engines/compositor/compositor_engine.cc
-  engines/image/image_engine.cc
   engines/image/image_drawing_mode.cc
+  engines/image/image_engine.cc
   engines/image/image_shader.cc
   engines/eevee_next/eevee_ambient_occlusion.cc
   engines/eevee_next/eevee_camera.cc
@@ -243,7 +243,6 @@ set(SRC
   engines/image/image_drawing_mode.hh
   engines/image/image_engine.h
   engines/image/image_enums.hh
-  engines/image/image_state.hh
   engines/image/image_partial_updater.hh
   engines/image/image_private.hh
   engines/image/image_shader.hh
@@ -251,6 +250,7 @@ set(SRC
   engines/image/image_space.hh
   engines/image/image_space_image.hh
   engines/image/image_space_node.hh
+  engines/image/image_state.hh
   engines/image/image_texture_info.hh
   engines/image/image_usage.hh
   engines/overlay/overlay_engine.h
diff --git a/source/blender/draw/engines/eevee_next/shaders/CMakeLists.txt b/source/blender/draw/engines/eevee_next/shaders/CMakeLists.txt
index 30401c3db94..a46a11f94ea 100644
--- a/source/blender/draw/engines/eevee_next/shaders/CMakeLists.txt
+++ b/source/blender/draw/engines/eevee_next/shaders/CMakeLists.txt
@@ -15,8 +15,8 @@ set(INC_GLSL
   ../../../../gpu
   ../../../../gpu/intern
   ../../../../gpu/shaders
-  ../../../../gpu/shaders/infos
   ../../../../gpu/shaders/common
+  ../../../../gpu/shaders/infos
 
   # For grease pencil.
   ../../gpencil
diff --git a/source/blender/draw/engines/gpencil/shaders/CMakeLists.txt b/source/blender/draw/engines/gpencil/shaders/CMakeLists.txt
index 599d375f8a7..53ddc408070 100644
--- a/source/blender/draw/engines/gpencil/shaders/CMakeLists.txt
+++ b/source/blender/draw/engines/gpencil/shaders/CMakeLists.txt
@@ -15,8 +15,8 @@ set(INC_GLSL
   ../../../../gpu
   ../../../../gpu/intern
   ../../../../gpu/shaders
-  ../../../../gpu/shaders/infos
   ../../../../gpu/shaders/common
+  ../../../../gpu/shaders/infos
 )
 
 set(SRC_GLSL_VERT
diff --git a/source/blender/draw/engines/workbench/shaders/CMakeLists.txt b/source/blender/draw/engines/workbench/shaders/CMakeLists.txt
index 450542b6f3c..19ca4a8204c 100644
--- a/source/blender/draw/engines/workbench/shaders/CMakeLists.txt
+++ b/source/blender/draw/engines/workbench/shaders/CMakeLists.txt
@@ -15,8 +15,8 @@ set(INC_GLSL
   ../../../../gpu
   ../../../../gpu/intern
   ../../../../gpu/shaders
-  ../../../../gpu/shaders/infos
   ../../../../gpu/shaders/common
+  ../../../../gpu/shaders/infos
 
   # For grease pencil.
   ../../gpencil