modifier include cleanup, this might need fixes on other systems but hard to avoid.

also removed unused stuff from cmake modifier file
2010-04-12 22:33:43 +00:00
parent 7814d42ec7
commit 4824e7eeeb
38 changed files with 87 additions and 1001 deletions
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -28,33 +28,18 @@ FILE(GLOB SRC intern/*.c)

 SET(INC 
 	. ./intern
-	../../../intern/guardedalloc
-	../include
 	../blenlib
 	../makesdna
 	../blenkernel
 	../blenkernel/intern
 	../render/extern/include
+    ../../../intern/guardedalloc
 	../../../intern/decimation/extern
 	../../../intern/elbeem/extern
 	../../../intern/bsp/extern
 	${ZLIB_INC}
 )

-IF(WITH_LZO)
-	SET(INC ${INC} ../../../extern/lzo/minilzo)
-	ADD_DEFINITIONS(-DWITH_LZO)
-ENDIF(WITH_LZO)
-
-IF(WITH_LZMA)
-	SET(INC ${INC} ../../../extern/lzma)
-	ADD_DEFINITIONS(-DWITH_LZMA)
-ENDIF(WITH_LZMA)
-
-IF(WITH_OPENMP)
-		ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
 IF(NOT WITH_ELBEEM)
 	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
 ENDIF(NOT WITH_ELBEEM)
--- a/source/blender/modifiers/intern/MOD_armature.c
+++ b/source/blender/modifiers/intern/MOD_armature.c
@@ -30,59 +30,21 @@
 *
 */

-#include "stddef.h"
 #include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"

-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_uvproject.h"
+#include "DNA_armature_types.h"
+
+#include "BKE_cdderivedmesh.h"
+#include "BKE_lattice.h"
+#include "BKE_modifier.h"

 #include "MEM_guardedalloc.h"

-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
-#include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
-#include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
-
 #include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"

-#include "CCGSubSurf.h"
-
-#include "MOD_modifiertypes.h"
 #include "MOD_util.h"


-/* Armature */
-
 static void initData(ModifierData *md)
 {
 	ArmatureModifierData *amd = (ArmatureModifierData*) md;
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -30,56 +30,23 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
+/* Array modifier: duplicates the object multiple times along an axis */
+
+#include "DNA_curve_types.h"
+#include "DNA_meshdata_types.h"

 #include "BLI_math.h"
-#include "BLI_rand.h"
 #include "BLI_ghash.h"
 #include "BLI_edgehash.h"

-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_meshdata_types.h"
-
-
-#include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"

 #include "depsgraph_private.h"

-#include "MOD_modifiertypes.h"
-
-/* Array */
-/* Array modifier: duplicates the object multiple times along an axis
-*/
-
 static void initData(ModifierData *md)
 {
 	ArrayModifierData *amd = (ArrayModifierData*) md;
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -30,53 +30,11 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
-
-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_uvproject.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
 #include "BKE_bmesh.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
 #include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"

-#include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-
-#include "MOD_modifiertypes.h"

 static void initData(ModifierData *md)
 {
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -30,52 +30,12 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"

-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_uvproject.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"

 #include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"

-#include "MOD_modifiertypes.h"
 #include "MOD_boolean_util.h"


--- a/source/blender/modifiers/intern/MOD_boolean_util.c
+++ b/source/blender/modifiers/intern/MOD_boolean_util.c
@@ -28,21 +28,14 @@
 * CSG operations. 
 */

-#include <string.h>
-#include <math.h>
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_math.h"
-#include "BLI_ghash.h"
-
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"

-#include "CSG_BooleanOps.h"
+#include "BLI_math.h"
+#include "BLI_ghash.h"

 #include "BKE_cdderivedmesh.h"
 #include "BKE_depsgraph.h"
@@ -50,7 +43,7 @@
 #include "BKE_mesh.h"
 #include "BKE_object.h"

-
+#include "CSG_BooleanOps.h"

 /**
 * Here's the vertex iterator structure used to walk through
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@@ -30,48 +30,17 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
-
-#include "BLI_kdtree.h"
 #include "BLI_rand.h"
-#include "BLI_uvproject.h"
 #include "BLI_ghash.h"

-#include "MEM_guardedalloc.h"
-
 #include "DNA_scene_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_object_fluidsim.h"

-
-#include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
-#include "BKE_paint.h"
 #include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
-
-#include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"


 static void initData(ModifierData *md)
--- a/source/blender/modifiers/intern/MOD_cast.c
+++ b/source/blender/modifiers/intern/MOD_cast.c
@@ -30,55 +30,17 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
+#include "DNA_meshdata_types.h"

 #include "BLI_math.h"

-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-#include "DNA_object_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_customdata_types.h"
+#include "BKE_deform.h"
 #include "BKE_DerivedMesh.h"
-
-#include "BKE_action.h"
-#include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
 #include "BKE_utildefines.h"
-#include "BKE_texture.h"

 #include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"

-#include "MOD_modifiertypes.h"
 #include "MOD_util.h"

 static void initData(ModifierData *md)
--- a/source/blender/modifiers/intern/MOD_cloth.c
+++ b/source/blender/modifiers/intern/MOD_cloth.c
@@ -30,59 +30,13 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
-
-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_uvproject.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
 #include "BKE_cloth.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
 #include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
 #include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"

 #include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-
-#include "LOD_decimation.h"
-
-#include "CCGSubSurf.h"
-
-#include "RE_shader_ext.h"
-
-#include "MOD_modifiertypes.h"


 static void initData(ModifierData *md) 
--- a/source/blender/modifiers/intern/MOD_collision.c
+++ b/source/blender/modifiers/intern/MOD_collision.c
@@ -30,54 +30,17 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
-
-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_math.h"
-#include "BLI_edgehash.h"
-
-#include "MEM_guardedalloc.h"
-
 #include "DNA_scene_types.h"
-#include "DNA_meshdata_types.h"
+
+#include "BLI_math.h"

 #include "BKE_collision.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
 #include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
 #include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"

-#include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-
-#include "LOD_decimation.h"
-
-#include "CCGSubSurf.h"
-
-#include "RE_shader_ext.h"
-
-#include "MOD_modifiertypes.h"

 static void initData(ModifierData *md) 
 {
--- a/source/blender/modifiers/intern/MOD_curve.c
+++ b/source/blender/modifiers/intern/MOD_curve.c
@@ -30,58 +30,15 @@
 *
 */

-#include "stddef.h"
 #include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
-
-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_uvproject.h"
-
-#include "MEM_guardedalloc.h"

 #include "DNA_scene_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"

-
-#include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
 #include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"

 #include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-
-#include "LOD_decimation.h"
-
-#include "CCGSubSurf.h"
-
-#include "RE_shader_ext.h"
-
-#include "MOD_modifiertypes.h"


 static void initData(ModifierData *md)
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -30,55 +30,20 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
+#include "DNA_meshdata_types.h"

 #include "BLI_math.h"

-#include "MEM_guardedalloc.h"
-
-#include "DNA_meshdata_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
 #include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"

-#include "depsgraph_private.h"
-#include "BKE_deform.h"
+#include "MEM_guardedalloc.h"

 #include "LOD_decimation.h"


-#include "RE_shader_ext.h"
-
-#include "MOD_modifiertypes.h"
-
-
 static void initData(ModifierData *md)
 {
 	DecimateModifierData *dmd = (DecimateModifierData*) md;
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -30,59 +30,22 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
+#include "DNA_meshdata_types.h"

-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
 #include "BLI_math.h"

-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
 #include "BKE_texture.h"
+#include "BKE_deform.h"

 #include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
+#include "MEM_guardedalloc.h"

-#include "LOD_decimation.h"
-
-#include "CCGSubSurf.h"
+#include "MOD_util.h"

 #include "RE_shader_ext.h"

-#include "MOD_modifiertypes.h"
-#include "MOD_util.h"
-

 /* Displace */

--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -30,55 +30,23 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "math.h"
-#include "float.h"
+/* EdgeSplit modifier: Splits edges in the mesh according to sharpness flag
+ * or edge angle (can be used to achieve autosmoothing) */
+
+#include "DNA_meshdata_types.h"

 #include "BLI_listbase.h"
 #include "BLI_memarena.h"
 #include "BLI_edgehash.h"
 #include "BLI_math.h"

-#include "MEM_guardedalloc.h"
-
-#include "DNA_meshdata_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
 #include "BKE_particle.h"

-#include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
+#include "MEM_guardedalloc.h"

-#include "LOD_decimation.h"

-#include "CCGSubSurf.h"
-
-#include "RE_shader_ext.h"
-
-#include "MOD_modifiertypes.h"
-
-/* EdgeSplit modifier: Splits edges in the mesh according to sharpness flag
- * or edge angle (can be used to achieve autosmoothing)
-*/
 #if 0
 #define EDGESPLIT_DEBUG_3
 #define EDGESPLIT_DEBUG_2
--- a/source/blender/modifiers/intern/MOD_explode.c
+++ b/source/blender/modifiers/intern/MOD_explode.c
@@ -30,59 +30,24 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_scene_types.h"

 #include "BLI_kdtree.h"
 #include "BLI_rand.h"
 #include "BLI_math.h"
 #include "BLI_edgehash.h"

-#include "MEM_guardedalloc.h"
-
-#include "DNA_meshdata_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
 #include "BKE_lattice.h"
-#include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
-#include "BKE_paint.h"
 #include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
 #include "BKE_utildefines.h"
-
-#include "depsgraph_private.h"
 #include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"

-#include "LOD_decimation.h"
-
-#include "CCGSubSurf.h"
-
-#include "RE_shader_ext.h"
-
-#include "MOD_modifiertypes.h"
+#include "MEM_guardedalloc.h"


 static void initData(ModifierData *md)
--- a/source/blender/modifiers/intern/MOD_fluidsim.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim.c
@@ -30,50 +30,16 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
-
-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_uvproject.h"
-
-#include "MEM_guardedalloc.h"
-
 #include "DNA_scene_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_fluidsim.h"

-
-#include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"

 #include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"

-#include "MOD_modifiertypes.h"
 #include "MOD_fluidsim_util.h"
-
+#include "MEM_guardedalloc.h"

 /* Fluidsim */
 static void initData(ModifierData *md)
--- a/source/blender/modifiers/intern/MOD_fluidsim_util.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c
@@ -31,33 +31,26 @@
 */

 #include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include <float.h>
 #include <zlib.h>

-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "BKE_cdderivedmesh.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_global.h"
-#include "BKE_mesh.h"
-#include "BKE_utildefines.h"
-
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_object_fluidsim.h"
-#include "DNA_scene_types.h"
-#include "DNA_space_types.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+
+#include "BKE_cdderivedmesh.h"
+#include "BKE_mesh.h"
+#include "BKE_utildefines.h"
+#include "BKE_global.h" /* G.sce only */

 #include "MOD_modifiertypes.h"
-#include "MOD_fluidsim_util.h"
+
+#include "MEM_guardedalloc.h"

 // headers for fluidsim bobj meshes
 #include "LBM_fluidsim.h"
--- a/source/blender/modifiers/intern/MOD_hook.c
+++ b/source/blender/modifiers/intern/MOD_hook.c
@@ -30,58 +30,18 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
-
-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_math.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"

+#include "BLI_math.h"

 #include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
+#include "BKE_deform.h"

 #include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-
-#include "LOD_decimation.h"
-
-#include "CCGSubSurf.h"
-
-#include "RE_shader_ext.h"
-
-#include "MOD_modifiertypes.h"
+#include "MEM_guardedalloc.h"


 static void initData(ModifierData *md) 
--- a/source/blender/modifiers/intern/MOD_lattice.c
+++ b/source/blender/modifiers/intern/MOD_lattice.c
@@ -30,57 +30,14 @@
 *
 */

-#include "stddef.h"
 #include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"

-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_uvproject.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
 #include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"

 #include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"

-#include "LOD_decimation.h"
-
-#include "CCGSubSurf.h"
-
-#include "RE_shader_ext.h"
-
-#include "MOD_modifiertypes.h"
 #include "MOD_util.h"


--- a/source/blender/modifiers/intern/MOD_mask.c
+++ b/source/blender/modifiers/intern/MOD_mask.c
@@ -30,55 +30,17 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
+#include "DNA_armature_types.h"
+#include "DNA_meshdata_types.h"

 #include "BLI_ghash.h"

-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
+#include "BKE_deform.h"

 #include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-
-#include "LOD_decimation.h"
-
-#include "CCGSubSurf.h"
-
-#include "RE_shader_ext.h"
-
-#include "MOD_modifiertypes.h"


 static void copyData(ModifierData *md, ModifierData *target)
--- a/source/blender/modifiers/intern/MOD_meshdeform.c
+++ b/source/blender/modifiers/intern/MOD_meshdeform.c
@@ -30,58 +30,20 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
+#include "DNA_meshdata_types.h"

-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
 #include "BLI_math.h"

+#include "BKE_cdderivedmesh.h"
+#include "BKE_global.h"
+#include "BKE_mesh.h"
+#include "BKE_modifier.h"
+#include "BKE_deform.h"
+
+#include "depsgraph_private.h"
+
 #include "MEM_guardedalloc.h"

-#include "DNA_meshdata_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
-#include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
-#include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
-
-#include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-
-#include "LOD_decimation.h"
-
-#include "CCGSubSurf.h"
-
-#include "RE_shader_ext.h"
-
-#include "MOD_modifiertypes.h"
 #include "MOD_util.h"


--- a/source/blender/modifiers/intern/MOD_mirror.c
+++ b/source/blender/modifiers/intern/MOD_mirror.c
@@ -30,57 +30,19 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
+
+#include "DNA_meshdata_types.h"

 #include "BLI_math.h"

-#include "MEM_guardedalloc.h"
-
-#include "DNA_meshdata_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
-
-#include "depsgraph_private.h"
 #include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
 #include "BKE_utildefines.h"

-#include "LOD_decimation.h"
-
-#include "CCGSubSurf.h"
-
-#include "RE_shader_ext.h"
-
-#include "MOD_modifiertypes.h"
-
+#include "MEM_guardedalloc.h"
+#include "depsgraph_private.h"

 static void initData(ModifierData *md)
 {
--- a/source/blender/modifiers/intern/MOD_multires.c
+++ b/source/blender/modifiers/intern/MOD_multires.c
@@ -30,56 +30,11 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
-
-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_uvproject.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
 #include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
 #include "BKE_paint.h"
 #include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
-
-#include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-
-#include "CCGSubSurf.h"
-
-#include "RE_shader_ext.h"
-
-#include "MOD_modifiertypes.h"
-

 static void initData(ModifierData *md)
 {
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@ -30,47 +30,20 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
+#include "DNA_meshdata_types.h"

 #include "BLI_math.h"
 #include "BLI_listbase.h"
 #include "BLI_rand.h"

-#include "MEM_guardedalloc.h"
-
-#include "DNA_meshdata_types.h"
-
-#include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
 #include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
-
-#include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
 #include "BKE_utildefines.h"

-
-#include "MOD_modifiertypes.h"
+#include "depsgraph_private.h"


 static void initData(ModifierData *md)
--- a/source/blender/modifiers/intern/MOD_particlesystem.c
+++ b/source/blender/modifiers/intern/MOD_particlesystem.c
@@ -31,36 +31,14 @@
 */

 #include "stddef.h"
-#include "string.h"
-#include "math.h"
-#include "float.h"

-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_uvproject.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
 #include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"

-#include "BKE_action.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_material.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
 #include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_smoke.h"

-#include "BKE_deform.h"
-
-#include "MOD_modifiertypes.h"
 #include "MOD_util.h"


--- a/source/blender/modifiers/intern/MOD_screw.c
+++ b/source/blender/modifiers/intern/MOD_screw.c
@@ -30,26 +30,18 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "math.h"
-#include "float.h"
-
-#include "BLI_math.h"
+/* Screw modifier: revolves the edges about an axis */

 #include "DNA_meshdata_types.h"

+#include "BLI_math.h"
+
 #include "BKE_cdderivedmesh.h"

 #include "depsgraph_private.h"
-
 #include "MOD_modifiertypes.h"
-
 #include "MEM_guardedalloc.h"

-/* Screw modifier: revolves the edges about an axis
-*/
-
 /* used for gathering edge connectivity */
 typedef struct ScrewVertConnect {
 	float dist;  /* distance from the center axis */
--- a/source/blender/modifiers/intern/MOD_shapekey.c
+++ b/source/blender/modifiers/intern/MOD_shapekey.c
@@ -30,16 +30,10 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "math.h"
-#include "float.h"
-
 #include "BLI_math.h"

 #include "DNA_key_types.h"

-
 #include "BKE_cdderivedmesh.h"
 #include "BKE_key.h"
 #include "BKE_particle.h"
--- a/source/blender/modifiers/intern/MOD_shrinkwrap.c
+++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c
@@ -30,10 +30,7 @@
 *
 */

-#include "stddef.h"
 #include "string.h"
-#include "math.h"
-#include "float.h"

 #include "BKE_cdderivedmesh.h"
 #include "BKE_modifier.h"
@@ -41,7 +38,6 @@

 #include "depsgraph_private.h"

-#include "MOD_modifiertypes.h"
 #include "MOD_util.h"


--- a/source/blender/modifiers/intern/MOD_simpledeform.c
+++ b/source/blender/modifiers/intern/MOD_simpledeform.c
@@ -30,11 +30,6 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "math.h"
-#include "float.h"
-
 #include "DNA_meshdata_types.h"

 #include "BLI_math.h"
@@ -48,11 +43,8 @@

 #include "depsgraph_private.h"

-#include "MOD_modifiertypes.h"
 #include "MOD_util.h"

-#include <string.h>
-#include <math.h>


 /* Clamps/Limits the given coordinate to:  limits[0] <= co[axis] <= limits[1]
--- a/source/blender/modifiers/intern/MOD_smoke.c
+++ b/source/blender/modifiers/intern/MOD_smoke.c
@@ -31,9 +31,6 @@
 */

 #include "stddef.h"
-#include "string.h"
-#include "math.h"
-#include "float.h"

 #include "BKE_cdderivedmesh.h"
 #include "BKE_modifier.h"
@@ -41,8 +38,6 @@

 #include "depsgraph_private.h"

-
-#include "MOD_modifiertypes.h"
 #include "MOD_util.h"


--- a/source/blender/modifiers/intern/MOD_smooth.c
+++ b/source/blender/modifiers/intern/MOD_smooth.c
@@ -30,11 +30,6 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "math.h"
-#include "float.h"
-
 #include "DNA_meshdata_types.h"

 #include "BLI_math.h"
--- a/source/blender/modifiers/intern/MOD_softbody.c
+++ b/source/blender/modifiers/intern/MOD_softbody.c
@@ -30,11 +30,6 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "math.h"
-#include "float.h"
-
 #include "DNA_scene_types.h"

 #include "BKE_cdderivedmesh.h"
--- a/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@@ -30,16 +30,11 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "math.h"
-#include "float.h"
+#include "DNA_meshdata_types.h"

 #include "BLI_math.h"
 #include "BLI_edgehash.h"

-#include "DNA_meshdata_types.h"
-
 #include "BKE_cdderivedmesh.h"
 #include "BKE_mesh.h"
 #include "BKE_particle.h"
--- a/source/blender/modifiers/intern/MOD_subsurf.c
+++ b/source/blender/modifiers/intern/MOD_subsurf.c
@@ -31,9 +31,6 @@
 */

 #include "stddef.h"
-#include "string.h"
-#include "math.h"
-#include "float.h"

 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
@@ -42,10 +39,9 @@
 #include "BKE_scene.h"
 #include "BKE_subsurf.h"

-#include "CCGSubSurf.h"
-
 #include "MOD_modifiertypes.h"

+#include "CCGSubSurf.h"

 static void initData(ModifierData *md)
 {
--- a/source/blender/modifiers/intern/MOD_surface.c
+++ b/source/blender/modifiers/intern/MOD_surface.c
@@ -30,24 +30,19 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "math.h"
-#include "float.h"
-
-#include "BLI_math.h"
-
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 #include "DNA_meshdata_types.h"

-#include "MEM_guardedalloc.h"
+#include "BLI_math.h"
+
 #include "BKE_cdderivedmesh.h"

 #include "MOD_modifiertypes.h"
 #include "MOD_util.h"

-/* Surface */
+#include "MEM_guardedalloc.h"
+

 static void initData(ModifierData *md) 
 {
--- a/source/blender/modifiers/intern/MOD_util.c
+++ b/source/blender/modifiers/intern/MOD_util.c
@@ -30,23 +30,22 @@
 * ***** END GPL LICENSE BLOCK *****
 */

+#include "string.h"
+
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 #include "DNA_curve_types.h"

-#include "MEM_guardedalloc.h"
-#include "MOD_util.h"
-
 #include "BKE_cdderivedmesh.h"
 #include "BKE_mesh.h"
 #include "BKE_displist.h"
-
-#include "RE_shader_ext.h"
-
 #include "BKE_utildefines.h"

-#include "stdlib.h"
-#include "string.h"
+#include "MOD_util.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "RE_shader_ext.h"

 void get_texture_value(Tex *texture, float *tex_co, TexResult *texres)
 {
--- a/source/blender/modifiers/intern/MOD_uvproject.c
+++ b/source/blender/modifiers/intern/MOD_uvproject.c
@@ -30,29 +30,21 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "math.h"
-#include "float.h"
+/* UV Project modifier: Generates UVs projected from an object */

-#include "DNA_camera_types.h"
 #include "DNA_meshdata_types.h"
+#include "DNA_camera_types.h"

 #include "BLI_math.h"
 #include "BLI_uvproject.h"

 #include "BKE_DerivedMesh.h"
-#include "depsgraph_private.h"

 #include "MOD_modifiertypes.h"
 #include "MOD_util.h"

 #include "MEM_guardedalloc.h"
-
-
-/* UVProject */
-/* UV Project modifier: Generates UVs projected from an object
-*/
+#include "depsgraph_private.h"

 static void initData(ModifierData *md)
 {
--- a/source/blender/modifiers/intern/MOD_wave.c
+++ b/source/blender/modifiers/intern/MOD_wave.c
@@ -30,27 +30,18 @@
 *
 */

-#include "stddef.h"
-#include "string.h"
-#include "math.h"
-#include "float.h"
-
 #include "BLI_math.h"

-#include "DNA_object_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_customdata_types.h"
+
 #include "BKE_DerivedMesh.h"
-
-#include "MEM_guardedalloc.h"
-
 #include "BKE_object.h"
-
-#include "depsgraph_private.h"
 #include "BKE_deform.h"

+#include "depsgraph_private.h"

+#include "MEM_guardedalloc.h"
 #include "RE_shader_ext.h"

 #include "MOD_modifiertypes.h"