Cleanup: unused includes in source/blender/blenkernel

Remove 397 includes.

source/blender/blenkernel/intern/anim_visualization.cc

@@ -8,9 +8,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_action_types.h"
-#include "DNA_anim_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 
 #include "BLT_translation.hh"
 

source/blender/blenkernel/intern/armature_update.cc

@@ -19,15 +19,12 @@
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 
 #include "BKE_action.h"
 #include "BKE_anim_path.h"
 #include "BKE_armature.hh"
 #include "BKE_curve.hh"
-#include "BKE_displist.h"
 #include "BKE_fcurve.h"
-#include "BKE_object.hh"
 #include "BKE_object_types.hh"
 #include "BKE_scene.hh"
 

source/blender/blenkernel/intern/bake_geometry_nodes_modifier.cc

@@ -6,19 +6,15 @@
 
 #include "BKE_bake_geometry_nodes_modifier.hh"
 #include "BKE_collection.hh"
-#include "BKE_curves.hh"
 #include "BKE_main.hh"
 
 #include "DNA_modifier_types.h"
 #include "DNA_node_types.h"
-#include "DNA_pointcloud_types.h"
 
 #include "BLI_binary_search.hh"
 #include "BLI_fileops.hh"
-#include "BLI_hash_md5.hh"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
-#include "BLI_string_utils.hh"
 
 #include "MOD_nodes.hh"
 

source/blender/blenkernel/intern/bake_items.cc

@@ -6,22 +6,15 @@
 #include "BKE_bake_items_serialize.hh"
 #include "BKE_curves.hh"
 #include "BKE_instances.hh"
-#include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
 #include "BKE_pointcloud.hh"
 #include "BKE_volume.hh"
 
-#include "BLI_endian_defines.h"
-#include "BLI_endian_switch.h"
 #include "BLI_math_matrix_types.hh"
-#include "BLI_path_util.h"
 
 #include "DNA_material_types.h"
 #include "DNA_volume_types.h"
 
-#include "RNA_access.hh"
-#include "RNA_enum_types.hh"
-
 namespace blender::bke::bake {
 
 using namespace io::serialize;

source/blender/blenkernel/intern/blender.cc

@@ -25,28 +25,21 @@
 #include "BKE_blender.hh"           /* own include */
 #include "BKE_blender_user_menu.hh" /* own include */
 #include "BKE_blender_version.h"    /* own include */
-#include "BKE_blendfile.hh"
 #include "BKE_brush.hh"
 #include "BKE_cachefile.hh"
 #include "BKE_callbacks.hh"
 #include "BKE_global.hh"
 #include "BKE_idprop.h"
-#include "BKE_image.h"
-#include "BKE_layer.hh"
 #include "BKE_main.hh"
 #include "BKE_node.h"
 #include "BKE_report.hh"
-#include "BKE_scene.hh"
 #include "BKE_screen.hh"
 #include "BKE_studiolight.h"
 
 #include "DEG_depsgraph.hh"
 
-#include "RE_pipeline.h"
 #include "RE_texture.h"
 
-#include "SEQ_sequencer.hh"
-
 #include "BLF_api.hh"
 
 Global G;

source/blender/blenkernel/intern/blender_copybuffer.cc

@@ -12,29 +12,17 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
 #include "DNA_userdef_types.h"
-#include "DNA_view3d_types.h"
-#include "DNA_windowmanager_types.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
-#include "IMB_imbuf.hh"
-#include "IMB_moviecache.hh"
-
 #include "BKE_blender_copybuffer.hh" /* own include */
 #include "BKE_blendfile.hh"
 #include "BKE_blendfile_link_append.hh"
 #include "BKE_context.hh"
-#include "BKE_global.hh"
 #include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
-#include "BKE_main.hh"
-#include "BKE_scene.hh"
 
-#include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
 
 #include "BLO_readfile.hh"

source/blender/blenkernel/intern/blendfile.cc

@@ -38,9 +38,6 @@
 #include "BKE_colorband.hh"
 #include "BKE_context.hh"
 #include "BKE_global.hh"
-#include "BKE_idtype.hh"
-#include "BKE_ipo.h"
-#include "BKE_keyconfig.h"
 #include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_override.hh"
@@ -61,8 +58,6 @@
 #include "BLO_userdef_default.h"
 #include "BLO_writefile.hh"
 
-#include "RNA_access.hh"
-
 #include "RE_pipeline.h"
 
 #ifdef WITH_PYTHON

source/blender/blenkernel/intern/brush.cc

@@ -10,9 +10,7 @@
 
 #include "DNA_brush_types.h"
 #include "DNA_defaults.h"
-#include "DNA_gpencil_legacy_types.h"
 #include "DNA_material_types.h"
-#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
 #include "BLI_listbase.h"
@@ -24,7 +22,6 @@
 #include "BKE_bpath.hh"
 #include "BKE_brush.hh"
 #include "BKE_colortools.hh"
-#include "BKE_context.hh"
 #include "BKE_gpencil_legacy.h"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"

source/blender/blenkernel/intern/cachefile.cc

@@ -8,9 +8,7 @@
 
 #include <cstring>
 
-#include "DNA_anim_types.h"
 #include "DNA_cachefile_types.h"
-#include "DNA_constraint_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
@@ -24,13 +22,11 @@
 
 #include "BLT_translation.hh"
 
-#include "BKE_anim_data.h"
 #include "BKE_bpath.hh"
 #include "BKE_cachefile.hh"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_main.hh"
-#include "BKE_modifier.hh"
 #include "BKE_scene.hh"
 
 #include "DEG_depsgraph_query.hh"

source/blender/blenkernel/intern/callbacks.cc

@@ -15,7 +15,6 @@
 
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
-#include "RNA_types.hh"
 
 static ListBase callback_slots[BKE_CB_EVT_TOT] = {{nullptr}};
 

source/blender/blenkernel/intern/camera.cc

@@ -29,14 +29,11 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_action.h"
-#include "BKE_anim_data.h"
 #include "BKE_camera.h"
 #include "BKE_idprop.h"
 #include "BKE_idtype.hh"
-#include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
-#include "BKE_main.hh"
 #include "BKE_object.hh"
 #include "BKE_scene.hh"
 #include "BKE_screen.hh"

source/blender/blenkernel/intern/cdderivedmesh.cc

@@ -12,23 +12,16 @@
 #include <cmath>
 #include <cstring>
 
-#include "atomic_ops.h"
-
 #include "BLI_utildefines.h"
 
 #include "BKE_DerivedMesh.hh"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_curve.hh"
 #include "BKE_editmesh.hh"
-#include "BKE_mesh.hh"
 #include "BKE_mesh_mapping.hh"
-#include "BKE_object.hh"
-#include "BKE_paint.hh"
 #include "BKE_pbvh.hh"
 
 #include "DNA_curve_types.h" /* for Curve */
 #include "DNA_mesh_types.h"
-#include "DNA_object_types.h"
 
 #include "MEM_guardedalloc.h"
 

source/blender/blenkernel/intern/cloth.cc

@@ -32,7 +32,6 @@
 #include "BKE_global.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.hh"
 #include "BKE_modifier.hh"
 #include "BKE_pointcache.h"
 

source/blender/blenkernel/intern/collision.cc

@@ -11,14 +11,10 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_cloth_types.h"
-#include "DNA_collection_types.h"
-#include "DNA_effect_types.h"
 #include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_blenlib.h"
-#include "BLI_linklist.h"
 #include "BLI_math_geom.h"
 #include "BLI_math_vector.h"
 #include "BLI_task.h"
@@ -27,10 +23,7 @@
 
 #include "BKE_cloth.hh"
 #include "BKE_collection.hh"
-#include "BKE_effect.h"
-#include "BKE_layer.hh"
 #include "BKE_modifier.hh"
-#include "BKE_scene.hh"
 
 #include "BKE_collision.h"
 #include "BLI_kdopbvh.h"

source/blender/blenkernel/intern/colorband.cc

@@ -18,7 +18,6 @@
 
 #include "BKE_colorband.hh"
 #include "BKE_key.hh"
-#include "BKE_material.h"
 
 void BKE_colorband_init(ColorBand *coba, bool rangetype)
 {

source/blender/blenkernel/intern/cpp_types.cc

@@ -6,7 +6,6 @@
 #include "BLI_cpp_type_make.hh"
 #include "BLI_cpp_types_make.hh"
 #include "BLI_math_matrix_types.hh"
-#include "BLI_math_quaternion_types.hh"
 #include "BLI_math_vector_types.hh"
 
 #include "BKE_cpp_types.hh"

source/blender/blenkernel/intern/crazyspace.cc

@@ -11,9 +11,7 @@
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 
-#include "BLI_bitmap.h"
 #include "BLI_linklist.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
@@ -30,7 +28,6 @@
 #include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.hh"
 #include "BKE_multires.hh"
-#include "BKE_object.hh"
 #include "BKE_object_types.hh"
 #include "BKE_report.hh"
 

source/blender/blenkernel/intern/curve.cc

@@ -40,24 +40,18 @@
 #include "DNA_object_types.h"
 #include "DNA_vfont_types.h"
 
-#include "BKE_anim_data.h"
 #include "BKE_curve.hh"
 #include "BKE_curveprofile.h"
-#include "BKE_displist.h"
 #include "BKE_idtype.hh"
 #include "BKE_key.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
-#include "BKE_main.hh"
-#include "BKE_object.hh"
 #include "BKE_object_types.hh"
 #include "BKE_vfont.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
 
-#include "CLG_log.h"
-
 #include "BLO_read_write.hh"
 
 using blender::float3;

source/blender/blenkernel/intern/curve_bevel.cc

@@ -11,9 +11,7 @@
 
 #include <cstring>
 
-#include "BLI_alloca.h"
 #include "BLI_listbase.h"
-#include "BLI_math_base.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -22,7 +20,6 @@
 #include "DNA_object_types.h"
 
 #include "BKE_curve.hh"
-#include "BKE_curveprofile.h"
 #include "BKE_displist.h"
 #include "BKE_object_types.hh"
 

source/blender/blenkernel/intern/curve_convert.cc

@@ -8,14 +8,12 @@
 
 #include "DNA_curve_types.h"
 #include "DNA_object_types.h"
-#include "DNA_vfont_types.h"
 
 #include "BLI_utildefines.h"
 
 #include "BKE_curve.hh"
 #include "BKE_displist.h"
 #include "BKE_lib_id.hh"
-#include "BKE_modifier.hh"
 #include "BKE_vfont.hh"
 
 #include "DEG_depsgraph.hh"

source/blender/blenkernel/intern/curve_deform.cc

@@ -25,7 +25,6 @@
 #include "BKE_anim_path.h"
 #include "BKE_curve.hh"
 #include "BKE_editmesh.hh"
-#include "BKE_lattice.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object_types.hh"
 

source/blender/blenkernel/intern/curves.cc

@@ -17,7 +17,6 @@
 #include "DNA_object_types.h"
 
 #include "BLI_index_range.hh"
-#include "BLI_listbase.h"
 #include "BLI_math_base.h"
 #include "BLI_math_matrix.hh"
 #include "BLI_rand.hh"
@@ -28,15 +27,11 @@
 
 #include "BKE_anim_data.h"
 #include "BKE_curves.hh"
-#include "BKE_customdata.hh"
 #include "BKE_geometry_fields.hh"
 #include "BKE_geometry_set.hh"
-#include "BKE_global.hh"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
-#include "BKE_lib_remap.hh"
-#include "BKE_main.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_object_types.hh"

source/blender/blenkernel/intern/displist.cc

@@ -15,12 +15,8 @@
 #include "DNA_curve_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_vfont_types.h"
 
-#include "BLI_bitmap.h"
 #include "BLI_index_range.hh"
-#include "BLI_linklist.h"
 #include "BLI_listbase.h"
 #include "BLI_math_rotation.h"
 #include "BLI_memarena.h"
@@ -36,7 +32,6 @@
 #include "BKE_geometry_set.hh"
 #include "BKE_key.hh"
 #include "BKE_lib_id.hh"
-#include "BKE_mball.hh"
 #include "BKE_mesh.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"

source/blender/blenkernel/intern/editmesh.cc

@@ -19,8 +19,6 @@
 #include "BKE_DerivedMesh.hh"
 #include "BKE_customdata.hh"
 #include "BKE_editmesh.hh"
-#include "BKE_editmesh_cache.hh"
-#include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
 #include "BKE_mesh_iterators.hh"
 #include "BKE_mesh_wrapper.hh"

source/blender/blenkernel/intern/editmesh_cache.cc

@@ -14,8 +14,6 @@
 #include "BLI_math_vector.h"
 #include "BLI_span.hh"
 
-#include "DNA_mesh_types.h"
-
 #include "BKE_editmesh.hh"
 #include "BKE_editmesh_cache.hh" /* own include */
 

source/blender/blenkernel/intern/editmesh_tangent.cc

@@ -12,7 +12,6 @@
 
 #include "DNA_customdata_types.h"
 #include "DNA_defs.h"
-#include "DNA_meshdata_types.h"
 
 #include "BKE_customdata.hh"
 #include "BKE_editmesh.hh"

source/blender/blenkernel/intern/effect.cc

@@ -14,11 +14,9 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_collection_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_listBase.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_particle_types.h"
@@ -45,13 +43,10 @@
 #include "BKE_effect.h"
 #include "BKE_fluid.h"
 #include "BKE_global.hh"
-#include "BKE_layer.hh"
-#include "BKE_mesh.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_object_types.hh"
 #include "BKE_particle.h"
-#include "BKE_scene.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_physics.hh"

source/blender/blenkernel/intern/geometry_component_curves.cc

@@ -8,7 +8,6 @@
 #include "DNA_curve_types.h"
 
 #include "BKE_attribute_math.hh"
-#include "BKE_curve.hh"
 #include "BKE_curves.hh"
 #include "BKE_deform.hh"
 #include "BKE_geometry_fields.hh"

source/blender/blenkernel/intern/geometry_component_instances.cc

@@ -7,23 +7,16 @@
 #include "BLI_index_mask.hh"
 #include "BLI_map.hh"
 #include "BLI_math_matrix_types.hh"
-#include "BLI_rand.hh"
 #include "BLI_set.hh"
 #include "BLI_span.hh"
 #include "BLI_task.hh"
 #include "BLI_vector.hh"
 
-#include "DNA_collection_types.h"
-
-#include "BKE_attribute_math.hh"
 #include "BKE_geometry_set.hh"
-#include "BKE_geometry_set_instances.hh"
 #include "BKE_instances.hh"
 
 #include "attribute_access_intern.hh"
 
-#include "BLI_cpp_type_make.hh"
-
 namespace blender::bke {
 
 /* -------------------------------------------------------------------- */

source/blender/blenkernel/intern/geometry_component_volume.cc

@@ -2,8 +2,6 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "DNA_volume_types.h"
-
 #include "BKE_geometry_set.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_volume.hh"

source/blender/blenkernel/intern/geometry_set_instances.cc

@@ -5,7 +5,6 @@
 #include "BKE_collection.hh"
 #include "BKE_geometry_set_instances.hh"
 #include "BKE_instances.hh"
-#include "BKE_mesh.hh"
 #include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object_types.hh"

source/blender/blenkernel/intern/gpencil_curve_legacy.cc

@@ -12,11 +12,8 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "CLG_log.h"
-
 #include "MEM_guardedalloc.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_math_color.h"
 #include "BLI_math_vector.h"
 
@@ -29,14 +26,11 @@
 #include "DNA_scene_types.h"
 
 #include "BKE_collection.hh"
-#include "BKE_context.hh"
 #include "BKE_curve.hh"
 #include "BKE_gpencil_curve_legacy.h"
 #include "BKE_gpencil_geom_legacy.h"
 #include "BKE_gpencil_legacy.h"
-#include "BKE_main.hh"
 #include "BKE_material.h"
-#include "BKE_object.hh"
 
 extern "C" {
 #include "curve_fit_nd.h"

source/blender/blenkernel/intern/gpencil_geom_legacy.cc

@@ -13,8 +13,6 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "CLG_log.h"
-
 #include "MEM_guardedalloc.h"
 
 #include "BLI_array_utils.h"
@@ -38,19 +36,13 @@
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-
-#include "BLT_translation.hh"
 
 #include "BKE_attribute.hh"
-#include "BKE_context.hh"
 #include "BKE_deform.hh"
 #include "BKE_gpencil_curve_legacy.h"
 #include "BKE_gpencil_geom_legacy.h"
 #include "BKE_gpencil_legacy.h"
-#include "BKE_main.hh"
 #include "BKE_material.h"
-#include "BKE_mesh.hh"
 #include "BKE_object.hh"
 #include "BKE_object_types.hh"
 

source/blender/blenkernel/intern/gpencil_update_cache_legacy.cc

@@ -13,10 +13,7 @@
 #include "BLI_dlrbTree.h"
 #include "BLI_listbase.h"
 
-#include "BKE_gpencil_legacy.h"
-
 #include "DNA_gpencil_legacy_types.h"
-#include "DNA_userdef_types.h"
 
 #include "MEM_guardedalloc.h"
 

source/blender/blenkernel/intern/grease_pencil.cc

@@ -52,7 +52,6 @@
 #include "DNA_grease_pencil_types.h"
 #include "DNA_material_types.h"
 #include "DNA_modifier_types.h"
-#include "DNA_scene_types.h"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"

source/blender/blenkernel/intern/grease_pencil_vertex_groups.cc

@@ -11,15 +11,12 @@
 #include "BLI_listbase.h"
 #include "BLI_set.hh"
 #include "BLI_string.h"
-#include "BLI_string_utils.hh"
 
 #include "BKE_curves.hh"
 #include "BKE_deform.hh"
 #include "BKE_grease_pencil.hh"
 #include "BKE_grease_pencil_vertex_groups.hh"
 
-#include "BLT_translation.hh"
-
 namespace blender::bke::greasepencil {
 
 /* ------------------------------------------------------------------- */

source/blender/blenkernel/intern/icons_rasterize.cc

@@ -5,7 +5,6 @@
 /** \file
  * \ingroup bke
  */
-#include "MEM_guardedalloc.h"
 
 #include "BLI_bitmap_draw_2d.h"
 #include "BLI_math_color.h"

source/blender/blenkernel/intern/image_format.cc

@@ -16,7 +16,6 @@
 #include "BLI_utildefines.h"
 
 #include "IMB_colormanagement.hh"
-#include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"
 
 #include "BKE_colortools.hh"

source/blender/blenkernel/intern/image_gpu.cc

@@ -8,7 +8,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_bitmap.h"
 #include "BLI_boxpack_2d.h"
 #include "BLI_linklist.h"
 #include "BLI_listbase.h"

source/blender/blenkernel/intern/image_partial_update.cc

@@ -54,7 +54,6 @@
 
 #include "DNA_image_types.h"
 
-#include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"
 
 #include "BLI_listbase.h"

source/blender/blenkernel/intern/instances.cc

@@ -6,7 +6,6 @@
 #include "BLI_rand.hh"
 #include "BLI_task.hh"
 
-#include "BKE_attribute_math.hh"
 #include "BKE_customdata.hh"
 #include "BKE_geometry_set.hh"
 #include "BKE_instances.hh"

source/blender/blenkernel/intern/lattice.cc

@@ -30,9 +30,7 @@
 #include "DNA_lattice_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 
-#include "BKE_anim_data.h"
 #include "BKE_curve.hh"
 #include "BKE_deform.hh"
 #include "BKE_displist.h"
@@ -40,13 +38,10 @@
 #include "BKE_lattice.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
-#include "BKE_main.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_object_types.hh"
 
-#include "DEG_depsgraph_query.hh"
-
 #include "BLO_read_write.hh"
 
 static void lattice_init_data(ID *id)

source/blender/blenkernel/intern/lattice_deform.cc

@@ -33,7 +33,6 @@
 #include "BKE_editmesh.hh"
 #include "BKE_key.hh"
 #include "BKE_lattice.hh"
-#include "BKE_mesh.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_object_types.hh"

source/blender/blenkernel/intern/lattice_deform_test.cc

@@ -3,20 +3,21 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #include "testing/testing.h"
 
-#include "BKE_idtype.hh"
-#include "BKE_lattice.hh"
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_lattice_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_object_types.h"
-
-#include "BLI_rand.hh"
-
 #define DO_PERF_TESTS 0
 
 #if DO_PERF_TESTS
+
+#  include "BKE_idtype.hh"
+#  include "BKE_lattice.hh"
+
+#  include "MEM_guardedalloc.h"
+
+#  include "DNA_lattice_types.h"
+#  include "DNA_mesh_types.h"
+#  include "DNA_object_types.h"
+
+#  include "BLI_rand.hh"
+
 namespace blender::bke::tests {
 
 struct LatticeDeformTestContext {

source/blender/blenkernel/intern/layer_utils.cc

@@ -8,8 +8,6 @@
 
 #include <cstring>
 
-#include "BLI_array.h"
-
 #include "BKE_collection.hh"
 #include "BKE_customdata.hh"
 #include "BKE_editmesh.hh"
@@ -19,7 +17,6 @@
 #include "DNA_layer_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 
 #include "MEM_guardedalloc.h"
 

source/blender/blenkernel/intern/library.cc

@@ -8,10 +8,6 @@
  * Contains code specific to the `Library` ID type.
  */
 
-#include "CLG_log.h"
-
-#include "MEM_guardedalloc.h"
-
 /* all types are needed here, in order to do memory operations */
 #include "DNA_ID.h"
 
@@ -23,7 +19,6 @@
 
 #include "BKE_bpath.hh"
 #include "BKE_idtype.hh"
-#include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
 #include "BKE_library.hh"
 #include "BKE_main.hh"

source/blender/blenkernel/intern/light.cc

@@ -13,24 +13,19 @@
 /* Allow using deprecated functionality for .blend file I/O. */
 #define DNA_DEPRECATED_ALLOW
 
-#include "DNA_anim_types.h"
 #include "DNA_defaults.h"
 #include "DNA_light_types.h"
-#include "DNA_material_types.h"
 #include "DNA_node_types.h"
-#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_texture_types.h"
 
 #include "BLI_utildefines.h"
 
-#include "BKE_anim_data.h"
 #include "BKE_icons.h"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
 #include "BKE_light.h"
-#include "BKE_main.hh"
 #include "BKE_node.h"
 #include "BKE_preview_image.hh"
 

source/blender/blenkernel/intern/lightprobe.cc

@@ -17,12 +17,10 @@
 #include "BLI_span.hh"
 #include "BLI_utildefines.h"
 
-#include "BKE_anim_data.h"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
 #include "BKE_lightprobe.h"
-#include "BKE_main.hh"
 
 #include "BLT_translation.hh"
 

source/blender/blenkernel/intern/linestyle.cc

@@ -25,7 +25,6 @@
 
 #include "BLT_translation.hh"
 
-#include "BKE_anim_data.h"
 #include "BKE_colorband.hh"
 #include "BKE_colortools.hh"
 #include "BKE_context.hh"
@@ -34,7 +33,6 @@
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
 #include "BKE_linestyle.h"
-#include "BKE_main.hh"
 #include "BKE_node.hh"
 #include "BKE_node_tree_update.hh"
 #include "BKE_texture.h"

source/blender/blenkernel/intern/main_idmap.cc

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

source/blender/blenkernel/intern/mball.cc

@@ -28,7 +28,6 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
@@ -39,22 +38,16 @@
 
 #include "BKE_main.hh"
 
-#include "BKE_anim_data.h"
-#include "BKE_curve.hh"
-#include "BKE_displist.h"
 #include "BKE_geometry_set.hh"
 #include "BKE_idtype.hh"
 #include "BKE_lattice.hh"
 #include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
-#include "BKE_material.h"
 #include "BKE_mball.hh"
 #include "BKE_mball_tessellate.hh"
-#include "BKE_mesh.hh"
 #include "BKE_object.hh"
 #include "BKE_object_types.hh"
-#include "BKE_scene.hh"
 
 #include "DEG_depsgraph.hh"
 

source/blender/blenkernel/intern/mball_tessellate.cc

@@ -19,7 +19,6 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_listbase.h"
 #include "BLI_math_geom.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
@@ -29,9 +28,7 @@
 #include "BLI_string_utils.hh"
 #include "BLI_utildefines.h"
 
-#include "BKE_displist.h"
 #include "BKE_global.hh"
-#include "BKE_lib_id.hh"
 #include "BKE_mball_tessellate.hh" /* own include */
 #include "BKE_mesh.hh"
 #include "BKE_object.hh"

source/blender/blenkernel/intern/mesh_boolean_convert.cc

@@ -8,11 +8,8 @@
 
 #include <iostream>
 
-#include "DNA_object_types.h"
-
 #include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
-#include "BKE_material.h"
 #include "BKE_mesh.hh"
 #include "BKE_mesh_boolean_convert.hh"
 

source/blender/blenkernel/intern/mesh_evaluate.cc

@@ -14,11 +14,8 @@
 
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_object_types.h"
 
-#include "BLI_alloca.h"
 #include "BLI_array_utils.hh"
-#include "BLI_bitmap.h"
 #include "BLI_index_range.hh"
 #include "BLI_math_geom.h"
 #include "BLI_span.hh"
@@ -26,9 +23,7 @@
 #include "BLI_virtual_array.hh"
 
 #include "BKE_attribute.hh"
-#include "BKE_customdata.hh"
 #include "BKE_mesh.hh"
-#include "BKE_multires.hh"
 
 using blender::float3;
 using blender::int2;

source/blender/blenkernel/intern/mesh_fair.cc

@@ -13,16 +13,10 @@
 #include "BLI_math_vector.h"
 #include "BLI_vector.hh"
 
-#include "DNA_object_types.h"
-
-#include "BKE_lib_id.hh"
-#include "BKE_lib_query.hh"
 #include "BKE_mesh.hh"
 #include "BKE_mesh_fair.hh"
-#include "BKE_mesh_mapping.hh"
 
 #include "bmesh.hh"
-#include "bmesh_tools.hh"
 
 #include "MEM_guardedalloc.h"
 #include "eigen_capi.h"

source/blender/blenkernel/intern/mesh_legacy_convert.cc

@@ -26,7 +26,6 @@
 #include "BLI_memarena.h"
 #include "BLI_multi_value_map.hh"
 #include "BLI_polyfill_2d.h"
-#include "BLI_resource_scope.hh"
 #include "BLI_string.h"
 #include "BLI_task.hh"
 #include "BLI_utildefines.h"
@@ -41,7 +40,6 @@
 #include "BKE_modifier.hh"
 #include "BKE_multires.hh"
 #include "BKE_node.hh"
-#include "BKE_node_runtime.hh"
 #include "BKE_node_tree_update.hh"
 
 #include "BLT_translation.hh"

source/blender/blenkernel/intern/mesh_merge_customdata.cc

@@ -14,8 +14,6 @@
 
 #include "BKE_customdata.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.hh"
-#include "BLI_memarena.h"
 
 #include "BLI_strict_flags.h"
 

source/blender/blenkernel/intern/mesh_mirror.cc

@@ -17,7 +17,6 @@
 #include "BKE_attribute.hh"
 #include "BKE_deform.hh"
 #include "BKE_lib_id.hh"
-#include "BKE_lib_query.hh"
 #include "BKE_mesh.hh"
 #include "BKE_mesh_mirror.hh"
 #include "BKE_modifier.hh"
@@ -27,8 +26,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "MOD_modifiertypes.hh"
-
 Mesh *BKE_mesh_mirror_bisect_on_mirror_plane_for_modifier(MirrorModifierData *mmd,
                                                           const Mesh *mesh,
                                                           int axis,

source/blender/blenkernel/intern/mesh_normals.cc

@@ -25,18 +25,14 @@
 #include "BLI_memarena.h"
 #include "BLI_span.hh"
 #include "BLI_task.hh"
-#include "BLI_timeit.hh"
 #include "BLI_utildefines.h"
 
 #include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
-#include "BKE_editmesh_cache.hh"
 #include "BKE_global.hh"
 #include "BKE_mesh.hh"
 #include "BKE_mesh_mapping.hh"
 
-#include "atomic_ops.h"
-
 // #define DEBUG_TIME
 
 #ifdef DEBUG_TIME

source/blender/blenkernel/intern/mesh_runtime.cc

@@ -6,16 +6,11 @@
  * \ingroup bke
  */
 
-#include "atomic_ops.h"
-
 #include "MEM_guardedalloc.h"
 
-#include "DNA_object_types.h"
-
 #include "BLI_array_utils.hh"
 #include "BLI_math_geom.h"
 #include "BLI_task.hh"
-#include "BLI_timeit.hh"
 
 #include "BKE_bake_data_block_id.hh"
 #include "BKE_bvhutils.hh"

source/blender/blenkernel/intern/mesh_sample.cc

@@ -5,7 +5,6 @@
 #include "BKE_attribute_math.hh"
 #include "BKE_bvhutils.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.hh"
 #include "BKE_mesh_sample.hh"
 
 #include "BLI_math_geom.h"

source/blender/blenkernel/intern/mesh_tangent.cc

@@ -21,13 +21,11 @@
 #include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.hh"
 #include "BKE_mesh_tangent.hh"
 #include "BKE_report.hh"
 
 #include "BLI_strict_flags.h"
 
-#include "atomic_ops.h"
 #include "mikktspace.hh"
 
 using blender::float2;

source/blender/blenkernel/intern/mesh_tessellate.cc

@@ -12,7 +12,6 @@
  */
 
 #include "BLI_array_utils.hh"
-#include "BLI_enumerable_thread_specific.hh"
 #include "BLI_math_geom.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"

source/blender/blenkernel/intern/movieclip.cc

@@ -25,7 +25,6 @@
 
 #include "DNA_defaults.h"
 
-#include "DNA_constraint_types.h"
 #include "DNA_gpencil_legacy_types.h"
 #include "DNA_movieclip_types.h"
 #include "DNA_node_types.h"
@@ -44,17 +43,14 @@
 
 #include "BLT_translation.hh"
 
-#include "BKE_anim_data.h"
 #include "BKE_bpath.hh"
 #include "BKE_colortools.hh"
-#include "BKE_global.hh"
 #include "BKE_idtype.hh"
 #include "BKE_image.h" /* openanim */
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
 #include "BKE_main.hh"
 #include "BKE_movieclip.h"
-#include "BKE_node.h"
 #include "BKE_node_tree_update.hh"
 #include "BKE_tracking.h"
 
@@ -72,8 +68,6 @@
 
 #include "BLO_read_write.hh"
 
-#include "tracking_private.h"
-
 static void free_buffers(MovieClip *clip);
 
 static void movie_clip_init_data(ID *id)

source/blender/blenkernel/intern/multires.cc

@@ -17,7 +17,6 @@
 #include "DNA_scene_types.h"
 
 #include "BLI_bitmap.h"
-#include "BLI_blenlib.h"
 #include "BLI_math_matrix.h"
 #include "BLI_task.h"
 #include "BLI_utildefines.h"
@@ -26,7 +25,6 @@
 #include "BKE_cdderivedmesh.h"
 #include "BKE_editmesh.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.hh"
 #include "BKE_mesh_runtime.hh"
 #include "BKE_modifier.hh"
 #include "BKE_multires.hh"
@@ -42,8 +40,6 @@
 
 #include "DEG_depsgraph_query.hh"
 
-#include "multires_reshape.hh"
-
 #include <cmath>
 #include <cstring>
 

source/blender/blenkernel/intern/multires_reshape.cc

@@ -9,18 +9,13 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
-#include "DNA_scene_types.h"
 
 #include "BKE_customdata.hh"
 #include "BKE_lib_id.hh"
-#include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.hh"
 #include "BKE_modifier.hh"
 #include "BKE_multires.hh"
 #include "BKE_object.hh"
-#include "BKE_subdiv.hh"
 #include "BKE_subsurf.hh"
 #include "BLI_math_vector.h"
 

source/blender/blenkernel/intern/multires_reshape_apply_base.cc

@@ -11,24 +11,14 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
 
-#include "BLI_listbase.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 
-#include "BKE_customdata.hh"
-#include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.hh"
-#include "BKE_mesh_runtime.hh"
 #include "BKE_multires.hh"
 #include "BKE_subdiv_eval.hh"
 
-#include "DEG_depsgraph_query.hh"
-
 void multires_reshape_apply_base_update_mesh_coords(MultiresReshapeContext *reshape_context)
 {
   Mesh *base_mesh = reshape_context->base_mesh;

source/blender/blenkernel/intern/multires_reshape_smooth.cc

@@ -11,8 +11,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
 
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
@@ -29,7 +27,6 @@
 
 #include "opensubdiv_converter_capi.hh"
 #include "opensubdiv_evaluator_capi.hh"
-#include "opensubdiv_topology_refiner_capi.hh"
 
 #include "atomic_ops.h"
 #include "subdiv_converter.hh"

source/blender/blenkernel/intern/multires_reshape_subdivide.cc

@@ -14,17 +14,11 @@
 #include "DNA_scene_types.h"
 
 #include "BKE_customdata.hh"
-#include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.hh"
-#include "BKE_modifier.hh"
 #include "BKE_multires.hh"
-#include "BKE_subdiv.hh"
 #include "BKE_subsurf.hh"
 #include "BLI_math_vector.h"
 
-#include "DEG_depsgraph_query.hh"
-
 #include "multires_reshape.hh"
 
 static void multires_subdivide_create_object_space_linear_grids(Mesh *mesh)

source/blender/blenkernel/intern/multires_reshape_util.cc

@@ -14,21 +14,17 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 
 #include "BLI_math_matrix.h"
 #include "BLI_task.h"
 
 #include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
-#include "BKE_mesh.hh"
 #include "BKE_mesh_runtime.hh"
 #include "BKE_multires.hh"
 #include "BKE_subdiv.hh"
 #include "BKE_subdiv_ccg.hh"
 #include "BKE_subdiv_eval.hh"
-#include "BKE_subdiv_foreach.hh"
-#include "BKE_subdiv_mesh.hh"
 
 #include "DEG_depsgraph_query.hh"
 

source/blender/blenkernel/intern/multires_reshape_vertcos.cc

@@ -8,9 +8,6 @@
 
 #include "multires_reshape.hh"
 
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-
 #include "BLI_math_vector.h"
 
 #include "BKE_subdiv_foreach.hh"

source/blender/blenkernel/intern/multires_subdiv.cc

@@ -8,12 +8,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_scene_types.h"
-
 #include "BLI_utildefines.h"
 
-#include "BKE_mesh.hh"
 #include "BKE_modifier.hh"
 #include "BKE_multires.hh"
 #include "BKE_subdiv.hh"

source/blender/blenkernel/intern/multires_unsubdivide.cc

@@ -20,19 +20,12 @@
 #include "BLI_math_vector.h"
 
 #include "BKE_customdata.hh"
-#include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.hh"
-#include "BKE_mesh_runtime.hh"
-#include "BKE_modifier.hh"
 #include "BKE_multires.hh"
-#include "BKE_subdiv.hh"
 #include "BKE_subsurf.hh"
 
 #include "bmesh.hh"
 
-#include "DEG_depsgraph_query.hh"
-
 #include "multires_reshape.hh"
 #include "multires_unsubdivide.hh"
 

source/blender/blenkernel/intern/node_enum_definition.cc

@@ -8,9 +8,7 @@
 #include "DNA_array_utils.hh"
 #include "DNA_node_types.h"
 
-#include "BKE_node.h"
 #include "BKE_node_enum.hh"
-#include "BKE_node_runtime.hh"
 
 using blender::bke::NodeSocketValueMenuRuntimeFlag;
 

source/blender/blenkernel/intern/node_runtime.cc

@@ -10,7 +10,6 @@
 #include "BLI_function_ref.hh"
 #include "BLI_stack.hh"
 #include "BLI_task.hh"
-#include "BLI_timeit.hh"
 
 #include "NOD_geometry_nodes_lazy_function.hh"
 

source/blender/blenkernel/intern/node_tree_update.cc

@@ -8,7 +8,6 @@
 #include "BLI_rand.hh"
 #include "BLI_set.hh"
 #include "BLI_stack.hh"
-#include "BLI_timeit.hh"
 #include "BLI_vector_set.hh"
 
 #include "DNA_anim_types.h"
@@ -31,8 +30,6 @@
 #include "NOD_socket.hh"
 #include "NOD_texture.h"
 
-#include "DEG_depsgraph_query.hh"
-
 using namespace blender::nodes;
 
 /**

source/blender/blenkernel/intern/node_tree_zones.cc

@@ -12,8 +12,6 @@
 #include "BLI_bit_span_ops.hh"
 #include "BLI_set.hh"
 #include "BLI_struct_equality_utils.hh"
-#include "BLI_task.hh"
-#include "BLI_timeit.hh"
 
 namespace blender::bke {
 

source/blender/blenkernel/intern/object_dupli.cc

@@ -17,26 +17,21 @@
 #include "BLI_string_utf8.h"
 
 #include "BLI_array.hh"
-#include "BLI_math_color.hh"
 #include "BLI_math_geom.h"
 #include "BLI_math_matrix.h"
-#include "BLI_math_matrix.hh"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.hh"
 #include "BLI_rand.h"
 #include "BLI_span.hh"
 #include "BLI_vector.hh"
 
-#include "DNA_anim_types.h"
 #include "DNA_collection_types.h"
 #include "DNA_curves_types.h"
 #include "DNA_grease_pencil_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_pointcloud_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_vfont_types.h"
 #include "DNA_volume_types.h"
 
 #include "BKE_collection.hh"
@@ -48,17 +43,11 @@
 #include "BKE_global.hh"
 #include "BKE_idprop.h"
 #include "BKE_instances.hh"
-#include "BKE_lattice.hh"
 #include "BKE_main.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_iterators.hh"
-#include "BKE_mesh_runtime.hh"
-#include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_object_types.hh"
 #include "BKE_particle.h"
-#include "BKE_scene.hh"
-#include "BKE_type_conversions.hh"
 #include "BKE_vfont.hh"
 
 #include "DEG_depsgraph.hh"
@@ -71,7 +60,6 @@
 #include "RNA_access.hh"
 #include "RNA_path.hh"
 #include "RNA_prototypes.h"
-#include "RNA_types.hh"
 
 #include "MOD_nodes.hh"
 

source/blender/blenkernel/intern/object_update.cc

@@ -6,12 +6,7 @@
  * \ingroup bke
  */
 
-#include "DNA_anim_types.h"
-#include "DNA_collection_types.h"
 #include "DNA_constraint_types.h"
-#include "DNA_gpencil_legacy_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_scene_types.h"
@@ -19,28 +14,21 @@
 #include "BLI_blenlib.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
-#include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_DerivedMesh.hh"
-#include "BKE_action.h"
 #include "BKE_armature.hh"
 #include "BKE_constraint.h"
 #include "BKE_curve.hh"
 #include "BKE_curves.h"
 #include "BKE_displist.h"
 #include "BKE_editmesh.hh"
-#include "BKE_effect.h"
 #include "BKE_gpencil_legacy.h"
 #include "BKE_gpencil_modifier_legacy.h"
 #include "BKE_grease_pencil.h"
 #include "BKE_grease_pencil.hh"
-#include "BKE_image.h"
-#include "BKE_key.hh"
 #include "BKE_lattice.hh"
 #include "BKE_layer.hh"
-#include "BKE_light.h"
-#include "BKE_material.h"
 #include "BKE_mball.hh"
 #include "BKE_mesh.hh"
 #include "BKE_object.hh"

source/blender/blenkernel/intern/paint_toolslots.cc

@@ -11,7 +11,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_brush_types.h"
-#include "DNA_modifier_types.h"
 #include "DNA_scene_types.h"
 
 #include "BLI_utildefines.h"

source/blender/blenkernel/intern/particle.cc

@@ -47,7 +47,6 @@
 
 #include "BLT_translation.hh"
 
-#include "BKE_anim_data.h"
 #include "BKE_anim_path.h"
 #include "BKE_boids.h"
 #include "BKE_cloth.hh"
@@ -63,11 +62,9 @@
 #include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
-#include "BKE_main.hh"
 #include "BKE_material.h"
 #include "BKE_mesh.hh"
 #include "BKE_mesh_legacy_convert.hh"
-#include "BKE_mesh_runtime.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_particle.h"

source/blender/blenkernel/intern/particle_distribute.cc

@@ -22,15 +22,12 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_particle_types.h"
-#include "DNA_scene_types.h"
 
 #include "BKE_customdata.hh"
 #include "BKE_global.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
 #include "BKE_mesh_legacy_convert.hh"
-#include "BKE_mesh_runtime.hh"
-#include "BKE_object.hh"
 #include "BKE_particle.h"
 
 #include "DEG_depsgraph_query.hh"

source/blender/blenkernel/intern/particle_system.cc

@@ -15,10 +15,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_anim_types.h"
 #include "DNA_boid_types.h"
 #include "DNA_cloth_types.h"
-#include "DNA_curve_types.h"
 #include "DNA_listBase.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
@@ -41,7 +39,6 @@
 #include "BLI_string_utils.hh"
 #include "BLI_task.h"
 #include "BLI_threads.h"
-#include "BLI_time.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_animsys.h"
@@ -53,13 +50,9 @@
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
 #include "BKE_mesh_legacy_convert.hh"
-#include "BKE_mesh_runtime.hh"
 #include "BKE_particle.h"
 
-#include "BKE_bvhutils.hh"
 #include "BKE_cloth.hh"
-#include "BKE_collection.hh"
-#include "BKE_lattice.hh"
 #include "BKE_material.h"
 #include "BKE_mesh.hh"
 #include "BKE_modifier.hh"
@@ -68,11 +61,8 @@
 #include "BKE_scene.hh"
 
 #include "DEG_depsgraph.hh"
-#include "DEG_depsgraph_physics.hh"
 #include "DEG_depsgraph_query.hh"
 
-#include "RE_texture.h"
-
 /* FLUID sim particle import */
 #ifdef WITH_FLUID
 #  include "DNA_fluid_types.h"

source/blender/blenkernel/intern/pbvh_pixels.cc

@@ -5,18 +5,15 @@
 #include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.hh"
 #include "BKE_pbvh_api.hh"
 #include "BKE_pbvh_pixels.hh"
 
 #include "DNA_image_types.h"
-#include "DNA_object_types.h"
 
 #include "BLI_listbase.h"
 #include "BLI_math_geom.h"
 #include "BLI_math_vector.h"
 #include "BLI_task.h"
-#include "BLI_time.h"
 
 #include "BKE_global.hh"
 #include "BKE_image_wrappers.hh"

source/blender/blenkernel/intern/pointcloud.cc

@@ -15,11 +15,9 @@
 
 #include "BLI_bounds.hh"
 #include "BLI_index_range.hh"
-#include "BLI_listbase.h"
 #include "BLI_math_vector.hh"
 #include "BLI_rand.h"
 #include "BLI_span.hh"
-#include "BLI_string.h"
 #include "BLI_task.hh"
 #include "BLI_utildefines.h"
 #include "BLI_vector.hh"
@@ -28,13 +26,9 @@
 #include "BKE_bake_data_block_id.hh"
 #include "BKE_customdata.hh"
 #include "BKE_geometry_set.hh"
-#include "BKE_global.hh"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
-#include "BKE_lib_remap.hh"
-#include "BKE_main.hh"
-#include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_object_types.hh"

source/blender/blenkernel/intern/preferences.cc

@@ -10,8 +10,6 @@
 
 #include <cstring>
 
-#include "DNA_asset_types.h"
-
 #include "MEM_guardedalloc.h"
 
 #include "BLI_fileops.h"

source/blender/blenkernel/intern/preview_image.cc

@@ -25,7 +25,9 @@
 #include "BLI_ghash.h"
 #include "BLI_string.h"
 #include "BLI_string_ref.hh"
-#include "BLI_threads.h"
+#ifndef NDEBUG
+#  include "BLI_threads.h"
+#endif
 
 #include "BLO_read_write.hh"
 

source/blender/blenkernel/intern/scene.cc

@@ -24,7 +24,6 @@
 #include "DNA_mask_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_modifier_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
 #include "DNA_rigidbody_types.h"
@@ -37,7 +36,6 @@
 #include "DNA_vfont_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_windowmanager_types.h"
-#include "DNA_workspace_types.h"
 #include "DNA_world_types.h"
 
 #include "BKE_callbacks.hh"
@@ -47,7 +45,6 @@
 #include "BLI_string_utils.hh"
 #include "BLI_task.h"
 #include "BLI_threads.h"
-#include "BLI_time.h"
 #include "BLI_utildefines.h"
 
 #include "BLO_readfile.hh"
@@ -57,9 +54,7 @@
 #include "BKE_action.h"
 #include "BKE_anim_data.h"
 #include "BKE_animsys.h"
-#include "BKE_armature.hh"
 #include "BKE_bpath.hh"
-#include "BKE_cachefile.hh"
 #include "BKE_collection.hh"
 #include "BKE_colortools.hh"
 #include "BKE_curveprofile.h"
@@ -67,8 +62,6 @@
 #include "BKE_editmesh.hh"
 #include "BKE_effect.h"
 #include "BKE_fcurve.h"
-#include "BKE_freestyle.h"
-#include "BKE_gpencil_legacy.h"
 #include "BKE_idprop.h"
 #include "BKE_idtype.hh"
 #include "BKE_image.h"
@@ -77,13 +70,8 @@
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
 #include "BKE_lib_remap.hh"
-#include "BKE_linestyle.h"
 #include "BKE_main.hh"
-#include "BKE_mask.h"
-#include "BKE_modifier.hh"
-#include "BKE_node.hh"
 #include "BKE_node_runtime.hh"
-#include "BKE_object.hh"
 #include "BKE_paint.hh"
 #include "BKE_pointcache.h"
 #include "BKE_preview_image.hh"
@@ -94,19 +82,16 @@
 #include "BKE_sound.h"
 #include "BKE_unit.hh"
 #include "BKE_workspace.h"
-#include "BKE_world.h"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
 #include "DEG_depsgraph_debug.hh"
 #include "DEG_depsgraph_query.hh"
-#include "DEG_depsgraph_writeback_sync.hh"
 
 #include "RE_engine.h"
 
 #include "RNA_access.hh"
 
-#include "SEQ_edit.hh"
 #include "SEQ_iterator.hh"
 #include "SEQ_sequencer.hh"
 

source/blender/blenkernel/intern/screen.cc

@@ -19,38 +19,28 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_collection_types.h"
 #include "DNA_defaults.h"
-#include "DNA_gpencil_legacy_types.h"
-#include "DNA_mask_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
-#include "DNA_text_types.h"
 #include "DNA_view3d_types.h"
-#include "DNA_workspace_types.h"
 
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
-#include "BLI_mempool.h"
 #include "BLI_rect.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "BLT_translation.hh"
 
-#include "BKE_gpencil_legacy.h"
 #include "BKE_idprop.h"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
-#include "BKE_node.h"
 #include "BKE_preview_image.hh"
 #include "BKE_screen.hh"
-#include "BKE_viewer_path.hh"
-#include "BKE_workspace.h"
 
 #include "BLO_read_write.hh"
 

source/blender/blenkernel/intern/shader_fx.cc

@@ -11,28 +11,20 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_math_vector.h"
 #include "BLI_string_utils.hh"
 #include "BLI_utildefines.h"
 
 #include "BLT_translation.hh"
 
-#include "DNA_gpencil_legacy_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_shader_fx_types.h"
 
-#include "BKE_gpencil_legacy.h"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
-#include "BKE_object.hh"
 #include "BKE_screen.hh"
 #include "BKE_shader_fx.h"
 
-#include "DEG_depsgraph.hh"
-#include "DEG_depsgraph_query.hh"
-
 #include "FX_shader_types.h"
 
 #include "BLO_read_write.hh"

source/blender/blenkernel/intern/shrinkwrap.cc

@@ -15,7 +15,6 @@
 
 #include "DNA_gpencil_modifier_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 
@@ -27,17 +26,13 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_DerivedMesh.hh"
-#include "BKE_attribute.hh"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_lattice.hh"
-#include "BKE_lib_id.hh"
 #include "BKE_modifier.hh"
 #include "BKE_shrinkwrap.hh"
 
 #include "BKE_deform.hh"
 #include "BKE_editmesh.hh"
 #include "BKE_mesh.hh" /* for OMP limits. */
-#include "BKE_mesh_runtime.hh"
 #include "BKE_mesh_wrapper.hh"
 #include "BKE_subsurf.hh"
 

source/blender/blenkernel/intern/sound.cc

@@ -14,7 +14,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_iterator.h"
 #include "BLI_math_rotation.h"
-#include "BLI_math_vector.h"
 #include "BLI_threads.h"
 
 #include "BLT_translation.hh"
@@ -47,7 +46,6 @@
 #include "BKE_lib_query.hh"
 #include "BKE_main.hh"
 #include "BKE_packedFile.h"
-#include "BKE_scene.hh"
 #include "BKE_sound.h"
 
 #include "DEG_depsgraph.hh"
@@ -55,7 +53,6 @@
 
 #include "BLO_read_write.hh"
 
-#include "SEQ_sequencer.hh"
 #include "SEQ_sound.hh"
 #include "SEQ_time.hh"
 

source/blender/blenkernel/intern/speaker.cc

@@ -7,7 +7,6 @@
  */
 
 #include "DNA_defaults.h"
-#include "DNA_object_types.h"
 #include "DNA_sound_types.h"
 #include "DNA_speaker_types.h"
 
@@ -15,11 +14,9 @@
 
 #include "BLT_translation.hh"
 
-#include "BKE_anim_data.h"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
-#include "BKE_main.hh"
 #include "BKE_speaker.h"
 
 #include "BLO_read_write.hh"

source/blender/blenkernel/intern/studiolight.cc

@@ -17,11 +17,9 @@
 #include "BLI_linklist.h"
 #include "BLI_listbase.h"
 #include "BLI_math_color.h"
-#include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
-#include "BLI_string_utils.hh"
 
 #include "DNA_listBase.h"
 

source/blender/blenkernel/intern/subdiv.cc

@@ -13,7 +13,6 @@
 
 #include "BLI_utildefines.h"
 
-#include "BKE_modifier.hh"
 #include "BKE_subdiv_modifier.hh"
 
 #include "MEM_guardedalloc.h"

source/blender/blenkernel/intern/subdiv_ccg.cc

@@ -21,7 +21,6 @@
 
 #include "BKE_DerivedMesh.hh"
 #include "BKE_ccg.h"
-#include "BKE_global.hh"
 #include "BKE_mesh.hh"
 #include "BKE_subdiv.hh"
 #include "BKE_subdiv_eval.hh"

source/blender/blenkernel/intern/subdiv_ccg_mask.cc

@@ -12,13 +12,10 @@
 
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
 
 #include "BLI_utildefines.h"
 
 #include "BKE_customdata.hh"
-#include "BKE_mesh.hh"
 #include "BKE_subdiv.hh"
 
 #include "MEM_guardedalloc.h"

source/blender/blenkernel/intern/subdiv_converter.cc

@@ -8,8 +8,6 @@
 
 #include "subdiv_converter.hh"
 
-#include "BLI_utildefines.h"
-
 #include "opensubdiv_converter_capi.hh"
 
 void BKE_subdiv_converter_free(OpenSubdiv_Converter *converter)

source/blender/blenkernel/intern/subdiv_converter_mesh.cc

@@ -20,11 +20,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "opensubdiv_capi.hh"
 #include "opensubdiv_converter_capi.hh"
 
-#include "bmesh_class.hh"
-
 /* Enable work-around for non-working CPU evaluator when using bilinear scheme.
  * This forces Catmark scheme with all edges marked as infinitely sharp. */
 #define BUGGY_SIMPLE_SCHEME_WORKAROUND 1

source/blender/blenkernel/intern/subdiv_displacement.cc

@@ -8,8 +8,6 @@
 
 #include "BKE_subdiv.hh"
 
-#include "BLI_utildefines.h"
-
 #include "MEM_guardedalloc.h"
 
 void BKE_subdiv_displacement_detach(Subdiv *subdiv)