Cleanup: remove redundant BKE/BLI/BIF headers

source/blender/blenfont/intern/blf_dir.c

@@ -50,8 +50,6 @@
 #include "BLI_string.h"
 #include "BLI_threads.h"
 
-#include "BIF_gl.h"
-
 #include "BLF_api.h"
 #include "blf_internal_types.h"
 #include "blf_internal.h"

source/blender/blenfont/intern/blf_font.c

@@ -53,9 +53,7 @@
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
 #include "BLI_threads.h"
-#include "BLI_alloca.h"
 
-#include "BIF_gl.h"
 #include "BLF_api.h"
 
 #include "UI_interface.h"

source/blender/blenfont/intern/blf_font_i18n.c

@@ -37,9 +37,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_fileops.h"
-#include "BLI_path_util.h"
-#include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_appdir.h"

source/blender/blenfont/intern/blf_glyph.c

@@ -52,7 +52,6 @@
 #include "BLI_rect.h"
 #include "BLI_threads.h"
 
-#include "BIF_gl.h"
 #include "BLF_api.h"
 
 #ifndef BLF_STANDALONE

source/blender/blenkernel/intern/CCGSubSurf.c

@@ -30,7 +30,6 @@
 #include "BLI_sys_types.h" // for intptr_t support
 
 #include "BLI_utildefines.h" /* for BLI_assert */
-#include "BLI_math.h"
 
 #include "BKE_ccg.h"
 #include "CCGSubSurf.h"

source/blender/blenkernel/intern/action.c

@@ -56,11 +56,8 @@
 #include "BKE_constraint.h"
 #include "BKE_deform.h"
 #include "BKE_fcurve.h"
-#include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 

source/blender/blenkernel/intern/anim.c

@@ -47,9 +47,7 @@
 #include "BKE_anim.h"
 #include "BKE_animsys.h"
 #include "BKE_action.h"
-#include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_global.h"
 #include "BKE_key.h"
 #include "BKE_main.h"
 #include "BKE_object.h"

source/blender/blenkernel/intern/armature.c

@@ -64,8 +64,6 @@
 #include "BKE_displist.h"
 #include "BKE_idprop.h"
 #include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
 #include "BKE_lattice.h"
 #include "BKE_main.h"
 #include "BKE_object.h"

source/blender/blenkernel/intern/armature_update.c

@@ -52,7 +52,6 @@
 
 #include "BIK_api.h"
 
-#include "BKE_main.h"
 
 #include "DEG_depsgraph.h"
 

source/blender/blenkernel/intern/blender.c

@@ -52,12 +52,10 @@
 #include "BKE_blendfile.h"
 #include "BKE_brush.h"
 #include "BKE_cachefile.h"
-#include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_image.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_report.h"

source/blender/blenkernel/intern/blender_copybuffer.c

@@ -36,7 +36,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
-#include "BLI_callbacks.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_moviecache.h"

source/blender/blenkernel/intern/blender_undo.c

@@ -51,7 +51,6 @@
 #include "BKE_blendfile.h"
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
 #include "BKE_main.h"
 
 #include "BLO_undofile.h"

source/blender/blenkernel/intern/brush.c

@@ -32,13 +32,11 @@
 #include "DNA_gpencil_types.h"
 
 #include "BLI_math.h"
-#include "BLI_blenlib.h"
 #include "BLI_rand.h"
 
 #include "BKE_brush.h"
 #include "BKE_colortools.h"
 #include "BKE_context.h"
-#include "BKE_global.h"
 #include "BKE_library.h"
 #include "BKE_library_query.h"
 #include "BKE_library_remap.h"

source/blender/blenkernel/intern/camera.c

@@ -50,8 +50,6 @@
 #include "BKE_object.h"
 #include "BKE_layer.h"
 #include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
 #include "BKE_main.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"

source/blender/blenkernel/intern/cdderivedmesh.c

@@ -37,13 +37,10 @@
 #include "atomic_ops.h"
 
 #include "BLI_math.h"
-#include "BLI_edgehash.h"
 #include "BLI_utildefines.h"
-#include "BLI_utildefines_stack.h"
 
 #include "BKE_pbvh.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_global.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_object.h"

source/blender/blenkernel/intern/collection.c

@@ -33,7 +33,6 @@
 #include "BLI_math_base.h"
 #include "BLI_threads.h"
 #include "BLT_translation.h"
-#include "BLI_string_utils.h"
 
 #include "BKE_collection.h"
 #include "BKE_icons.h"

source/blender/blenkernel/intern/curve.c

@@ -55,11 +55,8 @@
 #include "BKE_curve.h"
 #include "BKE_displist.h"
 #include "BKE_font.h"
-#include "BKE_global.h"
 #include "BKE_key.h"
 #include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_material.h"

source/blender/blenkernel/intern/customdata.c

@@ -52,8 +52,6 @@
 
 #include "BKE_customdata.h"
 #include "BKE_customdata_file.h"
-#include "BKE_global.h"
-#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_mesh_remap.h"

source/blender/blenkernel/intern/data_transfer.c

@@ -37,12 +37,10 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_array.h"
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_context.h"
 #include "BKE_customdata.h"
 #include "BKE_data_transfer.h"
 #include "BKE_deform.h"

source/blender/blenkernel/intern/displist.c

@@ -48,12 +48,10 @@
 #include "BLI_scanfill.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_global.h"
 #include "BKE_displist.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_object.h"
 #include "BKE_library.h"
-#include "BKE_main.h"
 #include "BKE_mball.h"
 #include "BKE_mball_tessellate.h"
 #include "BKE_mesh.h"

source/blender/blenkernel/intern/dynamicpaint.c

@@ -63,7 +63,6 @@
 #include "BKE_deform.h"
 #include "BKE_dynamicpaint.h"
 #include "BKE_effect.h"
-#include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_library.h"
 #include "BKE_main.h"

source/blender/blenkernel/intern/editmesh_cache.c

@@ -28,7 +28,6 @@
 
 #include "DNA_mesh_types.h"
 
-#include "BLI_math.h"
 
 #include "BKE_editmesh.h"
 #include "BKE_editmesh_cache.h"  /* own include */

source/blender/blenkernel/intern/effect.c

@@ -66,7 +66,6 @@
 #include "BKE_effect.h"
 #include "BKE_global.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"

source/blender/blenkernel/intern/fcurve.c

@@ -29,8 +29,6 @@
  *  \ingroup bke
  */
 
-
-
 #include <math.h>
 #include <stdio.h>
 #include <stddef.h>

source/blender/blenkernel/intern/gpencil.c

@@ -39,10 +39,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 #include "BLI_math_vector.h"
-#include "BLI_math_color.h"
 #include "BLI_string_utils.h"
-#include "BLI_rand.h"
-#include "BLI_ghash.h"
 
 #include "BLT_translation.h"
 
@@ -54,11 +51,9 @@
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 
-#include "BKE_context.h"
 #include "BKE_action.h"
 #include "BKE_animsys.h"
 #include "BKE_deform.h"
-#include "BKE_global.h"
 #include "BKE_gpencil.h"
 #include "BKE_colortools.h"
 #include "BKE_icons.h"

source/blender/blenkernel/intern/gpencil_modifier.c

@@ -45,7 +45,6 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_gpencil_modifier_types.h"
 
-#include "BKE_global.h"
 #include "BKE_library.h"
 #include "BKE_library_query.h"
 #include "BKE_gpencil.h"

source/blender/blenkernel/intern/image.c

@@ -74,8 +74,6 @@
 #include "BKE_icons.h"
 #include "BKE_image.h"
 #include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
 #include "BKE_main.h"
 #include "BKE_packedFile.h"
 #include "BKE_report.h"

source/blender/blenkernel/intern/key.c

@@ -55,7 +55,6 @@
 #include "BKE_curve.h"
 #include "BKE_customdata.h"
 #include "BKE_deform.h"
-#include "BKE_global.h"
 #include "BKE_key.h"
 #include "BKE_lattice.h"
 #include "BKE_library.h"
@@ -64,7 +63,6 @@
 #include "BKE_editmesh.h"
 #include "BKE_scene.h"
 
-
 #include "RNA_access.h"
 
 #define KEY_MODE_DUMMY      0 /* use where mode isn't checked for */

source/blender/blenkernel/intern/lamp.c

@@ -49,8 +49,6 @@
 #include "BKE_icons.h"
 #include "BKE_lamp.h"
 #include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 

source/blender/blenkernel/intern/lattice.c

@@ -57,8 +57,6 @@
 #include "BKE_key.h"
 #include "BKE_lattice.h"
 #include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"

source/blender/blenkernel/intern/layer.c

@@ -26,7 +26,6 @@
 
 #include <string.h>
 
-#include "BLI_array.h"
 #include "BLI_listbase.h"
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
@@ -37,7 +36,6 @@
 #include "BKE_animsys.h"
 #include "BKE_collection.h"
 #include "BKE_freestyle.h"
-#include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_layer.h"
 #include "BKE_main.h"

source/blender/blenkernel/intern/layer_utils.c

@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include "BLI_array.h"
-#include "BLI_listbase.h"
 
 #include "BKE_collection.h"
 #include "BKE_editmesh.h"

source/blender/blenkernel/intern/library.c

@@ -78,9 +78,7 @@
 #include "BLI_ghash.h"
 #include "BLI_linklist.h"
 #include "BLI_memarena.h"
-#include "BLI_mempool.h"
 #include "BLI_string_utils.h"
-#include "BLI_threads.h"
 
 #include "BLT_translation.h"
 
@@ -104,7 +102,6 @@
 #include "BKE_lamp.h"
 #include "BKE_lattice.h"
 #include "BKE_library.h"
-#include "BKE_library_override.h"
 #include "BKE_library_query.h"
 #include "BKE_library_remap.h"
 #include "BKE_linestyle.h"

source/blender/blenkernel/intern/library_idmap.c

@@ -30,7 +30,6 @@
 #include "DNA_ID.h"
 
 #include "BKE_idcode.h"
-#include "BKE_library.h"
 #include "BKE_library_idmap.h"  /* own include */
 #include "BKE_main.h"
 

source/blender/blenkernel/intern/library_query.c

@@ -64,7 +64,6 @@
 #include "DNA_world_types.h"
 
 #include "BLI_utildefines.h"
-#include "BLI_listbase.h"
 #include "BLI_ghash.h"
 #include "BLI_linklist_stack.h"
 

source/blender/blenkernel/intern/lightprobe.c

@@ -32,11 +32,9 @@
 #include "DNA_object_types.h"
 #include "DNA_lightprobe_types.h"
 
-#include "BLI_math.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_animsys.h"
-#include "BKE_global.h"
 #include "BKE_library.h"
 #include "BKE_lightprobe.h"
 #include "BKE_main.h"

source/blender/blenkernel/intern/material.c

@@ -53,19 +53,15 @@
 #include "BLI_math.h"
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
-#include "BLI_string.h"
 #include "BLI_array_utils.h"
 
 #include "BKE_animsys.h"
 #include "BKE_brush.h"
 #include "BKE_displist.h"
-#include "BKE_global.h"
 #include "BKE_gpencil.h"
 #include "BKE_icons.h"
 #include "BKE_image.h"
 #include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"

source/blender/blenkernel/intern/mball.c

@@ -52,15 +52,12 @@
 #include "BLI_string_utils.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_global.h"
 #include "BKE_main.h"
 
 #include "BKE_animsys.h"
 #include "BKE_curve.h"
 #include "BKE_scene.h"
 #include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
 #include "BKE_displist.h"
 #include "BKE_mball.h"
 #include "BKE_object.h"

source/blender/blenkernel/intern/mball_tessellate.c

@@ -49,7 +49,6 @@
 #include "BKE_global.h"
 
 #include "BKE_displist.h"
-#include "BKE_main.h"
 #include "BKE_mball_tessellate.h"  /* own include */
 #include "BKE_scene.h"
 

source/blender/blenkernel/intern/mesh_convert.c

@@ -40,7 +40,6 @@
 
 #include "BKE_main.h"
 #include "BKE_DerivedMesh.h"
-#include "BKE_global.h"
 #include "BKE_key.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"

source/blender/blenkernel/intern/mesh_evaluate.c

@@ -39,7 +39,6 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_memarena.h"
-#include "BLI_mempool.h"
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
 #include "BLI_bitmap.h"

source/blender/blenkernel/intern/mesh_tangent.c

@@ -38,11 +38,9 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_math.h"
-#include "BLI_stack.h"
 #include "BLI_task.h"
 
 #include "BKE_customdata.h"
-#include "BKE_global.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_tangent.h"
 #include "BKE_mesh_runtime.h"

source/blender/blenkernel/intern/movieclip.c

@@ -62,7 +62,6 @@
 #include "BKE_animsys.h"
 #include "BKE_colortools.h"
 #include "BKE_library.h"
-#include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_movieclip.h"
 #include "BKE_node.h"

source/blender/blenkernel/intern/multires.c

@@ -49,7 +49,6 @@
 #include "BKE_pbvh.h"
 #include "BKE_ccg.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_library.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_mesh_runtime.h"

source/blender/blenkernel/intern/multires_subdiv.c

@@ -34,7 +34,6 @@
 
 #include "BLI_utildefines.h"
 
-#include "BKE_library.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_multires.h"

source/blender/blenkernel/intern/node.c

@@ -59,8 +59,6 @@
 #include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 

source/blender/blenkernel/intern/object_facemap.c

@@ -35,12 +35,10 @@
 #include "DNA_mesh_types.h"
 
 #include "BLI_utildefines.h"
-#include "BLI_path_util.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"
 #include "BLI_listbase.h"
 
-#include "BKE_context.h"
 #include "BKE_customdata.h"
 #include "BKE_editmesh.h"
 #include "BKE_object.h"

source/blender/blenkernel/intern/object_update.c

@@ -48,13 +48,10 @@
 #include "BKE_displist.h"
 #include "BKE_editmesh.h"
 #include "BKE_effect.h"
-#include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_key.h"
 #include "BKE_lamp.h"
 #include "BKE_lattice.h"
-#include "BKE_library.h"
-#include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mball.h"
 #include "BKE_mesh.h"

source/blender/blenkernel/intern/ocean.c

@@ -39,11 +39,6 @@
 #include "DNA_modifier_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_math.h"
-#include "BLI_path_util.h"
-#include "BLI_rand.h"
-#include "BLI_task.h"
-#include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_image.h"

source/blender/blenkernel/intern/packedFile.c

@@ -52,9 +52,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_font.h"
-#include "BKE_global.h"
 #include "BKE_image.h"
-#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_packedFile.h"
 #include "BKE_report.h"

source/blender/blenkernel/intern/paint.c

@@ -45,9 +45,7 @@
 #include "DNA_workspace_types.h"
 
 #include "BLI_bitmap.h"
-#include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
-#include "BLI_string_utils.h"
 #include "BLI_math_vector.h"
 #include "BLI_listbase.h"
 
@@ -61,7 +59,6 @@
 #include "BKE_main.h"
 #include "BKE_context.h"
 #include "BKE_crazyspace.h"
-#include "BKE_global.h"
 #include "BKE_gpencil.h"
 #include "BKE_image.h"
 #include "BKE_key.h"

source/blender/blenkernel/intern/particle.c

@@ -48,7 +48,6 @@
 #include "DNA_dynamicpaint_types.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_noise.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 #include "BLI_kdopbvh.h"
@@ -68,7 +67,6 @@
 #include "BKE_collection.h"
 #include "BKE_colortools.h"
 #include "BKE_effect.h"
-#include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_lattice.h"
 
@@ -77,8 +75,6 @@
 #include "BKE_material.h"
 #include "BKE_key.h"
 #include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
 #include "BKE_modifier.h"
 #include "BKE_mesh.h"
 #include "BKE_cdderivedmesh.h"  /* for weight_to_rgb() */

source/blender/blenkernel/intern/particle_system.c

@@ -58,12 +58,10 @@
 #include "BLI_utildefines.h"
 #include "BLI_edgehash.h"
 #include "BLI_rand.h"
-#include "BLI_jitter_2d.h"
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_kdtree.h"
 #include "BLI_kdopbvh.h"
-#include "BLI_sort.h"
 #include "BLI_task.h"
 #include "BLI_threads.h"
 #include "BLI_linklist.h"
@@ -73,10 +71,8 @@
 #include "BKE_collision.h"
 #include "BKE_colortools.h"
 #include "BKE_effect.h"
-#include "BKE_global.h"
 #include "BKE_library.h"
 #include "BKE_library_query.h"
-#include "BKE_main.h"
 #include "BKE_particle.h"
 
 #include "BKE_collection.h"

source/blender/blenkernel/intern/pbvh.c

@@ -36,7 +36,6 @@
 #include "BKE_ccg.h"
 #include "BKE_subsurf.h"
 #include "BKE_DerivedMesh.h"
-#include "BKE_global.h"
 #include "BKE_mesh.h" /* for BKE_mesh_calc_normals */
 #include "BKE_paint.h"
 

source/blender/blenkernel/intern/pointcache.c

@@ -48,7 +48,6 @@
 #include "DNA_smoke_types.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_threads.h"
 #include "BLI_math.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"

source/blender/blenkernel/intern/rigidbody.c

@@ -39,7 +39,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_math.h"
 
 #ifdef WITH_BULLET
@@ -57,10 +56,7 @@
 
 #include "BKE_collection.h"
 #include "BKE_effect.h"
-#include "BKE_global.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
@@ -68,6 +64,11 @@
 #include "BKE_pointcache.h"
 #include "BKE_rigidbody.h"
 #include "BKE_scene.h"
+#ifdef WITH_BULLET
+#  include "BKE_global.h"
+#  include "BKE_library.h"
+#  include "BKE_library_query.h"
+#endif
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"

source/blender/blenkernel/intern/scene.c

@@ -73,7 +73,6 @@
 #include "BKE_editmesh.h"
 #include "BKE_fcurve.h"
 #include "BKE_freestyle.h"
-#include "BKE_global.h"
 #include "BKE_gpencil.h"
 #include "BKE_icons.h"
 #include "BKE_idprop.h"

source/blender/blenkernel/intern/shader_fx.c

@@ -45,7 +45,6 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_shader_fx_types.h"
 
-#include "BKE_global.h"
 #include "BKE_library.h"
 #include "BKE_library_query.h"
 #include "BKE_gpencil.h"

source/blender/blenkernel/intern/smoke.c

@@ -42,12 +42,9 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_kdtree.h"
 #include "BLI_kdopbvh.h"
-#include "BLI_task.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
-#include "BLI_voxel.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
@@ -72,9 +69,7 @@
 #include "BKE_customdata.h"
 #include "BKE_deform.h"
 #include "BKE_effect.h"
-#include "BKE_global.h"
 #include "BKE_library.h"
-#include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
 #include "BKE_modifier.h"
@@ -105,6 +100,10 @@
 
 #ifdef WITH_SMOKE
 
+#include "BLI_task.h"
+#include "BLI_kdtree.h"
+#include "BLI_voxel.h"
+
 static ThreadMutex object_update_lock = BLI_MUTEX_INITIALIZER;
 
 struct Mesh;

source/blender/blenkernel/intern/speaker.c

@@ -33,8 +33,6 @@
 
 #include "BKE_animsys.h"
 #include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
 #include "BKE_main.h"
 #include "BKE_speaker.h"
 

source/blender/blenkernel/intern/studiolight.c

@@ -43,7 +43,6 @@
 #include "BLI_math.h"
 #include "BLI_math_color.h"
 #include "BLI_path_util.h"
-#include "BLI_rand.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"
 

source/blender/blenkernel/intern/subdiv_ccg_mask.c

@@ -35,7 +35,6 @@
 #include "DNA_object_types.h"
 
 #include "BLI_utildefines.h"
-#include "BLI_math_vector.h"
 
 #include "BKE_customdata.h"
 #include "BKE_subdiv.h"

source/blender/blenkernel/intern/subdiv_converter_mesh.c

@@ -36,7 +36,6 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_bitmap.h"
-#include "BLI_math_vector.h"
 
 #include "BKE_customdata.h"
 #include "BKE_mesh_mapping.h"

source/blender/blenkernel/intern/subdiv_foreach.c

@@ -35,9 +35,7 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_key_types.h"
 
-#include "BLI_alloca.h"
 #include "BLI_bitmap.h"
-#include "BLI_math_vector.h"
 #include "BLI_task.h"
 
 #include "BKE_mesh.h"

source/blender/blenkernel/intern/subdiv_mesh.c

@@ -36,9 +36,7 @@
 #include "DNA_key_types.h"
 
 #include "BLI_alloca.h"
-#include "BLI_bitmap.h"
 #include "BLI_math_vector.h"
-#include "BLI_task.h"
 
 #include "BKE_mesh.h"
 #include "BKE_key.h"

source/blender/blenkernel/intern/subsurf_ccg.c

@@ -64,7 +64,6 @@
 #include "BKE_pbvh.h"
 #include "BKE_ccg.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_global.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_modifier.h"

source/blender/blenkernel/intern/text.c

@@ -56,7 +56,6 @@
 #include "DNA_node_types.h"
 #include "DNA_material_types.h"
 
-#include "BKE_global.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_text.h"

source/blender/blenkernel/intern/texture.c

@@ -57,8 +57,6 @@
 
 #include "BKE_colorband.h"
 #include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
 #include "BKE_image.h"
 #include "BKE_material.h"
 #include "BKE_texture.h"

source/blender/blenkernel/intern/undo_system.c

@@ -32,14 +32,12 @@
 #include "BLI_sys_types.h"
 #include "BLI_listbase.h"
 #include "BLI_string.h"
-#include "BLI_sort_utils.h"
 
 #include "DNA_listBase.h"
 #include "DNA_windowmanager_types.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
 #include "BKE_library_override.h"
 #include "BKE_main.h"
 #include "BKE_undo_system.h"

source/blender/blenkernel/intern/workspace.c

@@ -30,16 +30,13 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_string.h"
-#include "BLI_string_utf8.h"
 #include "BLI_string_utils.h"
 #include "BLI_listbase.h"
 
-#include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_scene.h"
-#include "BKE_screen.h"
 #include "BKE_object.h"
 #include "BKE_workspace.h"
 

source/blender/blenkernel/intern/world.c

@@ -44,11 +44,8 @@
 #include "BLI_listbase.h"
 
 #include "BKE_animsys.h"
-#include "BKE_global.h"
 #include "BKE_icons.h"
 #include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_world.h"

source/blender/blenkernel/intern/writeavi.c

@@ -39,13 +39,14 @@
 
 #include "DNA_scene_types.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_global.h"
-#include "BKE_library.h"
-#include "BKE_main.h"
 #include "BKE_report.h"
+#ifdef WITH_AVI
+#  include "BLI_blenlib.h"
+
+#  include "BKE_main.h"
+#endif
 
 #include "BKE_writeavi.h"
 

source/blender/blenlib/intern/astar.c

@@ -51,7 +51,6 @@
 #include "BLI_sys_types.h"
 #include "BLI_compiler_attrs.h"
 
-#include "BLI_alloca.h"
 #include "BLI_heap_simple.h"
 #include "BLI_listbase.h"
 #include "BLI_math.h"

source/blender/blenlib/intern/path_util.c

@@ -42,7 +42,6 @@
 #include "BLI_fileops.h"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
-#include "BLI_string_utf8.h"
 #include "BLI_fnmatch.h"
 
 #ifdef WIN32

source/blender/blenlib/intern/storage.c

@@ -74,7 +74,6 @@
 #include "BLI_linklist.h"
 #include "BLI_string.h"
 #include "BLI_fileops.h"
-#include "BLI_fileops_types.h"
 #include "BLI_path_util.h"
 
 /**

source/blender/blenlib/intern/string_utils.c

@@ -34,7 +34,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_listbase.h"
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
 #include "BLI_string_utils.h"

source/blender/blenloader/intern/readblenentry.c

@@ -41,7 +41,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
-#include "BLI_path_util.h"
 #include "BLI_ghash.h"
 #include "BLI_linklist.h"
 #include "BLI_listbase.h"
@@ -52,7 +51,6 @@
 
 
 #include "BKE_main.h"
-#include "BKE_library.h" // for BKE_main_free
 #include "BKE_idcode.h"
 
 #include "BLO_readfile.h"

source/blender/blenloader/intern/readfile.c

@@ -129,7 +129,6 @@
 #include "BKE_collection.h"
 #include "BKE_colortools.h"
 #include "BKE_constraint.h"
-#include "BKE_context.h"
 #include "BKE_curve.h"
 #include "BKE_effect.h"
 #include "BKE_fcurve.h"

source/blender/blenloader/intern/undofile.c

@@ -53,7 +53,6 @@
 #include "BLO_undofile.h"
 #include "BLO_readfile.h"
 
-#include "BKE_library.h"
 #include "BKE_main.h"
 
 /* keep last */

source/blender/blenloader/intern/versioning_270.c

@@ -63,7 +63,6 @@
 #include "BKE_colortools.h"
 #include "BKE_fcurve.h"
 #include "BKE_gpencil.h"
-#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_mask.h"
 #include "BKE_modifier.h"

source/blender/blenloader/intern/versioning_280.c

@@ -35,7 +35,6 @@
 #include "BLI_math.h"
 #include "BLI_mempool.h"
 #include "BLI_string.h"
-#include "BLI_string_utf8.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_object_types.h"

source/blender/blenloader/intern/writefile.c

@@ -157,7 +157,6 @@
 #include "MEM_guardedalloc.h" // MEM_freeN
 #include "BLI_bitmap.h"
 #include "BLI_blenlib.h"
-#include "BLI_linklist.h"
 #include "BLI_mempool.h"
 
 #include "BKE_action.h"

source/blender/blentranslation/intern/blt_lang.c

@@ -42,8 +42,6 @@
 #include "BLT_translation.h"
 #include "BLT_lang.h"  /* own include */
 
-#include "BLI_fileops.h"
-#include "BLI_linklist.h"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
@@ -60,6 +58,9 @@ static void blt_lang_check_ime_supported(void);
 
 #ifdef WITH_INTERNATIONAL
 
+#include "BLI_fileops.h"
+#include "BLI_linklist.h"
+
 #include "boost_locale_wrapper.h"
 
 /* Locale options. */

source/blender/blentranslation/intern/blt_translation.c

@@ -38,10 +38,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_fileops.h"
-#include "BLI_path_util.h"
-#include "BLI_string.h"
-#include "BLI_threads.h"
 
 #include "DNA_userdef_types.h" /* For user settings. */
 

source/blender/bmesh/intern/bmesh_mesh_conv.c

@@ -92,7 +92,6 @@
 #include "BKE_customdata.h"
 #include "BKE_multires.h"
 
-#include "BKE_global.h" /* ugh - for looping over all objects */
 #include "BKE_main.h"
 #include "BKE_key.h"
 

source/blender/bmesh/intern/bmesh_polygon.c

@@ -40,7 +40,6 @@
 #include "BLI_polyfill_2d.h"
 #include "BLI_polyfill_2d_beautify.h"
 #include "BLI_linklist.h"
-#include "BLI_edgehash.h"
 #include "BLI_heap.h"
 
 #include "bmesh.h"

source/blender/bmesh/intern/bmesh_polygon_edgenet.c

@@ -34,7 +34,6 @@
 #include "BLI_alloca.h"
 #include "BLI_utildefines_stack.h"
 #include "BLI_linklist_stack.h"
-#include "BLI_sort.h"
 #include "BLI_sort_utils.h"
 #include "BLI_kdopbvh.h"
 

source/blender/bmesh/operators/bmo_connect_pair.c

@@ -37,7 +37,6 @@
 #include "intern/bmesh_operators_private.h" /* own include */
 
 #include "BLI_mempool.h"
-#include "BLI_listbase.h"
 
 /**
  * Method for connecting across many faces.

source/blender/bmesh/tools/bmesh_bevel.c

@@ -38,8 +38,6 @@
 
 #include "BLI_array.h"
 #include "BLI_alloca.h"
-#include "BLI_gsqueue.h"
-#include "BLI_linklist_stack.h"
 #include "BLI_math.h"
 #include "BLI_memarena.h"
 #include "BLI_utildefines.h"

source/blender/bmesh/tools/bmesh_decimate_collapse.c

@@ -37,7 +37,6 @@
 #include "BLI_linklist.h"
 #include "BLI_alloca.h"
 #include "BLI_memarena.h"
-#include "BLI_edgehash.h"
 #include "BLI_polyfill_2d.h"
 #include "BLI_polyfill_2d_beautify.h"
 #include "BLI_utildefines_stack.h"

source/blender/bmesh/tools/bmesh_intersect.c

@@ -46,7 +46,6 @@
 #include "BLI_linklist_stack.h"
 #include "BLI_utildefines_stack.h"
 #ifndef NDEBUG
-#  include "BLI_array_utils.h"
 #endif
 
 #include "BLI_kdopbvh.h"

source/blender/collada/MaterialExporter.cpp

@@ -25,8 +25,6 @@
  *  \ingroup collada
  */
 
-
-
 #include "MaterialExporter.h"
 #include "COLLADABUUtils.h"
 #include "collada_internal.h"

source/blender/draw/engines/eevee/eevee_bloom.c

@@ -30,8 +30,6 @@
 
 #include "DRW_render.h"
 
-
-
 #include "GPU_texture.h"
 
 #include "DEG_depsgraph_query.h"

source/blender/draw/engines/eevee/eevee_engine.c

@@ -35,13 +35,10 @@
 
 #include "DNA_world_types.h"
 
-
-
 #include "eevee_private.h"
 
 #define EEVEE_ENGINE "BLENDER_EEVEE"
 
-
 /* *********** FUNCTIONS *********** */
 
 static void eevee_engine_init(void *ved)

source/blender/draw/intern/draw_anim_viz.c

@@ -40,8 +40,6 @@
 
 #include "BLI_math.h"
 
-
-
 #include "UI_resources.h"
 
 #include "DEG_depsgraph_query.h"
@@ -55,7 +53,6 @@
 #include "draw_common.h"
 #include "draw_manager_text.h"
 
-
 /* ********************************* Lists ************************************** */
 /* All lists are per viewport specific datas.
  * They are all free when viewport changes engines

source/blender/draw/modes/object_mode.c

@@ -45,8 +45,6 @@
 #include "DNA_view3d_types.h"
 #include "DNA_world_types.h"
 
-
-
 #include "BKE_anim.h"
 #include "BKE_camera.h"
 #include "BKE_constraint.h"

source/blender/editors/animation/anim_channels_defines.c

@@ -82,8 +82,6 @@
 #include "ED_anim_api.h"
 #include "ED_keyframing.h"
 
-#include "BIF_gl.h"
-
 #include "WM_api.h"
 #include "WM_types.h"
 

source/blender/editors/animation/anim_markers.c

@@ -57,8 +57,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "BIF_glutil.h"
-
 #include "GPU_immediate.h"
 #include "GPU_matrix.h"
 #include "GPU_state.h"

source/blender/editors/animation/keyframes_general.c

@@ -48,7 +48,6 @@
 #include "BKE_fcurve.h"
 #include "BKE_report.h"
 #include "BKE_main.h"
-#include "BKE_global.h"
 #include "BKE_deform.h"
 
 #include "RNA_access.h"

source/blender/editors/armature/armature_naming.c

@@ -52,7 +52,6 @@
 #include "BKE_constraint.h"
 #include "BKE_context.h"
 #include "BKE_deform.h"
-#include "BKE_global.h"
 #include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"