Cleanup: sort cmake file lists

25 files changed, 336 insertions, 336 deletions

diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 690e1bcf318..d14f3d67037 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -56,16 +56,18 @@ set(SRC_DNA_INC
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lattice_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_linestyle_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_listBase.h
+	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mask_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_material_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mesh_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_meshdata_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_meta_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_modifier_types.h
+	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_movieclip_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_nla_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_node_types.h
+	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_enums.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_fluidsim_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_force_types.h
-	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_enums.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_outliner_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_packedFile_types.h
@@ -83,6 +85,7 @@ set(SRC_DNA_INC
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_speaker_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_text_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_texture_types.h
+	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_tracking_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_userdef_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_vec_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_vfont_types.h
@@ -90,9 +93,6 @@ set(SRC_DNA_INC
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_view3d_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_windowmanager_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_world_types.h
-	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_movieclip_types.h
-	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_tracking_types.h
-	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mask_types.h
 )
 
 add_subdirectory(datatoc)
diff --git a/source/blender/alembic/CMakeLists.txt b/source/blender/alembic/CMakeLists.txt
index fb08887c076..f43bbea64b7 100644
--- a/source/blender/alembic/CMakeLists.txt
+++ b/source/blender/alembic/CMakeLists.txt
@@ -48,8 +48,8 @@ set(INC_SYS
 set(SRC
 	intern/abc_archive.cc
 	intern/abc_camera.cc
-	intern/abc_customdata.cc
 	intern/abc_curves.cc
+	intern/abc_customdata.cc
 	intern/abc_exporter.cc
 	intern/abc_hair.cc
 	intern/abc_mball.cc
@@ -64,8 +64,8 @@ set(SRC
 	ABC_alembic.h
 	intern/abc_archive.h
 	intern/abc_camera.h
-	intern/abc_customdata.h
 	intern/abc_curves.h
+	intern/abc_customdata.h
 	intern/abc_exporter.h
 	intern/abc_hair.h
 	intern/abc_mball.h
diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/avi/CMakeLists.txt
index d019863faa5..477ee73d833 100644
--- a/source/blender/avi/CMakeLists.txt
+++ b/source/blender/avi/CMakeLists.txt
@@ -36,18 +36,18 @@ set(INC_SYS
 
 set(SRC
 	intern/avi.c
-	intern/avi_rgb.c
 	intern/avi_codecs.c
 	intern/avi_endian.c
 	intern/avi_mjpeg.c
 	intern/avi_options.c
+	intern/avi_rgb.c
 	intern/avi_rgb32.c
 
 	AVI_avi.h
-	intern/avi_intern.h
-	intern/avi_rgb.h
 	intern/avi_endian.h
+	intern/avi_intern.h
 	intern/avi_mjpeg.h
+	intern/avi_rgb.h
 	intern/avi_rgb32.h
 )
 
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 45f2ac083dd..3b6a428f413 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -307,13 +307,13 @@ set(SRC
 
 	depsgraph_private.h
 	nla_private.h
-	tracking_private.h
 	particle_private.h
+	tracking_private.h
 	intern/CCGSubSurf.h
 	intern/CCGSubSurf_inline.h
 	intern/CCGSubSurf_intern.h
-	intern/pbvh_intern.h
 	intern/data_transfer_intern.h
+	intern/pbvh_intern.h
 )
 
 if(WITH_BINRELOC)
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index bd3eb4cc1ac..f8ab8aafdc7 100644
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -87,10 +87,10 @@ set(SRC
 	intern/bmesh_construct.h
 	intern/bmesh_core.c
 	intern/bmesh_core.h
-	intern/bmesh_edgeloop.c
-	intern/bmesh_edgeloop.h
 	intern/bmesh_delete.c
 	intern/bmesh_delete.h
+	intern/bmesh_edgeloop.c
+	intern/bmesh_edgeloop.h
 	intern/bmesh_inline.h
 	intern/bmesh_interp.c
 	intern/bmesh_interp.h
@@ -130,8 +130,8 @@ set(SRC
 	intern/bmesh_walkers_impl.c
 	intern/bmesh_walkers_private.h
 
-	intern/bmesh_operator_api.h
 	intern/bmesh_error.h
+	intern/bmesh_operator_api.h
 
 	tools/bmesh_beautify.c
 	tools/bmesh_beautify.h
@@ -139,10 +139,10 @@ set(SRC
 	tools/bmesh_bevel.h
 	tools/bmesh_bisect_plane.c
 	tools/bmesh_bisect_plane.h
+	tools/bmesh_decimate.h
 	tools/bmesh_decimate_collapse.c
 	tools/bmesh_decimate_dissolve.c
 	tools/bmesh_decimate_unsubdivide.c
-	tools/bmesh_decimate.h
 	tools/bmesh_edgenet.c
 	tools/bmesh_edgenet.h
 	tools/bmesh_edgesplit.c
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt
index fd38998c98c..3a0c9dcf50c 100644
--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/collada/CMakeLists.txt
@@ -60,8 +60,8 @@ set(INC_SYS
 )
 
 set(SRC
-	AnimationImporter.cpp
 	AnimationExporter.cpp
+	AnimationImporter.cpp
 	ArmatureExporter.cpp
 	ArmatureImporter.cpp
 	CameraExporter.cpp
@@ -71,25 +71,25 @@ set(SRC
 	EffectExporter.cpp
 	ErrorHandler.cpp
 	ExportSettings.cpp
-	ImportSettings.cpp
 	ExtraHandler.cpp
 	ExtraTags.cpp
 	GeometryExporter.cpp
 	ImageExporter.cpp
+	ImportSettings.cpp
 	InstanceWriter.cpp
 	LightExporter.cpp
 	MaterialExporter.cpp
 	MeshImporter.cpp
-	SkinInfo.cpp
 	SceneExporter.cpp
+	SkinInfo.cpp
 	TransformReader.cpp
 	TransformWriter.cpp
 	collada.cpp
 	collada_internal.cpp
 	collada_utils.cpp
 
-	AnimationImporter.h
 	AnimationExporter.h
+	AnimationImporter.h
 	ArmatureExporter.h
 	ArmatureImporter.h
 	CameraExporter.h
@@ -99,17 +99,17 @@ set(SRC
 	EffectExporter.h
 	ErrorHandler.h
 	ExportSettings.h
-	ImportSettings.h
 	ExtraHandler.h
 	ExtraTags.h
 	GeometryExporter.h
 	ImageExporter.h
+	ImportSettings.h
 	InstanceWriter.h
 	LightExporter.h
 	MaterialExporter.h
 	MeshImporter.h
-	SkinInfo.h
 	SceneExporter.h
+	SkinInfo.h
 	TransformReader.h
 	TransformWriter.h
 	collada.h
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index 0ad53d3ab80..becad00b647 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -53,126 +53,126 @@ set(SRC
 	COM_compositor.h
 	COM_defines.h
 
-	intern/COM_compositor.cpp
-	intern/COM_ExecutionSystem.cpp
-	intern/COM_ExecutionSystem.h
-	intern/COM_NodeConverter.cpp
-	intern/COM_NodeConverter.h
-	intern/COM_NodeOperationBuilder.cpp
-	intern/COM_NodeOperationBuilder.h
-	intern/COM_NodeGraph.cpp
-	intern/COM_NodeGraph.h
+	intern/COM_CPUDevice.cpp
+	intern/COM_CPUDevice.h
+	intern/COM_ChunkOrder.cpp
+	intern/COM_ChunkOrder.h
+	intern/COM_ChunkOrderHotspot.cpp
+	intern/COM_ChunkOrderHotspot.h
+	intern/COM_CompositorContext.cpp
+	intern/COM_CompositorContext.h
 	intern/COM_Converter.cpp
 	intern/COM_Converter.h
+	intern/COM_Debug.cpp
+	intern/COM_Debug.h
+	intern/COM_Device.cpp
+	intern/COM_Device.h
 	intern/COM_ExecutionGroup.cpp
 	intern/COM_ExecutionGroup.h
+	intern/COM_ExecutionSystem.cpp
+	intern/COM_ExecutionSystem.h
+	intern/COM_MemoryBuffer.cpp
+	intern/COM_MemoryBuffer.h
+	intern/COM_MemoryProxy.cpp
+	intern/COM_MemoryProxy.h
 	intern/COM_Node.cpp
 	intern/COM_Node.h
+	intern/COM_NodeConverter.cpp
+	intern/COM_NodeConverter.h
+	intern/COM_NodeGraph.cpp
+	intern/COM_NodeGraph.h
 	intern/COM_NodeOperation.cpp
 	intern/COM_NodeOperation.h
-	intern/COM_SocketReader.cpp
-	intern/COM_SocketReader.h
-	intern/COM_MemoryProxy.cpp
-	intern/COM_MemoryProxy.h
-	intern/COM_MemoryBuffer.cpp
-	intern/COM_MemoryBuffer.h
-	intern/COM_WorkScheduler.cpp
-	intern/COM_WorkScheduler.h
-	intern/COM_WorkPackage.cpp
-	intern/COM_WorkPackage.h
-	intern/COM_ChunkOrder.cpp
-	intern/COM_ChunkOrder.h
-	intern/COM_ChunkOrderHotspot.cpp
-	intern/COM_ChunkOrderHotspot.h
-	intern/COM_Device.cpp
-	intern/COM_Device.h
-	intern/COM_CPUDevice.cpp
-	intern/COM_CPUDevice.h
+	intern/COM_NodeOperationBuilder.cpp
+	intern/COM_NodeOperationBuilder.h
 	intern/COM_OpenCLDevice.cpp
 	intern/COM_OpenCLDevice.h
-	intern/COM_CompositorContext.cpp
-	intern/COM_CompositorContext.h
 	intern/COM_SingleThreadedOperation.cpp
 	intern/COM_SingleThreadedOperation.h
-	intern/COM_Debug.cpp
-	intern/COM_Debug.h
+	intern/COM_SocketReader.cpp
+	intern/COM_SocketReader.h
+	intern/COM_WorkPackage.cpp
+	intern/COM_WorkPackage.h
+	intern/COM_WorkScheduler.cpp
+	intern/COM_WorkScheduler.h
+	intern/COM_compositor.cpp
 
-	operations/COM_QualityStepHelper.h
 	operations/COM_QualityStepHelper.cpp
+	operations/COM_QualityStepHelper.h
 
 	# Internal nodes
 	nodes/COM_SocketProxyNode.cpp
 	nodes/COM_SocketProxyNode.h
 
 	# input nodes
-	nodes/COM_RenderLayersNode.cpp
-	nodes/COM_RenderLayersNode.h
-	nodes/COM_ImageNode.cpp
-	nodes/COM_ImageNode.h
-	nodes/COM_TextureNode.cpp
-	nodes/COM_TextureNode.h
 	nodes/COM_BokehImageNode.cpp
 	nodes/COM_BokehImageNode.h
 	nodes/COM_ColorNode.cpp
 	nodes/COM_ColorNode.h
-	nodes/COM_ValueNode.cpp
-	nodes/COM_ValueNode.h
-	nodes/COM_TimeNode.cpp
-	nodes/COM_TimeNode.h
-	nodes/COM_SwitchNode.cpp
-	nodes/COM_SwitchNode.h
-	nodes/COM_SwitchViewNode.cpp
-	nodes/COM_SwitchViewNode.h
+	nodes/COM_ImageNode.cpp
+	nodes/COM_ImageNode.h
+	nodes/COM_MaskNode.cpp
+	nodes/COM_MaskNode.h
 	nodes/COM_MovieClipNode.cpp
 	nodes/COM_MovieClipNode.h
 	nodes/COM_OutputFileNode.cpp
 	nodes/COM_OutputFileNode.h
-	nodes/COM_MaskNode.cpp
-	nodes/COM_MaskNode.h
+	nodes/COM_RenderLayersNode.cpp
+	nodes/COM_RenderLayersNode.h
+	nodes/COM_SwitchNode.cpp
+	nodes/COM_SwitchNode.h
+	nodes/COM_SwitchViewNode.cpp
+	nodes/COM_SwitchViewNode.h
+	nodes/COM_TextureNode.cpp
+	nodes/COM_TextureNode.h
+	nodes/COM_TimeNode.cpp
+	nodes/COM_TimeNode.h
+	nodes/COM_ValueNode.cpp
+	nodes/COM_ValueNode.h
 
 	# output nodes
 	nodes/COM_CompositorNode.cpp
 	nodes/COM_CompositorNode.h
-	nodes/COM_ViewerNode.cpp
-	nodes/COM_ViewerNode.h
 	nodes/COM_SplitViewerNode.cpp
 	nodes/COM_SplitViewerNode.h
 	nodes/COM_ViewLevelsNode.cpp
 	nodes/COM_ViewLevelsNode.h
-	operations/COM_CalculateStandardDeviationOperation.cpp
-	operations/COM_CalculateStandardDeviationOperation.h
+	nodes/COM_ViewerNode.cpp
+	nodes/COM_ViewerNode.h
 	operations/COM_CalculateMeanOperation.cpp
 	operations/COM_CalculateMeanOperation.h
+	operations/COM_CalculateStandardDeviationOperation.cpp
+	operations/COM_CalculateStandardDeviationOperation.h
 
 	# distort nodes
-	nodes/COM_TranslateNode.cpp
-	nodes/COM_TranslateNode.h
-	nodes/COM_ScaleNode.cpp
-	nodes/COM_ScaleNode.h
-	nodes/COM_RotateNode.cpp
-	nodes/COM_RotateNode.h
 	nodes/COM_FlipNode.cpp
 	nodes/COM_FlipNode.h
+	nodes/COM_RotateNode.cpp
+	nodes/COM_RotateNode.h
+	nodes/COM_ScaleNode.cpp
+	nodes/COM_ScaleNode.h
+	nodes/COM_TranslateNode.cpp
+	nodes/COM_TranslateNode.h
 
-	nodes/COM_MapUVNode.cpp
-	nodes/COM_MapUVNode.h
 	nodes/COM_DisplaceNode.cpp
 	nodes/COM_DisplaceNode.h
+	nodes/COM_MapUVNode.cpp
+	nodes/COM_MapUVNode.h
 
-	nodes/COM_DifferenceMatteNode.cpp
-	nodes/COM_DifferenceMatteNode.h
-	nodes/COM_LuminanceMatteNode.cpp
-	nodes/COM_LuminanceMatteNode.h
-	nodes/COM_DistanceMatteNode.cpp
-	nodes/COM_DistanceMatteNode.h
+	nodes/COM_ChannelMatteNode.cpp
+	nodes/COM_ChannelMatteNode.h
 	nodes/COM_ChromaMatteNode.cpp
 	nodes/COM_ChromaMatteNode.h
 	nodes/COM_ColorMatteNode.cpp
 	nodes/COM_ColorMatteNode.h
-	nodes/COM_ChannelMatteNode.cpp
-	nodes/COM_ChannelMatteNode.h
+	nodes/COM_DifferenceMatteNode.cpp
+	nodes/COM_DifferenceMatteNode.h
+	nodes/COM_DistanceMatteNode.cpp
+	nodes/COM_DistanceMatteNode.h
 	nodes/COM_LensDistortionNode.cpp
 	nodes/COM_LensDistortionNode.h
+	nodes/COM_LuminanceMatteNode.cpp
+	nodes/COM_LuminanceMatteNode.h
 
 	nodes/COM_GlareNode.cpp
 	nodes/COM_GlareNode.h
@@ -197,71 +197,71 @@ set(SRC
 	operations/COM_CropOperation.cpp
 	operations/COM_CropOperation.h
 
-	nodes/COM_TransformNode.cpp
-	nodes/COM_TransformNode.h
-	nodes/COM_Stabilize2dNode.cpp
-	nodes/COM_Stabilize2dNode.h
-	nodes/COM_MovieDistortionNode.cpp
-	nodes/COM_MovieDistortionNode.h
 	nodes/COM_DefocusNode.cpp
 	nodes/COM_DefocusNode.h
+	nodes/COM_MovieDistortionNode.cpp
+	nodes/COM_MovieDistortionNode.h
+	nodes/COM_Stabilize2dNode.cpp
+	nodes/COM_Stabilize2dNode.h
+	nodes/COM_TransformNode.cpp
+	nodes/COM_TransformNode.h
 
 	# color nodes
-	nodes/COM_VectorCurveNode.cpp
-	nodes/COM_VectorCurveNode.h
-	nodes/COM_ColorCurveNode.cpp
-	nodes/COM_ColorCurveNode.h
-	nodes/COM_ColorToBWNode.cpp
-	nodes/COM_ColorToBWNode.h
-	nodes/COM_ColorRampNode.cpp
-	nodes/COM_ColorRampNode.h
-	nodes/COM_MixNode.cpp
-	nodes/COM_MixNode.h
 	nodes/COM_AlphaOverNode.cpp
 	nodes/COM_AlphaOverNode.h
-	nodes/COM_ZCombineNode.cpp
-	nodes/COM_ZCombineNode.h
 	nodes/COM_BrightnessNode.cpp
 	nodes/COM_BrightnessNode.h
 	nodes/COM_ColorBalanceNode.cpp
 	nodes/COM_ColorBalanceNode.h
-	nodes/COM_InvertNode.cpp
-	nodes/COM_InvertNode.h
-	nodes/COM_GammaNode.cpp
-	nodes/COM_GammaNode.h
-	nodes/COM_SetAlphaNode.cpp
-	nodes/COM_SetAlphaNode.h
+	nodes/COM_ColorCorrectionNode.cpp
+	nodes/COM_ColorCorrectionNode.h
+	nodes/COM_ColorCurveNode.cpp
+	nodes/COM_ColorCurveNode.h
+	nodes/COM_ColorRampNode.cpp
+	nodes/COM_ColorRampNode.h
+	nodes/COM_ColorToBWNode.cpp
+	nodes/COM_ColorToBWNode.h
 	nodes/COM_ConvertAlphaNode.cpp
 	nodes/COM_ConvertAlphaNode.h
-	nodes/COM_HueSaturationValueNode.cpp
-	nodes/COM_HueSaturationValueNode.h
+	nodes/COM_GammaNode.cpp
+	nodes/COM_GammaNode.h
 	nodes/COM_HueSaturationValueCorrectNode.cpp
 	nodes/COM_HueSaturationValueCorrectNode.h
-	nodes/COM_ColorCorrectionNode.cpp
-	nodes/COM_ColorCorrectionNode.h
+	nodes/COM_HueSaturationValueNode.cpp
+	nodes/COM_HueSaturationValueNode.h
+	nodes/COM_InvertNode.cpp
+	nodes/COM_InvertNode.h
+	nodes/COM_MixNode.cpp
+	nodes/COM_MixNode.h
+	nodes/COM_SetAlphaNode.cpp
+	nodes/COM_SetAlphaNode.h
 	nodes/COM_TonemapNode.cpp
 	nodes/COM_TonemapNode.h
+	nodes/COM_VectorCurveNode.cpp
+	nodes/COM_VectorCurveNode.h
+	nodes/COM_ZCombineNode.cpp
+	nodes/COM_ZCombineNode.h
 	operations/COM_TonemapOperation.cpp
 	operations/COM_TonemapOperation.h
 
 	# converter nodes
+	nodes/COM_CombineColorNode.cpp
+	nodes/COM_CombineColorNode.h
 	nodes/COM_IDMaskNode.cpp
 	nodes/COM_IDMaskNode.h
 	nodes/COM_SeparateColorNode.cpp
 	nodes/COM_SeparateColorNode.h
-	nodes/COM_CombineColorNode.cpp
-	nodes/COM_CombineColorNode.h
 
+	nodes/COM_MapRangeNode.cpp
+	nodes/COM_MapRangeNode.h
+	nodes/COM_MapValueNode.cpp
+	nodes/COM_MapValueNode.h
+	nodes/COM_MathNode.cpp
+	nodes/COM_MathNode.h
 	nodes/COM_NormalNode.cpp
 	nodes/COM_NormalNode.h
 	nodes/COM_NormalizeNode.cpp
 	nodes/COM_NormalizeNode.h
-	nodes/COM_MathNode.cpp
-	nodes/COM_MathNode.h
-	nodes/COM_MapValueNode.cpp
-	nodes/COM_MapValueNode.h
-	nodes/COM_MapRangeNode.cpp
-	nodes/COM_MapRangeNode.h
 
 	operations/COM_NormalizeOperation.cpp
 	operations/COM_NormalizeOperation.h
@@ -281,56 +281,56 @@ set(SRC
 	operations/COM_VectorBlurOperation.cpp
 	operations/COM_VectorBlurOperation.h
 
-	nodes/COM_FilterNode.cpp
-	nodes/COM_FilterNode.h
-	nodes/COM_DespeckleNode.cpp
-	nodes/COM_DespeckleNode.h
-	nodes/COM_DilateErodeNode.cpp
-	nodes/COM_DilateErodeNode.h
-	nodes/COM_InpaintNode.cpp
-	nodes/COM_InpaintNode.h
 	nodes/COM_BlurNode.cpp
 	nodes/COM_BlurNode.h
 	nodes/COM_BokehBlurNode.cpp
 	nodes/COM_BokehBlurNode.h
+	nodes/COM_DespeckleNode.cpp
+	nodes/COM_DespeckleNode.h
+	nodes/COM_DilateErodeNode.cpp
+	nodes/COM_DilateErodeNode.h
 	nodes/COM_DirectionalBlurNode.cpp
 	nodes/COM_DirectionalBlurNode.h
+	nodes/COM_FilterNode.cpp
+	nodes/COM_FilterNode.h
+	nodes/COM_InpaintNode.cpp
+	nodes/COM_InpaintNode.h
+	operations/COM_BlurBaseOperation.cpp
+	operations/COM_BlurBaseOperation.h
+	operations/COM_BokehBlurOperation.cpp
+	operations/COM_BokehBlurOperation.h
+	operations/COM_DirectionalBlurOperation.cpp
+	operations/COM_DirectionalBlurOperation.h
+	operations/COM_FastGaussianBlurOperation.cpp
+	operations/COM_FastGaussianBlurOperation.h
+	operations/COM_GammaCorrectOperation.cpp
+	operations/COM_GammaCorrectOperation.h
 	operations/COM_GaussianAlphaXBlurOperation.cpp
 	operations/COM_GaussianAlphaXBlurOperation.h
 	operations/COM_GaussianAlphaYBlurOperation.cpp
 	operations/COM_GaussianAlphaYBlurOperation.h
+	operations/COM_GaussianBokehBlurOperation.cpp
+	operations/COM_GaussianBokehBlurOperation.h
 	operations/COM_GaussianXBlurOperation.cpp
 	operations/COM_GaussianXBlurOperation.h
 	operations/COM_GaussianYBlurOperation.cpp
 	operations/COM_GaussianYBlurOperation.h
-	operations/COM_GaussianBokehBlurOperation.cpp
-	operations/COM_GaussianBokehBlurOperation.h
-	operations/COM_BokehBlurOperation.cpp
-	operations/COM_BokehBlurOperation.h
-	operations/COM_VariableSizeBokehBlurOperation.cpp
-	operations/COM_VariableSizeBokehBlurOperation.h
-	operations/COM_FastGaussianBlurOperation.cpp
-	operations/COM_FastGaussianBlurOperation.h
-	operations/COM_BlurBaseOperation.cpp
-	operations/COM_BlurBaseOperation.h
-	operations/COM_DirectionalBlurOperation.cpp
-	operations/COM_DirectionalBlurOperation.h
 	operations/COM_MovieClipAttributeOperation.cpp
 	operations/COM_MovieClipAttributeOperation.h
 	operations/COM_MovieDistortionOperation.cpp
 	operations/COM_MovieDistortionOperation.h
-	operations/COM_GammaCorrectOperation.h
-	operations/COM_GammaCorrectOperation.cpp
+	operations/COM_VariableSizeBokehBlurOperation.cpp
+	operations/COM_VariableSizeBokehBlurOperation.h
 
 	# Matte nodes
 	nodes/COM_BoxMaskNode.cpp
 	nodes/COM_BoxMaskNode.h
-	nodes/COM_EllipseMaskNode.cpp
-	nodes/COM_EllipseMaskNode.h
 	nodes/COM_ColorSpillNode.cpp
 	nodes/COM_ColorSpillNode.h
 	nodes/COM_DoubleEdgeMaskNode.cpp
 	nodes/COM_DoubleEdgeMaskNode.h
+	nodes/COM_EllipseMaskNode.cpp
+	nodes/COM_EllipseMaskNode.h
 
 	operations/COM_DoubleEdgeMaskOperation.cpp
 	operations/COM_DoubleEdgeMaskOperation.h
@@ -348,193 +348,193 @@ set(SRC
 
 	nodes/COM_KeyingNode.cpp
 	nodes/COM_KeyingNode.h
-	operations/COM_KeyingOperation.cpp
-	operations/COM_KeyingOperation.h
 	operations/COM_KeyingBlurOperation.cpp
 	operations/COM_KeyingBlurOperation.h
-	operations/COM_KeyingDespillOperation.cpp
-	operations/COM_KeyingDespillOperation.h
 	operations/COM_KeyingClipOperation.cpp
 	operations/COM_KeyingClipOperation.h
+	operations/COM_KeyingDespillOperation.cpp
+	operations/COM_KeyingDespillOperation.h
+	operations/COM_KeyingOperation.cpp
+	operations/COM_KeyingOperation.h
 
 	operations/COM_ColorSpillOperation.cpp
 	operations/COM_ColorSpillOperation.h
 	operations/COM_RenderLayersProg.cpp
 	operations/COM_RenderLayersProg.h
 
+	operations/COM_BokehImageOperation.cpp
+	operations/COM_BokehImageOperation.h
 	operations/COM_ImageOperation.cpp
 	operations/COM_ImageOperation.h
 	operations/COM_MultilayerImageOperation.cpp
 	operations/COM_MultilayerImageOperation.h
 	operations/COM_TextureOperation.cpp
 	operations/COM_TextureOperation.h
-	operations/COM_BokehImageOperation.cpp
-	operations/COM_BokehImageOperation.h
 
 
-	operations/COM_SocketProxyOperation.h
 	operations/COM_SocketProxyOperation.cpp
+	operations/COM_SocketProxyOperation.h
 
-	operations/COM_CompositorOperation.h
 	operations/COM_CompositorOperation.cpp
-	operations/COM_OutputFileOperation.h
-	operations/COM_OutputFileOperation.cpp
-	operations/COM_OutputFileMultiViewOperation.h
+	operations/COM_CompositorOperation.h
+	operations/COM_ConvertDepthToRadiusOperation.cpp
+	operations/COM_ConvertDepthToRadiusOperation.h
 	operations/COM_OutputFileMultiViewOperation.cpp
-	operations/COM_ViewerOperation.h
-	operations/COM_ViewerOperation.cpp
-	operations/COM_PreviewOperation.h
+	operations/COM_OutputFileMultiViewOperation.h
+	operations/COM_OutputFileOperation.cpp
+	operations/COM_OutputFileOperation.h
 	operations/COM_PreviewOperation.cpp
-	operations/COM_SplitOperation.h
+	operations/COM_PreviewOperation.h
 	operations/COM_SplitOperation.cpp
-	operations/COM_ConvertDepthToRadiusOperation.h
-	operations/COM_ConvertDepthToRadiusOperation.cpp
+	operations/COM_SplitOperation.h
+	operations/COM_ViewerOperation.cpp
+	operations/COM_ViewerOperation.h
 	operations/COM_ZCombineOperation.cpp
 	operations/COM_ZCombineOperation.h
 
-	operations/COM_ChangeHSVOperation.h
 	operations/COM_ChangeHSVOperation.cpp
-	operations/COM_ColorCurveOperation.h
+	operations/COM_ChangeHSVOperation.h
+	operations/COM_ChannelMatteOperation.cpp
+	operations/COM_ChannelMatteOperation.h
+	operations/COM_ChromaMatteOperation.cpp
+	operations/COM_ChromaMatteOperation.h
 	operations/COM_ColorCurveOperation.cpp
-	operations/COM_ColorRampOperation.h
+	operations/COM_ColorCurveOperation.h
+	operations/COM_ColorMatteOperation.cpp
+	operations/COM_ColorMatteOperation.h
 	operations/COM_ColorRampOperation.cpp
-	operations/COM_VectorCurveOperation.h
-	operations/COM_VectorCurveOperation.cpp
-	operations/COM_CurveBaseOperation.h
+	operations/COM_ColorRampOperation.h
 	operations/COM_CurveBaseOperation.cpp
-	operations/COM_HueSaturationValueCorrectOperation.cpp
-	operations/COM_HueSaturationValueCorrectOperation.h
+	operations/COM_CurveBaseOperation.h
 	operations/COM_DifferenceMatteOperation.cpp
 	operations/COM_DifferenceMatteOperation.h
-	operations/COM_LuminanceMatteOperation.cpp
-	operations/COM_LuminanceMatteOperation.h
 	operations/COM_DistanceRGBMatteOperation.cpp
 	operations/COM_DistanceRGBMatteOperation.h
 	operations/COM_DistanceYCCMatteOperation.cpp
 	operations/COM_DistanceYCCMatteOperation.h
-	operations/COM_ChromaMatteOperation.cpp
-	operations/COM_ChromaMatteOperation.h
-	operations/COM_ColorMatteOperation.cpp
-	operations/COM_ColorMatteOperation.h
-	operations/COM_ChannelMatteOperation.cpp
-	operations/COM_ChannelMatteOperation.h
+	operations/COM_HueSaturationValueCorrectOperation.cpp
+	operations/COM_HueSaturationValueCorrectOperation.h
+	operations/COM_LuminanceMatteOperation.cpp
+	operations/COM_LuminanceMatteOperation.h
+	operations/COM_VectorCurveOperation.cpp
+	operations/COM_VectorCurveOperation.h
 
-	operations/COM_ReadBufferOperation.cpp
-	operations/COM_ReadBufferOperation.h
-	operations/COM_WriteBufferOperation.cpp
-	operations/COM_WriteBufferOperation.h
-	operations/COM_MixOperation.h
-	operations/COM_MixOperation.cpp
 	operations/COM_BrightnessOperation.cpp
 	operations/COM_BrightnessOperation.h
-	operations/COM_GammaOperation.cpp
-	operations/COM_GammaOperation.h
 	operations/COM_ColorCorrectionOperation.cpp
 	operations/COM_ColorCorrectionOperation.h
-	operations/COM_SetValueOperation.h
-	operations/COM_SetValueOperation.cpp
-	operations/COM_SetColorOperation.h
+	operations/COM_GammaOperation.cpp
+	operations/COM_GammaOperation.h
+	operations/COM_MixOperation.cpp
+	operations/COM_MixOperation.h
+	operations/COM_ReadBufferOperation.cpp
+	operations/COM_ReadBufferOperation.h
 	operations/COM_SetColorOperation.cpp
-	operations/COM_SetVectorOperation.h
+	operations/COM_SetColorOperation.h
+	operations/COM_SetValueOperation.cpp
+	operations/COM_SetValueOperation.h
 	operations/COM_SetVectorOperation.cpp
+	operations/COM_SetVectorOperation.h
+	operations/COM_WriteBufferOperation.cpp
+	operations/COM_WriteBufferOperation.h
 
-	operations/COM_MathBaseOperation.h
 	operations/COM_MathBaseOperation.cpp
+	operations/COM_MathBaseOperation.h
 
-	operations/COM_AlphaOverMixedOperation.h
+	operations/COM_AlphaOverKeyOperation.cpp
+	operations/COM_AlphaOverKeyOperation.h
 	operations/COM_AlphaOverMixedOperation.cpp
-	operations/COM_AlphaOverPremultiplyOperation.h
+	operations/COM_AlphaOverMixedOperation.h
 	operations/COM_AlphaOverPremultiplyOperation.cpp
-	operations/COM_AlphaOverKeyOperation.h
-	operations/COM_AlphaOverKeyOperation.cpp
+	operations/COM_AlphaOverPremultiplyOperation.h
 
-	operations/COM_ColorBalanceLGGOperation.h
-	operations/COM_ColorBalanceLGGOperation.cpp
-	operations/COM_ColorBalanceASCCDLOperation.h
 	operations/COM_ColorBalanceASCCDLOperation.cpp
+	operations/COM_ColorBalanceASCCDLOperation.h
+	operations/COM_ColorBalanceLGGOperation.cpp
+	operations/COM_ColorBalanceLGGOperation.h
 	operations/COM_InvertOperation.cpp
 	operations/COM_InvertOperation.h
-	operations/COM_SetAlphaOperation.cpp
-	operations/COM_SetAlphaOperation.h
-	operations/COM_MapValueOperation.cpp
-	operations/COM_MapValueOperation.h
 	operations/COM_MapRangeOperation.cpp
 	operations/COM_MapRangeOperation.h
+	operations/COM_MapValueOperation.cpp
+	operations/COM_MapValueOperation.h
+	operations/COM_SetAlphaOperation.cpp
+	operations/COM_SetAlphaOperation.h
 
 	# Distort operation
-	operations/COM_TranslateOperation.h
-	operations/COM_TranslateOperation.cpp
-	operations/COM_WrapOperation.h
-	operations/COM_WrapOperation.cpp
-	operations/COM_RotateOperation.h
-	operations/COM_RotateOperation.cpp
-	operations/COM_ScaleOperation.h
-	operations/COM_ScaleOperation.cpp
-	operations/COM_MapUVOperation.h
-	operations/COM_MapUVOperation.cpp
-	operations/COM_DisplaceOperation.h
 	operations/COM_DisplaceOperation.cpp
-	operations/COM_DisplaceSimpleOperation.h
+	operations/COM_DisplaceOperation.h
 	operations/COM_DisplaceSimpleOperation.cpp
-	operations/COM_FlipOperation.h
+	operations/COM_DisplaceSimpleOperation.h
 	operations/COM_FlipOperation.cpp
-	operations/COM_ProjectorLensDistortionOperation.cpp
-	operations/COM_ProjectorLensDistortionOperation.h
-	operations/COM_ScreenLensDistortionOperation.cpp
-	operations/COM_ScreenLensDistortionOperation.h
+	operations/COM_FlipOperation.h
+	operations/COM_MapUVOperation.cpp
+	operations/COM_MapUVOperation.h
+	operations/COM_PlaneCornerPinOperation.cpp
+	operations/COM_PlaneCornerPinOperation.h
 	operations/COM_PlaneDistortCommonOperation.cpp
 	operations/COM_PlaneDistortCommonOperation.h
 	operations/COM_PlaneTrackOperation.cpp
 	operations/COM_PlaneTrackOperation.h
-	operations/COM_PlaneCornerPinOperation.cpp
-	operations/COM_PlaneCornerPinOperation.h
+	operations/COM_ProjectorLensDistortionOperation.cpp
+	operations/COM_ProjectorLensDistortionOperation.h
+	operations/COM_RotateOperation.cpp
+	operations/COM_RotateOperation.h
+	operations/COM_ScaleOperation.cpp
+	operations/COM_ScaleOperation.h
+	operations/COM_ScreenLensDistortionOperation.cpp
+	operations/COM_ScreenLensDistortionOperation.h
+	operations/COM_TranslateOperation.cpp
+	operations/COM_TranslateOperation.h
+	operations/COM_WrapOperation.cpp
+	operations/COM_WrapOperation.h
 
 	#Filter operations
-	operations/COM_ConvolutionFilterOperation.h
-	operations/COM_ConvolutionFilterOperation.cpp
-	operations/COM_ConvolutionEdgeFilterOperation.h
 	operations/COM_ConvolutionEdgeFilterOperation.cpp
+	operations/COM_ConvolutionEdgeFilterOperation.h
+	operations/COM_ConvolutionFilterOperation.cpp
+	operations/COM_ConvolutionFilterOperation.h
 	operations/COM_DespeckleOperation.cpp
 	operations/COM_DespeckleOperation.h
 	operations/COM_DilateErodeOperation.cpp
 	operations/COM_DilateErodeOperation.h
-	operations/COM_InpaintOperation.cpp
-	operations/COM_InpaintOperation.h
-	operations/COM_GlareThresholdOperation.cpp
-	operations/COM_GlareThresholdOperation.h
 	operations/COM_GlareBaseOperation.cpp
 	operations/COM_GlareBaseOperation.h
+	operations/COM_GlareFogGlowOperation.cpp
+	operations/COM_GlareFogGlowOperation.h
+	operations/COM_GlareGhostOperation.cpp
+	operations/COM_GlareGhostOperation.h
 	operations/COM_GlareSimpleStarOperation.cpp
 	operations/COM_GlareSimpleStarOperation.h
 	operations/COM_GlareStreaksOperation.cpp
 	operations/COM_GlareStreaksOperation.h
-	operations/COM_GlareGhostOperation.cpp
-	operations/COM_GlareGhostOperation.h
-	operations/COM_GlareFogGlowOperation.cpp
-	operations/COM_GlareFogGlowOperation.h
+	operations/COM_GlareThresholdOperation.cpp
+	operations/COM_GlareThresholdOperation.h
+	operations/COM_InpaintOperation.cpp
+	operations/COM_InpaintOperation.h
 	operations/COM_SetSamplerOperation.cpp
 	operations/COM_SetSamplerOperation.h
 
 
 	#Convert operations
-	operations/COM_IDMaskOperation.cpp
-	operations/COM_IDMaskOperation.h
 	operations/COM_ConvertOperation.cpp
 	operations/COM_ConvertOperation.h
+	operations/COM_IDMaskOperation.cpp
+	operations/COM_IDMaskOperation.h
 
 	operations/COM_DotproductOperation.cpp
 	operations/COM_DotproductOperation.h
 
 	# Matte operation
-	operations/COM_BoxMaskOperation.h
 	operations/COM_BoxMaskOperation.cpp
-	operations/COM_EllipseMaskOperation.h
+	operations/COM_BoxMaskOperation.h
 	operations/COM_EllipseMaskOperation.cpp
+	operations/COM_EllipseMaskOperation.h
 
-	operations/COM_MovieClipOperation.cpp
-	operations/COM_MovieClipOperation.h
 	operations/COM_ConvertColorProfileOperation.cpp
 	operations/COM_ConvertColorProfileOperation.h
+	operations/COM_MovieClipOperation.cpp
+	operations/COM_MovieClipOperation.h
 
 	operations/COM_AntiAliasOperation.cpp
 	operations/COM_AntiAliasOperation.h
diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt
index 4c394d7836a..eccbb65b4f8 100644
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -51,8 +51,8 @@ set(SRC
 	editarmature_undo.c
 	meshlaplacian.c
 	pose_edit.c
-	pose_lib.c
 	pose_group.c
+	pose_lib.c
 	pose_select.c
 	pose_slide.c
 	pose_transform.c
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index 24740a3372b..d087553f640 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -45,6 +45,7 @@ set(SRC
 	object_bake.c
 	object_bake_api.c
 	object_constraint.c
+	object_data_transfer.c
 	object_edit.c
 	object_group.c
 	object_hook.c
@@ -56,10 +57,9 @@ set(SRC
 	object_relations.c
 	object_select.c
 	object_shapekey.c
-	object_data_transfer.c
 	object_transform.c
-	object_warp.c
 	object_vgroup.c
+	object_warp.c
 
 	object_intern.h
 )
diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt
index 9527dc4fe83..adc53547c32 100644
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -55,9 +55,9 @@ set(SRC
 	paint_vertex.c
 	paint_vertex_color_ops.c
 	paint_vertex_color_utils.c
+	paint_vertex_proj.c
 	paint_vertex_weight_ops.c
 	paint_vertex_weight_utils.c
-	paint_vertex_proj.c
 	sculpt.c
 	sculpt_undo.c
 	sculpt_uv.c
diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt
index 32d48c9c564..96e35bcf671 100644
--- a/source/blender/editors/space_clip/CMakeLists.txt
+++ b/source/blender/editors/space_clip/CMakeLists.txt
@@ -57,8 +57,8 @@ set(SRC
 	tracking_ops_orient.c
 	tracking_ops_plane.c
 	tracking_ops_solve.c
-	tracking_ops_track.c
 	tracking_ops_stabilize.c
+	tracking_ops_track.c
 	tracking_ops_utils.c
 	tracking_select.c
 
diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt
index 96fe9322b97..11712467094 100644
--- a/source/blender/editors/space_info/CMakeLists.txt
+++ b/source/blender/editors/space_info/CMakeLists.txt
@@ -40,12 +40,12 @@ set(INC_SYS
 )
 
 set(SRC
-	info_ops.c
-	info_stats.c
 	info_draw.c
+	info_ops.c
 	info_report.c
-	textview.c
+	info_stats.c
 	space_info.c
+	textview.c
 
 	info_intern.h
 	textview.h
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index e25a9c04f15..40acb01b726 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -54,7 +54,6 @@ set(SRC
 	view3d_draw.c
 	view3d_edit.c
 	view3d_fly.c
-	view3d_walk.c
 	view3d_header.c
 	view3d_iterators.c
 	view3d_ops.c
@@ -65,6 +64,7 @@ set(SRC
 	view3d_toolbar.c
 	view3d_utils.c
 	view3d_view.c
+	view3d_walk.c
 
 	view3d_intern.h
 )
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index 8d932c5e79d..677e224e921 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -140,9 +140,9 @@ if(WITH_CODEC_FFMPEG)
 	add_definitions(-DWITH_FFMPEG)
 
 	remove_strict_c_flags_file(
+		intern/anim_movie.c
 		intern/indexer.c
 		intern/util.c
-		intern/anim_movie.c
 	)
 endif()
 
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 5e7438ce4ee..352e2ce937c 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -112,7 +112,6 @@ set(APISRC
 	rna_material_api.c
 	rna_mesh_api.c
 	rna_meta_api.c
-	rna_texture_api.c
 	rna_object_api.c
 	rna_pose_api.c
 	rna_scene_api.c
@@ -121,6 +120,7 @@ set(APISRC
 	rna_sound_api.c
 	rna_space_api.c
 	rna_text_api.c
+	rna_texture_api.c
 	rna_ui_api.c
 	rna_vfont_api.c
 	rna_wm_api.c
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 80a67083582..444be06711b 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -96,8 +96,8 @@ set(SRC
 	intern/MOD_surfacedeform.c
 	intern/MOD_triangulate.c
 	intern/MOD_util.c
-	intern/MOD_uvwarp.c
 	intern/MOD_uvproject.c
+	intern/MOD_uvwarp.c
 	intern/MOD_warp.c
 	intern/MOD_wave.c
 	intern/MOD_weightvg_util.c
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 7ef41b25de8..7330bb71e74 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -49,26 +49,31 @@ set(SRC
 	composite/nodes/node_composite_alphaOver.c
 	composite/nodes/node_composite_bilateralblur.c
 	composite/nodes/node_composite_blur.c
+	composite/nodes/node_composite_bokehblur.c
+	composite/nodes/node_composite_bokehimage.c
+	composite/nodes/node_composite_boxmask.c
 	composite/nodes/node_composite_brightness.c
 	composite/nodes/node_composite_channelMatte.c
 	composite/nodes/node_composite_chromaMatte.c
 	composite/nodes/node_composite_colorMatte.c
 	composite/nodes/node_composite_colorSpill.c
 	composite/nodes/node_composite_colorbalance.c
+	composite/nodes/node_composite_colorcorrection.c
 	composite/nodes/node_composite_common.c
 	composite/nodes/node_composite_composite.c
 	composite/nodes/node_composite_cornerpin.c
 	composite/nodes/node_composite_crop.c
 	composite/nodes/node_composite_cryptomatte.c
 	composite/nodes/node_composite_curves.c
-	composite/nodes/node_composite_despeckle.c
-	composite/nodes/node_composite_doubleEdgeMask.c
 	composite/nodes/node_composite_defocus.c
+	composite/nodes/node_composite_despeckle.c
 	composite/nodes/node_composite_diffMatte.c
 	composite/nodes/node_composite_dilate.c
 	composite/nodes/node_composite_directionalblur.c
 	composite/nodes/node_composite_displace.c
 	composite/nodes/node_composite_distanceMatte.c
+	composite/nodes/node_composite_doubleEdgeMask.c
+	composite/nodes/node_composite_ellipsemask.c
 	composite/nodes/node_composite_filter.c
 	composite/nodes/node_composite_flip.c
 	composite/nodes/node_composite_gamma.c
@@ -79,22 +84,23 @@ set(SRC
 	composite/nodes/node_composite_image.c
 	composite/nodes/node_composite_inpaint.c
 	composite/nodes/node_composite_invert.c
-	composite/nodes/node_composite_keyingscreen.c
 	composite/nodes/node_composite_keying.c
+	composite/nodes/node_composite_keyingscreen.c
 	composite/nodes/node_composite_lensdist.c
 	composite/nodes/node_composite_levels.c
 	composite/nodes/node_composite_lummaMatte.c
+	composite/nodes/node_composite_mapRange.c
 	composite/nodes/node_composite_mapUV.c
 	composite/nodes/node_composite_mapValue.c
-	composite/nodes/node_composite_mapRange.c
-	composite/nodes/node_composite_math.c
 	composite/nodes/node_composite_mask.c
+	composite/nodes/node_composite_math.c
 	composite/nodes/node_composite_mixrgb.c
 	composite/nodes/node_composite_movieclip.c
 	composite/nodes/node_composite_moviedistortion.c
 	composite/nodes/node_composite_normal.c
 	composite/nodes/node_composite_normalize.c
 	composite/nodes/node_composite_outputFile.c
+	composite/nodes/node_composite_pixelate.c
 	composite/nodes/node_composite_planetrackdeform.c
 	composite/nodes/node_composite_premulkey.c
 	composite/nodes/node_composite_rgb.c
@@ -108,6 +114,8 @@ set(SRC
 	composite/nodes/node_composite_splitViewer.c
 	composite/nodes/node_composite_stabilize2d.c
 	composite/nodes/node_composite_sunbeams.c
+	composite/nodes/node_composite_switch.c
+	composite/nodes/node_composite_switchview.c
 	composite/nodes/node_composite_texture.c
 	composite/nodes/node_composite_tonemap.c
 	composite/nodes/node_composite_trackpos.c
@@ -118,86 +126,70 @@ set(SRC
 	composite/nodes/node_composite_vecBlur.c
 	composite/nodes/node_composite_viewer.c
 	composite/nodes/node_composite_zcombine.c
-	composite/nodes/node_composite_bokehblur.c
-	composite/nodes/node_composite_bokehimage.c
-	composite/nodes/node_composite_boxmask.c
-	composite/nodes/node_composite_ellipsemask.c
-	composite/nodes/node_composite_switch.c
-	composite/nodes/node_composite_switchview.c
-	composite/nodes/node_composite_colorcorrection.c
-	composite/nodes/node_composite_pixelate.c
 
 	composite/node_composite_tree.c
 	composite/node_composite_util.c
 
-	shader/nodes/node_shader_camera.c
-	shader/nodes/node_shader_common.c
-	shader/nodes/node_shader_curves.c
-	shader/nodes/node_shader_gamma.c
-	shader/nodes/node_shader_brightness.c
-	shader/nodes/node_shader_geom.c
-	shader/nodes/node_shader_hueSatVal.c
-	shader/nodes/node_shader_invert.c
-	shader/nodes/node_shader_lamp.c
-	shader/nodes/node_shader_mapping.c
-	shader/nodes/node_shader_material.c
-	shader/nodes/node_shader_math.c
-	shader/nodes/node_shader_mixRgb.c
-	shader/nodes/node_shader_normal.c
-	shader/nodes/node_shader_output.c
-	shader/nodes/node_shader_rgb.c
-	shader/nodes/node_shader_sepcombRGB.c
-	shader/nodes/node_shader_sepcombHSV.c
-	shader/nodes/node_shader_sepcombXYZ.c
-	shader/nodes/node_shader_squeeze.c
-	shader/nodes/node_shader_texture.c
-	shader/nodes/node_shader_valToRgb.c
-	shader/nodes/node_shader_value.c
-	shader/nodes/node_shader_wireframe.c
-	shader/nodes/node_shader_wavelength.c
-	shader/nodes/node_shader_blackbody.c
-	shader/nodes/node_shader_vectMath.c
-	shader/nodes/node_shader_vectTransform.c
 	shader/nodes/node_shader_add_shader.c
 	shader/nodes/node_shader_ambient_occlusion.c
 	shader/nodes/node_shader_attribute.c
 	shader/nodes/node_shader_background.c
+	shader/nodes/node_shader_bevel.c
+	shader/nodes/node_shader_blackbody.c
+	shader/nodes/node_shader_brightness.c
 	shader/nodes/node_shader_bsdf_anisotropic.c
 	shader/nodes/node_shader_bsdf_diffuse.c
-	shader/nodes/node_shader_bsdf_principled.c
 	shader/nodes/node_shader_bsdf_glass.c
 	shader/nodes/node_shader_bsdf_glossy.c
-	shader/nodes/node_shader_bsdf_toon.c
+	shader/nodes/node_shader_bsdf_hair.c
+	shader/nodes/node_shader_bsdf_hair_principled.c
+	shader/nodes/node_shader_bsdf_principled.c
 	shader/nodes/node_shader_bsdf_refraction.c
+	shader/nodes/node_shader_bsdf_toon.c
 	shader/nodes/node_shader_bsdf_translucent.c
 	shader/nodes/node_shader_bsdf_transparent.c
 	shader/nodes/node_shader_bsdf_velvet.c
-	shader/nodes/node_shader_bsdf_hair.c
-	shader/nodes/node_shader_bsdf_hair_principled.c
 	shader/nodes/node_shader_bump.c
+	shader/nodes/node_shader_camera.c
+	shader/nodes/node_shader_common.c
+	shader/nodes/node_shader_curves.c
+	shader/nodes/node_shader_displacement.c
 	shader/nodes/node_shader_emission.c
 	shader/nodes/node_shader_fresnel.c
+	shader/nodes/node_shader_gamma.c
+	shader/nodes/node_shader_geom.c
 	shader/nodes/node_shader_geometry.c
+	shader/nodes/node_shader_hair_info.c
 	shader/nodes/node_shader_holdout.c
+	shader/nodes/node_shader_hueSatVal.c
 	shader/nodes/node_shader_ies_light.c
+	shader/nodes/node_shader_invert.c
+	shader/nodes/node_shader_lamp.c
 	shader/nodes/node_shader_layer_weight.c
 	shader/nodes/node_shader_light_falloff.c
 	shader/nodes/node_shader_light_path.c
+	shader/nodes/node_shader_mapping.c
+	shader/nodes/node_shader_material.c
+	shader/nodes/node_shader_math.c
+	shader/nodes/node_shader_mixRgb.c
 	shader/nodes/node_shader_mix_shader.c
+	shader/nodes/node_shader_normal.c
 	shader/nodes/node_shader_normal_map.c
 	shader/nodes/node_shader_object_info.c
-	shader/nodes/node_shader_hair_info.c
+	shader/nodes/node_shader_output.c
 	shader/nodes/node_shader_output_lamp.c
+	shader/nodes/node_shader_output_linestyle.c
 	shader/nodes/node_shader_output_material.c
 	shader/nodes/node_shader_output_world.c
-	shader/nodes/node_shader_output_linestyle.c
 	shader/nodes/node_shader_particle_info.c
+	shader/nodes/node_shader_rgb.c
 	shader/nodes/node_shader_script.c
+	shader/nodes/node_shader_sepcombHSV.c
+	shader/nodes/node_shader_sepcombRGB.c
+	shader/nodes/node_shader_sepcombXYZ.c
+	shader/nodes/node_shader_squeeze.c
 	shader/nodes/node_shader_subsurface_scattering.c
 	shader/nodes/node_shader_tangent.c
-	shader/nodes/node_shader_bevel.c
-	shader/nodes/node_shader_displacement.c
-	shader/nodes/node_shader_vector_displacement.c
 	shader/nodes/node_shader_tex_brick.c
 	shader/nodes/node_shader_tex_checker.c
 	shader/nodes/node_shader_tex_coord.c
@@ -211,11 +203,19 @@ set(SRC
 	shader/nodes/node_shader_tex_sky.c
 	shader/nodes/node_shader_tex_voronoi.c
 	shader/nodes/node_shader_tex_wave.c
-	shader/nodes/node_shader_volume_scatter.c
-	shader/nodes/node_shader_volume_absorption.c
-	shader/nodes/node_shader_volume_principled.c
+	shader/nodes/node_shader_texture.c
 	shader/nodes/node_shader_uvAlongStroke.c
 	shader/nodes/node_shader_uvmap.c
+	shader/nodes/node_shader_valToRgb.c
+	shader/nodes/node_shader_value.c
+	shader/nodes/node_shader_vectMath.c
+	shader/nodes/node_shader_vectTransform.c
+	shader/nodes/node_shader_vector_displacement.c
+	shader/nodes/node_shader_volume_absorption.c
+	shader/nodes/node_shader_volume_principled.c
+	shader/nodes/node_shader_volume_scatter.c
+	shader/nodes/node_shader_wavelength.c
+	shader/nodes/node_shader_wireframe.c
 	shader/node_shader_tree.c
 	shader/node_shader_util.c
 
@@ -245,10 +245,10 @@ set(SRC
 	texture/node_texture_tree.c
 	texture/node_texture_util.c
 
-	intern/node_util.c
-	intern/node_exec.c
 	intern/node_common.c
+	intern/node_exec.c
 	intern/node_socket.c
+	intern/node_util.c
 
 	composite/node_composite_util.h
 	shader/node_shader_util.h
@@ -257,12 +257,12 @@ set(SRC
 	NOD_common.h
 	NOD_composite.h
 	NOD_shader.h
-	NOD_texture.h
 	NOD_socket.h
 	NOD_static_types.h
-	intern/node_util.h
-	intern/node_exec.h
+	NOD_texture.h
 	intern/node_common.h
+	intern/node_exec.h
+	intern/node_util.h
 )
 
 if(WITH_PYTHON)
diff --git a/source/blender/physics/CMakeLists.txt b/source/blender/physics/CMakeLists.txt
index 0a4ff3fe0f0..ee9efee003f 100644
--- a/source/blender/physics/CMakeLists.txt
+++ b/source/blender/physics/CMakeLists.txt
@@ -40,11 +40,11 @@ set(INC_SYS
 set(SRC
 	intern/BPH_mass_spring.cpp
 	intern/ConstrainedConjugateGradient.h
+	intern/eigen_utils.h
 	intern/hair_volume.cpp
 	intern/implicit.h
 	intern/implicit_blender.c
 	intern/implicit_eigen.cpp
-	intern/eigen_utils.h
 
 	BPH_mass_spring.h
 )
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 36e18da00c7..e7bfbe01f07 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -49,12 +49,12 @@ set(INC_SYS
 set(SRC
 	intern/raytrace/rayobject.cpp
 	intern/raytrace/rayobject_empty.cpp
-	intern/raytrace/rayobject_octree.cpp
-	intern/raytrace/rayobject_raycounter.cpp
-	intern/raytrace/rayobject_svbvh.cpp
 	intern/raytrace/rayobject_instance.cpp
+	intern/raytrace/rayobject_octree.cpp
 	intern/raytrace/rayobject_qbvh.cpp
+	intern/raytrace/rayobject_raycounter.cpp
 	intern/raytrace/rayobject_rtbuild.cpp
+	intern/raytrace/rayobject_svbvh.cpp
 	intern/raytrace/rayobject_vbvh.cpp
 	intern/source/bake.c
 	intern/source/bake_api.c
@@ -70,9 +70,9 @@ set(SRC
 	intern/source/pixelshading.c
 	intern/source/pointdensity.c
 	intern/source/rayshade.c
-	intern/source/rendercore.c
 	intern/source/render_result.c
 	intern/source/render_texture.c
+	intern/source/rendercore.c
 	intern/source/renderdatabase.c
 	intern/source/shadbuf.c
 	intern/source/shadeinput.c
@@ -86,8 +86,8 @@ set(SRC
 	intern/source/voxeldata.c
 	intern/source/zbuf.c
 
-	extern/include/RE_engine.h
 	extern/include/RE_bake.h
+	extern/include/RE_engine.h
 	extern/include/RE_multires_bake.h
 	extern/include/RE_pipeline.h
 	extern/include/RE_render_ext.h
@@ -99,10 +99,10 @@ set(SRC
 	intern/include/pixelshading.h
 	intern/include/pointdensity.h
 	intern/include/raycounter.h
-	intern/include/rayobject.h
 	intern/include/rayintersection.h
-	intern/include/render_types.h
+	intern/include/rayobject.h
 	intern/include/render_result.h
+	intern/include/render_types.h
 	intern/include/rendercore.h
 	intern/include/renderdatabase.h
 	intern/include/renderpipeline.h
diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt
index 9c563a46ea2..68bfa18b4ef 100644
--- a/source/gameengine/Expressions/CMakeLists.txt
+++ b/source/gameengine/Expressions/CMakeLists.txt
@@ -42,19 +42,19 @@ set(SRC
 	intern/ErrorValue.cpp
 	intern/Expression.cpp
 	intern/FloatValue.cpp
+	intern/HashedPtr.cpp
 	intern/IdentifierExpr.cpp
 	intern/IfExpr.cpp
 	intern/InputParser.cpp
 	intern/IntValue.cpp
-	intern/HashedPtr.cpp
 	intern/ListValue.cpp
+	intern/ListWrapper.cpp
 	intern/Operator1Expr.cpp
 	intern/Operator2Expr.cpp
 	intern/PyObjectPlus.cpp
 	intern/StringValue.cpp
 	intern/Value.cpp
 	intern/VectorValue.cpp
-	intern/ListWrapper.cpp
 
 	EXP_BoolValue.h
 	EXP_ConstExpr.h
@@ -68,6 +68,7 @@ set(SRC
 	EXP_InputParser.h
 	EXP_IntValue.h
 	EXP_ListValue.h
+	EXP_ListWrapper.h
 	EXP_Operator1Expr.h
 	EXP_Operator2Expr.h
 	EXP_PyObjectPlus.h
@@ -76,7 +77,6 @@ set(SRC
 	EXP_Value.h
 	EXP_VectorValue.h
 	EXP_VoidValue.h
-	EXP_ListWrapper.h
 
 )
 
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index 417f54cc8b9..80f7c8d3abf 100644
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -83,8 +83,8 @@ set(SRC
 	KX_FontObject.cpp
 	KX_GameActuator.cpp
 	KX_GameObject.cpp
-	KX_IpoConvert.cpp
 	KX_IPO_SGController.cpp
+	KX_IpoConvert.cpp
 	KX_KetsjiEngine.cpp
 	KX_Light.cpp
 	KX_LightIpoSGController.cpp
@@ -156,12 +156,12 @@ set(SRC
 	KX_GameActuator.h
 	KX_GameObject.h
 	KX_IInterpolator.h
-	KX_IpoConvert.h
 	KX_IPOTransform.h
 	KX_IPO_SGController.h
 	KX_IScalarInterpolator.h
 	KX_ISceneConverter.h
 	KX_ISystem.h
+	KX_IpoConvert.h
 	KX_KetsjiEngine.h
 	KX_Light.h
 	KX_LightIpoSGController.h
diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt
index 8b00f1b47fa..896ff5cf87b 100644
--- a/source/gameengine/Physics/Bullet/CMakeLists.txt
+++ b/source/gameengine/Physics/Bullet/CMakeLists.txt
@@ -52,9 +52,9 @@ set(INC_SYS
 )
 
 set(SRC
-	CcdPhysicsEnvironment.cpp
-	CcdPhysicsController.cpp
 	CcdGraphicController.cpp
+	CcdPhysicsController.cpp
+	CcdPhysicsEnvironment.cpp
 
 	CcdGraphicController.h
 	CcdPhysicsController.h
diff --git a/source/gameengine/Rasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/CMakeLists.txt
index fc7dc90e03b..e39098adbba 100644
--- a/source/gameengine/Rasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/CMakeLists.txt
@@ -49,13 +49,13 @@ set(SRC
 	RAS_2DFilterManager.cpp
 	RAS_BucketManager.cpp
 	RAS_FramingManager.cpp
+	RAS_ICanvas.cpp
 	RAS_IPolygonMaterial.cpp
 	RAS_MaterialBucket.cpp
 	RAS_MeshObject.cpp
 	RAS_Polygon.cpp
 	RAS_TexVert.cpp
 	RAS_texmatrix.cpp
-	RAS_ICanvas.cpp
 
 	RAS_2DFilterManager.h
 	RAS_BucketManager.h
@@ -63,10 +63,10 @@ set(SRC
 	RAS_Deformer.h
 	RAS_FramingManager.h
 	RAS_ICanvas.h
-	RAS_IPolygonMaterial.h
-	RAS_IRasterizer.h
 	RAS_ILightObject.h
 	RAS_IOffScreen.h
+	RAS_IPolygonMaterial.h
+	RAS_IRasterizer.h
 	RAS_ISync.h
 	RAS_MaterialBucket.h
 	RAS_MeshObject.h
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
index 89e31b62b41..f8930f37fc8 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
@@ -52,8 +52,8 @@ set(SRC
 	RAS_ListRasterizer.cpp
 	RAS_OpenGLLight.cpp
 	RAS_OpenGLOffScreen.cpp
-	RAS_OpenGLSync.cpp
 	RAS_OpenGLRasterizer.cpp
+	RAS_OpenGLSync.cpp
 	RAS_StorageVA.cpp
 	RAS_StorageVBO.cpp
 
@@ -61,8 +61,8 @@ set(SRC
 	RAS_ListRasterizer.h
 	RAS_OpenGLLight.h
 	RAS_OpenGLOffScreen.h
-	RAS_OpenGLSync.h
 	RAS_OpenGLRasterizer.h
+	RAS_OpenGLSync.h
 	RAS_StorageVA.h
 	RAS_StorageVBO.h
 )
diff --git a/source/gameengine/VideoTexture/CMakeLists.txt b/source/gameengine/VideoTexture/CMakeLists.txt
index 50e25c456e5..ff34c1a1f25 100644
--- a/source/gameengine/VideoTexture/CMakeLists.txt
+++ b/source/gameengine/VideoTexture/CMakeLists.txt
@@ -58,6 +58,7 @@ set(INC_SYS
 add_definitions(${GL_DEFINITIONS})
 
 set(SRC
+	DeckLink.cpp
 	Exception.cpp
 	FilterBase.cpp
 	FilterBlueScreen.cpp
@@ -71,14 +72,14 @@ set(SRC
 	ImageViewport.cpp
 	PyTypeList.cpp
 	Texture.cpp
-	DeckLink.cpp
 	VideoBase.cpp
-	VideoFFmpeg.cpp
 	VideoDeckLink.cpp
+	VideoFFmpeg.cpp
 	blendVideoTex.cpp
 
 	BlendType.h
 	Common.h
+	DeckLink.h
 	Exception.h
 	FilterBase.h
 	FilterBlueScreen.h
@@ -92,10 +93,9 @@ set(SRC
 	ImageViewport.h
 	PyTypeList.h
 	Texture.h
-	DeckLink.h
 	VideoBase.h
-	VideoFFmpeg.h
 	VideoDeckLink.h
+	VideoFFmpeg.h
 )
 
 if(WITH_CODEC_FFMPEG)