include cleanup

24 files changed, 65 insertions, 493 deletions

diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c
index 6f45f4f6611..43646c54acf 100644
--- a/source/blender/blenkernel/intern/modifiers_bmesh.c
+++ b/source/blender/blenkernel/intern/modifiers_bmesh.c
@@ -36,70 +36,16 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_math.h"
-#include "BLI_blenlib.h"
-#include "BLI_kdopbvh.h"
-#include "BLI_kdtree.h"
-#include "BLI_linklist.h"
-#include "BLI_rand.h"
-#include "BLI_edgehash.h"
-#include "BLI_ghash.h"
-#include "BLI_memarena.h"
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_action_types.h"
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_cloth_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_effect_types.h"
-#include "DNA_material_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_force.h"
-#include "DNA_particle_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_texture_types.h"
 
-#include "BLI_editVert.h"
 #include "BLI_array.h"
 
-#include "BKE_main.h"
-#include "BKE_anim.h"
 #include "BKE_bmesh.h"
-// XXX #include "BKE_booleanops.h"
-#include "BKE_cloth.h"
-#include "BKE_collision.h"
-#include "BKE_cdderivedmesh.h"
-#include "BKE_curve.h"
-#include "BKE_customdata.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_lattice.h"
-#include "BKE_library.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_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
 #include "BKE_tessmesh.h"
 
-#include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-
-#include "CCGSubSurf.h"
-#include "RE_shader_ext.h"
-#include "LOD_decimation.h"
 
 /* converts a cddm to a BMEditMesh.  if existing is non-NULL, the
  * new geometry will be put in there.*/
diff --git a/source/blender/bmesh/operators/bevel.c b/source/blender/bmesh/operators/bevel.c
index b957da66e7a..d208ec2ee14 100644
--- a/source/blender/bmesh/operators/bevel.c
+++ b/source/blender/bmesh/operators/bevel.c
@@ -22,17 +22,11 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_ghash.h"
-#include "BLI_memarena.h"
 #include "BLI_array.h"
 #include "BLI_math.h"
-#include "BLI_array.h"
-#include "BLI_utildefines.h"
 #include "BLI_smallhash.h"
 
 #include "bmesh.h"
-#include "bmesh_operators_private.h"
 
 #define BEVEL_FLAG	1
 #define BEVEL_DEL	2
diff --git a/source/blender/bmesh/operators/bmesh_dupeops.c b/source/blender/bmesh/operators/bmesh_dupeops.c
index a868679adfa..28dd9e25315 100644
--- a/source/blender/bmesh/operators/bmesh_dupeops.c
+++ b/source/blender/bmesh/operators/bmesh_dupeops.c
@@ -22,15 +22,11 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 
-#include "BLI_ghash.h"
-#include "BLI_memarena.h"
 #include "BLI_array.h"
 #include "BLI_math.h"
 
 #include "bmesh.h"
-#include "bmesh_operators_private.h"
 
 /* local flag define */
 #define DUPE_INPUT		1 /* input from operato */
diff --git a/source/blender/bmesh/operators/connectops.c b/source/blender/bmesh/operators/connectops.c
index 0b727194c42..5054b351f15 100644
--- a/source/blender/bmesh/operators/connectops.c
+++ b/source/blender/bmesh/operators/connectops.c
@@ -22,17 +22,12 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BKE_utildefines.h"
 
 #include "bmesh.h"
-#include "mesh_intern.h"
-#include "bmesh_private.h"
+
 #include "BLI_math.h"
 #include "BLI_array.h"
 
-#include <stdio.h>
-#include <string.h>
-
 #define VERT_INPUT	1
 #define EDGE_OUT	1
 #define FACE_NEW	2
diff --git a/source/blender/bmesh/operators/createops.c b/source/blender/bmesh/operators/createops.c
index cec2d8fd505..570c759eb43 100644
--- a/source/blender/bmesh/operators/createops.c
+++ b/source/blender/bmesh/operators/createops.c
@@ -22,12 +22,10 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
+#include "DNA_mesh_types.h"
+
 
-#include "BLI_memarena.h"
-#include "BLI_mempool.h"
 #include "BLI_heap.h"
-#include "BLI_ghash.h"
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_array.h"
@@ -35,7 +33,7 @@
 #include "BLI_rand.h"
 
 #include "bmesh.h"
-#include "bmesh_operators_private.h"
+
 
 #define EDGE_MARK	1
 #define EDGE_VIS	2
diff --git a/source/blender/bmesh/operators/dissolveops.c b/source/blender/bmesh/operators/dissolveops.c
index a876cc95fed..7abb9846a69 100644
--- a/source/blender/bmesh/operators/dissolveops.c
+++ b/source/blender/bmesh/operators/dissolveops.c
@@ -22,17 +22,18 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+
 #include "BKE_utildefines.h"
 
-#include "bmesh.h"
-#include "mesh_intern.h"
-#include "bmesh_private.h"
 #include "BLI_math.h"
 #include "BLI_array.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "bmesh.h"
+#include "bmesh_private.h"
+
+#include "bmesh_operators_private.h" /* own include */
 
 #define FACE_MARK	1
 #define FACE_ORIG	2
diff --git a/source/blender/bmesh/operators/edgesplitop.c b/source/blender/bmesh/operators/edgesplitop.c
index 41e5d510730..6f8bfb1c454 100644
--- a/source/blender/bmesh/operators/edgesplitop.c
+++ b/source/blender/bmesh/operators/edgesplitop.c
@@ -22,29 +22,18 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+
 #include "BKE_utildefines.h"
-#include "BKE_tessmesh.h"
 
 #include "BLI_math.h"
-#include "BLI_rand.h"
-#include "BLI_ghash.h"
 #include "BLI_array.h"
 
-#include "DNA_object_types.h"
-
-#include "ED_mesh.h"
-
 #include "bmesh.h"
-#include "mesh_intern.h"
-#include "subdivideop.h"
 
 #include "bmesh_operators_private.h" /* own include */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
 typedef struct EdgeTag {
 	BMVert *newv1, *newv2;
 	BMEdge *newe1, *newe2;
diff --git a/source/blender/bmesh/operators/extrudeops.c b/source/blender/bmesh/operators/extrudeops.c
index b79e41d9f20..950e82690e6 100644
--- a/source/blender/bmesh/operators/extrudeops.c
+++ b/source/blender/bmesh/operators/extrudeops.c
@@ -22,21 +22,17 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+
+#include "BKE_utildefines.h"
 
-#include "BLI_ghash.h"
-#include "BLI_memarena.h"
 #include "BLI_math.h"
 #include "BLI_array.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
-#include "bmesh_operators_private.h"
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "bmesh_operators_private.h" /* own include */
 
 #define EXT_INPUT 1
 #define EXT_KEEP  2
diff --git a/source/blender/bmesh/operators/join_triangles.c b/source/blender/bmesh/operators/join_triangles.c
index 56ff95cc086..7873be21556 100644
--- a/source/blender/bmesh/operators/join_triangles.c
+++ b/source/blender/bmesh/operators/join_triangles.c
@@ -21,29 +21,14 @@
  */
 
 #include "MEM_guardedalloc.h"
-#include "BKE_customdata.h"
-#include "DNA_listBase.h"
-#include "DNA_customdata_types.h"
+
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include <string.h>
-#include "BKE_utildefines.h"
-#include "BKE_mesh.h"
-#include "BKE_global.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_cdderivedmesh.h"
 
-#include "BLI_editVert.h"
-#include "mesh_intern.h"
-#include "ED_mesh.h"
+#include "BKE_utildefines.h"
 
 #include "BLI_math.h"
 #include "BLI_array.h"
-#include "BLI_edgehash.h"
-
-#include "BLI_heap.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/bmesh/operators/mesh_conv.c b/source/blender/bmesh/operators/mesh_conv.c
index 5bdb812fe87..8dc2bf34255 100644
--- a/source/blender/bmesh/operators/mesh_conv.c
+++ b/source/blender/bmesh/operators/mesh_conv.c
@@ -20,42 +20,29 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include <string.h>
-
 #include "MEM_guardedalloc.h"
 
-#include "DNA_listBase.h"
-#include "DNA_customdata_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_key_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
+#include "DNA_key_types.h"
+#include "DNA_modifier_types.h"
 
-#include "BKE_customdata.h"
 #include "BKE_mesh.h"
+#include "BKE_utildefines.h"
+#include "BLI_listbase.h"
 #include "BKE_global.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_cdderivedmesh.h"
 #include "BKE_key.h"
 #include "BKE_main.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_listbase.h"
 #include "BLI_math.h"
-#include "BLI_edgehash.h"
-#include "BLI_editVert.h"
-#include "BLI_scanfill.h"
 #include "BLI_array.h"
-#include "BLI_utildefines.h"
 
-#include "ED_mesh.h"
-
-#include "mesh_intern.h"
 #include "bmesh.h"
 #include "bmesh_private.h"
 
+#include "bmesh_operators_private.h" /* own include */
+
 /*
  * MESH CONV.C
  *
diff --git a/source/blender/bmesh/operators/mirror.c b/source/blender/bmesh/operators/mirror.c
index f1a7fec7023..86be9e2c00b 100644
--- a/source/blender/bmesh/operators/mirror.c
+++ b/source/blender/bmesh/operators/mirror.c
@@ -22,28 +22,10 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_listBase.h"
-#include "DNA_customdata_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-
-#include <string.h>
-
-#include "BKE_customdata.h"
-#include "BKE_mesh.h"
-#include "BKE_global.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_cdderivedmesh.h"
-#include "BKE_utildefines.h"
-
-#include "BLI_editVert.h"
-#include "mesh_intern.h"
-#include "ED_mesh.h"
 
 #include "BLI_math.h"
-#include "BLI_edgehash.h"
 #include "BLI_array.h"
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/bmesh/operators/primitiveops.c b/source/blender/bmesh/operators/primitiveops.c
index 01d95fb1879..b2f7501bf2b 100644
--- a/source/blender/bmesh/operators/primitiveops.c
+++ b/source/blender/bmesh/operators/primitiveops.c
@@ -22,26 +22,15 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_meshdata_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-
 #include "BLI_utildefines.h"
 
 #include "BLI_math.h"
-#include "BLI_ghash.h"
-#include "BLI_array.h"
 
-#include "ED_mesh.h"
+#include "ED_mesh.h" /* XXX BAD LEVEL CALL */
 
 #include "bmesh.h"
-#include "mesh_intern.h"
 #include "bmesh_private.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 
 /* ************************ primitives ******************* */
diff --git a/source/blender/bmesh/operators/removedoubles.c b/source/blender/bmesh/operators/removedoubles.c
index 48b66639170..ab77a78487c 100644
--- a/source/blender/bmesh/operators/removedoubles.c
+++ b/source/blender/bmesh/operators/removedoubles.c
@@ -22,25 +22,15 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_meshdata_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-
 #include "BLI_utildefines.h"
 
 #include "BLI_math.h"
-#include "BLI_ghash.h"
 #include "BLI_array.h"
-#include "BLI_utildefines.h"
 
 #include "bmesh.h"
-#include "mesh_intern.h"
 #include "bmesh_private.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "bmesh_operators_private.h" /* own include */
 
 static void remdoubles_splitface(BMFace *f, BMesh *bm, BMOperator *op)
 {
diff --git a/source/blender/bmesh/operators/subdivideop.c b/source/blender/bmesh/operators/subdivideop.c
index 1439b5fa3e7..e813ca395a2 100644
--- a/source/blender/bmesh/operators/subdivideop.c
+++ b/source/blender/bmesh/operators/subdivideop.c
@@ -23,29 +23,23 @@
 #include "MEM_guardedalloc.h"
 
 #include "BKE_utildefines.h"
-#include "BKE_tessmesh.h"
 
 #include "BLI_math.h"
 #include "BLI_rand.h"
-#include "BLI_ghash.h"
 #include "BLI_array.h"
 #include "BLI_noise.h"
-#include "BLI_utildefines.h"
 
 #include "DNA_object_types.h"
 
-#include "ED_mesh.h"
+#include "ED_mesh.h" /* XXX BAD LEVEL CALL */
+#include "mesh_intern.h" /* XXX EXTRA BAD LEVEL CALL - this is supposed to be internal! */
 
 #include "bmesh.h"
 #include "bmesh_private.h"
 
-#include "mesh_intern.h"
-#include "subdivideop.h"
+#include "bmesh_operators_private.h" /* own include */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include "subdivideop.h" /* own include */
 
 /* flags for all elements share a common bitfield space */
 #define SUBD_SPLIT	1
diff --git a/source/blender/bmesh/operators/triangulateop.c b/source/blender/bmesh/operators/triangulateop.c
index 73adaa51813..6a94707c8af 100644
--- a/source/blender/bmesh/operators/triangulateop.c
+++ b/source/blender/bmesh/operators/triangulateop.c
@@ -20,12 +20,11 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "MEM_guardedalloc.h"
 
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+
 #include "BKE_utildefines.h"
 
 #include "BLI_scanfill.h"
@@ -37,6 +36,8 @@
 #include "bmesh.h"
 #include "bmesh_private.h"
 
+#include "bmesh_operators_private.h" /* own include */
+
 #define EDGE_NEW	1
 #define FACE_NEW	1
 
diff --git a/source/blender/bmesh/operators/utils.c b/source/blender/bmesh/operators/utils.c
index 33f65558c34..b680cb959f3 100644
--- a/source/blender/bmesh/operators/utils.c
+++ b/source/blender/bmesh/operators/utils.c
@@ -21,28 +21,12 @@
  */
 
 #include "MEM_guardedalloc.h"
-#include "BKE_customdata.h"
-#include "DNA_listBase.h"
-#include "DNA_customdata_types.h"
+
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include <string.h>
-#include "BKE_utildefines.h"
-#include "BKE_mesh.h"
-#include "BKE_global.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_cdderivedmesh.h"
-
-#include "BLI_editVert.h"
-#include "mesh_intern.h"
-#include "ED_mesh.h"
 
 #include "BLI_math.h"
 #include "BLI_array.h"
-#include "BLI_edgehash.h"
-
 #include "BLI_heap.h"
 
 #include "bmesh.h"
diff --git a/source/blender/editors/mesh/bmesh_select.c b/source/blender/editors/mesh/bmesh_select.c
index 3b4007e6482..8370ee4ee48 100644
--- a/source/blender/editors/mesh/bmesh_select.c
+++ b/source/blender/editors/mesh/bmesh_select.c
@@ -25,24 +25,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_material_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
-#include "DNA_texture_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_space_types.h"
-#include "DNA_view3d_types.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
@@ -53,20 +39,13 @@
 #include "BKE_context.h"
 #include "BKE_displist.h"
 #include "BKE_depsgraph.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_customdata.h"
-#include "BKE_global.h"
-#include "BKE_mesh.h"
-#include "BKE_material.h"
-#include "BKE_texture.h"
 #include "BKE_report.h"
-#include "BKE_tessmesh.h"
 #include "BKE_paint.h"
+#include "BKE_tessmesh.h"
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
-#include "RE_render_ext.h"  /* externtex */
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -77,16 +56,14 @@
 #include "ED_mesh.h"
 #include "ED_screen.h"
 #include "ED_view3d.h"
-#include "bmesh.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
-#include "UI_resources.h"
+#include "DNA_object_types.h"
+#include "DNA_mesh_types.h"
 
 #include "mesh_intern.h"
 
-#include "BLO_sys_types.h" // for intptr_t support
 
 /* ****************************** MIRROR **************** */
 
diff --git a/source/blender/editors/mesh/bmesh_selecthistory.c b/source/blender/editors/mesh/bmesh_selecthistory.c
index 2a4156327d7..5a1fdeebdbc 100644
--- a/source/blender/editors/mesh/bmesh_selecthistory.c
+++ b/source/blender/editors/mesh/bmesh_selecthistory.c
@@ -27,63 +27,8 @@
 
 /* ********* Selection History ************ */
 
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_mesh_types.h"
-#include "DNA_material_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
-#include "DNA_texture_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_space_types.h"
-#include "DNA_view3d_types.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-#include "BLI_rand.h"
-#include "BLI_array.h"
-
-#include "BKE_context.h"
-#include "BKE_displist.h"
-#include "BKE_depsgraph.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_customdata.h"
-#include "BKE_global.h"
-#include "BKE_mesh.h"
-#include "BKE_material.h"
-#include "BKE_texture.h"
-#include "BKE_utildefines.h"
-#include "BKE_report.h"
 #include "BKE_tessmesh.h"
 
-#include "IMB_imbuf_types.h"
-#include "IMB_imbuf.h"
-
-#include "RE_render_ext.h"  /* externtex */
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "RNA_access.h"
-#include "RNA_define.h"
-
-#include "ED_mesh.h"
-#include "ED_screen.h"
-#include "ED_view3d.h"
-#include "bmesh.h"
-
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
-
-#include "mesh_intern.h"
-
-#include "BLO_sys_types.h" // for intptr_t support
 
 /* these wrap equivilent bmesh functions.  I'm in two minds of it we should
  * just use the bm functions directly; on the one hand, there's no real
diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c
index 3b1b74675c3..f3ffcb40e81 100644
--- a/source/blender/editors/mesh/bmesh_tools.c
+++ b/source/blender/editors/mesh/bmesh_tools.c
@@ -24,79 +24,45 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <math.h>
-#include <float.h>
 
 #include "MEM_guardedalloc.h"
-#include "PIL_time.h"
 
-#include "BLO_sys_types.h" // for intptr_t support
 
-#include "DNA_mesh_types.h"
 #include "DNA_material_types.h"
-#include "DNA_meshdata_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_view3d_types.h"
-#include "DNA_key_types.h"
 
-#include "RNA_types.h"
 #include "RNA_define.h"
 #include "RNA_access.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_rand.h"
-#include "BLI_ghash.h"
-#include "BLI_linklist.h"
-#include "BLI_heap.h"
-#include "BLI_array.h"
-#include "BLI_smallhash.h"
 
 #include "BKE_material.h"
 #include "BKE_context.h"
-#include "BKE_customdata.h"
-#include "BKE_DerivedMesh.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_depsgraph.h"
-#include "BKE_global.h"
-#include "BKE_library.h"
-#include "BKE_mesh.h"
 #include "BKE_object.h"
-#include "BKE_bmesh.h"
 #include "BKE_report.h"
-#include "BKE_tessmesh.h"
 #include "BKE_texture.h"
 #include "BKE_main.h"
-
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "BKE_tessmesh.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
 
 #include "ED_mesh.h"
 #include "ED_view3d.h"
-#include "ED_util.h"
 #include "ED_screen.h"
 #include "ED_transform.h"
 #include "ED_object.h"
 
-#include "UI_interface.h"
-
 #include "RE_render_ext.h"
 
 #include "mesh_intern.h"
-#include "bmesh.h"
 
-#include "editbmesh_bvh.h"
 
 static void add_normal_aligned(float nor[3], const float add[3])
 {
diff --git a/source/blender/editors/mesh/bmeshutils.c b/source/blender/editors/mesh/bmeshutils.c
index cd80bfa15e4..aabbbfe8a3a 100644
--- a/source/blender/editors/mesh/bmeshutils.c
+++ b/source/blender/editors/mesh/bmeshutils.c
@@ -24,70 +24,33 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <math.h>
-#include <float.h>
 
 #include "MEM_guardedalloc.h"
-#include "PIL_time.h"
 
-#include "BLO_sys_types.h" // for intptr_t support
 
-#include "DNA_mesh_types.h"
-#include "DNA_material_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_view3d_types.h"
-#include "DNA_key_types.h"
 
-#include "RNA_types.h"
-#include "RNA_define.h"
-#include "RNA_access.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
-#include "BLI_rand.h"
-#include "BLI_ghash.h"
-#include "BLI_linklist.h"
-#include "BLI_heap.h"
-#include "BLI_array.h"
 
 #include "BKE_context.h"
-#include "BKE_customdata.h"
-#include "BKE_depsgraph.h"
-#include "BKE_global.h"
 #include "BKE_library.h"
 #include "BKE_key.h"
 #include "BKE_mesh.h"
-#include "BKE_object.h"
 #include "BKE_bmesh.h"
 #include "BKE_report.h"
 #include "BKE_tessmesh.h"
 
-#include "bmesh.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
 
 #include "ED_mesh.h"
-#include "ED_view3d.h"
 #include "ED_util.h"
-#include "ED_screen.h"
 
-#include "UI_interface.h"
 
-#include "editbmesh_bvh.h"
-#include "mesh_intern.h"
 
 void EDBM_RecalcNormals(BMEditMesh *em)
 {
diff --git a/source/blender/editors/mesh/editbmesh_add.c b/source/blender/editors/mesh/editbmesh_add.c
index c901a916bd2..4d806ab02d3 100644
--- a/source/blender/editors/mesh/editbmesh_add.c
+++ b/source/blender/editors/mesh/editbmesh_add.c
@@ -24,71 +24,31 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <math.h>
-#include <float.h>
 
-#include "MEM_guardedalloc.h"
-#include "PIL_time.h"
 
-#include "BLO_sys_types.h" // for intptr_t support
 
 #include "DNA_mesh_types.h"
-#include "DNA_material_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_view3d_types.h"
-#include "DNA_key_types.h"
 
-#include "RNA_types.h"
 #include "RNA_define.h"
 #include "RNA_access.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
-#include "BLI_rand.h"
-#include "BLI_ghash.h"
-#include "BLI_linklist.h"
-#include "BLI_heap.h"
-#include "BLI_array.h"
 
 #include "BKE_context.h"
-#include "BKE_customdata.h"
 #include "BKE_depsgraph.h"
-#include "BKE_global.h"
-#include "BKE_library.h"
-#include "BKE_mesh.h"
-#include "BKE_object.h"
-#include "BKE_bmesh.h"
-#include "BKE_report.h"
 #include "BKE_tessmesh.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
 
 #include "ED_mesh.h"
-#include "ED_view3d.h"
-#include "ED_util.h"
 #include "ED_screen.h"
-#include "ED_transform.h"
 #include "ED_object.h"
 
-#include "UI_interface.h"
 
-#include "mesh_intern.h"
-#include "bmesh.h"
 
-#include "editbmesh_bvh.h"
 
 
 /* uses context to figure out transform for primitive */
diff --git a/source/blender/editors/mesh/editbmesh_bvh.c b/source/blender/editors/mesh/editbmesh_bvh.c
index 737590dc92d..b1d68ea7a60 100644
--- a/source/blender/editors/mesh/editbmesh_bvh.c
+++ b/source/blender/editors/mesh/editbmesh_bvh.c
@@ -26,73 +26,28 @@
  */
 #define IN_EDITMESHBVH
 
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <math.h>
-#include <float.h>
 
 #include "MEM_guardedalloc.h"
-#include "PIL_time.h"
 
-#include "BLO_sys_types.h" // for intptr_t support
 
-#include "DNA_mesh_types.h"
-#include "DNA_material_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
-#include "DNA_key_types.h"
 
-#include "RNA_types.h"
-#include "RNA_define.h"
-#include "RNA_access.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
-#include "BLI_rand.h"
-#include "BLI_ghash.h"
-#include "BLI_linklist.h"
-#include "BLI_heap.h"
-#include "BLI_array.h"
-#include "BLI_kdopbvh.h"
 #include "BLI_smallhash.h"
 
 #include "BKE_DerivedMesh.h"
-#include "BKE_context.h"
-#include "BKE_customdata.h"
-#include "BKE_depsgraph.h"
-#include "BKE_global.h"
-#include "BKE_library.h"
-#include "BKE_mesh.h"
-#include "BKE_object.h"
-#include "BKE_bmesh.h"
-#include "BKE_report.h"
 #include "BKE_tessmesh.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
-#include "WM_api.h"
-#include "WM_types.h"
 
 #include "ED_mesh.h"
 #include "ED_view3d.h"
-#include "ED_util.h"
-#include "ED_screen.h"
-#include "ED_transform.h"
 
-#include "UI_interface.h"
 
-#include "mesh_intern.h"
-#include "bmesh.h"
 
-#include "editbmesh_bvh.h"
 
 typedef struct BMBVHTree {
 	BMEditMesh *em;
diff --git a/source/blender/editors/mesh/knifetool.c b/source/blender/editors/mesh/knifetool.c
index 459215336ed..677c53e6625 100755
--- a/source/blender/editors/mesh/knifetool.c
+++ b/source/blender/editors/mesh/knifetool.c
@@ -24,66 +24,43 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include <float.h>
 #define _USE_MATH_DEFINES
-#include <math.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
 
-#include "DNA_ID.h"
-#include "DNA_screen_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_userdef_types.h"
-#include "DNA_object_types.h"
 
 #include "MEM_guardedalloc.h"
 
-#include "PIL_time.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_blenlib.h"
-#include "BLI_dynstr.h" /* for WM_operator_pystring */
-#include "BLI_editVert.h"
 #include "BLI_array.h"
-#include "BLI_ghash.h"
-#include "BLI_memarena.h"
-#include "BLI_mempool.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
-#include "BLI_kdopbvh.h"
 #include "BLI_smallhash.h"
 #include "BLI_scanfill.h"
 
 #include "BKE_DerivedMesh.h"
-#include "BKE_blender.h"
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
-#include "BKE_scene.h"
-#include "BKE_mesh.h"
-#include "BKE_tessmesh.h"
-#include "BKE_depsgraph.h"
 
 #include "BIF_gl.h"
 #include "BIF_glutil.h" /* for paint cursor */
 
-#include "IMB_imbuf_types.h"
 
 #include "ED_screen.h"
 #include "ED_space_api.h"
 #include "ED_view3d.h"
 #include "ED_mesh.h"
 
-#include "RNA_access.h"
-#include "RNA_define.h"
-
-#include "UI_interface.h"
-
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "DNA_scene_types.h"
+#include "DNA_object_types.h"
+#include "DNA_mesh_types.h"
+#include "BKE_tessmesh.h"
+#include "BLI_editVert.h"
+#include "RNA_types.h"
+
 #include "mesh_intern.h"
-#include "editbmesh_bvh.h"
 
 /* this code here is kindof messy. . .I might need to eventually rework it - joeedh */
 
diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h
index 59e9ffe54b6..10ccff75b02 100644
--- a/source/blender/editors/mesh/mesh_intern.h
+++ b/source/blender/editors/mesh/mesh_intern.h
@@ -35,16 +35,6 @@
 #ifndef MESH_INTERN_H
 #define MESH_INTERN_H
 
-#include "DNA_scene_types.h"
-#include "DNA_object_types.h"
-#include "DNA_mesh_types.h"
-
-#include "BKE_tessmesh.h"
-
-#include "BLI_editVert.h"
-
-#include "RNA_types.h"
-
 struct bContext;
 struct wmOperatorType;
 struct ViewContext;
@@ -52,9 +42,11 @@ struct BMEditMesh;
 struct BMesh;
 struct BMEdge;
 struct BMFace;
+struct BMOperator;
 struct wmOperator;
 struct wmKeyMap;
 struct wmKeyConfig;
+struct EnumPropertyItem;
 
 /* ******************** bmeshutils.c */
 
@@ -98,7 +90,7 @@ float labda_PdistVL2Dfl(const float v1[3], const float v2[3], const float v3[3])
 
 /* ******************** editface.c */
 
-
+#if 0 /* REMOVE AFTER BMESH MERGE */
 
 /* ******************* editmesh.c */
 
@@ -121,6 +113,8 @@ extern struct EditEdge *addedgelist(EditMesh *em, struct EditVert *v1, struct Ed
 extern struct EditFace *addfacelist(EditMesh *em, struct EditVert *v1, struct EditVert *v2, struct EditVert *v3, struct EditVert *v4, struct EditFace *example, struct EditFace *exampleEdges);
 extern struct EditEdge *findedgelist(EditMesh *em, struct EditVert *v1, struct EditVert *v2);
 
+#endif
+
 void em_setup_viewcontext(struct bContext *C, struct ViewContext *vc);
 
 void MESH_OT_separate(struct wmOperatorType *ot);
@@ -143,6 +137,8 @@ void MESH_OT_duplicate(struct wmOperatorType *ot);
 void MESH_OT_fgon_make(struct wmOperatorType *ot);
 void MESH_OT_fgon_clear(struct wmOperatorType *ot);
 
+#if 0 /* REMOVE AFTER BMESH MERGE */
+
 /* ******************* editmesh_lib.c */
 void EM_stats_update(EditMesh *em);
 
@@ -191,6 +187,8 @@ extern int convex(float *v1, float *v2, float *v3, float *v4);
 extern struct EditFace *EM_face_from_faces(EditMesh *em, struct EditFace *efa1,
 										   struct EditFace *efa2, int i1, int i2, int i3, int i4);
 
+#endif
+
 extern int EM_view3d_poll(struct bContext *C);
 
 struct wmKeyMap* knifetool_modal_keymap(struct wmKeyConfig *keyconf);
@@ -240,13 +238,17 @@ void MESH_OT_select_next_loop(struct wmOperatorType *ot);
 #define SUBDIV_CORNER_INNERVERT	1
 #define SUBDIV_CORNER_FAN		2
 
-extern EnumPropertyItem corner_type_items[];
+extern struct EnumPropertyItem *corner_type_items;
+
+#if 0 /* REMOVE AFTER BMESH MERGE */
 
 void join_triangles(EditMesh *em);
 int removedoublesflag(EditMesh *em, short flag, short automerge, float limit);		/* return amount */
 void esubdivideflag(Object *obedit, EditMesh *em, int flag, float smooth, float fractal, int beautify, int numcuts, int corner_pattern, int seltype);
 int EdgeSlide(EditMesh *em, struct wmOperator *op, short immediate, float imperc);
 
+#endif
+
 void MESH_OT_merge(struct wmOperatorType *ot);
 void MESH_OT_subdivide(struct wmOperatorType *ot);
 void MESH_OT_remove_doubles(struct wmOperatorType *ot);