Cleanup: `make format` after SortedIncludes change

51 files changed, 93 insertions, 93 deletions

diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h
index bdb719e0d7a..7d2100c0f65 100644
--- a/source/blender/bmesh/bmesh.h
+++ b/source/blender/bmesh/bmesh.h
@@ -192,22 +192,22 @@
 extern "C" {
 #endif
 
-#include "DNA_listBase.h"         /* selection history uses */
 #include "DNA_customdata_types.h" /* BMesh struct in bmesh_class.h uses */
+#include "DNA_listBase.h"         /* selection history uses */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "bmesh_class.h"
 
 /* include the rest of the API */
-#include "intern/bmesh_operator_api.h"
 #include "intern/bmesh_error.h"
+#include "intern/bmesh_operator_api.h"
 
-#include "intern/bmesh_core.h"
 #include "intern/bmesh_callback_generic.h"
 #include "intern/bmesh_construct.h"
+#include "intern/bmesh_core.h"
 #include "intern/bmesh_delete.h"
 #include "intern/bmesh_edgeloop.h"
 #include "intern/bmesh_interp.h"
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index f795783d161..8f55c14c681 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -22,10 +22,10 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math_vector.h"
-#include "BLI_array.h"
 #include "BLI_alloca.h"
+#include "BLI_array.h"
 #include "BLI_linklist_stack.h"
+#include "BLI_math_vector.h"
 #include "BLI_utildefines_stack.h"
 
 #include "BLT_translation.h"
diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.c b/source/blender/bmesh/intern/bmesh_edgeloop.c
index c07bae5e3f2..e4312877fc6 100644
--- a/source/blender/bmesh/intern/bmesh_edgeloop.c
+++ b/source/blender/bmesh/intern/bmesh_edgeloop.c
@@ -25,11 +25,11 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math_vector.h"
 #include "BLI_listbase.h"
+#include "BLI_math_vector.h"
 #include "BLI_mempool.h"
-#include "BLI_utildefines_iter.h"
 #include "BLI_stack.h"
+#include "BLI_utildefines_iter.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/bmesh/intern/bmesh_iterators.c b/source/blender/bmesh/intern/bmesh_iterators.c
index b1e20dd6058..c4dd53b0497 100644
--- a/source/blender/bmesh/intern/bmesh_iterators.c
+++ b/source/blender/bmesh/intern/bmesh_iterators.c
@@ -24,8 +24,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_bitmap.h"
+#include "BLI_utildefines.h"
 
 #include "bmesh.h"
 #include "intern/bmesh_private.h"
diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c
index b4e78453226..6c0585a7759 100644
--- a/source/blender/bmesh/intern/bmesh_log.c
+++ b/source/blender/bmesh/intern/bmesh_log.c
@@ -31,11 +31,11 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_mempool.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_customdata.h"
 
diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c
index 58a7d423d67..d33f4e0a1d6 100644
--- a/source/blender/bmesh/intern/bmesh_marking.c
+++ b/source/blender/bmesh/intern/bmesh_marking.c
@@ -31,8 +31,8 @@
 
 #include "DNA_scene_types.h"
 
-#include "BLI_math.h"
 #include "BLI_listbase.h"
+#include "BLI_math.h"
 
 #include "bmesh.h"
 #include "bmesh_structure.h"
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c
index 1ecbfccab74..de32d7881b0 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_conv.c
+++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c
@@ -70,25 +70,25 @@
  * and only editing the active shape key-block.
  */
 
+#include "DNA_key_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_object_types.h"
 #include "DNA_modifier_types.h"
-#include "DNA_key_types.h"
+#include "DNA_object_types.h"
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_listbase.h"
 #include "BLI_alloca.h"
+#include "BLI_listbase.h"
 #include "BLI_math_vector.h"
 
+#include "BKE_customdata.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
-#include "BKE_customdata.h"
 #include "BKE_multires.h"
 
-#include "BKE_main.h"
 #include "BKE_key.h"
+#include "BKE_main.h"
 
 #include "bmesh.h"
 #include "intern/bmesh_private.h" /* For element checking. */
diff --git a/source/blender/bmesh/intern/bmesh_mesh_validate.c b/source/blender/bmesh/intern/bmesh_mesh_validate.c
index 83ab29940f3..f8830e1557b 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_validate.c
+++ b/source/blender/bmesh/intern/bmesh_mesh_validate.c
@@ -26,8 +26,8 @@
 /* debug builds only */
 #ifdef DEBUG
 
-#  include "BLI_utildefines.h"
 #  include "BLI_edgehash.h"
+#  include "BLI_utildefines.h"
 
 #  include "bmesh.h"
 
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index 53f68804bd3..7b5df536192 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -23,8 +23,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
 #include "BLI_array.h"
+#include "BLI_math.h"
 
 #include "BKE_customdata.h"
 
diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c
index 2ec7e06a264..d3c8499477b 100644
--- a/source/blender/bmesh/intern/bmesh_operators.c
+++ b/source/blender/bmesh/intern/bmesh_operators.c
@@ -22,12 +22,12 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_string.h"
+#include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_memarena.h"
 #include "BLI_mempool.h"
-#include "BLI_listbase.h"
+#include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c
index 915ad6bf5c4..9ab5106cec2 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.c
+++ b/source/blender/bmesh/intern/bmesh_polygon.c
@@ -23,18 +23,18 @@
  */
 
 #include "DNA_listBase.h"
-#include "DNA_modifier_types.h"
 #include "DNA_meshdata_types.h"
+#include "DNA_modifier_types.h"
 
 #include "MEM_guardedalloc.h"
 
 #include "BLI_alloca.h"
+#include "BLI_heap.h"
+#include "BLI_linklist.h"
 #include "BLI_math.h"
 #include "BLI_memarena.h"
 #include "BLI_polyfill_2d.h"
 #include "BLI_polyfill_2d_beautify.h"
-#include "BLI_linklist.h"
-#include "BLI_heap.h"
 
 #include "bmesh.h"
 #include "bmesh_tools.h"
diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
index f6ed95d322d..284f5265b90 100644
--- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
+++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
@@ -24,14 +24,14 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
-#include "BLI_memarena.h"
-#include "BLI_array.h"
 #include "BLI_alloca.h"
-#include "BLI_utildefines_stack.h"
+#include "BLI_array.h"
+#include "BLI_kdopbvh.h"
 #include "BLI_linklist_stack.h"
+#include "BLI_math.h"
+#include "BLI_memarena.h"
 #include "BLI_sort_utils.h"
-#include "BLI_kdopbvh.h"
+#include "BLI_utildefines_stack.h"
 
 #include "BKE_customdata.h"
 
diff --git a/source/blender/bmesh/intern/bmesh_query.c b/source/blender/bmesh/intern/bmesh_query.c
index a9b0d4d3918..e3b6e243906 100644
--- a/source/blender/bmesh/intern/bmesh_query.c
+++ b/source/blender/bmesh/intern/bmesh_query.c
@@ -27,9 +27,9 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
 #include "BLI_alloca.h"
 #include "BLI_linklist.h"
+#include "BLI_math.h"
 #include "BLI_utildefines_stack.h"
 
 #include "BKE_customdata.h"
diff --git a/source/blender/bmesh/intern/bmesh_walkers.c b/source/blender/bmesh/intern/bmesh_walkers.c
index 05ae8c940af..860c83ec1e5 100644
--- a/source/blender/bmesh/intern/bmesh_walkers.c
+++ b/source/blender/bmesh/intern/bmesh_walkers.c
@@ -23,8 +23,8 @@
 #include <stdlib.h>
 #include <string.h> /* for memcpy */
 
-#include "BLI_utildefines.h"
 #include "BLI_listbase.h"
+#include "BLI_utildefines.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c
index 1d5bcf8b160..18193beff58 100644
--- a/source/blender/bmesh/operators/bmo_bevel.c
+++ b/source/blender/bmesh/operators/bmo_bevel.c
@@ -22,10 +22,10 @@
 
 #include "BLI_utildefines.h"
 
-#include "bmesh.h"
-#include "bmesh_tools.h"
 #include "BKE_curveprofile.h"
 #include "DNA_curveprofile_types.h"
+#include "bmesh.h"
+#include "bmesh_tools.h"
 
 #include "intern/bmesh_operators_private.h" /* own include */
 
diff --git a/source/blender/bmesh/operators/bmo_bisect_plane.c b/source/blender/bmesh/operators/bmo_bisect_plane.c
index f3062cac85c..ef59ebf1f2f 100644
--- a/source/blender/bmesh/operators/bmo_bisect_plane.c
+++ b/source/blender/bmesh/operators/bmo_bisect_plane.c
@@ -22,9 +22,9 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_math.h"
 #include "BLI_utildefines.h"
 #include "BLI_utildefines_stack.h"
-#include "BLI_math.h"
 
 #include "bmesh.h"
 #include "bmesh_tools.h"
diff --git a/source/blender/bmesh/operators/bmo_bridge.c b/source/blender/bmesh/operators/bmo_bridge.c
index bad5036f6cf..5713c17e146 100644
--- a/source/blender/bmesh/operators/bmo_bridge.c
+++ b/source/blender/bmesh/operators/bmo_bridge.c
@@ -20,9 +20,9 @@
  * Connect verts across faces (splits faces) and bridge tool.
  */
 
+#include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BLI_listbase.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c
index 2f0b21667e4..9969d31a4a5 100644
--- a/source/blender/bmesh/operators/bmo_connect.c
+++ b/source/blender/bmesh/operators/bmo_connect.c
@@ -20,10 +20,10 @@
  * Connect verts across faces (splits faces).
  */
 
-#include "BLI_utildefines.h"
-#include "BLI_utildefines_stack.h"
 #include "BLI_alloca.h"
 #include "BLI_linklist_stack.h"
+#include "BLI_utildefines.h"
+#include "BLI_utildefines_stack.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/bmesh/operators/bmo_connect_concave.c b/source/blender/bmesh/operators/bmo_connect_concave.c
index 0d0c21774c3..e7b86f102a2 100644
--- a/source/blender/bmesh/operators/bmo_connect_concave.c
+++ b/source/blender/bmesh/operators/bmo_connect_concave.c
@@ -30,14 +30,14 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
 #include "BLI_alloca.h"
-#include "BLI_memarena.h"
 #include "BLI_heap.h"
+#include "BLI_linklist.h"
+#include "BLI_math.h"
+#include "BLI_memarena.h"
 #include "BLI_polyfill_2d.h"
 #include "BLI_polyfill_2d_beautify.h"
-#include "BLI_linklist.h"
+#include "BLI_utildefines.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/bmesh/operators/bmo_connect_nonplanar.c b/source/blender/bmesh/operators/bmo_connect_nonplanar.c
index 5be4826c7d3..e0c5109430d 100644
--- a/source/blender/bmesh/operators/bmo_connect_nonplanar.c
+++ b/source/blender/bmesh/operators/bmo_connect_nonplanar.c
@@ -20,10 +20,10 @@
  * Connect verts non-planer faces iteratively (splits faces).
  */
 
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
 #include "BLI_alloca.h"
 #include "BLI_linklist_stack.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/bmesh/operators/bmo_connect_pair.c b/source/blender/bmesh/operators/bmo_connect_pair.c
index 07ead2b8a96..ba8a93ff819 100644
--- a/source/blender/bmesh/operators/bmo_connect_pair.c
+++ b/source/blender/bmesh/operators/bmo_connect_pair.c
@@ -22,9 +22,9 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_heap_simple.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BLI_heap_simple.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c
index 6c662323ec1..8c2e820df63 100644
--- a/source/blender/bmesh/operators/bmo_dissolve.c
+++ b/source/blender/bmesh/operators/bmo_dissolve.c
@@ -23,8 +23,8 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_array.h"
-#include "BLI_stack.h"
 #include "BLI_math.h"
+#include "BLI_stack.h"
 
 #include "bmesh.h"
 #include "bmesh_tools.h"
diff --git a/source/blender/bmesh/operators/bmo_dupe.c b/source/blender/bmesh/operators/bmo_dupe.c
index 65b70f62b58..6e968d58631 100644
--- a/source/blender/bmesh/operators/bmo_dupe.c
+++ b/source/blender/bmesh/operators/bmo_dupe.c
@@ -22,8 +22,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
 #include "BLI_alloca.h"
+#include "BLI_math.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/bmesh/operators/bmo_edgenet.c b/source/blender/bmesh/operators/bmo_edgenet.c
index d38a1be7a8d..16bbbd5df88 100644
--- a/source/blender/bmesh/operators/bmo_edgenet.c
+++ b/source/blender/bmesh/operators/bmo_edgenet.c
@@ -22,8 +22,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
 #include "BLI_array.h"
+#include "BLI_math.h"
 
 #include "bmesh.h"
 #include "bmesh_tools.h"
diff --git a/source/blender/bmesh/operators/bmo_extrude.c b/source/blender/bmesh/operators/bmo_extrude.c
index 7d557204369..7a7f4a14db3 100644
--- a/source/blender/bmesh/operators/bmo_extrude.c
+++ b/source/blender/bmesh/operators/bmo_extrude.c
@@ -24,8 +24,8 @@
 
 #include "DNA_meshdata_types.h"
 
-#include "BLI_math.h"
 #include "BLI_buffer.h"
+#include "BLI_math.h"
 
 #include "BKE_customdata.h"
 
diff --git a/source/blender/bmesh/operators/bmo_fill_attribute.c b/source/blender/bmesh/operators/bmo_fill_attribute.c
index 1e226beffc7..782fd98c2ea 100644
--- a/source/blender/bmesh/operators/bmo_fill_attribute.c
+++ b/source/blender/bmesh/operators/bmo_fill_attribute.c
@@ -20,8 +20,8 @@
  * Fill in geometry with the attributes of their adjacent data.
  */
 
-#include "BLI_utildefines.h"
 #include "BLI_linklist_stack.h"
+#include "BLI_utildefines.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/bmesh/operators/bmo_inset.c b/source/blender/bmesh/operators/bmo_inset.c
index 43dacfb5100..097a7aca383 100644
--- a/source/blender/bmesh/operators/bmo_inset.c
+++ b/source/blender/bmesh/operators/bmo_inset.c
@@ -23,8 +23,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
 #include "BLI_alloca.h"
+#include "BLI_math.h"
 #include "BLI_memarena.h"
 #include "BLI_utildefines_stack.h"
 
diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c
index 2c76074ad79..e480db64f9d 100644
--- a/source/blender/bmesh/operators/bmo_mesh_conv.c
+++ b/source/blender/bmesh/operators/bmo_mesh_conv.c
@@ -22,9 +22,9 @@
  * into a Bmesh, and back again.
  */
 
+#include "DNA_key_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
-#include "DNA_key_types.h"
 
 #include "BLI_math.h"
 
diff --git a/source/blender/bmesh/operators/bmo_normals.c b/source/blender/bmesh/operators/bmo_normals.c
index b24afc0f8e6..93a377ac2ca 100644
--- a/source/blender/bmesh/operators/bmo_normals.c
+++ b/source/blender/bmesh/operators/bmo_normals.c
@@ -22,8 +22,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
 #include "BLI_linklist_stack.h"
+#include "BLI_math.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/bmesh/operators/bmo_offset_edgeloops.c b/source/blender/bmesh/operators/bmo_offset_edgeloops.c
index 37b2133e0e4..d723e128bf1 100644
--- a/source/blender/bmesh/operators/bmo_offset_edgeloops.c
+++ b/source/blender/bmesh/operators/bmo_offset_edgeloops.c
@@ -25,8 +25,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
 #include "BLI_alloca.h"
+#include "BLI_math.h"
 #include "BLI_utildefines_stack.h"
 
 #include "BKE_customdata.h"
diff --git a/source/blender/bmesh/operators/bmo_planar_faces.c b/source/blender/bmesh/operators/bmo_planar_faces.c
index 9315d002d46..c8f9d9a38dd 100644
--- a/source/blender/bmesh/operators/bmo_planar_faces.c
+++ b/source/blender/bmesh/operators/bmo_planar_faces.c
@@ -22,8 +22,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
 #include "BLI_ghash.h"
+#include "BLI_math.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c
index 1d28d8223cd..02f17ea5d4a 100644
--- a/source/blender/bmesh/operators/bmo_removedoubles.c
+++ b/source/blender/bmesh/operators/bmo_removedoubles.c
@@ -22,12 +22,12 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
 #include "BLI_alloca.h"
 #include "BLI_kdtree.h"
 #include "BLI_listbase.h"
-#include "BLI_utildefines_stack.h"
+#include "BLI_math.h"
 #include "BLI_stack.h"
+#include "BLI_utildefines_stack.h"
 
 #include "BKE_customdata.h"
 
diff --git a/source/blender/bmesh/operators/bmo_rotate_edges.c b/source/blender/bmesh/operators/bmo_rotate_edges.c
index 56eaac03970..0c7c13610e6 100644
--- a/source/blender/bmesh/operators/bmo_rotate_edges.c
+++ b/source/blender/bmesh/operators/bmo_rotate_edges.c
@@ -22,8 +22,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
 #include "BLI_heap.h"
+#include "BLI_math.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c
index 41f65dd6f5a..bf63261fd4d 100644
--- a/source/blender/bmesh/operators/bmo_subdivide.c
+++ b/source/blender/bmesh/operators/bmo_subdivide.c
@@ -22,17 +22,17 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
-#include "BLI_rand.h"
 #include "BLI_array.h"
+#include "BLI_math.h"
 #include "BLI_noise.h"
+#include "BLI_rand.h"
 #include "BLI_stack.h"
 
 #include "BKE_customdata.h"
 
 #include "bmesh.h"
-#include "intern/bmesh_private.h"
 #include "intern/bmesh_operators_private.h"
+#include "intern/bmesh_private.h"
 
 typedef struct SubDParams {
   int numcuts;
diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c
index b9d5548f5d4..b261f018e3e 100644
--- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c
+++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c
@@ -33,11 +33,11 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_utildefines_stack.h"
 #include "BLI_alloca.h"
-#include "BLI_math.h"
 #include "BLI_listbase.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+#include "BLI_utildefines_stack.h"
 
 #include "BKE_curve.h"
 
diff --git a/source/blender/bmesh/operators/bmo_symmetrize.c b/source/blender/bmesh/operators/bmo_symmetrize.c
index 31c61f28ea9..e0df1c57d98 100644
--- a/source/blender/bmesh/operators/bmo_symmetrize.c
+++ b/source/blender/bmesh/operators/bmo_symmetrize.c
@@ -20,8 +20,8 @@
  * Makes the mesh symmetrical by splitting along an axis and duplicating the geometry.
  */
 
-#include "BLI_utildefines.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "bmesh.h"
 #include "intern/bmesh_operators_private.h"
diff --git a/source/blender/bmesh/operators/bmo_triangulate.c b/source/blender/bmesh/operators/bmo_triangulate.c
index f2a4f85acf9..b07494345ab 100644
--- a/source/blender/bmesh/operators/bmo_triangulate.c
+++ b/source/blender/bmesh/operators/bmo_triangulate.c
@@ -25,8 +25,8 @@
 #include "DNA_listBase.h"
 
 #include "BLI_math.h"
-#include "BLI_sort_utils.h"
 #include "BLI_scanfill.h"
+#include "BLI_sort_utils.h"
 
 #include "bmesh.h"
 #include "bmesh_tools.h"
diff --git a/source/blender/bmesh/operators/bmo_utils.c b/source/blender/bmesh/operators/bmo_utils.c
index bc06d5e454b..ffb4af1fe3c 100644
--- a/source/blender/bmesh/operators/bmo_utils.c
+++ b/source/blender/bmesh/operators/bmo_utils.c
@@ -25,8 +25,8 @@
 
 #include "DNA_meshdata_types.h"
 
-#include "BLI_math.h"
 #include "BLI_alloca.h"
+#include "BLI_math.h"
 
 #include "BKE_customdata.h"
 
diff --git a/source/blender/bmesh/tools/bmesh_beautify.c b/source/blender/bmesh/tools/bmesh_beautify.c
index dabdbc3c97a..c877c534376 100644
--- a/source/blender/bmesh/tools/bmesh_beautify.c
+++ b/source/blender/bmesh/tools/bmesh_beautify.c
@@ -29,8 +29,8 @@
  * - Take face normals into account.
  */
 
-#include "BLI_math.h"
 #include "BLI_heap.h"
+#include "BLI_math.h"
 #include "BLI_polyfill_2d_beautify.h"
 
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 1ab318a8946..4e4af05b17b 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -26,8 +26,8 @@
 #include "DNA_modifier_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_array.h"
 #include "BLI_alloca.h"
+#include "BLI_array.h"
 #include "BLI_math.h"
 #include "BLI_memarena.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c
index 8ae0dfecf55..7b6a820ea33 100644
--- a/source/blender/bmesh/tools/bmesh_bisect_plane.c
+++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c
@@ -31,12 +31,12 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_utildefines_stack.h"
 #include "BLI_alloca.h"
 #include "BLI_linklist.h"
 #include "BLI_linklist_stack.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
+#include "BLI_utildefines_stack.h"
 
 #include "bmesh.h"
 #include "bmesh_bisect_plane.h" /* own include */
diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c
index c183f370faa..0fc0fb130fc 100644
--- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c
+++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c
@@ -24,14 +24,14 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
-#include "BLI_quadric.h"
+#include "BLI_alloca.h"
 #include "BLI_heap.h"
 #include "BLI_linklist.h"
-#include "BLI_alloca.h"
+#include "BLI_math.h"
 #include "BLI_memarena.h"
 #include "BLI_polyfill_2d.h"
 #include "BLI_polyfill_2d_beautify.h"
+#include "BLI_quadric.h"
 #include "BLI_utildefines_stack.h"
 
 #include "BKE_customdata.h"
diff --git a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
index d4bce75d08b..0f23165f9af 100644
--- a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
+++ b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
@@ -22,8 +22,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
 #include "BLI_heap.h"
+#include "BLI_math.h"
 
 #include "BKE_customdata.h"
 
diff --git a/source/blender/bmesh/tools/bmesh_edgenet.c b/source/blender/bmesh/tools/bmesh_edgenet.c
index a3b9ce76b47..70b39393a4f 100644
--- a/source/blender/bmesh/tools/bmesh_edgenet.c
+++ b/source/blender/bmesh/tools/bmesh_edgenet.c
@@ -24,10 +24,10 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_alloca.h"
-#include "BLI_mempool.h"
 #include "BLI_linklist.h"
+#include "BLI_mempool.h"
+#include "BLI_utildefines.h"
 
 #include "bmesh.h"
 #include "bmesh_edgenet.h" /* own include */
diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c
index 8e378a034ab..4ca8364c312 100644
--- a/source/blender/bmesh/tools/bmesh_intersect.c
+++ b/source/blender/bmesh/tools/bmesh_intersect.c
@@ -33,19 +33,19 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_alloca.h"
 #include "BLI_math.h"
-#include "BLI_utildefines.h"
 #include "BLI_memarena.h"
-#include "BLI_alloca.h"
 #include "BLI_sort_utils.h"
+#include "BLI_utildefines.h"
 
 #include "BLI_linklist_stack.h"
 #include "BLI_utildefines_stack.h"
 #ifndef NDEBUG
 #endif
 
-#include "BLI_kdopbvh.h"
 #include "BLI_buffer.h"
+#include "BLI_kdopbvh.h"
 
 #include "bmesh.h"
 #include "intern/bmesh_private.h"
diff --git a/source/blender/bmesh/tools/bmesh_path.c b/source/blender/bmesh/tools/bmesh_path.c
index a874965c978..0331ca476dd 100644
--- a/source/blender/bmesh/tools/bmesh_path.c
+++ b/source/blender/bmesh/tools/bmesh_path.c
@@ -22,9 +22,9 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
-#include "BLI_linklist.h"
 #include "BLI_heap_simple.h"
+#include "BLI_linklist.h"
+#include "BLI_math.h"
 
 #include "bmesh.h"
 #include "bmesh_path.h" /* own include */
diff --git a/source/blender/bmesh/tools/bmesh_path_region.c b/source/blender/bmesh/tools/bmesh_path_region.c
index 841109a251f..f3061704884 100644
--- a/source/blender/bmesh/tools/bmesh_path_region.c
+++ b/source/blender/bmesh/tools/bmesh_path_region.c
@@ -23,10 +23,10 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
+#include "BLI_alloca.h"
 #include "BLI_linklist.h"
+#include "BLI_math.h"
 #include "BLI_utildefines_stack.h"
-#include "BLI_alloca.h"
 
 #include "bmesh.h"
 #include "bmesh_path_region.h" /* own include */
diff --git a/source/blender/bmesh/tools/bmesh_region_match.c b/source/blender/bmesh/tools/bmesh_region_match.c
index b4c2c3f091e..44761b9f37e 100644
--- a/source/blender/bmesh/tools/bmesh_region_match.c
+++ b/source/blender/bmesh/tools/bmesh_region_match.c
@@ -33,13 +33,13 @@
 
 #include <string.h>
 
-#include "MEM_guardedalloc.h"
-#include "BLI_listbase.h"
-#include "BLI_linklist.h"
 #include "BLI_alloca.h"
 #include "BLI_ghash.h"
-#include "BLI_mempool.h"
+#include "BLI_linklist.h"
 #include "BLI_linklist_stack.h"
+#include "BLI_listbase.h"
+#include "BLI_mempool.h"
+#include "MEM_guardedalloc.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/bmesh/tools/bmesh_separate.c b/source/blender/bmesh/tools/bmesh_separate.c
index 59c82448fa9..701c7dc7e03 100644
--- a/source/blender/bmesh/tools/bmesh_separate.c
+++ b/source/blender/bmesh/tools/bmesh_separate.c
@@ -25,12 +25,12 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_buffer.h"
+#include "BLI_utildefines.h"
 
 #include "bmesh.h"
-#include "intern/bmesh_private.h"
 #include "bmesh_separate.h" /* own include */
+#include "intern/bmesh_private.h"
 
 /**
  * Split all faces that match `filter_fn`.
diff --git a/source/blender/bmesh/tools/bmesh_triangulate.c b/source/blender/bmesh/tools/bmesh_triangulate.c
index 5c13292e556..08dbac95b56 100644
--- a/source/blender/bmesh/tools/bmesh_triangulate.c
+++ b/source/blender/bmesh/tools/bmesh_triangulate.c
@@ -24,11 +24,11 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_alloca.h"
-#include "BLI_memarena.h"
 #include "BLI_heap.h"
 #include "BLI_linklist.h"
+#include "BLI_memarena.h"
+#include "BLI_utildefines.h"
 
 /* only for defines */
 #include "BLI_polyfill_2d.h"
diff --git a/source/blender/bmesh/tools/bmesh_wireframe.c b/source/blender/bmesh/tools/bmesh_wireframe.c
index 1cfd608e959..2240c64807c 100644
--- a/source/blender/bmesh/tools/bmesh_wireframe.c
+++ b/source/blender/bmesh/tools/bmesh_wireframe.c
@@ -28,8 +28,8 @@
 
 #include "bmesh.h"
 
-#include "BKE_deform.h"
 #include "BKE_customdata.h"
+#include "BKE_deform.h"
 
 #include "bmesh_wireframe.h"