Cleanup: sort forward declarations of enum & struct

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

36 files changed, 191 insertions, 191 deletions

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;