13 files changed, 23 insertions, 22 deletions
diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h
index d5fb55af06c..96837f380d4 100644
--- a/source/blender/blenkernel/BKE_cloth.h
+++ b/source/blender/blenkernel/BKE_cloth.h
@@ -33,10 +33,10 @@ extern "C" {
 struct ClothModifierData;
 struct CollisionModifierData;
 struct Depsgraph;
+struct GHash;
 struct Mesh;
 struct Object;
 struct Scene;
-struct GHash;
 
 #define DO_INLINE MALWAYS_INLINE
 
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index 3284896795b..128d5807ca3 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -34,8 +34,10 @@ struct CurveMapping;
 struct Depsgraph;
 struct GHash;
 struct ListBase;
+struct MDeformVert;
 struct Main;
 struct Material;
+struct MaterialGPencilStyle;
 struct Object;
 struct Scene;
 struct SpaceImage;
@@ -47,8 +49,6 @@ struct bGPDlayer_Mask;
 struct bGPDspoint;
 struct bGPDstroke;
 struct bGPdata;
-struct MaterialGPencilStyle;
-struct MDeformVert;
 
 #define GPENCIL_SIMPLIFY(scene) ((scene->r.simplify_gpencil & SIMPLIFY_GPENCIL_ENABLE))
 #define GPENCIL_SIMPLIFY_ONPLAY(playing) \
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 9fd732027d1..881f3356a86 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -56,12 +56,12 @@ struct SubdivCCG;
 struct SubdivCCG;
 struct Tex;
 struct ToolSettings;
-struct tPaletteColorHSV;
 struct UnifiedPaintSettings;
 struct View3D;
 struct ViewLayer;
 struct bContext;
 struct bToolRef;
+struct tPaletteColorHSV;
 
 enum eOverlayFlags;
 
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index 4b6059f1474..e7914a1b86c 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -33,16 +33,16 @@ extern DrawEngineType draw_engine_gpencil_type;
 
 struct GPENCIL_Data;
 struct GPENCIL_StorageList;
+struct GPUBatch;
+struct GPUVertBuf;
+struct GPUVertFormat;
+struct GpencilBatchCache;
 struct MaterialGPencilStyle;
 struct Object;
 struct RenderEngine;
 struct RenderLayer;
-struct bGPDstroke;
 struct View3D;
-struct GpencilBatchCache;
-struct GPUBatch;
-struct GPUVertBuf;
-struct GPUVertFormat;
+struct bGPDstroke;
 
 /* used to convert pixel scale. */
 #define GPENCIL_PIXEL_FACTOR 2000.0f
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 8ed7bb25336..6c767102803 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -78,10 +78,10 @@ struct rcti;
 typedef struct DRWCallBuffer DRWCallBuffer;
 typedef struct DRWInterface DRWInterface;
 typedef struct DRWPass DRWPass;
+typedef struct DRWShaderLibrary DRWShaderLibrary;
 typedef struct DRWShadingGroup DRWShadingGroup;
 typedef struct DRWUniform DRWUniform;
 typedef struct DRWView DRWView;
-typedef struct DRWShaderLibrary DRWShaderLibrary;
 
 /* TODO Put it somewhere else? */
 typedef struct BoundSphere {
diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt
index 512e1ec6270..4083169d65c 100644
--- a/source/blender/editors/gpencil/CMakeLists.txt
+++ b/source/blender/editors/gpencil/CMakeLists.txt
@@ -58,8 +58,8 @@ set(SRC
   gpencil_undo.c
   gpencil_utils.c
   gpencil_uv.c
-  gpencil_vertex_paint.c
   gpencil_vertex_ops.c
+  gpencil_vertex_paint.c
   gpencil_weight_paint.c
 
   gpencil_intern.h
diff --git a/source/blender/editors/include/ED_fileselect.h b/source/blender/editors/include/ED_fileselect.h
index 7137b2244ab..a523e924e54 100644
--- a/source/blender/editors/include/ED_fileselect.h
+++ b/source/blender/editors/include/ED_fileselect.h
@@ -30,6 +30,7 @@ extern "C" {
 
 struct ARegion;
 struct FileSelectParams;
+struct Scene;
 struct ScrArea;
 struct SpaceFile;
 struct bContext;
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 8dd162ea538..66aa301f08c 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -33,13 +33,13 @@ struct ListBase;
 struct PointerRNA;
 
 struct Brush;
+struct GP_SpaceConversion;
 struct bGPDframe;
 struct bGPDlayer;
 struct bGPDspoint;
 struct bGPDstroke;
 struct bGPdata;
 struct tGPspoint;
-struct GP_SpaceConversion;
 
 struct ARegion;
 struct Depsgraph;
@@ -47,8 +47,8 @@ struct Main;
 struct RegionView3D;
 struct ReportList;
 struct Scene;
-struct ToolSettings;
 struct ScrArea;
+struct ToolSettings;
 struct View3D;
 struct ViewLayer;
 struct bContext;
diff --git a/source/blender/editors/include/ED_view3d_offscreen.h b/source/blender/editors/include/ED_view3d_offscreen.h
index 4520f831a08..3cbb13fa8b5 100644
--- a/source/blender/editors/include/ED_view3d_offscreen.h
+++ b/source/blender/editors/include/ED_view3d_offscreen.h
@@ -34,12 +34,12 @@ extern "C" {
 #endif
 
 /* ********* exports for space_view3d/ module for offscreen rendering ********** */
-struct Depsgraph;
-struct Scene;
-struct View3D;
 struct ARegion;
+struct Depsgraph;
 struct GPUOffScreen;
 struct GPUViewport;
+struct Scene;
+struct View3D;
 struct View3DShading;
 
 void ED_view3d_draw_offscreen(struct Depsgraph *depsgraph,
diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt
index f497b80e0f4..de9e70f8e06 100644
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -59,8 +59,8 @@ set(SRC
   paint_vertex_weight_ops.c
   paint_vertex_weight_utils.c
   sculpt.c
-  sculpt_multiplane_scrape.c
   sculpt_cloth.c
+  sculpt_multiplane_scrape.c
   sculpt_pose.c
   sculpt_undo.c
   sculpt_uv.c
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index 5f5a173932c..afa7b02a1f6 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -65,8 +65,6 @@ set(SRC
   transform_gizmo_3d.c
   transform_gizmo_extrude_3d.c
   transform_input.c
-  transform_ops.c
-  transform_orientations.c
   transform_mode.c
   transform_mode_align.c
   transform_mode_baketime.c
@@ -98,6 +96,8 @@ set(SRC
   transform_mode_trackball.c
   transform_mode_translate.c
   transform_mode_vert_slide.c
+  transform_ops.c
+  transform_orientations.c
   transform_snap.c
   transform_snap_object.c
 
diff --git a/source/blender/editors/transform/transform_mode.h b/source/blender/editors/transform/transform_mode.h
index a8a930cc156..6180f6d3477 100644
--- a/source/blender/editors/transform/transform_mode.h
+++ b/source/blender/editors/transform/transform_mode.h
@@ -27,9 +27,9 @@
 
 struct AnimData;
 struct LinkNode;
-struct TransInfo;
-struct TransDataContainer;
 struct TransData;
+struct TransDataContainer;
+struct TransInfo;
 struct wmOperator;
 
 /* header of TransDataEdgeSlideVert, TransDataEdgeSlideEdge */
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 41227a14fb3..a2f825ee454 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -206,10 +206,10 @@ set(SRC
   shader/nodes/node_shader_uvmap.c
   shader/nodes/node_shader_valToRgb.c
   shader/nodes/node_shader_value.c
-  shader/nodes/node_shader_vector_rotate.c
   shader/nodes/node_shader_vectTransform.c
   shader/nodes/node_shader_vector_displacement.c
   shader/nodes/node_shader_vector_math.c
+  shader/nodes/node_shader_vector_rotate.c
   shader/nodes/node_shader_vertex_color.c
   shader/nodes/node_shader_volume_absorption.c
   shader/nodes/node_shader_volume_info.c