Cleanup: finish modifiers' hearder re-order from rBe31f0fad9744c813.

For some reason forgot to handle half of modifier files...

source/blender/modifiers/intern/MOD_armature.c

@@ -24,12 +24,12 @@
 
 #include <string.h>
 
+#include "BLI_utildefines.h"
+
 #include "DNA_armature_types.h"
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
 
-#include "BLI_utildefines.h"
-
 #include "BKE_editmesh.h"
 #include "BKE_lattice.h"
 #include "BKE_library.h"

source/blender/modifiers/intern/MOD_array.c

@@ -25,9 +25,10 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
 #include "BLI_utildefines.h"
 
+#include "BLI_math.h"
+
 #include "DNA_curve_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"

source/blender/modifiers/intern/MOD_bevel.c

@@ -23,14 +23,15 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
+
+#include "BLI_math.h"
+
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_math.h"
-
 #include "BKE_deform.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"

source/blender/modifiers/intern/MOD_boolean.c

@@ -25,26 +25,25 @@
 
 #include <stdio.h>
 
-#include "DNA_object_types.h"
-
 #include "BLI_utildefines.h"
-#include "BLI_math_matrix.h"
-
-#include "BKE_library_query.h"
-#include "BKE_modifier.h"
-
-#include "MOD_util.h"
 
 #include "BLI_alloca.h"
 #include "BLI_math_geom.h"
-
-#include "BKE_global.h"  /* only to check G.debug */
-#include "BKE_library.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
+#include "BLI_math_matrix.h"
 
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
+#include "DNA_object_types.h"
+
+#include "BKE_global.h"  /* only to check G.debug */
+#include "BKE_library.h"
+#include "BKE_library_query.h"
+#include "BKE_material.h"
+#include "BKE_mesh.h"
+#include "BKE_modifier.h"
+
+
+#include "MOD_util.h"
 
 #include "DEG_depsgraph_query.h"
 

source/blender/modifiers/intern/MOD_build.c

@@ -24,9 +24,10 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
-#include "BLI_rand.h"
-#include "BLI_math_vector.h"
+
 #include "BLI_ghash.h"
+#include "BLI_math_vector.h"
+#include "BLI_rand.h"
 
 #include "DNA_meshdata_types.h"
 #include "DNA_mesh_types.h"

source/blender/modifiers/intern/MOD_cast.c

@@ -22,14 +22,14 @@
  */
 
 
+#include "BLI_utildefines.h"
+
+#include "BLI_math.h"
+
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-
-
 #include "BKE_deform.h"
 #include "BKE_editmesh.h"
 #include "BKE_library.h"

source/blender/modifiers/intern/MOD_cloth.c

@@ -23,6 +23,10 @@
 
 #include <string.h>
 
+#include "BLI_utildefines.h"
+
+#include "BLI_listbase.h"
+
 #include "DNA_cloth_types.h"
 #include "DNA_key_types.h"
 #include "DNA_mesh_types.h"
@@ -31,9 +35,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_listbase.h"
-#include "BLI_utildefines.h"
-
 #include "BKE_cloth.h"
 #include "BKE_effect.h"
 #include "BKE_global.h"

source/blender/modifiers/intern/MOD_collision.c

@@ -21,15 +21,16 @@
  * \ingroup modifiers
  */
 
+#include "BLI_utildefines.h"
+
+#include "BLI_math.h"
+
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-
 #include "BKE_collision.h"
 #include "BKE_global.h"
 #include "BKE_library.h"

source/blender/modifiers/intern/MOD_correctivesmooth.c

@@ -23,14 +23,15 @@
  * Method of smoothing deformation, also known as 'delta-mush'.
  */
 
+#include "BLI_utildefines.h"
+
+#include "BLI_math.h"
+
 #include "DNA_scene_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
 
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-
 #include "MEM_guardedalloc.h"
 
 #include "BKE_deform.h"

source/blender/modifiers/intern/MOD_curve.c

@@ -23,12 +23,12 @@
 
 #include <string.h>
 
+#include "BLI_utildefines.h"
+
 #include "DNA_mesh_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 
-#include "BLI_utildefines.h"
-
 #include "BKE_editmesh.h"
 #include "BKE_lattice.h"
 #include "BKE_library.h"

source/blender/modifiers/intern/MOD_datatransfer.c

@@ -22,6 +22,7 @@
  */
 
 #include "BLI_utildefines.h"
+
 #include "BLI_math.h"
 
 #include "DNA_mesh_types.h"

source/blender/modifiers/intern/MOD_decimate.c

@@ -21,13 +21,14 @@
  * \ingroup modifiers
  */
 
+#include "BLI_utildefines.h"
+
+#include "BLI_math.h"
+
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-
 #include "MEM_guardedalloc.h"
 
 #include "BKE_deform.h"

source/blender/modifiers/intern/MOD_displace.c

@@ -22,14 +22,15 @@
  */
 
 
+#include "BLI_utildefines.h"
+
+#include "BLI_math.h"
+#include "BLI_task.h"
+
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_math.h"
-#include "BLI_task.h"
-
 #include "BKE_customdata.h"
 #include "BKE_editmesh.h"
 #include "BKE_library.h"

source/blender/modifiers/intern/MOD_dynamicpaint.c

@@ -20,14 +20,14 @@
 
 #include <stddef.h>
 
+#include "BLI_utildefines.h"
+
 #include "DNA_dynamicpaint_types.h"
 #include "DNA_object_types.h"
 #include "DNA_object_force_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_mesh_types.h"
 
-#include "BLI_utildefines.h"
-
 #include "BKE_dynamicpaint.h"
 #include "BKE_layer.h"
 #include "BKE_library_query.h"

source/blender/modifiers/intern/MOD_edgesplit.c

@@ -27,17 +27,18 @@
  */
 
 #include "BLI_utildefines.h"
+
 #include "BLI_math.h"
 
+#include "DNA_mesh_types.h"
+#include "DNA_object_types.h"
+
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 
 #include "bmesh.h"
 #include "bmesh_tools.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_object_types.h"
-
 #include "MOD_modifiertypes.h"
 
 static Mesh *doEdgeSplit(Mesh *mesh, EdgeSplitModifierData *emd)

source/blender/modifiers/intern/MOD_explode.c

@@ -22,17 +22,18 @@
  */
 
 
+#include "BLI_utildefines.h"
+
+#include "BLI_edgehash.h"
+#include "BLI_kdtree.h"
+#include "BLI_math.h"
+#include "BLI_rand.h"
+
 #include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_math.h"
-#include "BLI_edgehash.h"
-
 #include "BKE_deform.h"
 #include "BKE_lattice.h"
 #include "BKE_library.h"

source/blender/modifiers/intern/MOD_fluidsim.c

@@ -22,13 +22,13 @@
  */
 
 
+#include "BLI_utildefines.h"
+
 #include "DNA_mesh_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_object_fluidsim_types.h"
 #include "DNA_object_types.h"
 
-#include "BLI_utildefines.h"
-
 #include "BKE_layer.h"
 #include "BKE_modifier.h"
 

source/blender/modifiers/intern/MOD_fluidsim_util.c

@@ -25,23 +25,25 @@
 #include <stddef.h>
 #include <zlib.h>
 
+#include "BLI_utildefines.h"
+
+#ifdef WITH_MOD_FLUID
+#  include "BLI_blenlib.h"
+#  include "BLI_math.h"
+#endif
+
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_fluidsim_types.h"
 
-#include "BLI_utildefines.h"
-
 #include "BKE_fluidsim.h" /* ensure definitions here match */
+#include "BKE_mesh.h"
 #ifdef WITH_MOD_FLUID
-#  include "BLI_blenlib.h"
-#  include "BLI_math.h"
-
 #  include "BKE_global.h"
 #  include "BKE_library.h"
 #endif
-#include "BKE_mesh.h"
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"

source/blender/modifiers/intern/MOD_hook.c

@@ -22,13 +22,14 @@
  */
 
 
+#include "BLI_utildefines.h"
+
+#include "BLI_math.h"
+
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-
 #include "BKE_action.h"
 #include "BKE_editmesh.h"
 #include "BKE_library.h"

source/blender/modifiers/intern/MOD_laplaciandeform.c

@@ -22,12 +22,16 @@
  */
 
 #include "BLI_utildefines.h"
-#include "BLI_utildefines_stack.h"
+
 #include "BLI_math.h"
 #include "BLI_string.h"
+#include "BLI_utildefines_stack.h"
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+
 #include "BKE_deform.h"
 #include "BKE_editmesh.h"
 #include "BKE_library.h"
@@ -35,9 +39,6 @@
 #include "BKE_mesh_runtime.h"
 #include "BKE_particle.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-
 #include "MOD_util.h"
 
 #include "eigen_capi.h"

source/blender/modifiers/intern/MOD_laplaciansmooth.c

@@ -22,13 +22,14 @@
  */
 
 
+#include "BLI_utildefines.h"
+
+#include "BLI_math.h"
+
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-
 #include "MEM_guardedalloc.h"
 
 #include "BKE_deform.h"

source/blender/modifiers/intern/MOD_lattice.c

@@ -24,10 +24,10 @@
 
 #include <string.h>
 
-#include "DNA_object_types.h"
-
 #include "BLI_utildefines.h"
 
+#include "DNA_object_types.h"
+
 #include "BKE_editmesh.h"
 #include "BKE_lattice.h"
 #include "BKE_library.h"

source/blender/modifiers/intern/MOD_mask.c

@@ -25,6 +25,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
+
 #include "BLI_listbase.h"
 #include "BLI_ghash.h"
 

source/blender/modifiers/intern/MOD_meshcache.c

@@ -20,16 +20,17 @@
 
 #include <stdio.h>
 
+#include "BLI_utildefines.h"
+
+#include "BLI_math.h"
+#include "BLI_path_util.h"
+#include "BLI_string.h"
+
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_string.h"
-#include "BLI_path_util.h"
-#include "BLI_math.h"
-
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_scene.h"

source/blender/modifiers/intern/MOD_meshcache_mdd.c

@@ -22,8 +22,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
+
 #include "BLI_fileops.h"
 #include "BLI_math.h"
 #ifdef __LITTLE_ENDIAN__
@@ -33,10 +33,10 @@
 #  include "BLI_winstuff.h"
 #endif
 
-#include "MOD_meshcache_util.h"  /* own include */
-
 #include "DNA_modifier_types.h"
 
+#include "MOD_meshcache_util.h"  /* own include */
+
 typedef struct MDDHead {
 	int frame_tot;
 	int verts_tot;

source/blender/modifiers/intern/MOD_meshcache_pc2.c

@@ -22,8 +22,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
+
 #include "BLI_fileops.h"
 #ifdef __BIG_ENDIAN__
 #  include "BLI_endian_switch.h"
@@ -33,10 +33,10 @@
 #  include "BLI_winstuff.h"
 #endif
 
-#include "MOD_meshcache_util.h"  /* own include */
-
 #include "DNA_modifier_types.h"
 
+#include "MOD_meshcache_util.h"  /* own include */
+
 typedef struct PC2Head {
 	char    header[12];  /* 'POINTCACHE2\0' */
 	int     file_version;  /* unused - should be 1 */

source/blender/modifiers/intern/MOD_meshcache_util.c

@@ -19,6 +19,7 @@
  */
 
 #include "BLI_utildefines.h"
+
 #include "BLI_math.h"
 
 #include "DNA_modifier_types.h"

source/blender/modifiers/intern/MOD_meshdeform.c

@@ -21,15 +21,16 @@
  * \ingroup modifiers
  */
 
+#include "BLI_utildefines.h"
+
+#include "BLI_math.h"
+#include "BLI_task.h"
+
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_math.h"
-#include "BLI_task.h"
-#include "BLI_utildefines.h"
-
 #include "BKE_global.h"
 #include "BKE_library.h"
 #include "BKE_library_query.h"

source/blender/modifiers/intern/MOD_mirror.c

@@ -22,12 +22,12 @@
  */
 
 
+#include "BLI_math.h"
+
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
-#include "BLI_math.h"
-
 #include "BKE_library.h"
 #include "BKE_library_query.h"
 #include "BKE_mesh.h"

source/blender/modifiers/intern/MOD_multires.c

@@ -24,12 +24,12 @@
 
 #include <stddef.h>
 
+#include "BLI_utildefines.h"
+
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_utildefines.h"
-
 #include "BKE_cdderivedmesh.h"
 #include "BKE_mesh.h"
 #include "BKE_multires.h"