Cleanup: `make format` after SortedIncludes change

83 files changed, 229 insertions, 229 deletions

diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 3eaee4a1ef4..46854bc6307 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -18,22 +18,22 @@
  * \ingroup RNA
  */
 
-#include <inttypes.h>
+#include <errno.h>
 #include <float.h>
+#include <inttypes.h>
 #include <limits.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
 
 #include "RNA_define.h"
-#include "RNA_types.h"
 #include "RNA_enum_types.h"
+#include "RNA_types.h"
 
 #include "rna_internal.h"
 
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index 9a660153a3b..42cec23975c 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -18,13 +18,13 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "DNA_ID.h"
-#include "DNA_vfont_types.h"
 #include "DNA_material_types.h"
 #include "DNA_object_types.h"
+#include "DNA_vfont_types.h"
 
 #include "BLI_utildefines.h"
 
@@ -93,15 +93,15 @@ const EnumPropertyItem rna_enum_id_type_items[] = {
 #  include "BLI_listbase.h"
 #  include "BLI_math_base.h"
 
+#  include "BKE_animsys.h"
 #  include "BKE_font.h"
+#  include "BKE_global.h" /* XXX, remove me */
 #  include "BKE_idprop.h"
-#  include "BKE_lib_query.h"
 #  include "BKE_lib_override.h"
+#  include "BKE_lib_query.h"
 #  include "BKE_lib_remap.h"
 #  include "BKE_library.h"
-#  include "BKE_animsys.h"
 #  include "BKE_material.h"
-#  include "BKE_global.h" /* XXX, remove me */
 
 #  include "DEG_depsgraph.h"
 #  include "DEG_depsgraph_build.h"
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 33f9b2da280..bc5a5d58790 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -18,24 +18,24 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
+#include <ctype.h>
 #include <stddef.h>
+#include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "MEM_guardedalloc.h"
 
 #include "DNA_ID.h"
-#include "DNA_scene_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_modifier_types.h"
+#include "DNA_scene_types.h"
 #include "DNA_windowmanager_types.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_utildefines.h"
 #include "BLI_dynstr.h"
 #include "BLI_ghash.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BLF_api.h"
 #include "BLT_translation.h"
@@ -43,12 +43,12 @@
 #include "BKE_animsys.h"
 #include "BKE_collection.h"
 #include "BKE_context.h"
+#include "BKE_fcurve.h"
 #include "BKE_idcode.h"
 #include "BKE_idprop.h"
-#include "BKE_fcurve.h"
 #include "BKE_main.h"
-#include "BKE_report.h"
 #include "BKE_node.h"
+#include "BKE_report.h"
 
 #include "DEG_depsgraph.h"
 
@@ -63,8 +63,8 @@
 #include "DNA_object_types.h"
 #include "WM_types.h"
 
-#include "rna_internal.h"
 #include "rna_access_internal.h"
+#include "rna_internal.h"
 
 const PointerRNA PointerRNA_NULL = {NULL};
 
diff --git a/source/blender/makesrna/intern/rna_access_compare_override.c b/source/blender/makesrna/intern/rna_access_compare_override.c
index 96f152f0868..22d018c6025 100644
--- a/source/blender/makesrna/intern/rna_access_compare_override.c
+++ b/source/blender/makesrna/intern/rna_access_compare_override.c
@@ -24,8 +24,8 @@
 #include "DNA_constraint_types.h"
 #include "DNA_modifier_types.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 // #define DEBUG_OVERRIDE_TIMEIT
 
@@ -41,8 +41,8 @@
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
 
-#include "rna_internal.h"
 #include "rna_access_internal.h"
+#include "rna_internal.h"
 
 int RNA_property_override_flag(PropertyRNA *prop)
 {
diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c
index a9dfa8b529e..0685fb270f1 100644
--- a/source/blender/makesrna/intern/rna_action.c
+++ b/source/blender/makesrna/intern/rna_action.c
@@ -20,8 +20,8 @@
 
 #include <stdlib.h>
 
-#include "DNA_anim_types.h"
 #include "DNA_action_types.h"
+#include "DNA_anim_types.h"
 #include "DNA_scene_types.h"
 
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/makesrna/intern/rna_action_api.c b/source/blender/makesrna/intern/rna_action_api.c
index 76a9a255d62..48da32afba5 100644
--- a/source/blender/makesrna/intern/rna_action_api.c
+++ b/source/blender/makesrna/intern/rna_action_api.c
@@ -21,8 +21,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c
index 9aafdb02f69..036bcfc6311 100644
--- a/source/blender/makesrna/intern/rna_animation.c
+++ b/source/blender/makesrna/intern/rna_animation.c
@@ -20,8 +20,8 @@
 
 #include <stdlib.h>
 
-#include "DNA_anim_types.h"
 #include "DNA_action_types.h"
+#include "DNA_anim_types.h"
 #include "DNA_scene_types.h"
 
 #include "BLI_utildefines.h"
diff --git a/source/blender/makesrna/intern/rna_animation_api.c b/source/blender/makesrna/intern/rna_animation_api.c
index 9da845d66f2..95b89e7efe4 100644
--- a/source/blender/makesrna/intern/rna_animation_api.c
+++ b/source/blender/makesrna/intern/rna_animation_api.c
@@ -21,8 +21,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -36,8 +36,8 @@
 #ifdef RNA_RUNTIME
 
 #  include "BKE_context.h"
-#  include "BKE_report.h"
 #  include "BKE_nla.h"
+#  include "BKE_report.h"
 
 #  include "ED_keyframing.h"
 
diff --git a/source/blender/makesrna/intern/rna_animviz.c b/source/blender/makesrna/intern/rna_animviz.c
index 61a1f1ffcd5..06215e16965 100644
--- a/source/blender/makesrna/intern/rna_animviz.c
+++ b/source/blender/makesrna/intern/rna_animviz.c
@@ -20,8 +20,8 @@
 
 #include <stdlib.h>
 
-#include "DNA_anim_types.h"
 #include "DNA_action_types.h"
+#include "DNA_anim_types.h"
 #include "DNA_scene_types.h"
 
 #include "BLI_utildefines.h"
diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c
index 232f3d86fd3..3afbd0405fe 100644
--- a/source/blender/makesrna/intern/rna_armature.c
+++ b/source/blender/makesrna/intern/rna_armature.c
@@ -44,8 +44,8 @@
 #  include "BKE_idprop.h"
 #  include "BKE_main.h"
 
-#  include "ED_armature.h"
 #  include "BKE_armature.h"
+#  include "ED_armature.h"
 
 #  include "DEG_depsgraph.h"
 #  include "DEG_depsgraph_build.h"
diff --git a/source/blender/makesrna/intern/rna_armature_api.c b/source/blender/makesrna/intern/rna_armature_api.c
index 2b60dbde39f..a9d39b7eda8 100644
--- a/source/blender/makesrna/intern/rna_armature_api.c
+++ b/source/blender/makesrna/intern/rna_armature_api.c
@@ -21,8 +21,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
@@ -36,8 +36,8 @@
 
 #  include "DNA_armature_types.h"
 
-#  include "BLI_math_vector.h"
 #  include "BKE_armature.h"
+#  include "BLI_math_vector.h"
 
 static void rna_EditBone_align_roll(EditBone *ebo, float no[3])
 {
diff --git a/source/blender/makesrna/intern/rna_boid.c b/source/blender/makesrna/intern/rna_boid.c
index 01d1d1ddddb..8a28a03cc71 100644
--- a/source/blender/makesrna/intern/rna_boid.c
+++ b/source/blender/makesrna/intern/rna_boid.c
@@ -25,10 +25,10 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include "DNA_scene_types.h"
 #include "DNA_boid_types.h"
 #include "DNA_object_types.h"
 #include "DNA_particle_types.h"
+#include "DNA_scene_types.h"
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index 5ea1b696e49..b18f50e3837 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -18,15 +18,15 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <assert.h>
+#include <stdlib.h>
 
 #include "DNA_brush_types.h"
-#include "DNA_texture_types.h"
-#include "DNA_scene_types.h"
+#include "DNA_gpencil_types.h"
 #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_texture_types.h"
 #include "DNA_workspace_types.h"
-#include "DNA_gpencil_types.h"
 
 #include "BLI_math.h"
 
diff --git a/source/blender/makesrna/intern/rna_camera_api.c b/source/blender/makesrna/intern/rna_camera_api.c
index cbbd8377c7f..49271f95056 100644
--- a/source/blender/makesrna/intern/rna_camera_api.c
+++ b/source/blender/makesrna/intern/rna_camera_api.c
@@ -18,8 +18,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "RNA_define.h"
diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c
index 59040df56c3..1dae78b9efd 100644
--- a/source/blender/makesrna/intern/rna_cloth.c
+++ b/source/blender/makesrna/intern/rna_cloth.c
@@ -18,8 +18,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <limits.h>
+#include <stdlib.h>
 
 #include "DNA_cloth_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/makesrna/intern/rna_collection.c b/source/blender/makesrna/intern/rna_collection.c
index fb366422f34..709be0cf842 100644
--- a/source/blender/makesrna/intern/rna_collection.c
+++ b/source/blender/makesrna/intern/rna_collection.c
@@ -32,8 +32,8 @@
 
 #ifdef RNA_RUNTIME
 
-#  include "DNA_scene_types.h"
 #  include "DNA_object_types.h"
+#  include "DNA_scene_types.h"
 
 #  include "DEG_depsgraph.h"
 #  include "DEG_depsgraph_build.h"
diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c
index 215ccc78bc2..56ad8e2677b 100644
--- a/source/blender/makesrna/intern/rna_color.c
+++ b/source/blender/makesrna/intern/rna_color.c
@@ -18,8 +18,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "DNA_color_types.h"
 #include "DNA_texture_types.h"
@@ -49,10 +49,10 @@
 #  include "BKE_colorband.h"
 #  include "BKE_colortools.h"
 #  include "BKE_image.h"
+#  include "BKE_linestyle.h"
 #  include "BKE_movieclip.h"
 #  include "BKE_node.h"
 #  include "BKE_sequencer.h"
-#  include "BKE_linestyle.h"
 
 #  include "DEG_depsgraph.h"
 
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c
index 64e6fc9059c..dc0cde953f4 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -285,8 +285,8 @@ static const EnumPropertyItem space_object_items[] = {
 
 #  include "DNA_cachefile_types.h"
 
-#  include "BKE_animsys.h"
 #  include "BKE_action.h"
+#  include "BKE_animsys.h"
 #  include "BKE_constraint.h"
 #  include "BKE_context.h"
 
diff --git a/source/blender/makesrna/intern/rna_context.c b/source/blender/makesrna/intern/rna_context.c
index c4c54aac2c6..c8abf774561 100644
--- a/source/blender/makesrna/intern/rna_context.c
+++ b/source/blender/makesrna/intern/rna_context.c
@@ -23,8 +23,8 @@
 #include "DNA_ID.h"
 #include "DNA_userdef_types.h"
 
-#include "BLI_utildefines.h"
 #include "BKE_context.h"
+#include "BLI_utildefines.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index ff132b52eb3..8b2658c7e0c 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -25,8 +25,8 @@
 #include "DNA_material_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/makesrna/intern/rna_curve_api.c b/source/blender/makesrna/intern/rna_curve_api.c
index 3ff244aed6d..1207f19b95f 100644
--- a/source/blender/makesrna/intern/rna_curve_api.c
+++ b/source/blender/makesrna/intern/rna_curve_api.c
@@ -21,8 +21,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "RNA_define.h"
 
diff --git a/source/blender/makesrna/intern/rna_curveprofile.c b/source/blender/makesrna/intern/rna_curveprofile.c
index c9ba338b9d6..94a35bdede8 100644
--- a/source/blender/makesrna/intern/rna_curveprofile.c
+++ b/source/blender/makesrna/intern/rna_curveprofile.c
@@ -18,11 +18,11 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
-#include "DNA_curveprofile_types.h"
 #include "DNA_curve_types.h"
+#include "DNA_curveprofile_types.h"
 #include "DNA_texture_types.h"
 
 #include "BLI_utildefines.h"
@@ -50,10 +50,10 @@
 #  include "BKE_colorband.h"
 #  include "BKE_curveprofile.h"
 #  include "BKE_image.h"
+#  include "BKE_linestyle.h"
 #  include "BKE_movieclip.h"
 #  include "BKE_node.h"
 #  include "BKE_sequencer.h"
-#  include "BKE_linestyle.h"
 
 #  include "DEG_depsgraph.h"
 
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index fc81fd52cf3..f5e7f87cfbd 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -18,23 +18,23 @@
  * \ingroup RNA
  */
 
+#include <ctype.h>
 #include <float.h>
 #include <limits.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "BLI_utildefines.h"
 #include "MEM_guardedalloc.h"
 
+#include "DNA_defaults.h"
 #include "DNA_genfile.h"
 #include "DNA_sdna_types.h"
-#include "DNA_defaults.h"
 
-#include "BLI_listbase.h"
 #include "BLI_ghash.h"
+#include "BLI_listbase.h"
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c
index b45b1117c2e..66c8522c53a 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@ -20,8 +20,8 @@
 
 #include <stdlib.h>
 
-#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
+#include "BLI_utildefines.h"
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.c b/source/blender/makesrna/intern/rna_dynamicpaint.c
index d7e34ff139c..f86cfb674d1 100644
--- a/source/blender/makesrna/intern/rna_dynamicpaint.c
+++ b/source/blender/makesrna/intern/rna_dynamicpaint.c
@@ -18,11 +18,11 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <limits.h>
+#include <stdlib.h>
 
-#include "BKE_modifier.h"
 #include "BKE_dynamicpaint.h"
+#include "BKE_modifier.h"
 
 #include "DNA_dynamicpaint_types.h"
 #include "DNA_modifier_types.h"
diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c
index 424bb4a492f..b6a2d38ba18 100644
--- a/source/blender/makesrna/intern/rna_fcurve.c
+++ b/source/blender/makesrna/intern/rna_fcurve.c
@@ -39,8 +39,8 @@
 
 #include "WM_types.h"
 
-#include "ED_keyframing.h"
 #include "ED_keyframes_edit.h"
+#include "ED_keyframing.h"
 
 const EnumPropertyItem rna_enum_fmodifier_type_items[] = {
     {FMODIFIER_TYPE_NULL, "NULL", 0, "Invalid", ""},
@@ -211,8 +211,8 @@ static StructRNA *rna_FModifierType_refine(struct PointerRNA *ptr)
 
 /* ****************************** */
 
-#  include "BKE_fcurve.h"
 #  include "BKE_animsys.h"
+#  include "BKE_fcurve.h"
 
 #  include "DEG_depsgraph.h"
 #  include "DEG_depsgraph_build.h"
diff --git a/source/blender/makesrna/intern/rna_fcurve_api.c b/source/blender/makesrna/intern/rna_fcurve_api.c
index 4cc38d3616c..4ee25be946c 100644
--- a/source/blender/makesrna/intern/rna_fcurve_api.c
+++ b/source/blender/makesrna/intern/rna_fcurve_api.c
@@ -21,8 +21,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c
index bd74973b7d7..9b46d0cd4a7 100644
--- a/source/blender/makesrna/intern/rna_fluid.c
+++ b/source/blender/makesrna/intern/rna_fluid.c
@@ -18,31 +18,31 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <limits.h>
+#include <stdlib.h>
 
-#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
 #include "BLI_sys_types.h"
+#include "BLI_utildefines.h"
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
 
 #include "rna_internal.h"
 
-#include "BKE_modifier.h"
 #include "BKE_fluid.h"
+#include "BKE_modifier.h"
 #include "BKE_pointcache.h"
 
+#include "DNA_fluid_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_fluid_types.h"
 #include "DNA_particle_types.h"
+#include "DNA_scene_types.h"
 
-#include "WM_types.h"
 #include "WM_api.h"
+#include "WM_types.h"
 
 #ifdef RNA_RUNTIME
 
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index a4e6f6762b1..f451126a7e0 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -22,11 +22,11 @@
 
 #include "BLI_math.h"
 
-#include "DNA_meshdata_types.h"
-#include "DNA_gpencil_types.h"
-#include "DNA_scene_types.h"
 #include "DNA_brush_types.h"
+#include "DNA_gpencil_types.h"
+#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index 00188ac0887..34eee9415d9 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -25,10 +25,10 @@
 #include "DNA_armature_types.h"
 #include "DNA_brush_types.h"
 #include "DNA_cachefile_types.h"
-#include "DNA_mesh_types.h"
 #include "DNA_gpencil_modifier_types.h"
-#include "DNA_object_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_object_force_types.h"
+#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
 #include "MEM_guardedalloc.h"
@@ -42,10 +42,10 @@
 #include "BKE_data_transfer.h"
 #include "BKE_dynamicpaint.h"
 #include "BKE_effect.h"
+#include "BKE_fluid.h" /* For BKE_fluid_modifier_free & BKE_fluid_modifier_create_type_data */
 #include "BKE_mesh_mapping.h"
 #include "BKE_mesh_remap.h"
 #include "BKE_multires.h"
-#include "BKE_fluid.h" /* For BKE_fluid_modifier_free & BKE_fluid_modifier_create_type_data */
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -174,15 +174,15 @@ static const EnumPropertyItem gpencil_tint_type_items[] = {
 
 #ifdef RNA_RUNTIME
 
-#  include "DNA_particle_types.h"
 #  include "DNA_curve_types.h"
 #  include "DNA_fluid_types.h"
+#  include "DNA_particle_types.h"
 
 #  include "BKE_cachefile.h"
 #  include "BKE_context.h"
+#  include "BKE_gpencil.h"
 #  include "BKE_gpencil_modifier.h"
 #  include "BKE_object.h"
-#  include "BKE_gpencil.h"
 
 #  include "DEG_depsgraph.h"
 #  include "DEG_depsgraph_build.h"
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index 8f2a841b55c..2797f3a2d84 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -37,8 +37,8 @@
 
 #include "rna_internal.h"
 
-#include "WM_types.h"
 #include "WM_api.h"
+#include "WM_types.h"
 
 const EnumPropertyItem rna_enum_image_generated_type_items[] = {
     {IMA_GENTYPE_BLANK, "BLANK", 0, "Blank", "Generate a blank image"},
diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c
index 7b5612ef8e7..fe3ef21d15e 100644
--- a/source/blender/makesrna/intern/rna_image_api.c
+++ b/source/blender/makesrna/intern/rna_image_api.c
@@ -21,15 +21,15 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 #include "DNA_packedFile_types.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
+#include "BLI_utildefines.h"
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -40,12 +40,12 @@
 
 #ifdef RNA_RUNTIME
 
-#  include <errno.h>
 #  include "BKE_image.h"
 #  include "BKE_main.h"
+#  include <errno.h>
 
-#  include "IMB_imbuf.h"
 #  include "IMB_colormanagement.h"
+#  include "IMB_imbuf.h"
 
 #  include "DNA_image_types.h"
 #  include "DNA_scene_types.h"
diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c
index 46c3adbd6ef..d8628097490 100644
--- a/source/blender/makesrna/intern/rna_key.c
+++ b/source/blender/makesrna/intern/rna_key.c
@@ -21,14 +21,14 @@
 #include <stdlib.h>
 
 #include "DNA_ID.h"
-#include "DNA_scene_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_key_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_scene_types.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/makesrna/intern/rna_lattice.c b/source/blender/makesrna/intern/rna_lattice.c
index 34f5b6caee1..176fb838e91 100644
--- a/source/blender/makesrna/intern/rna_lattice.c
+++ b/source/blender/makesrna/intern/rna_lattice.c
@@ -36,16 +36,16 @@
 #  include "DNA_object_types.h"
 #  include "DNA_scene_types.h"
 
-#  include "BLI_string.h"
+#  include "BKE_deform.h"
 #  include "BKE_lattice.h"
 #  include "BKE_main.h"
-#  include "BKE_deform.h"
+#  include "BLI_string.h"
 
 #  include "DEG_depsgraph.h"
 
+#  include "ED_lattice.h"
 #  include "WM_api.h"
 #  include "WM_types.h"
-#  include "ED_lattice.h"
 
 static void rna_LatticePoint_co_get(PointerRNA *ptr, float *values)
 {
diff --git a/source/blender/makesrna/intern/rna_lattice_api.c b/source/blender/makesrna/intern/rna_lattice_api.c
index 6aa9dfe803d..0b61603dd09 100644
--- a/source/blender/makesrna/intern/rna_lattice_api.c
+++ b/source/blender/makesrna/intern/rna_lattice_api.c
@@ -21,8 +21,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "RNA_define.h"
 
diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c
index bf8df14d258..3883ffab246 100644
--- a/source/blender/makesrna/intern/rna_layer.c
+++ b/source/blender/makesrna/intern/rna_layer.c
@@ -18,8 +18,8 @@
  * \ingroup RNA
  */
 
-#include "DNA_scene_types.h"
 #include "DNA_layer_types.h"
+#include "DNA_scene_types.h"
 #include "DNA_view3d_types.h"
 
 #include "BLT_translation.h"
@@ -51,9 +51,9 @@
 
 #  include "BKE_idprop.h"
 #  include "BKE_layer.h"
+#  include "BKE_mesh.h"
 #  include "BKE_node.h"
 #  include "BKE_scene.h"
-#  include "BKE_mesh.h"
 
 #  include "DEG_depsgraph_build.h"
 #  include "DEG_depsgraph_query.h"
diff --git a/source/blender/makesrna/intern/rna_light.c b/source/blender/makesrna/intern/rna_light.c
index 988504db2f9..c19dafb3bc6 100644
--- a/source/blender/makesrna/intern/rna_light.c
+++ b/source/blender/makesrna/intern/rna_light.c
@@ -20,9 +20,9 @@
 
 #include <stdlib.h>
 
-#include "BLI_sys_types.h"
 #include "BLI_math_base.h"
 #include "BLI_math_rotation.h"
+#include "BLI_sys_types.h"
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/makesrna/intern/rna_linestyle.c b/source/blender/makesrna/intern/rna_linestyle.c
index f5730885193..788246f5edd 100644
--- a/source/blender/makesrna/intern/rna_linestyle.c
+++ b/source/blender/makesrna/intern/rna_linestyle.c
@@ -32,8 +32,8 @@
 #include "DNA_material_types.h"
 #include "DNA_texture_types.h"
 
-#include "WM_types.h"
 #include "WM_api.h"
+#include "WM_types.h"
 
 const EnumPropertyItem rna_enum_linestyle_color_modifier_type_items[] = {
     {LS_MODIFIER_ALONG_STROKE, "ALONG_STROKE", ICON_MODIFIER, "Along Stroke", ""},
diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c
index 949a7e44feb..855d5f46890 100644
--- a/source/blender/makesrna/intern/rna_main.c
+++ b/source/blender/makesrna/intern/rna_main.c
@@ -21,19 +21,19 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
+#include "BLI_utildefines.h"
 
-#include "RNA_define.h"
 #include "RNA_access.h"
+#include "RNA_define.h"
 
 #include "rna_internal.h"
 
 #ifdef RNA_RUNTIME
 
+#  include "BKE_global.h"
 #  include "BKE_main.h"
 #  include "BKE_mesh.h"
-#  include "BKE_global.h"
 
 /* all the list begin functions are added manually here, Main is not in SDNA */
 
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index dfd94ccc927..6143af32c75 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -21,19 +21,19 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "DNA_ID.h"
 #include "DNA_modifier_types.h"
-#include "DNA_space_types.h"
 #include "DNA_object_types.h"
+#include "DNA_space_types.h"
 
 #include "BLI_utildefines.h"
 
-#include "RNA_define.h"
 #include "RNA_access.h"
+#include "RNA_define.h"
 #include "RNA_enum_types.h"
 
 #include "rna_internal.h"
@@ -53,9 +53,9 @@
 #  include "BKE_icons.h"
 #  include "BKE_idcode.h"
 #  include "BKE_image.h"
-#  include "BKE_light.h"
 #  include "BKE_lattice.h"
 #  include "BKE_lib_remap.h"
+#  include "BKE_light.h"
 #  include "BKE_lightprobe.h"
 #  include "BKE_linestyle.h"
 #  include "BKE_mask.h"
@@ -81,30 +81,30 @@
 #  include "DEG_depsgraph_query.h"
 
 #  include "DNA_armature_types.h"
+#  include "DNA_brush_types.h"
 #  include "DNA_camera_types.h"
+#  include "DNA_collection_types.h"
 #  include "DNA_curve_types.h"
+#  include "DNA_gpencil_types.h"
 #  include "DNA_hair_types.h"
+#  include "DNA_lattice_types.h"
 #  include "DNA_light_types.h"
+#  include "DNA_lightprobe_types.h"
+#  include "DNA_mask_types.h"
 #  include "DNA_material_types.h"
 #  include "DNA_mesh_types.h"
-#  include "DNA_speaker_types.h"
-#  include "DNA_sound_types.h"
-#  include "DNA_lightprobe_types.h"
-#  include "DNA_text_types.h"
-#  include "DNA_texture_types.h"
-#  include "DNA_collection_types.h"
-#  include "DNA_brush_types.h"
-#  include "DNA_lattice_types.h"
 #  include "DNA_meta_types.h"
-#  include "DNA_world_types.h"
+#  include "DNA_movieclip_types.h"
+#  include "DNA_node_types.h"
 #  include "DNA_particle_types.h"
 #  include "DNA_pointcloud_types.h"
+#  include "DNA_sound_types.h"
+#  include "DNA_speaker_types.h"
+#  include "DNA_text_types.h"
+#  include "DNA_texture_types.h"
 #  include "DNA_vfont_types.h"
 #  include "DNA_volume_types.h"
-#  include "DNA_node_types.h"
-#  include "DNA_movieclip_types.h"
-#  include "DNA_mask_types.h"
-#  include "DNA_gpencil_types.h"
+#  include "DNA_world_types.h"
 
 #  include "ED_screen.h"
 
diff --git a/source/blender/makesrna/intern/rna_mask.c b/source/blender/makesrna/intern/rna_mask.c
index adc041174aa..687b32dec04 100644
--- a/source/blender/makesrna/intern/rna_mask.c
+++ b/source/blender/makesrna/intern/rna_mask.c
@@ -18,8 +18,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <limits.h>
+#include <stdlib.h>
 
 #include "MEM_guardedalloc.h"
 
@@ -39,8 +39,8 @@
 
 #include "WM_types.h"
 
-#include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
 
 #ifdef RNA_RUNTIME
 
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index f206e0061fc..5c1697c70f4 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -71,22 +71,22 @@ const EnumPropertyItem rna_enum_ramp_blend_items[] = {
 
 #  include "BKE_colorband.h"
 #  include "BKE_context.h"
-#  include "BKE_main.h"
 #  include "BKE_gpencil.h"
+#  include "BKE_main.h"
 #  include "BKE_material.h"
-#  include "BKE_texture.h"
 #  include "BKE_node.h"
 #  include "BKE_paint.h"
 #  include "BKE_scene.h"
+#  include "BKE_texture.h"
 #  include "BKE_workspace.h"
 
 #  include "DEG_depsgraph.h"
 #  include "DEG_depsgraph_build.h"
 
-#  include "ED_node.h"
+#  include "ED_gpencil.h"
 #  include "ED_image.h"
+#  include "ED_node.h"
 #  include "ED_screen.h"
-#  include "ED_gpencil.h"
 
 static void rna_Material_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
diff --git a/source/blender/makesrna/intern/rna_material_api.c b/source/blender/makesrna/intern/rna_material_api.c
index 9f03b5f1a27..f5b13fdbc81 100644
--- a/source/blender/makesrna/intern/rna_material_api.c
+++ b/source/blender/makesrna/intern/rna_material_api.c
@@ -21,8 +21,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index 805abdd9aa6..54539924fde 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -39,8 +39,8 @@
 
 #include "RNA_access.h"
 #include "RNA_define.h"
-#include "RNA_types.h"
 #include "RNA_enum_types.h"
+#include "RNA_types.h"
 
 #include "rna_internal.h"
 
diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c
index 0b3a7802082..cc0b2eacd13 100644
--- a/source/blender/makesrna/intern/rna_mesh_api.c
+++ b/source/blender/makesrna/intern/rna_mesh_api.c
@@ -21,8 +21,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "RNA_define.h"
 
@@ -39,9 +39,9 @@
 #  include "DNA_mesh_types.h"
 
 #  include "BKE_mesh.h"
-#  include "BKE_mesh_tangent.h"
 #  include "BKE_mesh_mapping.h"
 #  include "BKE_mesh_runtime.h"
+#  include "BKE_mesh_tangent.h"
 #  include "ED_mesh.h"
 
 static const char *rna_Mesh_unit_test_compare(struct Mesh *mesh, struct Mesh *mesh2)
diff --git a/source/blender/makesrna/intern/rna_meta.c b/source/blender/makesrna/intern/rna_meta.c
index 2b2a928e280..382e83a5650 100644
--- a/source/blender/makesrna/intern/rna_meta.c
+++ b/source/blender/makesrna/intern/rna_meta.c
@@ -37,17 +37,17 @@
 
 #  include "MEM_guardedalloc.h"
 
-#  include "DNA_scene_types.h"
 #  include "DNA_object_types.h"
+#  include "DNA_scene_types.h"
 
-#  include "BKE_mball.h"
 #  include "BKE_main.h"
+#  include "BKE_mball.h"
 #  include "BKE_scene.h"
 
 #  include "DEG_depsgraph.h"
 
-#  include "WM_types.h"
 #  include "WM_api.h"
+#  include "WM_types.h"
 
 static int rna_Meta_texspace_editable(PointerRNA *ptr, const char **UNUSED(r_info))
 {
diff --git a/source/blender/makesrna/intern/rna_meta_api.c b/source/blender/makesrna/intern/rna_meta_api.c
index 2678ed30024..178209d1152 100644
--- a/source/blender/makesrna/intern/rna_meta_api.c
+++ b/source/blender/makesrna/intern/rna_meta_api.c
@@ -21,8 +21,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "RNA_define.h"
 
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 6440b140183..a91dd2e33c7 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -26,8 +26,8 @@
 #include "DNA_cachefile_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
 #include "DNA_object_force_types.h"
+#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
 #include "MEM_guardedalloc.h"
@@ -41,11 +41,11 @@
 #include "BKE_data_transfer.h"
 #include "BKE_dynamicpaint.h"
 #include "BKE_effect.h"
+#include "BKE_fluid.h" /* For BKE_fluid_modifier_free & BKE_fluid_modifier_create_type_data */
 #include "BKE_mesh_mapping.h"
 #include "BKE_mesh_remap.h"
 #include "BKE_multires.h"
 #include "BKE_ocean.h"
-#include "BKE_fluid.h" /* For BKE_fluid_modifier_free & BKE_fluid_modifier_create_type_data */
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -577,9 +577,9 @@ const EnumPropertyItem rna_enum_axis_flag_xyz_items[] = {
 };
 
 #ifdef RNA_RUNTIME
-#  include "DNA_particle_types.h"
 #  include "DNA_curve_types.h"
 #  include "DNA_fluid_types.h"
+#  include "DNA_particle_types.h"
 
 #  include "BKE_cachefile.h"
 #  include "BKE_context.h"
diff --git a/source/blender/makesrna/intern/rna_movieclip.c b/source/blender/makesrna/intern/rna_movieclip.c
index 9bfa93ceba5..f55d44e7bad 100644
--- a/source/blender/makesrna/intern/rna_movieclip.c
+++ b/source/blender/makesrna/intern/rna_movieclip.c
@@ -18,8 +18,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <limits.h>
+#include <stdlib.h>
 
 #include "MEM_guardedalloc.h"
 
@@ -36,8 +36,8 @@
 
 #include "WM_types.h"
 
-#include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
 #include "IMB_metadata.h"
 
 #ifdef RNA_RUNTIME
diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c
index cf84d38a880..304cfb49594 100644
--- a/source/blender/makesrna/intern/rna_nla.c
+++ b/source/blender/makesrna/intern/rna_nla.c
@@ -20,8 +20,8 @@
 
 #include <stdlib.h>
 
-#include "DNA_anim_types.h"
 #include "DNA_action_types.h"
+#include "DNA_anim_types.h"
 #include "DNA_scene_types.h"
 
 #include "BLI_utildefines.h"
@@ -39,8 +39,8 @@
 
 #ifdef RNA_RUNTIME
 
-#  include <stdio.h>
 #  include <math.h>
+#  include <stdio.h>
 
 /* needed for some of the validation stuff... */
 #  include "BKE_animsys.h"
@@ -51,8 +51,8 @@
 
 #  include "ED_anim_api.h"
 
-#  include "DEG_depsgraph_build.h"
 #  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph_build.h"
 
 /* temp constant defined for these funcs only... */
 #  define NLASTRIP_MIN_LEN_THRESH 0.1f
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 663c263c7cc..5f6fcc71706 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -18,9 +18,9 @@
  * \ingroup RNA
  */
 
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
@@ -36,8 +36,8 @@
 #include "DNA_texture_types.h"
 
 #include "BKE_animsys.h"
-#include "BKE_node.h"
 #include "BKE_image.h"
+#include "BKE_node.h"
 #include "BKE_texture.h"
 
 #include "RNA_access.h"
@@ -329,9 +329,9 @@ static const EnumPropertyItem prop_shader_output_target_items[] = {
 #  include "GPU_material.h"
 
 #  include "NOD_common.h"
-#  include "NOD_socket.h"
-#  include "NOD_shader.h"
 #  include "NOD_composite.h"
+#  include "NOD_shader.h"
+#  include "NOD_socket.h"
 
 #  include "RE_engine.h"
 #  include "RE_pipeline.h"
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 8fb90b69bc0..959529450f0 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -25,16 +25,16 @@
 #include "DNA_brush_types.h"
 #include "DNA_collection_types.h"
 #include "DNA_customdata_types.h"
+#include "DNA_gpencil_modifier_types.h"
 #include "DNA_lightprobe_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_meta_types.h"
 #include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_meta_types.h"
-#include "DNA_workspace_types.h"
-#include "DNA_gpencil_modifier_types.h"
 #include "DNA_shader_fx_types.h"
+#include "DNA_workspace_types.h"
 
 #include "BLI_utildefines.h"
 
@@ -42,12 +42,12 @@
 
 #include "BKE_camera.h"
 #include "BKE_collection.h"
-#include "BKE_paint.h"
 #include "BKE_editlattice.h"
 #include "BKE_editmesh.h"
 #include "BKE_layer.h"
 #include "BKE_object_deform.h"
 #include "BKE_object_facemap.h"
+#include "BKE_paint.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -289,10 +289,10 @@ const EnumPropertyItem rna_enum_object_axis_items[] = {
 
 #  include "BLI_math.h"
 
-#  include "DNA_key_types.h"
+#  include "DNA_ID.h"
 #  include "DNA_constraint_types.h"
 #  include "DNA_gpencil_types.h"
-#  include "DNA_ID.h"
+#  include "DNA_key_types.h"
 #  include "DNA_lattice_types.h"
 #  include "DNA_node_types.h"
 
@@ -301,24 +301,24 @@ const EnumPropertyItem rna_enum_object_axis_items[] = {
 #  include "BKE_constraint.h"
 #  include "BKE_context.h"
 #  include "BKE_curve.h"
+#  include "BKE_deform.h"
 #  include "BKE_effect.h"
 #  include "BKE_global.h"
 #  include "BKE_key.h"
-#  include "BKE_object.h"
 #  include "BKE_material.h"
 #  include "BKE_mesh.h"
 #  include "BKE_modifier.h"
+#  include "BKE_object.h"
 #  include "BKE_particle.h"
 #  include "BKE_scene.h"
-#  include "BKE_deform.h"
 
 #  include "DEG_depsgraph.h"
 #  include "DEG_depsgraph_build.h"
 
-#  include "ED_object.h"
-#  include "ED_particle.h"
 #  include "ED_curve.h"
 #  include "ED_lattice.h"
+#  include "ED_object.h"
+#  include "ED_particle.h"
 
 static void rna_Object_internal_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index 2afebf7e3f6..1db44f4fdea 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -21,13 +21,13 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#include "BLI_utildefines.h"
 #include "BLI_kdopbvh.h"
+#include "BLI_utildefines.h"
 
 #include "RNA_define.h"
 
@@ -36,8 +36,8 @@
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 
-#include "BKE_layer.h"
 #include "BKE_gpencil.h"
+#include "BKE_layer.h"
 
 #include "DEG_depsgraph.h"
 
@@ -72,8 +72,8 @@ static const EnumPropertyItem space_items[] = {
 #  include "BKE_global.h"
 #  include "BKE_layer.h"
 #  include "BKE_main.h"
-#  include "BKE_mesh.h"
 #  include "BKE_mball.h"
+#  include "BKE_mesh.h"
 #  include "BKE_modifier.h"
 #  include "BKE_object.h"
 #  include "BKE_report.h"
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index 559b8ca4cc1..cd0c28457cf 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -21,11 +21,11 @@
 #include <stdlib.h>
 
 #include "DNA_cloth_types.h"
-#include "DNA_object_types.h"
+#include "DNA_fluid_types.h"
 #include "DNA_object_force_types.h"
+#include "DNA_object_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_fluid_types.h"
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
diff --git a/source/blender/makesrna/intern/rna_palette.c b/source/blender/makesrna/intern/rna_palette.c
index 42bfe1a13b7..67d6daf5a13 100644
--- a/source/blender/makesrna/intern/rna_palette.c
+++ b/source/blender/makesrna/intern/rna_palette.c
@@ -22,8 +22,8 @@
 
 #include "BLI_utildefines.h"
 
-#include "RNA_define.h"
 #include "RNA_access.h"
+#include "RNA_define.h"
 
 #include "rna_internal.h"
 
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 3747dd53b97..47a20518648 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -20,20 +20,20 @@
  * \ingroup RNA
  */
 
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <limits.h>
 
+#include "DNA_boid_types.h"
+#include "DNA_cloth_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
-#include "DNA_cloth_types.h"
-#include "DNA_particle_types.h"
 #include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
+#include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_boid_types.h"
 #include "DNA_texture_types.h"
 
 #include "RNA_define.h"
@@ -45,8 +45,8 @@
 
 #include "rna_internal.h"
 
-#include "WM_types.h"
 #include "WM_api.h"
+#include "WM_types.h"
 
 #ifdef RNA_RUNTIME
 static const EnumPropertyItem part_from_items[] = {
@@ -149,9 +149,9 @@ static const EnumPropertyItem part_fluid_type_items[] = {
 #  include "BLI_string_utils.h"
 
 #  include "BKE_boids.h"
-#  include "BKE_context.h"
 #  include "BKE_cloth.h"
 #  include "BKE_colortools.h"
+#  include "BKE_context.h"
 #  include "BKE_deform.h"
 #  include "BKE_effect.h"
 #  include "BKE_material.h"
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index c6175f85bd8..17e5f3d3649 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -80,16 +80,16 @@ const EnumPropertyItem rna_enum_color_sets_items[] = {
 
 #  include "MEM_guardedalloc.h"
 
-#  include "BKE_context.h"
 #  include "BKE_constraint.h"
+#  include "BKE_context.h"
 #  include "BKE_global.h"
 #  include "BKE_idprop.h"
 
 #  include "DEG_depsgraph.h"
 #  include "DEG_depsgraph_build.h"
 
-#  include "ED_object.h"
 #  include "ED_armature.h"
+#  include "ED_object.h"
 
 #  include "WM_api.h"
 
diff --git a/source/blender/makesrna/intern/rna_pose_api.c b/source/blender/makesrna/intern/rna_pose_api.c
index 42b5c762c62..59704b00391 100644
--- a/source/blender/makesrna/intern/rna_pose_api.c
+++ b/source/blender/makesrna/intern/rna_pose_api.c
@@ -21,8 +21,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
@@ -39,8 +39,8 @@
 #ifdef RNA_RUNTIME
 
 /* #include "DNA_anim_types.h" */
-#  include "DNA_action_types.h" /* bPose */
 #  include "BKE_armature.h"
+#  include "DNA_action_types.h" /* bPose */
 
 static float rna_PoseBone_do_envelope(bPoseChannel *chan, float *vec)
 {
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index eeaa8f78438..03c7ffb75b6 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -21,16 +21,16 @@
 #include <stdlib.h>
 
 #include "DNA_node_types.h"
-#include "DNA_scene_types.h"
 #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
+#include "BLI_utildefines.h"
 
 #include "DEG_depsgraph.h"
 
-#include "BKE_scene.h"
 #include "BKE_image.h"
+#include "BKE_scene.h"
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -98,9 +98,9 @@ const EnumPropertyItem rna_enum_bake_pass_type_items[] = {
 #  include "BKE_context.h"
 #  include "BKE_report.h"
 
-#  include "IMB_colormanagement.h"
 #  include "GPU_extensions.h"
 #  include "GPU_shader.h"
+#  include "IMB_colormanagement.h"
 
 #  include "DEG_depsgraph_query.h"
 
diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c
index 03937a5434e..d0a836487b4 100644
--- a/source/blender/makesrna/intern/rna_rigidbody.c
+++ b/source/blender/makesrna/intern/rna_rigidbody.c
@@ -32,8 +32,8 @@
 #include "DNA_rigidbody_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "WM_types.h"
 
diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c
index 484fac18c8e..4ee144e9031 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -123,9 +123,9 @@ const EnumPropertyItem rna_enum_property_unit_items[] = {
 /** \} */
 
 #ifdef RNA_RUNTIME
-#  include "MEM_guardedalloc.h"
 #  include "BLI_ghash.h"
 #  include "BLI_string.h"
+#  include "MEM_guardedalloc.h"
 
 #  include "BKE_lib_override.h"
 
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index e96db76bd3a..932ac72324e 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -22,17 +22,17 @@
 
 #include "DNA_brush_types.h"
 #include "DNA_collection_types.h"
+#include "DNA_gpencil_types.h"
+#include "DNA_layer_types.h"
+#include "DNA_linestyle_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_rigidbody_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_layer_types.h"
-#include "DNA_linestyle_types.h"
+#include "DNA_screen_types.h" /* TransformOrientation */
 #include "DNA_userdef_types.h"
-#include "DNA_world_types.h"
-#include "DNA_gpencil_types.h"
 #include "DNA_view3d_types.h"
-#include "DNA_screen_types.h" /* TransformOrientation */
+#include "DNA_world_types.h"
 
 #include "IMB_imbuf_types.h"
 
@@ -44,8 +44,8 @@
 #include "BKE_editmesh.h"
 #include "BKE_paint.h"
 
-#include "ED_object.h"
 #include "ED_gpencil.h"
+#include "ED_object.h"
 
 #include "DRW_engine.h"
 
@@ -60,9 +60,9 @@
 
 #ifdef WITH_FFMPEG
 #  include "BKE_writeffmpeg.h"
+#  include "ffmpeg_compat.h"
 #  include <libavcodec/avcodec.h>
 #  include <libavformat/avformat.h>
-#  include "ffmpeg_compat.h"
 #endif
 
 #include "ED_render.h"
@@ -653,9 +653,9 @@ const EnumPropertyItem rna_enum_transform_orientation_items[] = {
 
 #  include "DNA_anim_types.h"
 #  include "DNA_color_types.h"
+#  include "DNA_mesh_types.h"
 #  include "DNA_node_types.h"
 #  include "DNA_object_types.h"
-#  include "DNA_mesh_types.h"
 #  include "DNA_text_types.h"
 #  include "DNA_workspace_types.h"
 
@@ -663,33 +663,33 @@ const EnumPropertyItem rna_enum_transform_orientation_items[] = {
 
 #  include "MEM_guardedalloc.h"
 
+#  include "BKE_animsys.h"
 #  include "BKE_brush.h"
 #  include "BKE_collection.h"
 #  include "BKE_colortools.h"
 #  include "BKE_context.h"
+#  include "BKE_freestyle.h"
 #  include "BKE_global.h"
+#  include "BKE_gpencil.h"
 #  include "BKE_idprop.h"
 #  include "BKE_image.h"
 #  include "BKE_layer.h"
 #  include "BKE_main.h"
+#  include "BKE_mesh.h"
 #  include "BKE_node.h"
 #  include "BKE_pointcache.h"
 #  include "BKE_scene.h"
-#  include "BKE_mesh.h"
 #  include "BKE_screen.h"
 #  include "BKE_sequencer.h"
-#  include "BKE_animsys.h"
-#  include "BKE_freestyle.h"
-#  include "BKE_gpencil.h"
 #  include "BKE_unit.h"
 
+#  include "ED_image.h"
 #  include "ED_info.h"
-#  include "ED_node.h"
-#  include "ED_view3d.h"
-#  include "ED_mesh.h"
 #  include "ED_keyframing.h"
-#  include "ED_image.h"
+#  include "ED_mesh.h"
+#  include "ED_node.h"
 #  include "ED_scene.h"
+#  include "ED_view3d.h"
 
 #  include "DEG_depsgraph_build.h"
 #  include "DEG_depsgraph_query.h"
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index 03032ac413e..c832c50bd5d 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -21,12 +21,12 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
-#include "BLI_utildefines.h"
 #include "BLI_kdopbvh.h"
 #include "BLI_path_util.h"
+#include "BLI_utildefines.h"
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c
index 89f65da335a..c6245f51e15 100644
--- a/source/blender/makesrna/intern/rna_screen.c
+++ b/source/blender/makesrna/intern/rna_screen.c
@@ -18,16 +18,16 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stddef.h>
+#include <stdlib.h>
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
 
 #include "rna_internal.h"
 
-#include "DNA_screen_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
 #include "DNA_workspace_types.h"
 
 const EnumPropertyItem rna_enum_region_type_items[] = {
@@ -55,8 +55,8 @@ const EnumPropertyItem rna_enum_region_type_items[] = {
 #ifdef RNA_RUNTIME
 
 #  include "BKE_global.h"
-#  include "BKE_workspace.h"
 #  include "BKE_screen.h"
+#  include "BKE_workspace.h"
 
 #  include "DEG_depsgraph.h"
 
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 743c47f4f48..04a54063a03 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -29,15 +29,15 @@
 #include "rna_internal.h"
 
 #include "DNA_ID.h"
+#include "DNA_brush_types.h"
 #include "DNA_gpencil_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_brush_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 
+#include "BKE_brush.h"
 #include "BKE_material.h"
 #include "BKE_paint.h"
-#include "BKE_brush.h"
 
 #include "ED_image.h"
 
@@ -115,11 +115,11 @@ const EnumPropertyItem rna_enum_symmetrize_direction_items[] = {
 
 #  include "BKE_collection.h"
 #  include "BKE_context.h"
+#  include "BKE_gpencil.h"
+#  include "BKE_object.h"
 #  include "BKE_particle.h"
 #  include "BKE_pbvh.h"
 #  include "BKE_pointcache.h"
-#  include "BKE_object.h"
-#  include "BKE_gpencil.h"
 
 #  include "DEG_depsgraph.h"
 
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index d4dd3365935..6677105b771 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -18,14 +18,14 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <limits.h>
+#include <stdlib.h>
 
 #include "DNA_anim_types.h"
+#include "DNA_movieclip_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
-#include "DNA_movieclip_types.h"
 #include "DNA_vfont_types.h"
 
 #include "BLI_math.h"
@@ -70,9 +70,9 @@ const EnumPropertyItem rna_enum_sequence_modifier_type_items[] = {
 #ifdef RNA_RUNTIME
 
 #  include "BKE_global.h"
-#  include "BKE_report.h"
 #  include "BKE_idprop.h"
 #  include "BKE_movieclip.h"
+#  include "BKE_report.h"
 
 #  include "WM_api.h"
 
diff --git a/source/blender/makesrna/intern/rna_sequencer_api.c b/source/blender/makesrna/intern/rna_sequencer_api.c
index 38bf1241b9c..d49a2ed1ea0 100644
--- a/source/blender/makesrna/intern/rna_sequencer_api.c
+++ b/source/blender/makesrna/intern/rna_sequencer_api.c
@@ -18,8 +18,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "DNA_scene_types.h"
diff --git a/source/blender/makesrna/intern/rna_sound.c b/source/blender/makesrna/intern/rna_sound.c
index 8402c4a8705..28a1c0f3cca 100644
--- a/source/blender/makesrna/intern/rna_sound.c
+++ b/source/blender/makesrna/intern/rna_sound.c
@@ -28,9 +28,9 @@
 
 #ifdef RNA_RUNTIME
 
-#  include "BKE_sound.h"
 #  include "BKE_context.h"
 #  include "BKE_sequencer.h"
+#  include "BKE_sound.h"
 
 #  include "DEG_depsgraph.h"
 
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 5d4ca44f53a..1b74cb8aece 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -29,8 +29,8 @@
 #include "BKE_key.h"
 #include "BKE_movieclip.h"
 #include "BKE_node.h"
-#include "BKE_studiolight.h"
 #include "BKE_sequencer.h"
+#include "BKE_studiolight.h"
 
 #include "ED_text.h"
 
@@ -39,12 +39,12 @@
 #include "DNA_action_types.h"
 #include "DNA_gpencil_types.h"
 #include "DNA_key_types.h"
+#include "DNA_mask_types.h"
 #include "DNA_material_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
-#include "DNA_space_types.h"
 #include "DNA_sequence_types.h"
-#include "DNA_mask_types.h"
+#include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_workspace_types.h"
 
@@ -495,14 +495,14 @@ const EnumPropertyItem rna_enum_file_sort_items[] = {
 #  include "BKE_brush.h"
 #  include "BKE_colortools.h"
 #  include "BKE_context.h"
+#  include "BKE_global.h"
+#  include "BKE_icons.h"
 #  include "BKE_idprop.h"
 #  include "BKE_layer.h"
-#  include "BKE_global.h"
 #  include "BKE_nla.h"
 #  include "BKE_paint.h"
 #  include "BKE_scene.h"
 #  include "BKE_screen.h"
-#  include "BKE_icons.h"
 #  include "BKE_workspace.h"
 
 #  include "DEG_depsgraph.h"
@@ -510,14 +510,14 @@ const EnumPropertyItem rna_enum_file_sort_items[] = {
 
 #  include "ED_anim_api.h"
 #  include "ED_buttons.h"
+#  include "ED_clip.h"
 #  include "ED_fileselect.h"
 #  include "ED_image.h"
 #  include "ED_node.h"
-#  include "ED_transform.h"
 #  include "ED_screen.h"
-#  include "ED_view3d.h"
 #  include "ED_sequencer.h"
-#  include "ED_clip.h"
+#  include "ED_transform.h"
+#  include "ED_view3d.h"
 
 #  include "GPU_material.h"
 
diff --git a/source/blender/makesrna/intern/rna_speaker.c b/source/blender/makesrna/intern/rna_speaker.c
index 8f156a67e08..27e8654306a 100644
--- a/source/blender/makesrna/intern/rna_speaker.c
+++ b/source/blender/makesrna/intern/rna_speaker.c
@@ -25,8 +25,8 @@
 
 #include "rna_internal.h"
 
-#include "DNA_speaker_types.h"
 #include "DNA_sound_types.h"
+#include "DNA_speaker_types.h"
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/makesrna/intern/rna_text.c b/source/blender/makesrna/intern/rna_text.c
index 778e817c73e..c8797a8bc74 100644
--- a/source/blender/makesrna/intern/rna_text.c
+++ b/source/blender/makesrna/intern/rna_text.c
@@ -18,8 +18,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <limits.h>
+#include <stdlib.h>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/makesrna/intern/rna_text_api.c b/source/blender/makesrna/intern/rna_text_api.c
index 000076eccec..b4c4a79ca75 100644
--- a/source/blender/makesrna/intern/rna_text_api.c
+++ b/source/blender/makesrna/intern/rna_text_api.c
@@ -18,8 +18,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index 356ecd5b4db..46b8d8647de 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -25,12 +25,12 @@
 #include "DNA_brush_types.h"
 #include "DNA_light_types.h"
 #include "DNA_material_types.h"
-#include "DNA_object_types.h"
-#include "DNA_texture_types.h"
-#include "DNA_world_types.h"
 #include "DNA_node_types.h"
+#include "DNA_object_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h" /* MAXFRAME only */
+#include "DNA_texture_types.h"
+#include "DNA_world_types.h"
 
 #include "BLI_utildefines.h"
 
@@ -144,8 +144,8 @@ static const EnumPropertyItem blend_type_items[] = {
 #  include "BKE_colorband.h"
 #  include "BKE_context.h"
 #  include "BKE_image.h"
-#  include "BKE_texture.h"
 #  include "BKE_main.h"
+#  include "BKE_texture.h"
 
 #  include "DEG_depsgraph.h"
 
diff --git a/source/blender/makesrna/intern/rna_texture_api.c b/source/blender/makesrna/intern/rna_texture_api.c
index 059c0b8208c..b000565ed09 100644
--- a/source/blender/makesrna/intern/rna_texture_api.c
+++ b/source/blender/makesrna/intern/rna_texture_api.c
@@ -18,8 +18,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "BLI_utildefines.h"
@@ -30,11 +30,11 @@
 
 #ifdef RNA_RUNTIME
 
-#  include "IMB_imbuf.h"
-#  include "IMB_imbuf_types.h"
-#  include "DNA_scene_types.h"
 #  include "BKE_context.h"
 #  include "BKE_global.h"
+#  include "DNA_scene_types.h"
+#  include "IMB_imbuf.h"
+#  include "IMB_imbuf_types.h"
 #  include "RE_pipeline.h"
 #  include "RE_shader_ext.h"
 
diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c
index 4b232251770..c8965f1a6fb 100644
--- a/source/blender/makesrna/intern/rna_tracking.c
+++ b/source/blender/makesrna/intern/rna_tracking.c
@@ -18,8 +18,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <limits.h>
+#include <stdlib.h>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c
index 778e65d3276..273bef6d239 100644
--- a/source/blender/makesrna/intern/rna_ui.c
+++ b/source/blender/makesrna/intern/rna_ui.c
@@ -29,13 +29,13 @@
 
 #include "RNA_define.h"
 
-#include "rna_internal.h"
 #include "RNA_enum_types.h"
+#include "rna_internal.h"
 
 #include "UI_interface.h"
 
-#include "WM_types.h"
 #include "WM_toolsystem.h"
+#include "WM_types.h"
 
 /* see WM_types.h */
 const EnumPropertyItem rna_enum_operator_context_items[] = {
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index 8b112031ada..5eadbaf55e4 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -21,8 +21,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "BLI_utildefines.h"
 
@@ -33,9 +33,9 @@
 
 #include "DNA_screen_types.h"
 
-#include "UI_resources.h"
 #include "UI_interface.h"
 #include "UI_interface_icons.h"
+#include "UI_resources.h"
 
 #include "rna_internal.h"
 
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 69694624a2b..6bec8843f82 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -21,22 +21,22 @@
 #include <limits.h>
 #include <stdlib.h>
 
+#include "DNA_brush_types.h"
 #include "DNA_curve_types.h"
+#include "DNA_scene_types.h"
 #include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
-#include "DNA_brush_types.h"
 #include "DNA_view3d_types.h"
-#include "DNA_scene_types.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_math_base.h"
 #include "BLI_math_rotation.h"
+#include "BLI_utildefines.h"
 
 #include "BLT_translation.h"
 
+#include "BKE_addon.h"
 #include "BKE_appdir.h"
 #include "BKE_sound.h"
-#include "BKE_addon.h"
 #include "BKE_studiolight.h"
 
 #include "RNA_access.h"
@@ -181,8 +181,8 @@ static const EnumPropertyItem rna_enum_userdef_viewport_aa_items[] = {
 #  include "BKE_idprop.h"
 #  include "BKE_main.h"
 #  include "BKE_mesh_runtime.h"
-#  include "BKE_pbvh.h"
 #  include "BKE_paint.h"
+#  include "BKE_pbvh.h"
 #  include "BKE_screen.h"
 
 #  include "DEG_depsgraph.h"
@@ -194,8 +194,8 @@ static const EnumPropertyItem rna_enum_userdef_viewport_aa_items[] = {
 
 #  include "BLI_path_util.h"
 
-#  include "MEM_guardedalloc.h"
 #  include "MEM_CacheLimiterC-Api.h"
+#  include "MEM_guardedalloc.h"
 
 #  include "UI_interface.h"
 
diff --git a/source/blender/makesrna/intern/rna_volume.c b/source/blender/makesrna/intern/rna_volume.c
index 755d8922140..4b31bc1b4a9 100644
--- a/source/blender/makesrna/intern/rna_volume.c
+++ b/source/blender/makesrna/intern/rna_volume.c
@@ -44,8 +44,8 @@
 #  include "DEG_depsgraph.h"
 #  include "DEG_depsgraph_build.h"
 
-#  include "WM_types.h"
 #  include "WM_api.h"
+#  include "WM_types.h"
 
 /* Updates */
 
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 515ed2b0743..b0d77a2e176 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -29,8 +29,8 @@
 
 #include "BLT_translation.h"
 
-#include "BKE_workspace.h"
 #include "BKE_keyconfig.h"
+#include "BKE_workspace.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c
index db7a7d6852b..df6abecd365 100644
--- a/source/blender/makesrna/intern/rna_wm_api.c
+++ b/source/blender/makesrna/intern/rna_wm_api.c
@@ -21,9 +21,9 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/makesrna/intern/rna_wm_gizmo_api.c b/source/blender/makesrna/intern/rna_wm_gizmo_api.c
index bc6c2e8a796..b4b7e02a95b 100644
--- a/source/blender/makesrna/intern/rna_wm_gizmo_api.c
+++ b/source/blender/makesrna/intern/rna_wm_gizmo_api.c
@@ -18,8 +18,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "BLI_utildefines.h"
 
@@ -36,8 +36,8 @@
 
 #ifdef RNA_RUNTIME
 
-#  include "UI_interface.h"
 #  include "BKE_context.h"
+#  include "UI_interface.h"
 
 #  include "ED_gizmo_library.h"
 
diff --git a/source/blender/makesrna/intern/rna_workspace_api.c b/source/blender/makesrna/intern/rna_workspace_api.c
index 4fb6677199f..a2bb89dd5ee 100644
--- a/source/blender/makesrna/intern/rna_workspace_api.c
+++ b/source/blender/makesrna/intern/rna_workspace_api.c
@@ -18,8 +18,8 @@
  * \ingroup RNA
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>