Cleanup: Remove 'BKE_library.h' include from 'BKE_main.h'

That kind of implicit includes should really only be done when totally,
absolutely necessary, and ideally only with rather simple 'second-level'
headers.

Otherwise not being explicit with includes always end up biting in
unexpected ways...

source/blender/alembic/intern/abc_mball.cc

@@ -31,6 +31,7 @@ extern "C" {
 
 #include "BKE_curve.h"
 #include "BKE_displist.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_mball.h"
 #include "BKE_mesh.h"

source/blender/alembic/intern/abc_mesh.cc

@@ -38,6 +38,7 @@ extern "C" {
 #include "BLI_math_geom.h"
 #include "BLI_string.h"
 
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"

source/blender/blenkernel/BKE_main.h

@@ -42,8 +42,6 @@
  */
 #include "DNA_listBase.h"
 
-#include "BKE_library.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

source/blender/blenkernel/intern/blender_undo.c

@@ -46,11 +46,12 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
+#include "BKE_appdir.h"
 #include "BKE_blender_undo.h"  /* own include */
 #include "BKE_blendfile.h"
-#include "BKE_appdir.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/customdata.c

@@ -53,6 +53,7 @@
 #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/dynamicpaint.c

@@ -65,6 +65,7 @@
 #include "BKE_effect.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"

source/blender/blenkernel/intern/lightprobe.c

@@ -37,8 +37,9 @@
 
 #include "BKE_animsys.h"
 #include "BKE_global.h"
-#include "BKE_main.h"
+#include "BKE_library.h"
 #include "BKE_lightprobe.h"
+#include "BKE_main.h"
 
 void BKE_lightprobe_init(LightProbe *probe)
 {

source/blender/blenkernel/intern/packedFile.c

@@ -54,6 +54,7 @@
 #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/pointcache.c

@@ -63,6 +63,7 @@
 #include "BKE_collection.h"
 #include "BKE_dynamicpaint.h"
 #include "BKE_global.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"

source/blender/blenkernel/intern/smoke.c

@@ -73,6 +73,7 @@
 #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"

source/blender/blenkernel/intern/undo_system.c

@@ -39,6 +39,7 @@
 
 #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/writeavi.c

@@ -43,6 +43,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_global.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 

source/blender/blenkernel/intern/writeffmpeg.c

@@ -54,6 +54,7 @@
 #include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_image.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_sound.h"

source/blender/blenloader/intern/undofile.c

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

source/blender/blenloader/intern/versioning_280.c

@@ -63,31 +63,32 @@
 #include "DNA_armature_types.h"
 
 #include "BKE_action.h"
+#include "BKE_cloth.h"
 #include "BKE_collection.h"
 #include "BKE_constraint.h"
-#include "BKE_customdata.h"
 #include "BKE_colortools.h"
+#include "BKE_customdata.h"
 #include "BKE_freestyle.h"
+#include "BKE_gpencil.h"
 #include "BKE_idprop.h"
 #include "BKE_image.h"
+#include "BKE_key.h"
+#include "BKE_library.h"
 #include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "BKE_node.h"
+#include "BKE_object.h"
+#include "BKE_paint.h"
 #include "BKE_pointcache.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
 #include "BKE_sequencer.h"
 #include "BKE_studiolight.h"
-#include "BKE_workspace.h"
-#include "BKE_gpencil.h"
-#include "BKE_paint.h"
-#include "BKE_object.h"
-#include "BKE_cloth.h"
-#include "BKE_key.h"
 #include "BKE_unit.h"
+#include "BKE_workspace.h"
 
 /* Only for IMB_BlendMode */
 #include "IMB_imbuf.h"

source/blender/collada/ImageExporter.cpp

@@ -37,6 +37,7 @@ extern "C" {
 #include "BKE_customdata.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BLI_fileops.h"

source/blender/collada/collada_utils.cpp

@@ -49,11 +49,12 @@ extern "C" {
 #include "BKE_customdata.h"
 #include "BKE_object.h"
 #include "BKE_global.h"
+#include "BKE_library.h"
+#include "BKE_main.h"
 #include "BKE_layer.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
 #include "BKE_scene.h"
-#include "BKE_main.h"
 
 #include "ED_armature.h"
 

source/blender/editors/armature/pose_transform.c

@@ -47,6 +47,7 @@
 #include "BKE_deform.h"
 #include "BKE_global.h"
 #include "BKE_idprop.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_layer.h"

source/blender/editors/interface/interface_ops.c

@@ -46,6 +46,7 @@
 #include "BKE_layer.h"
 #include "BKE_screen.h"
 #include "BKE_global.h"
+#include "BKE_library.h"
 #include "BKE_library_override.h"
 #include "BKE_node.h"
 #include "BKE_text.h" /* for UI_OT_reports_to_text */

source/blender/editors/io/io_alembic.c

@@ -48,6 +48,7 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 

source/blender/editors/io/io_collada.c

@@ -37,6 +37,7 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_object.h"

source/blender/editors/mesh/editmesh_tools.c

@@ -58,6 +58,7 @@
 #include "BKE_deform.h"
 #include "BKE_report.h"
 #include "BKE_texture.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_editmesh.h"

source/blender/editors/object/object_modifier.c

@@ -61,6 +61,7 @@
 #include "BKE_global.h"
 #include "BKE_key.h"
 #include "BKE_lattice.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"

source/blender/editors/physics/rigidbody_constraint.c

@@ -39,6 +39,7 @@
 
 #include "BKE_collection.h"
 #include "BKE_context.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_rigidbody.h"

source/blender/editors/physics/rigidbody_object.c

@@ -44,6 +44,7 @@
 
 #include "BKE_collection.h"
 #include "BKE_context.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_rigidbody.h"

source/blender/editors/render/render_opengl.c

@@ -49,6 +49,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"

source/blender/editors/scene/scene_edit.c

@@ -32,6 +32,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_layer.h"
+#include "BKE_library.h"
 #include "BKE_library_remap.h"
 #include "BKE_main.h"
 #include "BKE_node.h"

source/blender/editors/screen/screen_ops.c

@@ -55,17 +55,18 @@
 
 #include "BKE_context.h"
 #include "BKE_customdata.h"
+#include "BKE_editmesh.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_icons.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
+#include "BKE_mask.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
-#include "BKE_editmesh.h"
 #include "BKE_sound.h"
-#include "BKE_mask.h"
 #include "BKE_workspace.h"
 
 #include "WM_api.h"

source/blender/editors/screen/screendump.c

@@ -46,8 +46,9 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_main.h"
 #include "BKE_image.h"
+#include "BKE_library.h"
+#include "BKE_main.h"
 #include "BKE_report.h"
 
 #include "BIF_gl.h"

source/blender/editors/sculpt_paint/paint_ops.c

@@ -41,6 +41,7 @@
 #include "BKE_context.h"
 #include "BKE_paint.h"
 #include "BKE_gpencil.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 

source/blender/editors/space_buttons/buttons_ops.c

@@ -44,6 +44,7 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 

source/blender/editors/space_file/file_draw.c

@@ -46,6 +46,7 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 
 #include "BLO_readfile.h"

source/blender/editors/space_file/file_ops.c

@@ -40,6 +40,7 @@
 #include "BKE_screen.h"
 #include "BKE_global.h"
 #include "BKE_report.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 
 #ifdef WIN32

source/blender/editors/space_file/filesel.c

@@ -61,6 +61,7 @@
 #include "BKE_appdir.h"
 #include "BKE_context.h"
 #include "BKE_global.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 
 #include "BLF_api.h"

source/blender/editors/space_outliner/outliner_collections.c

@@ -35,6 +35,7 @@
 #include "BKE_context.h"
 #include "BKE_collection.h"
 #include "BKE_layer.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 

source/blender/editors/space_outliner/outliner_dragdrop.c

@@ -46,6 +46,7 @@
 #include "BKE_collection.h"
 #include "BKE_context.h"
 #include "BKE_layer.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_report.h"

source/blender/editors/space_sequencer/sequencer_edit.c

@@ -47,9 +47,10 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
-#include "BKE_sequencer.h"
 #include "BKE_report.h"
+#include "BKE_sequencer.h"
 #include "BKE_sound.h"
 
 

source/blender/editors/util/ed_util.c

@@ -53,15 +53,16 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
+#include "BKE_layer.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_multires.h"
 #include "BKE_object.h"
 #include "BKE_packedFile.h"
 #include "BKE_paint.h"
 #include "BKE_screen.h"
-#include "BKE_workspace.h"
-#include "BKE_layer.h"
 #include "BKE_undo_system.h"
+#include "BKE_workspace.h"
 
 #include "ED_armature.h"
 #include "ED_buttons.h"

source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h

@@ -52,6 +52,7 @@ extern "C" {
 #include "render_types.h"
 
 #include "BKE_customdata.h"
+#include "BKE_library.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "BKE_scene.h"

source/blender/modifiers/intern/MOD_fluidsim_util.c

@@ -47,11 +47,12 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_fluidsim.h" /* ensure definitions here match */
-#include "BKE_main.h"
-#include "BKE_mesh.h"
 #ifdef WITH_MOD_FLUID
 #  include "BKE_global.h"
 #endif
+#include "BKE_library.h"
+#include "BKE_main.h"
+#include "BKE_mesh.h"
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"

source/blender/modifiers/intern/MOD_meshcache.c

@@ -36,10 +36,11 @@
 #include "BLI_path_util.h"
 #include "BLI_math.h"
 
-#include "BKE_scene.h"
 #include "BKE_global.h"
-#include "BKE_mesh.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
+#include "BKE_mesh.h"
+#include "BKE_scene.h"
 
 #include "DEG_depsgraph_query.h"
 

source/blender/modifiers/intern/MOD_ocean.c

@@ -42,6 +42,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_global.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"

source/blender/python/generic/bpy_internal_import.c

@@ -43,9 +43,10 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
+#include "BKE_library.h"
+#include "BKE_main.h"
 /* UNUSED */
 #include "BKE_text.h"  /* txt_to_buf */
-#include "BKE_main.h"
 
 #include "py_capi_utils.h"
 

source/blender/python/intern/bpy_interface.c

@@ -58,9 +58,10 @@
 
 #include "BKE_appdir.h"
 #include "BKE_context.h"
-#include "BKE_text.h"
-#include "BKE_main.h"
 #include "BKE_global.h" /* only for script checking */
+#include "BKE_library.h"
+#include "BKE_main.h"
+#include "BKE_text.h"
 
 #include "CCL_api.h"
 

source/blender/render/intern/source/bake_api.c

@@ -76,10 +76,11 @@
 #include "BKE_bvhutils.h"
 #include "BKE_customdata.h"
 #include "BKE_image.h"
-#include "BKE_node.h"
+#include "BKE_library.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_tangent.h"
 #include "BKE_mesh_runtime.h"
+#include "BKE_node.h"
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"

source/blender/render/intern/source/render_result.c

@@ -45,11 +45,12 @@
 #include "BLI_threads.h"
 
 #include "BKE_appdir.h"
-#include "BKE_image.h"
+#include "BKE_camera.h"
 #include "BKE_global.h"
+#include "BKE_image.h"
+#include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
-#include "BKE_camera.h"
 #include "BKE_scene.h"
 
 #include "IMB_imbuf.h"