Cleanup: sort forward declarations of enum & struct

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

236 files changed, 818 insertions, 818 deletions

diff --git a/source/blender/alembic/ABC_alembic.h b/source/blender/alembic/ABC_alembic.h
index 70250310213..f32169406b6 100644
--- a/source/blender/alembic/ABC_alembic.h
+++ b/source/blender/alembic/ABC_alembic.h
@@ -27,12 +27,12 @@
 extern "C" {
 #endif
 
-struct bContext;
 struct CacheReader;
 struct DerivedMesh;
 struct ListBase;
 struct Object;
 struct Scene;
+struct bContext;
 
 typedef struct AbcArchiveHandle AbcArchiveHandle;
 
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index 7a6d00299c9..d66598c985b 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -35,9 +35,9 @@
 #include "BLI_compiler_attrs.h"
 #include "BLI_sys_types.h"
 
-struct rctf;
 struct ColorManagedDisplay;
 struct ResultBLF;
+struct rctf;
 
 int BLF_init(void);
 void BLF_exit(void);
diff --git a/source/blender/blenfont/intern/blf_internal.h b/source/blender/blenfont/intern/blf_internal.h
index 708466e8ebd..c2895fbad11 100644
--- a/source/blender/blenfont/intern/blf_internal.h
+++ b/source/blender/blenfont/intern/blf_internal.h
@@ -31,10 +31,10 @@
 #ifndef __BLF_INTERNAL_H__
 #define __BLF_INTERNAL_H__
 
-struct ResultBLF;
 struct FontBLF;
 struct GlyphBLF;
 struct GlyphCacheBLF;
+struct ResultBLF;
 struct rctf;
 
 unsigned int blf_next_p2(unsigned int x);
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 35496ea3313..c345e02d124 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -80,24 +80,24 @@
 #include "BKE_customdata.h"
 #include "BKE_bvhutils.h"
 
+struct BMEditMesh;
 struct CCGElem;
 struct CCGKey;
-struct MVert;
+struct ColorBand;
+struct GPUDrawObject;
+struct GPUVertexAttribs;
+struct KeyBlock;
+struct MCol;
 struct MEdge;
 struct MFace;
+struct MLoopNorSpaceArray;
 struct MTFace;
-struct Object;
-struct Scene;
+struct MVert;
 struct Mesh;
-struct MLoopNorSpaceArray;
-struct BMEditMesh;
-struct KeyBlock;
 struct ModifierData;
-struct MCol;
-struct ColorBand;
-struct GPUVertexAttribs;
-struct GPUDrawObject;
+struct Object;
 struct PBVH;
+struct Scene;
 
 /* number of sub-elements each mesh element has (for interpolation) */
 #define SUB_ELEMS_VERT 0
diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h
index 917226888a2..490dfe30399 100644
--- a/source/blender/blenkernel/BKE_action.h
+++ b/source/blender/blenkernel/BKE_action.h
@@ -38,14 +38,14 @@
 #include "DNA_listBase.h"
 
 /* The following structures are defined in DNA_action_types.h, and DNA_anim_types.h */
+struct FCurve;
+struct Main;
+struct Object;
 struct bAction;
 struct bActionGroup;
-struct FCurve;
-struct bPose;
 struct bItasc;
+struct bPose;
 struct bPoseChannel;
-struct Main;
-struct Object;
 
 /* Kernel prototypes */
 #ifdef __cplusplus
diff --git a/source/blender/blenkernel/BKE_anim.h b/source/blender/blenkernel/BKE_anim.h
index 05717e3c8af..61306c85906 100644
--- a/source/blender/blenkernel/BKE_anim.h
+++ b/source/blender/blenkernel/BKE_anim.h
@@ -32,9 +32,6 @@
  *  \author nzc
  *  \since March 2001
  */
-struct bAnimVizSettings;
-struct bMotionPath;
-struct bPoseChannel;
 struct EvaluationContext;
 struct ListBase;
 struct Main;
@@ -42,6 +39,9 @@ struct Object;
 struct Path;
 struct ReportList;
 struct Scene;
+struct bAnimVizSettings;
+struct bMotionPath;
+struct bPoseChannel;
 
 /* ---------------------------------------------------- */
 /* Animation Visualization */
diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h
index b66199d58aa..d5c64d1f8da 100644
--- a/source/blender/blenkernel/BKE_animsys.h
+++ b/source/blender/blenkernel/BKE_animsys.h
@@ -31,22 +31,22 @@
  *  \author Joshua Leung
  */
 
-struct ID;
-struct ListBase;
-struct Main;
 struct AnimData;
 struct FCurve;
-struct KeyingSet;
+struct ID;
 struct KS_Path;
+struct KeyingSet;
+struct ListBase;
+struct Main;
 struct PathResolvedRNA;
 struct bContext;
 
+struct AnimMapper;
 struct PointerRNA;
 struct PropertyRNA;
 struct ReportList;
 struct bAction;
 struct bActionGroup;
-struct AnimMapper;
 
 /* ************************************* */
 /* AnimData API */
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index efd665b070a..67792229012 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -35,14 +35,14 @@
 
 struct Bone;
 struct GHash;
+struct ListBase;
 struct Main;
-struct bArmature;
-struct bPoseChannel;
-struct bConstraint;
-struct Scene;
 struct Object;
 struct PoseTree;
-struct ListBase;
+struct Scene;
+struct bArmature;
+struct bConstraint;
+struct bPoseChannel;
 
 typedef struct PoseTarget {
 	struct PoseTarget *next, *prev;
@@ -152,10 +152,10 @@ void BKE_pchan_bbone_spline_setup(struct bPoseChannel *pchan, int rest, Mat4 res
 	(PBONE_VISIBLE(arm, bone) && !((bone)->flag & BONE_UNSELECTABLE))
 
 /* Evaluation helpers */
+struct EvaluationContext;
 struct bKinematicConstraint;
 struct bPose;
 struct bSplineIKConstraint;
-struct EvaluationContext;
 
 struct bPoseChannel *BKE_armature_ik_solver_find_root(
         struct bPoseChannel *pchan,
diff --git a/source/blender/blenkernel/BKE_blender_copybuffer.h b/source/blender/blenkernel/BKE_blender_copybuffer.h
index 02bd96217f6..3f8181f05c6 100644
--- a/source/blender/blenkernel/BKE_blender_copybuffer.h
+++ b/source/blender/blenkernel/BKE_blender_copybuffer.h
@@ -28,10 +28,10 @@
 extern "C" {
 #endif
 
-struct bContext;
-struct ReportList;
-struct Main;
 struct ID;
+struct Main;
+struct ReportList;
+struct bContext;
 
 /* copybuffer (wrapper for BKE_blendfile_write_partial) */
 void BKE_copybuffer_begin(struct Main *bmain_src);
diff --git a/source/blender/blenkernel/BKE_blender_undo.h b/source/blender/blenkernel/BKE_blender_undo.h
index a96f8af1fdb..5d3fa2726a2 100644
--- a/source/blender/blenkernel/BKE_blender_undo.h
+++ b/source/blender/blenkernel/BKE_blender_undo.h
@@ -28,10 +28,10 @@
 extern "C" {
 #endif
 
-struct bContext;
-struct Scene;
 struct Main;
 struct MemFileUndoData;
+struct Scene;
+struct bContext;
 
 #define BKE_UNDO_STR_MAX 64
 
diff --git a/source/blender/blenkernel/BKE_blendfile.h b/source/blender/blenkernel/BKE_blendfile.h
index 74fdde93d9a..d59a3c2cee2 100644
--- a/source/blender/blenkernel/BKE_blendfile.h
+++ b/source/blender/blenkernel/BKE_blendfile.h
@@ -28,13 +28,13 @@
 extern "C" {
 #endif
 
-struct bContext;
+struct BlendFileReadParams;
 struct ID;
 struct Main;
 struct MemFile;
 struct ReportList;
 struct UserDef;
-struct BlendFileReadParams;
+struct bContext;
 
 enum {
 	BKE_BLENDFILE_READ_FAIL             = 0, /* no load */
diff --git a/source/blender/blenkernel/BKE_bmfont.h b/source/blender/blenkernel/BKE_bmfont.h
index 3be84c83892..97ecb1ffa5c 100644
--- a/source/blender/blenkernel/BKE_bmfont.h
+++ b/source/blender/blenkernel/BKE_bmfont.h
@@ -37,9 +37,9 @@
 extern "C" {
 #endif
 
-struct bmGlyph;
 struct ImBuf;
 struct bmFont;
+struct bmGlyph;
 
 void printfGlyph(struct bmGlyph *glyph);
 void calcAlpha(struct ImBuf *ibuf);
diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h
index c6057442fec..d818ae81b27 100644
--- a/source/blender/blenkernel/BKE_bvhutils.h
+++ b/source/blender/blenkernel/BKE_bvhutils.h
@@ -38,10 +38,10 @@
  * This header encapsulates necessary code to build a BVH
  */
 
-struct DerivedMesh;
 struct BMEditMesh;
-struct MVert;
+struct DerivedMesh;
 struct MFace;
+struct MVert;
 
 typedef struct LinkNode BVHCache;
 
diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h
index 8eb8ef22b49..91d0b42bbcb 100644
--- a/source/blender/blenkernel/BKE_camera.h
+++ b/source/blender/blenkernel/BKE_camera.h
@@ -39,14 +39,14 @@ extern "C" {
 #include "DNA_vec_types.h"
 
 struct Camera;
+struct GPUFXSettings;
 struct Main;
 struct Object;
 struct RegionView3D;
 struct RenderData;
 struct Scene;
-struct rctf;
 struct View3D;
-struct GPUFXSettings;
+struct rctf;
 
 /* Camera Datablock */
 
diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h
index 761b679983d..962cba6a638 100644
--- a/source/blender/blenkernel/BKE_cdderivedmesh.h
+++ b/source/blender/blenkernel/BKE_cdderivedmesh.h
@@ -37,10 +37,10 @@
 
 #include "BKE_DerivedMesh.h"
 
-struct DerivedMesh;
 struct BMEditMesh;
-struct Mesh;
+struct DerivedMesh;
 struct MLoopNorSpaceArray;
+struct Mesh;
 struct Object;
 
 /* creates a new CDDerivedMesh */
diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h
index 6b76ec33c06..bd10a49059b 100644
--- a/source/blender/blenkernel/BKE_cloth.h
+++ b/source/blender/blenkernel/BKE_cloth.h
@@ -35,12 +35,12 @@
 #include <float.h>
 #include "BLI_math_inline.h"
 
-struct Object;
-struct Scene;
-struct MFace;
-struct DerivedMesh;
 struct ClothModifierData;
 struct CollisionModifierData;
+struct DerivedMesh;
+struct MFace;
+struct Object;
+struct Scene;
 
 #define DO_INLINE MALWAYS_INLINE
 
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h
index 98dc7d69c0d..02fe89c0d7e 100644
--- a/source/blender/blenkernel/BKE_collision.h
+++ b/source/blender/blenkernel/BKE_collision.h
@@ -47,9 +47,9 @@ struct CollisionModifierData;
 struct Group;
 struct MFace;
 struct MVert;
+struct MVertTri;
 struct Object;
 struct Scene;
-struct MVertTri;
 
 ////////////////////////////////////////
 // used for collisions in collision.c
diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h
index 5332b3acd72..e44d7a283b0 100644
--- a/source/blender/blenkernel/BKE_colortools.h
+++ b/source/blender/blenkernel/BKE_colortools.h
@@ -34,12 +34,12 @@
 struct ColorManagedColorspaceSettings;
 struct ColorManagedDisplaySettings;
 struct ColorManagedViewSettings;
-struct CurveMapping;
 struct CurveMap;
 struct CurveMapPoint;
-struct Scopes;
+struct CurveMapping;
 struct Histogram;
 struct ImBuf;
+struct Scopes;
 struct rctf;
 
 void                curvemapping_set_defaults(struct CurveMapping *cumap, int tot, float minx, float miny, float maxx, float maxy);
diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h
index 293ac30f0f9..bcf23957f03 100644
--- a/source/blender/blenkernel/BKE_constraint.h
+++ b/source/blender/blenkernel/BKE_constraint.h
@@ -34,11 +34,11 @@
  */
 
 struct ID;
-struct bConstraint;
-struct bConstraintTarget;
 struct ListBase;
 struct Object;
 struct Scene;
+struct bConstraint;
+struct bConstraintTarget;
 struct bPoseChannel;
 
 /* ---------------------------------------------------------------------------- */
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 4db365b7307..663d7f2586e 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -38,36 +38,36 @@ extern "C" {
 #endif
 
 struct ARegion;
-struct bScreen;
 struct CacheFile;
+struct EditBone;
+struct ID;
+struct Image;
 struct ListBase;
 struct Main;
 struct Object;
 struct PointerRNA;
+struct RegionView3D;
 struct ReportList;
 struct Scene;
 struct ScrArea;
+struct SpaceClip;
+struct SpaceImage;
 struct SpaceLink;
-struct View3D;
-struct RegionView3D;
+struct SpaceText;
 struct StructRNA;
-struct ToolSettings;
-struct Image;
 struct Text;
-struct EditBone;
-struct bPoseChannel;
-struct bGPdata;
-struct bGPDlayer;
+struct ToolSettings;
+struct View3D;
+struct bGPDbrush;
 struct bGPDframe;
+struct bGPDlayer;
 struct bGPDpalette;
 struct bGPDpalettecolor;
-struct bGPDbrush;
+struct bGPdata;
+struct bPoseChannel;
+struct bScreen;
 struct wmWindow;
 struct wmWindowManager;
-struct SpaceText;
-struct SpaceImage;
-struct SpaceClip;
-struct ID;
 
 /* Structs */
 
diff --git a/source/blender/blenkernel/BKE_crazyspace.h b/source/blender/blenkernel/BKE_crazyspace.h
index ee6c5c57678..fd632e1245b 100644
--- a/source/blender/blenkernel/BKE_crazyspace.h
+++ b/source/blender/blenkernel/BKE_crazyspace.h
@@ -34,10 +34,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-struct Scene;
-struct Object;
 struct BMEditMesh;
 struct Mesh;
+struct Object;
+struct Scene;
 
 /* crazyspace.c */
 float (*BKE_crazyspace_get_mapped_editverts(
diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h
index 5b7e5f9eebb..c9fba34d0cf 100644
--- a/source/blender/blenkernel/BKE_curve.h
+++ b/source/blender/blenkernel/BKE_curve.h
@@ -41,8 +41,8 @@ struct ListBase;
 struct Main;
 struct Nurb;
 struct Object;
-struct Scene;
 struct Path;
+struct Scene;
 struct TextBox;
 struct rctf;
 
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index e75997cd394..a1fb5545544 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -44,8 +44,8 @@ extern "C" {
 #include "DNA_customdata_types.h"
 
 struct BMesh;
-struct ID;
 struct CustomData;
+struct ID;
 typedef uint64_t CustomDataMask;
 
 /*a data type large enough to hold 1 element from any customdata layer type*/
@@ -404,8 +404,8 @@ void CustomData_external_reload(struct CustomData *data,
 
 /* Mesh-to-mesh transfer data. */
 
-struct MeshPairRemap;
 struct CustomDataTransferLayerMap;
+struct MeshPairRemap;
 
 typedef void (*cd_datatransfer_interp)(
         const struct CustomDataTransferLayerMap *laymap, void *dest,
diff --git a/source/blender/blenkernel/BKE_data_transfer.h b/source/blender/blenkernel/BKE_data_transfer.h
index 2ee9d8d2408..be1711967ae 100644
--- a/source/blender/blenkernel/BKE_data_transfer.h
+++ b/source/blender/blenkernel/BKE_data_transfer.h
@@ -39,9 +39,9 @@ extern "C" {
 #include "BKE_customdata.h"
 
 struct Object;
+struct ReportList;
 struct Scene;
 struct SpaceTransform;
-struct ReportList;
 
 /* Warning, those def are stored in files (TransferData modifier), *DO NOT* modify those values. */
 enum {
diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h
index a20c5a4240c..993485d47b3 100644
--- a/source/blender/blenkernel/BKE_deform.h
+++ b/source/blender/blenkernel/BKE_deform.h
@@ -35,13 +35,13 @@
  *  \brief support for deformation groups and hooks.
  */
 
-struct Object;
 struct ListBase;
-struct bDeformGroup;
 struct MDeformVert;
 struct MEdge;
 struct MLoop;
 struct MPoly;
+struct Object;
+struct bDeformGroup;
 
 struct bDeformGroup *BKE_defgroup_new(struct Object *ob, const char *name);
 void                 defgroup_copy_list(struct ListBase *lb1, const struct ListBase *lb2);
diff --git a/source/blender/blenkernel/BKE_editmesh.h b/source/blender/blenkernel/BKE_editmesh.h
index 2cae86d4c3b..940b6da0269 100644
--- a/source/blender/blenkernel/BKE_editmesh.h
+++ b/source/blender/blenkernel/BKE_editmesh.h
@@ -34,12 +34,12 @@
 #include "BKE_customdata.h"
 #include "bmesh.h"
 
-struct BMesh;
 struct BMLoop;
-struct Mesh;
-struct Scene;
+struct BMesh;
 struct DerivedMesh;
+struct Mesh;
 struct MeshStatVis;
+struct Scene;
 
 /**
  * This structure is used for mesh edit-mode.
diff --git a/source/blender/blenkernel/BKE_editmesh_bvh.h b/source/blender/blenkernel/BKE_editmesh_bvh.h
index fe21eba429a..1d9f88d2ece 100644
--- a/source/blender/blenkernel/BKE_editmesh_bvh.h
+++ b/source/blender/blenkernel/BKE_editmesh_bvh.h
@@ -32,12 +32,12 @@
 #ifndef __BKE_EDITMESH_BVH_H__
 #define __BKE_EDITMESH_BVH_H__
 
+struct BMBVHTree;
 struct BMEditMesh;
-struct BMesh;
 struct BMFace;
-struct BMVert;
 struct BMLoop;
-struct BMBVHTree;
+struct BMVert;
+struct BMesh;
 struct BVHTree;
 
 typedef struct BMBVHTree BMBVHTree;
diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h
index f12c55e762c..06971a68187 100644
--- a/source/blender/blenkernel/BKE_effect.h
+++ b/source/blender/blenkernel/BKE_effect.h
@@ -37,13 +37,13 @@
 
 #include "BLI_utildefines.h"
 
-struct Object;
-struct Scene;
-struct ListBase;
 struct Group;
-struct ParticleSimulationData;
+struct ListBase;
+struct Object;
 struct ParticleData;
 struct ParticleKey;
+struct ParticleSimulationData;
+struct Scene;
 
 struct EffectorWeights *BKE_effector_add_weights(struct Group *group);
 
diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.h
index 99648f61584..6d9af30087d 100644
--- a/source/blender/blenkernel/BKE_fcurve.h
+++ b/source/blender/blenkernel/BKE_fcurve.h
@@ -36,21 +36,21 @@
 extern "C" {
 #endif
 
-struct FCurve;
-struct FModifier;
 struct ChannelDriver;
-struct DriverVar;
 struct DriverTarget;
+struct DriverVar;
 struct FCM_EnvelopeData;
+struct FCurve;
+struct FModifier;
 
-struct bContext;
 struct AnimData;
-struct bAction;
 struct BezTriple;
-struct StructRNA;
 struct PathResolvedRNA;
 struct PointerRNA;
 struct PropertyRNA;
+struct StructRNA;
+struct bAction;
+struct bContext;
 
 #include "DNA_curve_types.h"
 
diff --git a/source/blender/blenkernel/BKE_fluidsim.h b/source/blender/blenkernel/BKE_fluidsim.h
index af5b146906a..6d6965156de 100644
--- a/source/blender/blenkernel/BKE_fluidsim.h
+++ b/source/blender/blenkernel/BKE_fluidsim.h
@@ -32,10 +32,10 @@
  *  \ingroup bke
  */
 
-struct Object;
-struct Scene;
 struct FluidsimSettings;
 struct MVert;
+struct Object;
+struct Scene;
 
 /* old interface */
 
diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_font.h
index 3f6d67f5ded..8be4b175637 100644
--- a/source/blender/blenkernel/BKE_font.h
+++ b/source/blender/blenkernel/BKE_font.h
@@ -37,11 +37,11 @@ extern "C" {
 
 #include <wchar.h>
 
-struct VFont;
-struct Object;
-struct Curve;
 struct CharInfo;
+struct Curve;
 struct Main;
+struct Object;
+struct VFont;
 
 struct CharTrans {
 	float xof, yof;
diff --git a/source/blender/blenkernel/BKE_freestyle.h b/source/blender/blenkernel/BKE_freestyle.h
index ab527e9b393..a70112653e5 100644
--- a/source/blender/blenkernel/BKE_freestyle.h
+++ b/source/blender/blenkernel/BKE_freestyle.h
@@ -44,8 +44,8 @@ struct FreestyleModuleConfig;
 struct Main;
 
 /* RNA aliases */
-typedef struct FreestyleSettings FreestyleSettings;
 typedef struct FreestyleModuleSettings FreestyleModuleSettings;
+typedef struct FreestyleSettings FreestyleSettings;
 
 /* FreestyleConfig */
 void BKE_freestyle_config_init(FreestyleConfig *config);
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index 6758630252e..522207ba770 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -31,15 +31,15 @@
  *  \author Joshua Leung
  */
 
-struct ToolSettings;
 struct ListBase;
-struct bGPdata;
-struct bGPDlayer;
+struct Main;
+struct ToolSettings;
 struct bGPDframe;
-struct bGPDstroke;
+struct bGPDlayer;
 struct bGPDpalette;
 struct bGPDpalettecolor;
-struct Main;
+struct bGPDstroke;
+struct bGPdata;
 
 /* ------------ Grease-Pencil API ------------------ */
 
diff --git a/source/blender/blenkernel/BKE_icons.h b/source/blender/blenkernel/BKE_icons.h
index 686dba21283..42809ed0a97 100644
--- a/source/blender/blenkernel/BKE_icons.h
+++ b/source/blender/blenkernel/BKE_icons.h
@@ -46,8 +46,8 @@ struct Icon {
 
 typedef struct Icon Icon;
 
-struct PreviewImage;
 struct ID;
+struct PreviewImage;
 
 enum eIconSizes;
 
diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h
index 48a00462dd1..3e8b63b3921 100644
--- a/source/blender/blenkernel/BKE_idprop.h
+++ b/source/blender/blenkernel/BKE_idprop.h
@@ -32,8 +32,8 @@
 
 #include "BLI_compiler_attrs.h"
 
-struct IDProperty;
 struct ID;
+struct IDProperty;
 
 typedef union IDPropertyTemplate {
 	int i;
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index e2c88798bea..9330a26a60d 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -37,18 +37,18 @@
 extern "C" {
 #endif
 
-struct Image;
 struct ImBuf;
-struct ImbFormatOptions;
-struct anim;
-struct Scene;
-struct Object;
+struct Image;
 struct ImageFormatData;
 struct ImagePool;
+struct ImbFormatOptions;
 struct Main;
-struct ReportList;
+struct Object;
 struct RenderResult;
+struct ReportList;
+struct Scene;
 struct StampData;
+struct anim;
 
 #define IMA_MAX_SPACE       64
 
diff --git a/source/blender/blenkernel/BKE_ipo.h b/source/blender/blenkernel/BKE_ipo.h
index 2370908332d..65228835d1d 100644
--- a/source/blender/blenkernel/BKE_ipo.h
+++ b/source/blender/blenkernel/BKE_ipo.h
@@ -38,8 +38,8 @@
 extern "C" {
 #endif
 
-struct Main;
 struct Ipo;
+struct Main;
 
 void do_versions_ipos_to_animato(struct Main *main);
 
diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h
index 2f953e57d71..4f42c70a38e 100644
--- a/source/blender/blenkernel/BKE_key.h
+++ b/source/blender/blenkernel/BKE_key.h
@@ -32,15 +32,15 @@
  *  \since March 2001
  *  \author nzc
  */
+struct Curve;
+struct ID;
 struct Key;
 struct KeyBlock;
-struct ID;
-struct ListBase;
-struct Curve;
-struct Object;
 struct Lattice;
+struct ListBase;
 struct Main;
 struct Mesh;
+struct Object;
 struct WeightsArrayCache;
 
 /* Kernel prototypes */
diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h
index f7d006785d2..f72d67125e0 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -36,13 +36,13 @@
 
 #include "BLI_compiler_attrs.h"
 
+struct BPoint;
+struct DerivedMesh;
 struct Lattice;
+struct MDeformVert;
 struct Main;
 struct Object;
 struct Scene;
-struct DerivedMesh;
-struct BPoint;
-struct MDeformVert;
 
 void BKE_lattice_resize(struct Lattice *lt, int u, int v, int w, struct Object *ltOb);
 void BKE_lattice_init(struct Lattice *lt);
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h
index 2ab9ac3ee58..1852fcced1a 100644
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@ -40,15 +40,15 @@ extern "C" {
 
 struct BlendThumbnail;
 struct GHash;
-struct ListBase;
 struct ID;
 struct ImBuf;
-struct Main;
 struct Library;
-struct wmWindowManager;
-struct bContext;
+struct ListBase;
+struct Main;
 struct PointerRNA;
 struct PropertyRNA;
+struct bContext;
+struct wmWindowManager;
 
 size_t BKE_libblock_get_alloc_info(short type, const char **name);
 void *BKE_libblock_alloc_notest(short type) ATTR_WARN_UNUSED_RESULT;
diff --git a/source/blender/blenkernel/BKE_library_idmap.h b/source/blender/blenkernel/BKE_library_idmap.h
index 971586ea8b7..57b7d444c3c 100644
--- a/source/blender/blenkernel/BKE_library_idmap.h
+++ b/source/blender/blenkernel/BKE_library_idmap.h
@@ -27,8 +27,8 @@
 #include "BLI_compiler_attrs.h"
 
 struct ID;
-struct Main;
 struct IDNameLib_Map;
+struct Main;
 
 struct IDNameLib_Map *BKE_main_idmap_create(
         struct Main *bmain)
diff --git a/source/blender/blenkernel/BKE_linestyle.h b/source/blender/blenkernel/BKE_linestyle.h
index 3ba4fbe0338..2b7b3c0584d 100644
--- a/source/blender/blenkernel/BKE_linestyle.h
+++ b/source/blender/blenkernel/BKE_linestyle.h
@@ -44,9 +44,9 @@ extern "C" {
 #define LS_MODIFIER_TYPE_THICKNESS  3
 #define LS_MODIFIER_TYPE_GEOMETRY   4
 
+struct ColorBand;
 struct Main;
 struct Object;
-struct ColorBand;
 struct bContext;
 
 void BKE_linestyle_init(struct FreestyleLineStyle *linestyle);
diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h
index e224155726f..2871875c87c 100644
--- a/source/blender/blenkernel/BKE_main.h
+++ b/source/blender/blenkernel/BKE_main.h
@@ -48,11 +48,11 @@
 extern "C" {
 #endif
 
+struct BLI_mempool;
 struct EvaluationContext;
+struct GHash;
 struct Library;
 struct MainLock;
-struct GHash;
-struct BLI_mempool;
 
 /* Blender thumbnail, as written on file (width, height, and data as char RGBA). */
 /* We pack pixel data after that struct. */
diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h
index 73d8394f2a0..b0a465e721e 100644
--- a/source/blender/blenkernel/BKE_mask.h
+++ b/source/blender/blenkernel/BKE_mask.h
@@ -33,14 +33,14 @@
  */
 
 struct EvaluationContext;
-struct ImageUser;
 struct Image;
+struct ImageUser;
 struct ListBase;
 struct Main;
 struct Mask;
-struct MaskParent;
 struct MaskLayer;
 struct MaskLayerShape;
+struct MaskParent;
 struct MaskSpline;
 struct MaskSplinePoint;
 struct MaskSplinePointUW;
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h
index b5d2323c59a..0211caaf3ee 100644
--- a/source/blender/blenkernel/BKE_material.h
+++ b/source/blender/blenkernel/BKE_material.h
@@ -36,9 +36,9 @@
 extern "C" {
 #endif
 
+struct ID;
 struct Main;
 struct Material;
-struct ID;
 struct Object;
 struct Scene;
 
diff --git a/source/blender/blenkernel/BKE_mball.h b/source/blender/blenkernel/BKE_mball.h
index 87bc7b2dfc5..1c48062b488 100644
--- a/source/blender/blenkernel/BKE_mball.h
+++ b/source/blender/blenkernel/BKE_mball.h
@@ -35,9 +35,9 @@
 struct EvaluationContext;
 struct Main;
 struct MetaBall;
+struct MetaElem;
 struct Object;
 struct Scene;
-struct MetaElem;
 
 void BKE_mball_free(struct MetaBall *mb);
 void BKE_mball_init(struct MetaBall *mb);
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 6d2a431f667..2fb0da672eb 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -31,31 +31,31 @@
  *  \ingroup bke
  */
 
-struct ID;
+struct BLI_Stack;
+struct BMesh;
 struct BMeshCreateParams;
 struct BoundBox;
+struct CustomData;
+struct DerivedMesh;
 struct EdgeHash;
-struct ListBase;
+struct ID;
 struct LinkNode;
-struct BLI_Stack;
-struct MemArena;
-struct BMesh;
+struct ListBase;
+struct MDeformVert;
+struct MDisps;
+struct MEdge;
+struct MFace;
+struct MLoop;
 struct MLoopTri;
-struct Main;
-struct Mesh;
+struct MLoopUV;
 struct MPoly;
-struct MLoop;
-struct MFace;
-struct MEdge;
 struct MVert;
-struct MDeformVert;
-struct MDisps;
+struct Main;
+struct MemArena;
+struct Mesh;
 struct Object;
-struct CustomData;
-struct DerivedMesh;
-struct Scene;
-struct MLoopUV;
 struct ReportList;
+struct Scene;
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/blenkernel/BKE_mesh_mapping.h b/source/blender/blenkernel/BKE_mesh_mapping.h
index 1005a50a214..e356b36f7c1 100644
--- a/source/blender/blenkernel/BKE_mesh_mapping.h
+++ b/source/blender/blenkernel/BKE_mesh_mapping.h
@@ -31,12 +31,12 @@
  *  \ingroup bke
  */
 
-struct MVert;
 struct MEdge;
-struct MPoly;
 struct MLoop;
-struct MLoopUV;
 struct MLoopTri;
+struct MLoopUV;
+struct MPoly;
+struct MVert;
 
 /* map from uv vertex to face (for select linked, stitch, uv suburf) */
 
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 2d39ac4d102..f4bcebebef7 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -32,18 +32,18 @@
 #include "BLI_compiler_attrs.h"
 #include "BKE_customdata.h"
 
-struct ID;
-struct DerivedMesh;
+struct BMEditMesh;
 struct DagForest;
 struct DagNode;
-struct Object;
-struct Scene;
+struct DepsNodeHandle;
+struct DerivedMesh;
+struct ID;
 struct ListBase;
-struct bArmature;
 struct Main;
 struct ModifierData;
-struct BMEditMesh;
-struct DepsNodeHandle;
+struct Object;
+struct Scene;
+struct bArmature;
 
 typedef enum {
 	/* Should not be used, only for None modifier type */
diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h
index 3b58f327b63..86c6740c135 100644
--- a/source/blender/blenkernel/BKE_multires.h
+++ b/source/blender/blenkernel/BKE_multires.h
@@ -43,9 +43,9 @@ struct Object;
 struct Scene;
 
 struct MLoop;
-struct MVert;
-struct MPoly;
 struct MLoopTri;
+struct MPoly;
+struct MVert;
 
 /* Delete mesh mdisps and grid paint masks */
 void multires_customdata_delete(struct Mesh *me);
diff --git a/source/blender/blenkernel/BKE_nla.h b/source/blender/blenkernel/BKE_nla.h
index 37929bae042..ee350ef5a7c 100644
--- a/source/blender/blenkernel/BKE_nla.h
+++ b/source/blender/blenkernel/BKE_nla.h
@@ -37,9 +37,9 @@ struct AnimData;
 struct Main;
 struct NlaStrip;
 struct NlaTrack;
-struct bAction;
 struct Scene;
 struct Speaker;
+struct bAction;
 
 struct PointerRNA;
 struct PropertyRNA;
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 3d78b95001d..6804b882a19 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -51,34 +51,34 @@
 /* not very important, but the stack solver likes to know a maximum */
 #define MAX_SOCKET	512
 
-struct bContext;
-struct bNode;
-struct bNodeLink;
-struct bNodeSocket;
-struct bNodeStack;
-struct bNodeTree;
-struct bNodeTreeType;
-struct bNodeTreeExec;
-struct bNodeExecContext;
-struct bNodeExecData;
+struct ARegion;
+struct ColorManagedDisplaySettings;
+struct ColorManagedViewSettings;
 struct GPUMaterial;
 struct GPUNodeStack;
 struct ID;
 struct ImBuf;
 struct ImageFormatData;
 struct ListBase;
-struct Main;
-struct uiLayout;
 struct MTex;
+struct Main;
 struct PointerRNA;
 struct RenderData;
 struct Scene;
-struct Tex;
 struct SpaceNode;
-struct ARegion;
-struct ColorManagedViewSettings;
-struct ColorManagedDisplaySettings;
+struct Tex;
+struct bContext;
+struct bNode;
+struct bNodeExecContext;
+struct bNodeExecData;
 struct bNodeInstanceHash;
+struct bNodeLink;
+struct bNodeSocket;
+struct bNodeStack;
+struct bNodeTree;
+struct bNodeTreeExec;
+struct bNodeTreeType;
+struct uiLayout;
 
 /* -------------------------------------------------------------------- */
 /** \name Node Type Definitions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 677d6b3fba2..b573f8e5807 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -36,18 +36,18 @@ extern "C" {
 #include "BLI_compiler_attrs.h"
 
 struct Base;
-struct EvaluationContext;
-struct Scene;
-struct Object;
 struct BoundBox;
-struct View3D;
-struct SoftBody;
 struct BulletSoftBody;
-struct MovieClip;
-struct Main;
-struct RigidBodyWorld;
+struct EvaluationContext;
 struct HookModifierData;
+struct Main;
 struct ModifierData;
+struct MovieClip;
+struct Object;
+struct RigidBodyWorld;
+struct Scene;
+struct SoftBody;
+struct View3D;
 
 void BKE_object_workob_clear(struct Object *workob);
 void BKE_object_workob_calc_parent(struct Scene *scene, struct Object *ob, struct Object *workob);
diff --git a/source/blender/blenkernel/BKE_object_deform.h b/source/blender/blenkernel/BKE_object_deform.h
index ab54330cf53..cc3c72c0b7c 100644
--- a/source/blender/blenkernel/BKE_object_deform.h
+++ b/source/blender/blenkernel/BKE_object_deform.h
@@ -33,9 +33,9 @@
 extern "C" {
 #endif
 
-struct Object;
 struct ID;
 struct MDeformVert;
+struct Object;
 struct bDeformGroup;
 
 /* General vgroup operations */
diff --git a/source/blender/blenkernel/BKE_outliner_treehash.h b/source/blender/blenkernel/BKE_outliner_treehash.h
index 454edb40c4e..b68fb90efb2 100644
--- a/source/blender/blenkernel/BKE_outliner_treehash.h
+++ b/source/blender/blenkernel/BKE_outliner_treehash.h
@@ -26,8 +26,8 @@
  *  \ingroup bke
  */
 
-struct ID;
 struct BLI_mempool;
+struct ID;
 struct TreeStoreElem;
 
 /* create and fill hashtable with treestore elements */
diff --git a/source/blender/blenkernel/BKE_packedFile.h b/source/blender/blenkernel/BKE_packedFile.h
index 1056c5d2119..bdddd940fe0 100644
--- a/source/blender/blenkernel/BKE_packedFile.h
+++ b/source/blender/blenkernel/BKE_packedFile.h
@@ -36,12 +36,12 @@
 #define RET_ERROR   1
 
 struct ID;
-struct bSound;
 struct Image;
 struct Main;
 struct PackedFile;
 struct ReportList;
 struct VFont;
+struct bSound;
 
 /* pack */
 struct PackedFile *dupPackedFile(const struct PackedFile *pf_src);
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index a8a5aa5274d..220b1cf8ba4 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -32,31 +32,31 @@
  *  \ingroup bke
  */
 
-struct bContext;
-struct BMesh;
 struct BMFace;
+struct BMesh;
 struct Brush;
 struct CurveMapping;
-struct MeshElemMap;
 struct GridPaintMask;
-struct Main;
+struct ImagePool;
+struct MFace;
 struct MLoop;
 struct MLoopTri;
-struct MFace;
 struct MVert;
+struct Main;
+struct MeshElemMap;
 struct Object;
+struct PBVH;
 struct Paint;
 struct PaintCurve;
 struct Palette;
 struct PaletteColor;
-struct PBVH;
 struct ReportList;
 struct Scene;
 struct Sculpt;
 struct StrokeCache;
 struct Tex;
-struct ImagePool;
 struct UnifiedPaintSettings;
+struct bContext;
 
 enum eOverlayFlags;
 
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index 54c927aaa99..896db8785bb 100644
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -41,27 +41,27 @@
 
 #include "BKE_customdata.h"
 
-struct ParticleSystemModifierData;
-struct ParticleSystem;
 struct ParticleKey;
 struct ParticleSettings;
+struct ParticleSystem;
+struct ParticleSystemModifierData;
 
-struct Main;
-struct Object;
-struct Scene;
+struct BVHTreeRay;
+struct BVHTreeRayHit;
 struct DerivedMesh;
-struct ModifierData;
-struct MTFace;
+struct EdgeHash;
+struct KDTree;
+struct LatticeDeformData;
+struct LinkNode;
 struct MCol;
 struct MFace;
+struct MTFace;
 struct MVert;
-struct LatticeDeformData;
-struct LinkNode;
-struct KDTree;
+struct Main;
+struct ModifierData;
+struct Object;
 struct RNG;
-struct BVHTreeRay;
-struct BVHTreeRayHit;
-struct EdgeHash;
+struct Scene;
 
 #define PARTICLE_COLLISION_MAX_COLLISIONS 10
 
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 1fede116193..98dafe42e5d 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -30,19 +30,19 @@
 #include "BLI_ghash.h"
 #include "BLI_utildefines.h"
 
+struct BMLog;
+struct BMesh;
+struct CCGDerivedMesh;
 struct CCGElem;
 struct CCGKey;
-struct CCGDerivedMesh;
 struct CustomData;
 struct DMFlagMat;
-struct MPoly;
 struct MLoop;
 struct MLoopTri;
+struct MPoly;
 struct MVert;
 struct PBVH;
 struct PBVHNode;
-struct BMesh;
-struct BMLog;
 
 typedef struct PBVH PBVH;
 typedef struct PBVHNode PBVHNode;
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h
index e905a5efae4..a3125bee472 100644
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@@ -89,10 +89,10 @@ struct Object;
 struct ParticleKey;
 struct ParticleSystem;
 struct PointCache;
+struct RigidBodyWorld;
 struct Scene;
 struct SmokeModifierData;
 struct SoftBody;
-struct RigidBodyWorld;
 
 struct OpenVDBReader;
 struct OpenVDBWriter;
diff --git a/source/blender/blenkernel/BKE_property.h b/source/blender/blenkernel/BKE_property.h
index d917a6b55e6..c49316c75ab 100644
--- a/source/blender/blenkernel/BKE_property.h
+++ b/source/blender/blenkernel/BKE_property.h
@@ -31,9 +31,9 @@
  *  \ingroup bke
  */
 
-struct bProperty;
 struct ListBase;
 struct Object;
+struct bProperty;
 
 void              BKE_bproperty_free(struct bProperty *prop);
 void              BKE_bproperty_free_list(struct ListBase *lb);
diff --git a/source/blender/blenkernel/BKE_rigidbody.h b/source/blender/blenkernel/BKE_rigidbody.h
index 470aae40df9..2d91754ff44 100644
--- a/source/blender/blenkernel/BKE_rigidbody.h
+++ b/source/blender/blenkernel/BKE_rigidbody.h
@@ -34,11 +34,11 @@
 #ifndef __BKE_RIGIDBODY_H__
 #define __BKE_RIGIDBODY_H__
 
-struct RigidBodyWorld;
 struct RigidBodyOb;
+struct RigidBodyWorld;
 
-struct Scene;
 struct Object;
+struct Scene;
 
 /* -------------- */
 /* Memory Management */
diff --git a/source/blender/blenkernel/BKE_sca.h b/source/blender/blenkernel/BKE_sca.h
index 653fc1afa64..e02458e6fb3 100644
--- a/source/blender/blenkernel/BKE_sca.h
+++ b/source/blender/blenkernel/BKE_sca.h
@@ -33,9 +33,9 @@
 
 struct Main;
 struct Object;
-struct bSensor;
-struct bController;
 struct bActuator;
+struct bController;
+struct bSensor;
 
 void link_logicbricks(void **poin, void ***ppoin, short *tot, short size);
 void unlink_logicbricks(void **poin, void ***ppoin, short *tot);
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index e85867fcbe7..72b0ec862ec 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -41,12 +41,12 @@ struct AviCodecData;
 struct Base;
 struct EvaluationContext;
 struct Main;
+struct Main;
 struct Object;
 struct RenderData;
-struct SceneRenderLayer;
 struct Scene;
+struct SceneRenderLayer;
 struct UnitSettings;
-struct Main;
 
 #define SCE_COPY_NEW        0
 #define SCE_COPY_EMPTY      1
diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h
index b33b9e455f1..d7ba319e30c 100644
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@ -34,6 +34,7 @@
  */
 
 struct ARegion;
+struct GPUFXSettings;
 struct Header;
 struct ID;
 struct ListBase;
@@ -52,7 +53,6 @@ struct wmKeyConfig;
 struct wmNotifier;
 struct wmWindow;
 struct wmWindowManager;
-struct GPUFXSettings;
 
 #include "BLI_compiler_attrs.h"
 
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h
index 81f9bbebe7d..ef1c7957375 100644
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@ -30,13 +30,11 @@
  *  \ingroup bke
  */
 
-struct bContext;
-struct EvaluationContext;
-struct StripColorBalance;
 struct Editing;
-struct GSet;
-struct GPUOffScreen;
+struct EvaluationContext;
 struct GPUFX;
+struct GPUOffScreen;
+struct GSet;
 struct ImBuf;
 struct Main;
 struct Mask;
@@ -44,8 +42,10 @@ struct Scene;
 struct Sequence;
 struct SequenceModifierData;
 struct Stereo3dFormat;
+struct StripColorBalance;
 struct StripElem;
 struct TextVars;
+struct bContext;
 struct bSound;
 
 struct SeqIndexBuildContext;
diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h
index 2dd42a9da1f..0e7fd39d473 100644
--- a/source/blender/blenkernel/BKE_shrinkwrap.h
+++ b/source/blender/blenkernel/BKE_shrinkwrap.h
@@ -46,13 +46,13 @@
  * (So that you don't have to pass an enormous amount of arguments to functions)
  */
 
-struct Object;
+struct BVHTree;
 struct DerivedMesh;
-struct MVert;
 struct MDeformVert;
-struct ShrinkwrapModifierData;
 struct MDeformVert;
-struct BVHTree;
+struct MVert;
+struct Object;
+struct ShrinkwrapModifierData;
 struct SpaceTransform;
 
 
diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h
index 6f8274fabc8..ae55a156e3e 100644
--- a/source/blender/blenkernel/BKE_sound.h
+++ b/source/blender/blenkernel/BKE_sound.h
@@ -39,9 +39,9 @@
 #  include AUD_DEVICE_H
 #endif
 
-struct bSound;
 struct Main;
 struct Sequence;
+struct bSound;
 
 typedef struct SoundWaveform {
 	int length;
diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h
index f6b5140c9d9..2312f69a9dd 100644
--- a/source/blender/blenkernel/BKE_subsurf.h
+++ b/source/blender/blenkernel/BKE_subsurf.h
@@ -37,21 +37,21 @@
 /* Thread sync primitives used directly.  */
 #include "BLI_threads.h"
 
+struct CCGEdge;
 struct CCGElem;
+struct CCGFace;
+struct CCGVert;
 struct DMFlagMat;
 struct DMGridAdjacency;
 struct DerivedMesh;
-struct MeshElemMap;
-struct Mesh;
+struct EdgeHash;
 struct MPoly;
+struct Mesh;
+struct MeshElemMap;
 struct Object;
 struct PBVH;
-struct SubsurfModifierData;
-struct CCGEdge;
-struct CCGFace;
-struct CCGVert;
-struct EdgeHash;
 struct PBVH;
+struct SubsurfModifierData;
 
 /**************************** External *****************************/
 
diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h
index 7ffa22ac49b..48dcbc160f6 100644
--- a/source/blender/blenkernel/BKE_texture.h
+++ b/source/blender/blenkernel/BKE_texture.h
@@ -37,16 +37,15 @@
 extern "C" {
 #endif
 
-struct bNode;
 struct Brush;
 struct ColorBand;
 struct EnvMap;
 struct FreestyleLineStyle;
 struct ImagePool;
 struct Lamp;
+struct MTex;
 struct Main;
 struct Material;
-struct MTex;
 struct OceanTex;
 struct ParticleSettings;
 struct PointDensity;
@@ -55,6 +54,7 @@ struct TexMapping;
 struct TexResult;
 struct VoxelData;
 struct World;
+struct bNode;
 
 /*  in ColorBand struct */
 #define MAXCOLORBAND 32
diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h
index 13302caa09d..b3d86a5993e 100644
--- a/source/blender/blenkernel/BKE_tracking.h
+++ b/source/blender/blenkernel/BKE_tracking.h
@@ -32,21 +32,21 @@
  *  \author Sergey Sharybin
  */
 
-struct bGPDlayer;
+struct Camera;
 struct ImBuf;
 struct ListBase;
+struct MovieClipUser;
+struct MovieDistortion;
 struct MovieReconstructContext;
-struct MovieTrackingTrack;
-struct MovieTrackingMarker;
-struct MovieTrackingPlaneTrack;
-struct MovieTrackingPlaneMarker;
 struct MovieTracking;
+struct MovieTrackingMarker;
 struct MovieTrackingObject;
-struct MovieClipUser;
-struct MovieDistortion;
-struct Camera;
+struct MovieTrackingPlaneMarker;
+struct MovieTrackingPlaneTrack;
+struct MovieTrackingTrack;
 struct Object;
 struct Scene;
+struct bGPDlayer;
 struct rcti;
 
 /* **** Common functions **** */
diff --git a/source/blender/blenkernel/depsgraph_private.h b/source/blender/blenkernel/depsgraph_private.h
index 72f4e2524a4..7092f237f72 100644
--- a/source/blender/blenkernel/depsgraph_private.h
+++ b/source/blender/blenkernel/depsgraph_private.h
@@ -34,10 +34,10 @@
 #include "DNA_constraint_types.h"
 #include "BKE_constraint.h"
 
-struct Scene;
-struct Group;
 struct EffectorWeights;
+struct Group;
 struct ModifierData;
+struct Scene;
 
 /* **** DAG relation types *** */
 
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.h b/source/blender/blenkernel/intern/CCGSubSurf.h
index 8cdbd2a7a98..8accec4c7ef 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf.h
+++ b/source/blender/blenkernel/intern/CCGSubSurf.h
@@ -30,10 +30,10 @@ typedef void* CCGVertHDL;
 typedef void* CCGEdgeHDL;
 typedef void* CCGFaceHDL;
 
-typedef struct CCGSubSurf CCGSubSurf;
-typedef struct CCGVert CCGVert;
 typedef struct CCGEdge CCGEdge;
 typedef struct CCGFace CCGFace;
+typedef struct CCGSubSurf CCGSubSurf;
+typedef struct CCGVert CCGVert;
 
 typedef struct CCGMeshIFC {
 	int			vertUserSize, edgeUserSize, faceUserSize;
@@ -176,9 +176,9 @@ int			ccgSubSurf_getNumFinalFaces		(const CCGSubSurf *ss);
 
 /***/
 
-typedef struct _EHashIterator CCGVertIterator;
 typedef struct _EHashIterator CCGEdgeIterator;
 typedef struct _EHashIterator CCGFaceIterator;
+typedef struct _EHashIterator CCGVertIterator;
 
 void		ccgSubSurf_initVertIterator(CCGSubSurf *ss, CCGVertIterator *viter);
 void		ccgSubSurf_initEdgeIterator(CCGSubSurf *ss, CCGEdgeIterator *eiter);
diff --git a/source/blender/blenkernel/intern/data_transfer_intern.h b/source/blender/blenkernel/intern/data_transfer_intern.h
index 1a543a1deb5..ee1d63a1d90 100644
--- a/source/blender/blenkernel/intern/data_transfer_intern.h
+++ b/source/blender/blenkernel/intern/data_transfer_intern.h
@@ -33,8 +33,8 @@
 
 #include "BKE_customdata.h"  /* For cd_datatransfer_interp */
 
-struct CustomDataTransferLayerMap;
 struct CustomData;
+struct CustomDataTransferLayerMap;
 struct ListBase;
 
 float data_transfer_interp_float_do(
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 06474115cdf..ef4617069ea 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -103,9 +103,9 @@
 
 static ThreadMutex object_update_lock = BLI_MUTEX_INITIALIZER;
 
+struct DerivedMesh;
 struct Object;
 struct Scene;
-struct DerivedMesh;
 struct SmokeModifierData;
 
 // timestep default value for nice appearance 0.1f
diff --git a/source/blender/blenlib/BLI_array_store.h b/source/blender/blenlib/BLI_array_store.h
index f4cbc07bf26..c0c16b83466 100644
--- a/source/blender/blenlib/BLI_array_store.h
+++ b/source/blender/blenlib/BLI_array_store.h
@@ -26,8 +26,8 @@
  *  \brief Efficient in-memory storage of multiple similar arrays.
  */
 
-typedef struct BArrayStore BArrayStore;
 typedef struct BArrayState BArrayState;
+typedef struct BArrayStore BArrayStore;
 
 BArrayStore *BLI_array_store_create(
         unsigned int stride, unsigned int chunk_count);
diff --git a/source/blender/blenlib/BLI_callbacks.h b/source/blender/blenlib/BLI_callbacks.h
index 3db7d2d87f1..8b07dfe6599 100644
--- a/source/blender/blenlib/BLI_callbacks.h
+++ b/source/blender/blenlib/BLI_callbacks.h
@@ -25,8 +25,8 @@
 #ifndef __BLI_CALLBACKS_H__
 #define __BLI_CALLBACKS_H__
 
-struct Main;
 struct ID;
+struct Main;
 
 /**
  * Common suffix uses:
diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h
index 0b316d3c5bb..2e65b67eaa3 100644
--- a/source/blender/blenlib/BLI_graph.h
+++ b/source/blender/blenlib/BLI_graph.h
@@ -31,9 +31,9 @@
 
 #include "DNA_listBase.h"
 
+struct BArc;
 struct BGraph;
 struct BNode;
-struct BArc;
 
 struct RadialArc;
 
diff --git a/source/blender/blenlib/BLI_linklist.h b/source/blender/blenlib/BLI_linklist.h
index 214915163c7..bd1ce15beeb 100644
--- a/source/blender/blenlib/BLI_linklist.h
+++ b/source/blender/blenlib/BLI_linklist.h
@@ -34,8 +34,8 @@
 
 #include "BLI_compiler_attrs.h"
 
-struct MemArena;
 struct BLI_mempool;
+struct MemArena;
 
 typedef void (*LinkNodeFreeFP)(void *link);
 typedef void (*LinkNodeApplyFP)(void *link, void *userdata);
diff --git a/source/blender/blenlib/BLI_uvproject.h b/source/blender/blenlib/BLI_uvproject.h
index 516a9b8b237..2a61acc8b36 100644
--- a/source/blender/blenlib/BLI_uvproject.h
+++ b/source/blender/blenlib/BLI_uvproject.h
@@ -24,8 +24,8 @@
  *  \ingroup bli
  */
 
-struct ProjCameraInfo;
 struct Object;
+struct ProjCameraInfo;
 
 /* create uv info from the camera, needs to be freed */
 struct ProjCameraInfo *BLI_uvproject_camera_info(struct Object *ob, float rotmat[4][4], float winx, float winy);
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h
index 102e892c775..8dcaac3880b 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -36,8 +36,10 @@
 extern "C" {
 #endif
 
+struct BHead;
+struct BlendFileReadParams;
 struct BlendThumbnail;
-struct bScreen;
+struct FileData;
 struct LinkNode;
 struct Main;
 struct MemFile;
@@ -46,9 +48,7 @@ struct Scene;
 struct UserDef;
 struct View3D;
 struct bContext;
-struct BHead;
-struct FileData;
-struct BlendFileReadParams;
+struct bScreen;
 
 typedef struct BlendHandle BlendHandle;
 
diff --git a/source/blender/blenloader/BLO_writefile.h b/source/blender/blenloader/BLO_writefile.h
index f6d0be6f5f0..38b0479bb4c 100644
--- a/source/blender/blenloader/BLO_writefile.h
+++ b/source/blender/blenloader/BLO_writefile.h
@@ -34,8 +34,8 @@
  */
 
 struct BlendThumbnail;
-struct MemFile;
 struct Main;
+struct MemFile;
 struct ReportList;
 
 extern bool BLO_write_file(
diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h
index 66161d86f02..9e9906aab1b 100644
--- a/source/blender/blenloader/intern/readfile.h
+++ b/source/blender/blenloader/intern/readfile.h
@@ -36,13 +36,13 @@
 #include "zlib.h"
 #include "DNA_windowmanager_types.h"  /* for ReportType */
 
-struct OldNewMap;
+struct Key;
 struct MemFile;
-struct ReportList;
 struct Object;
+struct OldNewMap;
 struct PartEff;
+struct ReportList;
 struct View3D;
-struct Key;
 
 typedef struct FileData {
 	// linked list of BHeadN's
diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h
index 79fdfd910fa..a86162116e6 100644
--- a/source/blender/bmesh/bmesh_class.h
+++ b/source/blender/bmesh/bmesh_class.h
@@ -32,11 +32,11 @@
 /* dissable holes for now, these are ifdef'd because they use more memory and cant be saved in DNA currently */
 // #define USE_BMESH_HOLES
 
-struct BMesh;
-struct BMVert;
 struct BMEdge;
-struct BMLoop;
 struct BMFace;
+struct BMLoop;
+struct BMVert;
+struct BMesh;
 
 struct BLI_mempool;
 
diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.h b/source/blender/bmesh/intern/bmesh_edgeloop.h
index 68583562888..def2256a585 100644
--- a/source/blender/bmesh/intern/bmesh_edgeloop.h
+++ b/source/blender/bmesh/intern/bmesh_edgeloop.h
@@ -28,9 +28,9 @@
  *  \ingroup bmesh
  */
 
-struct ListBase;
 struct BMEdgeLoopStore;
 struct GSet;
+struct ListBase;
 
 /* multiple edgeloops (ListBase) */
 int                 BM_mesh_edgeloops_find(
diff --git a/source/blender/bmesh/intern/bmesh_operators_private.h b/source/blender/bmesh/intern/bmesh_operators_private.h
index 5548ee7c361..7b50f578361 100644
--- a/source/blender/bmesh/intern/bmesh_operators_private.h
+++ b/source/blender/bmesh/intern/bmesh_operators_private.h
@@ -27,8 +27,8 @@
  *  \ingroup bmesh
  */
 
-struct BMesh;
 struct BMOperator;
+struct BMesh;
 
 void bmo_automerge_exec(BMesh *bm, BMOperator *op);
 void bmo_average_vert_facedata_exec(BMesh *bm, BMOperator *op);
diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h
index 907c94855f7..d9c46077572 100644
--- a/source/blender/collada/collada.h
+++ b/source/blender/collada/collada.h
@@ -43,8 +43,8 @@ extern "C" {
 
 
 struct EvaluationContext;
-struct bContext;
 struct Scene;
+struct bContext;
 
 /*
  * both return 1 on success, 0 on error
diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
index 718e1cbddc4..b4a8d214c62 100644
--- a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
@@ -33,8 +33,8 @@ extern "C" {
 #define PASS_VECTOR_MAX 10000.0f
 
 /* Forward declarations */
-struct ZSpan;
 struct DrawBufPixel;
+struct ZSpan;
 void zbuf_accumulate_vecblur(
         NodeBlurData *nbd, int xsize, int ysize, float *newrect,
         const float *imgrect, float *vecbufrect, const float *zbufrect);
diff --git a/source/blender/depsgraph/DEG_depsgraph_build.h b/source/blender/depsgraph/DEG_depsgraph_build.h
index b268822f659..84b0ffa4476 100644
--- a/source/blender/depsgraph/DEG_depsgraph_build.h
+++ b/source/blender/depsgraph/DEG_depsgraph_build.h
@@ -40,12 +40,12 @@ struct Depsgraph;
 
 /* ------------------------------------------------ */
 
-struct Main;
-struct Scene;
-struct Group;
 struct EffectorWeights;
+struct Group;
+struct Main;
 struct ModifierData;
 struct Object;
+struct Scene;
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
index 5ecfbf2f692..a1502e9b138 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
@@ -35,37 +35,37 @@
 
 struct Base;
 struct CacheFile;
-struct bGPdata;
-struct ListBase;
+struct FCurve;
 struct GHash;
+struct Group;
 struct ID;
 struct Image;
-struct FCurve;
-struct Group;
 struct Key;
+struct ListBase;
+struct MTex;
 struct Main;
-struct Material;
 struct Mask;
-struct MTex;
+struct Material;
 struct MovieClip;
-struct bNodeTree;
 struct Object;
-struct bPoseChannel;
-struct bConstraint;
 struct Scene;
 struct Tex;
 struct World;
+struct bConstraint;
+struct bGPdata;
+struct bNodeTree;
+struct bPoseChannel;
 
 struct PropertyRNA;
 
 namespace DEG {
 
-struct Depsgraph;
+struct ComponentDepsNode;
 struct DepsNode;
+struct Depsgraph;
 struct IDDepsNode;
-struct TimeSourceDepsNode;
-struct ComponentDepsNode;
 struct OperationDepsNode;
+struct TimeSourceDepsNode;
 
 struct DepsgraphNodeBuilder {
 	DepsgraphNodeBuilder(Main *bmain, Depsgraph *graph);
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index 35e17cd0dc1..67db859a292 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -49,44 +49,44 @@
 #include "intern/nodes/deg_node_operation.h"
 
 struct Base;
-struct bGPdata;
 struct CacheFile;
-struct ListBase;
-struct GHash;
-struct ID;
+struct EffectorWeights;
 struct FCurve;
+struct GHash;
 struct Group;
+struct ID;
 struct Key;
+struct ListBase;
+struct MTex;
 struct Main;
 struct Mask;
 struct Material;
-struct MTex;
 struct ModifierData;
 struct MovieClip;
-struct bNodeTree;
 struct Object;
-struct bPoseChannel;
-struct bConstraint;
 struct ParticleSystem;
 struct Scene;
 struct Tex;
 struct World;
-struct EffectorWeights;
+struct bConstraint;
+struct bGPdata;
+struct bNodeTree;
+struct bPoseChannel;
 
 struct PropertyRNA;
 
 namespace DEG {
 
-struct Depsgraph;
+struct ComponentDepsNode;
 struct DepsNode;
 struct DepsNodeHandle;
 struct DepsRelation;
-struct RootDepsNode;
+struct Depsgraph;
 struct IDDepsNode;
-struct TimeSourceDepsNode;
-struct ComponentDepsNode;
 struct OperationDepsNode;
+struct RootDepsNode;
 struct RootPChanMap;
+struct TimeSourceDepsNode;
 
 struct TimeSourceKey
 {
diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.h
index dda4da7bc13..526aa90d505 100644
--- a/source/blender/depsgraph/intern/depsgraph.h
+++ b/source/blender/depsgraph/intern/depsgraph.h
@@ -40,19 +40,19 @@
 
 #include "intern/depsgraph_types.h"
 
-struct ID;
 struct GHash;
 struct GSet;
+struct ID;
 struct PointerRNA;
 struct PropertyRNA;
 
 namespace DEG {
 
+struct ComponentDepsNode;
 struct DepsNode;
-struct TimeSourceDepsNode;
 struct IDDepsNode;
-struct ComponentDepsNode;
 struct OperationDepsNode;
+struct TimeSourceDepsNode;
 
 /* *************************** */
 /* Relationships Between Nodes */
diff --git a/source/blender/depsgraph/intern/depsgraph_intern.h b/source/blender/depsgraph/intern/depsgraph_intern.h
index 89432e17f87..7e119ccc619 100644
--- a/source/blender/depsgraph/intern/depsgraph_intern.h
+++ b/source/blender/depsgraph/intern/depsgraph_intern.h
@@ -46,8 +46,8 @@ extern "C" {
 #include "intern/nodes/deg_node_operation.h"
 #include "intern/depsgraph.h"
 
-struct Main;
 struct Group;
+struct Main;
 struct Scene;
 
 namespace DEG {
diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h
index 0478d97cf6b..143884c1a29 100644
--- a/source/blender/depsgraph/intern/depsgraph_types.h
+++ b/source/blender/depsgraph/intern/depsgraph_types.h
@@ -45,12 +45,12 @@
 #include <vector>
 #include <algorithm>
 
-struct bAction;
 struct ChannelDriver;
-struct ModifierData;
-struct PointerRNA;
 struct EvaluationContext;
 struct FCurve;
+struct ModifierData;
+struct PointerRNA;
+struct bAction;
 
 namespace DEG {
 
diff --git a/source/blender/depsgraph/intern/nodes/deg_node.h b/source/blender/depsgraph/intern/nodes/deg_node.h
index 603a6be7ceb..b877f799ff8 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node.h
@@ -34,14 +34,14 @@
 
 #include "BLI_utildefines.h"
 
-struct ID;
 struct GHash;
+struct ID;
 struct Scene;
 
 namespace DEG {
 
-struct Depsgraph;
 struct DepsRelation;
+struct Depsgraph;
 struct OperationDepsNode;
 
 /* *********************************** */
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.h b/source/blender/depsgraph/intern/nodes/deg_node_component.h
index 985716deaac..821bd68501a 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.h
@@ -35,18 +35,18 @@
 #include "BLI_utildefines.h"
 #include "BLI_string.h"
 
+struct GHash;
 struct ID;
 struct bPoseChannel;
-struct GHash;
 
 struct EvaluationContext;
 
 namespace DEG {
 
-struct Depsgraph;
-struct OperationDepsNode;
 struct BoneComponentDepsNode;
+struct Depsgraph;
 struct IDDepsNode;
+struct OperationDepsNode;
 
 /* ID Component - Base type for all components */
 struct ComponentDepsNode : public DepsNode {
diff --git a/source/blender/editors/armature/BIF_generate.h b/source/blender/editors/armature/BIF_generate.h
index e229b0f342a..385c80fbb04 100644
--- a/source/blender/editors/armature/BIF_generate.h
+++ b/source/blender/editors/armature/BIF_generate.h
@@ -26,11 +26,11 @@
 #ifndef __BIF_GENERATE_H__
 #define __BIF_GENERATE_H__
 
-struct ToolSettings;
-struct EditBone;
 struct BArcIterator;
-struct bArmature;
+struct EditBone;
 struct ListBase;
+struct ToolSettings;
+struct bArmature;
 
 typedef int (NextSubdivisionFunc)(struct ToolSettings *, struct BArcIterator *, int, int, float[3], float[3]);
 
diff --git a/source/blender/editors/armature/BIF_retarget.h b/source/blender/editors/armature/BIF_retarget.h
index 2bd2b80190b..7e278757cc2 100644
--- a/source/blender/editors/armature/BIF_retarget.h
+++ b/source/blender/editors/armature/BIF_retarget.h
@@ -40,10 +40,10 @@ struct bContext;
 
 struct EditBone;
 
-struct RigGraph;
-struct RigNode;
 struct RigArc;
 struct RigEdge;
+struct RigGraph;
+struct RigNode;
 
 #define USE_THREADS
 
diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h
index 67b8b266269..6ab9504d06b 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 bd0d2888568..48912f53e11 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/armature/reeb.h b/source/blender/editors/armature/reeb.h
index 9eed343f18a..b6dc7613aad 100644
--- a/source/blender/editors/armature/reeb.h
+++ b/source/blender/editors/armature/reeb.h
@@ -34,8 +34,8 @@
 
 #include "BLI_graph.h"
 
-struct GHash;
 struct EdgeHash;
+struct GHash;
 struct ReebArc;
 struct ReebEdge;
 struct ReebNode;
@@ -141,8 +141,8 @@ typedef struct ReebArcIterator {
 } ReebArcIterator;
 
 #if 0
-struct EditMesh;
 struct EdgeIndex;
+struct EditMesh;
 
 int weightToHarmonic(struct EditMesh *em, struct EdgeIndex *indexed_edges);
 int weightFromDistance(struct EditMesh *em, struct EdgeIndex *indexed_edges);
diff --git a/source/blender/editors/curve/curve_intern.h b/source/blender/editors/curve/curve_intern.h
index 01047d4badd..20733738466 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 f35a059c85c..7e83497c8ec 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -36,9 +36,9 @@
 
 
 /* internal exports only */
-struct bGPdata;
-struct bGPDstroke;
 struct bGPDspoint;
+struct bGPDstroke;
+struct bGPdata;
 
 struct GHash;
 
@@ -46,9 +46,9 @@ struct ARegion;
 struct View2D;
 struct wmOperatorType;
 
+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 ceb1a4f416a..a44c04b043a 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;
 
 void fdrawbezier(float vec[4][3]);
 void fdrawline(float x1, float y1, float x2, float y2);
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index f52117ed4d3..6a9e645f955 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 5c9618aba6c..9fe7724707f 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -34,23 +34,23 @@
 extern "C" {
 #endif
 
-struct bArmature;
 struct Base;
-struct bContext;
 struct Bone;
-struct bPoseChannel;
+struct DerivedMesh;
 struct IDProperty;
 struct ListBase;
 struct Main;
 struct MeshDeformModifierData;
-struct DerivedMesh;
 struct Object;
 struct ReportList;
 struct Scene;
+struct UndoType;
 struct ViewContext;
+struct bArmature;
+struct bContext;
+struct bPoseChannel;
 struct wmKeyConfig;
 struct wmOperator;
-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 8fcfb4743d5..457f87f39d5 100644
--- a/source/blender/editors/include/ED_curve.h
+++ b/source/blender/editors/include/ED_curve.h
@@ -31,18 +31,18 @@
 #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 bContext;
+struct wmKeyConfig;
+struct wmOperator;
 
 /* curve_ops.c */
 void    ED_operatortypes_curve(void);
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 6b9cf23ce73..950019c67e5 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -32,24 +32,24 @@
 
 #include "ED_numinput.h"
 
+struct ARegion;
 struct ID;
+struct KeyframeEditData;
 struct ListBase;
-struct bContext;
+struct Object;
+struct PointerRNA;
 struct ScrArea;
-struct ARegion;
 struct View3D;
-struct Object;
-struct bGPdata;
-struct bGPDlayer;
+struct bAnimContext;
+struct bContext;
 struct bGPDframe;
-struct bGPDstroke;
+struct bGPDlayer;
 struct bGPDpalette;
 struct bGPDpalettecolor;
-struct bAnimContext;
-struct KeyframeEditData;
-struct PointerRNA;
-struct wmWindowManager;
+struct bGPDstroke;
+struct bGPdata;
 struct wmKeyConfig;
+struct wmWindowManager;
 
 
 /* ------------- Grease-Pencil Helpers ---------------- */
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h
index e5631c4e191..6528fbe68ad 100644
--- a/source/blender/editors/include/ED_image.h
+++ b/source/blender/editors/include/ED_image.h
@@ -30,15 +30,15 @@
 #ifndef __ED_IMAGE_H__
 #define __ED_IMAGE_H__
 
-struct SpaceImage;
-struct bContext;
+struct ARegion;
+struct ImBuf;
 struct Image;
 struct ImageUser;
-struct ImBuf;
+struct Scene;
+struct SpaceImage;
 struct ToolSettings;
+struct bContext;
 struct wmWindowManager;
-struct ARegion;
-struct Scene;
 
 /* 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 5f4b8ce40bf..11637c0eaf6 100644
--- a/source/blender/editors/include/ED_keyframes_draw.h
+++ b/source/blender/editors/include/ED_keyframes_draw.h
@@ -32,20 +32,20 @@
 #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 MaskLayer;
+struct Object;
 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 b4d1b5dec9c..0685514f461 100644
--- a/source/blender/editors/include/ED_keyframing.h
+++ b/source/blender/editors/include/ED_keyframing.h
@@ -34,25 +34,25 @@
 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 EnumPropertyItem;
 struct PointerRNA;
 struct PropertyRNA;
-struct EnumPropertyItem;
 
 #include "DNA_anim_types.h"
 #include "RNA_types.h"
@@ -127,8 +127,8 @@ short delete_keyframe(struct ReportList *reports, struct ID *id, struct bAction
 /* ************ 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 a95e283f218..700b7b94982 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 2ab788d5e2a..053ba48d8f0 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 46c34d36efc..580331ea0a5 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 c2094b4215c..f224dbede92 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -35,34 +35,34 @@
 extern "C" {
 #endif
 
-struct ID;
-struct View3D;
 struct ARegion;
-struct bContext;
-struct wmOperator;
-struct wmKeyConfig;
-struct ReportList;
-struct ViewContext;
-struct bDeformGroup;
-struct MDeformVert;
-struct Scene;
-struct Mesh;
-struct MTexPoly;
-struct UvVertMap;
-struct UvMapVert;
-struct BMEditMesh;
-struct BMesh;
-struct BMVert;
-struct BMLoop;
 struct BMBVHTree;
 struct BMEdge;
+struct BMEditMesh;
 struct BMFace;
-struct UvVertMap;
-struct UvMapVert;
-struct ToolSettings;
+struct BMLoop;
+struct BMVert;
+struct BMesh;
+struct ID;
+struct MDeformVert;
+struct MTexPoly;
+struct Mesh;
 struct Object;
-struct rcti;
+struct ReportList;
+struct Scene;
+struct ToolSettings;
 struct UndoType;
+struct UvMapVert;
+struct UvMapVert;
+struct UvVertMap;
+struct UvVertMap;
+struct View3D;
+struct ViewContext;
+struct bContext;
+struct bDeformGroup;
+struct rcti;
+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 1958466d134..4574fe6a4bf 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 3f96d669f1c..9492719a916 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -37,10 +37,13 @@ extern "C" {
 
 struct Base;
 struct EnumPropertyItem;
+struct EnumPropertyItem;
 struct ID;
 struct Main;
 struct ModifierData;
 struct Object;
+struct PointerRNA;
+struct PropertyRNA;
 struct ReportList;
 struct Scene;
 struct bConstraint;
@@ -50,9 +53,6 @@ struct wmKeyConfig;
 struct wmKeyMap;
 struct wmOperator;
 struct wmOperatorType;
-struct PointerRNA;
-struct PropertyRNA;
-struct EnumPropertyItem;
 struct wmWindowManager;
 
 #include "DNA_object_enums.h"
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 00111887332..c360f7ba3a3 100644
--- a/source/blender/editors/include/ED_particle.h
+++ b/source/blender/editors/include/ED_particle.h
@@ -32,13 +32,13 @@
 #ifndef __ED_PARTICLE_H__
 #define __ED_PARTICLE_H__
 
-struct bContext;
 struct Object;
-struct ParticleEditSettings;
-struct rcti;
 struct PTCacheEdit;
+struct ParticleEditSettings;
 struct Scene;
 struct UndoType;
+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 707d7c6c693..eeda2a3a24b 100644
--- a/source/blender/editors/include/ED_render.h
+++ b/source/blender/editors/include/ED_render.h
@@ -30,13 +30,13 @@
 
 #include "DNA_vec_types.h"
 
-struct bContext;
 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 b4d9a2629cf..494a9b4e1ff 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -36,18 +36,18 @@
 #include "DNA_view2d_types.h"
 #include "DNA_view3d_types.h"
 
-struct wmWindowManager;
-struct wmWindow;
-struct wmNotifier;
-struct wmEvent;
-struct wmKeyConfig;
-struct bContext;
+struct ARegion;
+struct Main;
 struct Scene;
+struct bContext;
 struct bScreen;
-struct ARegion;
-struct uiBlock;
 struct rcti;
-struct Main;
+struct uiBlock;
+struct wmEvent;
+struct wmKeyConfig;
+struct wmNotifier;
+struct wmWindow;
+struct wmWindowManager;
 
 /* regions */
 void    ED_region_do_listen(struct bScreen *sc, struct ScrArea *sa, struct ARegion *ar, struct wmNotifier *note);
diff --git a/source/blender/editors/include/ED_sculpt.h b/source/blender/editors/include/ED_sculpt.h
index ee2eff3ebba..28b6428214b 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 9a0a7f8f1bb..a1e4baa1b0b 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -36,16 +36,16 @@
 
 struct ARegion;
 struct ListBase;
+struct Main;
 struct Object;
+struct SnapObjectContext;
+struct SnapObjectParams;
 struct View3D;
 struct bContext;
 struct wmEvent;
 struct wmKeyConfig;
 struct wmKeyMap;
 struct wmOperatorType;
-struct Main;
-struct SnapObjectContext;
-struct SnapObjectParams;
 
 void transform_keymap_for_space(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap, int spaceid);
 void transform_operatortypes(void);
@@ -108,18 +108,18 @@ enum TfmMode {
  * */
 bool calculateTransformCenter(struct bContext *C, int centerMode, float cent3d[3], float cent2d[2]);
 
-struct TransInfo;
 struct Base;
-struct Scene;
 struct Object;
+struct Scene;
+struct TransInfo;
 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 c20d92963a9..3df015f54d8 100644
--- a/source/blender/editors/include/ED_transform_snap_object_context.h
+++ b/source/blender/editors/include/ED_transform_snap_object_context.h
@@ -25,15 +25,15 @@
 #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 ListBase;
-struct Scene;
 struct Main;
 struct Object;
-struct ARegion;
+struct Scene;
 struct View3D;
 
 /* transform_snap_object.c */
diff --git a/source/blender/editors/include/ED_undo.h b/source/blender/editors/include/ED_undo.h
index 784ae33f3b0..d5d54e26a02 100644
--- a/source/blender/editors/include/ED_undo.h
+++ b/source/blender/editors/include/ED_undo.h
@@ -25,10 +25,10 @@
 #ifndef __ED_UNDO_H__
 #define __ED_UNDO_H__
 
+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 741c586d41f..d93b5072679 100644
--- a/source/blender/editors/include/ED_util.h
+++ b/source/blender/editors/include/ED_util.h
@@ -31,11 +31,11 @@
 #ifndef __ED_UTIL_H__
 #define __ED_UTIL_H__
 
-struct bContext;
-struct wmOperatorType;
+struct PackedFile;
 struct ScrArea;
 struct SpaceLink;
-struct PackedFile;
+struct bContext;
+struct wmOperatorType;
 
 /* ed_util.c */
 
diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h
index e9398bbd94c..075b7082077 100644
--- a/source/blender/editors/include/ED_uvedit.h
+++ b/source/blender/editors/include/ED_uvedit.h
@@ -31,10 +31,10 @@
 #define __ED_UVEDIT_H__
 
 struct ARegionType;
-struct BMesh;
 struct BMEditMesh;
 struct BMFace;
 struct BMLoop;
+struct BMesh;
 struct Image;
 struct ImageUser;
 struct MTexPoly;
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index 135e6645d13..0ae1144afd1 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -41,6 +41,9 @@ struct Base;
 struct BezTriple;
 struct BoundBox;
 struct EditBone;
+struct GPUFX;
+struct GPUFXSettings;
+struct GPUOffScreen;
 struct ImBuf;
 struct MVert;
 struct Main;
@@ -63,9 +66,6 @@ struct wmOperator;
 struct wmOperatorType;
 struct wmWindow;
 struct wmWindowManager;
-struct GPUFX;
-struct GPUOffScreen;
-struct GPUFXSettings;
 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 5c192d62612..b484a599079 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -38,46 +38,46 @@
 
 /* Struct Declarations */
 
+struct ARegion;
+struct AutoComplete;
 struct ID;
 struct IDProperty;
+struct ImBuf;
+struct Image;
+struct ImageUser;
 struct ListBase;
-struct ARegion;
-struct ScrArea;
-struct bScreen;
-struct wmEvent;
-struct wmWindow;
-struct wmOperator;
-struct AutoComplete;
-struct bContext;
-struct bContextStore;
+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 uiWidgetColors;
-struct MTex;
-struct ImBuf;
-struct bNodeTree;
-struct bNode;
-struct bNodeSocket;
-struct wmDropBox;
 struct wmDrag;
+struct wmDropBox;
+struct wmEvent;
 struct wmEvent;
+struct wmKeyConfig;
+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 308504ef4c4..76d2f83b9c1 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 a7ae4ea1241..0ab0f4357cf 100644
--- a/source/blender/editors/include/UI_view2d.h
+++ b/source/blender/editors/include/UI_view2d.h
@@ -131,13 +131,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 f2d23944b74..8408819abd7 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 e9ef06a368f..33939fb211f 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 593e6b59d85..b35e108d8ea 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 f962f83844b..662457fc87b 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 a00ab742386..ee06b5a35bf 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/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index b782a47192a..da57ca5a01a 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -33,29 +33,29 @@
 #define __PAINT_INTERN_H__
 
 struct ARegion;
-struct bContext;
 struct Brush;
-struct ImagePool;
-struct ColorSpace;
 struct ColorManagedDisplay;
+struct ColorSpace;
+struct DMCoNo;
+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 DMCoNo;
-struct UndoStep;
 enum ePaintMode;
 
 /* paint_stroke.c */
diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h
index 137e957dce6..987e7bb2501 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 37bef41e4d5..027a0a4c898 100644
--- a/source/blender/editors/space_action/action_intern.h
+++ b/source/blender/editors/space_action/action_intern.h
@@ -31,12 +31,12 @@
 #ifndef __ACTION_INTERN_H__
 #define __ACTION_INTERN_H__
 
-struct bContext;
-struct bAnimContext;
-struct SpaceAction;
-struct ScrArea;
 struct ARegion;
 struct ARegionType;
+struct ScrArea;
+struct SpaceAction;
+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 ae15834a1d9..4578ec06410 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 6eaf2dda084..725b92b0dfa 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 c50e0497519..edc31349250 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 f7fec4ed396..4b55d3bbcb2 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 a16acd665b4..3c059631740 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_logic/logic_intern.h b/source/blender/editors/space_logic/logic_intern.h
index ddbb145440d..429daac5092 100644
--- a/source/blender/editors/space_logic/logic_intern.h
+++ b/source/blender/editors/space_logic/logic_intern.h
@@ -33,9 +33,9 @@
 #define __LOGIC_INTERN_H__
 
 /* internal exports only */
-struct bContext;
 struct ARegion;
 struct ScrArea;
+struct bContext;
 struct wmOperatorType;
 
 /* space_logic.c */
diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h
index 2f13622f1fd..6eb07e35223 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 dabb95e9d2b..6bb191d6388 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -36,14 +36,14 @@
 
 /* internal exports only */
 
-struct wmOperatorType;
-struct TreeStoreElem;
-struct bContext;
-struct Scene;
+struct EditBone;
 struct ID;
 struct Object;
+struct Scene;
+struct TreeStoreElem;
+struct bContext;
 struct bPoseChannel;
-struct EditBone;
+struct wmOperatorType;
 
 typedef struct TreeElement {
 	struct TreeElement *next, *prev, *parent;
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h
index e06f4558f00..0b6765f200f 100644
--- a/source/blender/editors/space_sequencer/sequencer_intern.h
+++ b/source/blender/editors/space_sequencer/sequencer_intern.h
@@ -36,17 +36,17 @@
 
 /* internal exports only */
 
-struct Sequence;
-struct bContext;
-struct rctf;
-struct SpaceSeq;
-struct ScrArea;
 struct ARegion;
 struct ARegionType;
-struct Scene;
 struct Main;
-struct wmOperator;
+struct Scene;
+struct ScrArea;
+struct Sequence;
+struct SpaceSeq;
 struct StripElem;
+struct bContext;
+struct rctf;
+struct wmOperator;
 
 /* space_sequencer.c */
 struct ARegion *sequencer_has_buttons_region(struct ScrArea *sa);
@@ -88,8 +88,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 962a58768d1..9b51f3a3bc3 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -39,16 +39,16 @@ struct ARegion;
 struct ARegionType;
 struct BoundBox;
 struct DerivedMesh;
+struct Mesh;
 struct Object;
 struct SmokeDomainSettings;
 struct bAnimVizSettings;
 struct bContext;
 struct bMotionPath;
 struct bPoseChannel;
-struct Mesh;
+struct wmKeyConfig;
 struct wmOperatorType;
 struct wmWindowManager;
-struct wmKeyConfig;
 
 /* drawing flags: */
 enum {
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index cae5f4bdeb8..16e53c4cbe7 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -41,25 +41,25 @@
 
 /* ************************** Types ***************************** */
 
-struct TransInfo;
-struct TransData;
-struct TransformOrientation;
-struct TransSnap;
+struct ARegion;
+struct EditBone;
 struct NumInput;
 struct Object;
-struct View3D;
-struct ScrArea;
+struct ReportList;
 struct Scene;
+struct ScrArea;
+struct SnapObjectContext;
+struct TransData;
+struct TransInfo;
+struct TransSnap;
+struct TransformOrientation;
+struct View3D;
 struct bConstraint;
-struct wmKeyMap;
-struct wmKeyConfig;
 struct bContext;
 struct wmEvent;
+struct wmKeyConfig;
+struct wmKeyMap;
 struct wmTimer;
-struct ARegion;
-struct ReportList;
-struct EditBone;
-struct SnapObjectContext;
 
 /* transinfo->redraw */
 typedef enum {
@@ -202,8 +202,8 @@ typedef struct TransDataNla {
 	int handle;					/* handle-index: 0 for dummy entry, -1 for start, 1 for end, 2 for both ends */
 } 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 a9162d26d72..9d14ecffdfe 100644
--- a/source/blender/editors/uvedit/uvedit_intern.h
+++ b/source/blender/editors/uvedit/uvedit_intern.h
@@ -32,15 +32,15 @@
 #ifndef __UVEDIT_INTERN_H__
 #define __UVEDIT_INTERN_H__
 
-struct MTexPoly;
+struct BMEditMesh;
+struct BMFace;
+struct BMLoop;
 struct Image;
+struct MTexPoly;
 struct Object;
 struct Scene;
 struct SpaceImage;
 struct wmOperatorType;
-struct BMEditMesh;
-struct BMFace;
-struct BMLoop;
 
 /* visibility and selection */
 bool uvedit_face_visible_nolocal(struct Scene *scene, struct BMFace *efa);
diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c
index d01695ca2f8..ab4befe1ffd 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.c
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.c
@@ -92,11 +92,11 @@ typedef struct PHash {
 
 
 
-struct PVert;
+struct PChart;
 struct PEdge;
 struct PFace;
-struct PChart;
 struct PHandle;
+struct PVert;
 
 /* Simplices */
 
diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h
index a6382010ca7..14f047bd683 100644
--- a/source/blender/freestyle/FRS_freestyle.h
+++ b/source/blender/freestyle/FRS_freestyle.h
@@ -29,10 +29,10 @@
 extern "C" {
 #endif
 
-struct Render;
-struct Material;
 struct FreestyleConfig;
 struct FreestyleLineStyle;
+struct Material;
+struct Render;
 
 struct FreestyleGlobals {
 	struct Scene *scene;
diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h
index 8fd34348f03..572b3b2c085 100644
--- a/source/blender/gpu/GPU_buffers.h
+++ b/source/blender/gpu/GPU_buffers.h
@@ -46,12 +46,12 @@ struct CCGElem;
 struct CCGKey;
 struct DMFlagMat;
 struct DerivedMesh;
-struct GSet;
-struct GPUVertPointLink;
 struct GPUDrawObject;
+struct GPUVertPointLink;
+struct GSet;
 struct GridCommonGPUBuffer;
-struct PBVH;
 struct MVert;
+struct PBVH;
 
 typedef struct GPUBuffer {
 	size_t size;        /* in bytes */
diff --git a/source/blender/gpu/GPU_compositing.h b/source/blender/gpu/GPU_compositing.h
index d506d91a9aa..a579dab5159 100644
--- a/source/blender/gpu/GPU_compositing.h
+++ b/source/blender/gpu/GPU_compositing.h
@@ -39,12 +39,12 @@ extern "C" {
 /* opaque handle for framebuffer compositing effects (defined in gpu_compositing.c )*/
 typedef struct GPUFX GPUFX;
 struct GPUDOFSettings;
-struct GPUSSAOSettings;
-struct GPUOffScreen;
 struct GPUFXSettings;
-struct rcti;
-struct Scene;
+struct GPUOffScreen;
+struct GPUSSAOSettings;
 struct GPUShader;
+struct Scene;
+struct rcti;
 enum eGPUFXFlags;
 
 /**** Public API *****/
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h
index de53b1e8739..8c0fa6096f7 100644
--- a/source/blender/gpu/GPU_draw.h
+++ b/source/blender/gpu/GPU_draw.h
@@ -36,16 +36,16 @@
 extern "C" {
 #endif
 
+struct DupliObject;
 struct ImBuf;
 struct Image;
 struct ImageUser;
 struct MTexPoly;
 struct Object;
-struct Scene;
-struct View3D;
 struct RegionView3D;
+struct Scene;
 struct SmokeModifierData;
-struct DupliObject;
+struct View3D;
 
 /* OpenGL drawing functions related to shading. These are also
  * shared with the game engine, where there were previously
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h
index e0e92976b09..fad48f9d5e4 100644
--- a/source/blender/gpu/GPU_material.h
+++ b/source/blender/gpu/GPU_material.h
@@ -41,28 +41,28 @@
 extern "C" {
 #endif
 
+struct GPULamp;
+struct GPUMaterial;
+struct GPUNode;
+struct GPUNodeLink;
+struct GPUNodeStack;
+struct GPUTexture;
+struct GPUVertexAttribs;
+struct Image;
 struct Image;
 struct ImageUser;
 struct Main;
 struct Material;
 struct Object;
-struct Image;
+struct PreviewImage;
 struct Scene;
 struct SceneRenderLayer;
-struct GPUVertexAttribs;
-struct GPUNode;
-struct GPUNodeLink;
-struct GPUNodeStack;
-struct GPUMaterial;
-struct GPUTexture;
-struct GPULamp;
-struct PreviewImage;
 struct World;
 
+typedef struct GPULamp GPULamp;
+typedef struct GPUMaterial GPUMaterial;
 typedef struct GPUNode GPUNode;
 typedef struct GPUNodeLink GPUNodeLink;
-typedef struct GPUMaterial GPUMaterial;
-typedef struct GPULamp GPULamp;
 typedef struct GPUParticleInfo GPUParticleInfo;
 
 /* Functions to create GPU Materials nodes */
diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h
index 2f3b25c90f7..375d3b9a9d8 100644
--- a/source/blender/gpu/intern/gpu_codegen.h
+++ b/source/blender/gpu/intern/gpu_codegen.h
@@ -38,11 +38,11 @@
 #include "GPU_material.h"
 #include "GPU_glew.h"
 
-struct ListBase;
-struct GPUShader;
-struct GPUOutput;
 struct GPUNode;
+struct GPUOutput;
+struct GPUShader;
 struct GPUVertexAttribs;
+struct ListBase;
 struct PreviewImage;
 
 /* Pass Generation
diff --git a/source/blender/ikplugin/BIK_api.h b/source/blender/ikplugin/BIK_api.h
index 3f53e24f24a..d76e7f62a74 100644
--- a/source/blender/ikplugin/BIK_api.h
+++ b/source/blender/ikplugin/BIK_api.h
@@ -39,10 +39,10 @@ extern "C" {
 #endif
 
 struct Object;
-struct bPoseChannel;
-struct bPose;
 struct Scene;
 struct bConstraint;
+struct bPose;
+struct bPoseChannel;
 
 enum BIK_ParamType {
 	BIK_PARAM_TYPE_FLOAT = 0,
diff --git a/source/blender/ikplugin/intern/ikplugin_api.h b/source/blender/ikplugin/intern/ikplugin_api.h
index 0b4df11de60..fe68b7c2887 100644
--- a/source/blender/ikplugin/intern/ikplugin_api.h
+++ b/source/blender/ikplugin/intern/ikplugin_api.h
@@ -39,8 +39,8 @@ extern "C" {
 #endif
 
 struct Object;
-struct bPoseChannel;
 struct Scene;
+struct bPoseChannel;
 
 
 struct IKPlugin {
diff --git a/source/blender/imbuf/IMB_colormanagement.h b/source/blender/imbuf/IMB_colormanagement.h
index ff1784c54dd..bb5dc8af038 100644
--- a/source/blender/imbuf/IMB_colormanagement.h
+++ b/source/blender/imbuf/IMB_colormanagement.h
@@ -41,18 +41,18 @@
 #define BCM_CONFIG_FILE "config.ocio"
 
 
-struct bContext;
 struct ColorManagedColorspaceSettings;
 struct ColorManagedDisplaySettings;
 struct ColorManagedViewSettings;
 struct ColormanageProcessor;
 struct EnumPropertyItem;
 struct ImBuf;
-struct Main;
 struct ImageFormatData;
+struct Main;
+struct bContext;
 
-struct ColorSpace;
 struct ColorManagedDisplay;
+struct ColorSpace;
 
 /* ** Generic functions ** */
 
diff --git a/source/blender/imbuf/IMB_metadata.h b/source/blender/imbuf/IMB_metadata.h
index 0321d5ef0fb..579e2bfb519 100644
--- a/source/blender/imbuf/IMB_metadata.h
+++ b/source/blender/imbuf/IMB_metadata.h
@@ -33,9 +33,9 @@
 #ifndef __IMB_METADATA_H__
 #define __IMB_METADATA_H__
 
-struct anim;
-struct ImBuf;
 struct IDProperty;
+struct ImBuf;
+struct anim;
 
 /** The metadata is a list of key/value pairs (both char *) that can me
  * saved in the header of several image formats.
diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h
index 804095a0727..b1109f7ba4b 100644
--- a/source/blender/imbuf/intern/IMB_anim.h
+++ b/source/blender/imbuf/intern/IMB_anim.h
@@ -91,9 +91,9 @@
 
 #define MAXNUMSTREAMS       50
 
+struct IDProperty;
 struct _AviMovie;
 struct anim_index;
-struct IDProperty;
 
 struct anim {
 	int ib_flags;
diff --git a/source/blender/imbuf/intern/IMB_colormanagement_intern.h b/source/blender/imbuf/intern/IMB_colormanagement_intern.h
index 0b4557e7bef..34ad9d7302d 100644
--- a/source/blender/imbuf/intern/IMB_colormanagement_intern.h
+++ b/source/blender/imbuf/intern/IMB_colormanagement_intern.h
@@ -38,8 +38,8 @@
 #include "DNA_listBase.h"
 #include "BLI_sys_types.h"
 
-struct OCIO_ConstProcessorRcPtr;
 struct ImBuf;
+struct OCIO_ConstProcessorRcPtr;
 
 extern float imbuf_luma_coefficients[3];
 
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index df8ac92eb86..a5c65e1b462 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -39,11 +39,11 @@
 extern "C" {
 #endif
 
-struct Library;
 struct FileData;
+struct GPUTexture;
 struct ID;
+struct Library;
 struct PackedFile;
-struct GPUTexture;
 
 typedef struct IDPropertyData {
 	void *pointer;
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index e585c12b5a8..7b69b2008fe 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -41,10 +41,10 @@
 #include "DNA_view2d_types.h"
 #include "DNA_userdef_types.h" /* ThemeWireColor */
 
-struct SpaceLink;
-struct Object;
-struct Group;
 struct GHash;
+struct Group;
+struct Object;
+struct SpaceLink;
 
 /* ************************************************ */
 /* Visualization */
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index 6461ad5445f..af7155101a3 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -34,10 +34,10 @@
 #ifndef __DNA_ACTUATOR_TYPES_H__
 #define __DNA_ACTUATOR_TYPES_H__
 
-struct Object;
+struct Group;
 struct Mesh;
+struct Object;
 struct Scene;
-struct Group;
 struct Text;
 
 /* ****************** ACTUATORS ********************* */
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 484f74c4a83..8badd35f721 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -42,8 +42,8 @@
 //#endif
 
 struct CurveMapping;
-struct MTex;
 struct Image;
+struct MTex;
 
 typedef struct BrushClone {
 	struct Image *image;    /* image for clone tool */
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h
index 0dedd8c84ef..c5797c8b8fa 100644
--- a/source/blender/makesdna/DNA_camera_types.h
+++ b/source/blender/makesdna/DNA_camera_types.h
@@ -40,9 +40,9 @@
 extern "C" {
 #endif
 
-struct Object;
 struct AnimData;
 struct Ipo;
+struct Object;
 
 /* ------------------------------------------- */
 /* Stereo Settings */
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index fbca2aec2fc..17bd8af1508 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -38,8 +38,8 @@
 #include "DNA_listBase.h"
 
 struct Action;
-struct Text;
 struct Ipo;
+struct Text;
 
 /* channels reside in Object or Action (ListBase) constraintChannels */
 // XXX deprecated... old AnimSys
diff --git a/source/blender/makesdna/DNA_controller_types.h b/source/blender/makesdna/DNA_controller_types.h
index db0c8078211..eaf5c245f66 100644
--- a/source/blender/makesdna/DNA_controller_types.h
+++ b/source/blender/makesdna/DNA_controller_types.h
@@ -34,8 +34,8 @@
 #ifndef __DNA_CONTROLLER_TYPES_H__
 #define __DNA_CONTROLLER_TYPES_H__
 
-struct bActuator;
 struct Text;
+struct bActuator;
 struct bSensor;
 
 /* ****************** CONTROLLERS ********************* */
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index 85636f2a173..97ebfe90560 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -39,15 +39,15 @@
 
 #define MAXTEXTBOX 256  /* used in readfile.c and editfont.c */
 
+struct AnimData;
 struct BoundBox;
-struct Object;
+struct EditFont;
+struct GHash;
 struct Ipo;
 struct Key;
 struct Material;
+struct Object;
 struct VFont;
-struct AnimData;
-struct EditFont;
-struct GHash;
 
 /* These two Lines with # tell makesdna this struct can be excluded. */
 #
diff --git a/source/blender/makesdna/DNA_fileglobal_types.h b/source/blender/makesdna/DNA_fileglobal_types.h
index 98d433d8454..191f5bd9660 100644
--- a/source/blender/makesdna/DNA_fileglobal_types.h
+++ b/source/blender/makesdna/DNA_fileglobal_types.h
@@ -32,8 +32,8 @@
 #ifndef __DNA_FILEGLOBAL_TYPES_H__
 #define __DNA_FILEGLOBAL_TYPES_H__
 
-struct bScreen;
 struct Scene;
+struct bScreen;
 
 /**
  * FileGlobal stores a part of the current user-interface settings at
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index 12fa0781fa5..3baea015c5b 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -36,12 +36,12 @@
 #include "DNA_ID.h"
 #include "DNA_color_types.h"  /* for color management */
 
+struct GPUTexture;
+struct MovieCache;
 struct PackedFile;
+struct RenderResult;
 struct Scene;
 struct anim;
-struct MovieCache;
-struct RenderResult;
-struct GPUTexture;
 
 /* ImageUser is in Texture, in Nodes, Background Image, Image Window, .... */
 /* should be used in conjunction with an ID * to Image. */
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index 9f1b404e151..16d02feae97 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -40,10 +40,10 @@
 #endif
 
 struct AnimData;
-struct bNodeTree;
 struct CurveMapping;
 struct Ipo;
 struct MTex;
+struct bNodeTree;
 
 typedef struct Lamp {
 	ID id;
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 827a76311a0..962f760f715 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -40,13 +40,13 @@
 #define MAX_MTEX	18
 #endif
 
-struct MTex;
-struct Image;
+struct AnimData;
 struct ColorBand;
 struct Group;
-struct bNodeTree;
-struct AnimData;
+struct Image;
 struct Ipo;
+struct MTex;
+struct bNodeTree;
 
 /* WATCH IT: change type? also make changes in ipo.h  */
 
diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h
index aa926623e34..249251ac35f 100644
--- a/source/blender/makesdna/DNA_meta_types.h
+++ b/source/blender/makesdna/DNA_meta_types.h
@@ -36,8 +36,8 @@
 #include "DNA_listBase.h"
 #include "DNA_ID.h"
 
-struct BoundBox;
 struct AnimData;
+struct BoundBox;
 struct Ipo;
 struct Material;
 
diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h
index 46415a16f24..cd5e406fbae 100644
--- a/source/blender/makesdna/DNA_movieclip_types.h
+++ b/source/blender/makesdna/DNA_movieclip_types.h
@@ -39,13 +39,13 @@
 #include "DNA_tracking_types.h"
 #include "DNA_color_types.h"  /* for color management */
 
-struct anim;
 struct AnimData;
-struct bGPdata;
 struct ImBuf;
 struct MovieClipProxy;
-struct MovieTrackingTrack;
 struct MovieTrackingMarker;
+struct MovieTrackingTrack;
+struct anim;
+struct bGPdata;
 
 typedef struct MovieClipUser {
 	int framenr;    /* current frame number */
diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h
index 8ca5bf388a3..08fd3fbdf91 100644
--- a/source/blender/makesdna/DNA_nla_types.h
+++ b/source/blender/makesdna/DNA_nla_types.h
@@ -34,9 +34,9 @@
 
 #include "DNA_listBase.h"
 
-struct bAction;
 struct Ipo;
 struct Object;
+struct bAction;
 
 /* simple uniform modifier structure, assumed it can hold all type info */
 typedef struct bActionModifier {
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index ce734243788..cd1cf0d2737 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -38,17 +38,17 @@
 #include "DNA_texture_types.h"
 #include "DNA_scene_types.h"
 
+struct AnimData;
 struct ID;
+struct Image;
 struct ListBase;
+struct bGPdata;
+struct bNodeInstanceHash;
 struct bNodeLink;
-struct bNodeType;
-struct bNodeTreeExec;
 struct bNodePreview;
-struct bNodeInstanceHash;
-struct AnimData;
-struct bGPdata;
+struct bNodeTreeExec;
+struct bNodeType;
 struct uiBlock;
-struct Image;
 
 /* In writefile.c: write deprecated DNA data,
  * to ensure forward compatibility in 2.6x versions.
diff --git a/source/blender/makesdna/DNA_object_fluidsim_types.h b/source/blender/makesdna/DNA_object_fluidsim_types.h
index 8ea53ac3b7a..d205252a92e 100644
--- a/source/blender/makesdna/DNA_object_fluidsim_types.h
+++ b/source/blender/makesdna/DNA_object_fluidsim_types.h
@@ -39,8 +39,8 @@
 extern "C" {
 #endif
 
-struct Mesh;
 struct Ipo;
+struct Mesh;
 
 typedef struct FluidVertexVelocity {
 	float vel[3];
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index a9b43a5a957..bf1e9862cb4 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -44,20 +44,20 @@
 extern "C" {
 #endif
 
-struct Object;
 struct AnimData;
-struct Ipo;
 struct BoundBox;
-struct Path;
+struct DerivedMesh;
+struct FluidsimSettings;
+struct Ipo;
 struct Material;
+struct Object;
 struct PartDeflect;
-struct SoftBody;
-struct FluidsimSettings;
 struct ParticleSystem;
-struct DerivedMesh;
+struct Path;
+struct RigidBodyOb;
 struct SculptSession;
+struct SoftBody;
 struct bGPdata;
-struct RigidBodyOb;
 
 
 /* Vertex Groups - Name Info */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index e4ee1545179..c415cdcaaea 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -49,22 +49,22 @@ extern "C" {
 #include "DNA_gpu_types.h"
 #include "DNA_userdef_types.h"
 
+struct AnimData;
+struct Brush;
+struct ColorSpace;
 struct CurveMapping;
+struct Editing;
+struct Group;
+struct Image;
+struct MovieClip;
 struct Object;
-struct Brush;
-struct World;
 struct Scene;
-struct Image;
-struct Group;
-struct Text;
-struct bNodeTree;
-struct AnimData;
-struct Editing;
 struct SceneStats;
-struct bGPdata;
+struct Text;
+struct World;
 struct bGPDbrush;
-struct MovieClip;
-struct ColorSpace;
+struct bGPdata;
+struct bNodeTree;
 
 /* ************************************************************* */
 /* Scene Data */
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index ba6fe0c4861..7c3529664ea 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -36,12 +36,12 @@
 
 #include "DNA_ID.h"
 
-struct SpaceType;
-struct SpaceLink;
 struct ARegion;
 struct ARegionType;
 struct PanelType;
 struct Scene;
+struct SpaceLink;
+struct SpaceType;
 struct uiLayout;
 struct wmTimer;
 struct wmTooltipState;
diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h
index 1fee490319f..600a41a475b 100644
--- a/source/blender/makesdna/DNA_sensor_types.h
+++ b/source/blender/makesdna/DNA_sensor_types.h
@@ -36,8 +36,8 @@
 #ifndef __DNA_SENSOR_TYPES_H__
 #define __DNA_SENSOR_TYPES_H__
 
-struct Object;
 struct Material;
+struct Object;
 
 /* ****************** SENSORS ********************* */
 
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index 6cb3add8825..e0de78c08fe 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -48,9 +48,9 @@
 #include "DNA_vfont_types.h"
 
 struct Ipo;
+struct MovieClip;
 struct Scene;
 struct bSound;
-struct MovieClip;
 
 /* strlens; 256= FILE_MAXFILE, 768= FILE_MAXDIR */
 
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 2544a5661e8..31427947fb2 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -47,25 +47,25 @@
 /* Hum ... Not really nice... but needed for spacebuts. */
 #include "DNA_view2d_types.h"
 
+struct BLI_mempool;
+struct FileLayout;
+struct FileList;
+struct FileSelectParams;
+struct Histogram;
 struct ID;
-struct Text;
-struct Script;
 struct Image;
+struct Mask;
+struct MovieClip;
+struct MovieClipScopes;
 struct Scopes;
-struct Histogram;
+struct Script;
 struct SpaceIpo;
-struct bNodeTree;
-struct FileList;
-struct bGPdata;
+struct Text;
 struct bDopeSheet;
-struct FileSelectParams;
-struct FileLayout;
+struct bGPdata;
+struct bNodeTree;
 struct wmOperator;
 struct wmTimer;
-struct MovieClip;
-struct MovieClipScopes;
-struct Mask;
-struct BLI_mempool;
 
 /* -------------------------------------------------------------------- */
 /** \name SpaceLink (Base)
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 25668fb04d9..d8398eaf1f3 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -43,16 +43,16 @@ extern "C" {
 #endif
 
 struct AnimData;
-struct Ipo;
 struct ColorBand;
+struct CurveMapping;
 struct EnvMap;
-struct Object;
-struct Tex;
-struct Image;
-struct PreviewImage;
 struct ImBuf;
+struct Image;
+struct Ipo;
+struct Object;
 struct Ocean;
-struct CurveMapping;
+struct PreviewImage;
+struct Tex;
 
 typedef struct MTex {
 
diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h
index 6a4faddfa1e..b2a6a1d46da 100644
--- a/source/blender/makesdna/DNA_tracking_types.h
+++ b/source/blender/makesdna/DNA_tracking_types.h
@@ -42,13 +42,13 @@
 
 /* match-moving data */
 
-struct bGPdata;
 struct Image;
 struct MovieReconstructedCamera;
+struct MovieTracking;
 struct MovieTrackingCamera;
 struct MovieTrackingMarker;
 struct MovieTrackingTrack;
-struct MovieTracking;
+struct bGPdata;
 
 typedef struct MovieReconstructedCamera {
 	int framenr;
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 1c14c13ce90..e1472c65241 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -32,19 +32,19 @@
 #ifndef __DNA_VIEW3D_TYPES_H__
 #define __DNA_VIEW3D_TYPES_H__
 
-struct ViewDepths;
-struct Object;
-struct Image;
-struct SpaceLink;
 struct BoundBox;
+struct GPUFX;
+struct Image;
+struct Material;
 struct MovieClip;
 struct MovieClipUser;
+struct Object;
 struct RenderEngine;
-struct bGPdata;
 struct SmoothView3DStore;
+struct SpaceLink;
+struct ViewDepths;
+struct bGPdata;
 struct wmTimer;
-struct Material;
-struct GPUFX;
 
 #include "DNA_defs.h"
 #include "DNA_listBase.h"
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index 9d3456db431..22ab303dd5d 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -38,27 +38,27 @@
 #include "DNA_ID.h"
 
 /* defined here: */
-struct wmWindowManager;
 struct wmWindow;
+struct wmWindowManager;
 
 struct wmEvent;
 struct wmGesture;
-struct wmOperatorType;
-struct wmOperator;
-struct wmKeyMap;
 struct wmKeyConfig;
+struct wmKeyMap;
+struct wmOperator;
+struct wmOperatorType;
 
 /* forwards */
-struct bContext;
-struct bScreen;
-struct wmSubWindow;
-struct wmTimer;
 struct PointerRNA;
-struct ReportList;
 struct Report;
-struct uiLayout;
+struct ReportList;
 struct Stereo3dFormat;
 struct UndoStep;
+struct bContext;
+struct bScreen;
+struct uiLayout;
+struct wmSubWindow;
+struct wmTimer;
 
 #define OP_MAX_TYPENAME 64
 #define KMAP_MAX_NAME   64
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index fff949ecbaa..22e035990c1 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -36,9 +36,9 @@
 #include "DNA_ID.h"
 
 struct AnimData;
-struct bNodeTree;
 struct Ipo;
 struct MTex;
+struct bNodeTree;
 
 #ifndef MAX_MTEX
 #define MAX_MTEX	18
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index de46605bc40..52ed11cac12 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -37,12 +37,12 @@
 extern "C" {
 #endif
 
-struct bContext;
 struct ID;
 struct ListBase;
 struct Main;
 struct ReportList;
 struct Scene;
+struct bContext;
 
 /* Types */
 
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index 64740098db4..603e3dc4f98 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -29,9 +29,9 @@
 
 #include "RNA_types.h"
 
+struct bNodeSocketType;
 struct bNodeTreeType;
 struct bNodeType;
-struct bNodeSocketType;
 
 /* Types */
 
@@ -223,9 +223,9 @@ struct bNodeSocketType *rna_node_socket_type_from_enum(int value);
 const EnumPropertyItem *rna_node_socket_type_itemf(
         void *data, bool (*poll)(void *data, struct bNodeSocketType *), bool *r_free);
 
-struct bContext;
 struct PointerRNA;
 struct PropertyRNA;
+struct bContext;
 const EnumPropertyItem *rna_TransformOrientation_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, bool *r_free);
 const EnumPropertyItem *rna_Sensor_type_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, bool *r_free);
 const EnumPropertyItem *rna_Actuator_type_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, bool *r_free);
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h
index f427aeae5a6..6de56c871c4 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -33,14 +33,14 @@
 extern "C" {
 #endif
 
-struct ParameterList;
+struct BlenderRNA;
 struct FunctionRNA;
+struct Main;
+struct ParameterList;
 struct PropertyRNA;
+struct ReportList;
 struct StructRNA;
-struct BlenderRNA;
 struct bContext;
-struct Main;
-struct ReportList;
 
 /** Pointer
  *
diff --git a/source/blender/makesrna/intern/rna_internal_types.h b/source/blender/makesrna/intern/rna_internal_types.h
index f9929cec7b1..e7c4f812127 100644
--- a/source/blender/makesrna/intern/rna_internal_types.h
+++ b/source/blender/makesrna/intern/rna_internal_types.h
@@ -33,17 +33,17 @@
 #include "RNA_types.h"
 
 struct BlenderRNA;
+struct CollectionPropertyIterator;
 struct ContainerRNA;
-struct StructRNA;
-struct PropertyRNA;
-struct PointerRNA;
 struct FunctionRNA;
-struct CollectionPropertyIterator;
-struct bContext;
-struct IDProperty;
 struct GHash;
+struct IDProperty;
 struct Main;
+struct PointerRNA;
+struct PropertyRNA;
 struct Scene;
+struct StructRNA;
+struct bContext;
 
 #ifdef UNIT_TEST
 #define RNA_MAX_ARRAY_LENGTH 64
diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.h b/source/blender/modifiers/intern/MOD_fluidsim_util.h
index 2bb1da32718..d9accb24836 100644
--- a/source/blender/modifiers/intern/MOD_fluidsim_util.h
+++ b/source/blender/modifiers/intern/MOD_fluidsim_util.h
@@ -33,10 +33,10 @@
 #ifndef __MOD_FLUIDSIM_UTIL_H__
 #define __MOD_FLUIDSIM_UTIL_H__
 
+struct DerivedMesh;
+struct FluidsimModifierData;
 struct Object;
 struct Scene;
-struct FluidsimModifierData;
-struct DerivedMesh;
 
 /* new fluid-modifier interface */
 void fluidsim_init(struct FluidsimModifierData *fluidmd);
diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.h b/source/blender/modifiers/intern/MOD_weightvg_util.h
index 4a31f973974..b31d95093d7 100644
--- a/source/blender/modifiers/intern/MOD_weightvg_util.h
+++ b/source/blender/modifiers/intern/MOD_weightvg_util.h
@@ -34,9 +34,9 @@
 struct CurveMapping;
 struct DerivedMesh;
 struct Object;
-struct Tex;
-struct Scene;
 struct RNG;
+struct Scene;
+struct Tex;
 
 /*
  * XXX I'd like to make modified weights visible in WeightPaint mode,
diff --git a/source/blender/nodes/NOD_socket.h b/source/blender/nodes/NOD_socket.h
index 42735b21e03..48a380fc9a7 100644
--- a/source/blender/nodes/NOD_socket.h
+++ b/source/blender/nodes/NOD_socket.h
@@ -41,8 +41,8 @@
 
 #include "RNA_types.h"
 
-struct bNodeTree;
 struct bNode;
+struct bNodeTree;
 
 struct bNodeSocket *node_add_socket_from_template(struct bNodeTree *ntree, struct bNode *node, struct bNodeSocketTemplate *stemp, int in_out);
 
diff --git a/source/blender/nodes/intern/node_exec.h b/source/blender/nodes/intern/node_exec.h
index 6771df76bf9..5b91711ebb7 100644
--- a/source/blender/nodes/intern/node_exec.h
+++ b/source/blender/nodes/intern/node_exec.h
@@ -43,9 +43,9 @@
 
 #include "RNA_types.h"
 
-struct bNodeTree;
 struct bNode;
 struct bNodeStack;
+struct bNodeTree;
 
 /* Node execution data */
 typedef struct bNodeExec {
diff --git a/source/blender/nodes/intern/node_util.h b/source/blender/nodes/intern/node_util.h
index 5c0e53c2399..c8cc750c001 100644
--- a/source/blender/nodes/intern/node_util.h
+++ b/source/blender/nodes/intern/node_util.h
@@ -47,8 +47,8 @@
 
 #include "RNA_access.h"
 
-struct bNodeTree;
 struct bNode;
+struct bNodeTree;
 
 /* data for initializing node execution */
 typedef struct bNodeExecContext {
diff --git a/source/blender/physics/BPH_mass_spring.h b/source/blender/physics/BPH_mass_spring.h
index c650d83c927..0ba5d1b8bde 100644
--- a/source/blender/physics/BPH_mass_spring.h
+++ b/source/blender/physics/BPH_mass_spring.h
@@ -36,10 +36,10 @@
 extern "C" {
 #endif
 
-struct Implicit_Data;
-struct Object;
 struct ClothModifierData;
+struct Implicit_Data;
 struct ListBase;
+struct Object;
 struct VoxelData;
 
 typedef enum eMassSpringSolverStatus {
diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h
index 955b1c4e4ed..b5fca4613ff 100644
--- a/source/blender/python/BPY_extern.h
+++ b/source/blender/python/BPY_extern.h
@@ -32,19 +32,19 @@
 #ifndef __BPY_EXTERN_H__
 #define __BPY_EXTERN_H__
 
-struct PathResolvedRNA;
-struct Text; /* defined in DNA_text_types.h */
-struct ID; /* DNA_ID.h */
-struct Object; /* DNA_object_types.h */
 struct ChannelDriver; /* DNA_anim_types.h */
+struct ID; /* DNA_ID.h */
 struct ListBase; /* DNA_listBase.h */
+struct Object; /* DNA_object_types.h */
+struct PathResolvedRNA;
+struct ReportList;
+struct Text; /* defined in DNA_text_types.h */
 struct bConstraint; /* DNA_constraint_types.h */
-struct bPythonConstraint; /* DNA_constraint_types.h */
 struct bConstraintOb; /* DNA_constraint_types.h */
 struct bConstraintTarget; /* DNA_constraint_types.h*/
 struct bContext;
 struct bContextDataResult;
-struct ReportList;
+struct bPythonConstraint; /* DNA_constraint_types.h */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.h b/source/blender/python/bmesh/bmesh_py_types_meshdata.h
index 07d8a46cc65..f49f35ae0fa 100644
--- a/source/blender/python/bmesh/bmesh_py_types_meshdata.h
+++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.h
@@ -40,10 +40,10 @@ typedef struct BPy_BMGenericMeshData {
 	void *data;
 } BPy_BMGenericMeshData;
 
-struct MTexPoly;
-struct MLoopUV;
-struct MLoopCol;
 struct MDeformVert;
+struct MLoopCol;
+struct MLoopUV;
+struct MTexPoly;
 struct MVertSkin;
 
 int       BPy_BMTexPoly_AssignPyObject(struct MTexPoly *mloopuv, PyObject *value);
diff --git a/source/blender/python/generic/idprop_py_api.h b/source/blender/python/generic/idprop_py_api.h
index 279dad40456..89fc05cb540 100644
--- a/source/blender/python/generic/idprop_py_api.h
+++ b/source/blender/python/generic/idprop_py_api.h
@@ -28,9 +28,9 @@
 #ifndef __IDPROP_PY_API_H__
 #define __IDPROP_PY_API_H__
 
+struct BPy_IDGroup_Iter;
 struct ID;
 struct IDProperty;
-struct BPy_IDGroup_Iter;
 
 extern PyTypeObject BPy_IDArray_Type;
 extern PyTypeObject BPy_IDGroup_Iter_Type;
diff --git a/source/blender/render/extern/include/RE_bake.h b/source/blender/render/extern/include/RE_bake.h
index ad4d7485acc..1b53fba5967 100644
--- a/source/blender/render/extern/include/RE_bake.h
+++ b/source/blender/render/extern/include/RE_bake.h
@@ -33,8 +33,8 @@
 #define __RE_BAKE_H__
 
 struct ImBuf;
-struct Render;
 struct Mesh;
+struct Render;
 
 typedef struct BakeImage {
 	struct Image *image;
diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h
index e23d881c7b1..564a3e0eee7 100644
--- a/source/blender/render/extern/include/RE_engine.h
+++ b/source/blender/render/extern/include/RE_engine.h
@@ -39,8 +39,7 @@
 
 #include "BLI_threads.h"
 
-struct bNode;
-struct bNodeTree;
+struct BakePixel;
 struct Object;
 struct Render;
 struct RenderData;
@@ -50,7 +49,8 @@ struct RenderLayer;
 struct RenderResult;
 struct ReportList;
 struct Scene;
-struct BakePixel;
+struct bNode;
+struct bNodeTree;
 
 /* External Engine */
 
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index 6e35f10b7c5..f9d5126e5f5 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -35,8 +35,7 @@
 #include "DNA_listBase.h"
 #include "DNA_vec_types.h"
 
-struct bMovieHandle;
-struct bNodeTree;
+struct EnvMap;
 struct Image;
 struct ImageFormatData;
 struct Main;
@@ -47,8 +46,9 @@ struct RenderResult;
 struct ReportList;
 struct Scene;
 struct SceneRenderLayer;
-struct EnvMap;
 struct StampData;
+struct bMovieHandle;
+struct bNodeTree;
 
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* this include is what is exposed of render to outside world */
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h
index 838f7031d14..cc577e57309 100644
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -194,11 +194,11 @@ typedef struct BakeImBufuserData {
 } BakeImBufuserData;
 
 /* node shaders... */
-struct Tex;
-struct MTex;
 struct ImBuf;
 struct ImagePool;
+struct MTex;
 struct Object;
+struct Tex;
 
 /* this one uses nodes */
 int multitex_ext(struct Tex *tex,
@@ -222,8 +222,8 @@ void RE_instance_get_particle_info(struct ObjectInstanceRen *obi, float *index,
 float RE_fresnel_dielectric(float incoming[3], float normal[3], float eta);
 
 /* shaded view and bake */
-struct Render;
 struct Image;
+struct Render;
 
 int RE_bake_shade_all_selected(struct Render *re, int type, struct Object *actob, short *do_update, float *progress);
 struct Image *RE_bake_shade_get_image(void);
diff --git a/source/blender/render/intern/include/envmap.h b/source/blender/render/intern/include/envmap.h
index cf9efcb0beb..960b6f3632a 100644
--- a/source/blender/render/intern/include/envmap.h
+++ b/source/blender/render/intern/include/envmap.h
@@ -42,9 +42,9 @@
  * (initrender.c)
  */
 
+struct ImagePool;
 struct Render;
 struct TexResult;
-struct ImagePool;
 
 void make_envmaps(struct Render *re);
 int envmaptex(struct Tex *tex, const float texvec[3], float dxt[3], float dyt[3], int osatex, struct TexResult *texres, struct ImagePool *pool, const bool skip_image_load);
diff --git a/source/blender/render/intern/include/occlusion.h b/source/blender/render/intern/include/occlusion.h
index 15a5a04e3f6..0beaaea500d 100644
--- a/source/blender/render/intern/include/occlusion.h
+++ b/source/blender/render/intern/include/occlusion.h
@@ -34,8 +34,8 @@
 #define __OCCLUSION_H__
 
 struct Render;
-struct ShadeInput;
 struct RenderPart;
+struct ShadeInput;
 struct ShadeSample;
 
 void make_occ_tree(struct Render *re);
diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h
index a164bc1f940..1669f5aa7b2 100644
--- a/source/blender/render/intern/include/render_result.h
+++ b/source/blender/render/intern/include/render_result.h
@@ -40,6 +40,8 @@
 #define RR_ALL_LAYERS	NULL
 #define RR_ALL_VIEWS	NULL
 
+struct ColorManagedDisplaySettings;
+struct ColorManagedViewSettings;
 struct ImBuf;
 struct ListBase;
 struct Render;
@@ -49,8 +51,6 @@ struct RenderLayer;
 struct RenderResult;
 struct Scene;
 struct rcti;
-struct ColorManagedDisplaySettings;
-struct ColorManagedViewSettings;
 
 /* New */
 
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 1978820856f..d93cdb0cdfb 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -53,18 +53,18 @@
 #include "BLI_sys_types.h" // for intptr_t support
 
 struct EvaluationContext;
-struct Object;
-struct MemArena;
-struct VertTableNode;
-struct VlakTableNode;
 struct GHash;
+struct ImagePool;
+struct Main;
+struct MemArena;
+struct Object;
 struct ObjectInstanceRen;
-struct RayObject;
 struct RayFace;
+struct RayObject;
 struct RenderEngine;
 struct ReportList;
-struct Main;
-struct ImagePool;
+struct VertTableNode;
+struct VlakTableNode;
 
 #define TABLEINITSIZE 1024
 
@@ -407,8 +407,8 @@ struct halosort {
 };
 
 /* ------------------------------------------------------------------------- */
-struct Material;
 struct ImagePool;
+struct Material;
 
 typedef struct RadFace {
 	float unshot[3], totrad[3];
diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h
index aa3efca9e5b..509b2c1f5c5 100644
--- a/source/blender/render/intern/include/rendercore.h
+++ b/source/blender/render/intern/include/rendercore.h
@@ -40,12 +40,12 @@
 
 #include "NOD_composite.h"
 
+struct RayObject;
+struct RenderLayer;
+struct RenderPart;
 struct ShadeInput;
 struct ShadeResult;
 struct World;
-struct RenderPart;
-struct RenderLayer;
-struct RayObject;
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/source/blender/render/intern/include/renderdatabase.h b/source/blender/render/intern/include/renderdatabase.h
index 1840ec493c8..c4a99da10c3 100644
--- a/source/blender/render/intern/include/renderdatabase.h
+++ b/source/blender/render/intern/include/renderdatabase.h
@@ -37,21 +37,21 @@
 extern "C" {
 #endif
 
-struct Object;
-struct VlakRen;
-struct VertRen;
+struct CustomData;
 struct HaloRen;
+struct Isect;
+struct MCol;
+struct MTFace;
 struct Main;
 struct Material;
+struct Object;
+struct ObjectInstanceRen;
+struct RadFace;
 struct Render;
-struct MCol;
-struct MTFace;
-struct CustomData;
 struct StrandBuffer;
 struct StrandRen;
-struct ObjectInstanceRen;
-struct RadFace;
-struct Isect;
+struct VertRen;
+struct VlakRen;
 
 #define RE_QUAD_MASK	0x7FFFFFF
 #define RE_QUAD_OFFS	0x8000000
diff --git a/source/blender/render/intern/include/shadbuf.h b/source/blender/render/intern/include/shadbuf.h
index 5722f37a6a8..34b2988c7cc 100644
--- a/source/blender/render/intern/include/shadbuf.h
+++ b/source/blender/render/intern/include/shadbuf.h
@@ -64,8 +64,8 @@ float shadow_halo(LampRen *lar, const float p1[3], const float p2[3]);
  * Irregular shadowbuffer
  */
 
-struct MemArena;
 struct APixstr;
+struct MemArena;
 
 void ISB_create(RenderPart *pa, struct APixstr *apixbuf);
 void ISB_free(RenderPart *pa);
diff --git a/source/blender/render/intern/include/shading.h b/source/blender/render/intern/include/shading.h
index e306c3c075c..b04cf792f28 100644
--- a/source/blender/render/intern/include/shading.h
+++ b/source/blender/render/intern/include/shading.h
@@ -26,16 +26,16 @@
  */
 
 
+struct Isect;
+struct LampRen;
+struct ObjectInstanceRen;
+struct PixStr;
+struct RenderLayer;
+struct RenderPart;
 struct ShadeInput;
 struct ShadeResult;
-struct RenderPart;
-struct RenderLayer;
-struct PixStr;
-struct LampRen;
-struct VlakRen;
 struct StrandPoint;
-struct ObjectInstanceRen;
-struct Isect;
+struct VlakRen;
 
 /* shadeinput.c */
 
diff --git a/source/blender/render/intern/include/sss.h b/source/blender/render/intern/include/sss.h
index e01dfe73851..69e635286b6 100644
--- a/source/blender/render/intern/include/sss.h
+++ b/source/blender/render/intern/include/sss.h
@@ -53,8 +53,8 @@ void scatter_tree_free(ScatterTree *tree);
 
 /* Internal renderer API */
 
-struct Render;
 struct Material;
+struct Render;
 
 void make_sss_tree(struct Render *re);
 void sss_add_points(Render *re, float (*co)[3], float (*color)[3], float *area, int totpoint);
diff --git a/source/blender/render/intern/include/strand.h b/source/blender/render/intern/include/strand.h
index 354ba3f0f07..9e6689b31f0 100644
--- a/source/blender/render/intern/include/strand.h
+++ b/source/blender/render/intern/include/strand.h
@@ -28,17 +28,17 @@
 #ifndef __STRAND_H__
 #define __STRAND_H__
 
-struct StrandVert;
-struct StrandRen;
-struct StrandBuffer;
+struct DerivedMesh;
+struct ObjectInstanceRen;
+struct ObjectRen;
+struct Render;
 struct ShadeSample;
+struct StrandBuffer;
 struct StrandPart;
-struct Render;
-struct ZSpan;
-struct ObjectInstanceRen;
+struct StrandRen;
 struct StrandSurface;
-struct DerivedMesh;
-struct ObjectRen;
+struct StrandVert;
+struct ZSpan;
 
 typedef struct StrandPoint {
 	/* position within segment */
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h
index f6d39b81f2a..9b297c20950 100644
--- a/source/blender/render/intern/include/texture.h
+++ b/source/blender/render/intern/include/texture.h
@@ -64,12 +64,12 @@
 	}                                                                         \
 
 struct HaloRen;
-struct ShadeInput;
-struct TexResult;
-struct Tex;
-struct Image;
 struct ImBuf;
+struct Image;
 struct ImagePool;
+struct ShadeInput;
+struct Tex;
+struct TexResult;
 
 /* texture.h */
 
diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h
index 50ad78b5be7..2b96ce1356e 100644
--- a/source/blender/render/intern/include/zbuf.h
+++ b/source/blender/render/intern/include/zbuf.h
@@ -33,14 +33,14 @@
 #ifndef __ZBUF_H__
 #define __ZBUF_H__
 
-struct RenderPart;
-struct RenderLayer;
+struct APixstr;
+struct APixstrand;
 struct LampRen;
 struct ListBase;
-struct ZSpan;
-struct APixstrand;
-struct APixstr;
+struct RenderLayer;
+struct RenderPart;
 struct StrandShadeCache;
+struct ZSpan;
 
 void fillrect(int *rect, int x, int y, int val);
 
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index f56f2551a68..0a965c341b1 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -46,25 +46,25 @@
 extern "C" {
 #endif
 
-struct bContext;
+struct ARegion;
 struct GHashIterator;
 struct IDProperty;
+struct ImBuf;
+struct ImageFormatData;
+struct MenuType;
+struct PointerRNA;
+struct PropertyRNA;
+struct bContext;
+struct rcti;
+struct wmDrag;
+struct wmDropBox;
 struct wmEvent;
 struct wmEventHandler;
 struct wmGesture;
 struct wmJob;
-struct wmOperatorType;
 struct wmOperator;
+struct wmOperatorType;
 struct wmPaintCursor;
-struct rcti;
-struct PointerRNA;
-struct PropertyRNA;
-struct MenuType;
-struct wmDropBox;
-struct wmDrag;
-struct ImBuf;
-struct ImageFormatData;
-struct ARegion;
 
 #ifdef WITH_INPUT_NDOF
 struct wmNDOFMotionData;
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 918188117eb..09b4ea950a5 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -106,11 +106,11 @@
 extern "C" {
 #endif
 
+struct ImBuf;
 struct bContext;
 struct wmEvent;
-struct wmWindowManager;
 struct wmOperator;
-struct ImBuf;
+struct wmWindowManager;
 
 #include "RNA_types.h"
 #include "DNA_listBase.h"
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index 5f850a076f0..2b6e2fbf4f8 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -31,8 +31,8 @@
 #ifndef __WM_H__
 #define __WM_H__
 
-struct wmWindow;
 struct ReportList;
+struct wmWindow;
 
 typedef struct wmPaintCursor {
 	struct wmPaintCursor *next, *prev;
diff --git a/source/blender/windowmanager/wm_cursors.h b/source/blender/windowmanager/wm_cursors.h
index f863d8bfdd9..50961cdf48c 100644
--- a/source/blender/windowmanager/wm_cursors.h
+++ b/source/blender/windowmanager/wm_cursors.h
@@ -108,8 +108,8 @@ enum {
 	BC_YELLOW
 };
 
-struct wmWindow;
 struct wmEvent;
+struct wmWindow;
 
 bool wm_cursor_arrow_move(struct wmWindow *win, const struct wmEvent *event);
 
diff --git a/source/blender/windowmanager/wm_draw.h b/source/blender/windowmanager/wm_draw.h
index de9ad599781..d35ba102530 100644
--- a/source/blender/windowmanager/wm_draw.h
+++ b/source/blender/windowmanager/wm_draw.h
@@ -45,9 +45,9 @@ typedef struct wmDrawData {
 	wmDrawTriple *triple;
 } wmDrawData;
 
+struct ARegion;
 struct bContext;
 struct wmWindow;
-struct ARegion;
 
 /* wm_draw.c */
 void		wm_draw_update			(struct bContext *C);
diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h
index c890f25c053..4bfbbc043d3 100644
--- a/source/blender/windowmanager/wm_event_system.h
+++ b/source/blender/windowmanager/wm_event_system.h
@@ -37,8 +37,8 @@
 #define WM_HANDLER_HANDLED   2
 #define WM_HANDLER_MODAL     4 /* MODAL|BREAK means unhandled */
 
-struct ScrArea;
 struct ARegion;
+struct ScrArea;
 
 /* wmKeyMap is in DNA_windowmanager.h, it's savable */