Cleanup: sort forward declarations of enum & struct

Done using:
  source/tools/utils_maintenance/c_sort_blocks.py

64 files changed, 293 insertions, 293 deletions

diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h
index 0f4fc4832b8..fd5234cbdae 100644
--- a/source/blender/editors/armature/armature_intern.h
+++ b/source/blender/editors/armature/armature_intern.h
@@ -34,19 +34,19 @@
 /* internal exports only */
 struct wmOperatorType;
 
-struct bContext;
-struct Scene;
-struct Object;
 struct Base;
+struct Object;
+struct Scene;
 struct bAction;
+struct bContext;
 struct bPoseChannel;
 
-struct bArmature;
-struct EditBone;
 struct Bone;
+struct EditBone;
+struct bArmature;
 
-struct ListBase;
 struct LinkData;
+struct ListBase;
 
 /* ******************************************************* */
 /* Armature EditMode Operators */
diff --git a/source/blender/editors/armature/meshlaplacian.h b/source/blender/editors/armature/meshlaplacian.h
index 6758f9d16ac..962d1a8e0db 100644
--- a/source/blender/editors/armature/meshlaplacian.h
+++ b/source/blender/editors/armature/meshlaplacian.h
@@ -29,8 +29,8 @@
 
 //#define RIGID_DEFORM
 
-struct Object;
 struct Mesh;
+struct Object;
 struct bDeformGroup;
 
 #ifdef RIGID_DEFORM
diff --git a/source/blender/editors/curve/curve_intern.h b/source/blender/editors/curve/curve_intern.h
index b28f546ee96..fcdce0878f9 100644
--- a/source/blender/editors/curve/curve_intern.h
+++ b/source/blender/editors/curve/curve_intern.h
@@ -33,12 +33,12 @@
 #define __CURVE_INTERN_H__
 
 /* internal exports only */
-struct ListBase;
 struct EditNurb;
 struct GHash;
+struct ListBase;
 struct Object;
-struct wmOperatorType;
 struct ViewContext;
+struct wmOperatorType;
 
 /* editfont.c */
 enum { DEL_NEXT_CHAR, DEL_PREV_CHAR, DEL_NEXT_WORD, DEL_PREV_WORD, DEL_SELECTION, DEL_NEXT_SEL, DEL_PREV_SEL };
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index 8530f729889..a1146cb0777 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -38,27 +38,27 @@
 
 
 /* internal exports only */
-struct bGPdata;
-struct bGPDstroke;
+struct Material;
 struct bGPDspoint;
+struct bGPDstroke;
+struct bGPdata;
 struct tGPspoint;
-struct Material;
 
 struct GHash;
 struct RNG;
 
+struct ARegion;
 struct Brush;
 struct Scene;
-struct ARegion;
-struct View3D;
 struct View2D;
+struct View3D;
 struct wmOperatorType;
 
 struct Depsgraph;
 
+struct EnumPropertyItem;
 struct PointerRNA;
 struct PropertyRNA;
-struct EnumPropertyItem;
 
 
 /* ***************************************************** */
diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h
index 863d817d19a..c8c023c6376 100644
--- a/source/blender/editors/include/BIF_glutil.h
+++ b/source/blender/editors/include/BIF_glutil.h
@@ -30,13 +30,13 @@
 #ifndef __BIF_GLUTIL_H__
 #define __BIF_GLUTIL_H__
 
-struct rcti;
 struct rctf;
+struct rcti;
 
+struct ColorManagedDisplaySettings;
+struct ColorManagedViewSettings;
 struct ImBuf;
 struct bContext;
-struct ColorManagedViewSettings;
-struct ColorManagedDisplaySettings;
 
 /* A few functions defined here are being DEPRECATED for Blender 2.8
  *
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index 6e5746301be..d76559077df 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -31,27 +31,27 @@
 #ifndef __ED_ANIM_API_H__
 #define __ED_ANIM_API_H__
 
+struct AnimData;
 struct ID;
 struct ListBase;
-struct AnimData;
 
-struct bContext;
+struct ARegion;
 struct Main;
-struct wmKeyConfig;
 struct ReportList;
 struct ScrArea;
 struct SpaceLink;
-struct ARegion;
 struct View2D;
+struct bContext;
+struct wmKeyConfig;
 
-struct Scene;
 struct Object;
+struct Scene;
 
 struct bDopeSheet;
 
-struct bAction;
 struct FCurve;
 struct FModifier;
+struct bAction;
 
 struct uiBlock;
 struct uiLayout;
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index 88459da3a95..1a3306e8fe2 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -34,27 +34,27 @@
 extern "C" {
 #endif
 
-struct bArmature;
 struct Base;
-struct bContext;
 struct Bone;
-struct bPoseChannel;
 struct Depsgraph;
 struct IDProperty;
 struct ListBase;
 struct Main;
-struct MeshDeformModifierData;
+struct Main;
 struct Mesh;
+struct MeshDeformModifierData;
 struct Object;
 struct ReportList;
 struct Scene;
+struct UndoType;
 struct View3D;
-struct ViewLayer;
 struct ViewContext;
+struct ViewLayer;
+struct bArmature;
+struct bContext;
+struct bPoseChannel;
 struct wmKeyConfig;
 struct wmOperator;
-struct Main;
-struct UndoType;
 
 typedef struct EditBone {
 	struct EditBone *next, *prev;
diff --git a/source/blender/editors/include/ED_clip.h b/source/blender/editors/include/ED_clip.h
index 4844d96e6e8..af44099bf73 100644
--- a/source/blender/editors/include/ED_clip.h
+++ b/source/blender/editors/include/ED_clip.h
@@ -32,14 +32,14 @@
 #define __ED_CLIP_H__
 
 struct ARegion;
-struct bContext;
-struct bScreen;
 struct ImBuf;
 struct Main;
 struct Mask;
 struct MovieClip;
-struct SpaceClip;
 struct Scene;
+struct SpaceClip;
+struct bContext;
+struct bScreen;
 
 /*  ** clip_editor.c ** */
 
diff --git a/source/blender/editors/include/ED_curve.h b/source/blender/editors/include/ED_curve.h
index e4eea9921db..d362733207d 100644
--- a/source/blender/editors/include/ED_curve.h
+++ b/source/blender/editors/include/ED_curve.h
@@ -31,19 +31,19 @@
 #ifndef __ED_CURVE_H__
 #define __ED_CURVE_H__
 
-struct bContext;
-struct BezTriple;
 struct BPoint;
+struct BezTriple;
 struct Curve;
 struct EditNurb;
 struct Main;
 struct Nurb;
 struct Object;
 struct Text;
-struct wmOperator;
-struct wmKeyConfig;
 struct UndoType;
 struct View3D;
+struct bContext;
+struct wmKeyConfig;
+struct wmOperator;
 
 /* curve_ops.c */
 void    ED_operatortypes_curve(void);
diff --git a/source/blender/editors/include/ED_gizmo_library.h b/source/blender/editors/include/ED_gizmo_library.h
index be772a6af98..8dc1cf9cce9 100644
--- a/source/blender/editors/include/ED_gizmo_library.h
+++ b/source/blender/editors/include/ED_gizmo_library.h
@@ -47,9 +47,9 @@ void ED_gizmotypes_value_2d(void);
 /* gizmo group types */
 void ED_gizmogrouptypes_value_2d(void);
 
-struct bContext;
 struct Object;
 struct Scene;
+struct bContext;
 struct wmGizmo;
 struct wmGizmoGroup;
 
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 808e8461471..6503fd72e20 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -35,31 +35,31 @@ struct ListBase;
 struct PointerRNA;
 struct rcti;
 
-struct bGPdata;
-struct bGPDlayer;
+struct Brush;
 struct bGPDframe;
-struct bGPDstroke;
+struct bGPDlayer;
 struct bGPDspoint;
-struct Brush;
+struct bGPDstroke;
+struct bGPdata;
 
-struct Main;
-struct bContext;
-struct EvaluationContext;
-struct Depsgraph;
-struct ScrArea;
 struct ARegion;
+struct Depsgraph;
+struct EvaluationContext;
+struct Main;
 struct RegionView3D;
 struct ReportList;
 struct Scene;
+struct ScrArea;
 struct ToolSettings;
-struct ViewLayer;
 struct View3D;
+struct ViewLayer;
+struct bContext;
 
-struct Object;
 struct Material;
+struct Object;
 
-struct bAnimContext;
 struct KeyframeEditData;
+struct bAnimContext;
 
 struct wmKeyConfig;
 struct wmOperator;
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h
index f8af67b55ff..92f20d33c7b 100644
--- a/source/blender/editors/include/ED_image.h
+++ b/source/blender/editors/include/ED_image.h
@@ -30,16 +30,16 @@
 #ifndef __ED_IMAGE_H__
 #define __ED_IMAGE_H__
 
-struct SpaceImage;
-struct bContext;
+struct ARegion;
+struct ImBuf;
 struct Image;
 struct ImageUser;
-struct ImBuf;
-struct ToolSettings;
-struct wmWindowManager;
-struct ARegion;
 struct Scene;
+struct SpaceImage;
+struct ToolSettings;
 struct ViewLayer;
+struct bContext;
+struct wmWindowManager;
 
 /* image_edit.c, exported for transform */
 struct Image *ED_space_image(struct SpaceImage *sima);
diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h
index 9fce191561e..27e0519bab5 100644
--- a/source/blender/editors/include/ED_keyframes_draw.h
+++ b/source/blender/editors/include/ED_keyframes_draw.h
@@ -32,21 +32,21 @@
 #ifndef __ED_KEYFRAMES_DRAW_H__
 #define __ED_KEYFRAMES_DRAW_H__
 
-struct bAnimContext;
 struct AnimData;
 struct CacheFile;
+struct DLRBT_Tree;
 struct FCurve;
-struct bDopeSheet;
-struct bAction;
-struct bActionGroup;
-struct Object;
 struct ListBase;
-struct bGPDlayer;
-struct Palette;
 struct MaskLayer;
+struct Object;
+struct Palette;
 struct Scene;
 struct View2D;
-struct DLRBT_Tree;
+struct bAction;
+struct bActionGroup;
+struct bAnimContext;
+struct bDopeSheet;
+struct bGPDlayer;
 
 /* ****************************** Base Structs ****************************** */
 
diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h
index 0f477505f81..e697365be9b 100644
--- a/source/blender/editors/include/ED_keyframes_edit.h
+++ b/source/blender/editors/include/ED_keyframes_edit.h
@@ -31,12 +31,12 @@
 #ifndef __ED_KEYFRAMES_EDIT_H__
 #define __ED_KEYFRAMES_EDIT_H__
 
+struct BezTriple;
+struct FCurve;
+struct Scene;
 struct bAnimContext;
 struct bAnimListElem;
 struct bDopeSheet;
-struct FCurve;
-struct BezTriple;
-struct Scene;
 
 /* ************************************************ */
 /* Common Macros and Defines */
diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h
index b1140630dc0..1240a6bbd04 100644
--- a/source/blender/editors/include/ED_keyframing.h
+++ b/source/blender/editors/include/ED_keyframing.h
@@ -34,27 +34,27 @@
 extern "C" {
 #endif
 
-struct Main;
-struct ListBase;
 struct ID;
+struct ListBase;
+struct Main;
 struct Scene;
 
 struct KeyingSet;
 
-struct bAction;
-struct FCurve;
 struct BezTriple;
+struct FCurve;
+struct bAction;
 
 struct bPoseChannel;
 
-struct bContext;
 struct ReportList;
+struct bContext;
 
 struct Depsgraph;
 
+struct EnumPropertyItem;
 struct PointerRNA;
 struct PropertyRNA;
-struct EnumPropertyItem;
 
 struct NlaKeyframingContext;
 
@@ -133,8 +133,8 @@ short delete_keyframe(
 /* ************ Keying Sets ********************** */
 
 /* forward decl. for this struct which is declared a bit later... */
-struct KeyingSetInfo;
 struct ExtensionRNA;
+struct KeyingSetInfo;
 
 /* Polling Callback for KeyingSets */
 typedef bool (*cbKeyingSet_Poll)(struct KeyingSetInfo *ksi, struct bContext *C);
diff --git a/source/blender/editors/include/ED_lattice.h b/source/blender/editors/include/ED_lattice.h
index b30929f5307..932d55f6532 100644
--- a/source/blender/editors/include/ED_lattice.h
+++ b/source/blender/editors/include/ED_lattice.h
@@ -30,9 +30,9 @@
 #ifndef __ED_LATTICE_H__
 #define __ED_LATTICE_H__
 
-struct wmKeyConfig;
-struct UndoType;
 struct Object;
+struct UndoType;
+struct wmKeyConfig;
 
 /* lattice_ops.c */
 void ED_operatortypes_lattice(void);
diff --git a/source/blender/editors/include/ED_markers.h b/source/blender/editors/include/ED_markers.h
index fa907010870..270ec0137c0 100644
--- a/source/blender/editors/include/ED_markers.h
+++ b/source/blender/editors/include/ED_markers.h
@@ -31,12 +31,12 @@
 #ifndef __ED_MARKERS_H__
 #define __ED_MARKERS_H__
 
-struct wmKeyConfig;
-struct wmKeyMap;
-struct bContext;
-struct bAnimContext;
 struct Scene;
 struct TimeMarker;
+struct bAnimContext;
+struct bContext;
+struct wmKeyConfig;
+struct wmKeyMap;
 
 /* Drawing API ------------------------------ */
 
diff --git a/source/blender/editors/include/ED_mask.h b/source/blender/editors/include/ED_mask.h
index af9d87b8e0e..47d2d9e8ca1 100644
--- a/source/blender/editors/include/ED_mask.h
+++ b/source/blender/editors/include/ED_mask.h
@@ -31,11 +31,11 @@
 #ifndef __ED_MASK_H__
 #define __ED_MASK_H__
 
-struct bContext;
-struct wmKeyConfig;
+struct KeyframeEditData;
 struct MaskLayer;
 struct MaskLayerShape;
-struct KeyframeEditData;
+struct bContext;
+struct wmKeyConfig;
 
 /* mask_edit.c */
 void ED_mask_get_size(struct ScrArea *sa, int *width, int *height);
diff --git a/source/blender/editors/include/ED_mball.h b/source/blender/editors/include/ED_mball.h
index 47ea3929883..69918632220 100644
--- a/source/blender/editors/include/ED_mball.h
+++ b/source/blender/editors/include/ED_mball.h
@@ -31,10 +31,10 @@
 #ifndef __ED_MBALL_H__
 #define __ED_MBALL_H__
 
-struct bContext;
 struct Object;
-struct wmKeyConfig;
 struct UndoType;
+struct bContext;
+struct wmKeyConfig;
 
 void ED_operatortypes_metaball(void);
 void ED_operatormacros_metaball(void);
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index a2f034589f6..04a0cd5d1df 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -35,36 +35,36 @@
 extern "C" {
 #endif
 
-struct Base;
-struct ID;
-struct View3D;
 struct ARegion;
-struct bContext;
+struct BMBVHTree;
+struct BMEdge;
+struct BMEditMesh;
+struct BMElem;
+struct BMFace;
+struct BMLoop;
+struct BMVert;
+struct BMesh;
+struct Base;
 struct Depsgraph;
-struct wmOperator;
-struct wmKeyConfig;
-struct ReportList;
-struct ViewContext;
-struct bDeformGroup;
+struct ID;
 struct MDeformVert;
-struct Scene;
 struct Mesh;
-struct UvVertMap;
+struct Object;
+struct ReportList;
+struct Scene;
+struct ToolSettings;
+struct UndoType;
 struct UvMapVert;
-struct BMEditMesh;
-struct BMElem;
-struct BMesh;
-struct BMVert;
-struct BMLoop;
-struct BMBVHTree;
-struct BMEdge;
-struct BMFace;
-struct UvVertMap;
 struct UvMapVert;
-struct ToolSettings;
-struct Object;
+struct UvVertMap;
+struct UvVertMap;
+struct View3D;
+struct ViewContext;
+struct bContext;
+struct bDeformGroup;
 struct rcti;
-struct UndoType;
+struct wmKeyConfig;
+struct wmOperator;
 
 /* editmesh_utils.c */
 void           EDBM_verts_mirror_cache_begin_ex(struct BMEditMesh *em, const int axis,
diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node.h
index e3a62f871a2..eaddf46dbc4 100644
--- a/source/blender/editors/include/ED_node.h
+++ b/source/blender/editors/include/ED_node.h
@@ -34,17 +34,17 @@
 struct ID;
 struct Main;
 struct Scene;
+struct Scene;
+struct ScrArea;
 struct Tex;
+struct View2D;
 struct bContext;
-struct bNodeTree;
 struct bNode;
-struct bNodeType;
 struct bNodeSocketType;
 struct bNodeTree;
+struct bNodeTree;
 struct bNodeTreeType;
-struct ScrArea;
-struct Scene;
-struct View2D;
+struct bNodeType;
 
 typedef enum {
 	NODE_TOP    = 1,
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 5a02bc2310a..ebf28612448 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -35,33 +35,33 @@
 extern "C" {
 #endif
 
-struct bFaceMap;
 struct Base;
+struct Depsgraph;
+struct EnumPropertyItem;
 struct EnumPropertyItem;
 struct ID;
 struct Main;
 struct Menu;
 struct ModifierData;
-struct ShaderFxData;
 struct Object;
+struct PointerRNA;
+struct PropertyRNA;
 struct ReportList;
 struct Scene;
+struct ShaderFxData;
 struct View3D;
 struct ViewLayer;
 struct bConstraint;
 struct bContext;
+struct bFaceMap;
 struct bPoseChannel;
+struct uiLayout;
 struct wmKeyConfig;
 struct wmKeyMap;
 struct wmOperator;
 struct wmOperatorType;
 struct wmWindow;
 struct wmWindowManager;
-struct PointerRNA;
-struct PropertyRNA;
-struct EnumPropertyItem;
-struct Depsgraph;
-struct uiLayout;
 
 #include "DNA_object_enums.h"
 #include "BLI_compiler_attrs.h"
diff --git a/source/blender/editors/include/ED_outliner.h b/source/blender/editors/include/ED_outliner.h
index 52fdeb2045c..8a4790feec0 100644
--- a/source/blender/editors/include/ED_outliner.h
+++ b/source/blender/editors/include/ED_outliner.h
@@ -27,8 +27,8 @@
 #ifndef __ED_OUTLINER_H__
 #define __ED_OUTLINER_H__
 
-struct bContext;
 struct ListBase;
+struct bContext;
 
 bool ED_outliner_collections_editor_poll(struct bContext *C);
 
diff --git a/source/blender/editors/include/ED_paint.h b/source/blender/editors/include/ED_paint.h
index 246419d64aa..b0e12c4b5ed 100644
--- a/source/blender/editors/include/ED_paint.h
+++ b/source/blender/editors/include/ED_paint.h
@@ -25,13 +25,13 @@
 #ifndef __ED_PAINT_H__
 #define __ED_PAINT_H__
 
-struct bContext;
-struct wmKeyConfig;
-struct wmOperator;
 struct ImBuf;
 struct Image;
 struct UndoStep;
 struct UndoType;
+struct bContext;
+struct wmKeyConfig;
+struct wmOperator;
 
 /* paint_ops.c */
 void ED_operatortypes_paint(void);
diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h
index 7e7198a8ace..c58fe744500 100644
--- a/source/blender/editors/include/ED_particle.h
+++ b/source/blender/editors/include/ED_particle.h
@@ -32,15 +32,15 @@
 #ifndef __ED_PARTICLE_H__
 #define __ED_PARTICLE_H__
 
-struct bContext;
 struct Object;
-struct ParticleSystem;
-struct ParticleEditSettings;
-struct rcti;
 struct PTCacheEdit;
+struct ParticleEditSettings;
+struct ParticleSystem;
 struct Scene;
-struct ViewLayer;
 struct UndoType;
+struct ViewLayer;
+struct bContext;
+struct rcti;
 
 /* particle edit mode */
 void PE_free_ptcache_edit(struct PTCacheEdit *edit);
diff --git a/source/blender/editors/include/ED_physics.h b/source/blender/editors/include/ED_physics.h
index 32444beb0fe..9488bc91abd 100644
--- a/source/blender/editors/include/ED_physics.h
+++ b/source/blender/editors/include/ED_physics.h
@@ -32,12 +32,12 @@
 #ifndef __ED_PHYSICS_H__
 #define __ED_PHYSICS_H__
 
-struct bContext;
 struct ReportList;
+struct bContext;
 struct wmKeyConfig;
 
-struct Scene;
 struct Object;
+struct Scene;
 
 /* particle_edit.c */
 bool PE_poll(struct bContext *C);
diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.h
index 2615847e90a..fb11c187068 100644
--- a/source/blender/editors/include/ED_render.h
+++ b/source/blender/editors/include/ED_render.h
@@ -30,14 +30,14 @@
 
 #include "DNA_vec_types.h"
 
-struct bContext;
 struct DEGEditorUpdateContext;
 struct ID;
-struct Main;
 struct MTex;
+struct Main;
 struct Render;
 struct Scene;
 struct ScrArea;
+struct bContext;
 struct wmWindowManager;
 
 /* render_ops.c */
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index 9ad4c06dee6..166a3202542 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -41,29 +41,29 @@
 
 #include "BLI_compiler_attrs.h"
 
+struct ARegion;
 struct Depsgraph;
-struct wmWindowManager;
-struct wmWindow;
-struct wmNotifier;
-struct wmEvent;
-struct wmKeyConfig;
+struct IDProperty;
+struct Main;
+struct MenuType;
+struct PropertyRNA;
+struct Scene;
+struct ViewLayer;
 struct WorkSpace;
 struct WorkSpaceInstanceHook;
 struct bContext;
-struct Scene;
-struct ViewLayer;
 struct bScreen;
-struct ARegion;
-struct uiBlock;
 struct rcti;
-struct Main;
+struct uiBlock;
+struct wmEvent;
+struct wmKeyConfig;
 struct wmMsgBus;
 struct wmMsgSubscribeKey;
 struct wmMsgSubscribeValue;
+struct wmNotifier;
 struct wmOperatorType;
-struct IDProperty;
-struct MenuType;
-struct PropertyRNA;
+struct wmWindow;
+struct wmWindowManager;
 
 /* regions */
 void    ED_region_do_listen(
diff --git a/source/blender/editors/include/ED_sculpt.h b/source/blender/editors/include/ED_sculpt.h
index 94508a98dcb..7b8ee75fd90 100644
--- a/source/blender/editors/include/ED_sculpt.h
+++ b/source/blender/editors/include/ED_sculpt.h
@@ -31,14 +31,14 @@
 #define __ED_SCULPT_H__
 
 struct ARegion;
-struct bContext;
+struct ListBase;
 struct Object;
 struct RegionView3D;
-struct ViewContext;
-struct rcti;
 struct UndoStep;
 struct UndoType;
-struct ListBase;
+struct ViewContext;
+struct bContext;
+struct rcti;
 
 /* sculpt.c */
 void ED_operatortypes_sculpt(void);
diff --git a/source/blender/editors/include/ED_sequencer.h b/source/blender/editors/include/ED_sequencer.h
index 18446966c4f..8338e86a246 100644
--- a/source/blender/editors/include/ED_sequencer.h
+++ b/source/blender/editors/include/ED_sequencer.h
@@ -27,10 +27,10 @@
 #ifndef __ED_SEQUENCER_H__
 #define __ED_SEQUENCER_H__
 
-struct bContext;
 struct Scene;
 struct Sequence;
 struct SpaceSeq;
+struct bContext;
 
 void ED_sequencer_select_sequence_single(struct Scene *scene, struct Sequence *seq, bool deselect_all);
 void ED_sequencer_deselect_all(struct Scene *scene);
diff --git a/source/blender/editors/include/ED_text.h b/source/blender/editors/include/ED_text.h
index 858902eeec1..ead56f777d9 100644
--- a/source/blender/editors/include/ED_text.h
+++ b/source/blender/editors/include/ED_text.h
@@ -30,10 +30,10 @@
 #ifndef __ED_TEXT_H__
 #define __ED_TEXT_H__
 
-struct SpaceText;
 struct ARegion;
-struct UndoType;
+struct SpaceText;
 struct TextUndoBuf;
+struct UndoType;
 
 bool ED_text_region_location_from_cursor(struct SpaceText *st, struct ARegion *ar, const int cursor_co[2], int r_pixel_co[2]);
 
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h
index ad39c1ccc8a..7a819a612eb 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -36,17 +36,17 @@
 
 struct ARegion;
 struct ListBase;
+struct Main;
 struct Object;
+struct SnapObjectContext;
+struct SnapObjectParams;
 struct View3D;
+struct WorkSpace;
 struct bContext;
 struct wmEvent;
 struct wmKeyConfig;
 struct wmKeyMap;
 struct wmOperatorType;
-struct WorkSpace;
-struct Main;
-struct SnapObjectContext;
-struct SnapObjectParams;
 
 void ED_keymap_transform(struct wmKeyConfig *keyconf);
 void transform_operatortypes(void);
@@ -111,9 +111,9 @@ enum TfmMode {
  * */
 bool calculateTransformCenter(struct bContext *C, int centerMode, float cent3d[3], float cent2d[2]);
 
-struct TransInfo;
-struct Scene;
 struct Object;
+struct Scene;
+struct TransInfo;
 struct wmGizmoGroup;
 struct wmGizmoGroupType;
 struct wmOperator;
@@ -121,9 +121,9 @@ struct wmOperator;
 /* UNUSED */
 // int BIF_snappingSupported(struct Object *obedit);
 
+struct ReportList;
 struct TransformOrientation;
 struct bContext;
-struct ReportList;
 
 void BIF_clearTransformOrientation(struct bContext *C);
 void BIF_removeTransformOrientation(struct bContext *C, struct TransformOrientation *ts);
diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.h
index 8ac7dfcf9d8..6f143393432 100644
--- a/source/blender/editors/include/ED_transform_snap_object_context.h
+++ b/source/blender/editors/include/ED_transform_snap_object_context.h
@@ -25,18 +25,18 @@
 #ifndef __ED_TRANSFORM_SNAP_OBJECT_CONTEXT_H__
 #define __ED_TRANSFORM_SNAP_OBJECT_CONTEXT_H__
 
-struct BMVert;
 struct BMEdge;
 struct BMFace;
+struct BMVert;
 
+struct ARegion;
 struct Depsgraph;
 struct ListBase;
-struct Scene;
-struct ViewLayer;
 struct Main;
 struct Object;
-struct ARegion;
+struct Scene;
 struct View3D;
+struct ViewLayer;
 struct bContext;
 
 /* transform_snap_object.c */
diff --git a/source/blender/editors/include/ED_undo.h b/source/blender/editors/include/ED_undo.h
index 677d64acc7d..71e36892aa4 100644
--- a/source/blender/editors/include/ED_undo.h
+++ b/source/blender/editors/include/ED_undo.h
@@ -27,11 +27,11 @@
 
 #include "BLI_compiler_attrs.h"
 
-struct bContext;
 struct CLG_LogRef;
+struct UndoStack;
+struct bContext;
 struct wmOperator;
 struct wmOperatorType;
-struct UndoStack;
 
 /* undo.c */
 void    ED_undo_push(struct bContext *C, const char *str);
diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h
index e4d70a99e98..390398262f9 100644
--- a/source/blender/editors/include/ED_util.h
+++ b/source/blender/editors/include/ED_util.h
@@ -33,9 +33,9 @@
 
 #include "BLI_compiler_attrs.h"
 
+struct Main;
 struct bContext;
 struct wmOperatorType;
-struct Main;
 
 /* ed_util.c */
 void ED_editors_init(struct bContext *C);
diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h
index b17fea2b299..6b59b40ede1 100644
--- a/source/blender/editors/include/ED_uvedit.h
+++ b/source/blender/editors/include/ED_uvedit.h
@@ -31,19 +31,19 @@
 #define __ED_UVEDIT_H__
 
 struct ARegionType;
-struct BMesh;
 struct BMEditMesh;
 struct BMFace;
 struct BMLoop;
+struct BMesh;
 struct Depsgraph;
 struct Image;
 struct ImageUser;
 struct Main;
 struct Object;
 struct Scene;
+struct SpaceImage;
 struct View3D;
 struct ViewLayer;
-struct SpaceImage;
 struct bNode;
 struct wmKeyConfig;
 
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index 8a699d8c9fb..5f39d722da3 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -43,6 +43,10 @@ struct BoundBox;
 struct Camera;
 struct Depsgraph;
 struct EditBone;
+struct GPUFX;
+struct GPUFXSettings;
+struct GPUOffScreen;
+struct GPUViewport;
 struct ImBuf;
 struct MVert;
 struct Main;
@@ -53,10 +57,11 @@ struct RV3DMatrixStore;
 struct RegionView3D;
 struct RenderEngineType;
 struct Scene;
-struct ViewLayer;
 struct ScrArea;
 struct View3D;
 struct ViewContext;
+struct ViewLayer;
+struct WorkSpace;
 struct bContext;
 struct bPoseChannel;
 struct bScreen;
@@ -66,11 +71,6 @@ struct wmOperator;
 struct wmOperatorType;
 struct wmWindow;
 struct wmWindowManager;
-struct GPUFX;
-struct GPUOffScreen;
-struct GPUFXSettings;
-struct GPUViewport;
-struct WorkSpace;
 enum eGPUFXFlags;
 
 /* for derivedmesh drawing callbacks, for view3d_select, .... */
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 1db42ec0a53..38d88881f73 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -38,50 +38,50 @@
 
 /* Struct Declarations */
 
-struct ID;
-struct IDProperty;
-struct ListBase;
 struct ARegion;
 struct ARegionType;
-struct ScrArea;
-struct bScreen;
-struct wmEvent;
-struct wmWindow;
-struct wmOperator;
 struct AutoComplete;
-struct bContext;
-struct bContextStore;
+struct ID;
+struct IDProperty;
+struct ImBuf;
+struct Image;
+struct ImageUser;
+struct ListBase;
+struct MTex;
 struct Panel;
 struct PanelType;
 struct PointerRNA;
 struct PropertyRNA;
 struct ReportList;
+struct ScrArea;
+struct bContext;
+struct bContextStore;
+struct bNode;
+struct bNodeSocket;
+struct bNodeTree;
+struct bScreen;
 struct rcti;
+struct uiFontStyle;
 struct uiList;
 struct uiStyle;
-struct uiFontStyle;
 struct uiWidgetColors;
-struct Image;
-struct ImageUser;
-struct wmKeyConfig;
-struct wmOperatorType;
-struct MTex;
-struct ImBuf;
-struct bNodeTree;
-struct bNode;
-struct bNodeSocket;
-struct wmDropBox;
 struct wmDrag;
+struct wmDropBox;
+struct wmEvent;
 struct wmEvent;
 struct wmGizmo;
-struct wmMsgBus;
+struct wmKeyConfig;
 struct wmKeyMap;
 struct wmKeyMapItem;
+struct wmMsgBus;
+struct wmOperator;
+struct wmOperatorType;
+struct wmWindow;
 
-typedef struct uiBut uiBut;
 typedef struct uiBlock uiBlock;
-typedef struct uiPopupBlockHandle uiPopupBlockHandle;
+typedef struct uiBut uiBut;
 typedef struct uiLayout uiLayout;
+typedef struct uiPopupBlockHandle uiPopupBlockHandle;
 
 /* Defines */
 
diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h
index 640d66c9ac4..16b3f67bb73 100644
--- a/source/blender/editors/include/UI_interface_icons.h
+++ b/source/blender/editors/include/UI_interface_icons.h
@@ -32,11 +32,11 @@
 #ifndef __UI_INTERFACE_ICONS_H__
 #define __UI_INTERFACE_ICONS_H__
 
-struct bContext;
 struct ID;
-struct Scene;
-struct PreviewImage;
 struct PointerRNA;
+struct PreviewImage;
+struct Scene;
+struct bContext;
 
 enum eIconSizes;
 
diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h
index f35976750c9..eb29efb6a07 100644
--- a/source/blender/editors/include/UI_view2d.h
+++ b/source/blender/editors/include/UI_view2d.h
@@ -134,13 +134,13 @@ struct View2D;
 struct View2DGrid;
 struct View2DScrollers;
 
-struct wmKeyConfig;
-struct bScreen;
+struct ARegion;
 struct Scene;
 struct ScrArea;
-struct ARegion;
 struct bContext;
+struct bScreen;
 struct rctf;
+struct wmKeyConfig;
 
 typedef struct View2DGrid View2DGrid;
 typedef struct View2DScrollers View2DScrollers;
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index c5315518ec7..7720a3283d6 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -39,19 +39,19 @@
 #include "DNA_listBase.h"
 
 struct ARegion;
+struct ID;
+struct ImBuf;
+struct Scene;
 struct bContext;
+struct bContextStore;
 struct uiHandleButtonData;
+struct uiLayout;
+struct uiStyle;
+struct uiWidgetColors;
 struct wmEvent;
 struct wmKeyConfig;
 struct wmOperatorType;
 struct wmTimer;
-struct uiStyle;
-struct uiWidgetColors;
-struct uiLayout;
-struct bContextStore;
-struct Scene;
-struct ID;
-struct ImBuf;
 
 /* ****************** general defines ************** */
 
diff --git a/source/blender/editors/mask/mask_intern.h b/source/blender/editors/mask/mask_intern.h
index 60acb430b20..99b4a8b42d4 100644
--- a/source/blender/editors/mask/mask_intern.h
+++ b/source/blender/editors/mask/mask_intern.h
@@ -32,8 +32,8 @@
 #ifndef __MASK_INTERN_H__
 #define __MASK_INTERN_H__
 
-struct bContext;
 struct Mask;
+struct bContext;
 struct wmOperatorType;
 
 /* internal exports only */
diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h
index ab0b6e19575..b87340f1486 100644
--- a/source/blender/editors/mesh/mesh_intern.h
+++ b/source/blender/editors/mesh/mesh_intern.h
@@ -35,15 +35,15 @@
 #define __MESH_INTERN_H__
 
 struct BMEditMesh;
-struct BMOperator;
 struct BMElem;
+struct BMOperator;
 struct EnumPropertyItem;
+struct LinkNode;
 struct bContext;
 struct wmKeyConfig;
 struct wmKeyMap;
 struct wmOperator;
 struct wmOperatorType;
-struct LinkNode;
 
 /* *** editmesh_utils.c *** */
 
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index e4953202ee4..1ef0b0f268c 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -31,11 +31,11 @@
 #ifndef __OBJECT_INTERN_H__
 #define __OBJECT_INTERN_H__
 
-struct wmOperatorType;
 struct Object;
-struct bContext;
 struct StructRNA;
+struct bContext;
 struct wmOperator;
+struct wmOperatorType;
 
 struct ModifierData;
 
diff --git a/source/blender/editors/render/render_intern.h b/source/blender/editors/render/render_intern.h
index 585a7999290..7e73884c5be 100644
--- a/source/blender/editors/render/render_intern.h
+++ b/source/blender/editors/render/render_intern.h
@@ -32,10 +32,10 @@
 #ifndef __RENDER_INTERN_H__
 #define __RENDER_INTERN_H__
 
-struct bContext;
 struct RenderEngine;
-struct wmOperatorType;
 struct ScrArea;
+struct bContext;
+struct wmOperatorType;
 
 /* render_shading.c */
 void OBJECT_OT_material_slot_add(struct wmOperatorType *ot);
diff --git a/source/blender/editors/screen/screen_intern.h b/source/blender/editors/screen/screen_intern.h
index 4c7d859e4ee..9299d401651 100644
--- a/source/blender/editors/screen/screen_intern.h
+++ b/source/blender/editors/screen/screen_intern.h
@@ -31,9 +31,9 @@
 #ifndef __SCREEN_INTERN_H__
 #define __SCREEN_INTERN_H__
 
+struct Main;
 struct bContext;
 struct bContextDataResult;
-struct Main;
 
 /* internal exports only */
 
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index 4bfdf39621e..b5993c1f243 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -33,28 +33,28 @@
 #define __PAINT_INTERN_H__
 
 struct ARegion;
-struct bContext;
 struct Brush;
-struct ImagePool;
-struct ColorSpace;
 struct ColorManagedDisplay;
+struct ColorSpace;
+struct ImagePool;
 struct ListBase;
 struct MTex;
 struct Object;
-struct PaintStroke;
 struct Paint;
 struct PaintCurve;
+struct PaintStroke;
 struct PointerRNA;
-struct rcti;
-struct Scene;
 struct RegionView3D;
+struct Scene;
+struct UndoStep;
 struct VPaint;
 struct ViewContext;
+struct bContext;
+struct rcti;
 struct wmEvent;
 struct wmOperator;
 struct wmOperatorType;
 struct wmWindowManager;
-struct UndoStep;
 enum ePaintMode;
 
 typedef struct CoNo {
diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h
index 4e2ecc210f4..2d530d2ef5f 100644
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@ -42,11 +42,11 @@
 
 #include "BKE_pbvh.h"
 
-struct bContext;
 struct KeyBlock;
 struct Object;
-struct SculptUndoNode;
 struct SculptOrigVertData;
+struct SculptUndoNode;
+struct bContext;
 
 bool sculpt_mode_poll(struct bContext *C);
 bool sculpt_mode_poll_view3d(struct bContext *C);
diff --git a/source/blender/editors/space_action/action_intern.h b/source/blender/editors/space_action/action_intern.h
index 986afe96e11..a895f28985b 100644
--- a/source/blender/editors/space_action/action_intern.h
+++ b/source/blender/editors/space_action/action_intern.h
@@ -31,15 +31,15 @@
 #ifndef __ACTION_INTERN_H__
 #define __ACTION_INTERN_H__
 
-struct bContext;
-struct bAnimContext;
-struct Scene;
-struct Object;
-struct SpaceAction;
-struct ScrArea;
 struct ARegion;
 struct ARegionType;
+struct Object;
+struct Scene;
+struct ScrArea;
+struct SpaceAction;
 struct View2D;
+struct bAnimContext;
+struct bContext;
 struct wmOperatorType;
 
 /* internal exports only */
diff --git a/source/blender/editors/space_clip/clip_intern.h b/source/blender/editors/space_clip/clip_intern.h
index e8488a5d0b6..7489ca9022e 100644
--- a/source/blender/editors/space_clip/clip_intern.h
+++ b/source/blender/editors/space_clip/clip_intern.h
@@ -32,7 +32,6 @@
 #ifndef __CLIP_INTERN_H__
 #define __CLIP_INTERN_H__
 
-struct bContext;
 struct ARegion;
 struct MovieClip;
 struct MovieTrackingMarker;
@@ -40,6 +39,7 @@ struct MovieTrackingTrack;
 struct Scene;
 struct ScrArea;
 struct SpaceClip;
+struct bContext;
 struct wmOperatorType;
 
 /* channel heights */
diff --git a/source/blender/editors/space_clip/tracking_ops_intern.h b/source/blender/editors/space_clip/tracking_ops_intern.h
index b53799b88d8..6cb2c97325a 100644
--- a/source/blender/editors/space_clip/tracking_ops_intern.h
+++ b/source/blender/editors/space_clip/tracking_ops_intern.h
@@ -32,10 +32,10 @@
 #ifndef __TRACKING_OPS_INTERN_H__
 #define __TRACKING_OPS_INTERN_H__
 
-struct bContext;
 struct ListBase;
 struct MovieClip;
 struct SpaceClip;
+struct bContext;
 
 /* tracking_utils.c */
 
diff --git a/source/blender/editors/space_console/console_intern.h b/source/blender/editors/space_console/console_intern.h
index a272464e0d9..ca2e7679212 100644
--- a/source/blender/editors/space_console/console_intern.h
+++ b/source/blender/editors/space_console/console_intern.h
@@ -30,8 +30,8 @@
 /* internal exports only */
 
 struct ConsoleLine;
-struct wmOperatorType;
 struct bContext;
+struct wmOperatorType;
 
 /* console_draw.c */
 void console_textview_main(struct SpaceConsole *sc, struct ARegion *ar);
diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h
index 710aa472a8b..77b13a0dbef 100644
--- a/source/blender/editors/space_file/file_intern.h
+++ b/source/blender/editors/space_file/file_intern.h
@@ -59,8 +59,8 @@ void file_draw_check_cb(bContext *C, void *arg1, void *arg2);
 bool file_draw_check_exists(SpaceFile *sfile);
 
 /* file_ops.h */
-struct wmOperatorType;
 struct wmOperator;
+struct wmOperatorType;
 
 typedef enum WalkSelectDirection {
 	FILE_SELECT_WALK_UP,
diff --git a/source/blender/editors/space_graph/graph_intern.h b/source/blender/editors/space_graph/graph_intern.h
index 286d3cea59c..f9a39df0a89 100644
--- a/source/blender/editors/space_graph/graph_intern.h
+++ b/source/blender/editors/space_graph/graph_intern.h
@@ -31,14 +31,14 @@
 #ifndef __GRAPH_INTERN_H__
 #define __GRAPH_INTERN_H__
 
-struct bContext;
-struct bAnimContext;
-struct bAnimListElem;
-struct SpaceIpo;
-struct ScrArea;
 struct ARegion;
 struct ARegionType;
+struct ScrArea;
+struct SpaceIpo;
 struct View2DGrid;
+struct bAnimContext;
+struct bAnimListElem;
+struct bContext;
 
 /* internal exports only */
 
diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h
index db223d7f7a1..55f6f1e03c9 100644
--- a/source/blender/editors/space_image/image_intern.h
+++ b/source/blender/editors/space_image/image_intern.h
@@ -33,13 +33,13 @@
 #define __IMAGE_INTERN_H__
 
 /* internal exports only */
-struct bContext;
 struct ARegion;
 struct ARegionType;
 struct ScrArea;
 struct SpaceImage;
-struct wmOperatorType;
+struct bContext;
 struct bNodeTree;
+struct wmOperatorType;
 
 /* space_image.c */
 struct ARegion *image_has_buttons_region(struct ScrArea *sa);
diff --git a/source/blender/editors/space_info/info_intern.h b/source/blender/editors/space_info/info_intern.h
index 37d3c73f705..4fb564c3da6 100644
--- a/source/blender/editors/space_info/info_intern.h
+++ b/source/blender/editors/space_info/info_intern.h
@@ -33,9 +33,9 @@
 
 /* internal exports only */
 
+struct ReportList;
 struct SpaceInfo;
 struct wmOperatorType;
-struct ReportList;
 
 void FILE_OT_autopack_toggle(struct wmOperatorType *ot);
 void FILE_OT_pack_all(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h
index a74daae12b3..4e30bae7ad6 100644
--- a/source/blender/editors/space_node/node_intern.h
+++ b/source/blender/editors/space_node/node_intern.h
@@ -39,14 +39,14 @@
 
 struct ARegion;
 struct ARegionType;
+struct Main;
 struct View2D;
 struct bContext;
-struct Main;
-struct wmWindow;
 struct bNode;
-struct bNodeSocket;
 struct bNodeLink;
+struct bNodeSocket;
 struct wmKeyConfig;
+struct wmWindow;
 
 /* temp data to pass on to modal */
 typedef struct bNodeLinkDrag {
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index b3e4ea88b4c..194e79f4ac2 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -37,20 +37,20 @@
 /* internal exports only */
 
 struct ARegion;
+struct EditBone;
+struct ID;
 struct ListBase;
-struct wmOperatorType;
-struct TreeElement;
-struct TreeStoreElem;
 struct Main;
-struct bContext;
+struct Object;
 struct Scene;
+struct TreeElement;
+struct TreeStoreElem;
 struct ViewLayer;
-struct ID;
-struct Object;
+struct bContext;
 struct bPoseChannel;
-struct EditBone;
 struct wmEvent;
 struct wmKeyConfig;
+struct wmOperatorType;
 
 typedef enum TreeElementInsertType {
 	TE_INSERT_BEFORE,
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h
index 0d647c883be..69a33573f19 100644
--- a/source/blender/editors/space_sequencer/sequencer_intern.h
+++ b/source/blender/editors/space_sequencer/sequencer_intern.h
@@ -36,18 +36,18 @@
 
 /* internal exports only */
 
+struct ARegion;
+struct ARegionType;
 struct Depsgraph;
+struct Main;
+struct Scene;
+struct ScrArea;
 struct Sequence;
+struct SpaceSeq;
+struct StripElem;
 struct bContext;
 struct rctf;
-struct SpaceSeq;
-struct ScrArea;
-struct ARegion;
-struct ARegionType;
-struct Scene;
-struct Main;
 struct wmOperator;
-struct StripElem;
 
 /* space_sequencer.c */
 struct ARegion *sequencer_has_buttons_region(struct ScrArea *sa);
@@ -87,8 +87,8 @@ extern EnumPropertyItem sequencer_prop_effect_types[];
 extern EnumPropertyItem prop_side_types[];
 
 /* operators */
-struct wmOperatorType;
 struct wmKeyConfig;
+struct wmOperatorType;
 
 void SEQUENCER_OT_cut(struct wmOperatorType *ot);
 void SEQUENCER_OT_slip(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h
index 02948d35623..b22ec86b444 100644
--- a/source/blender/editors/space_text/text_intern.h
+++ b/source/blender/editors/space_text/text_intern.h
@@ -34,11 +34,11 @@
 /* internal exports only */
 
 struct ARegion;
-struct bContext;
 struct ScrArea;
 struct SpaceText;
 struct Text;
 struct TextLine;
+struct bContext;
 struct wmOperatorType;
 
 /* text_draw.c */
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index c84bd039012..ad12ace591e 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -39,20 +39,20 @@ struct ARegion;
 struct ARegionType;
 struct Base;
 struct BoundBox;
-struct GPUBatch;
 struct Depsgraph;
+struct GPUBatch;
+struct Mesh;
 struct Object;
 struct SmokeDomainSettings;
+struct ViewLayer;
 struct bAnimVizSettings;
 struct bContext;
 struct bMotionPath;
 struct bPoseChannel;
-struct Mesh;
-struct ViewLayer;
-struct wmOperatorType;
-struct wmKeyConfig;
 struct wmGizmoGroupType;
 struct wmGizmoType;
+struct wmKeyConfig;
+struct wmOperatorType;
 struct wmWindowManager;
 
 /* drawing flags: */
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index cd5c7e31efd..360fb4fad25 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -45,30 +45,30 @@
 
 /* ************************** Types ***************************** */
 
+struct ARegion;
 struct Depsgraph;
-struct TransInfo;
-struct TransDataContainer;
-struct TransData;
-struct TransformOrientation;
-struct TransSnap;
+struct EditBone;
 struct NumInput;
 struct Object;
-struct View3D;
-struct ScrArea;
+struct RNG;
+struct RenderEngineType;
+struct ReportList;
 struct Scene;
+struct ScrArea;
+struct SnapObjectContext;
+struct TransData;
+struct TransDataContainer;
+struct TransInfo;
+struct TransSnap;
+struct TransformOrientation;
+struct View3D;
 struct ViewLayer;
 struct bConstraint;
-struct wmKeyMap;
-struct wmKeyConfig;
 struct bContext;
 struct wmEvent;
+struct wmKeyConfig;
+struct wmKeyMap;
 struct wmTimer;
-struct ARegion;
-struct ReportList;
-struct RNG;
-struct EditBone;
-struct RenderEngineType;
-struct SnapObjectContext;
 
 #include "DNA_object_enums.h"
 
@@ -261,8 +261,8 @@ typedef struct TransDataNla {
 	int handle;
 } TransDataNla;
 
-struct LinkNode;
 struct GHash;
+struct LinkNode;
 
 /* header of TransDataEdgeSlideVert, TransDataEdgeSlideEdge */
 typedef struct TransDataGenericSlideVert {
diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h
index 34cd885d75e..adb12239371 100644
--- a/source/blender/editors/uvedit/uvedit_intern.h
+++ b/source/blender/editors/uvedit/uvedit_intern.h
@@ -32,14 +32,14 @@
 #ifndef __UVEDIT_INTERN_H__
 #define __UVEDIT_INTERN_H__
 
+struct BMEditMesh;
+struct BMFace;
+struct BMLoop;
 struct Image;
 struct Object;
 struct Scene;
 struct SpaceImage;
 struct wmOperatorType;
-struct BMEditMesh;
-struct BMFace;
-struct BMLoop;
 
 /* geometric utilities */
 void  uv_poly_copy_aspect(float uv_orig[][2], float uv[][2], float aspx, float aspy, int len);
diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c
index 7d0439d9b66..c58621690a8 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.c
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.c
@@ -91,11 +91,11 @@ typedef struct PHash {
 
 
 
-struct PVert;
+struct PChart;
 struct PEdge;
 struct PFace;
-struct PChart;
 struct PHandle;
+struct PVert;
 
 /* Simplices */