12 files changed, 44 insertions, 44 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index bfd555abb9a..16a9144e8b0 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -46,41 +46,41 @@
 extern "C" {
 #endif
 
-struct bContext;
-struct bToolRef_Runtime;
+struct ARegion;
 struct GHashIterator;
+struct GPUViewport;
 struct IDProperty;
+struct ImBuf;
+struct ImageFormatData;
+struct Main;
+struct MenuType;
+struct PointerRNA;
+struct PropertyRNA;
+struct ScrArea;
+struct ViewLayer;
+struct bContext;
+struct bToolRef_Runtime;
+struct rcti;
+struct wmDrag;
+struct wmDropBox;
 struct wmEvent;
 struct wmEventHandler;
 struct wmGesture;
 struct wmJob;
 struct wmMsgSubscribeKey;
 struct wmMsgSubscribeValue;
-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;
-struct ScrArea;
-struct Main;
-struct ViewLayer;
-struct GPUViewport;
 
 #ifdef WITH_INPUT_NDOF
 struct wmNDOFMotionData;
 #endif
 
-typedef struct wmJob wmJob;
 typedef struct wmGizmo wmGizmo;
 typedef struct wmGizmoMap wmGizmoMap;
 typedef struct wmGizmoMapType wmGizmoMapType;
+typedef struct wmJob wmJob;
 
 /* general API */
 void		WM_init_state_app_template_set(const char *app_template);
diff --git a/source/blender/windowmanager/WM_toolsystem.h b/source/blender/windowmanager/WM_toolsystem.h
index 5c6dc6d7cbe..69706d81e25 100644
--- a/source/blender/windowmanager/WM_toolsystem.h
+++ b/source/blender/windowmanager/WM_toolsystem.h
@@ -31,17 +31,17 @@
 extern "C" {
 #endif
 
-struct bContext;
-struct bToolRef_Runtime;
 struct IDProperty;
-struct wmMsgSubscribeKey;
-struct wmMsgSubscribeValue;
-struct wmOperatorType;
+struct Main;
 struct PointerRNA;
 struct ScrArea;
-struct Main;
 struct StructRNA;
 struct WorkSpace;
+struct bContext;
+struct bToolRef_Runtime;
+struct wmMsgSubscribeKey;
+struct wmMsgSubscribeValue;
+struct wmOperatorType;
 
 /* wm_toolsystem.c  */
 
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 5367e7b0aef..f94eb65b8c3 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -106,13 +106,13 @@
 extern "C" {
 #endif
 
+struct ID;
+struct ImBuf;
 struct bContext;
 struct wmEvent;
-struct wmWindowManager;
 struct wmMsgBus;
 struct wmOperator;
-struct ID;
-struct ImBuf;
+struct wmWindowManager;
 
 #include "RNA_types.h"
 #include "DNA_listBase.h"
diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_api.h b/source/blender/windowmanager/gizmo/WM_gizmo_api.h
index 2a4f6b344a9..55c4acf9380 100644
--- a/source/blender/windowmanager/gizmo/WM_gizmo_api.h
+++ b/source/blender/windowmanager/gizmo/WM_gizmo_api.h
@@ -41,16 +41,16 @@ struct GHashIterator;
 struct IDProperty;
 struct Main;
 struct PropertyRNA;
-struct wmKeyConfig;
 struct wmGizmo;
-struct wmGizmoProperty;
-struct wmGizmoPropertyType;
-struct wmGizmoType;
 struct wmGizmoGroup;
 struct wmGizmoGroupType;
 struct wmGizmoMap;
 struct wmGizmoMapType;
 struct wmGizmoMapType_Params;
+struct wmGizmoProperty;
+struct wmGizmoPropertyType;
+struct wmGizmoType;
+struct wmKeyConfig;
 struct wmMsgSubscribeKey;
 struct wmMsgSubscribeValue;
 
diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_types.h b/source/blender/windowmanager/gizmo/WM_gizmo_types.h
index b000305d15b..c130130b9b8 100644
--- a/source/blender/windowmanager/gizmo/WM_gizmo_types.h
+++ b/source/blender/windowmanager/gizmo/WM_gizmo_types.h
@@ -38,10 +38,10 @@
 
 #include "BLI_compiler_attrs.h"
 
-struct wmGizmoMapType;
-struct wmGizmoGroupType;
-struct wmGizmoGroup;
 struct wmGizmo;
+struct wmGizmoGroup;
+struct wmGizmoGroupType;
+struct wmGizmoMapType;
 struct wmGizmoProperty;
 struct wmKeyConfig;
 
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
index a580a063aaf..d79be78eef8 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
@@ -28,10 +28,10 @@
 #ifndef __WM_GIZMO_INTERN_H__
 #define __WM_GIZMO_INTERN_H__
 
-struct wmKeyConfig;
-struct wmGizmoMap;
-struct GizmoGeomInfo;
 struct GHashIterator;
+struct GizmoGeomInfo;
+struct wmGizmoMap;
+struct wmKeyConfig;
 
 #include "wm_gizmo_fn.h"
 
diff --git a/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
index 414109e89e5..3eb6e82c68b 100644
--- a/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
+++ b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
@@ -40,8 +40,8 @@
 
 struct wmEventHandler;
 struct wmGizmoMap;
-struct wmOperatorType;
 struct wmOperator;
+struct wmOperatorType;
 
 
 /* -------------------------------------------------------------------- */
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index 89fd2fdf557..5e469a2255d 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -32,8 +32,8 @@
 #define __WM_H__
 
 struct ARegion;
-struct wmWindow;
 struct ReportList;
+struct wmWindow;
 
 #include "gizmo/wm_gizmo_wmapi.h"
 
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 1e0f3cd6b35..892c621eb51 100644
--- a/source/blender/windowmanager/wm_draw.h
+++ b/source/blender/windowmanager/wm_draw.h
@@ -35,8 +35,8 @@
 #include "GPU_glew.h"
 
 struct GPUOffScreen;
-struct GPUViewport;
 struct GPUTexture;
+struct GPUViewport;
 
 typedef struct wmDrawBuffer {
 	struct GPUOffScreen *offscreen[2];
@@ -45,9 +45,9 @@ typedef struct wmDrawBuffer {
 	int bound_view;
 } wmDrawBuffer;
 
+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 fe28cbf9895..ea9de7d2902 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 saveable */
 
diff --git a/source/blender/windowmanager/wm_window.h b/source/blender/windowmanager/wm_window.h
index 5988c8dab17..da244314721 100644
--- a/source/blender/windowmanager/wm_window.h
+++ b/source/blender/windowmanager/wm_window.h
@@ -33,10 +33,10 @@
 #define __WM_WINDOW_H__
 
 struct EnumPropertyItem;
-struct wmEvent;
-struct wmOperator;
 struct PointerRNA;
 struct PropertyRNA;
+struct wmEvent;
+struct wmOperator;
 
 /* *************** internal api ************** */
 void		wm_ghost_init			(bContext *C);