diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index bf6c1f32330..412044ecabb 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -105,8 +105,8 @@ set(SRC
   intern/math_geom.cc
   intern/math_geom_inline.c
   intern/math_interp.cc
-  intern/math_matrix_c.cc
   intern/math_matrix.cc
+  intern/math_matrix_c.cc
   intern/math_rotation.c
   intern/math_rotation.cc
   intern/math_solvers.c
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 54e4a71f936..687ac3989f0 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -222,10 +222,10 @@ set(VULKAN_SRC
   vulkan/render_graph/nodes/vk_pipeline_data.cc
   vulkan/render_graph/vk_command_buffer_wrapper.cc
   vulkan/render_graph/vk_command_builder.cc
+  vulkan/render_graph/vk_render_graph.cc
   vulkan/render_graph/vk_resource_access_info.cc
   vulkan/render_graph/vk_resource_state_tracker.cc
   vulkan/render_graph/vk_scheduler.cc
-  vulkan/render_graph/vk_render_graph.cc
   vulkan/vk_resource_tracker.cc
   vulkan/vk_sampler.cc
   vulkan/vk_samplers.cc
@@ -280,16 +280,16 @@ set(VULKAN_SRC
   vulkan/render_graph/nodes/vk_dispatch_node.hh
   vulkan/render_graph/nodes/vk_fill_buffer_node.hh
   vulkan/render_graph/nodes/vk_node_info.hh
-  vulkan/render_graph/nodes/vk_synchronization_node.hh
   vulkan/render_graph/nodes/vk_pipeline_data.hh
+  vulkan/render_graph/nodes/vk_synchronization_node.hh
   vulkan/render_graph/vk_command_buffer_wrapper.hh
   vulkan/render_graph/vk_command_builder.hh
+  vulkan/render_graph/vk_render_graph.hh
+  vulkan/render_graph/vk_render_graph_links.hh
   vulkan/render_graph/vk_render_graph_node.hh
   vulkan/render_graph/vk_resource_access_info.hh
   vulkan/render_graph/vk_resource_state_tracker.hh
   vulkan/render_graph/vk_scheduler.hh
-  vulkan/render_graph/vk_render_graph.hh
-  vulkan/render_graph/vk_render_graph_links.hh
   vulkan/vk_resource_tracker.hh
   vulkan/vk_sampler.hh
   vulkan/vk_samplers.hh
@@ -942,9 +942,9 @@ if(WITH_GTESTS)
     list(APPEND TEST_SRC
       vulkan/tests/vk_data_conversion_test.cc
       vulkan/tests/vk_memory_layout_test.cc
-      vulkan/render_graph/tests/vk_render_graph_test_transfer.cc
       vulkan/render_graph/tests/vk_render_graph_test_compute.cc
       vulkan/render_graph/tests/vk_render_graph_test_present.cc
+      vulkan/render_graph/tests/vk_render_graph_test_transfer.cc
     )
   endif()
 
diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt
index f555e7c572f..1b1885b9949 100644
--- a/source/blender/io/usd/CMakeLists.txt
+++ b/source/blender/io/usd/CMakeLists.txt
@@ -120,9 +120,9 @@ set(SRC
   intern/usd_reader_shape.cc
   intern/usd_reader_skeleton.cc
   intern/usd_reader_stage.cc
+  intern/usd_reader_utils.cc
   intern/usd_reader_volume.cc
   intern/usd_reader_xform.cc
-  intern/usd_reader_utils.cc
   intern/usd_skel_convert.cc
   intern/usd_skel_root_utils.cc
 
@@ -162,9 +162,9 @@ set(SRC
   intern/usd_reader_shape.hh
   intern/usd_reader_skeleton.hh
   intern/usd_reader_stage.hh
+  intern/usd_reader_utils.hh
   intern/usd_reader_volume.hh
   intern/usd_reader_xform.hh
-  intern/usd_reader_utils.hh
   intern/usd_skel_convert.hh
   intern/usd_skel_root_utils.hh
 )
diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt
index f8db9b896aa..cd8607f482a 100644
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@ -9,8 +9,8 @@ set(INC
   ../intern
   ../../editors/include
   ../../blenkernel
-  ../../blentranslation
   ../../blenloader
+  ../../blentranslation
   ../../bmesh
   ../../functions
   ../../geometry