Cleanup: BLI headers first

Also move descriptions into doxy header

36 files changed, 183 insertions, 199 deletions

diff --git a/source/blender/blenkernel/intern/object_facemap.c b/source/blender/blenkernel/intern/object_facemap.c
index 700935de0e8..1218dd376cb 100644
--- a/source/blender/blenkernel/intern/object_facemap.c
+++ b/source/blender/blenkernel/intern/object_facemap.c
@@ -34,6 +34,12 @@
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
 
+#include "BLI_utildefines.h"
+#include "BLI_path_util.h"
+#include "BLI_string.h"
+#include "BLI_string_utils.h"
+#include "BLI_listbase.h"
+
 #include "BKE_context.h"
 #include "BKE_customdata.h"
 #include "BKE_editmesh.h"
@@ -41,12 +47,6 @@
 #include "BKE_object_facemap.h"  /* own include */
 #include "BKE_object_deform.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_path_util.h"
-#include "BLI_string.h"
-#include "BLI_string_utils.h"
-#include "BLI_listbase.h"
-
 #include "BLT_translation.h"
 
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c
index c4d4ff1a56d..760ecab12d3 100644
--- a/source/blender/draw/engines/clay/clay_engine.c
+++ b/source/blender/draw/engines/clay/clay_engine.c
@@ -19,7 +19,9 @@
  *
  */
 
-#include "DRW_render.h"
+#include "BLI_utildefines.h"
+#include "BLI_dynstr.h"
+#include "BLI_rand.h"
 
 #include "DNA_particle_types.h"
 
@@ -28,9 +30,6 @@
 #include "BKE_main.h"
 #include "BKE_particle.h"
 
-#include "BLI_dynstr.h"
-#include "BLI_rand.h"
-
 #include "GPU_shader.h"
 
 #include "IMB_imbuf.h"
@@ -39,6 +38,8 @@
 #include "UI_resources.h"
 #include "UI_interface_icons.h"
 
+#include "DRW_render.h"
+
 #include "clay_engine.h"
 
 #ifdef WITH_CLAY_ENGINE
diff --git a/source/blender/draw/engines/eevee/eevee_bloom.c b/source/blender/draw/engines/eevee/eevee_bloom.c
index 1bb3878278a..21fba216fb7 100644
--- a/source/blender/draw/engines/eevee/eevee_bloom.c
+++ b/source/blender/draw/engines/eevee/eevee_bloom.c
@@ -19,19 +19,18 @@
  *
  */
 
-/* Eevee's bloom shader
- */
-
 /** \file eevee_bloom.c
  *  \ingroup draw_engine
+ *
+ * Eevee's bloom shader.
  */
 
 #include "DRW_render.h"
 
-#include "BKE_global.h" /* for G.debug_value */
-
 #include "BLI_dynstr.h"
 
+#include "BKE_global.h" /* for G.debug_value */
+
 #include "eevee_private.h"
 #include "GPU_extensions.h"
 #include "GPU_texture.h"
diff --git a/source/blender/draw/engines/eevee/eevee_data.c b/source/blender/draw/engines/eevee/eevee_data.c
index 92a992f578b..1faffe3bb17 100644
--- a/source/blender/draw/engines/eevee/eevee_data.c
+++ b/source/blender/draw/engines/eevee/eevee_data.c
@@ -19,11 +19,10 @@
  *
  */
 
-/* All specific data handler for Objects, Lights, SceneLayers, ...
- */
-
 /** \file eevee_data.c
  *  \ingroup draw_engine
+ *
+ * All specific data handler for Objects, Lights, SceneLayers, ...
  */
 
 #include "DRW_render.h"
diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
index c5836c75406..275be6efa39 100644
--- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c
+++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
@@ -19,15 +19,17 @@
  *
  */
 
-/* Depth of field post process effect
- */
-
 /** \file eevee_depth_of_field.c
  *  \ingroup draw_engine
+ *
+ * Depth of field post process effect.
  */
 
 #include "DRW_render.h"
 
+#include "BLI_dynstr.h"
+#include "BLI_rand.h"
+
 #include "DNA_anim_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_object_force.h"
@@ -42,18 +44,15 @@
 #include "BKE_animsys.h"
 #include "BKE_screen.h"
 
-#include "ED_screen.h"
-
 #include "DEG_depsgraph.h"
 
-#include "BLI_dynstr.h"
-#include "BLI_rand.h"
-
 #include "eevee_private.h"
 #include "GPU_extensions.h"
 #include "GPU_framebuffer.h"
 #include "GPU_texture.h"
 
+#include "ED_screen.h"
+
 static struct {
 	/* Depth Of Field */
 	struct GPUShader *dof_downsample_sh;
diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c
index 86d767df313..603fc1aa14a 100644
--- a/source/blender/draw/engines/eevee/eevee_effects.c
+++ b/source/blender/draw/engines/eevee/eevee_effects.c
@@ -19,11 +19,10 @@
  *
  */
 
-/* Gather all screen space effects technique such as Bloom, Motion Blur, DoF, SSAO, SSR, ...
- */
-
 /** \file eevee_effects.c
  *  \ingroup draw_engine
+ *
+ * Gather all screen space effects technique such as Bloom, Motion Blur, DoF, SSAO, SSR, ...
  */
 
 #include "DRW_render.h"
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c
index 4ca59aaa39e..72ebfe94f16 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -23,7 +23,6 @@
  *  \ingroup draw_engine
  */
 
-#include "DNA_world_types.h"
 #include "DRW_render.h"
 
 #include "BLI_dynstr.h"
@@ -31,6 +30,8 @@
 
 #include "BKE_object.h"
 
+#include "DNA_world_types.h"
+
 #include "GPU_material.h"
 #include "GPU_glew.h"
 
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index aa5624646f3..a8b9b963cb1 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -23,6 +23,12 @@
  *  \ingroup DNA
  */
 
+#include "DRW_render.h"
+
+#include "BLI_utildefines.h"
+#include "BLI_dynstr.h"
+#include "BLI_rand.h"
+
 #include "DNA_world_types.h"
 #include "DNA_texture_types.h"
 #include "DNA_image_types.h"
@@ -31,20 +37,15 @@
 
 #include "BKE_object.h"
 
-#include "BLI_dynstr.h"
-#include "BLI_rand.h"
-
-#include "ED_screen.h"
-
 #include "GPU_material.h"
 #include "GPU_texture.h"
 #include "GPU_glew.h"
 
-#include "DRW_render.h"
-
 #include "eevee_engine.h"
 #include "eevee_private.h"
 
+#include "ED_screen.h"
+
 #define IRRADIANCE_POOL_SIZE 1024
 
 static struct {
diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c
index 6c1ed277005..9c30ecba03f 100644
--- a/source/blender/draw/engines/eevee/eevee_lights.c
+++ b/source/blender/draw/engines/eevee/eevee_lights.c
@@ -1058,4 +1058,4 @@ void EEVEE_lights_free(void)
 		DRW_SHADER_FREE_SAFE(e_data.shadow_copy_cube_sh[i]);
 		DRW_SHADER_FREE_SAFE(e_data.shadow_copy_cascade_sh[i]);
 	}
-}
\ No newline at end of file
+}
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index b0e30109a7f..6721547e2b0 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -25,10 +25,6 @@
 
 #include "DRW_render.h"
 
-#include "DNA_world_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_view3d_types.h"
-
 #include "BLI_dynstr.h"
 #include "BLI_ghash.h"
 #include "BLI_alloca.h"
@@ -37,6 +33,10 @@
 #include "BKE_paint.h"
 #include "BKE_pbvh.h"
 
+#include "DNA_world_types.h"
+#include "DNA_modifier_types.h"
+#include "DNA_view3d_types.h"
+
 #include "GPU_material.h"
 
 #include "eevee_engine.h"
diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c
index 5ca2dfe1949..b9ec1f8b186 100644
--- a/source/blender/draw/engines/eevee/eevee_motion_blur.c
+++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c
@@ -19,25 +19,24 @@
  *
  */
 
-/* Gather all screen space effects technique such as Bloom, Motion Blur, DoF, SSAO, SSR, ...
- */
-
 /** \file eevee_effects.c
  *  \ingroup draw_engine
+ *
+ * Gather all screen space effects technique such as Bloom, Motion Blur, DoF, SSAO, SSR, ...
  */
 
 #include "DRW_render.h"
 
-#include "DNA_anim_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_screen_types.h"
-
 #include "BKE_global.h" /* for G.debug_value */
 #include "BKE_camera.h"
 #include "BKE_object.h"
 #include "BKE_animsys.h"
 #include "BKE_screen.h"
 
+#include "DNA_anim_types.h"
+#include "DNA_camera_types.h"
+#include "DNA_screen_types.h"
+
 #include "ED_screen.h"
 
 #include "DEG_depsgraph.h"
diff --git a/source/blender/draw/engines/eevee/eevee_occlusion.c b/source/blender/draw/engines/eevee/eevee_occlusion.c
index 86a9fb2ff1a..a6b35ce1b16 100644
--- a/source/blender/draw/engines/eevee/eevee_occlusion.c
+++ b/source/blender/draw/engines/eevee/eevee_occlusion.c
@@ -19,21 +19,20 @@
  *
  */
 
-/* Implementation of the screen space Ground Truth Ambient Occlusion.
- */
-
 /** \file eevee_occlusion.c
  *  \ingroup draw_engine
+ *
+ * Implementation of the screen space Ground Truth Ambient Occlusion.
  */
 
 #include "DRW_render.h"
 
+#include "BLI_dynstr.h"
+
 #include "DNA_anim_types.h"
 
 #include "BKE_global.h" /* for G.debug_value */
 
-#include "BLI_dynstr.h"
-
 #include "eevee_private.h"
 
 static struct {
diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
index e287ba6fc14..c6162f1d693 100644
--- a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
+++ b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
@@ -19,11 +19,10 @@
  *
  */
 
-/* Screen space reflections and refractions techniques.
- */
-
 /** \file eevee_screen_raytrace.c
  *  \ingroup draw_engine
+ *
+ * Screen space reflections and refractions techniques.
  */
 
 #include "DRW_render.h"
diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c b/source/blender/draw/engines/eevee/eevee_subsurface.c
index 2784125ca58..6827d44aea4 100644
--- a/source/blender/draw/engines/eevee/eevee_subsurface.c
+++ b/source/blender/draw/engines/eevee/eevee_subsurface.c
@@ -19,11 +19,10 @@
  *
  */
 
-/* Screen space subsurface scattering technique.
- */
-
 /** \file eevee_subsurface.c
  *  \ingroup draw_engine
+ *
+ * Screen space subsurface scattering technique.
  */
 
 #include "DRW_render.h"
diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
index 6e70ba45edf..d5580c21a1f 100644
--- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
+++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
@@ -19,11 +19,10 @@
  *
  */
 
-/* Temporal super sampling technique
- */
-
 /** \file eevee_temporal_sampling.c
  *  \ingroup draw_engine
+ *
+ * Temporal super sampling technique
  */
 
 #include "DRW_render.h"
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index 4ee50cfb082..760205f4937 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -19,15 +19,17 @@
  *
  */
 
-/* Volumetric effects rendering using frostbite approach.
- */
-
 /** \file eevee_volume.c
  *  \ingroup draw_engine
+ *
+ * Volumetric effects rendering using frostbite approach.
  */
 
 #include "DRW_render.h"
 
+#include "BLI_dynstr.h"
+#include "BLI_rand.h"
+
 #include "DNA_object_force.h"
 #include "DNA_smoke_types.h"
 #include "DNA_world_types.h"
@@ -39,9 +41,6 @@
 
 #include "ED_screen.h"
 
-#include "BLI_dynstr.h"
-#include "BLI_rand.h"
-
 #include "eevee_private.h"
 #include "GPU_draw.h"
 #include "GPU_texture.h"
diff --git a/source/blender/editors/manipulator_library/manipulator_draw_utils.c b/source/blender/editors/manipulator_library/manipulator_draw_utils.c
index f15cd9c9793..430841311aa 100644
--- a/source/blender/editors/manipulator_library/manipulator_draw_utils.c
+++ b/source/blender/editors/manipulator_library/manipulator_draw_utils.c
@@ -27,14 +27,14 @@
  *  \ingroup wm
  */
 
-#include "BKE_context.h"
-
 #include "BLI_listbase.h"
 #include "BLI_ghash.h"
 #include "BLI_math.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"
 
+#include "BKE_context.h"
+
 #include "ED_screen.h"
 #include "ED_view3d.h"
 
diff --git a/source/blender/editors/manipulator_library/manipulator_library_presets.c b/source/blender/editors/manipulator_library/manipulator_library_presets.c
index e552a7a6aa3..7b8d2104992 100644
--- a/source/blender/editors/manipulator_library/manipulator_library_presets.c
+++ b/source/blender/editors/manipulator_library/manipulator_library_presets.c
@@ -26,17 +26,16 @@
  * \brief Preset shapes that can be drawn from any manipulator type.
  */
 
-#include "BIF_gl.h"
-
-#include "BKE_context.h"
+#include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
 
 #include "DNA_view3d_types.h"
 #include "DNA_object_types.h"
 
-#include "ED_view3d.h"
-#include "ED_screen.h"
+#include "BKE_context.h"
+
+#include "BIF_gl.h"
 
 #include "GPU_draw.h"
 #include "GPU_immediate.h"
@@ -44,8 +43,6 @@
 #include "GPU_matrix.h"
 #include "GPU_select.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "DEG_depsgraph.h"
 
 #include "RNA_access.h"
@@ -53,6 +50,8 @@
 #include "WM_types.h"
 #include "WM_api.h"
 
+#include "ED_view3d.h"
+#include "ED_screen.h"
 
 /* own includes */
 #include "ED_manipulator_library.h"  /* own include */
diff --git a/source/blender/editors/manipulator_library/manipulator_library_utils.c b/source/blender/editors/manipulator_library/manipulator_library_utils.c
index fb1d1f89626..38b518b1992 100644
--- a/source/blender/editors/manipulator_library/manipulator_library_utils.c
+++ b/source/blender/editors/manipulator_library/manipulator_library_utils.c
@@ -31,21 +31,21 @@
  * \brief This file contains functions for common behaviors of manipulators.
  */
 
-#include "BKE_context.h"
-
 #include "BLI_math.h"
 #include "BLI_listbase.h"
 
 #include "DNA_view3d_types.h"
 #include "DNA_screen_types.h"
 
-#include "ED_view3d.h"
+#include "BKE_context.h"
 
 #include "RNA_access.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "ED_view3d.h"
+
 /* own includes */
 #include "manipulator_library_intern.h"
 
diff --git a/source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c
index 44dd5698a48..749e92e25fb 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c
@@ -31,18 +31,15 @@
  * \brief Simple arrow manipulator which is dragged into a certain direction.
  */
 
-#include "BIF_gl.h"
-
-#include "BKE_context.h"
-
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_rect.h"
 
 #include "DNA_windowmanager_types.h"
 
-#include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "BKE_context.h"
+
+#include "BIF_gl.h"
 
 #include "GPU_draw.h"
 #include "GPU_immediate.h"
@@ -55,6 +52,9 @@
 
 #include "WM_types.h"
 
+#include "ED_screen.h"
+#include "ED_manipulator_library.h"
+
 /* own includes */
 #include "WM_api.h"
 
diff --git a/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c
index 3bbcafb925a..e9760e3e270 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c
@@ -40,15 +40,11 @@
 
 #include "BIF_gl.h"
 
-#include "BKE_context.h"
-
 #include "BLI_math.h"
 
 #include "DNA_view3d_types.h"
 
-#include "ED_view3d.h"
-#include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "BKE_context.h"
 
 #include "GPU_draw.h"
 #include "GPU_immediate.h"
@@ -64,6 +60,10 @@
 #include "WM_types.h"
 #include "WM_api.h"
 
+#include "ED_view3d.h"
+#include "ED_screen.h"
+#include "ED_manipulator_library.h"
+
 /* own includes */
 #include "../manipulator_geometry.h"
 #include "../manipulator_library_intern.h"
diff --git a/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
index d1902864d57..0299a33d0fe 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
@@ -34,17 +34,15 @@
  * Interacting scales or translates the manipulator.
  */
 
-#include "BIF_gl.h"
-
-#include "BKE_context.h"
+#include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
 #include "BLI_dial.h"
 #include "BLI_rect.h"
 
-#include "ED_screen.h"
-#include "ED_view3d.h"
-#include "ED_manipulator_library.h"
+#include "BKE_context.h"
+
+#include "BIF_gl.h"
 
 #include "GPU_matrix.h"
 #include "GPU_shader.h"
@@ -52,14 +50,16 @@
 #include "GPU_immediate_util.h"
 #include "GPU_select.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "RNA_access.h"
 #include "RNA_define.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "ED_screen.h"
+#include "ED_view3d.h"
+#include "ED_manipulator_library.h"
+
 /* own includes */
 #include "../manipulator_library_intern.h"
 
diff --git a/source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c
index e116a26fd59..d58cdb4b187 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c
@@ -34,17 +34,15 @@
  * Interacting scales or translates the manipulator.
  */
 
-#include "BIF_gl.h"
-
-#include "BKE_context.h"
+#include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
 #include "BLI_dial.h"
 #include "BLI_rect.h"
 
-#include "ED_screen.h"
-#include "ED_view3d.h"
-#include "ED_manipulator_library.h"
+#include "BKE_context.h"
+
+#include "BIF_gl.h"
 
 #include "GPU_matrix.h"
 #include "GPU_shader.h"
@@ -52,14 +50,16 @@
 #include "GPU_immediate_util.h"
 #include "GPU_select.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "RNA_access.h"
 #include "RNA_define.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "ED_screen.h"
+#include "ED_view3d.h"
+#include "ED_manipulator_library.h"
+
 /* own includes */
 #include "../manipulator_library_intern.h"
 
diff --git a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
index ec490a0d047..f2f5851ff0c 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
@@ -38,25 +38,19 @@
  * - `matrix[2]` is the axis the dial rotates around (all dials).
  */
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
-
-#include "BKE_context.h"
+#include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
 
-#include "ED_screen.h"
-#include "ED_view3d.h"
-#include "ED_manipulator_library.h"
-
-#include "GPU_select.h"
+#include "BKE_context.h"
 
-#include "GPU_matrix.h"
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
 
 #include "GPU_immediate.h"
 #include "GPU_immediate_util.h"
-
-#include "MEM_guardedalloc.h"
+#include "GPU_matrix.h"
+#include "GPU_select.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -64,6 +58,10 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "ED_screen.h"
+#include "ED_view3d.h"
+#include "ED_manipulator_library.h"
+
 /* own includes */
 #include "../manipulator_geometry.h"
 #include "../manipulator_library_intern.h"
diff --git a/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
index 5353104a1fd..151e173e5e6 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
@@ -33,25 +33,19 @@
  *
  */
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
-
-#include "BKE_context.h"
+#include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
 
-#include "ED_screen.h"
-#include "ED_view3d.h"
-#include "ED_manipulator_library.h"
-
-#include "GPU_select.h"
+#include "BKE_context.h"
 
-#include "GPU_matrix.h"
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
 
 #include "GPU_immediate.h"
 #include "GPU_immediate_util.h"
-
-#include "MEM_guardedalloc.h"
+#include "GPU_matrix.h"
+#include "GPU_select.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -59,6 +53,10 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "ED_screen.h"
+#include "ED_view3d.h"
+#include "ED_manipulator_library.h"
+
 /* own includes */
 #include "../manipulator_geometry.h"
 #include "../manipulator_library_intern.h"
diff --git a/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c
index eea14f2033f..531cf742e6f 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c
@@ -29,20 +29,20 @@
  * Currently only plane primitive supported without own handling, use with operator only.
  */
 
-#include "BIF_gl.h"
-
-#include "BKE_context.h"
+#include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
 
 #include "DNA_view3d_types.h"
 
+#include "BKE_context.h"
+
+#include "BIF_gl.h"
+
 #include "GPU_immediate.h"
 #include "GPU_matrix.h"
 #include "GPU_select.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "RNA_access.h"
 #include "RNA_define.h"
 
diff --git a/source/blender/editors/object/object_facemap_ops.c b/source/blender/editors/object/object_facemap_ops.c
index d526ea93ffa..857446ac6b0 100644
--- a/source/blender/editors/object/object_facemap_ops.c
+++ b/source/blender/editors/object/object_facemap_ops.c
@@ -24,13 +24,18 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <string.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_utildefines.h"
+#include "BLI_path_util.h"
+#include "BLI_string.h"
+#include "BLI_listbase.h"
 
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
 
-#include "WM_types.h"
-#include "WM_api.h"
-
 #include "BKE_context.h"
 #include "BKE_customdata.h"
 #include "BKE_editmesh.h"
@@ -40,21 +45,15 @@
 
 #include "DEG_depsgraph.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_path_util.h"
-#include "BLI_string.h"
-#include "BLI_listbase.h"
+#include "RNA_define.h"
+#include "RNA_access.h"
 
-#include "MEM_guardedalloc.h"
+#include "WM_types.h"
+#include "WM_api.h"
 
 #include "ED_mesh.h"
 #include "ED_object.h"
 
-#include "RNA_define.h"
-#include "RNA_access.h"
-
-#include <string.h>
-
 #include "object_intern.h"
 
 /* called while not in editmode */
diff --git a/source/blender/editors/screen/workspace_layout_edit.c b/source/blender/editors/screen/workspace_layout_edit.c
index e4dd841f833..d84df160125 100644
--- a/source/blender/editors/screen/workspace_layout_edit.c
+++ b/source/blender/editors/screen/workspace_layout_edit.c
@@ -24,24 +24,23 @@
 
 #include <stdlib.h>
 
-#include "BKE_context.h"
-#include "BKE_global.h"
-#include "BKE_main.h"
-#include "BKE_screen.h"
-#include "BKE_workspace.h"
-
 #include "BLI_utildefines.h"
 #include "BLI_listbase.h"
 
 #include "DNA_screen_types.h"
 #include "DNA_workspace_types.h"
 
-#include "ED_screen.h"
+#include "BKE_context.h"
+#include "BKE_global.h"
+#include "BKE_main.h"
+#include "BKE_screen.h"
+#include "BKE_workspace.h"
 
 #include "WM_api.h"
 
-#include "screen_intern.h"
+#include "ED_screen.h"
 
+#include "screen_intern.h"
 
 /**
  * Empty screen, with 1 dummy area without spacedata. Uses window size.
diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c
index 6946993d630..aa6a5dba6a7 100644
--- a/source/blender/editors/space_outliner/outliner_ops.c
+++ b/source/blender/editors/space_outliner/outliner_ops.c
@@ -28,15 +28,13 @@
  *  \ingroup spoutliner
  */
 
-#include "BKE_context.h"
-#include "BKE_main.h"
+#include "MEM_guardedalloc.h"
 
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 
-#include "ED_screen.h"
-
-#include "MEM_guardedalloc.h"
+#include "BKE_context.h"
+#include "BKE_main.h"
 
 #include "RNA_access.h"
 
@@ -46,8 +44,9 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "outliner_intern.h"
+#include "ED_screen.h"
 
+#include "outliner_intern.h"
 
 enum {
 	OUTLINER_ITEM_DRAG_CANCEL,
diff --git a/source/blender/editors/space_outliner/outliner_utils.c b/source/blender/editors/space_outliner/outliner_utils.c
index f123b240efc..d3f7fd7055e 100644
--- a/source/blender/editors/space_outliner/outliner_utils.c
+++ b/source/blender/editors/space_outliner/outliner_utils.c
@@ -27,20 +27,19 @@
  *  \ingroup spoutliner
  */
 
-#include "BKE_outliner_treehash.h"
-
 #include "BLI_utildefines.h"
 
 #include "DNA_action_types.h"
 #include "DNA_space_types.h"
 
+#include "BKE_outliner_treehash.h"
+
 #include "ED_armature.h"
 
 #include "UI_interface.h"
 
 #include "outliner_intern.h"
 
-
 /**
  * Try to find an item under y-coordinate \a view_co_y (view-space).
  * \note Recursive
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 1e273462d52..eeca75b7308 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -30,6 +30,13 @@
 
 #include <math.h>
 
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+#include "BLI_rect.h"
+#include "BLI_string.h"
+#include "BLI_threads.h"
+#include "BLI_jitter.h"
+
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
@@ -44,13 +51,6 @@
 
 #include "BLF_api.h"
 
-#include "BLI_listbase.h"
-#include "BLI_math.h"
-#include "BLI_rect.h"
-#include "BLI_string.h"
-#include "BLI_threads.h"
-#include "BLI_jitter.h"
-
 #include "BLT_translation.h"
 
 #include "DNA_armature_types.h"
diff --git a/source/blender/editors/transform/transform_manipulator2d.c b/source/blender/editors/transform/transform_manipulator2d.c
index 94f425eb9f0..6e2d0d8c5c0 100644
--- a/source/blender/editors/transform/transform_manipulator2d.c
+++ b/source/blender/editors/transform/transform_manipulator2d.c
@@ -31,8 +31,7 @@
  * Used for UV/Image Editor
  */
 
-#include "BKE_context.h"
-#include "BKE_editmesh.h"
+#include "MEM_guardedalloc.h"
 
 #include "BLI_listbase.h"
 #include "BLI_math.h"
@@ -43,12 +42,8 @@
 #include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
 
-#include "ED_image.h"
-#include "ED_screen.h"
-#include "ED_uvedit.h"
-#include "ED_manipulator_library.h"
-
-#include "MEM_guardedalloc.h"
+#include "BKE_context.h"
+#include "BKE_editmesh.h"
 
 #include "RNA_access.h"
 
@@ -59,6 +54,11 @@
 #include "WM_types.h"
 #include "wm.h" /* XXX */
 
+#include "ED_image.h"
+#include "ED_screen.h"
+#include "ED_uvedit.h"
+#include "ED_manipulator_library.h"
+
 #include "transform.h" /* own include */
 
 /* axes as index */
diff --git a/source/blender/makesrna/intern/rna_workspace.c b/source/blender/makesrna/intern/rna_workspace.c
index e09f7bcbcc1..354e400a392 100644
--- a/source/blender/makesrna/intern/rna_workspace.c
+++ b/source/blender/makesrna/intern/rna_workspace.c
@@ -43,10 +43,10 @@
 
 #ifdef RNA_RUNTIME
 
-#include "BKE_global.h"
-
 #include "BLI_listbase.h"
 
+#include "BKE_global.h"
+
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
index 52c8fb24244..7ca1f8fd5f2 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
@@ -27,22 +27,19 @@
  *  \ingroup wm
  */
 
-#include "BKE_context.h"
+#include "MEM_guardedalloc.h"
 
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"
 
-#include "ED_screen.h"
-#include "ED_view3d.h"
+#include "BKE_context.h"
 
 #include "GPU_batch.h"
 #include "GPU_glew.h"
 #include "GPU_immediate.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -53,6 +50,9 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "ED_screen.h"
+#include "ED_view3d.h"
+
 #ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
index e0b12289b9e..d62aac8cd87 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
@@ -35,16 +35,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "BKE_context.h"
-#include "BKE_main.h"
-#include "BKE_report.h"
+#include "MEM_guardedalloc.h"
 
 #include "BLI_listbase.h"
 #include "BLI_string.h"
 
-#include "ED_screen.h"
-
-#include "MEM_guardedalloc.h"
+#include "BKE_context.h"
+#include "BKE_main.h"
+#include "BKE_report.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -53,6 +51,8 @@
 #include "WM_types.h"
 #include "wm_event_system.h"
 
+#include "ED_screen.h"
+
 /* own includes */
 #include "wm_manipulator_wmapi.h"
 #include "wm_manipulator_intern.h"
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
index b4f65807341..11bf981490e 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
@@ -22,15 +22,12 @@
  *  \ingroup wm
  */
 
-#include "BKE_context.h"
-
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"
 
-#include "ED_screen.h"
-#include "ED_view3d.h"
+#include "BKE_context.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -41,6 +38,9 @@
 
 #include "wm.h"
 
+#include "ED_screen.h"
+#include "ED_view3d.h"
+
 /* own includes */
 #include "wm_manipulator_wmapi.h"
 #include "wm_manipulator_intern.h"