diff --git a/source/blender/editors/sculpt_paint/sculpt_boundary.c b/source/blender/editors/sculpt_paint/sculpt_boundary.c
index 355f260ae11..2bf6110dca0 100644
--- a/source/blender/editors/sculpt_paint/sculpt_boundary.c
+++ b/source/blender/editors/sculpt_paint/sculpt_boundary.c
@@ -28,8 +28,6 @@
 #include "GPU_immediate.h"
 #include "GPU_state.h"
 
-#include "bmesh.h"
-
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_color.c b/source/blender/editors/sculpt_paint/sculpt_filter_color.c
index 89cb67a875f..e222e0d917f 100644
--- a/source/blender/editors/sculpt_paint/sculpt_filter_color.c
+++ b/source/blender/editors/sculpt_paint/sculpt_filter_color.c
@@ -30,8 +30,6 @@
 #include "RNA_access.h"
 #include "RNA_define.h"
 
-#include "bmesh.h"
-
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
index 181180267db..e0a5811ae76 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
@@ -27,6 +27,9 @@
 
 #include "obj_export_mesh.hh"
 
+#include "bmesh.h"
+#include "bmesh_tools.h"
+
 namespace blender::io::obj {
 OBJMesh::OBJMesh(Depsgraph *depsgraph, const OBJExportParams &export_params, Object *mesh_object)
 {
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.hh b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.hh
index b74dca4a47e..9869469e616 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.hh
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.hh
@@ -12,9 +12,6 @@
 #include "BLI_utility_mixins.hh"
 #include "BLI_vector.hh"
 
-#include "bmesh.h"
-#include "bmesh_tools.h"
-
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index c5e7c6a6e91..a57f3c5a1a6 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -32,8 +32,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "bmesh.h"
-
 extern const EnumPropertyItem RNA_automasking_flags[];
 
 const EnumPropertyItem rna_enum_particle_edit_hair_brush_items[] = {
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c
index 8e627f9964d..e8aac290dd5 100644
--- a/source/blender/modifiers/intern/MOD_armature.c
+++ b/source/blender/modifiers/intern/MOD_armature.c
@@ -40,9 +40,6 @@
 
 #include "DEG_depsgraph_query.h"
 
-#include "bmesh.h"
-#include "bmesh_tools.h"
-
 #include "MEM_guardedalloc.h"
 
 #include "MOD_ui_common.h"
diff --git a/source/blender/modifiers/intern/MOD_mirror.cc b/source/blender/modifiers/intern/MOD_mirror.cc
index 9e99a6b9a5e..ca65afb7176 100644
--- a/source/blender/modifiers/intern/MOD_mirror.cc
+++ b/source/blender/modifiers/intern/MOD_mirror.cc
@@ -5,21 +5,16 @@
  * \ingroup modifiers
  */
 
-#include "BLI_math.h"
-
 #include "BLT_translation.h"
 
 #include "DNA_defaults.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 
 #include "BKE_context.h"
-#include "BKE_deform.h"
 #include "BKE_lib_id.h"
 #include "BKE_lib_query.h"
-#include "BKE_mesh.h"
 #include "BKE_mesh_mirror.h"
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
@@ -30,9 +25,6 @@
 #include "RNA_access.h"
 #include "RNA_prototypes.h"
 
-#include "bmesh.h"
-#include "bmesh_tools.h"
-
 #include "MEM_guardedalloc.h"
 
 #include "DEG_depsgraph_build.h"
diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c
index 0de89850bc9..c08853d06a7 100644
--- a/source/blender/modifiers/intern/MOD_simpledeform.c
+++ b/source/blender/modifiers/intern/MOD_simpledeform.c
@@ -5,7 +5,7 @@
  * \ingroup modifiers
  */
 
-#include "BLI_math.h"
+#include "BLI_math_vector.h"
 #include "BLI_task.h"
 #include "BLI_utildefines.h"
 #include "BLT_translation.h"
@@ -37,8 +37,6 @@
 #include "MOD_ui_common.h"
 #include "MOD_util.h"
 
-#include "bmesh.h"
-
 #define BEND_EPS 0.000001f
 
 ALIGN_STRUCT struct DeformUserData {
diff --git a/source/blender/modifiers/intern/MOD_util.cc b/source/blender/modifiers/intern/MOD_util.cc
index a94fc6732a0..6b7072db121 100644
--- a/source/blender/modifiers/intern/MOD_util.cc
+++ b/source/blender/modifiers/intern/MOD_util.cc
@@ -40,7 +40,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "bmesh.h"
 
 void MOD_init_texture(MappingInfoModifierData *dmd, const ModifierEvalContext *ctx)
 {
diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.cc b/source/blender/modifiers/intern/MOD_weighted_normal.cc
index 76d8d27b899..2f68f00ce07 100644
--- a/source/blender/modifiers/intern/MOD_weighted_normal.cc
+++ b/source/blender/modifiers/intern/MOD_weighted_normal.cc
@@ -8,7 +8,7 @@
 
 #include "BLI_bitmap.h"
 #include "BLI_linklist.h"
-#include "BLI_math.h"
+#include "BLI_math_vector.h"
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/modifiers/intern/MOD_weld.cc b/source/blender/modifiers/intern/MOD_weld.cc
index bbd440f377e..dc9d361c838 100644
--- a/source/blender/modifiers/intern/MOD_weld.cc
+++ b/source/blender/modifiers/intern/MOD_weld.cc
@@ -28,10 +28,6 @@
 #include "DNA_modifier_types.h"
 #include "DNA_screen_types.h"
 
-#ifdef USE_BVHTREEKDOP
-#  include "BKE_bvhutils.h"
-#endif
-
 #include "BKE_context.h"
 #include "BKE_deform.h"
 #include "BKE_modifier.h"