From 920e709069e9378b85f70ba499fb9e48a0fa7428 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Tue, 7 Jan 2025 12:39:13 +0100
Subject: [PATCH] Refactor: Make header files more clangd and clang-tidy
 friendly

When using clangd or running clang-tidy on headers there are
currently many errors. These are noisy in IDEs, make auto fixes
impossible, and break features like code completion, refactoring
and navigation.

This makes source/blender headers work by themselves, which is
generally the goal anyway. But #includes and forward declarations
were often incomplete.

* Add #includes and forward declarations
* Add IWYU pragma: export in a few places
* Remove some unused #includes (but there are many more)
* Tweak ShaderCreateInfo macros to work better with clangd

Some types of headers still have errors, these could be fixed or
worked around with more investigation. Mostly preprocessor
template headers like NOD_static_types.h.

Note that that disabling WITH_UNITY_BUILD is required for clangd to
work properly, otherwise compile_commands.json does not contain
the information for the relevant source files.

For more details see the developer docs:
https://developer.blender.org/docs/handbook/tooling/clangd/

Pull Request: https://projects.blender.org/blender/blender/pulls/132608
---
 intern/eigen/eigen_capi.h                     |  8 +--
 source/blender/animrig/ANIM_action.hh         |  1 -
 .../blender/animrig/ANIM_action_iterators.hh  |  4 +-
 .../blender/animrig/ANIM_bone_collections.hh  |  1 -
 source/blender/animrig/ANIM_evaluation.hh     |  4 --
 source/blender/animrig/ANIM_keyframing.hh     |  4 --
 source/blender/animrig/ANIM_keyingsets.hh     |  2 +
 .../blender/animrig/intern/action_runtime.hh  |  1 +
 .../intern/bone_collections_internal.hh       |  3 +-
 .../animrig/intern/bone_collections_test.cc   |  1 +
 .../animrig/intern/evaluation_internal.hh     |  7 +++
 .../asset_system/AS_asset_catalog_path.hh     |  1 -
 .../blenfont/intern/blf_internal_types.hh     |  7 +++
 source/blender/blenkernel/BKE_action.hh       |  2 -
 source/blender/blenkernel/BKE_anim_data.hh    |  1 -
 .../blenkernel/BKE_anonymous_attribute_id.hh  |  1 -
 source/blender/blenkernel/BKE_armature.hh     |  3 +-
 source/blender/blenkernel/BKE_asset.hh        |  1 -
 source/blender/blenkernel/BKE_attribute.hh    |  2 -
 .../blenkernel/BKE_attribute_filter.hh        |  1 -
 .../blenkernel/BKE_bake_data_block_id.hh      |  4 +-
 .../blenkernel/BKE_bake_data_block_map.hh     |  7 ---
 source/blender/blenkernel/BKE_blender.hh      |  2 -
 source/blender/blenkernel/BKE_collection.hh   |  1 -
 source/blender/blenkernel/BKE_context.hh      |  1 -
 .../blenkernel/BKE_curve_legacy_convert.hh    |  3 +-
 source/blender/blenkernel/BKE_customdata.hh   |  4 +-
 .../blender/blenkernel/BKE_customdata_file.h  |  2 +
 source/blender/blenkernel/BKE_editmesh.hh     |  2 -
 source/blender/blenkernel/BKE_global.hh       |  1 -
 .../blender/blenkernel/BKE_grease_pencil.hh   |  2 -
 source/blender/blenkernel/BKE_image.hh        |  4 +-
 source/blender/blenkernel/BKE_image_format.hh |  2 +
 .../blenkernel/BKE_image_partial_update.hh    |  3 +-
 source/blender/blenkernel/BKE_keyconfig.h     |  2 +
 source/blender/blenkernel/BKE_lattice.hh      |  1 -
 source/blender/blenkernel/BKE_lib_query.hh    |  1 -
 source/blender/blenkernel/BKE_library.hh      |  2 -
 source/blender/blenkernel/BKE_lightprobe.h    |  2 +
 source/blender/blenkernel/BKE_main_idmap.hh   |  2 +
 source/blender/blenkernel/BKE_mesh.hh         |  4 +-
 source/blender/blenkernel/BKE_mesh_fair.hh    |  1 -
 .../blenkernel/BKE_mesh_legacy_convert.hh     |  3 +-
 .../BKE_mesh_legacy_derived_mesh.hh           |  2 -
 source/blender/blenkernel/BKE_mesh_remap.hh   |  1 -
 source/blender/blenkernel/BKE_mesh_runtime.hh |  3 +
 source/blender/blenkernel/BKE_mesh_tangent.hh |  1 +
 source/blender/blenkernel/BKE_multires.hh     |  2 +-
 source/blender/blenkernel/BKE_node.hh         |  3 -
 source/blender/blenkernel/BKE_node_runtime.hh |  1 -
 .../blenkernel/BKE_node_socket_value.hh       |  1 -
 .../blenkernel/BKE_node_tree_interface.hh     |  2 -
 source/blender/blenkernel/BKE_paint_bvh.hh    |  5 +-
 .../blenkernel/BKE_paint_bvh_pixels.hh        |  2 +
 source/blender/blenkernel/BKE_pointcloud.hh   |  2 -
 .../blender/blenkernel/BKE_preview_image.hh   |  2 -
 source/blender/blenkernel/BKE_report.hh       |  1 -
 .../blender/blenkernel/BKE_scene_runtime.hh   |  2 +
 source/blender/blenkernel/BKE_screen.hh       |  3 +-
 .../blenkernel/BKE_sequencer_offscreen.h      |  4 ++
 source/blender/blenkernel/BKE_shrinkwrap.hh   |  2 +
 source/blender/blenkernel/BKE_subdiv.hh       |  3 +-
 source/blender/blenkernel/BKE_subdiv_ccg.hh   |  1 -
 .../blender/blenkernel/BKE_subdiv_deform.hh   |  1 -
 source/blender/blenkernel/BKE_subdiv_eval.hh  |  1 -
 source/blender/blenkernel/BKE_subdiv_mesh.hh  |  1 -
 .../blender/blenkernel/BKE_subdiv_modifier.hh |  2 -
 source/blender/blenkernel/BKE_text.h          |  1 +
 source/blender/blenkernel/BKE_volume_enums.hh |  2 +
 .../blenkernel/BKE_volume_grid_type_traits.hh |  1 -
 .../blender/blenkernel/BKE_volume_openvdb.hh  |  1 +
 .../blender/blenkernel/BKE_volume_render.hh   |  2 -
 .../blender/blenkernel/BKE_volume_to_mesh.hh  |  1 +
 source/blender/blenkernel/BKE_workspace.hh    |  6 ++
 .../blender/blenkernel/intern/CCGSubSurf.cc   |  2 +-
 .../blenkernel/intern/CCGSubSurf_inline.h     |  6 ++
 .../blenkernel/intern/CCGSubSurf_intern.h     |  4 +-
 .../blenkernel/intern/CCGSubSurf_legacy.cc    |  1 +
 .../blenkernel/intern/CCGSubSurf_util.cc      |  1 +
 .../blender/blenkernel/intern/constraint.cc   |  1 +
 .../blender/blenkernel/intern/crazyspace.cc   |  2 +
 .../blenkernel/intern/data_transfer.cc        |  5 +-
 source/blender/blenkernel/intern/displist.cc  |  1 +
 source/blender/blenkernel/intern/fluid.cc     |  1 +
 .../blenkernel/intern/mesh_calc_edges.cc      |  1 +
 .../intern/mesh_merge_customdata.cc           |  1 +
 .../blender/blenkernel/intern/mesh_remap.cc   |  1 +
 source/blender/blenkernel/intern/multires.cc  |  2 +-
 .../blenkernel/intern/multires_inline.hh      |  1 -
 .../blenkernel/intern/multires_reshape.hh     |  1 -
 .../blenkernel/intern/multires_unsubdivide.hh |  3 +-
 .../blenkernel/intern/node_tree_interface.cc  |  2 +
 .../blenkernel/intern/pbvh_pixels_copy.hh     |  8 ---
 .../blenkernel/intern/pbvh_uv_islands.cc      |  1 +
 .../blenkernel/intern/pbvh_uv_islands.hh      |  4 --
 source/blender/blenkernel/intern/sound.cc     |  1 +
 source/blender/blenkernel/intern/volume.cc    |  8 +--
 source/blender/blenkernel/nla_private.h       |  4 ++
 source/blender/blenkernel/particle_private.h  |  2 +
 source/blender/blenkernel/tracking_private.h  |  3 +
 source/blender/blenlib/BLI_args.h             |  1 +
 source/blender/blenlib/BLI_array_store.h      |  2 +
 .../blender/blenlib/BLI_array_store_utils.h   | 10 ++--
 source/blender/blenlib/BLI_binary_search.hh   |  2 -
 source/blender/blenlib/BLI_bit_ref.hh         |  1 -
 source/blender/blenlib/BLI_boxpack_2d.h       |  2 +
 source/blender/blenlib/BLI_buffer.h           |  2 +
 source/blender/blenlib/BLI_compute_context.hh |  1 -
 source/blender/blenlib/BLI_concurrent_map.hh  |  5 +-
 source/blender/blenlib/BLI_cpp_type.hh        |  1 -
 source/blender/blenlib/BLI_cpp_types.hh       |  1 -
 .../blenlib/BLI_devirtualize_parameters.hh    |  2 +
 .../blenlib/BLI_endian_switch_inline.h        |  3 +
 source/blender/blenlib/BLI_fileops.hh         |  2 +-
 source/blender/blenlib/BLI_function_ref.hh    |  3 -
 source/blender/blenlib/BLI_generic_key.hh     |  2 +-
 .../blenlib/BLI_generic_virtual_array.hh      |  1 -
 source/blender/blenlib/BLI_hash.hh            |  1 -
 source/blender/blenlib/BLI_hash_tables.hh     |  1 -
 source/blender/blenlib/BLI_heap.h             |  3 +
 source/blender/blenlib/BLI_heap_simple.h      |  3 +
 .../blenlib/BLI_index_ranges_builder_fwd.hh   |  2 -
 source/blender/blenlib/BLI_iterator.h         |  2 +
 source/blender/blenlib/BLI_kdopbvh.hh         |  2 +-
 source/blender/blenlib/BLI_kdtree_impl.h      |  5 ++
 source/blender/blenlib/BLI_map_slots.hh       |  1 +
 .../blenlib/BLI_math_axis_angle_types.hh      |  1 -
 source/blender/blenlib/BLI_math_base.h        | 47 ++--------------
 source/blender/blenlib/BLI_math_base_safe.h   |  2 +-
 source/blender/blenlib/BLI_math_bits.h        |  2 +-
 source/blender/blenlib/BLI_math_color.hh      |  3 -
 source/blender/blenlib/BLI_math_color_blend.h |  9 ++-
 source/blender/blenlib/BLI_math_constants.h   | 49 ++++++++++++++++
 source/blender/blenlib/BLI_math_geom.h        |  2 +-
 source/blender/blenlib/BLI_math_matrix.h      |  1 -
 source/blender/blenlib/BLI_math_matrix.hh     |  1 +
 .../blender/blenlib/BLI_math_matrix_types.hh  |  4 +-
 source/blender/blenlib/BLI_math_rotation.h    |  2 +-
 .../blenlib/BLI_math_rotation_types.hh        | 10 ++--
 source/blender/blenlib/BLI_math_solvers.h     |  1 -
 source/blender/blenlib/BLI_math_statistics.h  |  2 +-
 source/blender/blenlib/BLI_math_vector.h      |  2 +-
 source/blender/blenlib/BLI_math_vector.hh     |  1 -
 .../blender/blenlib/BLI_math_vector_types.hh  |  2 -
 source/blender/blenlib/BLI_memarena.h         |  2 +
 source/blender/blenlib/BLI_memblock.h         |  1 +
 source/blender/blenlib/BLI_memory_counter.hh  |  2 -
 source/blender/blenlib/BLI_memory_utils.h     |  2 +
 source/blender/blenlib/BLI_memory_utils.hh    |  1 -
 source/blender/blenlib/BLI_mempool.h          |  1 -
 source/blender/blenlib/BLI_mesh_intersect.hh  |  1 -
 source/blender/blenlib/BLI_noise.h            |  2 +
 .../blenlib/BLI_polyfill_2d_beautify.h        |  2 +
 source/blender/blenlib/BLI_quadric.h          |  2 +
 source/blender/blenlib/BLI_scanfill.h         |  4 ++
 source/blender/blenlib/BLI_set_slots.hh       |  1 +
 source/blender/blenlib/BLI_stack.h            |  2 +
 .../blender/blenlib/BLI_string_cursor_utf8.h  |  2 +
 source/blender/blenlib/BLI_sys_types.h        | 16 +++---
 source/blender/blenlib/BLI_timecode.h         |  2 +
 source/blender/blenlib/BLI_utildefines.h      |  2 +-
 .../blender/blenlib/BLI_vector_set_slots.hh   |  2 +-
 source/blender/blenlib/CMakeLists.txt         |  1 +
 .../blenlib/intern/BLI_mempool_private.h      |  4 --
 .../blender/blenlib/intern/math_base_inline.c |  5 +-
 .../blenlib/intern/math_color_blend_inline.c  | 14 ++++-
 source/blender/blenlib/intern/math_vector.cc  |  1 +
 .../blenlib/intern/math_vector_inline.c       |  3 +
 source/blender/blenlib/intern/task_pool.cc    |  1 +
 .../blenlib/tests/BLI_math_matrix_test.cc     |  1 +
 .../tests/BLI_math_rotation_types_test.cc     |  1 +
 source/blender/blenloader/BLO_writefile.hh    |  2 +
 .../blenloader/intern/versioning_common.hh    |  2 +
 source/blender/bmesh/bmesh.hh                 | 56 +++++++++----------
 source/blender/bmesh/bmesh_class.hh           |  4 ++
 source/blender/bmesh/bmesh_tools.hh           | 28 +++++-----
 .../bmesh/intern/bmesh_callback_generic.hh    |  2 +
 .../blender/bmesh/intern/bmesh_construct.hh   |  2 +
 source/blender/bmesh/intern/bmesh_core.hh     |  4 ++
 source/blender/bmesh/intern/bmesh_delete.hh   |  2 +
 source/blender/bmesh/intern/bmesh_edgeloop.hh |  2 +
 source/blender/bmesh/intern/bmesh_error.hh    |  2 +
 source/blender/bmesh/intern/bmesh_inline.hh   |  5 ++
 source/blender/bmesh/intern/bmesh_interp.hh   |  2 +
 .../blender/bmesh/intern/bmesh_iterators.hh   |  3 +
 .../bmesh/intern/bmesh_iterators_inline.hh    |  3 +
 source/blender/bmesh/intern/bmesh_marking.hh  |  2 +
 source/blender/bmesh/intern/bmesh_mesh.hh     |  2 +
 .../bmesh/intern/bmesh_mesh_duplicate.hh      |  2 +
 .../bmesh/intern/bmesh_mesh_normals.hh        |  3 +
 .../bmesh/intern/bmesh_mesh_partial_update.cc |  1 +
 .../bmesh/intern/bmesh_mesh_partial_update.hh |  2 +
 .../bmesh/intern/bmesh_mesh_tessellate.hh     |  4 ++
 .../bmesh/intern/bmesh_mesh_validate.hh       |  2 +
 source/blender/bmesh/intern/bmesh_mods.hh     |  2 +
 .../bmesh/intern/bmesh_operator_api.hh        |  3 +
 .../bmesh/intern/bmesh_operator_api_inline.hh |  9 +++
 .../blender/bmesh/intern/bmesh_operators.hh   |  2 +
 source/blender/bmesh/intern/bmesh_polygon.hh  |  2 +
 .../bmesh/intern/bmesh_polygon_edgenet.hh     |  2 +
 source/blender/bmesh/intern/bmesh_private.hh  |  2 +
 source/blender/bmesh/intern/bmesh_query.cc    |  1 +
 source/blender/bmesh/intern/bmesh_query.hh    |  5 ++
 .../bmesh/intern/bmesh_query_inline.hh        |  6 ++
 source/blender/bmesh/intern/bmesh_query_uv.hh |  4 ++
 .../blender/bmesh/intern/bmesh_structure.hh   |  5 ++
 .../bmesh/intern/bmesh_structure_inline.hh    |  6 ++
 source/blender/bmesh/intern/bmesh_walkers.hh  |  2 +
 .../bmesh/intern/bmesh_walkers_private.hh     |  4 ++
 .../blender/bmesh/operators/bmo_dissolve.cc   |  3 +-
 source/blender/bmesh/operators/bmo_extrude.cc |  1 +
 .../bmesh/operators/bmo_join_triangles.cc     |  1 +
 source/blender/bmesh/operators/bmo_mirror.cc  |  2 +-
 .../bmesh/operators/bmo_rotate_edges.cc       |  2 +
 .../bmesh/operators/bmo_unsubdivide.cc        |  2 +-
 source/blender/bmesh/tools/bmesh_beautify.hh  |  2 +
 source/blender/bmesh/tools/bmesh_bevel.cc     |  1 +
 source/blender/bmesh/tools/bmesh_bevel.hh     |  2 +
 .../blender/bmesh/tools/bmesh_bisect_plane.hh |  2 +
 source/blender/bmesh/tools/bmesh_boolean.cc   |  1 +
 source/blender/bmesh/tools/bmesh_boolean.hh   |  6 ++
 source/blender/bmesh/tools/bmesh_decimate.hh  |  4 ++
 source/blender/bmesh/tools/bmesh_edgenet.hh   |  2 +
 source/blender/bmesh/tools/bmesh_edgesplit.hh |  2 +
 source/blender/bmesh/tools/bmesh_intersect.hh |  4 ++
 .../bmesh/tools/bmesh_intersect_edges.hh      |  4 ++
 source/blender/bmesh/tools/bmesh_path.hh      |  7 +++
 .../blender/bmesh/tools/bmesh_path_region.hh  |  4 ++
 .../bmesh/tools/bmesh_path_region_uv.hh       |  4 ++
 source/blender/bmesh/tools/bmesh_path_uv.hh   |  5 ++
 .../blender/bmesh/tools/bmesh_region_match.hh |  4 ++
 source/blender/bmesh/tools/bmesh_separate.hh  |  2 +
 .../blender/bmesh/tools/bmesh_triangulate.hh  |  2 +
 source/blender/bmesh/tools/bmesh_wireframe.cc |  1 +
 source/blender/bmesh/tools/bmesh_wireframe.hh |  2 +
 ..._morphological_distance_feather_weights.hh |  1 +
 .../COM_ocio_color_space_conversion_shader.hh |  4 ++
 .../COM_symmetric_blur_weights.hh             |  1 +
 .../COM_symmetric_separable_blur_weights.hh   |  1 +
 .../infos/compositor_cryptomatte_info.hh      |  2 +
 .../engines/compositor/compositor_engine.h    |  2 +
 .../draw/engines/eevee_next/eevee_lookdev.cc  |  4 +-
 .../draw/engines/eevee_next/eevee_lookdev.hh  | 21 +++++++
 .../draw/engines/eevee_next/eevee_pipeline.hh |  2 +
 .../draw/engines/eevee_next/eevee_view.hh     |  2 +
 .../draw/engines/eevee_next/eevee_volume.hh   |  4 ++
 .../draw/engines/eevee_next/eevee_world.hh    |  5 ++
 .../draw/engines/external/external_engine.h   |  3 +
 .../blender/draw/engines/image/image_engine.h |  2 +
 .../draw/engines/image/image_shader_params.hh |  2 +
 .../blender/draw/engines/image/image_space.hh |  6 ++
 .../draw/engines/image/image_space_image.hh   |  2 +
 .../draw/engines/image/image_space_node.hh    |  3 +
 .../blender/draw/engines/image/image_usage.hh |  5 ++
 .../draw/engines/overlay/overlay_engine.h     |  2 +
 .../engines/overlay/overlay_next_facing.hh    |  2 +
 .../overlay/overlay_next_mode_transfer.hh     |  2 +
 .../engines/overlay/overlay_next_sculpt.hh    |  1 +
 .../engines/overlay/overlay_next_wireframe.hh |  1 +
 .../engines/workbench/workbench_engine.cc     |  9 ++-
 .../draw/engines/workbench/workbench_engine.h |  2 +
 source/blender/draw/intern/draw_debug.hh      |  1 -
 .../blender/draw/intern/draw_instance_data.hh |  3 -
 source/blender/draw/intern/draw_manager.hh    |  2 -
 source/blender/draw/intern/draw_manager_c.hh  |  3 -
 source/blender/draw/intern/draw_view.hh       |  1 -
 source/blender/draw/intern/draw_view_data.hh  |  5 +-
 .../extract_mesh_vbo_mesh_analysis.cc         |  1 +
 .../blender/editors/animation/anim_intern.hh  |  1 +
 .../editors/armature/armature_intern.hh       | 11 +++-
 .../blender/editors/asset/ED_asset_filter.hh  |  3 +
 .../blender/editors/asset/ED_asset_handle.hh  |  3 -
 .../blender/editors/asset/ED_asset_import.hh  |  2 -
 .../blender/editors/asset/ED_asset_library.hh |  2 +
 source/blender/editors/asset/ED_asset_list.hh |  2 -
 .../blender/editors/asset/ED_asset_shelf.hh   |  6 +-
 source/blender/editors/curve/curve_intern.hh  |  9 +++
 .../gizmo_library/gizmo_library_intern.hh     |  2 +
 .../editors/gpencil_legacy/gpencil_intern.hh  |  6 +-
 source/blender/editors/include/ED_armature.hh |  1 -
 source/blender/editors/include/ED_asset.hh    | 22 ++++----
 .../editors/include/ED_asset_menu_utils.hh    |  1 +
 source/blender/editors/include/ED_curve.hh    |  2 +
 .../editors/include/ED_grease_pencil.hh       |  2 +-
 .../editors/include/ED_id_management.hh       |  1 -
 source/blender/editors/include/ED_info.hh     |  3 +
 .../blender/editors/include/ED_keyframing.hh  |  1 -
 source/blender/editors/include/ED_markers.hh  |  1 +
 source/blender/editors/include/ED_mask.hh     |  3 +
 source/blender/editors/include/ED_mesh.hh     |  1 +
 .../editors/include/ED_node_preview.hh        |  9 ++-
 source/blender/editors/include/ED_numinput.hh |  1 +
 .../editors/include/ED_object_vgroup.hh       |  6 +-
 source/blender/editors/include/ED_paint.hh    |  3 +
 source/blender/editors/include/ED_particle.hh |  1 +
 source/blender/editors/include/ED_physics.hh  |  1 +
 source/blender/editors/include/ED_screen.hh   |  4 --
 .../editors/include/ED_screen_types.hh        |  2 +-
 source/blender/editors/include/ED_sculpt.hh   |  6 +-
 .../editors/include/ED_select_utils.hh        |  2 +
 .../blender/editors/include/ED_space_api.hh   |  1 +
 .../editors/include/ED_time_scrub_ui.hh       |  5 +-
 source/blender/editors/include/ED_undo.hh     |  4 +-
 source/blender/editors/include/ED_util.hh     |  1 -
 .../blender/editors/include/ED_util_imbuf.hh  |  3 -
 source/blender/editors/include/ED_uvedit.hh   |  3 +
 .../blender/editors/include/UI_interface.hh   |  2 +-
 .../eyedroppers/eyedropper_intern.hh          |  6 ++
 .../regions/interface_regions_intern.hh       |  4 ++
 .../blender/editors/io/io_drop_import_file.hh |  2 +
 .../blender/editors/lattice/lattice_intern.hh |  2 +
 source/blender/editors/mask/mask_intern.hh    |  6 ++
 source/blender/editors/mesh/editmesh_undo.cc  |  2 +
 .../blender/editors/render/render_intern.hh   |  1 +
 .../blender/editors/screen/screen_intern.hh   |  3 +
 .../grease_pencil_sculpt_strength.cc          |  1 +
 .../editors/sculpt_paint/sculpt_color.hh      |  1 +
 .../editors/sculpt_paint/sculpt_geodesic.hh   |  2 +
 .../editors/sculpt_paint/sculpt_pose.hh       |  8 ++-
 .../editors/space_action/action_intern.hh     |  2 +
 .../editors/space_buttons/buttons_intern.hh   |  1 +
 .../blender/editors/space_clip/clip_intern.hh |  1 +
 .../editors/space_console/console_intern.hh   |  2 +
 .../blender/editors/space_file/file_intern.hh |  2 +
 source/blender/editors/space_file/filelist.hh |  5 ++
 source/blender/editors/space_file/fsmenu.h    |  8 +--
 .../editors/space_image/image_intern.hh       |  1 +
 .../blender/editors/space_info/info_intern.hh |  1 +
 source/blender/editors/space_info/textview.hh |  4 ++
 .../blender/editors/space_nla/nla_intern.hh   | 10 ++++
 .../editors/space_outliner/outliner_intern.hh |  2 +
 .../tree/tree_element_anim_data.hh            |  2 +
 .../tree/tree_element_collection.hh           |  2 +
 .../tree/tree_element_constraint.hh           |  1 +
 .../tree/tree_element_driver.hh               |  2 +
 .../tree/tree_element_id_collection.hh        |  2 +
 .../tree/tree_element_id_curve.hh             |  2 +
 .../tree/tree_element_id_gpencil_legacy.hh    |  2 +
 .../tree/tree_element_id_object.hh            |  2 +
 .../tree/tree_element_id_scene.hh             |  2 +
 .../tree/tree_element_id_texture.hh           |  2 +
 .../tree/tree_element_layer_collection.hh     |  2 +
 .../space_outliner/tree/tree_element_nla.hh   |  2 +
 .../tree/tree_element_particle_system.hh      |  1 +
 .../space_outliner/tree/tree_element_pose.hh  |  1 +
 .../tree/tree_element_view_collection.hh      |  2 +
 .../tree/tree_element_view_layer.hh           |  3 +
 .../editors/space_script/script_intern.hh     |  3 +
 .../space_spreadsheet/spreadsheet_intern.hh   |  3 +
 .../blender/editors/space_text/text_format.hh |  2 +
 .../editors/space_view3d/view3d_navigate.hh   |  4 ++
 .../space_view3d/view3d_navigate_view_axis.cc |  3 +-
 .../view3d_navigate_view_orbit.cc             |  3 +-
 .../space_view3d/view3d_navigate_view_pan.cc  |  2 -
 source/blender/editors/transform/transform.hh |  1 -
 .../transform/transform_constraints.hh        |  2 +
 .../editors/transform/transform_convert.hh    |  2 +
 .../transform/transform_draw_cursors.hh       |  2 +
 .../editors/transform/transform_mode.hh       |  4 ++
 .../editors/transform/transform_snap.hh       |  2 +
 .../transform/transform_snap_object.hh        | 18 ++++++
 source/blender/geometry/GEO_mesh_boolean.hh   |  1 +
 source/blender/geometry/GEO_smooth_curves.hh  |  2 +
 .../intern/mesh_primitive_cylinder_cone.cc    |  2 +
 .../intern/mesh_primitive_uv_sphere.cc        |  2 +
 source/blender/gpu/CMakeLists.txt             |  3 +-
 .../gpu/intern/gpu_shader_create_info.cc      |  7 +++
 .../gpu/intern/gpu_shader_create_info.hh      | 30 +++++++---
 source/blender/imbuf/IMB_metadata.hh          |  2 +
 source/blender/imbuf/IMB_thumbs.hh            |  2 +
 source/blender/imbuf/intern/transform.cc      |  2 +-
 source/blender/io/collada/ArmatureExporter.h  |  9 +--
 .../blender/io/collada/ArmatureImporter.cpp   |  2 +
 source/blender/io/collada/ArmatureImporter.h  |  1 -
 source/blender/io/collada/MeshImporter.h      |  3 +-
 .../io/stl/exporter/stl_export_writer.hh      |  1 +
 source/blender/io/stl/importer/stl_import.hh  |  2 +
 .../wavefront_obj/exporter/obj_export_mesh.cc |  2 -
 .../wavefront_obj/exporter/obj_export_mtl.cc  |  2 -
 .../exporter/obj_export_nurbs.hh              |  5 ++
 .../wavefront_obj/importer/obj_import_mesh.hh |  1 +
 .../importer/obj_import_nurbs.hh              |  2 +
 .../wavefront_obj/tests/obj_exporter_tests.cc |  1 -
 .../wavefront_obj/tests/obj_importer_tests.cc |  4 +-
 .../blender/makesdna/DNA_fileglobal_types.h   |  2 +
 .../makesdna/DNA_node_tree_interface_types.h  |  2 +-
 source/blender/makesdna/DNA_scene_enums.h     |  2 +
 source/blender/makesdna/DNA_sdna_types.h      |  2 +
 source/blender/makesdna/intern/dna_defaults.c |  2 +
 source/blender/makesdna/intern/dna_genfile.cc |  1 -
 source/blender/makesdna/intern/dna_utils.h    |  2 +
 source/blender/makesrna/intern/rna_ID.cc      | 10 +---
 source/blender/makesrna/intern/rna_access.cc  |  7 +--
 .../intern/rna_access_compare_override.cc     |  3 -
 source/blender/makesrna/intern/rna_action.cc  |  5 --
 .../blender/makesrna/intern/rna_action_api.cc |  5 --
 .../blender/makesrna/intern/rna_animation.cc  | 13 +----
 .../blender/makesrna/intern/rna_modifier.cc   |  3 +
 source/blender/modifiers/MOD_nodes.hh         |  3 +
 .../modifiers/intern/MOD_datatransfer.cc      |  3 +-
 .../modifiers/intern/MOD_meshcache_util.hh    |  2 +
 source/blender/modifiers/intern/MOD_ocean.cc  |  4 +-
 .../modifiers/intern/MOD_solidify_util.hh     |  4 ++
 .../modifiers/intern/MOD_weightvg_util.hh     |  3 +
 .../modifiers/intern/MOD_weightvgmix.cc       |  2 +
 .../intern/lineart/lineart_intern.hh          |  2 +
 source/blender/nodes/NOD_socket_items_ui.hh   |  4 ++
 .../node_geo_input_mesh_edge_neighbors.cc     |  2 +-
 .../node_geo_input_mesh_edge_vertices.cc      |  2 +-
 .../node_geo_input_mesh_face_is_planar.cc     |  2 +-
 .../node_geo_input_shortest_edge_paths.cc     |  2 -
 .../nodes/node_geo_instance_on_points.cc      |  1 -
 .../nodes/node_geo_instances_to_points.cc     |  1 -
 .../geometry/nodes/node_geo_menu_switch.cc    |  4 --
 .../node_geo_mesh_face_group_boundaries.cc    |  2 +-
 source/blender/nodes/intern/node_util.hh      |  2 +
 .../nodes/shader/materialx/node_item.h        |  2 -
 source/blender/python/BPY_extern.hh           |  4 +-
 source/blender/python/bmesh/bmesh_py_api.cc   |  2 -
 source/blender/python/bmesh/bmesh_py_api.hh   |  2 +
 .../blender/python/bmesh/bmesh_py_geometry.cc |  2 -
 .../blender/python/bmesh/bmesh_py_geometry.hh |  2 +
 source/blender/python/bmesh/bmesh_py_ops.cc   |  1 -
 source/blender/python/bmesh/bmesh_py_ops.hh   |  2 +
 .../blender/python/bmesh/bmesh_py_ops_call.cc |  1 -
 .../blender/python/bmesh/bmesh_py_ops_call.hh |  2 +
 source/blender/python/bmesh/bmesh_py_types.cc |  4 +-
 source/blender/python/bmesh/bmesh_py_types.hh |  4 ++
 .../python/bmesh/bmesh_py_types_customdata.hh |  4 ++
 .../python/bmesh/bmesh_py_types_meshdata.hh   |  4 ++
 .../python/bmesh/bmesh_py_types_select.hh     |  4 ++
 source/blender/python/bmesh/bmesh_py_utils.hh |  2 +
 source/blender/python/generic/bgl.cc          |  4 --
 source/blender/python/generic/bgl.hh          |  2 +
 .../blender/python/generic/bl_math_py_api.hh  |  2 +
 .../blender/python/generic/idprop_py_api.hh   |  2 +
 .../python/generic/idprop_py_ui_api.cc        |  2 -
 .../python/generic/idprop_py_ui_api.hh        |  2 +
 source/blender/python/generic/imbuf_py_api.cc |  2 -
 source/blender/python/generic/imbuf_py_api.hh |  2 +
 source/blender/python/generic/py_capi_rna.hh  |  2 +-
 .../blender/python/generic/py_capi_utils.cc   |  8 ---
 .../blender/python/generic/py_capi_utils.hh   |  3 +-
 .../blender/python/generic/python_compat.hh   |  2 +
 .../python/generic/python_utildefines.hh      |  2 +
 source/blender/python/gpu/gpu_py.hh           |  2 +
 source/blender/python/gpu/gpu_py_api.cc       |  2 -
 source/blender/python/gpu/gpu_py_api.hh       |  2 +
 source/blender/python/gpu/gpu_py_batch.hh     |  2 +
 source/blender/python/gpu/gpu_py_buffer.hh    |  2 +
 .../blender/python/gpu/gpu_py_capabilities.cc |  2 -
 .../blender/python/gpu/gpu_py_capabilities.hh |  2 +
 source/blender/python/gpu/gpu_py_compute.cc   |  2 -
 source/blender/python/gpu/gpu_py_compute.hh   |  2 +
 source/blender/python/gpu/gpu_py_element.hh   |  2 +
 .../blender/python/gpu/gpu_py_framebuffer.hh  |  2 +
 source/blender/python/gpu/gpu_py_matrix.cc    |  2 -
 source/blender/python/gpu/gpu_py_matrix.hh    |  2 +
 source/blender/python/gpu/gpu_py_offscreen.cc |  1 -
 source/blender/python/gpu/gpu_py_offscreen.hh |  2 +
 source/blender/python/gpu/gpu_py_platform.cc  |  2 -
 source/blender/python/gpu/gpu_py_platform.hh  |  2 +
 source/blender/python/gpu/gpu_py_select.cc    |  2 -
 source/blender/python/gpu/gpu_py_select.hh    |  2 +
 source/blender/python/gpu/gpu_py_shader.hh    |  2 +
 .../python/gpu/gpu_py_shader_create_info.cc   |  1 -
 source/blender/python/gpu/gpu_py_state.hh     |  2 +
 source/blender/python/gpu/gpu_py_texture.hh   |  2 +
 source/blender/python/gpu/gpu_py_types.hh     | 22 ++++----
 .../python/gpu/gpu_py_uniformbuffer.hh        |  2 +
 .../python/gpu/gpu_py_vertex_buffer.cc        |  3 -
 .../python/gpu/gpu_py_vertex_buffer.hh        |  2 +
 .../python/gpu/gpu_py_vertex_format.hh        |  2 +
 source/blender/python/intern/bpy.hh           |  2 +
 source/blender/python/intern/bpy_app.cc       |  3 -
 source/blender/python/intern/bpy_app.hh       |  2 +
 .../blender/python/intern/bpy_app_alembic.hh  |  2 +
 .../python/intern/bpy_app_build_options.hh    |  2 +
 .../blender/python/intern/bpy_app_ffmpeg.hh   |  2 +
 .../blender/python/intern/bpy_app_handlers.cc |  2 -
 .../blender/python/intern/bpy_app_handlers.hh |  2 +
 source/blender/python/intern/bpy_app_icons.cc |  2 -
 source/blender/python/intern/bpy_app_icons.hh |  2 +
 source/blender/python/intern/bpy_app_ocio.hh  |  2 +
 source/blender/python/intern/bpy_app_oiio.hh  |  2 +
 .../python/intern/bpy_app_opensubdiv.hh       |  2 +
 .../blender/python/intern/bpy_app_openvdb.hh  |  2 +
 source/blender/python/intern/bpy_app_sdl.hh   |  2 +
 .../blender/python/intern/bpy_app_timers.hh   |  2 +
 .../python/intern/bpy_app_translations.cc     |  2 -
 .../python/intern/bpy_app_translations.hh     |  2 +
 source/blender/python/intern/bpy_app_usd.hh   |  2 +
 .../blender/python/intern/bpy_capi_utils.cc   |  3 -
 .../blender/python/intern/bpy_cli_command.cc  |  3 -
 .../blender/python/intern/bpy_cli_command.hh  |  2 +
 source/blender/python/intern/bpy_driver.cc    |  1 -
 source/blender/python/intern/bpy_driver.hh    |  2 +
 .../blender/python/intern/bpy_gizmo_wrap.cc   |  2 -
 source/blender/python/intern/bpy_interface.cc |  6 --
 .../python/intern/bpy_interface_atexit.cc     |  2 -
 .../python/intern/bpy_interface_run.cc        |  1 -
 .../python/intern/bpy_intern_string.hh        |  2 +
 source/blender/python/intern/bpy_library.hh   |  2 +
 .../blender/python/intern/bpy_library_load.cc |  2 -
 .../python/intern/bpy_library_write.cc        |  3 -
 source/blender/python/intern/bpy_msgbus.cc    |  2 -
 source/blender/python/intern/bpy_msgbus.hh    |  2 +
 source/blender/python/intern/bpy_operator.cc  |  4 --
 source/blender/python/intern/bpy_operator.hh  |  2 +
 .../python/intern/bpy_operator_wrap.cc        |  2 -
 .../python/intern/bpy_operator_wrap.hh        |  2 +
 source/blender/python/intern/bpy_path.cc      |  2 -
 source/blender/python/intern/bpy_path.hh      |  2 +
 source/blender/python/intern/bpy_props.hh     |  4 ++
 source/blender/python/intern/bpy_rna.cc       |  2 -
 source/blender/python/intern/bpy_rna.hh       |  2 +
 source/blender/python/intern/bpy_rna_anim.cc  |  1 -
 source/blender/python/intern/bpy_rna_anim.hh  |  4 ++
 .../blender/python/intern/bpy_rna_callback.hh |  2 +
 .../blender/python/intern/bpy_rna_context.hh  |  2 +
 source/blender/python/intern/bpy_rna_data.cc  |  1 -
 source/blender/python/intern/bpy_rna_data.hh  |  2 +
 .../blender/python/intern/bpy_rna_driver.cc   |  4 --
 .../blender/python/intern/bpy_rna_driver.hh   |  2 +
 source/blender/python/intern/bpy_rna_gizmo.hh |  2 +
 .../python/intern/bpy_rna_id_collection.cc    |  1 -
 .../python/intern/bpy_rna_id_collection.hh    |  2 +
 .../blender/python/intern/bpy_rna_operator.cc |  2 -
 .../blender/python/intern/bpy_rna_operator.hh |  2 +
 source/blender/python/intern/bpy_rna_text.hh  |  2 +
 .../python/intern/bpy_rna_types_capi.cc       |  2 -
 source/blender/python/intern/bpy_rna_ui.hh    |  2 +
 .../python/intern/bpy_utils_previews.cc       |  4 --
 .../python/intern/bpy_utils_previews.hh       |  2 +
 .../blender/python/intern/bpy_utils_units.hh  |  2 +
 source/blender/python/intern/stubs.cc         |  2 -
 source/blender/python/mathutils/mathutils.cc  |  1 -
 source/blender/python/mathutils/mathutils.hh  | 13 +++--
 .../python/mathutils/mathutils_Color.hh       |  4 ++
 .../python/mathutils/mathutils_Euler.cc       |  1 -
 .../python/mathutils/mathutils_Euler.hh       |  4 ++
 .../python/mathutils/mathutils_Matrix.hh      |  4 ++
 .../python/mathutils/mathutils_Quaternion.hh  |  4 ++
 .../python/mathutils/mathutils_Vector.hh      |  4 ++
 .../python/mathutils/mathutils_bvhtree.hh     |  2 +
 .../python/mathutils/mathutils_geometry.cc    |  2 +-
 .../python/mathutils/mathutils_geometry.hh    |  2 +
 .../python/mathutils/mathutils_interpolate.cc |  1 -
 .../python/mathutils/mathutils_interpolate.hh |  2 +
 .../python/mathutils/mathutils_kdtree.hh      |  2 +
 .../python/mathutils/mathutils_noise.hh       |  2 +
 source/blender/render/RE_bake.h               |  2 +
 source/blender/render/RE_compositor.hh        |  2 -
 source/blender/render/RE_multires_bake.h      |  4 ++
 source/blender/render/RE_pipeline.h           |  2 -
 source/blender/render/intern/texture_image.cc |  2 +-
 .../blender/render/intern/tile_highlight.cc   |  3 +-
 source/blender/render/intern/tile_highlight.h |  3 +-
 source/blender/sequencer/SEQ_animation.hh     |  1 -
 source/blender/sequencer/SEQ_edit.hh          |  1 +
 source/blender/sequencer/SEQ_effects.hh       |  3 +
 source/blender/sequencer/SEQ_iterator.hh      |  2 +
 source/blender/sequencer/SEQ_proxy.hh         |  2 +
 source/blender/sequencer/SEQ_relations.hh     |  2 +
 .../blender/sequencer/SEQ_thumbnail_cache.hh  |  4 --
 source/blender/sequencer/SEQ_transform.hh     |  2 +
 .../intern/effects/vse_effect_wipe.cc         |  1 -
 .../blender/sequencer/intern/image_cache.cc   |  3 +-
 source/blender/sequencer/intern/iterator.cc   |  2 -
 source/blender/sequencer/intern/multiview.cc  |  2 -
 source/blender/sequencer/intern/multiview.hh  |  3 +
 source/blender/sequencer/intern/prefetch.cc   |  2 +-
 source/blender/sequencer/intern/proxy.hh      |  1 +
 source/blender/sequencer/intern/render.hh     |  1 +
 .../sequencer/intern/sequence_lookup.cc       |  1 -
 source/blender/sequencer/intern/sequencer.cc  |  3 -
 source/blender/sequencer/intern/sequencer.hh  |  4 +-
 .../blender/sequencer/intern/strip_connect.cc |  1 -
 .../sequencer/intern/strip_relations.cc       |  2 -
 .../sequencer/intern/strip_retiming.cc        |  1 -
 source/blender/sequencer/intern/strip_time.cc |  4 --
 .../sequencer/intern/strip_transform.cc       |  2 -
 source/blender/sequencer/intern/utils.cc      |  6 +-
 source/blender/sequencer/intern/utils.hh      |  1 +
 .../shader_fx/intern/FX_shader_blur.cc        |  3 -
 .../shader_fx/intern/FX_shader_colorize.cc    |  2 -
 .../shader_fx/intern/FX_shader_flip.cc        |  7 ---
 .../shader_fx/intern/FX_shader_glow.cc        |  5 --
 .../shader_fx/intern/FX_shader_pixel.cc       |  2 -
 .../blender/shader_fx/intern/FX_shader_rim.cc |  2 -
 .../shader_fx/intern/FX_shader_shadow.cc      |  6 --
 .../shader_fx/intern/FX_shader_swirl.cc       |  9 ---
 .../shader_fx/intern/FX_shader_util.cc        |  7 ---
 .../shader_fx/intern/FX_shader_wave.cc        |  7 ---
 .../blender/shader_fx/intern/FX_ui_common.cc  |  2 -
 .../blender/shader_fx/intern/FX_ui_common.h   |  6 +-
 .../intern/ConstrainedConjugateGradient.h     |  1 +
 .../simulation/intern/SIM_mass_spring.cc      |  2 -
 .../blender/simulation/intern/hair_volume.cc  |  7 ---
 .../simulation/intern/implicit_blender.cc     |  8 ---
 source/blender/windowmanager/WM_message.hh    |  2 +-
 source/blender/windowmanager/WM_types.hh      |  8 +--
 .../windowmanager/gizmo/WM_gizmo_api.hh       |  7 +++
 .../windowmanager/gizmo/WM_gizmo_types.hh     |  4 +-
 .../windowmanager/gizmo/intern/wm_gizmo.cc    |  2 -
 .../gizmo/intern/wm_gizmo_group.cc            |  2 -
 .../gizmo/intern/wm_gizmo_group_type.cc       |  1 -
 .../gizmo/intern/wm_gizmo_intern.hh           |  7 +++
 .../gizmo/intern/wm_gizmo_map.cc              |  2 -
 .../gizmo/intern/wm_gizmo_type.cc             |  1 -
 .../windowmanager/gizmo/wm_gizmo_fn.hh        | 10 +++-
 .../windowmanager/gizmo/wm_gizmo_wmapi.hh     |  6 ++
 source/blender/windowmanager/intern/wm.cc     |  6 +-
 .../windowmanager/intern/wm_cursors.cc        |  2 -
 .../windowmanager/intern/wm_dragdrop.cc       |  3 -
 .../blender/windowmanager/intern/wm_draw.cc   |  1 +
 .../windowmanager/intern/wm_event_query.cc    |  1 -
 .../windowmanager/intern/wm_event_system.cc   |  1 -
 .../blender/windowmanager/intern/wm_files.cc  |  6 +-
 .../windowmanager/intern/wm_files_link.cc     | 10 ----
 .../windowmanager/intern/wm_gesture_ops.cc    |  3 -
 .../windowmanager/intern/wm_init_exit.cc      |  1 -
 .../blender/windowmanager/intern/wm_keymap.cc |  2 -
 .../windowmanager/intern/wm_keymap_utils.cc   |  2 -
 .../windowmanager/intern/wm_operator_type.cc  |  5 --
 .../windowmanager/intern/wm_operator_utils.cc |  1 -
 .../windowmanager/intern/wm_operators.cc      |  4 --
 .../windowmanager/intern/wm_panel_type.cc     |  2 -
 .../windowmanager/intern/wm_platform.cc       |  4 +-
 .../windowmanager/intern/wm_playanim.cc       |  1 -
 .../windowmanager/intern/wm_splash_screen.cc  |  5 --
 .../blender/windowmanager/intern/wm_stereo.cc |  3 -
 .../windowmanager/intern/wm_tooltip.cc        |  1 -
 .../windowmanager/intern/wm_uilist_type.cc    |  1 -
 .../blender/windowmanager/intern/wm_window.cc |  9 ---
 .../intern/wm_message_bus_intern.hh           |  2 +
 .../message_bus/intern/wm_message_bus_rna.cc  |  1 -
 .../intern/wm_message_bus_static.cc           |  1 -
 .../message_bus/wm_message_bus.hh             |  4 +-
 source/blender/windowmanager/wm.hh            |  4 ++
 source/blender/windowmanager/wm_surface.hh    |  2 +
 .../windowmanager/xr/intern/wm_xr_intern.hh   |  5 ++
 642 files changed, 1248 insertions(+), 767 deletions(-)
 create mode 100644 source/blender/blenlib/BLI_math_constants.h

diff --git a/intern/eigen/eigen_capi.h b/intern/eigen/eigen_capi.h
index b9fe4570a93..564416d9b25 100644
--- a/intern/eigen/eigen_capi.h
+++ b/intern/eigen/eigen_capi.h
@@ -9,9 +9,9 @@
 #ifndef __EIGEN_C_API_H__
 #define __EIGEN_C_API_H__
 
-#include "intern/eigenvalues.h"
-#include "intern/linear_solver.h"
-#include "intern/matrix.h"
-#include "intern/svd.h"
+#include "intern/eigenvalues.h"    // IWYU pragma: export
+#include "intern/linear_solver.h"  // IWYU pragma: export
+#include "intern/matrix.h"         // IWYU pragma: export
+#include "intern/svd.h"            // IWYU pragma: export
 
 #endif /* __EIGEN_C_API_H__ */
diff --git a/source/blender/animrig/ANIM_action.hh b/source/blender/animrig/ANIM_action.hh
index 3fb3f2f2ed7..32313d0e5d1 100644
--- a/source/blender/animrig/ANIM_action.hh
+++ b/source/blender/animrig/ANIM_action.hh
@@ -18,7 +18,6 @@
 #include "BKE_action.hh"
 #include "BKE_anim_data.hh"
 
-#include "BLI_math_vector.hh"
 #include "BLI_span.hh"
 #include "BLI_string_ref.hh"
 #include "BLI_vector.hh"
diff --git a/source/blender/animrig/ANIM_action_iterators.hh b/source/blender/animrig/ANIM_action_iterators.hh
index 2a9cba12e3e..c13c57ea23a 100644
--- a/source/blender/animrig/ANIM_action_iterators.hh
+++ b/source/blender/animrig/ANIM_action_iterators.hh
@@ -10,9 +10,7 @@
 
 #pragma once
 
-#include <cstdint>
-
-#include "BLI_vector.hh"
+#include "BLI_function_ref.hh"
 #include "DNA_action_types.h"
 
 struct FCurve;
diff --git a/source/blender/animrig/ANIM_bone_collections.hh b/source/blender/animrig/ANIM_bone_collections.hh
index 222d0e63c96..9fae47d2577 100644
--- a/source/blender/animrig/ANIM_bone_collections.hh
+++ b/source/blender/animrig/ANIM_bone_collections.hh
@@ -17,7 +17,6 @@
 #include <stdbool.h>
 
 #include "BLI_map.hh"
-#include "BLI_math_bits.h"
 
 #include "BKE_armature.hh"
 
diff --git a/source/blender/animrig/ANIM_evaluation.hh b/source/blender/animrig/ANIM_evaluation.hh
index 682e2001897..c2d4c1619c3 100644
--- a/source/blender/animrig/ANIM_evaluation.hh
+++ b/source/blender/animrig/ANIM_evaluation.hh
@@ -12,10 +12,6 @@
 #include "BLI_map.hh"
 #include "BLI_string_ref.hh"
 
-#include "DNA_anim_types.h"
-
-#include "RNA_access.hh"
-
 #include "ANIM_action.hh"
 
 namespace blender::animrig {
diff --git a/source/blender/animrig/ANIM_keyframing.hh b/source/blender/animrig/ANIM_keyframing.hh
index bba14d1c7ae..5a6ce3a1782 100644
--- a/source/blender/animrig/ANIM_keyframing.hh
+++ b/source/blender/animrig/ANIM_keyframing.hh
@@ -11,12 +11,8 @@
 #pragma once
 
 #include <array>
-#include <string>
 
-#include "BLI_array.hh"
-#include "BLI_bit_span.hh"
 #include "BLI_string_ref.hh"
-#include "BLI_vector.hh"
 
 #include "DNA_anim_types.h"
 #include "DNA_windowmanager_types.h"
diff --git a/source/blender/animrig/ANIM_keyingsets.hh b/source/blender/animrig/ANIM_keyingsets.hh
index 200383a36a3..72881a4d882 100644
--- a/source/blender/animrig/ANIM_keyingsets.hh
+++ b/source/blender/animrig/ANIM_keyingsets.hh
@@ -10,6 +10,8 @@
 
 #pragma once
 
+#include "RNA_types.hh"
+
 struct KeyingSet;
 struct ExtensionRNA;
 /* Forward declaration for this struct which is declared a bit later. */
diff --git a/source/blender/animrig/intern/action_runtime.hh b/source/blender/animrig/intern/action_runtime.hh
index f92b1256ed3..388cc30b980 100644
--- a/source/blender/animrig/intern/action_runtime.hh
+++ b/source/blender/animrig/intern/action_runtime.hh
@@ -13,6 +13,7 @@
 #include "BLI_vector.hh"
 
 struct ID;
+struct Main;
 
 namespace blender::animrig {
 
diff --git a/source/blender/animrig/intern/bone_collections_internal.hh b/source/blender/animrig/intern/bone_collections_internal.hh
index 78b2bcfde66..0fd8059ec0f 100644
--- a/source/blender/animrig/intern/bone_collections_internal.hh
+++ b/source/blender/animrig/intern/bone_collections_internal.hh
@@ -11,7 +11,8 @@
 
 #pragma once
 
-#include <stdint.h>
+struct bArmature;
+struct BoneCollection;
 
 namespace blender::animrig::internal {
 
diff --git a/source/blender/animrig/intern/bone_collections_test.cc b/source/blender/animrig/intern/bone_collections_test.cc
index e8c1dbfe852..1695bdb200c 100644
--- a/source/blender/animrig/intern/bone_collections_test.cc
+++ b/source/blender/animrig/intern/bone_collections_test.cc
@@ -2,6 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "BLI_listbase.h"
 #include "BLI_string.h"
 
 #include "BLT_translation.hh"
diff --git a/source/blender/animrig/intern/evaluation_internal.hh b/source/blender/animrig/intern/evaluation_internal.hh
index 0d5ab53daed..e2597518a50 100644
--- a/source/blender/animrig/intern/evaluation_internal.hh
+++ b/source/blender/animrig/intern/evaluation_internal.hh
@@ -4,6 +4,13 @@
 
 #pragma once
 
+#include "ANIM_evaluation.hh"
+
+struct AnimationEvalContext;
+struct PointerRNA;
+struct Action;
+struct Layer;
+
 namespace blender::animrig::internal {
 
 /**
diff --git a/source/blender/asset_system/AS_asset_catalog_path.hh b/source/blender/asset_system/AS_asset_catalog_path.hh
index 31df4815438..06fe68a716a 100644
--- a/source/blender/asset_system/AS_asset_catalog_path.hh
+++ b/source/blender/asset_system/AS_asset_catalog_path.hh
@@ -10,7 +10,6 @@
 
 #include "BLI_function_ref.hh"
 #include "BLI_string_ref.hh"
-#include "BLI_sys_types.h"
 
 #include <string>
 
diff --git a/source/blender/blenfont/intern/blf_internal_types.hh b/source/blender/blenfont/intern/blf_internal_types.hh
index 35834bda0fc..157e5412bbe 100644
--- a/source/blender/blenfont/intern/blf_internal_types.hh
+++ b/source/blender/blenfont/intern/blf_internal_types.hh
@@ -11,6 +11,8 @@
 #include <atomic>
 #include <mutex>
 
+#include "DNA_vec_types.h"
+
 #include "BLF_api.hh"
 
 #include "BLI_map.hh"
@@ -19,8 +21,13 @@
 #include "GPU_texture.hh"
 #include "GPU_vertex_buffer.hh"
 
+#include <ft2build.h>
+
 struct ColorManagedDisplay;
 struct FontBLF;
+struct GlyphCacheBLF;
+struct GlyphBLF;
+
 namespace blender::gpu {
 class Batch;
 class VertBuf;
diff --git a/source/blender/blenkernel/BKE_action.hh b/source/blender/blenkernel/BKE_action.hh
index a50002db650..40a8a64e066 100644
--- a/source/blender/blenkernel/BKE_action.hh
+++ b/source/blender/blenkernel/BKE_action.hh
@@ -14,8 +14,6 @@
 #include "BLI_compiler_attrs.h"
 #include "BLI_function_ref.hh"
 
-#include "DNA_listBase.h"
-
 struct BlendDataReader;
 struct BlendLibReader;
 struct BlendWriter;
diff --git a/source/blender/blenkernel/BKE_anim_data.hh b/source/blender/blenkernel/BKE_anim_data.hh
index 95b4d6caf8c..de8881a5b2e 100644
--- a/source/blender/blenkernel/BKE_anim_data.hh
+++ b/source/blender/blenkernel/BKE_anim_data.hh
@@ -8,7 +8,6 @@
  * \ingroup bke
  */
 
-#include <functional>
 #include <optional>
 
 #include "BLI_function_ref.hh"
diff --git a/source/blender/blenkernel/BKE_anonymous_attribute_id.hh b/source/blender/blenkernel/BKE_anonymous_attribute_id.hh
index 5941ca47c51..204243f25f0 100644
--- a/source/blender/blenkernel/BKE_anonymous_attribute_id.hh
+++ b/source/blender/blenkernel/BKE_anonymous_attribute_id.hh
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "BLI_set.hh"
 #include "BLI_string_ref.hh"
 
 #include "BKE_attribute_filter.hh"
diff --git a/source/blender/blenkernel/BKE_armature.hh b/source/blender/blenkernel/BKE_armature.hh
index 7a161aef8f8..a541cb0c382 100644
--- a/source/blender/blenkernel/BKE_armature.hh
+++ b/source/blender/blenkernel/BKE_armature.hh
@@ -8,9 +8,10 @@
  * \ingroup bke
  */
 
+#include <optional>
+
 #include "BLI_bounds_types.hh"
 #include "BLI_function_ref.hh"
-#include "BLI_listbase.h"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_set.hh"
diff --git a/source/blender/blenkernel/BKE_asset.hh b/source/blender/blenkernel/BKE_asset.hh
index 56529bbf738..75b9f17976a 100644
--- a/source/blender/blenkernel/BKE_asset.hh
+++ b/source/blender/blenkernel/BKE_asset.hh
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "BLI_compiler_attrs.h"
-#include "BLI_utildefines.h"
 
 #include "DNA_asset_types.h"
 
diff --git a/source/blender/blenkernel/BKE_attribute.hh b/source/blender/blenkernel/BKE_attribute.hh
index 93fc94ae308..e99a68df3f4 100644
--- a/source/blender/blenkernel/BKE_attribute.hh
+++ b/source/blender/blenkernel/BKE_attribute.hh
@@ -9,13 +9,11 @@
 
 #include "BLI_function_ref.hh"
 #include "BLI_generic_pointer.hh"
-#include "BLI_generic_span.hh"
 #include "BLI_generic_virtual_array.hh"
 #include "BLI_offset_indices.hh"
 #include "BLI_set.hh"
 #include "BLI_struct_equality_utils.hh"
 
-#include "BKE_anonymous_attribute_id.hh"
 #include "BKE_attribute.h"
 #include "BKE_attribute_filters.hh"
 
diff --git a/source/blender/blenkernel/BKE_attribute_filter.hh b/source/blender/blenkernel/BKE_attribute_filter.hh
index 07f61c9651c..8f5aa561fb3 100644
--- a/source/blender/blenkernel/BKE_attribute_filter.hh
+++ b/source/blender/blenkernel/BKE_attribute_filter.hh
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "BLI_function_ref.hh"
 #include "BLI_string_ref.hh"
 
 namespace blender::bke {
diff --git a/source/blender/blenkernel/BKE_bake_data_block_id.hh b/source/blender/blenkernel/BKE_bake_data_block_id.hh
index 4df8b1a1ae0..d69f79a21e0 100644
--- a/source/blender/blenkernel/BKE_bake_data_block_id.hh
+++ b/source/blender/blenkernel/BKE_bake_data_block_id.hh
@@ -8,7 +8,9 @@
  * \ingroup bke
  */
 
-#include "BLI_string_ref.hh"
+#include <optional>
+#include <string>
+
 #include "BLI_struct_equality_utils.hh"
 #include "BLI_vector.hh"
 
diff --git a/source/blender/blenkernel/BKE_bake_data_block_map.hh b/source/blender/blenkernel/BKE_bake_data_block_map.hh
index d67e0da4f47..3765be124d7 100644
--- a/source/blender/blenkernel/BKE_bake_data_block_map.hh
+++ b/source/blender/blenkernel/BKE_bake_data_block_map.hh
@@ -8,15 +8,8 @@
  * \ingroup bke
  */
 
-#include <optional>
-
-#include "BLI_string_ref.hh"
-#include "BLI_struct_equality_utils.hh"
-
 #include "BKE_bake_data_block_id.hh"
 
-#include "DNA_ID_enums.h"
-
 namespace blender::bke::bake {
 
 /**
diff --git a/source/blender/blenkernel/BKE_blender.hh b/source/blender/blenkernel/BKE_blender.hh
index 8e442ce6c4b..43404629548 100644
--- a/source/blender/blenkernel/BKE_blender.hh
+++ b/source/blender/blenkernel/BKE_blender.hh
@@ -8,8 +8,6 @@
  * \brief Blender util stuff
  */
 
-#include "BLI_compiler_attrs.h"
-
 struct Main;
 struct UserDef;
 
diff --git a/source/blender/blenkernel/BKE_collection.hh b/source/blender/blenkernel/BKE_collection.hh
index 389b619159c..f3e7c8a9c1a 100644
--- a/source/blender/blenkernel/BKE_collection.hh
+++ b/source/blender/blenkernel/BKE_collection.hh
@@ -8,7 +8,6 @@
  * \ingroup bke
  */
 
-#include "BLI_compiler_compat.h"
 #include "BLI_ghash.h"
 #include "BLI_iterator.h"
 #include "BLI_sys_types.h"
diff --git a/source/blender/blenkernel/BKE_context.hh b/source/blender/blenkernel/BKE_context.hh
index 4ecb168e633..2359f2465f8 100644
--- a/source/blender/blenkernel/BKE_context.hh
+++ b/source/blender/blenkernel/BKE_context.hh
@@ -11,7 +11,6 @@
 #include <variant>
 
 #include "BLI_string_ref.hh"
-#include "BLI_utildefines.h"
 #include "BLI_vector.hh"
 
 #include "DNA_listBase.h"
diff --git a/source/blender/blenkernel/BKE_curve_legacy_convert.hh b/source/blender/blenkernel/BKE_curve_legacy_convert.hh
index 0319f6620e0..f43d5e3bafd 100644
--- a/source/blender/blenkernel/BKE_curve_legacy_convert.hh
+++ b/source/blender/blenkernel/BKE_curve_legacy_convert.hh
@@ -8,8 +8,7 @@
  * \ingroup bke
  */
 
-#include "BKE_curves.hh"
-
+struct ListBase;
 struct Curve;
 struct Curves;
 
diff --git a/source/blender/blenkernel/BKE_customdata.hh b/source/blender/blenkernel/BKE_customdata.hh
index 796f30f4d4a..a4f83343d02 100644
--- a/source/blender/blenkernel/BKE_customdata.hh
+++ b/source/blender/blenkernel/BKE_customdata.hh
@@ -9,14 +9,14 @@
 
 #pragma once
 
-#include "BLI_cpp_type.hh"
+#include <optional>
+
 #include "BLI_implicit_sharing.h"
 #include "BLI_memory_counter_fwd.hh"
 #include "BLI_set.hh"
 #include "BLI_span.hh"
 #include "BLI_string_ref.hh"
 #include "BLI_sys_types.h"
-#include "BLI_utildefines.h"
 #include "BLI_vector.hh"
 
 #include "BKE_volume_enums.hh"
diff --git a/source/blender/blenkernel/BKE_customdata_file.h b/source/blender/blenkernel/BKE_customdata_file.h
index 4a527d8cd11..03c0e2e9bcb 100644
--- a/source/blender/blenkernel/BKE_customdata_file.h
+++ b/source/blender/blenkernel/BKE_customdata_file.h
@@ -8,6 +8,8 @@
  * \ingroup bke
  */
 
+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenkernel/BKE_editmesh.hh b/source/blender/blenkernel/BKE_editmesh.hh
index 44666f5d964..c1129e88b47 100644
--- a/source/blender/blenkernel/BKE_editmesh.hh
+++ b/source/blender/blenkernel/BKE_editmesh.hh
@@ -17,8 +17,6 @@
 #include "BLI_array.hh"
 #include "BLI_math_vector_types.hh"
 
-#include "DNA_customdata_types.h"
-
 #include "bmesh.hh"
 
 struct BMLoop;
diff --git a/source/blender/blenkernel/BKE_global.hh b/source/blender/blenkernel/BKE_global.hh
index f33ad9dd117..b8d713e5d3f 100644
--- a/source/blender/blenkernel/BKE_global.hh
+++ b/source/blender/blenkernel/BKE_global.hh
@@ -11,7 +11,6 @@
  *   for every fresh Blender run.
  */
 
-#include "BLI_utildefines.h"
 #include "DNA_listBase.h"
 
 struct Main;
diff --git a/source/blender/blenkernel/BKE_grease_pencil.hh b/source/blender/blenkernel/BKE_grease_pencil.hh
index 170feb78cde..e6825b4f0f4 100644
--- a/source/blender/blenkernel/BKE_grease_pencil.hh
+++ b/source/blender/blenkernel/BKE_grease_pencil.hh
@@ -12,14 +12,12 @@
 #include <atomic>
 
 #include "BLI_color.hh"
-#include "BLI_function_ref.hh"
 #include "BLI_implicit_sharing_ptr.hh"
 #include "BLI_map.hh"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_offset_indices.hh"
 #include "BLI_shared_cache.hh"
-#include "BLI_utility_mixins.hh"
 #include "BLI_virtual_array_fwd.hh"
 
 #include "DNA_grease_pencil_types.h"
diff --git a/source/blender/blenkernel/BKE_image.hh b/source/blender/blenkernel/BKE_image.hh
index 5d280baee2c..eb599903fe9 100644
--- a/source/blender/blenkernel/BKE_image.hh
+++ b/source/blender/blenkernel/BKE_image.hh
@@ -8,12 +8,10 @@
  */
 
 #include "BLI_compiler_attrs.h"
-#include "BLI_utildefines.h"
-
-#include "BLI_rect.h"
 
 #include <optional>
 
+struct rcti;
 struct Depsgraph;
 struct GPUTexture;
 struct ID;
diff --git a/source/blender/blenkernel/BKE_image_format.hh b/source/blender/blenkernel/BKE_image_format.hh
index b24a71d3c6a..a9c7df7798d 100644
--- a/source/blender/blenkernel/BKE_image_format.hh
+++ b/source/blender/blenkernel/BKE_image_format.hh
@@ -8,6 +8,8 @@
  * \ingroup bke
  */
 
+#include <stddef.h>
+
 struct BlendDataReader;
 struct BlendWriter;
 struct ID;
diff --git a/source/blender/blenkernel/BKE_image_partial_update.hh b/source/blender/blenkernel/BKE_image_partial_update.hh
index d437f8e43ce..a6e77a03afa 100644
--- a/source/blender/blenkernel/BKE_image_partial_update.hh
+++ b/source/blender/blenkernel/BKE_image_partial_update.hh
@@ -15,10 +15,9 @@
 
 #pragma once
 
-#include "BLI_utildefines.h"
-
 #include "BLI_rect.h"
 
+#include "BKE_image.hh"
 #include "BKE_image_wrappers.hh"
 
 #include "DNA_image_types.h"
diff --git a/source/blender/blenkernel/BKE_keyconfig.h b/source/blender/blenkernel/BKE_keyconfig.h
index 4b42c90d0e0..9d7448e1919 100644
--- a/source/blender/blenkernel/BKE_keyconfig.h
+++ b/source/blender/blenkernel/BKE_keyconfig.h
@@ -7,6 +7,8 @@
  * \ingroup bke
  */
 
+#include "BLI_sys_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenkernel/BKE_lattice.hh b/source/blender/blenkernel/BKE_lattice.hh
index b0452d022d5..87fe627c043 100644
--- a/source/blender/blenkernel/BKE_lattice.hh
+++ b/source/blender/blenkernel/BKE_lattice.hh
@@ -13,7 +13,6 @@
 #include "BLI_bounds_types.hh"
 #include "BLI_compiler_attrs.h"
 #include "BLI_math_vector_types.hh"
-#include "BLI_sys_types.h"
 
 struct BMEditMesh;
 struct BPoint;
diff --git a/source/blender/blenkernel/BKE_lib_query.hh b/source/blender/blenkernel/BKE_lib_query.hh
index 7888896b811..d2f5c5f2725 100644
--- a/source/blender/blenkernel/BKE_lib_query.hh
+++ b/source/blender/blenkernel/BKE_lib_query.hh
@@ -22,7 +22,6 @@
 #include "DNA_ID.h"
 
 #include "BLI_function_ref.hh"
-#include "BLI_sys_types.h"
 
 #include <array>
 
diff --git a/source/blender/blenkernel/BKE_library.hh b/source/blender/blenkernel/BKE_library.hh
index e78cf1529a4..1e53c03a2e8 100644
--- a/source/blender/blenkernel/BKE_library.hh
+++ b/source/blender/blenkernel/BKE_library.hh
@@ -9,8 +9,6 @@
  * API to manage `Library` data-blocks.
  */
 
-#include "BLI_compiler_attrs.h"
-
 struct Library;
 struct Main;
 
diff --git a/source/blender/blenkernel/BKE_lightprobe.h b/source/blender/blenkernel/BKE_lightprobe.h
index bd139a73d70..0ad17473f7a 100644
--- a/source/blender/blenkernel/BKE_lightprobe.h
+++ b/source/blender/blenkernel/BKE_lightprobe.h
@@ -9,6 +9,8 @@
  * \brief General operations for probes.
  */
 
+#include "BLI_sys_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenkernel/BKE_main_idmap.hh b/source/blender/blenkernel/BKE_main_idmap.hh
index a59eac1590b..05707420b2e 100644
--- a/source/blender/blenkernel/BKE_main_idmap.hh
+++ b/source/blender/blenkernel/BKE_main_idmap.hh
@@ -18,7 +18,9 @@
  */
 
 #include "BLI_compiler_attrs.h"
+#include "BLI_sys_types.h"
 
+struct Library;
 struct ID;
 struct IDNameLib_Map;
 struct Main;
diff --git a/source/blender/blenkernel/BKE_mesh.hh b/source/blender/blenkernel/BKE_mesh.hh
index e72c8c41f62..24943910b1c 100644
--- a/source/blender/blenkernel/BKE_mesh.hh
+++ b/source/blender/blenkernel/BKE_mesh.hh
@@ -12,8 +12,8 @@
 #include "BLI_offset_indices.hh"
 #include "BLI_string_ref.hh"
 
-#include "BKE_mesh.h"
-#include "BKE_mesh_types.hh"
+#include "BKE_mesh.h"         // IWYU pragma: export
+#include "BKE_mesh_types.hh"  // IWYU pragma: export
 
 namespace blender::bke {
 
diff --git a/source/blender/blenkernel/BKE_mesh_fair.hh b/source/blender/blenkernel/BKE_mesh_fair.hh
index d18014481fc..3cfdfaa9ae8 100644
--- a/source/blender/blenkernel/BKE_mesh_fair.hh
+++ b/source/blender/blenkernel/BKE_mesh_fair.hh
@@ -12,7 +12,6 @@
 
 #include "BLI_math_vector_types.hh"
 #include "BLI_span.hh"
-#include "BLI_utildefines.h"
 
 struct Mesh;
 
diff --git a/source/blender/blenkernel/BKE_mesh_legacy_convert.hh b/source/blender/blenkernel/BKE_mesh_legacy_convert.hh
index b1300add930..439134a89fd 100644
--- a/source/blender/blenkernel/BKE_mesh_legacy_convert.hh
+++ b/source/blender/blenkernel/BKE_mesh_legacy_convert.hh
@@ -8,14 +8,13 @@
  * \ingroup bke
  */
 
-#include "BLI_resource_scope.hh"
 #include "BLI_span.hh"
-#include "BLI_utildefines.h"
 
 struct CustomData;
 struct Main;
 struct Mesh;
 struct MFace;
+struct CustomDataLayer;
 
 namespace blender::bke {
 
diff --git a/source/blender/blenkernel/BKE_mesh_legacy_derived_mesh.hh b/source/blender/blenkernel/BKE_mesh_legacy_derived_mesh.hh
index 5c54c27ce20..0a3d439979f 100644
--- a/source/blender/blenkernel/BKE_mesh_legacy_derived_mesh.hh
+++ b/source/blender/blenkernel/BKE_mesh_legacy_derived_mesh.hh
@@ -47,9 +47,7 @@
  *       as it is and stick with using BMesh and CDDM.
  */
 
-#include "BLI_compiler_attrs.h"
 #include "BLI_math_vector_types.hh"
-#include "BLI_span.hh"
 
 #include "DNA_customdata_types.h"
 
diff --git a/source/blender/blenkernel/BKE_mesh_remap.hh b/source/blender/blenkernel/BKE_mesh_remap.hh
index 4938c4b2748..f41e9f11b57 100644
--- a/source/blender/blenkernel/BKE_mesh_remap.hh
+++ b/source/blender/blenkernel/BKE_mesh_remap.hh
@@ -9,7 +9,6 @@
  */
 
 #include "BLI_math_matrix.h"
-#include "BLI_math_rotation.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_offset_indices.hh"
 
diff --git a/source/blender/blenkernel/BKE_mesh_runtime.hh b/source/blender/blenkernel/BKE_mesh_runtime.hh
index 7f166a722bd..93a16450842 100644
--- a/source/blender/blenkernel/BKE_mesh_runtime.hh
+++ b/source/blender/blenkernel/BKE_mesh_runtime.hh
@@ -9,6 +9,9 @@
  * This file contains access functions for the Mesh.runtime struct.
  */
 
+#include "BLI_math_vector_types.hh"
+#include "BLI_span.hh"
+
 struct BMEditMesh;
 struct CustomData_MeshMasks;
 struct Depsgraph;
diff --git a/source/blender/blenkernel/BKE_mesh_tangent.hh b/source/blender/blenkernel/BKE_mesh_tangent.hh
index 2823e88cbe2..ddf3952006f 100644
--- a/source/blender/blenkernel/BKE_mesh_tangent.hh
+++ b/source/blender/blenkernel/BKE_mesh_tangent.hh
@@ -14,6 +14,7 @@
 #include "BLI_sys_types.h"
 
 struct ReportList;
+struct Mesh;
 
 /**
  * Compute simplified tangent space normals, i.e.
diff --git a/source/blender/blenkernel/BKE_multires.hh b/source/blender/blenkernel/BKE_multires.hh
index 10cb76f04d6..a8e4c8ed8f6 100644
--- a/source/blender/blenkernel/BKE_multires.hh
+++ b/source/blender/blenkernel/BKE_multires.hh
@@ -215,4 +215,4 @@ BLI_INLINE void BKE_multires_construct_tangent_matrix(float tangent_matrix[3][3]
  */
 void multires_do_versions_simple_to_catmull_clark(Object *object, MultiresModifierData *mmd);
 
-#include "intern/multires_inline.hh"
+#include "intern/multires_inline.hh"  // IWYU pragma: export
diff --git a/source/blender/blenkernel/BKE_node.hh b/source/blender/blenkernel/BKE_node.hh
index 0d568e701de..f86a7afe002 100644
--- a/source/blender/blenkernel/BKE_node.hh
+++ b/source/blender/blenkernel/BKE_node.hh
@@ -10,11 +10,8 @@
 
 #include "BLI_compiler_compat.h"
 #include "BLI_ghash.h"
-#include "BLI_math_vector_types.hh"
 #include "BLI_span.hh"
 
-#include "DNA_listBase.h"
-
 #include "BKE_volume_enums.hh"
 
 /* for FOREACH_NODETREE_BEGIN */
diff --git a/source/blender/blenkernel/BKE_node_runtime.hh b/source/blender/blenkernel/BKE_node_runtime.hh
index c6de5535c88..d4756eec3ba 100644
--- a/source/blender/blenkernel/BKE_node_runtime.hh
+++ b/source/blender/blenkernel/BKE_node_runtime.hh
@@ -10,7 +10,6 @@
 #include "BLI_cache_mutex.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_multi_value_map.hh"
-#include "BLI_resource_scope.hh"
 #include "BLI_set.hh"
 #include "BLI_utility_mixins.hh"
 #include "BLI_vector.hh"
diff --git a/source/blender/blenkernel/BKE_node_socket_value.hh b/source/blender/blenkernel/BKE_node_socket_value.hh
index d26892e9367..ac939af4f26 100644
--- a/source/blender/blenkernel/BKE_node_socket_value.hh
+++ b/source/blender/blenkernel/BKE_node_socket_value.hh
@@ -11,7 +11,6 @@
 #include "DNA_node_types.h"
 
 #include "BLI_any.hh"
-#include "BLI_cpp_type.hh"
 #include "BLI_generic_pointer.hh"
 
 namespace blender::bke {
diff --git a/source/blender/blenkernel/BKE_node_tree_interface.hh b/source/blender/blenkernel/BKE_node_tree_interface.hh
index 67748d171b8..b451e906655 100644
--- a/source/blender/blenkernel/BKE_node_tree_interface.hh
+++ b/source/blender/blenkernel/BKE_node_tree_interface.hh
@@ -9,12 +9,10 @@
 
 #include "BKE_node.hh"
 
-#include <queue>
 #include <type_traits>
 
 #include "BLI_cache_mutex.hh"
 #include "BLI_parameter_pack_utils.hh"
-#include "BLI_vector.hh"
 #include "BLI_vector_set.hh"
 
 namespace blender::bke {
diff --git a/source/blender/blenkernel/BKE_paint_bvh.hh b/source/blender/blenkernel/BKE_paint_bvh.hh
index a16a08cc5df..6c8ae08debf 100644
--- a/source/blender/blenkernel/BKE_paint_bvh.hh
+++ b/source/blender/blenkernel/BKE_paint_bvh.hh
@@ -9,17 +9,13 @@
  * \brief A BVH for high poly meshes.
  */
 
-#include <optional>
-#include <string>
 #include <variant>
 
 #include "BLI_array.hh"
 #include "BLI_bit_group_vector.hh"
 #include "BLI_bit_vector.hh"
 #include "BLI_bounds_types.hh"
-#include "BLI_compiler_compat.h"
 #include "BLI_function_ref.hh"
-#include "BLI_generic_span.hh"
 #include "BLI_index_mask_fwd.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_offset_indices.hh"
@@ -28,6 +24,7 @@
 #include "BLI_string_ref.hh"
 #include "BLI_utildefines.h"
 #include "BLI_vector.hh"
+#include "BLI_vector_set.hh"
 
 struct BMFace;
 struct BMLog;
diff --git a/source/blender/blenkernel/BKE_paint_bvh_pixels.hh b/source/blender/blenkernel/BKE_paint_bvh_pixels.hh
index f447b12bd3b..adc9b7a2bc9 100644
--- a/source/blender/blenkernel/BKE_paint_bvh_pixels.hh
+++ b/source/blender/blenkernel/BKE_paint_bvh_pixels.hh
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "BLI_array.hh"
 #include "BLI_math_vector.hh"
 #include "BLI_rect.h"
 #include "BLI_vector.hh"
@@ -12,6 +13,7 @@
 
 #include "BKE_image.hh"
 #include "BKE_image_wrappers.hh"
+#include "BKE_paint_bvh.hh"
 
 #include "IMB_imbuf_types.hh"
 
diff --git a/source/blender/blenkernel/BKE_pointcloud.hh b/source/blender/blenkernel/BKE_pointcloud.hh
index 31d47ad47e7..db0b69d9020 100644
--- a/source/blender/blenkernel/BKE_pointcloud.hh
+++ b/source/blender/blenkernel/BKE_pointcloud.hh
@@ -9,8 +9,6 @@
  * \brief General operations for point clouds.
  */
 
-#include <mutex>
-
 #include "BLI_bounds_types.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_shared_cache.hh"
diff --git a/source/blender/blenkernel/BKE_preview_image.hh b/source/blender/blenkernel/BKE_preview_image.hh
index 83441621e9d..0b7eae25a43 100644
--- a/source/blender/blenkernel/BKE_preview_image.hh
+++ b/source/blender/blenkernel/BKE_preview_image.hh
@@ -8,8 +8,6 @@
 #include <memory>
 #include <optional>
 
-#include "BLI_sys_types.h"
-
 #include "DNA_ID_enums.h"
 
 struct BlendDataReader;
diff --git a/source/blender/blenkernel/BKE_report.hh b/source/blender/blenkernel/BKE_report.hh
index 792650c075d..f51373071d2 100644
--- a/source/blender/blenkernel/BKE_report.hh
+++ b/source/blender/blenkernel/BKE_report.hh
@@ -11,7 +11,6 @@
 #include <stdio.h>
 
 #include "BLI_compiler_attrs.h"
-#include "BLI_utildefines.h"
 #include "DNA_windowmanager_types.h"
 
 /**
diff --git a/source/blender/blenkernel/BKE_scene_runtime.hh b/source/blender/blenkernel/BKE_scene_runtime.hh
index bbb118a5c94..3d7e5140f03 100644
--- a/source/blender/blenkernel/BKE_scene_runtime.hh
+++ b/source/blender/blenkernel/BKE_scene_runtime.hh
@@ -8,6 +8,8 @@
 #include "BLI_timeit.hh"
 #include "BLI_utility_mixins.hh"
 
+#include "DNA_node_types.h"
+
 struct Depsgraph;
 
 namespace blender::bke {
diff --git a/source/blender/blenkernel/BKE_screen.hh b/source/blender/blenkernel/BKE_screen.hh
index 8700a606cd3..0bc7c18c2e1 100644
--- a/source/blender/blenkernel/BKE_screen.hh
+++ b/source/blender/blenkernel/BKE_screen.hh
@@ -13,9 +13,10 @@
 #include "BLI_compiler_attrs.h"
 #include "BLI_map.hh"
 #include "BLI_math_vector_types.hh"
-#include "BLI_rect.h"
 #include "BLI_vector.hh"
 
+#include "DNA_vec_types.h"
+
 #include "RNA_types.hh"
 
 #include "BKE_context.hh"
diff --git a/source/blender/blenkernel/BKE_sequencer_offscreen.h b/source/blender/blenkernel/BKE_sequencer_offscreen.h
index 616a2c26ba8..382798aa3e0 100644
--- a/source/blender/blenkernel/BKE_sequencer_offscreen.h
+++ b/source/blender/blenkernel/BKE_sequencer_offscreen.h
@@ -7,6 +7,10 @@
 /** \file
  * \ingroup bke
  */
+
+#include "DNA_object_enums.h"
+#include "DNA_view3d_enums.h"
+
 #include "IMB_imbuf_types.hh"
 
 #ifdef __cplusplus
diff --git a/source/blender/blenkernel/BKE_shrinkwrap.hh b/source/blender/blenkernel/BKE_shrinkwrap.hh
index f662130d2cd..e69cf06a39f 100644
--- a/source/blender/blenkernel/BKE_shrinkwrap.hh
+++ b/source/blender/blenkernel/BKE_shrinkwrap.hh
@@ -10,6 +10,7 @@
 /* Shrinkwrap stuff */
 #include "BKE_bvhutils.hh"
 
+#include "BKE_context.hh"
 #include "BLI_array.hh"
 #include "BLI_bit_vector.hh"
 #include "BLI_math_vector_types.hh"
@@ -29,6 +30,7 @@
  * (So that you don't have to pass an enormous amount of arguments to functions)
  */
 
+struct Depsgraph;
 struct BVHTree;
 struct MDeformVert;
 struct Mesh;
diff --git a/source/blender/blenkernel/BKE_subdiv.hh b/source/blender/blenkernel/BKE_subdiv.hh
index 774f2a42bba..078b6896ced 100644
--- a/source/blender/blenkernel/BKE_subdiv.hh
+++ b/source/blender/blenkernel/BKE_subdiv.hh
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "BLI_compiler_compat.h"
-#include "BLI_sys_types.h"
 
 struct Mesh;
 struct MultiresModifierData;
@@ -306,4 +305,4 @@ BLI_INLINE float crease_to_sharpness(float edge_crease);
 
 }  // namespace blender::bke::subdiv
 
-#include "intern/subdiv_inline.hh"
+#include "intern/subdiv_inline.hh"  // IWYU pragma: export
diff --git a/source/blender/blenkernel/BKE_subdiv_ccg.hh b/source/blender/blenkernel/BKE_subdiv_ccg.hh
index f820d62b4a7..8d11d667fdd 100644
--- a/source/blender/blenkernel/BKE_subdiv_ccg.hh
+++ b/source/blender/blenkernel/BKE_subdiv_ccg.hh
@@ -16,7 +16,6 @@
 #include "BLI_index_mask_fwd.hh"
 #include "BLI_offset_indices.hh"
 #include "BLI_span.hh"
-#include "BLI_sys_types.h"
 #include "BLI_utility_mixins.hh"
 #include "BLI_vector.hh"
 
diff --git a/source/blender/blenkernel/BKE_subdiv_deform.hh b/source/blender/blenkernel/BKE_subdiv_deform.hh
index 92c8a0e85d1..2aa71a9344c 100644
--- a/source/blender/blenkernel/BKE_subdiv_deform.hh
+++ b/source/blender/blenkernel/BKE_subdiv_deform.hh
@@ -10,7 +10,6 @@
 
 #include "BLI_math_vector_types.hh"
 #include "BLI_span.hh"
-#include "BLI_sys_types.h"
 
 struct Mesh;
 
diff --git a/source/blender/blenkernel/BKE_subdiv_eval.hh b/source/blender/blenkernel/BKE_subdiv_eval.hh
index f3af1f524f4..6cbb030b3b6 100644
--- a/source/blender/blenkernel/BKE_subdiv_eval.hh
+++ b/source/blender/blenkernel/BKE_subdiv_eval.hh
@@ -10,7 +10,6 @@
 
 #include "BLI_math_vector_types.hh"
 #include "BLI_span.hh"
-#include "BLI_sys_types.h"
 
 struct Mesh;
 struct OpenSubdiv_EvaluatorCache;
diff --git a/source/blender/blenkernel/BKE_subdiv_mesh.hh b/source/blender/blenkernel/BKE_subdiv_mesh.hh
index fa46fd02318..2565eb3dd1b 100644
--- a/source/blender/blenkernel/BKE_subdiv_mesh.hh
+++ b/source/blender/blenkernel/BKE_subdiv_mesh.hh
@@ -10,7 +10,6 @@
 
 #include "BLI_math_vector_types.hh"
 #include "BLI_offset_indices.hh"
-#include "BLI_sys_types.h"
 
 struct Mesh;
 
diff --git a/source/blender/blenkernel/BKE_subdiv_modifier.hh b/source/blender/blenkernel/BKE_subdiv_modifier.hh
index bf364cb667f..70d1c3f10d4 100644
--- a/source/blender/blenkernel/BKE_subdiv_modifier.hh
+++ b/source/blender/blenkernel/BKE_subdiv_modifier.hh
@@ -10,8 +10,6 @@
 
 #include "BKE_subdiv.hh"
 
-#include "BLI_sys_types.h"
-
 /* Hardcoded for until GPU shaders are automatically generated, then we will have a more
  * programmatic way of detecting this. */
 #define MAX_GPU_SUBDIV_SSBOS 12
diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index ef59f2597da..6a3946c1c8a 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -16,6 +16,7 @@ struct Text;
 struct TextLine;
 
 #include "BLI_compiler_attrs.h"
+#include "BLI_sys_types.h"
 
 /**
  * \note caller must handle `compiled` member.
diff --git a/source/blender/blenkernel/BKE_volume_enums.hh b/source/blender/blenkernel/BKE_volume_enums.hh
index 3817b52e8cf..f7b7d369d8c 100644
--- a/source/blender/blenkernel/BKE_volume_enums.hh
+++ b/source/blender/blenkernel/BKE_volume_enums.hh
@@ -8,6 +8,8 @@
  * \ingroup bli
  */
 
+#include <stdint.h>
+
 enum VolumeGridType : int8_t {
   VOLUME_GRID_UNKNOWN = 0,
   VOLUME_GRID_BOOLEAN,
diff --git a/source/blender/blenkernel/BKE_volume_grid_type_traits.hh b/source/blender/blenkernel/BKE_volume_grid_type_traits.hh
index 49605364b1e..c1be36f4ca5 100644
--- a/source/blender/blenkernel/BKE_volume_grid_type_traits.hh
+++ b/source/blender/blenkernel/BKE_volume_grid_type_traits.hh
@@ -10,7 +10,6 @@
 
 #ifdef WITH_OPENVDB
 
-#  include "BLI_math_quaternion_types.hh"
 #  include "BLI_math_vector_types.hh"
 
 #  include "BKE_volume_enums.hh"
diff --git a/source/blender/blenkernel/BKE_volume_openvdb.hh b/source/blender/blenkernel/BKE_volume_openvdb.hh
index 47cd65fcb52..2af01be05a5 100644
--- a/source/blender/blenkernel/BKE_volume_openvdb.hh
+++ b/source/blender/blenkernel/BKE_volume_openvdb.hh
@@ -16,6 +16,7 @@
 #  include "BLI_string_ref.hh"
 
 #  include "BKE_volume_enums.hh"
+#  include "BKE_volume_grid_fwd.hh"
 
 struct Volume;
 
diff --git a/source/blender/blenkernel/BKE_volume_render.hh b/source/blender/blenkernel/BKE_volume_render.hh
index aae351c352d..127f3c48c1e 100644
--- a/source/blender/blenkernel/BKE_volume_render.hh
+++ b/source/blender/blenkernel/BKE_volume_render.hh
@@ -9,8 +9,6 @@
  * \brief Volume data-block rendering and viewport drawing utilities.
  */
 
-#include "BLI_sys_types.h"
-
 #include "DNA_volume_types.h"
 
 #include "BKE_volume_enums.hh"
diff --git a/source/blender/blenkernel/BKE_volume_to_mesh.hh b/source/blender/blenkernel/BKE_volume_to_mesh.hh
index 1a1499aa508..9b0723776f5 100644
--- a/source/blender/blenkernel/BKE_volume_to_mesh.hh
+++ b/source/blender/blenkernel/BKE_volume_to_mesh.hh
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "BLI_math_vector_types.hh"
 #include "BLI_span.hh"
 
 #include "DNA_modifier_types.h"
diff --git a/source/blender/blenkernel/BKE_workspace.hh b/source/blender/blenkernel/BKE_workspace.hh
index 8a1d60a73c7..7b9396a1051 100644
--- a/source/blender/blenkernel/BKE_workspace.hh
+++ b/source/blender/blenkernel/BKE_workspace.hh
@@ -8,8 +8,14 @@
 
 #pragma once
 
+#include <string>
+
+#include "DNA_listBase.h"
+
 #include "BLI_compiler_attrs.h"
 
+#include "BLI_vector.hh"
+
 struct Main;
 struct bScreen;
 struct bToolRef;
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.cc b/source/blender/blenkernel/intern/CCGSubSurf.cc
index c50fb6c40d3..5822ba2bf78 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf.cc
+++ b/source/blender/blenkernel/intern/CCGSubSurf.cc
@@ -6,7 +6,6 @@
  * \ingroup bke
  */
 
-#include <cmath>
 #include <cstdlib>
 #include <cstring>
 
@@ -18,6 +17,7 @@
 #include "BKE_ccg.hh"
 #include "BKE_subsurf.hh"
 #include "CCGSubSurf.h"
+#include "CCGSubSurf_inline.h"
 #include "CCGSubSurf_intern.h"
 
 /***/
diff --git a/source/blender/blenkernel/intern/CCGSubSurf_inline.h b/source/blender/blenkernel/intern/CCGSubSurf_inline.h
index 59a05824ad0..a917b27065a 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf_inline.h
+++ b/source/blender/blenkernel/intern/CCGSubSurf_inline.h
@@ -8,7 +8,13 @@
 
 #pragma once
 
+#include "BLI_assert.h"
+#include "BLI_compiler_compat.h"
+
+#include "CCGSubSurf_intern.h"
+
 #include <math.h>
+#include <string.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/blenkernel/intern/CCGSubSurf_intern.h b/source/blender/blenkernel/intern/CCGSubSurf_intern.h
index 0f527c428ea..781407177c2 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf_intern.h
+++ b/source/blender/blenkernel/intern/CCGSubSurf_intern.h
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include "CCGSubSurf.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -264,5 +266,3 @@ void ccgSubSurf__dumpCoords(CCGSubSurf *ss);
 #ifdef __cplusplus
 }
 #endif
-
-#include "CCGSubSurf_inline.h"
diff --git a/source/blender/blenkernel/intern/CCGSubSurf_legacy.cc b/source/blender/blenkernel/intern/CCGSubSurf_legacy.cc
index 5ccb590a558..6eb1922a27c 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf_legacy.cc
+++ b/source/blender/blenkernel/intern/CCGSubSurf_legacy.cc
@@ -13,6 +13,7 @@
 #include "BLI_utildefines.h" /* for BLI_assert */
 
 #include "CCGSubSurf.h"
+#include "CCGSubSurf_inline.h"
 #include "CCGSubSurf_intern.h"
 
 #define FACE_calcIFNo(f, lvl, S, x, y, no) \
diff --git a/source/blender/blenkernel/intern/CCGSubSurf_util.cc b/source/blender/blenkernel/intern/CCGSubSurf_util.cc
index 5704994aee2..433992911de 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf_util.cc
+++ b/source/blender/blenkernel/intern/CCGSubSurf_util.cc
@@ -16,6 +16,7 @@
 #include "BLI_utildefines.h" /* for BLI_assert */
 
 #include "CCGSubSurf.h"
+#include "CCGSubSurf_inline.h"
 #include "CCGSubSurf_intern.h"
 
 /**
diff --git a/source/blender/blenkernel/intern/constraint.cc b/source/blender/blenkernel/intern/constraint.cc
index 956a5a1afdd..aa014164466 100644
--- a/source/blender/blenkernel/intern/constraint.cc
+++ b/source/blender/blenkernel/intern/constraint.cc
@@ -24,6 +24,7 @@
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
+#include "BLI_math_vector.hh"
 #include "BLI_string_utils.hh"
 #include "BLI_utildefines.h"
 #include "BLT_translation.hh"
diff --git a/source/blender/blenkernel/intern/crazyspace.cc b/source/blender/blenkernel/intern/crazyspace.cc
index 5191dd875a2..d1765d45447 100644
--- a/source/blender/blenkernel/intern/crazyspace.cc
+++ b/source/blender/blenkernel/intern/crazyspace.cc
@@ -15,6 +15,8 @@
 #include "BLI_linklist.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
+#include "BLI_math_vector_types.hh"
+#include "BLI_span.hh"
 #include "BLI_utildefines.h"
 
 #include "BKE_crazyspace.hh"
diff --git a/source/blender/blenkernel/intern/data_transfer.cc b/source/blender/blenkernel/intern/data_transfer.cc
index 118e1229d89..d47e49764b1 100644
--- a/source/blender/blenkernel/intern/data_transfer.cc
+++ b/source/blender/blenkernel/intern/data_transfer.cc
@@ -12,10 +12,10 @@
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 
-#include "BLI_blenlib.h"
+#include "BLI_math_base.h"
 #include "BLI_math_matrix.h"
+#include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_attribute.hh"
@@ -29,7 +29,6 @@
 #include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
-#include "BKE_object_deform.h"
 #include "BKE_report.hh"
 
 #include "DEG_depsgraph_query.hh"
diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc
index ef418b5ba36..2e67ba79b9e 100644
--- a/source/blender/blenkernel/intern/displist.cc
+++ b/source/blender/blenkernel/intern/displist.cc
@@ -19,6 +19,7 @@
 #include "BLI_index_range.hh"
 #include "BLI_listbase.h"
 #include "BLI_math_rotation.h"
+#include "BLI_math_vector.h"
 #include "BLI_memarena.h"
 #include "BLI_scanfill.h"
 #include "BLI_span.hh"
diff --git a/source/blender/blenkernel/intern/fluid.cc b/source/blender/blenkernel/intern/fluid.cc
index 8e6a45294ec..58083160c52 100644
--- a/source/blender/blenkernel/intern/fluid.cc
+++ b/source/blender/blenkernel/intern/fluid.cc
@@ -51,6 +51,7 @@
 
 #  include "BLI_kdopbvh.hh"
 #  include "BLI_kdtree.h"
+#  include "BLI_math_vector.hh"
 #  include "BLI_threads.h"
 #  include "BLI_voxel.h"
 
diff --git a/source/blender/blenkernel/intern/mesh_calc_edges.cc b/source/blender/blenkernel/intern/mesh_calc_edges.cc
index 6ed07b81acf..f342e9f25fa 100644
--- a/source/blender/blenkernel/intern/mesh_calc_edges.cc
+++ b/source/blender/blenkernel/intern/mesh_calc_edges.cc
@@ -7,6 +7,7 @@
  */
 
 #include "BLI_array_utils.hh"
+#include "BLI_math_base.h"
 #include "BLI_ordered_edge.hh"
 #include "BLI_task.hh"
 #include "BLI_threads.h"
diff --git a/source/blender/blenkernel/intern/mesh_merge_customdata.cc b/source/blender/blenkernel/intern/mesh_merge_customdata.cc
index 6bf7db57071..1070fa44c24 100644
--- a/source/blender/blenkernel/intern/mesh_merge_customdata.cc
+++ b/source/blender/blenkernel/intern/mesh_merge_customdata.cc
@@ -8,6 +8,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_math_base.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_task.hh"
 #include "BLI_utildefines.h"
diff --git a/source/blender/blenkernel/intern/mesh_remap.cc b/source/blender/blenkernel/intern/mesh_remap.cc
index 3ca420afcd0..733c2adc330 100644
--- a/source/blender/blenkernel/intern/mesh_remap.cc
+++ b/source/blender/blenkernel/intern/mesh_remap.cc
@@ -17,6 +17,7 @@
 #include "BLI_array.hh"
 #include "BLI_astar.h"
 #include "BLI_bit_vector.hh"
+#include "BLI_index_mask.hh"
 #include "BLI_math_geom.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_solvers.h"
diff --git a/source/blender/blenkernel/intern/multires.cc b/source/blender/blenkernel/intern/multires.cc
index 6b63eccc5d0..3b47fb2aa08 100644
--- a/source/blender/blenkernel/intern/multires.cc
+++ b/source/blender/blenkernel/intern/multires.cc
@@ -17,9 +17,9 @@
 #include "DNA_scene_types.h"
 
 #include "BLI_bitmap.h"
+#include "BLI_index_mask.hh"
 #include "BLI_math_matrix.h"
 #include "BLI_task.h"
-#include "BLI_utildefines.h"
 
 #include "BKE_ccg.hh"
 #include "BKE_editmesh.hh"
diff --git a/source/blender/blenkernel/intern/multires_inline.hh b/source/blender/blenkernel/intern/multires_inline.hh
index fdedb014665..9c39244f7fc 100644
--- a/source/blender/blenkernel/intern/multires_inline.hh
+++ b/source/blender/blenkernel/intern/multires_inline.hh
@@ -10,7 +10,6 @@
 
 #include "BKE_multires.hh"
 #include "BLI_math_vector.h"
-#include "BLI_utildefines.h"
 
 BLI_INLINE void BKE_multires_construct_tangent_matrix(float tangent_matrix[3][3],
                                                       const float dPdu[3],
diff --git a/source/blender/blenkernel/intern/multires_reshape.hh b/source/blender/blenkernel/intern/multires_reshape.hh
index 6a3254ff08b..fa0beb094bc 100644
--- a/source/blender/blenkernel/intern/multires_reshape.hh
+++ b/source/blender/blenkernel/intern/multires_reshape.hh
@@ -11,7 +11,6 @@
 #include "BLI_math_vector_types.hh"
 #include "BLI_offset_indices.hh"
 #include "BLI_span.hh"
-#include "BLI_sys_types.h"
 #include "BLI_virtual_array.hh"
 
 #include "BKE_multires.hh"
diff --git a/source/blender/blenkernel/intern/multires_unsubdivide.hh b/source/blender/blenkernel/intern/multires_unsubdivide.hh
index 896acb8a6ad..477c5babfc6 100644
--- a/source/blender/blenkernel/intern/multires_unsubdivide.hh
+++ b/source/blender/blenkernel/intern/multires_unsubdivide.hh
@@ -8,10 +8,11 @@
 
 #pragma once
 
-#include "BLI_sys_types.h"
+#include "BLI_span.hh"
 
 struct BMesh;
 struct Mesh;
+struct MDisps;
 struct MultiresModifierData;
 
 struct MultiresUnsubdivideGrid {
diff --git a/source/blender/blenkernel/intern/node_tree_interface.cc b/source/blender/blenkernel/intern/node_tree_interface.cc
index ef5d86fae8d..321e92a6b47 100644
--- a/source/blender/blenkernel/intern/node_tree_interface.cc
+++ b/source/blender/blenkernel/intern/node_tree_interface.cc
@@ -2,6 +2,8 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include <queue>
+
 #include "BKE_idprop.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
diff --git a/source/blender/blenkernel/intern/pbvh_pixels_copy.hh b/source/blender/blenkernel/intern/pbvh_pixels_copy.hh
index e310e36da1a..e8c4fc06e8d 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels_copy.hh
+++ b/source/blender/blenkernel/intern/pbvh_pixels_copy.hh
@@ -2,15 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "BLI_math_vector_types.hh"
-#include "BLI_vector.hh"
-
-#include "IMB_imbuf.hh"
-#include "IMB_imbuf_types.hh"
-
-#include "BKE_image_wrappers.hh"
 #include "BKE_paint_bvh.hh"
-#include "BKE_paint_bvh_pixels.hh"
 
 #include "pbvh_uv_islands.hh"
 
diff --git a/source/blender/blenkernel/intern/pbvh_uv_islands.cc b/source/blender/blenkernel/intern/pbvh_uv_islands.cc
index 58fce1923e4..ccef4d0c956 100644
--- a/source/blender/blenkernel/intern/pbvh_uv_islands.cc
+++ b/source/blender/blenkernel/intern/pbvh_uv_islands.cc
@@ -7,6 +7,7 @@
 #include "BLI_math_matrix.hh"
 #include "BLI_math_vector.h"
 #include "BLI_ordered_edge.hh"
+#include "BLI_rect.h"
 
 #include "pbvh_uv_islands.hh"
 
diff --git a/source/blender/blenkernel/intern/pbvh_uv_islands.hh b/source/blender/blenkernel/intern/pbvh_uv_islands.hh
index 5a81d0898ff..5194fc59f0d 100644
--- a/source/blender/blenkernel/intern/pbvh_uv_islands.hh
+++ b/source/blender/blenkernel/intern/pbvh_uv_islands.hh
@@ -21,18 +21,14 @@
 
 #pragma once
 
-#include <fstream>
 #include <optional>
 
 #include "BLI_array.hh"
 #include "BLI_map.hh"
-#include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_offset_indices.hh"
-#include "BLI_rect.h"
 #include "BLI_vector.hh"
 #include "BLI_vector_list.hh"
-#include "BLI_virtual_array.hh"
 
 namespace blender::bke::pbvh::uv_islands {
 
diff --git a/source/blender/blenkernel/intern/sound.cc b/source/blender/blenkernel/intern/sound.cc
index 5e81fe11dfb..881dafb3ac3 100644
--- a/source/blender/blenkernel/intern/sound.cc
+++ b/source/blender/blenkernel/intern/sound.cc
@@ -14,6 +14,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_iterator.h"
+#include "BLI_math_base.h"
 #include "BLI_math_rotation.h"
 #include "BLI_threads.h"
 
diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc
index 40d7bf1db1b..429aede040c 100644
--- a/source/blender/blenkernel/intern/volume.cc
+++ b/source/blender/blenkernel/intern/volume.cc
@@ -17,18 +17,14 @@
 #include "DNA_volume_types.h"
 
 #include "BLI_bounds.hh"
-#include "BLI_compiler_compat.h"
 #include "BLI_fileops.h"
-#include "BLI_ghash.h"
 #include "BLI_index_range.hh"
-#include "BLI_map.hh"
-#include "BLI_math_matrix.h"
+#include "BLI_math_base.h"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_string_ref.hh"
-#include "BLI_task.hh"
 #include "BLI_utildefines.h"
 
 #include "BKE_anim_data.hh"
@@ -74,10 +70,8 @@ using blender::StringRefNull;
 using blender::bke::GVolumeGrid;
 
 #ifdef WITH_OPENVDB
-#  include <atomic>
 #  include <list>
 #  include <mutex>
-#  include <unordered_set>
 
 #  include <openvdb/openvdb.h>
 #  include <openvdb/points/PointDataGrid.h>
diff --git a/source/blender/blenkernel/nla_private.h b/source/blender/blenkernel/nla_private.h
index e7f6b4f1a06..e49239b2d98 100644
--- a/source/blender/blenkernel/nla_private.h
+++ b/source/blender/blenkernel/nla_private.h
@@ -10,6 +10,10 @@
 
 #include "BLI_bitmap.h"
 #include "BLI_ghash.h"
+
+#include "DNA_anim_types.h"
+#include "DNA_listBase.h"
+
 #include "RNA_types.hh"
 
 #ifdef __cplusplus
diff --git a/source/blender/blenkernel/particle_private.h b/source/blender/blenkernel/particle_private.h
index 144c67ef449..f9c2b957ec6 100644
--- a/source/blender/blenkernel/particle_private.h
+++ b/source/blender/blenkernel/particle_private.h
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include "BKE_particle.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenkernel/tracking_private.h b/source/blender/blenkernel/tracking_private.h
index cd601459973..8c9643a2b7c 100644
--- a/source/blender/blenkernel/tracking_private.h
+++ b/source/blender/blenkernel/tracking_private.h
@@ -11,6 +11,9 @@
 
 #pragma once
 
+#include "DNA_ID.h"
+#include "DNA_movieclip_types.h"
+
 #include "BLI_threads.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/blenlib/BLI_args.h b/source/blender/blenlib/BLI_args.h
index 1c96fb38978..4a5d096e61a 100644
--- a/source/blender/blenlib/BLI_args.h
+++ b/source/blender/blenlib/BLI_args.h
@@ -17,6 +17,7 @@ struct bArgs;
 typedef struct bArgs bArgs;
 
 #include <stdarg.h> /* For `va_list`. */
+#include <stdbool.h>
 
 #include "BLI_compiler_attrs.h"
 
diff --git a/source/blender/blenlib/BLI_array_store.h b/source/blender/blenlib/BLI_array_store.h
index 3ccdc182f1f..73732c19240 100644
--- a/source/blender/blenlib/BLI_array_store.h
+++ b/source/blender/blenlib/BLI_array_store.h
@@ -9,6 +9,8 @@
  * \brief Efficient in-memory storage of multiple similar arrays.
  */
 
+#include "BLI_sys_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenlib/BLI_array_store_utils.h b/source/blender/blenlib/BLI_array_store_utils.h
index 59d9b0575d2..4bca2cfb68c 100644
--- a/source/blender/blenlib/BLI_array_store_utils.h
+++ b/source/blender/blenlib/BLI_array_store_utils.h
@@ -8,6 +8,8 @@
  * \ingroup bli
  */
 
+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -19,11 +21,11 @@ struct BArrayStore_AtSize {
   int stride_table_len;
 };
 
-BArrayStore *BLI_array_store_at_size_ensure(struct BArrayStore_AtSize *bs_stride,
-                                            int stride,
-                                            int chunk_size);
+struct BArrayStore *BLI_array_store_at_size_ensure(struct BArrayStore_AtSize *bs_stride,
+                                                   int stride,
+                                                   int chunk_size);
 
-BArrayStore *BLI_array_store_at_size_get(struct BArrayStore_AtSize *bs_stride, int stride);
+struct BArrayStore *BLI_array_store_at_size_get(struct BArrayStore_AtSize *bs_stride, int stride);
 
 void BLI_array_store_at_size_clear(struct BArrayStore_AtSize *bs_stride);
 
diff --git a/source/blender/blenlib/BLI_binary_search.hh b/source/blender/blenlib/BLI_binary_search.hh
index 4f37a1f1c31..2794240f5d5 100644
--- a/source/blender/blenlib/BLI_binary_search.hh
+++ b/source/blender/blenlib/BLI_binary_search.hh
@@ -10,8 +10,6 @@
 
 #include <algorithm>
 
-#include "BLI_utildefines.h"
-
 namespace blender::binary_search {
 
 /**
diff --git a/source/blender/blenlib/BLI_bit_ref.hh b/source/blender/blenlib/BLI_bit_ref.hh
index 1312b095af9..ac94e370e17 100644
--- a/source/blender/blenlib/BLI_bit_ref.hh
+++ b/source/blender/blenlib/BLI_bit_ref.hh
@@ -17,7 +17,6 @@
  * - Within each #BitInt, the bits are ordered from least to most significant.
  */
 
-#include "BLI_index_range.hh"
 #include "BLI_utildefines.h"
 
 #include <iosfwd>
diff --git a/source/blender/blenlib/BLI_boxpack_2d.h b/source/blender/blenlib/BLI_boxpack_2d.h
index 271fafd766c..528deb3184b 100644
--- a/source/blender/blenlib/BLI_boxpack_2d.h
+++ b/source/blender/blenlib/BLI_boxpack_2d.h
@@ -8,6 +8,8 @@
  * \ingroup bli
  */
 
+#include <stdbool.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenlib/BLI_buffer.h b/source/blender/blenlib/BLI_buffer.h
index c5cc8701604..2cc7a508d7e 100644
--- a/source/blender/blenlib/BLI_buffer.h
+++ b/source/blender/blenlib/BLI_buffer.h
@@ -8,6 +8,8 @@
  * \ingroup bli
  */
 
+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenlib/BLI_compute_context.hh b/source/blender/blenlib/BLI_compute_context.hh
index b01ab904181..101db521fee 100644
--- a/source/blender/blenlib/BLI_compute_context.hh
+++ b/source/blender/blenlib/BLI_compute_context.hh
@@ -36,7 +36,6 @@
 
 #include <optional>
 
-#include "BLI_array.hh"
 #include "BLI_linear_allocator.hh"
 #include "BLI_stack.hh"
 #include "BLI_string_ref.hh"
diff --git a/source/blender/blenlib/BLI_concurrent_map.hh b/source/blender/blenlib/BLI_concurrent_map.hh
index e74f91d24cf..82e0fca0d40 100644
--- a/source/blender/blenlib/BLI_concurrent_map.hh
+++ b/source/blender/blenlib/BLI_concurrent_map.hh
@@ -23,13 +23,12 @@
 #      undef NOMINMAX
 #    endif
 #  endif
+#else
+#  include "BLI_set.hh"
 #endif
 
-#include <mutex>
-
 #include "BLI_hash.hh"
 #include "BLI_hash_tables.hh"
-#include "BLI_set.hh"
 
 namespace blender {
 
diff --git a/source/blender/blenlib/BLI_cpp_type.hh b/source/blender/blenlib/BLI_cpp_type.hh
index ef67114ee87..f110447421a 100644
--- a/source/blender/blenlib/BLI_cpp_type.hh
+++ b/source/blender/blenlib/BLI_cpp_type.hh
@@ -75,7 +75,6 @@
 #include "BLI_hash.hh"
 #include "BLI_index_mask.hh"
 #include "BLI_map.hh"
-#include "BLI_math_base.h"
 #include "BLI_parameter_pack_utils.hh"
 #include "BLI_string_ref.hh"
 #include "BLI_utility_mixins.hh"
diff --git a/source/blender/blenlib/BLI_cpp_types.hh b/source/blender/blenlib/BLI_cpp_types.hh
index 7cf89e70bd8..a66240c4e35 100644
--- a/source/blender/blenlib/BLI_cpp_types.hh
+++ b/source/blender/blenlib/BLI_cpp_types.hh
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "BLI_cpp_type.hh"
-#include "BLI_vector.hh"
 
 namespace blender {
 
diff --git a/source/blender/blenlib/BLI_devirtualize_parameters.hh b/source/blender/blenlib/BLI_devirtualize_parameters.hh
index 1641b301c5c..c1066600576 100644
--- a/source/blender/blenlib/BLI_devirtualize_parameters.hh
+++ b/source/blender/blenlib/BLI_devirtualize_parameters.hh
@@ -33,6 +33,8 @@
  * finding a good compromise for each function.
  */
 
+#include <tuple>
+
 namespace blender {
 
 /**
diff --git a/source/blender/blenlib/BLI_endian_switch_inline.h b/source/blender/blenlib/BLI_endian_switch_inline.h
index c6b7a007479..633bc972446 100644
--- a/source/blender/blenlib/BLI_endian_switch_inline.h
+++ b/source/blender/blenlib/BLI_endian_switch_inline.h
@@ -4,6 +4,9 @@
 
 #pragma once
 
+#include "BLI_compiler_compat.h"
+#include "BLI_sys_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenlib/BLI_fileops.hh b/source/blender/blenlib/BLI_fileops.hh
index 2a4ebfb7593..98ff73d6ad9 100644
--- a/source/blender/blenlib/BLI_fileops.hh
+++ b/source/blender/blenlib/BLI_fileops.hh
@@ -13,7 +13,7 @@
 #  error This is a C++ header
 #endif
 
-#include "BLI_fileops.h"
+#include "BLI_fileops.h"  // IWYU pragma: export
 #include "BLI_string_ref.hh"
 
 #include <fstream>
diff --git a/source/blender/blenlib/BLI_function_ref.hh b/source/blender/blenlib/BLI_function_ref.hh
index a21d4a498c6..95f60fae554 100644
--- a/source/blender/blenlib/BLI_function_ref.hh
+++ b/source/blender/blenlib/BLI_function_ref.hh
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <optional>
 #include <type_traits>
 #include <utility>
 
@@ -68,8 +67,6 @@
  *   some_function([]() { return 0; });
  */
 
-#include "BLI_memory_utils.hh"
-
 namespace blender {
 
 template<typename Function> class FunctionRef;
diff --git a/source/blender/blenlib/BLI_generic_key.hh b/source/blender/blenlib/BLI_generic_key.hh
index 04e9815fbe8..c9899d4464b 100644
--- a/source/blender/blenlib/BLI_generic_key.hh
+++ b/source/blender/blenlib/BLI_generic_key.hh
@@ -10,7 +10,7 @@
 
 #include <memory>
 
-#include "BLI_utildefines.h"
+#include "BLI_assert.h"
 
 namespace blender {
 
diff --git a/source/blender/blenlib/BLI_generic_virtual_array.hh b/source/blender/blenlib/BLI_generic_virtual_array.hh
index c47b6da1e6a..abfa5072b1a 100644
--- a/source/blender/blenlib/BLI_generic_virtual_array.hh
+++ b/source/blender/blenlib/BLI_generic_virtual_array.hh
@@ -13,7 +13,6 @@
 
 #include "BLI_generic_array.hh"
 #include "BLI_generic_span.hh"
-#include "BLI_timeit.hh"
 #include "BLI_virtual_array.hh"
 
 namespace blender {
diff --git a/source/blender/blenlib/BLI_hash.hh b/source/blender/blenlib/BLI_hash.hh
index d16328cc819..bcfb5678f9f 100644
--- a/source/blender/blenlib/BLI_hash.hh
+++ b/source/blender/blenlib/BLI_hash.hh
@@ -66,7 +66,6 @@
 #include <utility>
 
 #include "BLI_string_ref.hh"
-#include "BLI_utildefines.h"
 
 namespace blender {
 
diff --git a/source/blender/blenlib/BLI_hash_tables.hh b/source/blender/blenlib/BLI_hash_tables.hh
index 4bfe657b67b..1d12ce34200 100644
--- a/source/blender/blenlib/BLI_hash_tables.hh
+++ b/source/blender/blenlib/BLI_hash_tables.hh
@@ -12,7 +12,6 @@
 
 #include <algorithm>
 
-#include "BLI_memory_utils.hh"
 #include "BLI_utildefines.h"
 #include "BLI_vector.hh"
 
diff --git a/source/blender/blenlib/BLI_heap.h b/source/blender/blenlib/BLI_heap.h
index f9786f7394c..5de0e3f0850 100644
--- a/source/blender/blenlib/BLI_heap.h
+++ b/source/blender/blenlib/BLI_heap.h
@@ -9,6 +9,9 @@
  * \brief A min-heap / priority queue ADT
  */
 
+#include <stdbool.h>
+#include <stddef.h>
+
 #include "BLI_compiler_attrs.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/blenlib/BLI_heap_simple.h b/source/blender/blenlib/BLI_heap_simple.h
index bfb5f1ddc9a..1363c94d01a 100644
--- a/source/blender/blenlib/BLI_heap_simple.h
+++ b/source/blender/blenlib/BLI_heap_simple.h
@@ -9,6 +9,9 @@
  * \brief A min-heap / priority queue ADT
  */
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_sys_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenlib/BLI_index_ranges_builder_fwd.hh b/source/blender/blenlib/BLI_index_ranges_builder_fwd.hh
index 3fd8b1d2fcf..d6f053ec132 100644
--- a/source/blender/blenlib/BLI_index_ranges_builder_fwd.hh
+++ b/source/blender/blenlib/BLI_index_ranges_builder_fwd.hh
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "BLI_utildefines.h"
-
 namespace blender {
 
 template<typename T> class IndexRangesBuilder;
diff --git a/source/blender/blenlib/BLI_iterator.h b/source/blender/blenlib/BLI_iterator.h
index c0830d25fb6..473d81120de 100644
--- a/source/blender/blenlib/BLI_iterator.h
+++ b/source/blender/blenlib/BLI_iterator.h
@@ -8,6 +8,8 @@
  * \ingroup bli
  */
 
+#include <stdbool.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenlib/BLI_kdopbvh.hh b/source/blender/blenlib/BLI_kdopbvh.hh
index 11a89022800..e0eec79f3e7 100644
--- a/source/blender/blenlib/BLI_kdopbvh.hh
+++ b/source/blender/blenlib/BLI_kdopbvh.hh
@@ -9,7 +9,7 @@
  */
 
 #include "BLI_function_ref.hh"
-#include "BLI_math_vector.hh"
+#include "BLI_math_vector_types.hh"
 #include "BLI_sys_types.h"
 
 struct BVHTree;
diff --git a/source/blender/blenlib/BLI_kdtree_impl.h b/source/blender/blenlib/BLI_kdtree_impl.h
index bbbc83d1794..01f889b0d7b 100644
--- a/source/blender/blenlib/BLI_kdtree_impl.h
+++ b/source/blender/blenlib/BLI_kdtree_impl.h
@@ -14,6 +14,11 @@
 #define _BLI_CONCAT(MACRO_ARG1, MACRO_ARG2) _BLI_CONCAT_AUX(MACRO_ARG1, MACRO_ARG2)
 #define BLI_kdtree_nd_(id) _BLI_CONCAT(KDTREE_PREFIX_ID, _##id)
 
+/* For autocomplete/clangd */
+#ifndef KD_DIMS
+#  define KD_DIMS 0
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenlib/BLI_map_slots.hh b/source/blender/blenlib/BLI_map_slots.hh
index 816ab95f552..02986699e4a 100644
--- a/source/blender/blenlib/BLI_map_slots.hh
+++ b/source/blender/blenlib/BLI_map_slots.hh
@@ -22,6 +22,7 @@
  * - Implement slot type that stores the hash.
  */
 
+#include "BLI_hash_tables.hh"
 #include "BLI_memory_utils.hh"
 
 namespace blender {
diff --git a/source/blender/blenlib/BLI_math_axis_angle_types.hh b/source/blender/blenlib/BLI_math_axis_angle_types.hh
index b7326489156..e1fdaa8763b 100644
--- a/source/blender/blenlib/BLI_math_axis_angle_types.hh
+++ b/source/blender/blenlib/BLI_math_axis_angle_types.hh
@@ -23,7 +23,6 @@
 #include <ostream>
 
 #include "BLI_math_angle_types.hh"
-#include "BLI_math_base.hh"
 #include "BLI_math_basis_types.hh"
 #include "BLI_math_vector_types.hh"
 
diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h
index a97b2d16a35..4ec84e0ded9 100644
--- a/source/blender/blenlib/BLI_math_base.h
+++ b/source/blender/blenlib/BLI_math_base.h
@@ -50,49 +50,12 @@
 #endif
 
 #include "BLI_assert.h"
-#include "BLI_math_inline.h"
+#include "BLI_math_inline.h"  // IWYU pragma: export
 #include "BLI_sys_types.h"
-#include <math.h>
 
-#ifndef M_PI
-#  define M_PI 3.14159265358979323846 /* pi */
-#endif
-#ifndef M_PI_2
-#  define M_PI_2 1.57079632679489661923 /* pi/2 */
-#endif
-#ifndef M_PI_4
-#  define M_PI_4 0.78539816339744830962 /* pi/4 */
-#endif
-#ifndef M_SQRT2
-#  define M_SQRT2 1.41421356237309504880 /* sqrt(2) */
-#endif
-#ifndef M_SQRT1_2
-#  define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */
-#endif
-#ifndef M_SQRT3
-#  define M_SQRT3 1.73205080756887729352 /* sqrt(3) */
-#endif
-#ifndef M_SQRT1_3
-#  define M_SQRT1_3 0.57735026918962576450 /* 1/sqrt(3) */
-#endif
-#ifndef M_1_PI
-#  define M_1_PI 0.318309886183790671538 /* 1/pi */
-#endif
-#ifndef M_E
-#  define M_E 2.7182818284590452354 /* e */
-#endif
-#ifndef M_LOG2E
-#  define M_LOG2E 1.4426950408889634074 /* log_2 e */
-#endif
-#ifndef M_LOG10E
-#  define M_LOG10E 0.43429448190325182765 /* log_10 e */
-#endif
-#ifndef M_LN2
-#  define M_LN2 0.69314718055994530942 /* log_e 2 */
-#endif
-#ifndef M_LN10
-#  define M_LN10 2.30258509299404568402 /* log_e 10 */
-#endif
+#include <math.h>  // IWYU pragma: export
+
+#include "BLI_math_constants.h"  // IWYU pragma: export
 
 #if defined(__GNUC__)
 #  define NAN_FLT __builtin_nanf("")
@@ -102,7 +65,7 @@ static const int NAN_INT = 0x7FC00000;
 #endif
 
 #if BLI_MATH_DO_INLINE
-#  include "intern/math_base_inline.c"
+#  include "intern/math_base_inline.c"  // IWYU pragma: export
 #endif
 
 #ifdef BLI_MATH_GCC_WARN_PRAGMA
diff --git a/source/blender/blenlib/BLI_math_base_safe.h b/source/blender/blenlib/BLI_math_base_safe.h
index 63b27820212..6f50c32bdc3 100644
--- a/source/blender/blenlib/BLI_math_base_safe.h
+++ b/source/blender/blenlib/BLI_math_base_safe.h
@@ -31,5 +31,5 @@ MINLINE float safe_powf(float base, float exponent);
 #endif
 
 #if BLI_MATH_DO_INLINE
-#  include "intern/math_base_safe_inline.c"
+#  include "intern/math_base_safe_inline.c"  // IWYU pragma: export
 #endif
diff --git a/source/blender/blenlib/BLI_math_bits.h b/source/blender/blenlib/BLI_math_bits.h
index 49ec8acde00..3e69f1bdaeb 100644
--- a/source/blender/blenlib/BLI_math_bits.h
+++ b/source/blender/blenlib/BLI_math_bits.h
@@ -61,7 +61,7 @@ MINLINE float uint_as_float(unsigned int i);
 MINLINE float xor_fl(float x, int y);
 
 #if BLI_MATH_DO_INLINE
-#  include "intern/math_bits_inline.c"
+#  include "intern/math_bits_inline.c"  // IWYU pragma: export
 #endif
 
 #ifdef __cplusplus
diff --git a/source/blender/blenlib/BLI_math_color.hh b/source/blender/blenlib/BLI_math_color.hh
index 0e11052ffe2..4232b3c79d7 100644
--- a/source/blender/blenlib/BLI_math_color.hh
+++ b/source/blender/blenlib/BLI_math_color.hh
@@ -8,9 +8,6 @@
  * \ingroup bli
  */
 
-#include <cmath>
-#include <type_traits>
-
 #include "BLI_color.hh"
 #include "BLI_math_base.hh"
 #include "BLI_math_matrix_types.hh"
diff --git a/source/blender/blenlib/BLI_math_color_blend.h b/source/blender/blenlib/BLI_math_color_blend.h
index 5215fc67dfb..d8a1d2e783f 100644
--- a/source/blender/blenlib/BLI_math_color_blend.h
+++ b/source/blender/blenlib/BLI_math_color_blend.h
@@ -10,7 +10,6 @@
 
 #include "BLI_math_inline.h"
 #include "BLI_sys_types.h"
-#include "BLI_utildefines.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -127,10 +126,10 @@ MINLINE void blend_color_interpolate_float(float dst[4],
                                            const float src2[4],
                                            float t);
 
-#if BLI_MATH_DO_INLINE
-#  include "intern/math_color_blend_inline.c"
-#endif
-
 #ifdef __cplusplus
 }
 #endif
+
+#if BLI_MATH_DO_INLINE
+#  include "intern/math_color_blend_inline.c"  // IWYU pragma: export
+#endif
diff --git a/source/blender/blenlib/BLI_math_constants.h b/source/blender/blenlib/BLI_math_constants.h
new file mode 100644
index 00000000000..db7701cca89
--- /dev/null
+++ b/source/blender/blenlib/BLI_math_constants.h
@@ -0,0 +1,49 @@
+/* SPDX-FileCopyrightText: 2001-2002 NaN Holding BV. All rights reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+/** \file
+ * \ingroup bli
+ */
+
+#ifndef M_PI
+#  define M_PI 3.14159265358979323846 /* pi */
+#endif
+#ifndef M_PI_2
+#  define M_PI_2 1.57079632679489661923 /* pi/2 */
+#endif
+#ifndef M_PI_4
+#  define M_PI_4 0.78539816339744830962 /* pi/4 */
+#endif
+#ifndef M_SQRT2
+#  define M_SQRT2 1.41421356237309504880 /* sqrt(2) */
+#endif
+#ifndef M_SQRT1_2
+#  define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */
+#endif
+#ifndef M_SQRT3
+#  define M_SQRT3 1.73205080756887729352 /* sqrt(3) */
+#endif
+#ifndef M_SQRT1_3
+#  define M_SQRT1_3 0.57735026918962576450 /* 1/sqrt(3) */
+#endif
+#ifndef M_1_PI
+#  define M_1_PI 0.318309886183790671538 /* 1/pi */
+#endif
+#ifndef M_E
+#  define M_E 2.7182818284590452354 /* e */
+#endif
+#ifndef M_LOG2E
+#  define M_LOG2E 1.4426950408889634074 /* log_2 e */
+#endif
+#ifndef M_LOG10E
+#  define M_LOG10E 0.43429448190325182765 /* log_10 e */
+#endif
+#ifndef M_LN2
+#  define M_LN2 0.69314718055994530942 /* log_e 2 */
+#endif
+#ifndef M_LN10
+#  define M_LN10 2.30258509299404568402 /* log_e 10 */
+#endif
diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h
index 52f2d127178..04e94a653bf 100644
--- a/source/blender/blenlib/BLI_math_geom.h
+++ b/source/blender/blenlib/BLI_math_geom.h
@@ -1392,7 +1392,7 @@ float geodesic_distance_propagate_across_triangle(
  * \{ */
 
 #if BLI_MATH_DO_INLINE
-#  include "intern/math_geom_inline.c"
+#  include "intern/math_geom_inline.c"  // IWYU pragma: export
 #endif
 
 #ifdef BLI_MATH_GCC_WARN_PRAGMA
diff --git a/source/blender/blenlib/BLI_math_matrix.h b/source/blender/blenlib/BLI_math_matrix.h
index d5aeec033ef..3388f815f67 100644
--- a/source/blender/blenlib/BLI_math_matrix.h
+++ b/source/blender/blenlib/BLI_math_matrix.h
@@ -9,7 +9,6 @@
  */
 
 #include "BLI_compiler_attrs.h"
-#include "BLI_sys_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/blenlib/BLI_math_matrix.hh b/source/blender/blenlib/BLI_math_matrix.hh
index 505f9547bc7..6d1972f5b21 100644
--- a/source/blender/blenlib/BLI_math_matrix.hh
+++ b/source/blender/blenlib/BLI_math_matrix.hh
@@ -12,6 +12,7 @@
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_rotation_types.hh"
 #include "BLI_math_vector.hh"
+#include "BLI_unroll.hh"
 
 namespace blender::math {
 
diff --git a/source/blender/blenlib/BLI_math_matrix_types.hh b/source/blender/blenlib/BLI_math_matrix_types.hh
index 785cf4d8703..d0d662f8f82 100644
--- a/source/blender/blenlib/BLI_math_matrix_types.hh
+++ b/source/blender/blenlib/BLI_math_matrix_types.hh
@@ -31,11 +31,11 @@
  * defined outside of the class in the `blender::math` namespace.
  */
 
-#include <array>
-#include <cmath>
 #include <ostream>
 #include <type_traits>
 
+#include "BLI_unroll.hh"
+
 #include "BLI_math_vector_types.hh"
 #include "BLI_utildefines.h"
 #include "BLI_utility_mixins.hh"
diff --git a/source/blender/blenlib/BLI_math_rotation.h b/source/blender/blenlib/BLI_math_rotation.h
index 5b2db05350f..b98e2182579 100644
--- a/source/blender/blenlib/BLI_math_rotation.h
+++ b/source/blender/blenlib/BLI_math_rotation.h
@@ -8,7 +8,7 @@
  * \ingroup bli
  */
 
-#include "BLI_math_base.h"
+#include "BLI_math_base.h"  // IWYU pragma: keep
 #include "BLI_utildefines.h"
 #include "DNA_vec_types.h"
 
diff --git a/source/blender/blenlib/BLI_math_rotation_types.hh b/source/blender/blenlib/BLI_math_rotation_types.hh
index ec489849560..b05b0e979be 100644
--- a/source/blender/blenlib/BLI_math_rotation_types.hh
+++ b/source/blender/blenlib/BLI_math_rotation_types.hh
@@ -13,8 +13,8 @@
  * They also prevent implicit cast from rotation to vector types.
  */
 
-#include "BLI_math_angle_types.hh"
-#include "BLI_math_axis_angle_types.hh"
-#include "BLI_math_basis_types.hh"
-#include "BLI_math_euler_types.hh"
-#include "BLI_math_quaternion_types.hh"
+#include "BLI_math_angle_types.hh"       // IWYU pragma: export
+#include "BLI_math_axis_angle_types.hh"  // IWYU pragma: export
+#include "BLI_math_basis_types.hh"       // IWYU pragma: export
+#include "BLI_math_euler_types.hh"       // IWYU pragma: export
+#include "BLI_math_quaternion_types.hh"  // IWYU pragma: export
diff --git a/source/blender/blenlib/BLI_math_solvers.h b/source/blender/blenlib/BLI_math_solvers.h
index 26826d8c7ee..fd0c01a7c96 100644
--- a/source/blender/blenlib/BLI_math_solvers.h
+++ b/source/blender/blenlib/BLI_math_solvers.h
@@ -8,7 +8,6 @@
  * \ingroup bli
  */
 
-#include "BLI_compiler_attrs.h"
 #include "BLI_math_inline.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/blenlib/BLI_math_statistics.h b/source/blender/blenlib/BLI_math_statistics.h
index bbb83a34546..eb4a7bb94cc 100644
--- a/source/blender/blenlib/BLI_math_statistics.h
+++ b/source/blender/blenlib/BLI_math_statistics.h
@@ -8,8 +8,8 @@
  * \ingroup bli
  */
 
-#include "BLI_compiler_attrs.h"
 #include "BLI_math_inline.h"
+#include "BLI_sys_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h
index 6f114a1e407..aada5632db7 100644
--- a/source/blender/blenlib/BLI_math_vector.h
+++ b/source/blender/blenlib/BLI_math_vector.h
@@ -635,7 +635,7 @@ void mul_vn_db(double *array_tar, int size, double f);
  * \{ */
 
 #if BLI_MATH_DO_INLINE
-#  include "intern/math_vector_inline.c"
+#  include "intern/math_vector_inline.c"  // IWYU pragma: export
 #endif
 
 #ifdef BLI_MATH_GCC_WARN_PRAGMA
diff --git a/source/blender/blenlib/BLI_math_vector.hh b/source/blender/blenlib/BLI_math_vector.hh
index b826d04be73..c7d9d8f2dc4 100644
--- a/source/blender/blenlib/BLI_math_vector.hh
+++ b/source/blender/blenlib/BLI_math_vector.hh
@@ -8,7 +8,6 @@
  * \ingroup bli
  */
 
-#include <cmath>
 #include <type_traits>
 
 #include "BLI_math_base.hh"
diff --git a/source/blender/blenlib/BLI_math_vector_types.hh b/source/blender/blenlib/BLI_math_vector_types.hh
index 079704d7b16..68209b93a96 100644
--- a/source/blender/blenlib/BLI_math_vector_types.hh
+++ b/source/blender/blenlib/BLI_math_vector_types.hh
@@ -9,12 +9,10 @@
  */
 
 #include <array>
-#include <cmath>
 #include <ostream>
 #include <type_traits>
 
 #include "BLI_math_vector_unroll.hh"
-#include "BLI_unroll.hh"
 #include "BLI_utildefines.h"
 
 namespace blender {
diff --git a/source/blender/blenlib/BLI_memarena.h b/source/blender/blenlib/BLI_memarena.h
index 8f613ec67d5..b813a61a1ac 100644
--- a/source/blender/blenlib/BLI_memarena.h
+++ b/source/blender/blenlib/BLI_memarena.h
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <stddef.h>
+
 #include "BLI_compiler_attrs.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/blenlib/BLI_memblock.h b/source/blender/blenlib/BLI_memblock.h
index 42741e7ea13..9813e4f572d 100644
--- a/source/blender/blenlib/BLI_memblock.h
+++ b/source/blender/blenlib/BLI_memblock.h
@@ -9,6 +9,7 @@
  */
 
 #include "BLI_compiler_attrs.h"
+#include "BLI_sys_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/blenlib/BLI_memory_counter.hh b/source/blender/blenlib/BLI_memory_counter.hh
index ce90268d0ec..5d1d833b60f 100644
--- a/source/blender/blenlib/BLI_memory_counter.hh
+++ b/source/blender/blenlib/BLI_memory_counter.hh
@@ -10,10 +10,8 @@
 
 #include "BLI_function_ref.hh"
 #include "BLI_implicit_sharing_ptr.hh"
-#include "BLI_map.hh"
 #include "BLI_memory_counter_fwd.hh"
 #include "BLI_set.hh"
-#include "BLI_vector_set.hh"
 
 namespace blender::memory_counter {
 
diff --git a/source/blender/blenlib/BLI_memory_utils.h b/source/blender/blenlib/BLI_memory_utils.h
index d23f81321c7..8707724bf1f 100644
--- a/source/blender/blenlib/BLI_memory_utils.h
+++ b/source/blender/blenlib/BLI_memory_utils.h
@@ -11,6 +11,8 @@
  * \brief Generic memory manipulation API.
  */
 
+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenlib/BLI_memory_utils.hh b/source/blender/blenlib/BLI_memory_utils.hh
index 9edd4abdad9..7128ce69c60 100644
--- a/source/blender/blenlib/BLI_memory_utils.hh
+++ b/source/blender/blenlib/BLI_memory_utils.hh
@@ -10,7 +10,6 @@
 
 #include <algorithm>
 #include <memory>
-#include <new>
 #include <type_traits>
 
 #include "BLI_utildefines.h"
diff --git a/source/blender/blenlib/BLI_mempool.h b/source/blender/blenlib/BLI_mempool.h
index d4c902a5038..880bdd47086 100644
--- a/source/blender/blenlib/BLI_mempool.h
+++ b/source/blender/blenlib/BLI_mempool.h
@@ -9,7 +9,6 @@
  */
 
 #include "BLI_compiler_attrs.h"
-#include "BLI_utildefines.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/blenlib/BLI_mesh_intersect.hh b/source/blender/blenlib/BLI_mesh_intersect.hh
index fc935bcbd21..dd566bf498e 100644
--- a/source/blender/blenlib/BLI_mesh_intersect.hh
+++ b/source/blender/blenlib/BLI_mesh_intersect.hh
@@ -24,7 +24,6 @@
 #  include "BLI_math_vector_types.hh"
 #  include "BLI_span.hh"
 #  include "BLI_utility_mixins.hh"
-#  include "BLI_vector.hh"
 
 namespace blender::meshintersect {
 
diff --git a/source/blender/blenlib/BLI_noise.h b/source/blender/blenlib/BLI_noise.h
index fedbeb372be..b8d5c48fa45 100644
--- a/source/blender/blenlib/BLI_noise.h
+++ b/source/blender/blenlib/BLI_noise.h
@@ -8,6 +8,8 @@
  * \ingroup bli
  */
 
+#include "BLI_sys_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenlib/BLI_polyfill_2d_beautify.h b/source/blender/blenlib/BLI_polyfill_2d_beautify.h
index 629e86dd6e5..543e2a0e1a0 100644
--- a/source/blender/blenlib/BLI_polyfill_2d_beautify.h
+++ b/source/blender/blenlib/BLI_polyfill_2d_beautify.h
@@ -8,6 +8,8 @@
  * \ingroup bli
  */
 
+#include <stdbool.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenlib/BLI_quadric.h b/source/blender/blenlib/BLI_quadric.h
index 0c07c58a4ad..13d8c95b1b8 100644
--- a/source/blender/blenlib/BLI_quadric.h
+++ b/source/blender/blenlib/BLI_quadric.h
@@ -8,6 +8,8 @@
  * \ingroup bli
  */
 
+#include <stdbool.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenlib/BLI_scanfill.h b/source/blender/blenlib/BLI_scanfill.h
index b4344563780..2382da9e0a8 100644
--- a/source/blender/blenlib/BLI_scanfill.h
+++ b/source/blender/blenlib/BLI_scanfill.h
@@ -8,6 +8,10 @@
  * \ingroup bli
  */
 
+#include "DNA_listBase.h"
+
+#include <stdbool.h>
+
 struct ScanFillVert;
 
 #ifdef __cplusplus
diff --git a/source/blender/blenlib/BLI_set_slots.hh b/source/blender/blenlib/BLI_set_slots.hh
index 63ca7b74c35..829fbfb9a13 100644
--- a/source/blender/blenlib/BLI_set_slots.hh
+++ b/source/blender/blenlib/BLI_set_slots.hh
@@ -19,6 +19,7 @@
  * destructor might not be called in that case.
  */
 
+#include "BLI_hash_tables.hh"
 #include "BLI_memory_utils.hh"
 #include "BLI_string_ref.hh"
 
diff --git a/source/blender/blenlib/BLI_stack.h b/source/blender/blenlib/BLI_stack.h
index 0d684172027..038e37c135c 100644
--- a/source/blender/blenlib/BLI_stack.h
+++ b/source/blender/blenlib/BLI_stack.h
@@ -8,6 +8,8 @@
  * \ingroup bli
  */
 
+#include <stddef.h>
+
 #include "BLI_compiler_attrs.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/blenlib/BLI_string_cursor_utf8.h b/source/blender/blenlib/BLI_string_cursor_utf8.h
index 6ecca1f2b35..b95bff3e14a 100644
--- a/source/blender/blenlib/BLI_string_cursor_utf8.h
+++ b/source/blender/blenlib/BLI_string_cursor_utf8.h
@@ -8,6 +8,8 @@
  * \ingroup bli
  */
 
+#include "BLI_sys_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h
index f377b953d11..b4a9b2101e0 100644
--- a/source/blender/blenlib/BLI_sys_types.h
+++ b/source/blender/blenlib/BLI_sys_types.h
@@ -26,7 +26,7 @@ extern "C" {
     defined(__FreeBSD_kernel__) || defined(__HAIKU__)
 
 /* Linux-i386, Linux-Alpha, Linux-PPC */
-#  include <stdint.h>
+#  include <stdint.h>  // IWYU pragma: export
 
 /* XXX */
 #  ifndef UINT64_MAX
@@ -39,29 +39,29 @@ typedef uint64_t u_int64_t;
 
 #elif defined(__APPLE__)
 
-#  include <inttypes.h>
+#  include <inttypes.h>  // IWYU pragma: export
 
 /* MSVC >= 2010 */
 #elif defined(_MSC_VER)
-#  include <stdint.h>
+#  include <stdint.h>  // IWYU pragma: export
 
 #else
 
 /* FreeBSD, Solaris */
-#  include <stdint.h>
-#  include <sys/types.h>
+#  include <stdint.h>     // IWYU pragma: export
+#  include <sys/types.h>  // IWYU pragma: export
 
 #endif /* ifdef platform for types */
 
-#include <stdbool.h>
-#include <stddef.h> /* size_t define */
+#include <stdbool.h>  // IWYU pragma: export
+#include <stddef.h>   // IWYU pragma: export
 
 #ifndef __cplusplus
 /* The <uchar.h> standard header is missing on some systems. */
 #  if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
 typedef unsigned int char32_t;
 #  else
-#    include <uchar.h>
+#    include <uchar.h>  // IWYU pragma: export
 #  endif
 #endif
 
diff --git a/source/blender/blenlib/BLI_timecode.h b/source/blender/blenlib/BLI_timecode.h
index f8b9d4df479..4f4e84f6338 100644
--- a/source/blender/blenlib/BLI_timecode.h
+++ b/source/blender/blenlib/BLI_timecode.h
@@ -8,6 +8,8 @@
  * \ingroup bli
  */
 
+#include <stddef.h>
+
 #include "BLI_compiler_attrs.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h
index 6936362bb90..4ed1b94040c 100644
--- a/source/blender/blenlib/BLI_utildefines.h
+++ b/source/blender/blenlib/BLI_utildefines.h
@@ -13,7 +13,7 @@
 /* avoid many includes for now */
 #include "BLI_compiler_compat.h"
 #include "BLI_sys_types.h"
-#include "BLI_utildefines_variadic.h"
+#include "BLI_utildefines_variadic.h"  // IWYU prama: export
 
 /* We could remove in future. */
 #include "BLI_assert.h"
diff --git a/source/blender/blenlib/BLI_vector_set_slots.hh b/source/blender/blenlib/BLI_vector_set_slots.hh
index 6099bab95f1..2304f782ead 100644
--- a/source/blender/blenlib/BLI_vector_set_slots.hh
+++ b/source/blender/blenlib/BLI_vector_set_slots.hh
@@ -24,7 +24,7 @@
  *   result in better performance, due to better cache utilization.
  */
 
-#include "BLI_sys_types.h"
+#include <type_traits>
 
 namespace blender {
 
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 53af4e92de6..5f4f5e697b6 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -295,6 +295,7 @@ set(SRC
   BLI_math_color.h
   BLI_math_color.hh
   BLI_math_color_blend.h
+  BLI_math_constants.h
   BLI_math_euler.hh
   BLI_math_euler_types.hh
   BLI_math_geom.h
diff --git a/source/blender/blenlib/intern/BLI_mempool_private.h b/source/blender/blenlib/intern/BLI_mempool_private.h
index 646af946895..14b2726835e 100644
--- a/source/blender/blenlib/intern/BLI_mempool_private.h
+++ b/source/blender/blenlib/intern/BLI_mempool_private.h
@@ -50,7 +50,3 @@ void mempool_iter_threadsafe_destroy(ParallelMempoolTaskData *iter_arr) ATTR_NON
  * (threaded section noted in comments).
  */
 void *mempool_iter_threadsafe_step(BLI_mempool_threadsafe_iter *ts_iter);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c
index 8f45e0852b8..ab183106975 100644
--- a/source/blender/blenlib/intern/math_base_inline.c
+++ b/source/blender/blenlib/intern/math_base_inline.c
@@ -14,7 +14,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "BLI_math_base.h"
+#include "BLI_assert.h"
+#include "BLI_math_constants.h"
+#include "BLI_math_inline.h"
+#include "BLI_sys_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/blenlib/intern/math_color_blend_inline.c b/source/blender/blenlib/intern/math_color_blend_inline.c
index 8df824f6bb5..e7e3dac5462 100644
--- a/source/blender/blenlib/intern/math_color_blend_inline.c
+++ b/source/blender/blenlib/intern/math_color_blend_inline.c
@@ -7,13 +7,21 @@
  */
 
 #include "BLI_math_base.h"
+
+#if !BLI_MATH_DO_INLINE
+#  include "BLI_math_color_blend.h"
+#endif
+
 #include "BLI_math_color.h"
-#include "BLI_math_color_blend.h"
 #include "BLI_math_vector.h"
 
 #ifndef __MATH_COLOR_BLEND_INLINE_C__
 #  define __MATH_COLOR_BLEND_INLINE_C__
 
+#  ifdef __cplusplus
+extern "C" {
+#  endif
+
 /* don't add any saturation to a completely black and white image */
 #  define EPS_SATURATION 0.0005f
 #  define EPS_ALPHA 0.0005f
@@ -1127,4 +1135,8 @@ MINLINE void blend_color_interpolate_float(float dst[4],
 #  undef EPS_SATURATION
 #  undef EPS_ALPHA
 
+#  ifdef __cplusplus
+}
+#  endif
+
 #endif /* __MATH_COLOR_BLEND_INLINE_C__ */
diff --git a/source/blender/blenlib/intern/math_vector.cc b/source/blender/blenlib/intern/math_vector.cc
index 3a5100ad70f..480470eca6b 100644
--- a/source/blender/blenlib/intern/math_vector.cc
+++ b/source/blender/blenlib/intern/math_vector.cc
@@ -6,6 +6,7 @@
  * \ingroup bli
  */
 
+#include "BLI_math_base.h"
 #include "BLI_math_vector.h"
 
 #include "BLI_math_base_safe.h"
diff --git a/source/blender/blenlib/intern/math_vector_inline.c b/source/blender/blenlib/intern/math_vector_inline.c
index 739854e8138..b0845db0784 100644
--- a/source/blender/blenlib/intern/math_vector_inline.c
+++ b/source/blender/blenlib/intern/math_vector_inline.c
@@ -10,6 +10,7 @@
 #define __MATH_VECTOR_INLINE_C__
 
 #include "BLI_math_base.h"
+#include "BLI_utildefines.h"
 
 /********************************** Init *************************************/
 
@@ -634,6 +635,8 @@ MINLINE float dot_v3v3(const float a[3], const float b[3])
   return a[0] * b[0] + a[1] * b[1] + a[2] * b[2];
 }
 
+MINLINE bool is_zero_v3(const float v[3]);
+
 MINLINE float dot_v3v3v3(const float p[3], const float a[3], const float b[3])
 {
   float vec1[3], vec2[3];
diff --git a/source/blender/blenlib/intern/task_pool.cc b/source/blender/blenlib/intern/task_pool.cc
index 61565a85a2b..2b6f1dce9d1 100644
--- a/source/blender/blenlib/intern/task_pool.cc
+++ b/source/blender/blenlib/intern/task_pool.cc
@@ -8,6 +8,7 @@
  * Task pool to run tasks in parallel.
  */
 
+#include <atomic>
 #include <cstdlib>
 #include <memory>
 #include <utility>
diff --git a/source/blender/blenlib/tests/BLI_math_matrix_test.cc b/source/blender/blenlib/tests/BLI_math_matrix_test.cc
index a310be5930b..ed62a76b75f 100644
--- a/source/blender/blenlib/tests/BLI_math_matrix_test.cc
+++ b/source/blender/blenlib/tests/BLI_math_matrix_test.cc
@@ -4,6 +4,7 @@
 
 #include "testing/testing.h"
 
+#include "BLI_math_base.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_matrix.hh"
 #include "BLI_math_rotation.h"
diff --git a/source/blender/blenlib/tests/BLI_math_rotation_types_test.cc b/source/blender/blenlib/tests/BLI_math_rotation_types_test.cc
index 011e1887251..24e9c54cd4c 100644
--- a/source/blender/blenlib/tests/BLI_math_rotation_types_test.cc
+++ b/source/blender/blenlib/tests/BLI_math_rotation_types_test.cc
@@ -6,6 +6,7 @@
 
 #include "DNA_action_types.h"
 
+#include "BLI_math_base.h"
 #include "BLI_math_rotation.h"
 #include "BLI_math_rotation.hh"
 #include "BLI_math_rotation_types.hh"
diff --git a/source/blender/blenloader/BLO_writefile.hh b/source/blender/blenloader/BLO_writefile.hh
index 2bbc7f3be55..70435617866 100644
--- a/source/blender/blenloader/BLO_writefile.hh
+++ b/source/blender/blenloader/BLO_writefile.hh
@@ -9,6 +9,8 @@
  * \brief external `writefile.cc` function prototypes.
  */
 
+#include "BLI_sys_types.h"
+
 struct BlendThumbnail;
 struct Main;
 struct MemFile;
diff --git a/source/blender/blenloader/intern/versioning_common.hh b/source/blender/blenloader/intern/versioning_common.hh
index 84a13eb8e5c..89c5e570e17 100644
--- a/source/blender/blenloader/intern/versioning_common.hh
+++ b/source/blender/blenloader/intern/versioning_common.hh
@@ -11,6 +11,8 @@
 #include "BLI_function_ref.hh"
 #include "BLI_map.hh"
 
+#include "DNA_node_types.h"
+
 struct ARegion;
 struct bNode;
 struct bNodeSocket;
diff --git a/source/blender/bmesh/bmesh.hh b/source/blender/bmesh/bmesh.hh
index f1b9a30641d..3daabde3c7c 100644
--- a/source/blender/bmesh/bmesh.hh
+++ b/source/blender/bmesh/bmesh.hh
@@ -182,35 +182,35 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "bmesh_class.hh"
+#include "bmesh_class.hh"  // IWYU pragma: export
 
 /* include the rest of the API */
-#include "intern/bmesh_error.hh"
-#include "intern/bmesh_operator_api.hh"
+#include "intern/bmesh_error.hh"         // IWYU pragma: export
+#include "intern/bmesh_operator_api.hh"  // IWYU pragma: export
 
-#include "intern/bmesh_callback_generic.hh"
-#include "intern/bmesh_construct.hh"
-#include "intern/bmesh_core.hh"
-#include "intern/bmesh_delete.hh"
-#include "intern/bmesh_edgeloop.hh"
-#include "intern/bmesh_interp.hh"
-#include "intern/bmesh_iterators.hh"
-#include "intern/bmesh_log.hh"
-#include "intern/bmesh_marking.hh"
-#include "intern/bmesh_mesh.hh"
-#include "intern/bmesh_mesh_convert.hh"
-#include "intern/bmesh_mesh_debug.hh"
-#include "intern/bmesh_mesh_duplicate.hh"
-#include "intern/bmesh_mesh_normals.hh"
-#include "intern/bmesh_mesh_partial_update.hh"
-#include "intern/bmesh_mesh_tessellate.hh"
-#include "intern/bmesh_mesh_validate.hh"
-#include "intern/bmesh_mods.hh"
-#include "intern/bmesh_operators.hh"
-#include "intern/bmesh_polygon.hh"
-#include "intern/bmesh_polygon_edgenet.hh"
-#include "intern/bmesh_query.hh"
-#include "intern/bmesh_query_uv.hh"
-#include "intern/bmesh_walkers.hh"
+#include "intern/bmesh_callback_generic.hh"     // IWYU pragma: export
+#include "intern/bmesh_construct.hh"            // IWYU pragma: export
+#include "intern/bmesh_core.hh"                 // IWYU pragma: export
+#include "intern/bmesh_delete.hh"               // IWYU pragma: export
+#include "intern/bmesh_edgeloop.hh"             // IWYU pragma: export
+#include "intern/bmesh_interp.hh"               // IWYU pragma: export
+#include "intern/bmesh_iterators.hh"            // IWYU pragma: export
+#include "intern/bmesh_log.hh"                  // IWYU pragma: export
+#include "intern/bmesh_marking.hh"              // IWYU pragma: export
+#include "intern/bmesh_mesh.hh"                 // IWYU pragma: export
+#include "intern/bmesh_mesh_convert.hh"         // IWYU pragma: export
+#include "intern/bmesh_mesh_debug.hh"           // IWYU pragma: export
+#include "intern/bmesh_mesh_duplicate.hh"       // IWYU pragma: export
+#include "intern/bmesh_mesh_normals.hh"         // IWYU pragma: export
+#include "intern/bmesh_mesh_partial_update.hh"  // IWYU pragma: export
+#include "intern/bmesh_mesh_tessellate.hh"      // IWYU pragma: export
+#include "intern/bmesh_mesh_validate.hh"        // IWYU pragma: export
+#include "intern/bmesh_mods.hh"                 // IWYU pragma: export
+#include "intern/bmesh_operators.hh"            // IWYU pragma: export
+#include "intern/bmesh_polygon.hh"              // IWYU pragma: export
+#include "intern/bmesh_polygon_edgenet.hh"      // IWYU pragma: export
+#include "intern/bmesh_query.hh"                // IWYU pragma: export
+#include "intern/bmesh_query_uv.hh"             // IWYU pragma: export
+#include "intern/bmesh_walkers.hh"              // IWYU pragma: export
 
-#include "intern/bmesh_inline.hh"
+#include "intern/bmesh_inline.hh"  // IWYU pragma: export
diff --git a/source/blender/bmesh/bmesh_class.hh b/source/blender/bmesh/bmesh_class.hh
index 2aeff28f615..f2ebb140531 100644
--- a/source/blender/bmesh/bmesh_class.hh
+++ b/source/blender/bmesh/bmesh_class.hh
@@ -12,6 +12,10 @@
  */
 
 #include "BLI_assert.h"
+#include "BLI_sys_types.h"
+
+#include "DNA_customdata_types.h"
+#include "DNA_listBase.h"
 
 /* disable holes for now,
  * these are ifdef'd because they use more memory and can't be saved in DNA currently */
diff --git a/source/blender/bmesh/bmesh_tools.hh b/source/blender/bmesh/bmesh_tools.hh
index 9bf0427e779..d6b79af036c 100644
--- a/source/blender/bmesh/bmesh_tools.hh
+++ b/source/blender/bmesh/bmesh_tools.hh
@@ -11,17 +11,17 @@
  * These can be used by both Modifiers and BMesh-Operators.
  */
 
-#include "tools/bmesh_beautify.hh"
-#include "tools/bmesh_bevel.hh"
-#include "tools/bmesh_bisect_plane.hh"
-#include "tools/bmesh_boolean.hh"
-#include "tools/bmesh_decimate.hh"
-#include "tools/bmesh_edgenet.hh"
-#include "tools/bmesh_edgesplit.hh"
-#include "tools/bmesh_path.hh"
-#include "tools/bmesh_path_region.hh"
-#include "tools/bmesh_path_region_uv.hh"
-#include "tools/bmesh_path_uv.hh"
-#include "tools/bmesh_region_match.hh"
-#include "tools/bmesh_separate.hh"
-#include "tools/bmesh_triangulate.hh"
+#include "tools/bmesh_beautify.hh"        // IWYU pragma: export
+#include "tools/bmesh_bevel.hh"           // IWYU pragma: export
+#include "tools/bmesh_bisect_plane.hh"    // IWYU pragma: export
+#include "tools/bmesh_boolean.hh"         // IWYU pragma: export
+#include "tools/bmesh_decimate.hh"        // IWYU pragma: export
+#include "tools/bmesh_edgenet.hh"         // IWYU pragma: export
+#include "tools/bmesh_edgesplit.hh"       // IWYU pragma: export
+#include "tools/bmesh_path.hh"            // IWYU pragma: export
+#include "tools/bmesh_path_region.hh"     // IWYU pragma: export
+#include "tools/bmesh_path_region_uv.hh"  // IWYU pragma: export
+#include "tools/bmesh_path_uv.hh"         // IWYU pragma: export
+#include "tools/bmesh_region_match.hh"    // IWYU pragma: export
+#include "tools/bmesh_separate.hh"        // IWYU pragma: export
+#include "tools/bmesh_triangulate.hh"     // IWYU pragma: export
diff --git a/source/blender/bmesh/intern/bmesh_callback_generic.hh b/source/blender/bmesh/intern/bmesh_callback_generic.hh
index 1d780ab28fd..182997d47d0 100644
--- a/source/blender/bmesh/intern/bmesh_callback_generic.hh
+++ b/source/blender/bmesh/intern/bmesh_callback_generic.hh
@@ -8,6 +8,8 @@
  * \ingroup bmesh
  */
 
+struct BMElem;
+
 bool BM_elem_cb_check_hflag_enabled(BMElem *, void *user_data);
 bool BM_elem_cb_check_hflag_disabled(BMElem *, void *user_data);
 bool BM_elem_cb_check_hflag_ex(BMElem *, void *user_data);
diff --git a/source/blender/bmesh/intern/bmesh_construct.hh b/source/blender/bmesh/intern/bmesh_construct.hh
index 7a5cf287135..f0d89c98a2a 100644
--- a/source/blender/bmesh/intern/bmesh_construct.hh
+++ b/source/blender/bmesh/intern/bmesh_construct.hh
@@ -8,9 +8,11 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_class.hh"
 #include "bmesh_core.hh"
 
 struct BMAllocTemplate;
+struct BMCustomDataCopyMap;
 struct Mesh;
 
 /**
diff --git a/source/blender/bmesh/intern/bmesh_core.hh b/source/blender/bmesh/intern/bmesh_core.hh
index ceaf3be2cf7..2053ec7f777 100644
--- a/source/blender/bmesh/intern/bmesh_core.hh
+++ b/source/blender/bmesh/intern/bmesh_core.hh
@@ -8,6 +8,10 @@
  * \ingroup bmesh
  */
 
+#include "BKE_customdata.hh"
+
+#include "bmesh_class.hh"
+
 /**
  * When copying between different BMesh objects,
  * `copy_verts` & `copy_edges` should always be true.
diff --git a/source/blender/bmesh/intern/bmesh_delete.hh b/source/blender/bmesh/intern/bmesh_delete.hh
index 64e1cb01435..569a3cde999 100644
--- a/source/blender/bmesh/intern/bmesh_delete.hh
+++ b/source/blender/bmesh/intern/bmesh_delete.hh
@@ -8,6 +8,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_class.hh"
+
 void BMO_mesh_delete_oflag_tagged(BMesh *bm, short oflag, char htype);
 void BM_mesh_delete_hflag_tagged(BMesh *bm, char hflag, char htype);
 
diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.hh b/source/blender/bmesh/intern/bmesh_edgeloop.hh
index 12286ae42a6..e9d92f18040 100644
--- a/source/blender/bmesh/intern/bmesh_edgeloop.hh
+++ b/source/blender/bmesh/intern/bmesh_edgeloop.hh
@@ -8,6 +8,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_class.hh"
+
 struct BMEdgeLoopStore;
 struct GSet;
 struct ListBase;
diff --git a/source/blender/bmesh/intern/bmesh_error.hh b/source/blender/bmesh/intern/bmesh_error.hh
index 7f42c496ac1..87ace4d2fa4 100644
--- a/source/blender/bmesh/intern/bmesh_error.hh
+++ b/source/blender/bmesh/intern/bmesh_error.hh
@@ -10,6 +10,8 @@
 
 #include "bmesh_operator_api.hh"
 
+#include "bmesh_class.hh"
+
 /*----------- BMOP error system ----------*/
 
 /**
diff --git a/source/blender/bmesh/intern/bmesh_inline.hh b/source/blender/bmesh/intern/bmesh_inline.hh
index 7c2514444cc..2b9cffb11c0 100644
--- a/source/blender/bmesh/intern/bmesh_inline.hh
+++ b/source/blender/bmesh/intern/bmesh_inline.hh
@@ -10,6 +10,11 @@
 
 #pragma once
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_compat.h"
+
+#include "bmesh_class.hh"
+
 /* stuff for dealing with header flags */
 #define BM_elem_flag_test(ele, hflag) _bm_elem_flag_test(&(ele)->head, hflag)
 #define BM_elem_flag_test_bool(ele, hflag) _bm_elem_flag_test_bool(&(ele)->head, hflag)
diff --git a/source/blender/bmesh/intern/bmesh_interp.hh b/source/blender/bmesh/intern/bmesh_interp.hh
index 7a7d37f809e..689b8108a98 100644
--- a/source/blender/bmesh/intern/bmesh_interp.hh
+++ b/source/blender/bmesh/intern/bmesh_interp.hh
@@ -8,6 +8,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_class.hh"
+
 struct LinkNode;
 struct MemArena;
 
diff --git a/source/blender/bmesh/intern/bmesh_iterators.hh b/source/blender/bmesh/intern/bmesh_iterators.hh
index 39c837e72b8..8d5d072b694 100644
--- a/source/blender/bmesh/intern/bmesh_iterators.hh
+++ b/source/blender/bmesh/intern/bmesh_iterators.hh
@@ -23,6 +23,9 @@
 #include "BLI_compiler_attrs.h"
 #include "BLI_mempool.h"
 
+#include "bmesh_class.hh"
+#include "intern/bmesh_operator_api.hh"
+
 /* these iterator over all elements of a specific
  * type in the mesh.
  *
diff --git a/source/blender/bmesh/intern/bmesh_iterators_inline.hh b/source/blender/bmesh/intern/bmesh_iterators_inline.hh
index 8cdf5f34b25..be9dac64295 100644
--- a/source/blender/bmesh/intern/bmesh_iterators_inline.hh
+++ b/source/blender/bmesh/intern/bmesh_iterators_inline.hh
@@ -10,6 +10,9 @@
 
 #pragma once
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_compat.h"
+
 /* inline here optimizes out the switch statement when called with
  * constant values (which is very common), nicer for loop-in-loop situations */
 
diff --git a/source/blender/bmesh/intern/bmesh_marking.hh b/source/blender/bmesh/intern/bmesh_marking.hh
index d81042777fc..5cb9e3d0124 100644
--- a/source/blender/bmesh/intern/bmesh_marking.hh
+++ b/source/blender/bmesh/intern/bmesh_marking.hh
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "bmesh_class.hh"
+
 /** \file
  * \ingroup bmesh
  */
diff --git a/source/blender/bmesh/intern/bmesh_mesh.hh b/source/blender/bmesh/intern/bmesh_mesh.hh
index 24fec9693f0..196c9ee8223 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.hh
+++ b/source/blender/bmesh/intern/bmesh_mesh.hh
@@ -14,6 +14,8 @@
 
 #include "bmesh_class.hh"
 
+#include "intern/bmesh_operator_api.hh"
+
 struct BMAllocTemplate;
 
 void BM_mesh_elem_toolflags_ensure(BMesh *bm);
diff --git a/source/blender/bmesh/intern/bmesh_mesh_duplicate.hh b/source/blender/bmesh/intern/bmesh_mesh_duplicate.hh
index ebf41bcfa3e..0c35bf4b64d 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_duplicate.hh
+++ b/source/blender/bmesh/intern/bmesh_mesh_duplicate.hh
@@ -8,6 +8,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_class.hh"
+
 /**
  * Geometry must be completely isolated.
  */
diff --git a/source/blender/bmesh/intern/bmesh_mesh_normals.hh b/source/blender/bmesh/intern/bmesh_mesh_normals.hh
index f9c86fdb1a5..c6e821f4148 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_normals.hh
+++ b/source/blender/bmesh/intern/bmesh_mesh_normals.hh
@@ -8,6 +8,9 @@
  * \ingroup bmesh
  */
 
+#include "BLI_math_vector_types.hh"
+#include "BLI_span.hh"
+
 #include "bmesh_class.hh"
 
 struct BMPartialUpdate;
diff --git a/source/blender/bmesh/intern/bmesh_mesh_partial_update.cc b/source/blender/bmesh/intern/bmesh_mesh_partial_update.cc
index 70ec7a4dedb..0b6c70ef96a 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_partial_update.cc
+++ b/source/blender/bmesh/intern/bmesh_mesh_partial_update.cc
@@ -38,6 +38,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_bitmap.h"
+#include "BLI_math_base.h"
 
 #include "bmesh.hh"
 
diff --git a/source/blender/bmesh/intern/bmesh_mesh_partial_update.hh b/source/blender/bmesh/intern/bmesh_mesh_partial_update.hh
index 1c9603b11fb..4ccac4ddfc4 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_partial_update.hh
+++ b/source/blender/bmesh/intern/bmesh_mesh_partial_update.hh
@@ -10,6 +10,8 @@
 
 #include "BLI_compiler_attrs.h"
 
+#include "bmesh_class.hh"
+
 /**
  * Parameters used to determine which kinds of data needs to be generated.
  */
diff --git a/source/blender/bmesh/intern/bmesh_mesh_tessellate.hh b/source/blender/bmesh/intern/bmesh_mesh_tessellate.hh
index a00896af08c..b49032cae04 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_tessellate.hh
+++ b/source/blender/bmesh/intern/bmesh_mesh_tessellate.hh
@@ -8,6 +8,10 @@
  * \ingroup bmesh
  */
 
+#include "BLI_span.hh"
+
+#include "bmesh_class.hh"
+
 struct BMPartialUpdate;
 
 struct BMeshCalcTessellation_Params {
diff --git a/source/blender/bmesh/intern/bmesh_mesh_validate.hh b/source/blender/bmesh/intern/bmesh_mesh_validate.hh
index 178c230f152..88003c6fe8f 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_validate.hh
+++ b/source/blender/bmesh/intern/bmesh_mesh_validate.hh
@@ -8,6 +8,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_class.hh"
+
 /**
  * Check of this #BMesh is valid,
  * this function can be slow since its intended to help with debugging.
diff --git a/source/blender/bmesh/intern/bmesh_mods.hh b/source/blender/bmesh/intern/bmesh_mods.hh
index 0034d60a709..2d540520387 100644
--- a/source/blender/bmesh/intern/bmesh_mods.hh
+++ b/source/blender/bmesh/intern/bmesh_mods.hh
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "bmesh_class.hh"
+
 /** \file
  * \ingroup bmesh
  */
diff --git a/source/blender/bmesh/intern/bmesh_operator_api.hh b/source/blender/bmesh/intern/bmesh_operator_api.hh
index 55d7b0a5a61..bda6c2dd374 100644
--- a/source/blender/bmesh/intern/bmesh_operator_api.hh
+++ b/source/blender/bmesh/intern/bmesh_operator_api.hh
@@ -9,9 +9,12 @@
  */
 
 #include "BLI_ghash.h"
+#include "BLI_utildefines.h"
 
 #include <stdarg.h>
 
+#include "bmesh_class.hh"
+
 /**
  * operators represent logical, executable mesh modules.  all topological
  * operations involving a bmesh has to go through them.
diff --git a/source/blender/bmesh/intern/bmesh_operator_api_inline.hh b/source/blender/bmesh/intern/bmesh_operator_api_inline.hh
index fb62b4c5949..1fce45a173b 100644
--- a/source/blender/bmesh/intern/bmesh_operator_api_inline.hh
+++ b/source/blender/bmesh/intern/bmesh_operator_api_inline.hh
@@ -10,6 +10,15 @@
 
 #pragma once
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_compat.h"
+
+#include "bmesh_class.hh"
+
+#include "intern/bmesh_operator_api.hh"
+
+struct BMOperator;
+
 /* Tool Flag API: Tool code must never put junk in header flags (#BMHeader.hflag)
  * instead, use this API to set flags.
  * If you need to store a value per element, use a #GHash or a mapping slot to do it. */
diff --git a/source/blender/bmesh/intern/bmesh_operators.hh b/source/blender/bmesh/intern/bmesh_operators.hh
index 5b1d0f0f4dd..e75648df07a 100644
--- a/source/blender/bmesh/intern/bmesh_operators.hh
+++ b/source/blender/bmesh/intern/bmesh_operators.hh
@@ -8,6 +8,8 @@
  * \ingroup bmesh
  */
 
+#include "intern/bmesh_operator_api.hh"
+
 /* See comments in `intern/bmesh_opdefines.cc` for documentation of specific operators. */
 
 /*--------defines/enumerations for specific operators-------*/
diff --git a/source/blender/bmesh/intern/bmesh_polygon.hh b/source/blender/bmesh/intern/bmesh_polygon.hh
index e9cc88c7957..14c32c5e157 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.hh
+++ b/source/blender/bmesh/intern/bmesh_polygon.hh
@@ -14,6 +14,8 @@ struct Heap;
 #include "BLI_math_vector_types.hh"
 #include "BLI_span.hh"
 
+#include "bmesh_class.hh"
+
 /**
  * For tools that insist on using triangles, ideally we would cache this data.
  *
diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.hh b/source/blender/bmesh/intern/bmesh_polygon_edgenet.hh
index f772d0ddd4c..deb548ffb0a 100644
--- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.hh
+++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.hh
@@ -6,6 +6,8 @@
 
 #include "BLI_vector.hh"
 
+#include "bmesh_class.hh"
+
 /** \file
  * \ingroup bmesh
  */
diff --git a/source/blender/bmesh/intern/bmesh_private.hh b/source/blender/bmesh/intern/bmesh_private.hh
index 8a53f72ea84..c0112b8d670 100644
--- a/source/blender/bmesh/intern/bmesh_private.hh
+++ b/source/blender/bmesh/intern/bmesh_private.hh
@@ -12,6 +12,8 @@
  * parts of the bmesh internals.
  */
 
+#include "bmesh_class.hh"
+
 /* returns positive nonzero on error */
 
 #ifdef NDEBUG
diff --git a/source/blender/bmesh/intern/bmesh_query.cc b/source/blender/bmesh/intern/bmesh_query.cc
index ea0dba07205..c10c71ca987 100644
--- a/source/blender/bmesh/intern/bmesh_query.cc
+++ b/source/blender/bmesh/intern/bmesh_query.cc
@@ -17,6 +17,7 @@
 
 #include "BLI_alloca.h"
 #include "BLI_linklist.h"
+#include "BLI_math_base.h"
 #include "BLI_math_geom.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
diff --git a/source/blender/bmesh/intern/bmesh_query.hh b/source/blender/bmesh/intern/bmesh_query.hh
index 122661b3ffc..9b58c9fe905 100644
--- a/source/blender/bmesh/intern/bmesh_query.hh
+++ b/source/blender/bmesh/intern/bmesh_query.hh
@@ -8,6 +8,11 @@
  * \ingroup bmesh
  */
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_compat.h"
+
+#include "bmesh_class.hh"
+
 /**
  * Returns true if the vertex is used in a given face.
  */
diff --git a/source/blender/bmesh/intern/bmesh_query_inline.hh b/source/blender/bmesh/intern/bmesh_query_inline.hh
index 5e4aaa5d724..4511561e00c 100644
--- a/source/blender/bmesh/intern/bmesh_query_inline.hh
+++ b/source/blender/bmesh/intern/bmesh_query_inline.hh
@@ -8,6 +8,12 @@
 
 #pragma once
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_compat.h"
+#include "BLI_utildefines.h"
+
+#include "bmesh_class.hh"
+
 /**
  * Returns whether or not a given vertex is
  * is part of a given edge.
diff --git a/source/blender/bmesh/intern/bmesh_query_uv.hh b/source/blender/bmesh/intern/bmesh_query_uv.hh
index 1848f2dc199..98e8c48ebb9 100644
--- a/source/blender/bmesh/intern/bmesh_query_uv.hh
+++ b/source/blender/bmesh/intern/bmesh_query_uv.hh
@@ -8,6 +8,10 @@
  * \ingroup bmesh
  */
 
+#include "BKE_customdata.hh"
+
+#include "bmesh_class.hh"
+
 /**
  * Retrieve the custom data offsets for the UV map.
  * \param layer: The layer index (where 0 is the first UV map).
diff --git a/source/blender/bmesh/intern/bmesh_structure.hh b/source/blender/bmesh/intern/bmesh_structure.hh
index 4b76136598b..cbc110c7b6e 100644
--- a/source/blender/bmesh/intern/bmesh_structure.hh
+++ b/source/blender/bmesh/intern/bmesh_structure.hh
@@ -15,6 +15,11 @@
  * descriptive comments.  but seriously, don't use this stuff.
  */
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_compat.h"
+
+#include "bmesh_class.hh"
+
 /* LOOP CYCLE MANAGEMENT */
 /*****loop cycle functions, e.g. loops surrounding a face**** */
 bool bmesh_loop_validate(BMFace *f) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
diff --git a/source/blender/bmesh/intern/bmesh_structure_inline.hh b/source/blender/bmesh/intern/bmesh_structure_inline.hh
index e42b81089b0..51d723bdc60 100644
--- a/source/blender/bmesh/intern/bmesh_structure_inline.hh
+++ b/source/blender/bmesh/intern/bmesh_structure_inline.hh
@@ -10,6 +10,12 @@
 
 #pragma once
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_compat.h"
+
+#include "bmesh_class.hh"
+#include "intern/bmesh_query.hh"
+
 ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2)
     BLI_INLINE BMDiskLink *bmesh_disk_edge_link_from_vert(const BMEdge *e, const BMVert *v)
 {
diff --git a/source/blender/bmesh/intern/bmesh_walkers.hh b/source/blender/bmesh/intern/bmesh_walkers.hh
index 58890e765b4..13ae3724f1a 100644
--- a/source/blender/bmesh/intern/bmesh_walkers.hh
+++ b/source/blender/bmesh/intern/bmesh_walkers.hh
@@ -8,6 +8,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_class.hh"
+
 /*
  * NOTE: do NOT modify topology while walking a mesh!
  */
diff --git a/source/blender/bmesh/intern/bmesh_walkers_private.hh b/source/blender/bmesh/intern/bmesh_walkers_private.hh
index 9a8e0073e3a..8fcd8a50f03 100644
--- a/source/blender/bmesh/intern/bmesh_walkers_private.hh
+++ b/source/blender/bmesh/intern/bmesh_walkers_private.hh
@@ -10,6 +10,10 @@
  * BMesh walker API.
  */
 
+#include "bmesh_class.hh"
+
+struct BMWalker;
+
 extern BMWalker *bm_walker_types[];
 extern const int bm_totwalkers;
 
diff --git a/source/blender/bmesh/operators/bmo_dissolve.cc b/source/blender/bmesh/operators/bmo_dissolve.cc
index 7a8b255ff63..c9499101ec5 100644
--- a/source/blender/bmesh/operators/bmo_dissolve.cc
+++ b/source/blender/bmesh/operators/bmo_dissolve.cc
@@ -8,8 +8,7 @@
  * Removes isolated geometry regions without creating holes in the mesh.
  */
 
-#include "MEM_guardedalloc.h"
-
+#include "BLI_math_base.h"
 #include "BLI_math_vector.h"
 #include "BLI_stack.h"
 #include "BLI_vector.hh"
diff --git a/source/blender/bmesh/operators/bmo_extrude.cc b/source/blender/bmesh/operators/bmo_extrude.cc
index 6cc59c97d10..4b08388461e 100644
--- a/source/blender/bmesh/operators/bmo_extrude.cc
+++ b/source/blender/bmesh/operators/bmo_extrude.cc
@@ -13,6 +13,7 @@
 #include "DNA_meshdata_types.h"
 
 #include "BLI_buffer.h"
+#include "BLI_math_base.h"
 #include "BLI_math_geom.h"
 #include "BLI_math_vector.h"
 
diff --git a/source/blender/bmesh/operators/bmo_join_triangles.cc b/source/blender/bmesh/operators/bmo_join_triangles.cc
index 49ffee1c7dc..c50929420d3 100644
--- a/source/blender/bmesh/operators/bmo_join_triangles.cc
+++ b/source/blender/bmesh/operators/bmo_join_triangles.cc
@@ -14,6 +14,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_heap.h"
+#include "BLI_math_base.h"
 #include "BLI_math_geom.h"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
diff --git a/source/blender/bmesh/operators/bmo_mirror.cc b/source/blender/bmesh/operators/bmo_mirror.cc
index 1073315221b..8efb7fbb86d 100644
--- a/source/blender/bmesh/operators/bmo_mirror.cc
+++ b/source/blender/bmesh/operators/bmo_mirror.cc
@@ -8,7 +8,7 @@
  * Basic mirror, optionally with UVs's.
  */
 
-#include "MEM_guardedalloc.h"
+#include "BLI_math_base.h"
 
 #include "BKE_customdata.hh"
 
diff --git a/source/blender/bmesh/operators/bmo_rotate_edges.cc b/source/blender/bmesh/operators/bmo_rotate_edges.cc
index de929969391..8af2d8de378 100644
--- a/source/blender/bmesh/operators/bmo_rotate_edges.cc
+++ b/source/blender/bmesh/operators/bmo_rotate_edges.cc
@@ -8,6 +8,8 @@
  * Rotate edges topology that share two faces.
  */
 
+#include <cfloat>
+
 #include "MEM_guardedalloc.h"
 
 #include "BLI_heap.h"
diff --git a/source/blender/bmesh/operators/bmo_unsubdivide.cc b/source/blender/bmesh/operators/bmo_unsubdivide.cc
index ab09932842f..39d097c8b6c 100644
--- a/source/blender/bmesh/operators/bmo_unsubdivide.cc
+++ b/source/blender/bmesh/operators/bmo_unsubdivide.cc
@@ -9,7 +9,7 @@
  * a subdivide operation.
  */
 
-#include "BLI_utildefines.h"
+#include "BLI_math_base.h"
 
 #include "bmesh.hh"
 #include "bmesh_tools.hh"
diff --git a/source/blender/bmesh/tools/bmesh_beautify.hh b/source/blender/bmesh/tools/bmesh_beautify.hh
index f9aba8ed9c3..30a87269ed3 100644
--- a/source/blender/bmesh/tools/bmesh_beautify.hh
+++ b/source/blender/bmesh/tools/bmesh_beautify.hh
@@ -8,6 +8,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_class.hh"
+
 enum {
   /** Vertices tags must match (special case). */
   VERT_RESTRICT_TAG = (1 << 0),
diff --git a/source/blender/bmesh/tools/bmesh_bevel.cc b/source/blender/bmesh/tools/bmesh_bevel.cc
index 630799d416b..2a6afbdee9d 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.cc
+++ b/source/blender/bmesh/tools/bmesh_bevel.cc
@@ -15,6 +15,7 @@
 #include "DNA_modifier_types.h"
 
 #include "BLI_alloca.h"
+#include "BLI_math_base.h"
 #include "BLI_math_geom.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
diff --git a/source/blender/bmesh/tools/bmesh_bevel.hh b/source/blender/bmesh/tools/bmesh_bevel.hh
index 4f034b20a98..be539e46bbf 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.hh
+++ b/source/blender/bmesh/tools/bmesh_bevel.hh
@@ -8,6 +8,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_class.hh"
+
 struct CurveProfile;
 struct MDeformVert;
 
diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.hh b/source/blender/bmesh/tools/bmesh_bisect_plane.hh
index a625c078cb8..7f385689b4a 100644
--- a/source/blender/bmesh/tools/bmesh_bisect_plane.hh
+++ b/source/blender/bmesh/tools/bmesh_bisect_plane.hh
@@ -8,6 +8,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_class.hh"
+
 /**
  * \param use_snap_center: Snap verts onto the plane.
  * \param use_tag: Only bisect tagged edges and faces.
diff --git a/source/blender/bmesh/tools/bmesh_boolean.cc b/source/blender/bmesh/tools/bmesh_boolean.cc
index a34ede82f89..6f5c4bfbc65 100644
--- a/source/blender/bmesh/tools/bmesh_boolean.cc
+++ b/source/blender/bmesh/tools/bmesh_boolean.cc
@@ -11,6 +11,7 @@
 #include <functional>
 
 #include "BLI_array.hh"
+#include "BLI_math_base.h"
 #include "BLI_math_mpq.hh"
 #include "BLI_mesh_boolean.hh"
 #include "BLI_mesh_intersect.hh"
diff --git a/source/blender/bmesh/tools/bmesh_boolean.hh b/source/blender/bmesh/tools/bmesh_boolean.hh
index 26ed8fe25d8..8c3cb60be3f 100644
--- a/source/blender/bmesh/tools/bmesh_boolean.hh
+++ b/source/blender/bmesh/tools/bmesh_boolean.hh
@@ -8,6 +8,12 @@
  * \ingroup bmesh
  */
 
+#include <array>
+
+#include "BLI_span.hh"
+
+#include "bmesh_class.hh"
+
 bool BM_mesh_boolean(BMesh *bm,
                      blender::Span<std::array<BMLoop *, 3>> looptris,
                      int (*test_fn)(BMFace *f, void *user_data),
diff --git a/source/blender/bmesh/tools/bmesh_decimate.hh b/source/blender/bmesh/tools/bmesh_decimate.hh
index e45885cdd3f..c6821636255 100644
--- a/source/blender/bmesh/tools/bmesh_decimate.hh
+++ b/source/blender/bmesh/tools/bmesh_decimate.hh
@@ -8,6 +8,10 @@
  * \ingroup bmesh
  */
 
+#include "intern/bmesh_operator_api.hh"
+
+#include "bmesh_class.hh"
+
 /**
  * \brief BM_mesh_decimate
  * \param bm: The mesh
diff --git a/source/blender/bmesh/tools/bmesh_edgenet.hh b/source/blender/bmesh/tools/bmesh_edgenet.hh
index 939166b4a51..910f2a1e950 100644
--- a/source/blender/bmesh/tools/bmesh_edgenet.hh
+++ b/source/blender/bmesh/tools/bmesh_edgenet.hh
@@ -8,6 +8,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_class.hh"
+
 /**
  * Fill in faces from an edgenet made up of boundary and wire edges.
  *
diff --git a/source/blender/bmesh/tools/bmesh_edgesplit.hh b/source/blender/bmesh/tools/bmesh_edgesplit.hh
index ff58c0da0a0..4ab9027fb1e 100644
--- a/source/blender/bmesh/tools/bmesh_edgesplit.hh
+++ b/source/blender/bmesh/tools/bmesh_edgesplit.hh
@@ -8,6 +8,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_class.hh"
+
 /**
  * \param use_verts: Use flagged verts instead of edges.
  * \param tag_only: Only split tagged edges.
diff --git a/source/blender/bmesh/tools/bmesh_intersect.hh b/source/blender/bmesh/tools/bmesh_intersect.hh
index b3d385e81cd..42fea95f7ad 100644
--- a/source/blender/bmesh/tools/bmesh_intersect.hh
+++ b/source/blender/bmesh/tools/bmesh_intersect.hh
@@ -8,6 +8,10 @@
  * \ingroup bmesh
  */
 
+#include "BLI_span.hh"
+
+#include "bmesh_class.hh"
+
 /**
  * Intersect tessellated faces
  * leaving the resulting edges tagged.
diff --git a/source/blender/bmesh/tools/bmesh_intersect_edges.hh b/source/blender/bmesh/tools/bmesh_intersect_edges.hh
index 56c64334eba..aa0a83af9af 100644
--- a/source/blender/bmesh/tools/bmesh_intersect_edges.hh
+++ b/source/blender/bmesh/tools/bmesh_intersect_edges.hh
@@ -8,5 +8,9 @@
 
 #pragma once
 
+#include "BLI_ghash.h"
+
+#include "bmesh_class.hh"
+
 bool BM_mesh_intersect_edges(
     BMesh *bm, char hflag, float dist, bool split_faces, GHash *r_targetmap);
diff --git a/source/blender/bmesh/tools/bmesh_path.hh b/source/blender/bmesh/tools/bmesh_path.hh
index c5d3bb9e48b..b0088ca0fe2 100644
--- a/source/blender/bmesh/tools/bmesh_path.hh
+++ b/source/blender/bmesh/tools/bmesh_path.hh
@@ -8,6 +8,13 @@
  * \ingroup bmesh
  */
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_sys_types.h"
+
+#include "bmesh_class.hh"
+
+struct LinkNode;
+
 struct BMCalcPathParams {
   uint use_topology_distance : 1;
   uint use_step_face : 1;
diff --git a/source/blender/bmesh/tools/bmesh_path_region.hh b/source/blender/bmesh/tools/bmesh_path_region.hh
index 50264e07f7d..c424aaf6122 100644
--- a/source/blender/bmesh/tools/bmesh_path_region.hh
+++ b/source/blender/bmesh/tools/bmesh_path_region.hh
@@ -8,6 +8,10 @@
  * \ingroup bmesh
  */
 
+#include "BLI_compiler_attrs.h"
+
+#include "bmesh_class.hh"
+
 struct LinkNode *BM_mesh_calc_path_region_vert(BMesh *bm,
                                                BMElem *ele_src,
                                                BMElem *ele_dst,
diff --git a/source/blender/bmesh/tools/bmesh_path_region_uv.hh b/source/blender/bmesh/tools/bmesh_path_region_uv.hh
index cc7eaa67fca..bac07daccaf 100644
--- a/source/blender/bmesh/tools/bmesh_path_region_uv.hh
+++ b/source/blender/bmesh/tools/bmesh_path_region_uv.hh
@@ -8,6 +8,10 @@
  * \ingroup bmesh
  */
 
+#include "BLI_linklist.h"
+
+#include "bmesh_class.hh"
+
 LinkNode *BM_mesh_calc_path_uv_region_vert(BMesh *bm,
                                            BMElem *ele_src,
                                            BMElem *ele_dst,
diff --git a/source/blender/bmesh/tools/bmesh_path_uv.hh b/source/blender/bmesh/tools/bmesh_path_uv.hh
index 720d3c264c2..69d6ad18be8 100644
--- a/source/blender/bmesh/tools/bmesh_path_uv.hh
+++ b/source/blender/bmesh/tools/bmesh_path_uv.hh
@@ -8,6 +8,11 @@
  * \ingroup bmesh
  */
 
+#include "BLI_linklist.h"
+#include "BLI_sys_types.h"
+
+#include "bmesh_class.hh"
+
 struct BMCalcPathUVParams {
   uint use_topology_distance : 1;
   uint use_step_face : 1;
diff --git a/source/blender/bmesh/tools/bmesh_region_match.hh b/source/blender/bmesh/tools/bmesh_region_match.hh
index 337c8d66da8..d9edb6dbcbf 100644
--- a/source/blender/bmesh/tools/bmesh_region_match.hh
+++ b/source/blender/bmesh/tools/bmesh_region_match.hh
@@ -8,6 +8,10 @@
  * \ingroup bmesh
  */
 
+#include "BLI_sys_types.h"
+
+#include "bmesh_class.hh"
+
 /**
  * Take a face-region and return a list of matching face-regions.
  *
diff --git a/source/blender/bmesh/tools/bmesh_separate.hh b/source/blender/bmesh/tools/bmesh_separate.hh
index 0c90c78cc37..9542c03ce09 100644
--- a/source/blender/bmesh/tools/bmesh_separate.hh
+++ b/source/blender/bmesh/tools/bmesh_separate.hh
@@ -8,6 +8,8 @@
  * \ingroup bmesh
  */
 
+#include "bmesh_class.hh"
+
 /**
  * Split all faces that match `filter_fn`.
  * \note
diff --git a/source/blender/bmesh/tools/bmesh_triangulate.hh b/source/blender/bmesh/tools/bmesh_triangulate.hh
index 57d9e4accc2..b4f87fe5097 100644
--- a/source/blender/bmesh/tools/bmesh_triangulate.hh
+++ b/source/blender/bmesh/tools/bmesh_triangulate.hh
@@ -10,6 +10,8 @@
 
 #pragma once
 
+#include "bmesh_class.hh"
+
 void BM_mesh_triangulate(BMesh *bm,
                          int quad_method,
                          int ngon_method,
diff --git a/source/blender/bmesh/tools/bmesh_wireframe.cc b/source/blender/bmesh/tools/bmesh_wireframe.cc
index 8edfb203f57..83fc91b42e0 100644
--- a/source/blender/bmesh/tools/bmesh_wireframe.cc
+++ b/source/blender/bmesh/tools/bmesh_wireframe.cc
@@ -14,6 +14,7 @@
 
 #include "bmesh.hh"
 
+#include "BLI_math_base.h"
 #include "BLI_math_geom.h"
 #include "BLI_math_vector.h"
 
diff --git a/source/blender/bmesh/tools/bmesh_wireframe.hh b/source/blender/bmesh/tools/bmesh_wireframe.hh
index 6ba20ca7f45..bebbeee92a0 100644
--- a/source/blender/bmesh/tools/bmesh_wireframe.hh
+++ b/source/blender/bmesh/tools/bmesh_wireframe.hh
@@ -10,6 +10,8 @@
 
 #pragma once
 
+#include "bmesh_class.hh"
+
 /**
  * \param defgrp_index: Vertex group index, -1 for no vertex groups.
  *
diff --git a/source/blender/compositor/cached_resources/COM_morphological_distance_feather_weights.hh b/source/blender/compositor/cached_resources/COM_morphological_distance_feather_weights.hh
index d9cd8859912..24acc4b76f0 100644
--- a/source/blender/compositor/cached_resources/COM_morphological_distance_feather_weights.hh
+++ b/source/blender/compositor/cached_resources/COM_morphological_distance_feather_weights.hh
@@ -11,6 +11,7 @@
 #include "BLI_map.hh"
 
 #include "COM_cached_resource.hh"
+#include "COM_result.hh"
 
 namespace blender::compositor {
 
diff --git a/source/blender/compositor/cached_resources/COM_ocio_color_space_conversion_shader.hh b/source/blender/compositor/cached_resources/COM_ocio_color_space_conversion_shader.hh
index 64baa67761a..9a2688bb577 100644
--- a/source/blender/compositor/cached_resources/COM_ocio_color_space_conversion_shader.hh
+++ b/source/blender/compositor/cached_resources/COM_ocio_color_space_conversion_shader.hh
@@ -7,8 +7,12 @@
 #include <cstdint>
 #include <string>
 
+#include "BLI_map.hh"
+
 #include "COM_cached_resource.hh"
 
+struct GPUShader;
+
 namespace blender::compositor {
 
 class Context;
diff --git a/source/blender/compositor/cached_resources/COM_symmetric_blur_weights.hh b/source/blender/compositor/cached_resources/COM_symmetric_blur_weights.hh
index 1bc11a6924a..74621bf06c7 100644
--- a/source/blender/compositor/cached_resources/COM_symmetric_blur_weights.hh
+++ b/source/blender/compositor/cached_resources/COM_symmetric_blur_weights.hh
@@ -12,6 +12,7 @@
 #include "BLI_math_vector_types.hh"
 
 #include "COM_cached_resource.hh"
+#include "COM_result.hh"
 
 namespace blender::compositor {
 
diff --git a/source/blender/compositor/cached_resources/COM_symmetric_separable_blur_weights.hh b/source/blender/compositor/cached_resources/COM_symmetric_separable_blur_weights.hh
index 7f326e071a8..517778c7fd6 100644
--- a/source/blender/compositor/cached_resources/COM_symmetric_separable_blur_weights.hh
+++ b/source/blender/compositor/cached_resources/COM_symmetric_separable_blur_weights.hh
@@ -12,6 +12,7 @@
 #include "BLI_math_vector_types.hh"
 
 #include "COM_cached_resource.hh"
+#include "COM_result.hh"
 
 namespace blender::compositor {
 
diff --git a/source/blender/compositor/shaders/infos/compositor_cryptomatte_info.hh b/source/blender/compositor/shaders/infos/compositor_cryptomatte_info.hh
index 121e402a4dc..1dafe13dbdb 100644
--- a/source/blender/compositor/shaders/infos/compositor_cryptomatte_info.hh
+++ b/source/blender/compositor/shaders/infos/compositor_cryptomatte_info.hh
@@ -4,6 +4,8 @@
 
 #include "gpu_shader_create_info.hh"
 
+using namespace blender::gpu::shader;
+
 GPU_SHADER_CREATE_INFO(compositor_cryptomatte_pick)
 LOCAL_GROUP_SIZE(16, 16)
 PUSH_CONSTANT(IVEC2, lower_bound)
diff --git a/source/blender/draw/engines/compositor/compositor_engine.h b/source/blender/draw/engines/compositor/compositor_engine.h
index 4b76ec70c75..77e2f61035f 100644
--- a/source/blender/draw/engines/compositor/compositor_engine.h
+++ b/source/blender/draw/engines/compositor/compositor_engine.h
@@ -8,6 +8,8 @@
 extern "C" {
 #endif
 
+struct DrawEngineType;
+
 extern DrawEngineType draw_engine_compositor_type;
 
 #ifdef __cplusplus
diff --git a/source/blender/draw/engines/eevee_next/eevee_lookdev.cc b/source/blender/draw/engines/eevee_next/eevee_lookdev.cc
index 41ebd749969..45c568e4bc4 100644
--- a/source/blender/draw/engines/eevee_next/eevee_lookdev.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_lookdev.cc
@@ -6,6 +6,8 @@
  * \ingroup eevee
  */
 
+#include "BLI_rect.h"
+
 #include "BKE_image.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_node.hh"
@@ -17,8 +19,6 @@
 
 #include "eevee_instance.hh"
 
-#include "draw_debug.hh"
-
 namespace blender::eevee {
 
 /* -------------------------------------------------------------------- */
diff --git a/source/blender/draw/engines/eevee_next/eevee_lookdev.hh b/source/blender/draw/engines/eevee_next/eevee_lookdev.hh
index f5540e78ec1..77e4b91953b 100644
--- a/source/blender/draw/engines/eevee_next/eevee_lookdev.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_lookdev.hh
@@ -11,13 +11,34 @@
 
 #pragma once
 
+#include <string>
+
+#include "DNA_image_types.h"
+#include "DNA_vec_types.h"
 #include "DNA_world_types.h"
 
+#include "BLI_math_vector_types.hh"
+
+#include "DRW_gpu_wrapper.hh"
+
+#include "draw_manager.hh"
+#include "draw_pass.hh"
+
+struct bNode;
+struct bNodeSocketValueFloat;
+struct View3D;
+
 namespace blender::eevee {
 
 class Instance;
 class LookdevView;
 
+using blender::draw::Framebuffer;
+using blender::draw::PassSimple;
+using blender::draw::ResourceHandle;
+using blender::draw::Texture;
+using blender::draw::View;
+
 /* -------------------------------------------------------------------- */
 /** \name Parameters
  *
diff --git a/source/blender/draw/engines/eevee_next/eevee_pipeline.hh b/source/blender/draw/engines/eevee_next/eevee_pipeline.hh
index 3690b264468..f5c11ade864 100644
--- a/source/blender/draw/engines/eevee_next/eevee_pipeline.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_pipeline.hh
@@ -21,6 +21,8 @@
 #include "eevee_raytrace.hh"
 #include "eevee_subsurface.hh"
 
+struct Camera;
+
 namespace blender::eevee {
 
 class Instance;
diff --git a/source/blender/draw/engines/eevee_next/eevee_view.hh b/source/blender/draw/engines/eevee_next/eevee_view.hh
index 4930b19c0de..f2757426402 100644
--- a/source/blender/draw/engines/eevee_next/eevee_view.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_view.hh
@@ -19,7 +19,9 @@
 #include "DRW_render.hh"
 
 #include "eevee_camera.hh"
+#include "eevee_depth_of_field.hh"
 #include "eevee_pipeline.hh"
+#include "eevee_renderbuffers.hh"
 #include "eevee_shader.hh"
 #include "eevee_velocity.hh"
 
diff --git a/source/blender/draw/engines/eevee_next/eevee_volume.hh b/source/blender/draw/engines/eevee_next/eevee_volume.hh
index 0044a69f7ce..f8f00a141b1 100644
--- a/source/blender/draw/engines/eevee_next/eevee_volume.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_volume.hh
@@ -36,7 +36,11 @@
 #pragma once
 
 #include "BLI_set.hh"
+
+#include "DRW_gpu_wrapper.hh"
+
 #include "eevee_shader_shared.hh"
+#include "eevee_sync.hh"
 
 namespace blender::eevee {
 
diff --git a/source/blender/draw/engines/eevee_next/eevee_world.hh b/source/blender/draw/engines/eevee_next/eevee_world.hh
index b81488833fa..34476949c99 100644
--- a/source/blender/draw/engines/eevee_next/eevee_world.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_world.hh
@@ -14,6 +14,11 @@
 #include "DNA_world_types.h"
 
 #include "eevee_lookdev.hh"
+#include "eevee_sync.hh"
+
+struct bNodeTree;
+struct bNodeSocketValueRGBA;
+struct UniformBuffer;
 
 namespace blender::eevee {
 
diff --git a/source/blender/draw/engines/external/external_engine.h b/source/blender/draw/engines/external/external_engine.h
index 9e708e33396..5fb54eecd49 100644
--- a/source/blender/draw/engines/external/external_engine.h
+++ b/source/blender/draw/engines/external/external_engine.h
@@ -12,6 +12,9 @@
 extern "C" {
 #endif
 
+struct DrawEngineType;
+struct RenderEngineType;
+
 extern DrawEngineType draw_engine_external_type;
 extern RenderEngineType DRW_engine_viewport_external_type;
 
diff --git a/source/blender/draw/engines/image/image_engine.h b/source/blender/draw/engines/image/image_engine.h
index 6b59e08b47d..5ff434accbd 100644
--- a/source/blender/draw/engines/image/image_engine.h
+++ b/source/blender/draw/engines/image/image_engine.h
@@ -12,6 +12,8 @@
 extern "C" {
 #endif
 
+struct DrawEngineType;
+
 extern DrawEngineType draw_engine_image_type;
 
 #ifdef __cplusplus
diff --git a/source/blender/draw/engines/image/image_shader_params.hh b/source/blender/draw/engines/image/image_shader_params.hh
index 6961c462cce..516401dc354 100644
--- a/source/blender/draw/engines/image/image_shader_params.hh
+++ b/source/blender/draw/engines/image/image_shader_params.hh
@@ -12,6 +12,8 @@
 #include "DNA_image_types.h"
 #include "DNA_scene_types.h"
 
+#include "BLI_math_vector.h"
+
 #include "IMB_imbuf_types.hh"
 
 #include "BKE_image.hh"
diff --git a/source/blender/draw/engines/image/image_space.hh b/source/blender/draw/engines/image/image_space.hh
index b14a702d8dd..24d1beabde2 100644
--- a/source/blender/draw/engines/image/image_space.hh
+++ b/source/blender/draw/engines/image/image_space.hh
@@ -8,6 +8,12 @@
 
 #pragma once
 
+struct ARegion;
+struct ImBuf;
+struct Image;
+struct ImageUser;
+struct Main;
+
 namespace blender::image_engine {
 
 struct ShaderParameters;
diff --git a/source/blender/draw/engines/image/image_space_image.hh b/source/blender/draw/engines/image/image_space_image.hh
index de4c11e5d11..f357766ce2c 100644
--- a/source/blender/draw/engines/image/image_space_image.hh
+++ b/source/blender/draw/engines/image/image_space_image.hh
@@ -10,6 +10,8 @@
 
 #include "ED_image.hh"
 
+#include "DNA_screen_types.h"
+
 #include "image_private.hh"
 
 namespace blender::image_engine {
diff --git a/source/blender/draw/engines/image/image_space_node.hh b/source/blender/draw/engines/image/image_space_node.hh
index 5390949a8fc..b8e2af2165f 100644
--- a/source/blender/draw/engines/image/image_space_node.hh
+++ b/source/blender/draw/engines/image/image_space_node.hh
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
+
 #include "image_private.hh"
 
 namespace blender::image_engine {
diff --git a/source/blender/draw/engines/image/image_usage.hh b/source/blender/draw/engines/image/image_usage.hh
index 80450ba2e8b..a249e790597 100644
--- a/source/blender/draw/engines/image/image_usage.hh
+++ b/source/blender/draw/engines/image/image_usage.hh
@@ -8,6 +8,11 @@
 
 #pragma once
 
+#include <cstring>
+
+#include "DNA_color_types.h"
+#include "DNA_image_types.h"
+
 namespace blender::image_engine {
 
 /**
diff --git a/source/blender/draw/engines/overlay/overlay_engine.h b/source/blender/draw/engines/overlay/overlay_engine.h
index 83a785f94d2..c58487db92c 100644
--- a/source/blender/draw/engines/overlay/overlay_engine.h
+++ b/source/blender/draw/engines/overlay/overlay_engine.h
@@ -12,6 +12,8 @@
 extern "C" {
 #endif
 
+struct DrawEngineType;
+
 extern DrawEngineType draw_engine_overlay_next_type;
 
 #ifdef __cplusplus
diff --git a/source/blender/draw/engines/overlay/overlay_next_facing.hh b/source/blender/draw/engines/overlay/overlay_next_facing.hh
index 02fdb3610f7..a6143a4190b 100644
--- a/source/blender/draw/engines/overlay/overlay_next_facing.hh
+++ b/source/blender/draw/engines/overlay/overlay_next_facing.hh
@@ -10,6 +10,8 @@
 
 #include "BKE_paint.hh"
 
+#include "draw_sculpt.hh"
+
 #include "overlay_next_base.hh"
 
 namespace blender::draw::overlay {
diff --git a/source/blender/draw/engines/overlay/overlay_next_mode_transfer.hh b/source/blender/draw/engines/overlay/overlay_next_mode_transfer.hh
index 2cda267a149..39b2d62597d 100644
--- a/source/blender/draw/engines/overlay/overlay_next_mode_transfer.hh
+++ b/source/blender/draw/engines/overlay/overlay_next_mode_transfer.hh
@@ -10,6 +10,8 @@
 
 #include "BKE_paint.hh"
 
+#include "draw_sculpt.hh"
+
 #include "overlay_next_base.hh"
 
 namespace blender::draw::overlay {
diff --git a/source/blender/draw/engines/overlay/overlay_next_sculpt.hh b/source/blender/draw/engines/overlay/overlay_next_sculpt.hh
index 770be8f2ef0..f552a90b773 100644
--- a/source/blender/draw/engines/overlay/overlay_next_sculpt.hh
+++ b/source/blender/draw/engines/overlay/overlay_next_sculpt.hh
@@ -19,6 +19,7 @@
 #include "bmesh.hh"
 
 #include "draw_cache_impl.hh"
+#include "draw_sculpt.hh"
 
 #include "overlay_next_base.hh"
 
diff --git a/source/blender/draw/engines/overlay/overlay_next_wireframe.hh b/source/blender/draw/engines/overlay/overlay_next_wireframe.hh
index 874e75d54f6..255cc860a48 100644
--- a/source/blender/draw/engines/overlay/overlay_next_wireframe.hh
+++ b/source/blender/draw/engines/overlay/overlay_next_wireframe.hh
@@ -12,6 +12,7 @@
 #include "DNA_volume_types.h"
 
 #include "draw_common.hh"
+#include "draw_sculpt.hh"
 
 #include "overlay_next_base.hh"
 #include "overlay_next_mesh.hh"
diff --git a/source/blender/draw/engines/workbench/workbench_engine.cc b/source/blender/draw/engines/workbench/workbench_engine.cc
index d0ac4ab0bf8..9d37a76219d 100644
--- a/source/blender/draw/engines/workbench/workbench_engine.cc
+++ b/source/blender/draw/engines/workbench/workbench_engine.cc
@@ -2,6 +2,10 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "BLI_rect.h"
+
+#include "DNA_fluid_types.h"
+
 #include "BKE_editmesh.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
@@ -9,11 +13,14 @@
 #include "BKE_paint_bvh.hh"
 #include "BKE_particle.h"
 #include "BKE_report.hh"
+
 #include "DEG_depsgraph_query.hh"
-#include "DNA_fluid_types.h"
+
 #include "ED_paint.hh"
 #include "ED_view3d.hh"
+
 #include "GPU_capabilities.hh"
+
 #include "IMB_imbuf_types.hh"
 
 #include "draw_common.hh"
diff --git a/source/blender/draw/engines/workbench/workbench_engine.h b/source/blender/draw/engines/workbench/workbench_engine.h
index 1955ffc6fc4..db1c143d901 100644
--- a/source/blender/draw/engines/workbench/workbench_engine.h
+++ b/source/blender/draw/engines/workbench/workbench_engine.h
@@ -12,6 +12,8 @@
 extern "C" {
 #endif
 
+struct RenderEngineType;
+
 extern RenderEngineType DRW_engine_viewport_workbench_type;
 
 #ifdef __cplusplus
diff --git a/source/blender/draw/intern/draw_debug.hh b/source/blender/draw/intern/draw_debug.hh
index 00813fc9902..a935c0dc5be 100644
--- a/source/blender/draw/intern/draw_debug.hh
+++ b/source/blender/draw/intern/draw_debug.hh
@@ -16,7 +16,6 @@
 #pragma once
 
 #include "BLI_math_vector_types.hh"
-#include "BLI_string_ref.hh"
 #include "BLI_vector.hh"
 #include "DNA_object_types.h"
 #include "DRW_gpu_wrapper.hh"
diff --git a/source/blender/draw/intern/draw_instance_data.hh b/source/blender/draw/intern/draw_instance_data.hh
index 584ef3f4dc0..1179dd3755c 100644
--- a/source/blender/draw/intern/draw_instance_data.hh
+++ b/source/blender/draw/intern/draw_instance_data.hh
@@ -8,11 +8,8 @@
 
 #pragma once
 
-#include "BLI_compiler_attrs.h"
 #include "BLI_sys_types.h"
 
-#include "GPU_batch.hh"
-
 #define MAX_INSTANCE_DATA_SIZE 64 /* Can be adjusted for more */
 
 #define DRW_BUFFER_VERTS_CHUNK 128
diff --git a/source/blender/draw/intern/draw_manager.hh b/source/blender/draw/intern/draw_manager.hh
index 59f666d5a3a..55e980bfae0 100644
--- a/source/blender/draw/intern/draw_manager.hh
+++ b/source/blender/draw/intern/draw_manager.hh
@@ -20,11 +20,9 @@
 #include "GPU_material.hh"
 
 #include "draw_resource.hh"
-#include "draw_sculpt.hh"
 #include "draw_view.hh"
 
 #include <atomic>
-#include <string>
 
 namespace blender::draw {
 
diff --git a/source/blender/draw/intern/draw_manager_c.hh b/source/blender/draw/intern/draw_manager_c.hh
index 1ea6b0b6ba9..24f28516615 100644
--- a/source/blender/draw/intern/draw_manager_c.hh
+++ b/source/blender/draw/intern/draw_manager_c.hh
@@ -13,9 +13,6 @@
 #include "DRW_engine.hh"
 #include "DRW_render.hh"
 
-#include "BLI_assert.h"
-#include "BLI_linklist.h"
-#include "BLI_memblock.h"
 #include "BLI_task.h"
 #include "BLI_threads.h"
 
diff --git a/source/blender/draw/intern/draw_view.hh b/source/blender/draw/intern/draw_view.hh
index 1a5097289dc..c6a869707b9 100644
--- a/source/blender/draw/intern/draw_view.hh
+++ b/source/blender/draw/intern/draw_view.hh
@@ -19,7 +19,6 @@
 
 #include "DNA_view3d_types.h"
 #include "DRW_gpu_wrapper.hh"
-#include "DRW_render.hh"
 #include "GPU_matrix.hh"
 
 #include "draw_shader_shared.hh"
diff --git a/source/blender/draw/intern/draw_view_data.hh b/source/blender/draw/intern/draw_view_data.hh
index 3f2aa394e5a..0d1d39ccbfc 100644
--- a/source/blender/draw/intern/draw_view_data.hh
+++ b/source/blender/draw/intern/draw_view_data.hh
@@ -18,10 +18,13 @@ class TextureFromPool;
 }  // namespace blender::draw
 
 struct DRWPass;
-struct DRWTextStore;
 struct DRWRegisteredDrawEngine;
+struct DRWTextStore;
 struct DrawEngineType;
+struct GPUFrameBuffer;
+struct GPUTexture;
 struct GPUViewport;
+struct ListBase;
 
 /* NOTE: these structs are only here for reading the actual lists from the engine.
  * The actual length of them is stored in a ViewportEngineData_Info.
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc
index bb93e2034bc..98933db57ad 100644
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc
@@ -9,6 +9,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_jitter_2d.h"
+#include "BLI_map.hh"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
 #include "BLI_ordered_edge.hh"
diff --git a/source/blender/editors/animation/anim_intern.hh b/source/blender/editors/animation/anim_intern.hh
index 99f559b322d..d16ea53de8f 100644
--- a/source/blender/editors/animation/anim_intern.hh
+++ b/source/blender/editors/animation/anim_intern.hh
@@ -9,6 +9,7 @@
 #pragma once
 
 struct ListBase;
+struct wmOperatorType;
 
 /* size of string buffers used for animation channel displayed names */
 #define ANIM_CHAN_NAME_SIZE 256
diff --git a/source/blender/editors/armature/armature_intern.hh b/source/blender/editors/armature/armature_intern.hh
index 77ab14b9662..e052f917367 100644
--- a/source/blender/editors/armature/armature_intern.hh
+++ b/source/blender/editors/armature/armature_intern.hh
@@ -8,17 +8,22 @@
 
 #pragma once
 
-struct bArmature;
+#include "DNA_listBase.h"
+
+#include "BLI_span.hh"
+
 struct Base;
-struct bContext;
 struct Bone;
-struct bPoseChannel;
 struct EditBone;
 struct GPUSelectResult;
+struct IDProperty;
 struct LinkData;
 struct ListBase;
 struct Object;
 struct Scene;
+struct bArmature;
+struct bContext;
+struct bPoseChannel;
 struct wmOperatorType;
 
 /* -------------------------------------------------------------------- */
diff --git a/source/blender/editors/asset/ED_asset_filter.hh b/source/blender/editors/asset/ED_asset_filter.hh
index 9f1770ea17f..d064f15946a 100644
--- a/source/blender/editors/asset/ED_asset_filter.hh
+++ b/source/blender/editors/asset/ED_asset_filter.hh
@@ -10,6 +10,8 @@
 
 #pragma once
 
+#include "DNA_listBase.h"
+
 #include "BLI_function_ref.hh"
 #include "BLI_multi_value_map.hh"
 #include "BLI_vector.hh"
@@ -18,6 +20,7 @@
 #include "AS_asset_catalog_tree.hh"
 
 struct AssetLibraryReference;
+struct AssetMetaData;
 struct bContext;
 namespace blender::asset_system {
 class AssetLibrary;
diff --git a/source/blender/editors/asset/ED_asset_handle.hh b/source/blender/editors/asset/ED_asset_handle.hh
index d7927db2063..2ba12bd4c28 100644
--- a/source/blender/editors/asset/ED_asset_handle.hh
+++ b/source/blender/editors/asset/ED_asset_handle.hh
@@ -14,11 +14,8 @@
 
 #pragma once
 
-#include "DNA_ID_enums.h"
 #include "DNA_asset_types.h"
 
-#include "RNA_types.hh"
-
 struct AssetHandle;
 namespace blender::asset_system {
 class AssetRepresentation;
diff --git a/source/blender/editors/asset/ED_asset_import.hh b/source/blender/editors/asset/ED_asset_import.hh
index f496589f010..8c4d634aea7 100644
--- a/source/blender/editors/asset/ED_asset_import.hh
+++ b/source/blender/editors/asset/ED_asset_import.hh
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include "DNA_ID_enums.h"
-
 struct ID;
 struct Main;
 namespace blender::asset_system {
diff --git a/source/blender/editors/asset/ED_asset_library.hh b/source/blender/editors/asset/ED_asset_library.hh
index c604ae14800..6566c907c25 100644
--- a/source/blender/editors/asset/ED_asset_library.hh
+++ b/source/blender/editors/asset/ED_asset_library.hh
@@ -10,6 +10,8 @@
 
 #include "DNA_asset_types.h"
 
+struct EnumPropertyItem;
+
 namespace blender::ed::asset {
 
 /**
diff --git a/source/blender/editors/asset/ED_asset_list.hh b/source/blender/editors/asset/ED_asset_list.hh
index bb723f38410..7252ba9dc63 100644
--- a/source/blender/editors/asset/ED_asset_list.hh
+++ b/source/blender/editors/asset/ED_asset_list.hh
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include <string>
-
 #include "BLI_function_ref.hh"
 
 struct AssetHandle;
diff --git a/source/blender/editors/asset/ED_asset_shelf.hh b/source/blender/editors/asset/ED_asset_shelf.hh
index 10063fc0c9e..4a92e0505c9 100644
--- a/source/blender/editors/asset/ED_asset_shelf.hh
+++ b/source/blender/editors/asset/ED_asset_shelf.hh
@@ -15,12 +15,14 @@ struct ARegionType;
 struct AssetShelf;
 struct AssetShelfSettings;
 struct AssetShelfType;
-struct bContext;
-struct bContextDataResult;
 struct BlendDataReader;
 struct BlendWriter;
 struct Main;
 struct RegionPollParams;
+struct ScrArea;
+struct bContext;
+struct bContextDataResult;
+struct wmRegionListenerParams;
 struct wmRegionMessageSubscribeParams;
 struct wmWindowManager;
 
diff --git a/source/blender/editors/curve/curve_intern.hh b/source/blender/editors/curve/curve_intern.hh
index 77a33a3c0a2..c7d5e40a03e 100644
--- a/source/blender/editors/curve/curve_intern.hh
+++ b/source/blender/editors/curve/curve_intern.hh
@@ -8,12 +8,21 @@
 
 #pragma once
 
+#include "BLI_sys_types.h"
+
 /* internal exports only */
+struct BPoint;
+struct Base;
+struct BezTriple;
+struct Curve;
 struct EditNurb;
 struct GHash;
 struct ListBase;
+struct Nurb;
 struct Object;
+struct View3D;
 struct ViewContext;
+struct wmKeyConfig;
 struct wmKeyMap;
 struct wmOperatorType;
 
diff --git a/source/blender/editors/gizmo_library/gizmo_library_intern.hh b/source/blender/editors/gizmo_library/gizmo_library_intern.hh
index 617f62714b5..b887f8186c5 100644
--- a/source/blender/editors/gizmo_library/gizmo_library_intern.hh
+++ b/source/blender/editors/gizmo_library/gizmo_library_intern.hh
@@ -10,7 +10,9 @@
 
 #include "gizmo_geometry.h"
 
+struct IDProperty;
 struct bContext;
+struct wmGizmo;
 struct wmGizmoProperty;
 
 #define DIAL_RESOLUTION 48
diff --git a/source/blender/editors/gpencil_legacy/gpencil_intern.hh b/source/blender/editors/gpencil_legacy/gpencil_intern.hh
index 35001826ca4..7d9446a5069 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_intern.hh
+++ b/source/blender/editors/gpencil_legacy/gpencil_intern.hh
@@ -10,8 +10,6 @@
 
 #include "DNA_vec_types.h"
 
-#include "ED_numinput.hh"
-
 #define DEPTH_INVALID 1.0f
 
 /* internal exports only */
@@ -34,6 +32,10 @@ struct wmOperatorType;
 struct wmWindow;
 
 struct Depsgraph;
+struct Object;
+struct ScrArea;
+struct ListBase;
+struct bGPDlayer;
 
 struct EnumPropertyItem;
 struct PointerRNA;
diff --git a/source/blender/editors/include/ED_armature.hh b/source/blender/editors/include/ED_armature.hh
index dae012b9f71..6c1ac05bd43 100644
--- a/source/blender/editors/include/ED_armature.hh
+++ b/source/blender/editors/include/ED_armature.hh
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "BLI_compiler_attrs.h"
-#include "BLI_listbase.h"
 #include "BLI_span.hh"
 
 struct Base;
diff --git a/source/blender/editors/include/ED_asset.hh b/source/blender/editors/include/ED_asset.hh
index b68b28c1a45..c90ddd6a5e8 100644
--- a/source/blender/editors/include/ED_asset.hh
+++ b/source/blender/editors/include/ED_asset.hh
@@ -14,18 +14,18 @@
 /* Barely anything here. Just general editor level functions. Actual asset level code is in
  * dedicated headers. */
 
-#include "../asset/ED_asset_catalog.hh"
-#include "../asset/ED_asset_handle.hh"
-#include "../asset/ED_asset_library.hh"
-#include "../asset/ED_asset_list.hh"
-#include "../asset/ED_asset_mark_clear.hh"
-#include "../asset/ED_asset_temp_id_consumer.hh"
-#include "../asset/ED_asset_type.hh"
+#include "../asset/ED_asset_catalog.hh"           // IWYU pragma: export
+#include "../asset/ED_asset_handle.hh"            // IWYU pragma: export
+#include "../asset/ED_asset_library.hh"           // IWYU pragma: export
+#include "../asset/ED_asset_list.hh"              // IWYU pragma: export
+#include "../asset/ED_asset_mark_clear.hh"        // IWYU pragma: export
+#include "../asset/ED_asset_temp_id_consumer.hh"  // IWYU pragma: export
+#include "../asset/ED_asset_type.hh"              // IWYU pragma: export
 
-#include "../asset/ED_asset_catalog.hh"
-#include "../asset/ED_asset_filter.hh"
-#include "../asset/ED_asset_import.hh"
-#include "../asset/ED_asset_list.hh"
+#include "../asset/ED_asset_catalog.hh"  // IWYU pragma: export
+#include "../asset/ED_asset_filter.hh"   // IWYU pragma: export
+#include "../asset/ED_asset_import.hh"   // IWYU pragma: export
+#include "../asset/ED_asset_list.hh"     // IWYU pragma: export
 
 namespace blender::ed::asset {
 
diff --git a/source/blender/editors/include/ED_asset_menu_utils.hh b/source/blender/editors/include/ED_asset_menu_utils.hh
index bd32906af1b..6ced59e2b8c 100644
--- a/source/blender/editors/include/ED_asset_menu_utils.hh
+++ b/source/blender/editors/include/ED_asset_menu_utils.hh
@@ -15,6 +15,7 @@
 #include "RNA_types.hh"
 
 struct uiLayout;
+struct AssetWeakReference;
 
 namespace blender::asset_system {
 class AssetCatalogTreeItem;
diff --git a/source/blender/editors/include/ED_curve.hh b/source/blender/editors/include/ED_curve.hh
index 98272ffc5c1..917fee7f0d5 100644
--- a/source/blender/editors/include/ED_curve.hh
+++ b/source/blender/editors/include/ED_curve.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include "BLI_span.hh"
+
 struct BPoint;
 struct Base;
 struct BezTriple;
diff --git a/source/blender/editors/include/ED_grease_pencil.hh b/source/blender/editors/include/ED_grease_pencil.hh
index 23480499af2..abc0101ef78 100644
--- a/source/blender/editors/include/ED_grease_pencil.hh
+++ b/source/blender/editors/include/ED_grease_pencil.hh
@@ -11,10 +11,10 @@
 #include "BKE_grease_pencil.hh"
 
 #include "BKE_attribute_filter.hh"
-#include "BLI_generic_span.hh"
 #include "BLI_index_mask_fwd.hh"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_set.hh"
+#include "BLI_task.hh"
 
 #include "ED_keyframes_edit.hh"
 #include "ED_select_utils.hh"
diff --git a/source/blender/editors/include/ED_id_management.hh b/source/blender/editors/include/ED_id_management.hh
index ac328861443..7a6d34b380f 100644
--- a/source/blender/editors/include/ED_id_management.hh
+++ b/source/blender/editors/include/ED_id_management.hh
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "BLI_compiler_attrs.h"
 #include "BLI_string_ref.hh"
 
 struct ID;
diff --git a/source/blender/editors/include/ED_info.hh b/source/blender/editors/include/ED_info.hh
index 6602acca0fc..e385dfd38c5 100644
--- a/source/blender/editors/include/ED_info.hh
+++ b/source/blender/editors/include/ED_info.hh
@@ -9,6 +9,9 @@
 #pragma once
 
 struct Main;
+struct Scene;
+struct View3D;
+struct ViewLayer;
 struct wmWindowManager;
 
 /* `info_stats.cc` */
diff --git a/source/blender/editors/include/ED_keyframing.hh b/source/blender/editors/include/ED_keyframing.hh
index 941286baa18..f4626809c91 100644
--- a/source/blender/editors/include/ED_keyframing.hh
+++ b/source/blender/editors/include/ED_keyframing.hh
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "BLI_vector.hh"
 #include "DNA_anim_types.h"
 #include "RNA_types.hh"
 
diff --git a/source/blender/editors/include/ED_markers.hh b/source/blender/editors/include/ED_markers.hh
index f72735d1cda..65609603ab6 100644
--- a/source/blender/editors/include/ED_markers.hh
+++ b/source/blender/editors/include/ED_markers.hh
@@ -8,6 +8,7 @@
 
 #pragma once
 
+struct ListBase;
 struct Scene;
 struct ScrArea;
 struct TimeMarker;
diff --git a/source/blender/editors/include/ED_mask.hh b/source/blender/editors/include/ED_mask.hh
index bedeb79db72..c1b33df3e26 100644
--- a/source/blender/editors/include/ED_mask.hh
+++ b/source/blender/editors/include/ED_mask.hh
@@ -10,10 +10,13 @@
 
 #include "DNA_mask_types.h"
 
+struct ARegion;
 struct Depsgraph;
 struct KeyframeEditData;
 struct MaskLayer;
 struct MaskLayerShape;
+struct Scene;
+struct ScrArea;
 struct bContext;
 struct wmKeyConfig;
 
diff --git a/source/blender/editors/include/ED_mesh.hh b/source/blender/editors/include/ED_mesh.hh
index ccc99c4243e..4b747953934 100644
--- a/source/blender/editors/include/ED_mesh.hh
+++ b/source/blender/editors/include/ED_mesh.hh
@@ -25,6 +25,7 @@ struct BMeshNormalsUpdate_Params;
 struct Base;
 struct Depsgraph;
 struct KeyBlock;
+struct Main;
 struct MDeformVert;
 struct Mesh;
 struct Object;
diff --git a/source/blender/editors/include/ED_node_preview.hh b/source/blender/editors/include/ED_node_preview.hh
index 65146fd6d66..1584b9a43d6 100644
--- a/source/blender/editors/include/ED_node_preview.hh
+++ b/source/blender/editors/include/ED_node_preview.hh
@@ -4,15 +4,20 @@
 
 #pragma once
 
+#include "BLI_map.hh"
+
 #include "RE_pipeline.h"
 
 #include "IMB_imbuf.hh"
 
 #include "DNA_material_types.h"
 
-struct bContext;
-struct bNodeTree;
 struct ImBuf;
+struct SpaceNode;
+struct bContext;
+struct bNode;
+struct bNodeTree;
+struct wmWindowManager;
 struct Render;
 
 namespace blender::ed::space_node {
diff --git a/source/blender/editors/include/ED_numinput.hh b/source/blender/editors/include/ED_numinput.hh
index 5b281abbe3d..c5842f6313e 100644
--- a/source/blender/editors/include/ED_numinput.hh
+++ b/source/blender/editors/include/ED_numinput.hh
@@ -11,6 +11,7 @@
 #define NUM_STR_REP_LEN 64
 #define NUM_MAX_ELEMENTS 3
 
+struct bContext;
 struct wmEvent;
 struct UnitSettings;
 
diff --git a/source/blender/editors/include/ED_object_vgroup.hh b/source/blender/editors/include/ED_object_vgroup.hh
index d09267dafd0..f19f07a6840 100644
--- a/source/blender/editors/include/ED_object_vgroup.hh
+++ b/source/blender/editors/include/ED_object_vgroup.hh
@@ -8,15 +8,15 @@
 
 #pragma once
 
-#include "BLI_compiler_attrs.h"
-
-struct bDeformGroup;
 struct EnumPropertyItem;
 struct ID;
 struct MDeformVert;
 struct Object;
 struct PointerRNA;
 struct PropertyRNA;
+struct SpaceNode;
+struct bContext;
+struct bDeformGroup;
 
 #define WEIGHT_REPLACE 1
 #define WEIGHT_ADD 2
diff --git a/source/blender/editors/include/ED_paint.hh b/source/blender/editors/include/ED_paint.hh
index 3b162b20377..87a8cbd3cd5 100644
--- a/source/blender/editors/include/ED_paint.hh
+++ b/source/blender/editors/include/ED_paint.hh
@@ -10,6 +10,8 @@
 
 #include "DNA_view3d_enums.h"
 
+#include <cstdint>
+
 enum class PaintMode : int8_t;
 struct bContext;
 struct bToolRef;
@@ -18,6 +20,7 @@ struct Image;
 struct ImageUser;
 struct ImBuf;
 struct Main;
+struct Object;
 struct PaintModeSettings;
 struct PaintTileMap;
 struct ReportList;
diff --git a/source/blender/editors/include/ED_particle.hh b/source/blender/editors/include/ED_particle.hh
index 69cb1d4c1a4..07145a94c19 100644
--- a/source/blender/editors/include/ED_particle.hh
+++ b/source/blender/editors/include/ED_particle.hh
@@ -10,6 +10,7 @@
 
 #include "BLI_math_vector_types.hh"
 
+struct Depsgraph;
 struct Object;
 struct PTCacheEdit;
 struct ParticleEditSettings;
diff --git a/source/blender/editors/include/ED_physics.hh b/source/blender/editors/include/ED_physics.hh
index 5eba2ab3b6b..ec713c79e82 100644
--- a/source/blender/editors/include/ED_physics.hh
+++ b/source/blender/editors/include/ED_physics.hh
@@ -10,6 +10,7 @@
 
 struct bContext;
 struct Depsgraph;
+struct Main;
 struct Object;
 struct ReportList;
 struct Scene;
diff --git a/source/blender/editors/include/ED_screen.hh b/source/blender/editors/include/ED_screen.hh
index 01005d81a7f..162cdc10fce 100644
--- a/source/blender/editors/include/ED_screen.hh
+++ b/source/blender/editors/include/ED_screen.hh
@@ -10,12 +10,8 @@
 
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
-#include "DNA_view2d_types.h"
-#include "DNA_view3d_types.h"
 #include "DNA_workspace_types.h"
 
-#include "DNA_object_enums.h"
-
 #include "WM_types.hh"
 
 #include "BLI_compiler_attrs.h"
diff --git a/source/blender/editors/include/ED_screen_types.hh b/source/blender/editors/include/ED_screen_types.hh
index 9c281043e96..c28979cb18d 100644
--- a/source/blender/editors/include/ED_screen_types.hh
+++ b/source/blender/editors/include/ED_screen_types.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "BLI_rect.h"
+#include "DNA_vec_types.h"
 
 struct ARegion;
 
diff --git a/source/blender/editors/include/ED_sculpt.hh b/source/blender/editors/include/ED_sculpt.hh
index 0960fd26c9f..2a3536822bf 100644
--- a/source/blender/editors/include/ED_sculpt.hh
+++ b/source/blender/editors/include/ED_sculpt.hh
@@ -8,12 +8,16 @@
 
 #pragma once
 
+struct Depsgraph;
+struct Main;
+struct Mesh;
 struct Object;
 struct ReportList;
+struct Scene;
 struct UndoType;
 struct bContext;
-struct wmOperator;
 struct wmKeyConfig;
+struct wmOperator;
 
 namespace blender::ed::sculpt_paint {
 
diff --git a/source/blender/editors/include/ED_select_utils.hh b/source/blender/editors/include/ED_select_utils.hh
index 134dc6f6d0d..8955daff05c 100644
--- a/source/blender/editors/include/ED_select_utils.hh
+++ b/source/blender/editors/include/ED_select_utils.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <string>
+
 #include "BLI_compiler_attrs.h"
 
 struct KDTree_1d;
diff --git a/source/blender/editors/include/ED_space_api.hh b/source/blender/editors/include/ED_space_api.hh
index 31261b330b7..c832316c405 100644
--- a/source/blender/editors/include/ED_space_api.hh
+++ b/source/blender/editors/include/ED_space_api.hh
@@ -8,6 +8,7 @@
 
 #pragma once
 
+struct ARegion;
 struct ARegionType;
 struct bContext;
 
diff --git a/source/blender/editors/include/ED_time_scrub_ui.hh b/source/blender/editors/include/ED_time_scrub_ui.hh
index 30cf826f210..031cae24182 100644
--- a/source/blender/editors/include/ED_time_scrub_ui.hh
+++ b/source/blender/editors/include/ED_time_scrub_ui.hh
@@ -8,10 +8,13 @@
 
 #pragma once
 
+struct ARegion;
+struct Scene;
+struct ScrArea;
 struct bContext;
 struct bDopeSheet;
-struct wmEvent;
 struct rcti;
+struct wmEvent;
 struct wmWindow;
 
 void ED_time_scrub_draw_current_frame(const ARegion *region,
diff --git a/source/blender/editors/include/ED_undo.hh b/source/blender/editors/include/ED_undo.hh
index b65aef5c3f0..d291248cc07 100644
--- a/source/blender/editors/include/ED_undo.hh
+++ b/source/blender/editors/include/ED_undo.hh
@@ -8,15 +8,15 @@
 
 #pragma once
 
-#include "BLI_compiler_attrs.h"
 #include "BLI_sys_types.h"
 #include "BLI_vector.hh"
 
 struct Base;
 struct CLG_LogRef;
+struct ID;
+struct MemFile;
 struct Object;
 struct Scene;
-struct MemFile;
 struct UndoStack;
 struct ViewLayer;
 struct bContext;
diff --git a/source/blender/editors/include/ED_util.hh b/source/blender/editors/include/ED_util.hh
index c1af7e70d6c..d47008eb68e 100644
--- a/source/blender/editors/include/ED_util.hh
+++ b/source/blender/editors/include/ED_util.hh
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "BLI_compiler_attrs.h"
 #include "WM_types.hh"
 
 struct Main;
diff --git a/source/blender/editors/include/ED_util_imbuf.hh b/source/blender/editors/include/ED_util_imbuf.hh
index af34cac4b1e..e1953b7bd5c 100644
--- a/source/blender/editors/include/ED_util_imbuf.hh
+++ b/source/blender/editors/include/ED_util_imbuf.hh
@@ -8,9 +8,6 @@
 
 #pragma once
 
-#include "BLI_compiler_attrs.h"
-#include "BLI_sys_types.h"
-
 struct ARegion;
 struct bContext;
 struct wmEvent;
diff --git a/source/blender/editors/include/ED_uvedit.hh b/source/blender/editors/include/ED_uvedit.hh
index f1891a08181..4ed505ecb64 100644
--- a/source/blender/editors/include/ED_uvedit.hh
+++ b/source/blender/editors/include/ED_uvedit.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include "BLI_function_ref.hh"
+
 #include "BKE_customdata.hh"
 
 struct ARegion;
@@ -18,6 +20,7 @@ struct BMLoop;
 struct BMesh;
 struct Image;
 struct ImageUser;
+struct ListBase;
 struct Main;
 struct Object;
 struct Scene;
diff --git a/source/blender/editors/include/UI_interface.hh b/source/blender/editors/include/UI_interface.hh
index 728d832ebc0..a9fd02c9749 100644
--- a/source/blender/editors/include/UI_interface.hh
+++ b/source/blender/editors/include/UI_interface.hh
@@ -17,7 +17,7 @@
 
 #include "UI_resources.hh"
 
-#include "UI_interface_c.hh"
+#include "UI_interface_c.hh"  // IWYU pragma: export
 
 namespace blender::nodes::geo_eval_log {
 struct GeometryAttributeInfo;
diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_intern.hh b/source/blender/editors/interface/eyedroppers/eyedropper_intern.hh
index 3594f6a43a8..fd00ec11b35 100644
--- a/source/blender/editors/interface/eyedroppers/eyedropper_intern.hh
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_intern.hh
@@ -10,6 +10,12 @@
 
 #pragma once
 
+struct ScrArea;
+struct bContext;
+struct uiBut;
+struct wmEvent;
+struct wmWindow;
+
 /* `interface_eyedropper.cc` */
 
 void eyedropper_draw_cursor_text_window(const wmWindow *window, const char *name);
diff --git a/source/blender/editors/interface/regions/interface_regions_intern.hh b/source/blender/editors/interface/regions/interface_regions_intern.hh
index aa189d62de8..34673c6d365 100644
--- a/source/blender/editors/interface/regions/interface_regions_intern.hh
+++ b/source/blender/editors/interface/regions/interface_regions_intern.hh
@@ -12,6 +12,10 @@
 
 #include "BLI_string_ref.hh"
 
+struct ARegion;
+struct bContext;
+struct bScreen;
+
 /* interface_region_menu_popup.cc */
 
 uint ui_popup_menu_hash(blender::StringRef str);
diff --git a/source/blender/editors/io/io_drop_import_file.hh b/source/blender/editors/io/io_drop_import_file.hh
index 5c5f6e66af0..5f183f690b3 100644
--- a/source/blender/editors/io/io_drop_import_file.hh
+++ b/source/blender/editors/io/io_drop_import_file.hh
@@ -4,5 +4,7 @@
 
 #pragma once
 
+struct wmOperatorType;
+
 void WM_OT_drop_import_file(wmOperatorType *ot);
 void ED_dropbox_drop_import_file();
diff --git a/source/blender/editors/lattice/lattice_intern.hh b/source/blender/editors/lattice/lattice_intern.hh
index 47cd27fb24e..712e56ccea6 100644
--- a/source/blender/editors/lattice/lattice_intern.hh
+++ b/source/blender/editors/lattice/lattice_intern.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+struct wmOperatorType;
+
 /* `editlattice_select.cc` */
 
 void LATTICE_OT_select_all(wmOperatorType *ot);
diff --git a/source/blender/editors/mask/mask_intern.hh b/source/blender/editors/mask/mask_intern.hh
index dbe6d785201..706652879f5 100644
--- a/source/blender/editors/mask/mask_intern.hh
+++ b/source/blender/editors/mask/mask_intern.hh
@@ -8,9 +8,15 @@
 
 #pragma once
 
+#include "BKE_mask.h"
+
 #include "ED_clip.hh"
 
 struct Mask;
+struct MaskLayer;
+struct MaskSpline;
+struct MaskSplinePoint;
+struct MaskSplinePointUW;
 struct bContext;
 struct wmOperatorType;
 
diff --git a/source/blender/editors/mesh/editmesh_undo.cc b/source/blender/editors/mesh/editmesh_undo.cc
index bc531661e78..139051b9cc4 100644
--- a/source/blender/editors/mesh/editmesh_undo.cc
+++ b/source/blender/editors/mesh/editmesh_undo.cc
@@ -6,6 +6,7 @@
  * \ingroup edmesh
  */
 
+#include <algorithm>
 #include <variant>
 
 #include "MEM_guardedalloc.h"
@@ -22,6 +23,7 @@
 #include "BLI_array_utils.h"
 #include "BLI_implicit_sharing.hh"
 #include "BLI_listbase.h"
+#include "BLI_math_base.h"
 #include "BLI_string.h"
 #include "BLI_task.hh"
 #include "BLI_vector.hh"
diff --git a/source/blender/editors/render/render_intern.hh b/source/blender/editors/render/render_intern.hh
index 6c4353e3fd4..b4d08ea82eb 100644
--- a/source/blender/editors/render/render_intern.hh
+++ b/source/blender/editors/render/render_intern.hh
@@ -8,6 +8,7 @@
 
 #pragma once
 
+struct ReportList;
 struct ScrArea;
 struct bContext;
 struct wmOperatorType;
diff --git a/source/blender/editors/screen/screen_intern.hh b/source/blender/editors/screen/screen_intern.hh
index dbe8a2029de..df5d0415b30 100644
--- a/source/blender/editors/screen/screen_intern.hh
+++ b/source/blender/editors/screen/screen_intern.hh
@@ -17,9 +17,12 @@ struct bContextDataResult;
 struct bScreen;
 struct Main;
 struct rcti;
+struct ScrArea;
 struct ScrAreaMap;
 struct ScrEdge;
 struct ScrVert;
+struct WorkSpaceLayout;
+struct wmOperatorType;
 struct wmWindow;
 
 /* internal exports only */
diff --git a/source/blender/editors/sculpt_paint/grease_pencil_sculpt_strength.cc b/source/blender/editors/sculpt_paint/grease_pencil_sculpt_strength.cc
index 932072f4095..6ab4cb56227 100644
--- a/source/blender/editors/sculpt_paint/grease_pencil_sculpt_strength.cc
+++ b/source/blender/editors/sculpt_paint/grease_pencil_sculpt_strength.cc
@@ -2,6 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "BLI_index_mask.hh"
 #include "BLI_task.hh"
 
 #include "DNA_gpencil_legacy_types.h"
diff --git a/source/blender/editors/sculpt_paint/sculpt_color.hh b/source/blender/editors/sculpt_paint/sculpt_color.hh
index 1641cca5aa3..5237f45370a 100644
--- a/source/blender/editors/sculpt_paint/sculpt_color.hh
+++ b/source/blender/editors/sculpt_paint/sculpt_color.hh
@@ -16,6 +16,7 @@
 #include "BLI_span.hh"
 
 struct Depsgraph;
+struct Mesh;
 namespace blender::bke {
 enum class AttrDomain : int8_t;
 struct GAttributeReader;
diff --git a/source/blender/editors/sculpt_paint/sculpt_geodesic.hh b/source/blender/editors/sculpt_paint/sculpt_geodesic.hh
index 043e972d82b..863e00db90f 100644
--- a/source/blender/editors/sculpt_paint/sculpt_geodesic.hh
+++ b/source/blender/editors/sculpt_paint/sculpt_geodesic.hh
@@ -9,6 +9,8 @@
 #pragma once
 
 #include "BLI_array.hh"
+#include "BLI_math_vector_types.hh"
+#include "BLI_offset_indices.hh"
 #include "BLI_set.hh"
 
 namespace blender::ed::sculpt_paint::geodesic {
diff --git a/source/blender/editors/sculpt_paint/sculpt_pose.hh b/source/blender/editors/sculpt_paint/sculpt_pose.hh
index 36b035999f5..e2c2cae5914 100644
--- a/source/blender/editors/sculpt_paint/sculpt_pose.hh
+++ b/source/blender/editors/sculpt_paint/sculpt_pose.hh
@@ -8,8 +8,14 @@
 
 #pragma once
 
+#include <array>
+
+#include "BLI_array.hh"
+#include "BLI_index_mask.hh"
+#include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector.hh"
-#include "BLI_span.hh"
+
+#include "BKE_paint.hh"
 
 struct Brush;
 struct Depsgraph;
diff --git a/source/blender/editors/space_action/action_intern.hh b/source/blender/editors/space_action/action_intern.hh
index 99d2b4e253f..85c836464ab 100644
--- a/source/blender/editors/space_action/action_intern.hh
+++ b/source/blender/editors/space_action/action_intern.hh
@@ -10,11 +10,13 @@
 
 struct ARegion;
 struct ARegionType;
+struct ListBase;
 struct Object;
 struct Scene;
 struct SpaceAction;
 struct bAnimContext;
 struct bContext;
+struct wmKeyConfig;
 struct wmOperatorType;
 
 /* internal exports only */
diff --git a/source/blender/editors/space_buttons/buttons_intern.hh b/source/blender/editors/space_buttons/buttons_intern.hh
index 2c2a8eb0efe..c6c716dc4cc 100644
--- a/source/blender/editors/space_buttons/buttons_intern.hh
+++ b/source/blender/editors/space_buttons/buttons_intern.hh
@@ -11,6 +11,7 @@
 #include "BLI_bitmap.h"
 #include "DNA_listBase.h"
 #include "RNA_types.hh"
+#include "UI_interface.hh"
 
 struct ARegionType;
 struct ID;
diff --git a/source/blender/editors/space_clip/clip_intern.hh b/source/blender/editors/space_clip/clip_intern.hh
index 74163f23f2d..a711966c336 100644
--- a/source/blender/editors/space_clip/clip_intern.hh
+++ b/source/blender/editors/space_clip/clip_intern.hh
@@ -14,6 +14,7 @@
 #include "DNA_tracking_types.h"
 
 struct ARegion;
+struct ARegionType;
 struct MovieClip;
 struct MovieTrackingMarker;
 struct MovieTrackingTrack;
diff --git a/source/blender/editors/space_console/console_intern.hh b/source/blender/editors/space_console/console_intern.hh
index b75418275f5..a602c6566f5 100644
--- a/source/blender/editors/space_console/console_intern.hh
+++ b/source/blender/editors/space_console/console_intern.hh
@@ -10,7 +10,9 @@
 
 /* internal exports only */
 
+struct ARegion;
 struct ConsoleLine;
+struct SpaceConsole;
 struct bContext;
 struct wmOperatorType;
 
diff --git a/source/blender/editors/space_file/file_intern.hh b/source/blender/editors/space_file/file_intern.hh
index 7d5689d5ca5..edbacb4a1b5 100644
--- a/source/blender/editors/space_file/file_intern.hh
+++ b/source/blender/editors/space_file/file_intern.hh
@@ -11,6 +11,8 @@
 #include "DNA_space_types.h"
 #include "DNA_windowmanager_types.h"
 
+#include "ED_fileselect.hh"
+
 /* internal exports only */
 
 struct ARegion;
diff --git a/source/blender/editors/space_file/filelist.hh b/source/blender/editors/space_file/filelist.hh
index aecdfda47cf..1daef32433a 100644
--- a/source/blender/editors/space_file/filelist.hh
+++ b/source/blender/editors/space_file/filelist.hh
@@ -8,6 +8,11 @@
 
 #pragma once
 
+#include <cstddef>
+#include <cstdint>
+
+#include "DNA_space_types.h"
+
 struct AssetLibraryReference;
 struct bContext;
 struct BlendHandle;
diff --git a/source/blender/editors/space_file/fsmenu.h b/source/blender/editors/space_file/fsmenu.h
index 26fd3004084..3b91ae3c19b 100644
--- a/source/blender/editors/space_file/fsmenu.h
+++ b/source/blender/editors/space_file/fsmenu.h
@@ -8,15 +8,11 @@
 
 #pragma once
 
+#include "ED_fileselect.hh"
+
 /* XXX could become UserPref */
 #define FSMENU_RECENT_MAX 10
 
-enum FSMenuCategory;
-enum FSMenuInsert;
-
-struct FSMenu;
-struct FSMenuEntry;
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/editors/space_image/image_intern.hh b/source/blender/editors/space_image/image_intern.hh
index c258e0b28ad..d70b2fa65c0 100644
--- a/source/blender/editors/space_image/image_intern.hh
+++ b/source/blender/editors/space_image/image_intern.hh
@@ -11,6 +11,7 @@
 /* internal exports only */
 struct ARegion;
 struct ARegionType;
+struct ImageUser;
 struct SpaceImage;
 struct bContext;
 struct bNodeTree;
diff --git a/source/blender/editors/space_info/info_intern.hh b/source/blender/editors/space_info/info_intern.hh
index 533bc417e0d..ce635488779 100644
--- a/source/blender/editors/space_info/info_intern.hh
+++ b/source/blender/editors/space_info/info_intern.hh
@@ -10,6 +10,7 @@
 
 /* internal exports only */
 
+struct ARegion;
 struct ReportList;
 struct SpaceInfo;
 struct wmOperatorType;
diff --git a/source/blender/editors/space_info/textview.hh b/source/blender/editors/space_info/textview.hh
index 2426e4fbbe7..1aee608d50b 100644
--- a/source/blender/editors/space_info/textview.hh
+++ b/source/blender/editors/space_info/textview.hh
@@ -8,6 +8,10 @@
 
 #pragma once
 
+#include "BLI_utildefines.h"
+
+#include "DNA_vec_types.h"
+
 #define TVC_TAB_COLUMNS 4
 
 enum eTextViewContext_LineFlag {
diff --git a/source/blender/editors/space_nla/nla_intern.hh b/source/blender/editors/space_nla/nla_intern.hh
index 890bbcc7ccc..e76e92dfb5b 100644
--- a/source/blender/editors/space_nla/nla_intern.hh
+++ b/source/blender/editors/space_nla/nla_intern.hh
@@ -8,6 +8,16 @@
 
 #pragma once
 
+struct ARegion;
+struct ARegionType;
+struct ListBase;
+struct PointerRNA;
+struct SpaceNla;
+struct bAnimContext;
+struct bContext;
+struct wmKeyConfig;
+struct wmOperatorType;
+
 /* internal exports only */
 
 /* **************************************** */
diff --git a/source/blender/editors/space_outliner/outliner_intern.hh b/source/blender/editors/space_outliner/outliner_intern.hh
index bec1c3b09d1..dd515bac063 100644
--- a/source/blender/editors/space_outliner/outliner_intern.hh
+++ b/source/blender/editors/space_outliner/outliner_intern.hh
@@ -10,6 +10,8 @@
 
 #include <memory>
 
+#include "DNA_listBase.h"
+
 #include "BLI_function_ref.hh"
 
 #include "RNA_types.hh"
diff --git a/source/blender/editors/space_outliner/tree/tree_element_anim_data.hh b/source/blender/editors/space_outliner/tree/tree_element_anim_data.hh
index 0e8aafa48b4..566732bdeff 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_anim_data.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_anim_data.hh
@@ -10,6 +10,8 @@
 
 #include "tree_element.hh"
 
+struct AnimData;
+
 namespace blender::ed::outliner {
 
 class TreeElementAnimData final : public AbstractTreeElement {
diff --git a/source/blender/editors/space_outliner/tree/tree_element_collection.hh b/source/blender/editors/space_outliner/tree/tree_element_collection.hh
index c94c83e8472..4e6d521b625 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_collection.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_collection.hh
@@ -10,6 +10,8 @@
 
 #include "tree_element.hh"
 
+struct Scene;
+
 namespace blender::ed::outliner {
 
 class TreeElementCollectionBase final : public AbstractTreeElement {
diff --git a/source/blender/editors/space_outliner/tree/tree_element_constraint.hh b/source/blender/editors/space_outliner/tree/tree_element_constraint.hh
index f52be424fcb..fa7a2b0c6d3 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_constraint.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_constraint.hh
@@ -11,6 +11,7 @@
 #include "tree_element.hh"
 
 struct bConstraint;
+struct Object;
 
 namespace blender::ed::outliner {
 
diff --git a/source/blender/editors/space_outliner/tree/tree_element_driver.hh b/source/blender/editors/space_outliner/tree/tree_element_driver.hh
index d13fe702d70..f0e33bdf9da 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_driver.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_driver.hh
@@ -10,6 +10,8 @@
 
 #include "tree_element.hh"
 
+struct AnimData;
+
 namespace blender::ed::outliner {
 
 class TreeElementDriverBase final : public AbstractTreeElement {
diff --git a/source/blender/editors/space_outliner/tree/tree_element_id_collection.hh b/source/blender/editors/space_outliner/tree/tree_element_id_collection.hh
index 701bb842b28..7f12417c4e8 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_id_collection.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_id_collection.hh
@@ -10,6 +10,8 @@
 
 #include "tree_element_id.hh"
 
+struct Collection;
+
 namespace blender::ed::outliner {
 
 class TreeElementIDCollection final : public TreeElementID {
diff --git a/source/blender/editors/space_outliner/tree/tree_element_id_curve.hh b/source/blender/editors/space_outliner/tree/tree_element_id_curve.hh
index 387ecffbb53..be10660a51c 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_id_curve.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_id_curve.hh
@@ -10,6 +10,8 @@
 
 #include "tree_element_id.hh"
 
+struct Curve;
+
 namespace blender::ed::outliner {
 
 class TreeElementIDCurve final : public TreeElementID {
diff --git a/source/blender/editors/space_outliner/tree/tree_element_id_gpencil_legacy.hh b/source/blender/editors/space_outliner/tree/tree_element_id_gpencil_legacy.hh
index 1e045f09294..08fe9f279bd 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_id_gpencil_legacy.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_id_gpencil_legacy.hh
@@ -10,6 +10,8 @@
 
 #include "tree_element_id.hh"
 
+struct bGPdata;
+
 namespace blender::ed::outliner {
 
 class TreeElementIDGPLegacy final : public TreeElementID {
diff --git a/source/blender/editors/space_outliner/tree/tree_element_id_object.hh b/source/blender/editors/space_outliner/tree/tree_element_id_object.hh
index 87034c27fcb..33d15f82dc0 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_id_object.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_id_object.hh
@@ -10,6 +10,8 @@
 
 #include "tree_element_id.hh"
 
+struct Object;
+
 namespace blender::ed::outliner {
 
 class TreeElementIDObject final : public TreeElementID {
diff --git a/source/blender/editors/space_outliner/tree/tree_element_id_scene.hh b/source/blender/editors/space_outliner/tree/tree_element_id_scene.hh
index 772f26f0e17..9d345329382 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_id_scene.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_id_scene.hh
@@ -10,6 +10,8 @@
 
 #include "tree_element_id.hh"
 
+struct Scene;
+
 namespace blender::ed::outliner {
 
 class TreeElementIDScene final : public TreeElementID {
diff --git a/source/blender/editors/space_outliner/tree/tree_element_id_texture.hh b/source/blender/editors/space_outliner/tree/tree_element_id_texture.hh
index 3acad7be848..dc5eab316a4 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_id_texture.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_id_texture.hh
@@ -10,6 +10,8 @@
 
 #include "tree_element_id.hh"
 
+struct Tex;
+
 namespace blender::ed::outliner {
 
 class TreeElementIDTexture final : public TreeElementID {
diff --git a/source/blender/editors/space_outliner/tree/tree_element_layer_collection.hh b/source/blender/editors/space_outliner/tree/tree_element_layer_collection.hh
index 6f2479d934c..d1d760763f7 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_layer_collection.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_layer_collection.hh
@@ -10,6 +10,8 @@
 
 #include "tree_element.hh"
 
+struct LayerCollection;
+
 namespace blender::ed::outliner {
 
 class TreeElementLayerCollection final : public AbstractTreeElement {
diff --git a/source/blender/editors/space_outliner/tree/tree_element_nla.hh b/source/blender/editors/space_outliner/tree/tree_element_nla.hh
index 2acec04c62d..19970a8338e 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_nla.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_nla.hh
@@ -10,6 +10,8 @@
 
 #include "tree_element.hh"
 
+struct bAction;
+struct AnimData;
 struct NlaTrack;
 
 namespace blender::ed::outliner {
diff --git a/source/blender/editors/space_outliner/tree/tree_element_particle_system.hh b/source/blender/editors/space_outliner/tree/tree_element_particle_system.hh
index 35e243e3d8c..c6080db7005 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_particle_system.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_particle_system.hh
@@ -10,6 +10,7 @@
 
 #include "tree_element.hh"
 
+struct Object;
 struct ParticleSystem;
 
 namespace blender::ed::outliner {
diff --git a/source/blender/editors/space_outliner/tree/tree_element_pose.hh b/source/blender/editors/space_outliner/tree/tree_element_pose.hh
index a1a8f4826dd..ecd1a62a6ba 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_pose.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_pose.hh
@@ -10,6 +10,7 @@
 
 #include "tree_element.hh"
 
+struct bPoseChannel;
 struct Object;
 
 namespace blender::ed::outliner {
diff --git a/source/blender/editors/space_outliner/tree/tree_element_view_collection.hh b/source/blender/editors/space_outliner/tree/tree_element_view_collection.hh
index bf63a7aa342..020fbf37890 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_view_collection.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_view_collection.hh
@@ -10,6 +10,8 @@
 
 #include "tree_element.hh"
 
+struct Scene;
+
 namespace blender::ed::outliner {
 
 class TreeElementViewCollectionBase final : public AbstractTreeElement {
diff --git a/source/blender/editors/space_outliner/tree/tree_element_view_layer.hh b/source/blender/editors/space_outliner/tree/tree_element_view_layer.hh
index 7ef6644d7ab..977af82fc30 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_view_layer.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_view_layer.hh
@@ -10,6 +10,9 @@
 
 #include "tree_element.hh"
 
+struct Scene;
+struct ViewLayer;
+
 namespace blender::ed::outliner {
 
 class TreeElementViewLayerBase final : public AbstractTreeElement {
diff --git a/source/blender/editors/space_script/script_intern.hh b/source/blender/editors/space_script/script_intern.hh
index 43e5cf3579d..235c3b006d2 100644
--- a/source/blender/editors/space_script/script_intern.hh
+++ b/source/blender/editors/space_script/script_intern.hh
@@ -10,6 +10,9 @@
 
 /* internal exports only */
 
+struct wmKeyConfig;
+struct wmOperatorType;
+
 /* `script_ops.cc` */
 
 void script_operatortypes();
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_intern.hh b/source/blender/editors/space_spreadsheet/spreadsheet_intern.hh
index 8da72fa6a73..56d7373fedd 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_intern.hh
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_intern.hh
@@ -8,6 +8,9 @@
 #include "spreadsheet_cache.hh"
 
 struct ARegionType;
+struct Depsgraph;
+struct Object;
+struct SpaceSpreadsheet;
 
 namespace blender::ed::spreadsheet {
 
diff --git a/source/blender/editors/space_text/text_format.hh b/source/blender/editors/space_text/text_format.hh
index a7c7edeb4a2..39ed1b8c2af 100644
--- a/source/blender/editors/space_text/text_format.hh
+++ b/source/blender/editors/space_text/text_format.hh
@@ -12,7 +12,9 @@
 
 using blender::Span;
 
+struct SpaceText;
 struct Text;
+struct TextLine;
 
 /* *** Flatten String *** */
 struct FlattenString {
diff --git a/source/blender/editors/space_view3d/view3d_navigate.hh b/source/blender/editors/space_view3d/view3d_navigate.hh
index 22a309b1953..1e39162d6e4 100644
--- a/source/blender/editors/space_view3d/view3d_navigate.hh
+++ b/source/blender/editors/space_view3d/view3d_navigate.hh
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#include "MEM_guardedalloc.h"
+
+#include "BLI_math_vector_types.hh"
 #include "BLI_utildefines.h"
 
 /**
@@ -23,6 +26,7 @@ struct RegionView3D;
 struct Scene;
 struct ScrArea;
 struct View3D;
+struct ViewOpsData;
 struct bContext;
 struct Object;
 struct PointerRNA;
diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc b/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc
index 2df582a0ebb..9f5c6305fd0 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc
@@ -6,8 +6,7 @@
  * \ingroup spview3d
  */
 
-#include "MEM_guardedalloc.h"
-
+#include "BLI_math_base.h"
 #include "BLI_math_rotation.h"
 
 #include "BLT_translation.hh"
diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc b/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc
index 96444d58105..01cbd80a9ea 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc
@@ -6,8 +6,7 @@
  * \ingroup spview3d
  */
 
-#include "MEM_guardedalloc.h"
-
+#include "BLI_math_base.h"
 #include "BLI_math_rotation.h"
 
 #include "WM_api.hh"
diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc b/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc
index 115d91a61d7..52953e3d0b2 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc
@@ -6,8 +6,6 @@
  * \ingroup spview3d
  */
 
-#include "MEM_guardedalloc.h"
-
 #include "WM_api.hh"
 
 #include "RNA_access.hh"
diff --git a/source/blender/editors/transform/transform.hh b/source/blender/editors/transform/transform.hh
index da2b66ab29b..69d34ff2835 100644
--- a/source/blender/editors/transform/transform.hh
+++ b/source/blender/editors/transform/transform.hh
@@ -15,7 +15,6 @@
 #include "ED_view3d.hh"
 
 #include "DNA_listBase.h"
-#include "DNA_object_enums.h"
 #include "DNA_scene_types.h"
 
 #include "DEG_depsgraph.hh"
diff --git a/source/blender/editors/transform/transform_constraints.hh b/source/blender/editors/transform/transform_constraints.hh
index da79e87a3d5..8014f1bb790 100644
--- a/source/blender/editors/transform/transform_constraints.hh
+++ b/source/blender/editors/transform/transform_constraints.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include "BLI_math_vector_types.hh"
+
 /* DRAWLINE options flags. */
 #define DRAWLIGHT 1
 
diff --git a/source/blender/editors/transform/transform_convert.hh b/source/blender/editors/transform/transform_convert.hh
index 38e80f75ed1..03170168ac9 100644
--- a/source/blender/editors/transform/transform_convert.hh
+++ b/source/blender/editors/transform/transform_convert.hh
@@ -15,6 +15,8 @@
 
 #include "BLI_index_mask.hh"
 
+#include "transform.hh"
+
 struct BMEditMesh;
 struct BMesh;
 struct BezTriple;
diff --git a/source/blender/editors/transform/transform_draw_cursors.hh b/source/blender/editors/transform/transform_draw_cursors.hh
index 6c2c3b5f99f..0e510e1ce41 100644
--- a/source/blender/editors/transform/transform_draw_cursors.hh
+++ b/source/blender/editors/transform/transform_draw_cursors.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+struct bContext;
+
 /* Callbacks for #WM_paint_cursor_activate. */
 
 /**
diff --git a/source/blender/editors/transform/transform_mode.hh b/source/blender/editors/transform/transform_mode.hh
index 69b68dc047d..b159d812b05 100644
--- a/source/blender/editors/transform/transform_mode.hh
+++ b/source/blender/editors/transform/transform_mode.hh
@@ -9,6 +9,10 @@
 
 #pragma once
 
+#include "ED_transform.hh"
+
+#include "transform.hh"
+
 struct BMVert;
 struct LinkNode;
 struct TransData;
diff --git a/source/blender/editors/transform/transform_snap.hh b/source/blender/editors/transform/transform_snap.hh
index 629ae6aa22f..c1e424f42c6 100644
--- a/source/blender/editors/transform/transform_snap.hh
+++ b/source/blender/editors/transform/transform_snap.hh
@@ -14,6 +14,8 @@
 #include "DNA_scene_types.h"
 #include "DNA_space_types.h"
 
+#include "transform.hh"
+
 bool peelObjectsTransform(TransInfo *t,
                           const float mval[2],
                           bool use_peel_object,
diff --git a/source/blender/editors/transform/transform_snap_object.hh b/source/blender/editors/transform/transform_snap_object.hh
index 2f7771f40f6..41a49f84993 100644
--- a/source/blender/editors/transform/transform_snap_object.hh
+++ b/source/blender/editors/transform/transform_snap_object.hh
@@ -8,8 +8,15 @@
 
 #pragma once
 
+#include "DNA_scene_types.h"
+
+#include "BLI_kdopbvh.hh"
 #include "BLI_map.hh"
 #include "BLI_math_geom.h"
+#include "BLI_math_matrix_types.hh"
+#include "BLI_math_vector_types.hh"
+
+#include "ED_transform_snap_object_context.hh"
 
 #define MAX_CLIPPLANE_LEN 6
 
@@ -17,6 +24,17 @@
   (SCE_SNAP_TO_EDGE | SCE_SNAP_TO_EDGE_ENDPOINT | SCE_SNAP_TO_EDGE_MIDPOINT | \
    SCE_SNAP_TO_EDGE_PERPENDICULAR)
 
+struct BMEdge;
+struct BMFace;
+struct BMVert;
+struct Depsgraph;
+struct ID;
+struct ListBase;
+struct Object;
+struct RegionView3D;
+struct Scene;
+struct View3D;
+
 struct SnapObjectContext {
   Scene *scene;
 
diff --git a/source/blender/geometry/GEO_mesh_boolean.hh b/source/blender/geometry/GEO_mesh_boolean.hh
index bf365c4264a..5060e7caeb3 100644
--- a/source/blender/geometry/GEO_mesh_boolean.hh
+++ b/source/blender/geometry/GEO_mesh_boolean.hh
@@ -7,6 +7,7 @@
 #include "BLI_array.hh"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_span.hh"
+#include "BLI_vector.hh"
 
 struct Mesh;
 
diff --git a/source/blender/geometry/GEO_smooth_curves.hh b/source/blender/geometry/GEO_smooth_curves.hh
index a9dfe7eb1f6..60f8c09df69 100644
--- a/source/blender/geometry/GEO_smooth_curves.hh
+++ b/source/blender/geometry/GEO_smooth_curves.hh
@@ -8,6 +8,8 @@
 #include "BLI_index_mask.hh"
 #include "BLI_offset_indices.hh"
 
+#include "BKE_curves.hh"
+
 namespace blender::geometry {
 
 /**
diff --git a/source/blender/geometry/intern/mesh_primitive_cylinder_cone.cc b/source/blender/geometry/intern/mesh_primitive_cylinder_cone.cc
index dfad74079e2..d29eba605ca 100644
--- a/source/blender/geometry/intern/mesh_primitive_cylinder_cone.cc
+++ b/source/blender/geometry/intern/mesh_primitive_cylinder_cone.cc
@@ -2,6 +2,8 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include <cmath>
+
 #include "BKE_attribute.hh"
 #include "BKE_mesh.hh"
 
diff --git a/source/blender/geometry/intern/mesh_primitive_uv_sphere.cc b/source/blender/geometry/intern/mesh_primitive_uv_sphere.cc
index 5583d0a0065..20f24731ece 100644
--- a/source/blender/geometry/intern/mesh_primitive_uv_sphere.cc
+++ b/source/blender/geometry/intern/mesh_primitive_uv_sphere.cc
@@ -2,6 +2,8 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include <cmath>
+
 #include "BKE_attribute.hh"
 #include "BKE_mesh.hh"
 
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 12496e209ab..cd1b4f9ebf6 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -811,7 +811,8 @@ if(WITH_GTESTS)
   endif()
 
   # Enable shader validation on build-bot for Metal
-  if(WITH_METAL_BACKEND AND NOT WITH_GPU_DRAW_TESTS)
+  if(WITH_METAL_BACKEND AND NOT WITH_GPU_DRAW_TESTS AND
+     NOT (WITH_GTESTS AND WITH_GPU_BACKEND_TESTS)) # Avoid duplicate source file
     list(APPEND TEST_SRC
       tests/shader_create_info_test.cc
     )
diff --git a/source/blender/gpu/intern/gpu_shader_create_info.cc b/source/blender/gpu/intern/gpu_shader_create_info.cc
index f5a337b843f..a5100f9d22b 100644
--- a/source/blender/gpu/intern/gpu_shader_create_info.cc
+++ b/source/blender/gpu/intern/gpu_shader_create_info.cc
@@ -28,6 +28,9 @@
 #undef GPU_SHADER_NAMED_INTERFACE_INFO
 #undef GPU_SHADER_INTERFACE_INFO
 #undef GPU_SHADER_CREATE_INFO
+#undef GPU_SHADER_NAMED_INTERFACE_END
+#undef GPU_SHADER_INTERFACE_END
+#undef GPU_SHADER_CREATE_END
 
 namespace blender::gpu::shader {
 
@@ -464,6 +467,10 @@ void gpu_shader_create_info_init()
   g_create_infos->add_new(#_info, ptr_##_info); \
   _info
 
+#define GPU_SHADER_NAMED_INTERFACE_END(_inst_name) ;
+#define GPU_SHADER_INTERFACE_END() ;
+#define GPU_SHADER_CREATE_END() ;
+
 /* Declare, register and construct the infos. */
 #include "gpu_shader_create_info_list.hh"
 
diff --git a/source/blender/gpu/intern/gpu_shader_create_info.hh b/source/blender/gpu/intern/gpu_shader_create_info.hh
index 58877118288..9faae673978 100644
--- a/source/blender/gpu/intern/gpu_shader_create_info.hh
+++ b/source/blender/gpu/intern/gpu_shader_create_info.hh
@@ -81,18 +81,30 @@
 #elif !defined(GPU_SHADER_CREATE_INFO)
 /* Helps intellisense / auto-completion inside info files. */
 #  define GPU_SHADER_NAMED_INTERFACE_INFO(_interface, _inst_name) \
-    StageInterfaceInfo _interface(#_interface, _inst_name); \
-    _interface
+    static inline void autocomplete_helper_interface_##_interface() \
+    { \
+      StageInterfaceInfo _interface(#_interface, _inst_name); \
+      _interface
 #  define GPU_SHADER_INTERFACE_INFO(_interface) \
-    StageInterfaceInfo _interface(#_interface); \
-    _interface
+    static inline void autocomplete_helper_interface_##_interface() \
+    { \
+      StageInterfaceInfo _interface(#_interface); \
+      _interface
 #  define GPU_SHADER_CREATE_INFO(_info) \
-    ShaderCreateInfo _info(#_info); \
-    _info
+    static inline void autocomplete_helper_info_##_info() \
+    { \
+      ShaderCreateInfo _info(#_info); \
+      _info
 
-#  define GPU_SHADER_NAMED_INTERFACE_END(_inst_name) ;
-#  define GPU_SHADER_INTERFACE_END() ;
-#  define GPU_SHADER_CREATE_END() ;
+#  define GPU_SHADER_NAMED_INTERFACE_END(_inst_name) \
+    ; \
+    }
+#  define GPU_SHADER_INTERFACE_END() \
+    ; \
+    }
+#  define GPU_SHADER_CREATE_END() \
+    ; \
+    }
 
 #endif
 
diff --git a/source/blender/imbuf/IMB_metadata.hh b/source/blender/imbuf/IMB_metadata.hh
index ebbde1bd375..3e49abb46fd 100644
--- a/source/blender/imbuf/IMB_metadata.hh
+++ b/source/blender/imbuf/IMB_metadata.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <cstddef>
+
 struct IDProperty;
 struct ImBuf;
 
diff --git a/source/blender/imbuf/IMB_thumbs.hh b/source/blender/imbuf/IMB_thumbs.hh
index 778bb23915b..3962b564035 100644
--- a/source/blender/imbuf/IMB_thumbs.hh
+++ b/source/blender/imbuf/IMB_thumbs.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <cstdint>
+
 struct ImBuf;
 
 /**
diff --git a/source/blender/imbuf/intern/transform.cc b/source/blender/imbuf/intern/transform.cc
index 87270a6e207..683d9f151ef 100644
--- a/source/blender/imbuf/intern/transform.cc
+++ b/source/blender/imbuf/intern/transform.cc
@@ -9,7 +9,7 @@
 
 #include <type_traits>
 
-#include "BLI_math_color_blend.h"
+#include "BLI_math_color.h"
 #include "BLI_math_interp.hh"
 #include "BLI_math_matrix.hh"
 #include "BLI_math_vector.h"
diff --git a/source/blender/io/collada/ArmatureExporter.h b/source/blender/io/collada/ArmatureExporter.h
index a3552254d54..b533e74cac2 100644
--- a/source/blender/io/collada/ArmatureExporter.h
+++ b/source/blender/io/collada/ArmatureExporter.h
@@ -12,10 +12,11 @@
 #include <string>
 // #include <vector>
 
-#include "COLLADASWInputList.h"
-#include "COLLADASWLibraryControllers.h"
-#include "COLLADASWNode.h"
-#include "COLLADASWStreamWriter.h"
+#include <COLLADASWInputList.h>
+#include <COLLADASWInstanceController.h>
+#include <COLLADASWLibraryControllers.h>
+#include <COLLADASWNode.h>
+#include <COLLADASWStreamWriter.h>
 
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
diff --git a/source/blender/io/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp
index 3a885780ba6..a719f0421e3 100644
--- a/source/blender/io/collada/ArmatureImporter.cpp
+++ b/source/blender/io/collada/ArmatureImporter.cpp
@@ -13,6 +13,8 @@
 
 #include "COLLADAFWUniqueId.h"
 
+#include "DNA_key_types.h"
+
 #include "BKE_action.hh"
 #include "BKE_armature.hh"
 #include "BKE_object.hh"
diff --git a/source/blender/io/collada/ArmatureImporter.h b/source/blender/io/collada/ArmatureImporter.h
index 85343fac98c..ae35c7ef7c5 100644
--- a/source/blender/io/collada/ArmatureImporter.h
+++ b/source/blender/io/collada/ArmatureImporter.h
@@ -16,7 +16,6 @@
 #include "BKE_key.hh"
 
 #include "DNA_armature_types.h"
-#include "DNA_key_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
diff --git a/source/blender/io/collada/MeshImporter.h b/source/blender/io/collada/MeshImporter.h
index 04d553e7cd8..0b2248bdadb 100644
--- a/source/blender/io/collada/MeshImporter.h
+++ b/source/blender/io/collada/MeshImporter.h
@@ -18,11 +18,9 @@
 #include "COLLADAFWMeshVertexData.h"
 #include "COLLADAFWNode.h"
 #include "COLLADAFWPolygons.h"
-#include "COLLADAFWTextureCoordinateBinding.h"
 #include "COLLADAFWTypes.h"
 #include "COLLADAFWUniqueId.h"
 
-#include "ArmatureImporter.h"
 #include "collada_utils.h"
 
 #include "BLI_math_vector_types.hh"
@@ -32,6 +30,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
+class ArmatureImporter;
 struct MLoopCol;
 
 /* only for ArmatureImporter to "see" MeshImporter::get_object_by_geom_uid */
diff --git a/source/blender/io/stl/exporter/stl_export_writer.hh b/source/blender/io/stl/exporter/stl_export_writer.hh
index a600ca8da44..7def77390c2 100644
--- a/source/blender/io/stl/exporter/stl_export_writer.hh
+++ b/source/blender/io/stl/exporter/stl_export_writer.hh
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <cstdio>
 
 namespace blender::io::stl {
diff --git a/source/blender/io/stl/importer/stl_import.hh b/source/blender/io/stl/importer/stl_import.hh
index 89c6aafa35a..9509d150e07 100644
--- a/source/blender/io/stl/importer/stl_import.hh
+++ b/source/blender/io/stl/importer/stl_import.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <cstdio>
+
 #include "IO_stl.hh"
 
 struct bContext;
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 92fc636cade..daa6ef7001a 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
@@ -18,7 +18,6 @@
 #include "BLI_array_utils.hh"
 #include "BLI_listbase.h"
 #include "BLI_map.hh"
-#include "BLI_math_matrix.h"
 #include "BLI_math_matrix.hh"
 #include "BLI_math_rotation.h"
 #include "BLI_sort.hh"
@@ -26,7 +25,6 @@
 
 #include "DEG_depsgraph_query.hh"
 
-#include "DNA_material_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mtl.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mtl.cc
index 2cca77aa33a..5c5f571d6fe 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_mtl.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_mtl.cc
@@ -11,14 +11,12 @@
 #include "BKE_node_runtime.hh"
 
 #include "BLI_math_vector.h"
-#include "BLI_math_vector.hh"
 #include "BLI_path_utils.hh"
 #include "BLI_string.h"
 
 #include "DNA_material_types.h"
 #include "DNA_node_types.h"
 
-#include "obj_export_mesh.hh"
 #include "obj_export_mtl.hh"
 
 #include "CLG_log.h"
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.hh b/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.hh
index 6dbc81f7fbd..133ee536dab 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.hh
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.hh
@@ -8,10 +8,15 @@
 
 #pragma once
 
+#include "BLI_math_vector_types.hh"
 #include "BLI_utility_mixins.hh"
 
 #include "DNA_curve_types.h"
 
+#include "IO_orientation.hh"
+
+struct OBJExportParams;
+
 namespace blender::io::obj {
 
 /**
diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mesh.hh b/source/blender/io/wavefront_obj/importer/obj_import_mesh.hh
index 86c97a88372..e0d306b70fb 100644
--- a/source/blender/io/wavefront_obj/importer/obj_import_mesh.hh
+++ b/source/blender/io/wavefront_obj/importer/obj_import_mesh.hh
@@ -17,6 +17,7 @@ struct Main;
 struct Mesh;
 struct Material;
 struct Object;
+struct OBJImportParams;
 
 namespace blender::io::obj {
 
diff --git a/source/blender/io/wavefront_obj/importer/obj_import_nurbs.hh b/source/blender/io/wavefront_obj/importer/obj_import_nurbs.hh
index b1ce1ed90aa..8bdb8e67ae8 100644
--- a/source/blender/io/wavefront_obj/importer/obj_import_nurbs.hh
+++ b/source/blender/io/wavefront_obj/importer/obj_import_nurbs.hh
@@ -16,6 +16,8 @@
 
 #include "obj_import_objects.hh"
 
+struct OBJImportParams;
+
 namespace blender::io::obj {
 
 /**
diff --git a/source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc b/source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc
index 001bfef9eb2..22f1f360f85 100644
--- a/source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc
+++ b/source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc
@@ -16,7 +16,6 @@
 
 #include "BLI_fileops.h"
 #include "BLI_string.h"
-#include "BLI_vector.hh"
 
 #include "BLO_readfile.hh"
 
diff --git a/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc b/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
index 7a93660f6b9..21b51953584 100644
--- a/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
+++ b/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
@@ -16,7 +16,7 @@
 #include "BKE_scene.hh"
 
 #include "BLI_listbase.h"
-#include "BLI_math_base.hh"
+#include "BLI_math_base.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_string.h"
 
@@ -28,8 +28,6 @@
 #include "DNA_curve_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_scene_types.h"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/makesdna/DNA_fileglobal_types.h b/source/blender/makesdna/DNA_fileglobal_types.h
index 25d5791811e..3e110196e6b 100644
--- a/source/blender/makesdna/DNA_fileglobal_types.h
+++ b/source/blender/makesdna/DNA_fileglobal_types.h
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 /**
  * FileGlobal stores a part of the current user-interface settings at
  * the moment of saving, and the file-specific settings.
diff --git a/source/blender/makesdna/DNA_node_tree_interface_types.h b/source/blender/makesdna/DNA_node_tree_interface_types.h
index a5ba886a31a..5875516707a 100644
--- a/source/blender/makesdna/DNA_node_tree_interface_types.h
+++ b/source/blender/makesdna/DNA_node_tree_interface_types.h
@@ -90,7 +90,7 @@ typedef struct bNodeTreeInterfaceSocket {
   /* Socket default value and associated data, e.g. bNodeSocketValueFloat. */
   void *socket_data;
 
-  IDProperty *properties;
+  struct IDProperty *properties;
 
 #ifdef __cplusplus
   bNodeSocketTypeHandle *socket_typeinfo() const;
diff --git a/source/blender/makesdna/DNA_scene_enums.h b/source/blender/makesdna/DNA_scene_enums.h
index 0c65e2bdeb1..1b7949057fb 100644
--- a/source/blender/makesdna/DNA_scene_enums.h
+++ b/source/blender/makesdna/DNA_scene_enums.h
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include "BLI_utildefines.h"
+
 /** #ToolSettings.vgroupsubset */
 typedef enum eVGroupSelect {
   WT_VGROUP_ALL = 0,
diff --git a/source/blender/makesdna/DNA_sdna_types.h b/source/blender/makesdna/DNA_sdna_types.h
index 4e57b632931..93ed9518f31 100644
--- a/source/blender/makesdna/DNA_sdna_types.h
+++ b/source/blender/makesdna/DNA_sdna_types.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include "BLI_sys_types.h"
+
 struct MemArena;
 
 #
diff --git a/source/blender/makesdna/intern/dna_defaults.c b/source/blender/makesdna/intern/dna_defaults.c
index 90b74b6ee50..926d348318a 100644
--- a/source/blender/makesdna/intern/dna_defaults.c
+++ b/source/blender/makesdna/intern/dna_defaults.c
@@ -61,6 +61,7 @@
 
 #define DNA_DEPRECATED_ALLOW
 
+#include <float.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -69,6 +70,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_endian_switch.h"
+#include "BLI_math_base.h"
 #include "BLI_math_rotation.h"
 #include "BLI_memarena.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/makesdna/intern/dna_genfile.cc b/source/blender/makesdna/intern/dna_genfile.cc
index ccd02361f6b..0a658e64361 100644
--- a/source/blender/makesdna/intern/dna_genfile.cc
+++ b/source/blender/makesdna/intern/dna_genfile.cc
@@ -23,7 +23,6 @@
 #include "BLI_endian_switch.h"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_memarena.h"
-#include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "BLI_ghash.h"
diff --git a/source/blender/makesdna/intern/dna_utils.h b/source/blender/makesdna/intern/dna_utils.h
index f5cd01749c2..f0363e9f21e 100644
--- a/source/blender/makesdna/intern/dna_utils.h
+++ b/source/blender/makesdna/intern/dna_utils.h
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include "BLI_sys_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/makesrna/intern/rna_ID.cc b/source/blender/makesrna/intern/rna_ID.cc
index 6c2c576567d..c20428c1c05 100644
--- a/source/blender/makesrna/intern/rna_ID.cc
+++ b/source/blender/makesrna/intern/rna_ID.cc
@@ -6,22 +6,13 @@
  * \ingroup RNA
  */
 
-#include <cstdio>
 #include <cstdlib>
 
 #include "DNA_ID.h"
 #include "DNA_material_types.h"
-#include "DNA_object_types.h"
-#include "DNA_vfont_types.h"
 
-#include "BLI_utildefines.h"
-
-#include "BKE_icons.h"
 #include "BKE_lib_id.hh"
-#include "BKE_main_namemap.hh"
-#include "BKE_object.hh"
 
-#include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
 
@@ -219,6 +210,7 @@ const IDFilterEnumPropertyItem rna_enum_id_type_filter_items[] = {
 
 #  include "BKE_anim_data.hh"
 #  include "BKE_global.hh" /* XXX, remove me */
+#  include "BKE_icons.h"
 #  include "BKE_idprop.hh"
 #  include "BKE_idtype.hh"
 #  include "BKE_lib_override.hh"
diff --git a/source/blender/makesrna/intern/rna_access.cc b/source/blender/makesrna/intern/rna_access.cc
index 7f101e7ad9e..564726f8056 100644
--- a/source/blender/makesrna/intern/rna_access.cc
+++ b/source/blender/makesrna/intern/rna_access.cc
@@ -10,7 +10,6 @@
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
-#include <new>
 #include <sstream>
 
 #include <fmt/format.h>
@@ -19,19 +18,15 @@
 
 #include "DNA_ID.h"
 #include "DNA_anim_types.h"
-#include "DNA_constraint_types.h"
-#include "DNA_modifier_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_windowmanager_types.h"
 
-#include "BLI_alloca.h"
-#include "BLI_blenlib.h"
 #include "BLI_dynstr.h"
 #include "BLI_ghash.h"
+#include "BLI_string.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
-#include "BLF_api.hh"
 #include "BLT_translation.hh"
 
 #include "BKE_anim_data.hh"
diff --git a/source/blender/makesrna/intern/rna_access_compare_override.cc b/source/blender/makesrna/intern/rna_access_compare_override.cc
index 6638ff721b1..98b5e00adea 100644
--- a/source/blender/makesrna/intern/rna_access_compare_override.cc
+++ b/source/blender/makesrna/intern/rna_access_compare_override.cc
@@ -18,13 +18,11 @@
 #include "DNA_anim_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_constraint_types.h"
-#include "DNA_gpencil_modifier_types.h"
 #include "DNA_key_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 
 #include "BLI_listbase.h"
-#include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 // #define DEBUG_OVERRIDE_TIMEIT
@@ -41,7 +39,6 @@
 #include "BKE_main.hh"
 
 #include "RNA_access.hh"
-#include "RNA_define.hh"
 #include "RNA_enum_types.hh"
 #include "RNA_path.hh"
 #include "RNA_prototypes.hh"
diff --git a/source/blender/makesrna/intern/rna_action.cc b/source/blender/makesrna/intern/rna_action.cc
index 13f178dd728..79e95ad3a78 100644
--- a/source/blender/makesrna/intern/rna_action.cc
+++ b/source/blender/makesrna/intern/rna_action.cc
@@ -12,10 +12,6 @@
 #include "DNA_anim_types.h"
 #include "DNA_scene_types.h"
 
-#include "MEM_guardedalloc.h"
-
-#include "BLI_utildefines.h"
-
 #include "BLT_translation.hh"
 
 #include "BKE_action.hh"
@@ -28,7 +24,6 @@
 #include "rna_internal.hh"
 
 #include "ANIM_action.hh"
-#include "ANIM_action_legacy.hh"
 
 #include "WM_types.hh"
 
diff --git a/source/blender/makesrna/intern/rna_action_api.cc b/source/blender/makesrna/intern/rna_action_api.cc
index bf79f190a27..65c0a2685ef 100644
--- a/source/blender/makesrna/intern/rna_action_api.cc
+++ b/source/blender/makesrna/intern/rna_action_api.cc
@@ -6,17 +6,12 @@
  * \ingroup RNA
  */
 
-#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
 
-#include "BLI_utildefines.h"
-
 #include "RNA_define.hh"
 
-#include "DNA_action_types.h"
-
 #include "rna_internal.hh" /* own include */
 
 #ifdef RNA_RUNTIME
diff --git a/source/blender/makesrna/intern/rna_animation.cc b/source/blender/makesrna/intern/rna_animation.cc
index ddb7e3eb1a2..fe7d8f7b86e 100644
--- a/source/blender/makesrna/intern/rna_animation.cc
+++ b/source/blender/makesrna/intern/rna_animation.cc
@@ -8,20 +8,12 @@
 
 #include <cstdlib>
 
-#include "DNA_action_types.h"
 #include "DNA_anim_types.h"
-#include "DNA_scene_types.h"
-
-#include "BLI_listbase_wrapper.hh"
-#include "BLI_utildefines.h"
 
 #include "BLT_translation.hh"
 
-#include "MEM_guardedalloc.h"
-
 #include "BKE_nla.hh"
 
-#include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
 
@@ -32,9 +24,6 @@
 
 #include "ED_keyframing.hh"
 
-#include "ANIM_action.hh"
-#include "ANIM_keyingsets.hh"
-
 using namespace blender;
 
 /* exported for use in API */
@@ -117,7 +106,9 @@ const EnumPropertyItem rna_enum_keying_flag_api_items[] = {
 #  include "BKE_fcurve.hh"
 #  include "BKE_nla.hh"
 
+#  include "ANIM_action.hh"
 #  include "ANIM_action_legacy.hh"
+#  include "ANIM_keyingsets.hh"
 
 #  include "DEG_depsgraph.hh"
 #  include "DEG_depsgraph_build.hh"
diff --git a/source/blender/makesrna/intern/rna_modifier.cc b/source/blender/makesrna/intern/rna_modifier.cc
index b76d3eb8aa7..b8e25de20f9 100644
--- a/source/blender/makesrna/intern/rna_modifier.cc
+++ b/source/blender/makesrna/intern/rna_modifier.cc
@@ -22,6 +22,9 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_math_base.h"
+#include "BLI_math_rotation.h"
+
 #include "BLT_translation.hh"
 
 #include "BKE_animsys.h"
diff --git a/source/blender/modifiers/MOD_nodes.hh b/source/blender/modifiers/MOD_nodes.hh
index 08e60a02255..827c4476d1d 100644
--- a/source/blender/modifiers/MOD_nodes.hh
+++ b/source/blender/modifiers/MOD_nodes.hh
@@ -4,7 +4,10 @@
 
 #pragma once
 
+#include <memory>
+
 struct NodesModifierData;
+struct NodesModifierDataBlock;
 struct Object;
 struct NodesModifierPackedBake;
 
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.cc b/source/blender/modifiers/intern/MOD_datatransfer.cc
index 475e464e047..7bdb32af88a 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.cc
+++ b/source/blender/modifiers/intern/MOD_datatransfer.cc
@@ -6,6 +6,8 @@
  * \ingroup modifiers
  */
 
+#include <cfloat>
+
 #include "BLI_utildefines.h"
 
 #include "BLT_translation.hh"
@@ -20,7 +22,6 @@
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_mapping.hh"
 #include "BKE_mesh_remap.hh"
 #include "BKE_modifier.hh"
 #include "BKE_report.hh"
diff --git a/source/blender/modifiers/intern/MOD_meshcache_util.hh b/source/blender/modifiers/intern/MOD_meshcache_util.hh
index 41ec6a0fa94..f99dd139149 100644
--- a/source/blender/modifiers/intern/MOD_meshcache_util.hh
+++ b/source/blender/modifiers/intern/MOD_meshcache_util.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <cstdio>
+
 /* `MOD_meshcache_mdd.cc` */
 
 bool MOD_meshcache_read_mdd_index(FILE *fp,
diff --git a/source/blender/modifiers/intern/MOD_ocean.cc b/source/blender/modifiers/intern/MOD_ocean.cc
index a86d6cf58e7..79c3d311496 100644
--- a/source/blender/modifiers/intern/MOD_ocean.cc
+++ b/source/blender/modifiers/intern/MOD_ocean.cc
@@ -6,9 +6,9 @@
  * \ingroup modifiers
  */
 
-#include "BLI_utildefines.h"
-
+#include "BLI_math_base.h"
 #include "BLI_task.h"
+#include "BLI_utildefines.h"
 
 #include "BLT_translation.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_solidify_util.hh b/source/blender/modifiers/intern/MOD_solidify_util.hh
index 82c1f495168..75f79ce6b06 100644
--- a/source/blender/modifiers/intern/MOD_solidify_util.hh
+++ b/source/blender/modifiers/intern/MOD_solidify_util.hh
@@ -8,6 +8,10 @@
 
 #pragma once
 
+struct Mesh;
+struct ModifierData;
+struct ModifierEvalContext;
+
 /* MOD_solidify_extrude.cc */
 
 Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md,
diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.hh b/source/blender/modifiers/intern/MOD_weightvg_util.hh
index ac152bcd50b..736cbb1fcd2 100644
--- a/source/blender/modifiers/intern/MOD_weightvg_util.hh
+++ b/source/blender/modifiers/intern/MOD_weightvg_util.hh
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#include "DNA_object_types.h"
+
+struct bContext;
 struct CurveMapping;
 struct MDeformVert;
 struct MDeformWeight;
diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.cc b/source/blender/modifiers/intern/MOD_weightvgmix.cc
index 2793e5659e8..7387a85c71e 100644
--- a/source/blender/modifiers/intern/MOD_weightvgmix.cc
+++ b/source/blender/modifiers/intern/MOD_weightvgmix.cc
@@ -6,6 +6,8 @@
  * \ingroup modifiers
  */
 
+#include <cfloat>
+
 #include "BLI_utildefines.h"
 
 #include "BLI_listbase.h"
diff --git a/source/blender/modifiers/intern/lineart/lineart_intern.hh b/source/blender/modifiers/intern/lineart/lineart_intern.hh
index c925bfc764c..762fabd5f15 100644
--- a/source/blender/modifiers/intern/lineart/lineart_intern.hh
+++ b/source/blender/modifiers/intern/lineart/lineart_intern.hh
@@ -10,6 +10,7 @@
 
 #include "BLI_linklist.h"
 #include "BLI_listbase.h"
+#include "BLI_set.hh"
 #include "BLI_threads.h"
 
 #include "DNA_lineart_types.h"
@@ -21,6 +22,7 @@
 extern "C" {
 #endif
 
+struct LineartBoundingArea;
 struct LineartEdge;
 struct LineartData;
 struct LineartStaticMemPool;
diff --git a/source/blender/nodes/NOD_socket_items_ui.hh b/source/blender/nodes/NOD_socket_items_ui.hh
index 4108c15afb2..cb9d7acf15c 100644
--- a/source/blender/nodes/NOD_socket_items_ui.hh
+++ b/source/blender/nodes/NOD_socket_items_ui.hh
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "DNA_node_types.h"
+
 #include "WM_api.hh"
 
 #include "UI_interface.hh"
@@ -13,6 +15,8 @@
 
 #include "BKE_screen.hh"
 
+#include "NOD_socket_items.hh"
+
 namespace blender::nodes::socket_items::ui {
 
 template<typename Accessor>
diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_neighbors.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_neighbors.cc
index 8789a02c09b..7aff6101e9e 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_neighbors.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_neighbors.cc
@@ -4,7 +4,7 @@
 
 #include "BLI_array_utils.hh"
 
-#include "BKE_mesh.hh"
+#include "DNA_mesh_types.h"
 
 #include "node_geometry_util.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc
index 49128226d93..e34ba479893 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "BKE_mesh.hh"
+#include "DNA_mesh_types.h"
 
 #include "node_geometry_util.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc
index 4f69e321a6c..08e40ab9484 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc
@@ -4,7 +4,7 @@
 
 #include "BLI_math_vector.hh"
 
-#include "BKE_mesh.hh"
+#include "DNA_mesh_types.h"
 
 #include "node_geometry_util.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_shortest_edge_paths.cc b/source/blender/nodes/geometry/nodes/node_geo_input_shortest_edge_paths.cc
index 2fda65f1791..6b6af704083 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_input_shortest_edge_paths.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_input_shortest_edge_paths.cc
@@ -5,9 +5,7 @@
 #include <queue>
 
 #include "BLI_array_utils.hh"
-#include "BLI_map.hh"
 #include "BLI_math_vector_types.hh"
-#include "BLI_set.hh"
 #include "BLI_task.hh"
 
 #include "BKE_mesh.hh"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc b/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc
index 6bacac0ef0a..8e77abd73db 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc
@@ -7,7 +7,6 @@
 #include "BLI_math_matrix.hh"
 #include "BLI_task.hh"
 
-#include "BKE_attribute_math.hh"
 #include "BKE_curves.hh"
 #include "BKE_grease_pencil.hh"
 #include "BKE_instances.hh"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_instances_to_points.cc b/source/blender/nodes/geometry/nodes/node_geo_instances_to_points.cc
index db504e1af22..5d0273884fb 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_instances_to_points.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_instances_to_points.cc
@@ -6,7 +6,6 @@
 
 #include "DNA_pointcloud_types.h"
 
-#include "BKE_attribute_math.hh"
 #include "BKE_instances.hh"
 #include "BKE_pointcloud.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_menu_switch.cc b/source/blender/nodes/geometry/nodes/node_geo_menu_switch.cc
index 058b569cec4..96de6f51dae 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_menu_switch.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_menu_switch.cc
@@ -2,14 +2,10 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include <algorithm>
-
 #include "node_geometry_util.hh"
 
 #include "DNA_node_types.h"
 
-#include "BLI_string.h"
-
 #include "FN_multi_function.hh"
 
 #include "UI_interface.hh"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_face_group_boundaries.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_face_group_boundaries.cc
index ac1d9d23499..fc2cfc47fc3 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_face_group_boundaries.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_face_group_boundaries.cc
@@ -4,7 +4,7 @@
 
 #include <atomic>
 
-#include "BKE_mesh.hh"
+#include "DNA_mesh_types.h"
 
 #include "node_geometry_util.hh"
 
diff --git a/source/blender/nodes/intern/node_util.hh b/source/blender/nodes/intern/node_util.hh
index f4885162d28..9cb7d0a9eca 100644
--- a/source/blender/nodes/intern/node_util.hh
+++ b/source/blender/nodes/intern/node_util.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include "DNA_node_types.h"
+
 struct bNode;
 namespace blender::bke {
 struct bNodeInstanceHash;
diff --git a/source/blender/nodes/shader/materialx/node_item.h b/source/blender/nodes/shader/materialx/node_item.h
index f6a98366d73..2f45e2d0df1 100644
--- a/source/blender/nodes/shader/materialx/node_item.h
+++ b/source/blender/nodes/shader/materialx/node_item.h
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <map>
-
 #include <MaterialXCore/Node.h>
 
 namespace blender::nodes::materialx {
diff --git a/source/blender/python/BPY_extern.hh b/source/blender/python/BPY_extern.hh
index c2d55dad264..f82775951c6 100644
--- a/source/blender/python/BPY_extern.hh
+++ b/source/blender/python/BPY_extern.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include "BLI_sys_types.h"
+
 struct ARegionType;
 struct AnimationEvalContext;
 struct ChannelDriver; /* DNA_anim_types.h */
@@ -25,8 +27,6 @@ struct bPythonConstraint; /* DNA_constraint_types.h */
 struct StructRNA;
 struct wmWindowManager;
 
-#include "BLI_utildefines.h"
-
 void BPY_pyconstraint_exec(bPythonConstraint *con, bConstraintOb *cob, ListBase *targets);
 //  void BPY_pyconstraint_settings(void *arg1, void *arg2);
 void BPY_pyconstraint_target(bPythonConstraint *con, bConstraintTarget *ct);
diff --git a/source/blender/python/bmesh/bmesh_py_api.cc b/source/blender/python/bmesh/bmesh_py_api.cc
index 049e32ed6c7..1ed5f36359c 100644
--- a/source/blender/python/bmesh/bmesh_py_api.cc
+++ b/source/blender/python/bmesh/bmesh_py_api.cc
@@ -10,8 +10,6 @@
 
 #include <Python.h>
 
-#include "BLI_utildefines.h"
-
 #include "bmesh.hh"
 
 #include "bmesh_py_types.hh"
diff --git a/source/blender/python/bmesh/bmesh_py_api.hh b/source/blender/python/bmesh/bmesh_py_api.hh
index 990cfd93d54..6cd345678fe 100644
--- a/source/blender/python/bmesh/bmesh_py_api.hh
+++ b/source/blender/python/bmesh/bmesh_py_api.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPyInit_bmesh();
diff --git a/source/blender/python/bmesh/bmesh_py_geometry.cc b/source/blender/python/bmesh/bmesh_py_geometry.cc
index 640858673d7..ce03568ed64 100644
--- a/source/blender/python/bmesh/bmesh_py_geometry.cc
+++ b/source/blender/python/bmesh/bmesh_py_geometry.cc
@@ -11,8 +11,6 @@
 
 #include <Python.h>
 
-#include "BLI_utildefines.h"
-
 #include "../mathutils/mathutils.hh"
 
 #include "bmesh.hh"
diff --git a/source/blender/python/bmesh/bmesh_py_geometry.hh b/source/blender/python/bmesh/bmesh_py_geometry.hh
index 2e3b58969b3..9a8c1a1ebe0 100644
--- a/source/blender/python/bmesh/bmesh_py_geometry.hh
+++ b/source/blender/python/bmesh/bmesh_py_geometry.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPyInit_bmesh_geometry();
diff --git a/source/blender/python/bmesh/bmesh_py_ops.cc b/source/blender/python/bmesh/bmesh_py_ops.cc
index 5a27d03d2f2..eaa2c733f87 100644
--- a/source/blender/python/bmesh/bmesh_py_ops.cc
+++ b/source/blender/python/bmesh/bmesh_py_ops.cc
@@ -12,7 +12,6 @@
 #include <Python.h>
 
 #include "BLI_dynstr.h"
-#include "BLI_utildefines.h"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/python/bmesh/bmesh_py_ops.hh b/source/blender/python/bmesh/bmesh_py_ops.hh
index 699db2c4b70..dcff64228ed 100644
--- a/source/blender/python/bmesh/bmesh_py_ops.hh
+++ b/source/blender/python/bmesh/bmesh_py_ops.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPyInit_bmesh_ops();
diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.cc b/source/blender/python/bmesh/bmesh_py_ops_call.cc
index c598ae54db1..d2328ec1552 100644
--- a/source/blender/python/bmesh/bmesh_py_ops_call.cc
+++ b/source/blender/python/bmesh/bmesh_py_ops_call.cc
@@ -23,7 +23,6 @@
 #include "bmesh_py_types.hh"
 
 #include "../generic/py_capi_utils.hh"
-#include "../generic/python_utildefines.hh"
 
 BLI_STATIC_ASSERT(sizeof(PyC_FlagSet) == sizeof(BMO_FlagSet), "size mismatch");
 
diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.hh b/source/blender/python/bmesh/bmesh_py_ops_call.hh
index 64a72f7099e..523a1c67910 100644
--- a/source/blender/python/bmesh/bmesh_py_ops_call.hh
+++ b/source/blender/python/bmesh/bmesh_py_ops_call.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 struct BPy_BMeshOpFunc {
   PyObject_HEAD /* Required Python macro. */
   const char *opname;
diff --git a/source/blender/python/bmesh/bmesh_py_types.cc b/source/blender/python/bmesh/bmesh_py_types.cc
index 6ee88d3113c..f981d503541 100644
--- a/source/blender/python/bmesh/bmesh_py_types.cc
+++ b/source/blender/python/bmesh/bmesh_py_types.cc
@@ -10,7 +10,6 @@
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 #include "BLI_sort.h"
-#include "BLI_string.h"
 #include "BLI_string_utils.hh"
 
 #include "DNA_material_types.h"
@@ -20,8 +19,9 @@
 #include "BKE_customdata.hh"
 #include "BKE_global.hh"
 #include "BKE_lib_id.hh"
-#include "BKE_mesh.hh"
+#include "BKE_mesh.h"
 #include "BKE_mesh_runtime.hh"
+#include "BKE_mesh_types.hh"
 #include "BKE_object.hh"
 
 #include "DEG_depsgraph.hh"
diff --git a/source/blender/python/bmesh/bmesh_py_types.hh b/source/blender/python/bmesh/bmesh_py_types.hh
index 850c024c4cb..e1002c64a49 100644
--- a/source/blender/python/bmesh/bmesh_py_types.hh
+++ b/source/blender/python/bmesh/bmesh_py_types.hh
@@ -8,6 +8,10 @@
 
 #pragma once
 
+#include <Python.h>
+
+#include "bmesh.hh"
+
 struct BMesh;
 struct BMEdge;
 struct BMElem;
diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.hh b/source/blender/python/bmesh/bmesh_py_types_customdata.hh
index 5e204b48274..0dc5db5f9e3 100644
--- a/source/blender/python/bmesh/bmesh_py_types_customdata.hh
+++ b/source/blender/python/bmesh/bmesh_py_types_customdata.hh
@@ -8,6 +8,10 @@
 
 #pragma once
 
+#include <Python.h>
+
+#include "bmesh_py_types.hh"
+
 struct BMesh;
 
 /* All use #BPy_BMLayerAccess struct. */
diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.hh b/source/blender/python/bmesh/bmesh_py_types_meshdata.hh
index ffc7039a1f4..7bf7d85681f 100644
--- a/source/blender/python/bmesh/bmesh_py_types_meshdata.hh
+++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.hh
@@ -8,6 +8,10 @@
 
 #pragma once
 
+#include <Python.h>
+
+#include "bmesh.hh"
+
 extern PyTypeObject BPy_BMLoopUV_Type;
 extern PyTypeObject BPy_BMDeformVert_Type;
 
diff --git a/source/blender/python/bmesh/bmesh_py_types_select.hh b/source/blender/python/bmesh/bmesh_py_types_select.hh
index 52076d76105..e7e1f83b384 100644
--- a/source/blender/python/bmesh/bmesh_py_types_select.hh
+++ b/source/blender/python/bmesh/bmesh_py_types_select.hh
@@ -8,6 +8,10 @@
 
 #pragma once
 
+#include <Python.h>
+
+#include "bmesh.hh"
+
 struct BBMesh;
 struct BMEditSelection;
 struct BPy_BMesh;
diff --git a/source/blender/python/bmesh/bmesh_py_utils.hh b/source/blender/python/bmesh/bmesh_py_utils.hh
index 8aa8b206164..e5b47f47206 100644
--- a/source/blender/python/bmesh/bmesh_py_utils.hh
+++ b/source/blender/python/bmesh/bmesh_py_utils.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPyInit_bmesh_utils();
diff --git a/source/blender/python/generic/bgl.cc b/source/blender/python/generic/bgl.cc
index ecf72910df6..4501e3feafd 100644
--- a/source/blender/python/generic/bgl.cc
+++ b/source/blender/python/generic/bgl.cc
@@ -14,18 +14,14 @@
 
 #include <Python.h>
 
-#include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "MEM_guardedalloc.h"
 
 #include "GPU_context.hh"
-#include "GPU_state.hh"
 
 #include "py_capi_utils.hh"
 
-#include "BKE_global.hh"
-
 #include <epoxy/gl.h>
 
 #include "CLG_log.h"
diff --git a/source/blender/python/generic/bgl.hh b/source/blender/python/generic/bgl.hh
index d863edcc85e..5507a1e88da 100644
--- a/source/blender/python/generic/bgl.hh
+++ b/source/blender/python/generic/bgl.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPyInit_bgl();
 
 /* This API is deprecated, currently these are only used in `bgl.cc`
diff --git a/source/blender/python/generic/bl_math_py_api.hh b/source/blender/python/generic/bl_math_py_api.hh
index b2b914f1b9d..dde4e8295ce 100644
--- a/source/blender/python/generic/bl_math_py_api.hh
+++ b/source/blender/python/generic/bl_math_py_api.hh
@@ -9,4 +9,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyMODINIT_FUNC BPyInit_bl_math();
diff --git a/source/blender/python/generic/idprop_py_api.hh b/source/blender/python/generic/idprop_py_api.hh
index acf1ebceb8d..38cf242c50e 100644
--- a/source/blender/python/generic/idprop_py_api.hh
+++ b/source/blender/python/generic/idprop_py_api.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 struct BPy_IDGroup_Iter;
 struct ID;
 struct IDProperty;
diff --git a/source/blender/python/generic/idprop_py_ui_api.cc b/source/blender/python/generic/idprop_py_ui_api.cc
index d93396923b2..0c823e66215 100644
--- a/source/blender/python/generic/idprop_py_ui_api.cc
+++ b/source/blender/python/generic/idprop_py_ui_api.cc
@@ -29,8 +29,6 @@
 #endif
 #include "py_capi_rna.hh"
 
-#include "python_utildefines.hh"
-
 /* -------------------------------------------------------------------- */
 /** \name UI Data Update
  * \{ */
diff --git a/source/blender/python/generic/idprop_py_ui_api.hh b/source/blender/python/generic/idprop_py_ui_api.hh
index 8b24605d267..58a283eb69c 100644
--- a/source/blender/python/generic/idprop_py_ui_api.hh
+++ b/source/blender/python/generic/idprop_py_ui_api.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 struct IDProperty;
 
 extern PyTypeObject BPy_IDPropertyUIManager_Type;
diff --git a/source/blender/python/generic/imbuf_py_api.cc b/source/blender/python/generic/imbuf_py_api.cc
index 45190cc76d3..6b445dc4466 100644
--- a/source/blender/python/generic/imbuf_py_api.cc
+++ b/source/blender/python/generic/imbuf_py_api.cc
@@ -10,14 +10,12 @@
 
 #include <Python.h>
 
-#include "BLI_rect.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "py_capi_utils.hh"
 
 #include "python_compat.hh"
-#include "python_utildefines.hh"
 
 #include "imbuf_py_api.hh" /* own include */
 
diff --git a/source/blender/python/generic/imbuf_py_api.hh b/source/blender/python/generic/imbuf_py_api.hh
index c5f2024906b..9129e6eb210 100644
--- a/source/blender/python/generic/imbuf_py_api.hh
+++ b/source/blender/python/generic/imbuf_py_api.hh
@@ -8,6 +8,8 @@
  * \ingroup pygen
  */
 
+#include <Python.h>
+
 PyObject *BPyInit_imbuf();
 
 extern PyTypeObject Py_ImBuf_Type;
diff --git a/source/blender/python/generic/py_capi_rna.hh b/source/blender/python/generic/py_capi_rna.hh
index e8eb807a69b..990a594b494 100644
--- a/source/blender/python/generic/py_capi_rna.hh
+++ b/source/blender/python/generic/py_capi_rna.hh
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "BLI_sys_types.h"
+#include <Python.h>
 
 struct EnumPropertyItem;
 
diff --git a/source/blender/python/generic/py_capi_utils.cc b/source/blender/python/generic/py_capi_utils.cc
index d6c58a5c6eb..9619663b2e8 100644
--- a/source/blender/python/generic/py_capi_utils.cc
+++ b/source/blender/python/generic/py_capi_utils.cc
@@ -7,10 +7,6 @@
  *
  * Extend upon CPython's API, filling in some gaps, these functions use PyC_
  * prefix to distinguish them apart from CPython.
- *
- * \note
- * This module should only depend on CPython, however it currently uses
- * BLI_string_utf8() for unicode conversion.
  */
 
 /* Future-proof, See https://docs.python.org/3/c-api/arg.html#strings-and-buffers */
@@ -29,10 +25,6 @@
 #  include "MEM_guardedalloc.h"
 
 #  include "BLI_string.h"
-
-/* Only for #BLI_strncpy_wchar_from_utf8,
- * should replace with Python functions but too late in release now. */
-#  include "BLI_string_utf8.h"
 #endif
 
 #ifdef _WIN32
diff --git a/source/blender/python/generic/py_capi_utils.hh b/source/blender/python/generic/py_capi_utils.hh
index 29222d35c2c..1c593bc0bec 100644
--- a/source/blender/python/generic/py_capi_utils.hh
+++ b/source/blender/python/generic/py_capi_utils.hh
@@ -8,12 +8,13 @@
 
 #pragma once
 
+#include <Python.h>
+
 #include <string>
 
 #include "BLI_compiler_attrs.h"
 #include "BLI_span.hh"
 #include "BLI_sys_types.h"
-#include "BLI_utildefines_variadic.h"
 
 /** Useful to print Python objects while debugging. */
 void PyC_ObSpit(const char *name, PyObject *var);
diff --git a/source/blender/python/generic/python_compat.hh b/source/blender/python/generic/python_compat.hh
index e2799aeeb46..2a60c90d9b3 100644
--- a/source/blender/python/generic/python_compat.hh
+++ b/source/blender/python/generic/python_compat.hh
@@ -9,6 +9,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 /* Removes `intialized` member from Python 3.13+. */
 #if PY_VERSION_HEX >= 0x030d0000
 #  define PY_ARG_PARSER_HEAD_COMPAT()
diff --git a/source/blender/python/generic/python_utildefines.hh b/source/blender/python/generic/python_utildefines.hh
index 71139861aaf..920c40bc491 100644
--- a/source/blender/python/generic/python_utildefines.hh
+++ b/source/blender/python/generic/python_utildefines.hh
@@ -10,6 +10,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 #define PyTuple_SET_ITEMS(op_arg, ...) \
   { \
     PyTupleObject *op = (PyTupleObject *)op_arg; \
diff --git a/source/blender/python/gpu/gpu_py.hh b/source/blender/python/gpu/gpu_py.hh
index 8d3eebfe3e2..91eae94b1f9 100644
--- a/source/blender/python/gpu/gpu_py.hh
+++ b/source/blender/python/gpu/gpu_py.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 #include "../generic/py_capi_utils.hh"
 
 extern struct PyC_StringEnumItems bpygpu_primtype_items[];
diff --git a/source/blender/python/gpu/gpu_py_api.cc b/source/blender/python/gpu/gpu_py_api.cc
index 5d14fcea179..3ab7e059a68 100644
--- a/source/blender/python/gpu/gpu_py_api.cc
+++ b/source/blender/python/gpu/gpu_py_api.cc
@@ -14,8 +14,6 @@
 
 #include <Python.h>
 
-#include "BLI_utildefines.h"
-
 #include "gpu_py_capabilities.hh"
 #include "gpu_py_compute.hh"
 #include "gpu_py_matrix.hh"
diff --git a/source/blender/python/gpu/gpu_py_api.hh b/source/blender/python/gpu/gpu_py_api.hh
index aee56ef595b..bc60819e123 100644
--- a/source/blender/python/gpu/gpu_py_api.hh
+++ b/source/blender/python/gpu/gpu_py_api.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 /* Each type object could have a method for free GPU resources.
  * However, it is currently of little use. */
 // #define BPYGPU_USE_GPUOBJ_FREE_METHOD
diff --git a/source/blender/python/gpu/gpu_py_batch.hh b/source/blender/python/gpu/gpu_py_batch.hh
index 13bb18513fa..ad4ba06b1dd 100644
--- a/source/blender/python/gpu/gpu_py_batch.hh
+++ b/source/blender/python/gpu/gpu_py_batch.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 #include "BLI_compiler_attrs.h"
 
 namespace blender::gpu {
diff --git a/source/blender/python/gpu/gpu_py_buffer.hh b/source/blender/python/gpu/gpu_py_buffer.hh
index 0b0741c9703..e717f77b886 100644
--- a/source/blender/python/gpu/gpu_py_buffer.hh
+++ b/source/blender/python/gpu/gpu_py_buffer.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 #include "BLI_sys_types.h"
 
 extern PyTypeObject BPyGPU_BufferType;
diff --git a/source/blender/python/gpu/gpu_py_capabilities.cc b/source/blender/python/gpu/gpu_py_capabilities.cc
index 86289d06e9a..f1ddb9f5608 100644
--- a/source/blender/python/gpu/gpu_py_capabilities.cc
+++ b/source/blender/python/gpu/gpu_py_capabilities.cc
@@ -11,8 +11,6 @@
 
 #include <Python.h>
 
-#include "BLI_utildefines.h"
-
 #include "GPU_capabilities.hh"
 
 #include "gpu_py.hh"
diff --git a/source/blender/python/gpu/gpu_py_capabilities.hh b/source/blender/python/gpu/gpu_py_capabilities.hh
index 5f7965b6fc1..1a146411977 100644
--- a/source/blender/python/gpu/gpu_py_capabilities.hh
+++ b/source/blender/python/gpu/gpu_py_capabilities.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *bpygpu_capabilities_init();
diff --git a/source/blender/python/gpu/gpu_py_compute.cc b/source/blender/python/gpu/gpu_py_compute.cc
index 8f844614cc1..ce77bc46cc7 100644
--- a/source/blender/python/gpu/gpu_py_compute.cc
+++ b/source/blender/python/gpu/gpu_py_compute.cc
@@ -11,8 +11,6 @@
 
 #include <Python.h>
 
-#include "BLI_utildefines.h"
-
 #include "GPU_capabilities.hh"
 #include "GPU_compute.hh"
 #include "GPU_state.hh"
diff --git a/source/blender/python/gpu/gpu_py_compute.hh b/source/blender/python/gpu/gpu_py_compute.hh
index 7bdbda1a71c..77d5601de0f 100644
--- a/source/blender/python/gpu/gpu_py_compute.hh
+++ b/source/blender/python/gpu/gpu_py_compute.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *bpygpu_compute_init();
diff --git a/source/blender/python/gpu/gpu_py_element.hh b/source/blender/python/gpu/gpu_py_element.hh
index 859e449f5d0..4eb6bda1127 100644
--- a/source/blender/python/gpu/gpu_py_element.hh
+++ b/source/blender/python/gpu/gpu_py_element.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 namespace blender::gpu {
 class IndexBuf;
 }
diff --git a/source/blender/python/gpu/gpu_py_framebuffer.hh b/source/blender/python/gpu/gpu_py_framebuffer.hh
index 3a3a9179757..7fd52a69251 100644
--- a/source/blender/python/gpu/gpu_py_framebuffer.hh
+++ b/source/blender/python/gpu/gpu_py_framebuffer.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 #include "BLI_compiler_attrs.h"
 
 struct GPUFrameBuffer;
diff --git a/source/blender/python/gpu/gpu_py_matrix.cc b/source/blender/python/gpu/gpu_py_matrix.cc
index 3e34ee4114b..cf1b9e52032 100644
--- a/source/blender/python/gpu/gpu_py_matrix.cc
+++ b/source/blender/python/gpu/gpu_py_matrix.cc
@@ -20,8 +20,6 @@
 
 #include "../mathutils/mathutils.hh"
 
-#include "../generic/py_capi_utils.hh"
-
 #define USE_GPU_PY_MATRIX_API
 #include "GPU_matrix.hh"
 #undef USE_GPU_PY_MATRIX_API
diff --git a/source/blender/python/gpu/gpu_py_matrix.hh b/source/blender/python/gpu/gpu_py_matrix.hh
index 617e83b85d3..ce1a4fb3584 100644
--- a/source/blender/python/gpu/gpu_py_matrix.hh
+++ b/source/blender/python/gpu/gpu_py_matrix.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *bpygpu_matrix_init();
diff --git a/source/blender/python/gpu/gpu_py_offscreen.cc b/source/blender/python/gpu/gpu_py_offscreen.cc
index db6cdf329c4..b9bfe551a69 100644
--- a/source/blender/python/gpu/gpu_py_offscreen.cc
+++ b/source/blender/python/gpu/gpu_py_offscreen.cc
@@ -15,7 +15,6 @@
 #include <Python.h>
 
 #include "BLI_string.h"
-#include "BLI_utildefines.h"
 
 #include "BKE_global.hh"
 #include "BKE_lib_id.hh" /* For #BKE_id_is_in_global_main. */
diff --git a/source/blender/python/gpu/gpu_py_offscreen.hh b/source/blender/python/gpu/gpu_py_offscreen.hh
index 12791c213ad..63b6b7cc480 100644
--- a/source/blender/python/gpu/gpu_py_offscreen.hh
+++ b/source/blender/python/gpu/gpu_py_offscreen.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 #include "BLI_compiler_attrs.h"
 
 struct GPUOffScreen;
diff --git a/source/blender/python/gpu/gpu_py_platform.cc b/source/blender/python/gpu/gpu_py_platform.cc
index 71089544289..03644101b87 100644
--- a/source/blender/python/gpu/gpu_py_platform.cc
+++ b/source/blender/python/gpu/gpu_py_platform.cc
@@ -11,8 +11,6 @@
 
 #include <Python.h>
 
-#include "BLI_utildefines.h"
-
 #include "GPU_context.hh"
 #include "GPU_platform.hh"
 
diff --git a/source/blender/python/gpu/gpu_py_platform.hh b/source/blender/python/gpu/gpu_py_platform.hh
index 25e1bf807ea..9c78e49d99a 100644
--- a/source/blender/python/gpu/gpu_py_platform.hh
+++ b/source/blender/python/gpu/gpu_py_platform.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *bpygpu_platform_init();
diff --git a/source/blender/python/gpu/gpu_py_select.cc b/source/blender/python/gpu/gpu_py_select.cc
index 18a0dc0f9ef..162f04d1da8 100644
--- a/source/blender/python/gpu/gpu_py_select.cc
+++ b/source/blender/python/gpu/gpu_py_select.cc
@@ -16,8 +16,6 @@
 
 #include <Python.h>
 
-#include "BLI_utildefines.h"
-
 #include "../generic/py_capi_utils.hh"
 
 #include "GPU_select.hh"
diff --git a/source/blender/python/gpu/gpu_py_select.hh b/source/blender/python/gpu/gpu_py_select.hh
index 2572559b5ec..93f0aa3d1fa 100644
--- a/source/blender/python/gpu/gpu_py_select.hh
+++ b/source/blender/python/gpu/gpu_py_select.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *bpygpu_select_init();
diff --git a/source/blender/python/gpu/gpu_py_shader.hh b/source/blender/python/gpu/gpu_py_shader.hh
index d1abed9e085..b7e992fdb37 100644
--- a/source/blender/python/gpu/gpu_py_shader.hh
+++ b/source/blender/python/gpu/gpu_py_shader.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 #ifndef __cplusplus
 #  include "../generic/py_capi_utils.hh"
 #endif
diff --git a/source/blender/python/gpu/gpu_py_shader_create_info.cc b/source/blender/python/gpu/gpu_py_shader_create_info.cc
index 16fa3780db6..cb787dab2a5 100644
--- a/source/blender/python/gpu/gpu_py_shader_create_info.cc
+++ b/source/blender/python/gpu/gpu_py_shader_create_info.cc
@@ -19,7 +19,6 @@
 #include "../generic/py_capi_utils.hh"
 #include "../generic/python_compat.hh"
 
-#include "gpu_py.hh"
 #include "gpu_py_shader.hh" /* own include */
 #include "gpu_py_texture.hh"
 
diff --git a/source/blender/python/gpu/gpu_py_state.hh b/source/blender/python/gpu/gpu_py_state.hh
index 336996d2759..97f8437c461 100644
--- a/source/blender/python/gpu/gpu_py_state.hh
+++ b/source/blender/python/gpu/gpu_py_state.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *bpygpu_state_init();
diff --git a/source/blender/python/gpu/gpu_py_texture.hh b/source/blender/python/gpu/gpu_py_texture.hh
index f7f48388bf1..0584fb378c6 100644
--- a/source/blender/python/gpu/gpu_py_texture.hh
+++ b/source/blender/python/gpu/gpu_py_texture.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 #include "BLI_compiler_attrs.h"
 
 struct GPUTexture;
diff --git a/source/blender/python/gpu/gpu_py_types.hh b/source/blender/python/gpu/gpu_py_types.hh
index 29ea81e2b45..9537de67916 100644
--- a/source/blender/python/gpu/gpu_py_types.hh
+++ b/source/blender/python/gpu/gpu_py_types.hh
@@ -8,17 +8,17 @@
 
 #pragma once
 
-#include "gpu_py_buffer.hh"
+#include "gpu_py_buffer.hh"  // IWYU pragma: export
 
-#include "gpu_py_batch.hh"
-#include "gpu_py_compute.hh"
-#include "gpu_py_element.hh"
-#include "gpu_py_framebuffer.hh"
-#include "gpu_py_offscreen.hh"
-#include "gpu_py_shader.hh"
-#include "gpu_py_texture.hh"
-#include "gpu_py_uniformbuffer.hh"
-#include "gpu_py_vertex_buffer.hh"
-#include "gpu_py_vertex_format.hh"
+#include "gpu_py_batch.hh"          // IWYU pragma: export
+#include "gpu_py_compute.hh"        // IWYU pragma: export
+#include "gpu_py_element.hh"        // IWYU pragma: export
+#include "gpu_py_framebuffer.hh"    // IWYU pragma: export
+#include "gpu_py_offscreen.hh"      // IWYU pragma: export
+#include "gpu_py_shader.hh"         // IWYU pragma: export
+#include "gpu_py_texture.hh"        // IWYU pragma: export
+#include "gpu_py_uniformbuffer.hh"  // IWYU pragma: export
+#include "gpu_py_vertex_buffer.hh"  // IWYU pragma: export
+#include "gpu_py_vertex_format.hh"  // IWYU pragma: export
 
 PyObject *bpygpu_types_init();
diff --git a/source/blender/python/gpu/gpu_py_uniformbuffer.hh b/source/blender/python/gpu/gpu_py_uniformbuffer.hh
index 19eda128649..9d3ce68d645 100644
--- a/source/blender/python/gpu/gpu_py_uniformbuffer.hh
+++ b/source/blender/python/gpu/gpu_py_uniformbuffer.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 #include "BLI_compiler_attrs.h"
 
 struct GPUUniformBuf;
diff --git a/source/blender/python/gpu/gpu_py_vertex_buffer.cc b/source/blender/python/gpu/gpu_py_vertex_buffer.cc
index f4032a52a0b..9683266ed58 100644
--- a/source/blender/python/gpu/gpu_py_vertex_buffer.cc
+++ b/source/blender/python/gpu/gpu_py_vertex_buffer.cc
@@ -13,11 +13,8 @@
 
 #include "GPU_vertex_buffer.hh"
 
-#include "MEM_guardedalloc.h"
-
 #include "../generic/py_capi_utils.hh"
 #include "../generic/python_compat.hh"
-#include "../generic/python_utildefines.hh"
 
 #include "gpu_py.hh"
 #include "gpu_py_vertex_buffer.hh" /* own include */
diff --git a/source/blender/python/gpu/gpu_py_vertex_buffer.hh b/source/blender/python/gpu/gpu_py_vertex_buffer.hh
index 2c716166b58..05241198486 100644
--- a/source/blender/python/gpu/gpu_py_vertex_buffer.hh
+++ b/source/blender/python/gpu/gpu_py_vertex_buffer.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 #include "BLI_compiler_attrs.h"
 
 namespace blender::gpu {
diff --git a/source/blender/python/gpu/gpu_py_vertex_format.hh b/source/blender/python/gpu/gpu_py_vertex_format.hh
index 04a9bda6ae1..40b755d5f63 100644
--- a/source/blender/python/gpu/gpu_py_vertex_format.hh
+++ b/source/blender/python/gpu/gpu_py_vertex_format.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 #include "GPU_vertex_format.hh"
 
 extern PyTypeObject BPyGPUVertFormat_Type;
diff --git a/source/blender/python/intern/bpy.hh b/source/blender/python/intern/bpy.hh
index e70a1cbad45..dac8196c612 100644
--- a/source/blender/python/intern/bpy.hh
+++ b/source/blender/python/intern/bpy.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 struct bContext;
 
 /** Creates the `bpy` module and adds it to `sys.modules` for importing. */
diff --git a/source/blender/python/intern/bpy_app.cc b/source/blender/python/intern/bpy_app.cc
index 810753deae5..42152f24ed9 100644
--- a/source/blender/python/intern/bpy_app.cc
+++ b/source/blender/python/intern/bpy_app.cc
@@ -42,8 +42,6 @@
 #include "BKE_global.hh"
 #include "BKE_main.hh"
 
-#include "DNA_ID.h"
-
 #include "UI_interface_icons.hh"
 
 #include "MEM_guardedalloc.h"
@@ -57,7 +55,6 @@
 #include "../generic/py_capi_rna.hh"
 #include "../generic/py_capi_utils.hh"
 #include "../generic/python_compat.hh"
-#include "../generic/python_utildefines.hh"
 
 #ifdef BUILD_DATE
 extern "C" char build_date[];
diff --git a/source/blender/python/intern/bpy_app.hh b/source/blender/python/intern/bpy_app.hh
index dbb33d6e83e..9806ea0682b 100644
--- a/source/blender/python/intern/bpy_app.hh
+++ b/source/blender/python/intern/bpy_app.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_app_struct();
diff --git a/source/blender/python/intern/bpy_app_alembic.hh b/source/blender/python/intern/bpy_app_alembic.hh
index 20e9f5772e3..28607a24fba 100644
--- a/source/blender/python/intern/bpy_app_alembic.hh
+++ b/source/blender/python/intern/bpy_app_alembic.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_app_alembic_struct();
diff --git a/source/blender/python/intern/bpy_app_build_options.hh b/source/blender/python/intern/bpy_app_build_options.hh
index 2558ad0d2b7..5a254681069 100644
--- a/source/blender/python/intern/bpy_app_build_options.hh
+++ b/source/blender/python/intern/bpy_app_build_options.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_app_build_options_struct();
diff --git a/source/blender/python/intern/bpy_app_ffmpeg.hh b/source/blender/python/intern/bpy_app_ffmpeg.hh
index 953e89ec6b0..7ea59d47ab0 100644
--- a/source/blender/python/intern/bpy_app_ffmpeg.hh
+++ b/source/blender/python/intern/bpy_app_ffmpeg.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_app_ffmpeg_struct();
diff --git a/source/blender/python/intern/bpy_app_handlers.cc b/source/blender/python/intern/bpy_app_handlers.cc
index 3e369368a78..e86398a965d 100644
--- a/source/blender/python/intern/bpy_app_handlers.cc
+++ b/source/blender/python/intern/bpy_app_handlers.cc
@@ -20,8 +20,6 @@
 #include "bpy_app_handlers.hh"
 #include "bpy_rna.hh"
 
-#include "../generic/python_utildefines.hh"
-
 #include "BPY_extern.hh"
 
 void bpy_app_generic_callback(Main *main,
diff --git a/source/blender/python/intern/bpy_app_handlers.hh b/source/blender/python/intern/bpy_app_handlers.hh
index 92c757d8f0e..e5202ef10ed 100644
--- a/source/blender/python/intern/bpy_app_handlers.hh
+++ b/source/blender/python/intern/bpy_app_handlers.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_app_handlers_struct();
diff --git a/source/blender/python/intern/bpy_app_icons.cc b/source/blender/python/intern/bpy_app_icons.cc
index f1da38e2100..003535686c4 100644
--- a/source/blender/python/intern/bpy_app_icons.cc
+++ b/source/blender/python/intern/bpy_app_icons.cc
@@ -12,8 +12,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
-
 #include "BKE_icons.h"
 
 #include "../generic/py_capi_utils.hh"
diff --git a/source/blender/python/intern/bpy_app_icons.hh b/source/blender/python/intern/bpy_app_icons.hh
index 89e7628c6f3..d285036fbc6 100644
--- a/source/blender/python/intern/bpy_app_icons.hh
+++ b/source/blender/python/intern/bpy_app_icons.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_app_icons_module();
diff --git a/source/blender/python/intern/bpy_app_ocio.hh b/source/blender/python/intern/bpy_app_ocio.hh
index c533554986c..7908c35676a 100644
--- a/source/blender/python/intern/bpy_app_ocio.hh
+++ b/source/blender/python/intern/bpy_app_ocio.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_app_ocio_struct();
diff --git a/source/blender/python/intern/bpy_app_oiio.hh b/source/blender/python/intern/bpy_app_oiio.hh
index e7ce1c9cbed..5ef943deb83 100644
--- a/source/blender/python/intern/bpy_app_oiio.hh
+++ b/source/blender/python/intern/bpy_app_oiio.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_app_oiio_struct();
diff --git a/source/blender/python/intern/bpy_app_opensubdiv.hh b/source/blender/python/intern/bpy_app_opensubdiv.hh
index 8636faf3b8f..5ec2de573c0 100644
--- a/source/blender/python/intern/bpy_app_opensubdiv.hh
+++ b/source/blender/python/intern/bpy_app_opensubdiv.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_app_opensubdiv_struct();
diff --git a/source/blender/python/intern/bpy_app_openvdb.hh b/source/blender/python/intern/bpy_app_openvdb.hh
index 5e8f191990e..841b0efddac 100644
--- a/source/blender/python/intern/bpy_app_openvdb.hh
+++ b/source/blender/python/intern/bpy_app_openvdb.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_app_openvdb_struct();
diff --git a/source/blender/python/intern/bpy_app_sdl.hh b/source/blender/python/intern/bpy_app_sdl.hh
index b0c091f0e07..8e3ff9552cf 100644
--- a/source/blender/python/intern/bpy_app_sdl.hh
+++ b/source/blender/python/intern/bpy_app_sdl.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_app_sdl_struct();
diff --git a/source/blender/python/intern/bpy_app_timers.hh b/source/blender/python/intern/bpy_app_timers.hh
index c44d4e438d4..7a1efc4fc01 100644
--- a/source/blender/python/intern/bpy_app_timers.hh
+++ b/source/blender/python/intern/bpy_app_timers.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_app_timers_module();
diff --git a/source/blender/python/intern/bpy_app_translations.cc b/source/blender/python/intern/bpy_app_translations.cc
index ee028169d2b..e0aaa2ace75 100644
--- a/source/blender/python/intern/bpy_app_translations.cc
+++ b/source/blender/python/intern/bpy_app_translations.cc
@@ -26,8 +26,6 @@
 
 #include "RNA_types.hh"
 
-#include "../generic/python_utildefines.hh"
-
 #ifdef WITH_INTERNATIONAL
 #  include "BLI_ghash.h"
 #  include "BLI_string.h"
diff --git a/source/blender/python/intern/bpy_app_translations.hh b/source/blender/python/intern/bpy_app_translations.hh
index c5369598233..420d017ac9e 100644
--- a/source/blender/python/intern/bpy_app_translations.hh
+++ b/source/blender/python/intern/bpy_app_translations.hh
@@ -8,5 +8,7 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_app_translations_struct();
 void BPY_app_translations_end();
diff --git a/source/blender/python/intern/bpy_app_usd.hh b/source/blender/python/intern/bpy_app_usd.hh
index 22b3ba95410..2dd0017b006 100644
--- a/source/blender/python/intern/bpy_app_usd.hh
+++ b/source/blender/python/intern/bpy_app_usd.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_app_usd_struct();
diff --git a/source/blender/python/intern/bpy_capi_utils.cc b/source/blender/python/intern/bpy_capi_utils.cc
index 651c49e7b3e..519b36e3538 100644
--- a/source/blender/python/intern/bpy_capi_utils.cc
+++ b/source/blender/python/intern/bpy_capi_utils.cc
@@ -11,9 +11,6 @@
 
 #include <Python.h>
 
-#include "BLI_listbase.h"
-#include "BLI_utildefines.h"
-
 #include "bpy_capi_utils.hh"
 
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/python/intern/bpy_cli_command.cc b/source/blender/python/intern/bpy_cli_command.cc
index 413a9466e2a..feac498bd92 100644
--- a/source/blender/python/intern/bpy_cli_command.cc
+++ b/source/blender/python/intern/bpy_cli_command.cc
@@ -13,13 +13,10 @@
 
 #include "bpy_capi_utils.hh"
 
-#include "MEM_guardedalloc.h"
-
 #include "BKE_blender_cli_command.hh"
 
 #include "../generic/py_capi_utils.hh"
 #include "../generic/python_compat.hh"
-#include "../generic/python_utildefines.hh"
 
 #include "bpy_cli_command.hh" /* Own include. */
 
diff --git a/source/blender/python/intern/bpy_cli_command.hh b/source/blender/python/intern/bpy_cli_command.hh
index 7f5db8859cd..1de0f0e2f8d 100644
--- a/source/blender/python/intern/bpy_cli_command.hh
+++ b/source/blender/python/intern/bpy_cli_command.hh
@@ -8,5 +8,7 @@
 
 #pragma once
 
+#include <Python.h>
+
 extern PyMethodDef BPY_cli_command_register_def;
 extern PyMethodDef BPY_cli_command_unregister_def;
diff --git a/source/blender/python/intern/bpy_driver.cc b/source/blender/python/intern/bpy_driver.cc
index 7908ca99a44..f0d3f2b8ed9 100644
--- a/source/blender/python/intern/bpy_driver.cc
+++ b/source/blender/python/intern/bpy_driver.cc
@@ -15,7 +15,6 @@
 #include "DNA_anim_types.h"
 
 #include "BLI_listbase.h"
-#include "BLI_math_base.h"
 #include "BLI_string.h"
 
 #include "BKE_animsys.h"
diff --git a/source/blender/python/intern/bpy_driver.hh b/source/blender/python/intern/bpy_driver.hh
index b4c9f5bf4d2..9c10eceacdd 100644
--- a/source/blender/python/intern/bpy_driver.hh
+++ b/source/blender/python/intern/bpy_driver.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 #include <stdbool.h>
 
 /**
diff --git a/source/blender/python/intern/bpy_gizmo_wrap.cc b/source/blender/python/intern/bpy_gizmo_wrap.cc
index b3d679abdd4..054886ddd1e 100644
--- a/source/blender/python/intern/bpy_gizmo_wrap.cc
+++ b/source/blender/python/intern/bpy_gizmo_wrap.cc
@@ -16,8 +16,6 @@
 
 #include <Python.h>
 
-#include "BLI_utildefines.h"
-
 #include "WM_types.hh"
 
 #include "RNA_access.hh"
diff --git a/source/blender/python/intern/bpy_interface.cc b/source/blender/python/intern/bpy_interface.cc
index fa7f05d5176..bf155c48427 100644
--- a/source/blender/python/intern/bpy_interface.cc
+++ b/source/blender/python/intern/bpy_interface.cc
@@ -17,15 +17,10 @@
 #  include "pylifecycle.h" /* For `Py_Version`. */
 #endif
 
-#include "MEM_guardedalloc.h"
-
 #include "CLG_log.h"
 
-#include "BLI_fileops.h"
-#include "BLI_listbase.h"
 #include "BLI_path_utils.hh"
 #include "BLI_string.h"
-#include "BLI_string_utf8.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
@@ -39,7 +34,6 @@
 #include "bpy_path.hh"
 #include "bpy_props.hh"
 #include "bpy_rna.hh"
-#include "bpy_traceback.hh"
 
 #include "bpy_app_translations.hh"
 
diff --git a/source/blender/python/intern/bpy_interface_atexit.cc b/source/blender/python/intern/bpy_interface_atexit.cc
index 9d815e2f282..8aaaf0a641d 100644
--- a/source/blender/python/intern/bpy_interface_atexit.cc
+++ b/source/blender/python/intern/bpy_interface_atexit.cc
@@ -12,8 +12,6 @@
 
 #include <Python.h>
 
-#include "BLI_utildefines.h"
-
 #include "bpy.hh" /* own include */
 #include "bpy_capi_utils.hh"
 
diff --git a/source/blender/python/intern/bpy_interface_run.cc b/source/blender/python/intern/bpy_interface_run.cc
index dcf53413a02..d6326efc72e 100644
--- a/source/blender/python/intern/bpy_interface_run.cc
+++ b/source/blender/python/intern/bpy_interface_run.cc
@@ -27,7 +27,6 @@
 #include "BPY_extern_run.hh"
 
 #include "bpy_capi_utils.hh"
-#include "bpy_intern_string.hh"
 #include "bpy_traceback.hh"
 
 #include "../generic/py_capi_utils.hh"
diff --git a/source/blender/python/intern/bpy_intern_string.hh b/source/blender/python/intern/bpy_intern_string.hh
index 533a52db381..60cd9f05ef7 100644
--- a/source/blender/python/intern/bpy_intern_string.hh
+++ b/source/blender/python/intern/bpy_intern_string.hh
@@ -8,6 +8,8 @@
  * \ingroup pythonintern
  */
 
+#include <Python.h>
+
 void bpy_intern_string_init();
 void bpy_intern_string_exit();
 
diff --git a/source/blender/python/intern/bpy_library.hh b/source/blender/python/intern/bpy_library.hh
index a24ca789712..5ecabf1c268 100644
--- a/source/blender/python/intern/bpy_library.hh
+++ b/source/blender/python/intern/bpy_library.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 int BPY_library_load_type_ready();
 
 extern PyMethodDef BPY_library_load_method_def;
diff --git a/source/blender/python/intern/bpy_library_load.cc b/source/blender/python/intern/bpy_library_load.cc
index 5da08830f8b..a664d6dd8f7 100644
--- a/source/blender/python/intern/bpy_library_load.cc
+++ b/source/blender/python/intern/bpy_library_load.cc
@@ -32,8 +32,6 @@
 
 #include "BLO_readfile.hh"
 
-#include "MEM_guardedalloc.h"
-
 #include "bpy_capi_utils.hh"
 #include "bpy_library.hh"
 
diff --git a/source/blender/python/intern/bpy_library_write.cc b/source/blender/python/intern/bpy_library_write.cc
index 09e9466f1f0..7b0b334f075 100644
--- a/source/blender/python/intern/bpy_library_write.cc
+++ b/source/blender/python/intern/bpy_library_write.cc
@@ -12,11 +12,8 @@
 #include <Python.h>
 #include <cstddef>
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_path_utils.hh"
 #include "BLI_string.h"
-#include "BLI_utildefines.h"
 
 #include "BKE_blendfile.hh"
 #include "BKE_global.hh"
diff --git a/source/blender/python/intern/bpy_msgbus.cc b/source/blender/python/intern/bpy_msgbus.cc
index e48354d178b..83629c023da 100644
--- a/source/blender/python/intern/bpy_msgbus.cc
+++ b/source/blender/python/intern/bpy_msgbus.cc
@@ -16,8 +16,6 @@
 
 #include "../mathutils/mathutils.hh"
 
-#include "BLI_utildefines.h"
-
 #include "BKE_context.hh"
 
 #include "WM_message.hh"
diff --git a/source/blender/python/intern/bpy_msgbus.hh b/source/blender/python/intern/bpy_msgbus.hh
index a6de5780d94..c4722679be9 100644
--- a/source/blender/python/intern/bpy_msgbus.hh
+++ b/source/blender/python/intern/bpy_msgbus.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_msgbus_module();
diff --git a/source/blender/python/intern/bpy_operator.cc b/source/blender/python/intern/bpy_operator.cc
index d06fbeb09ca..fd52f6b6978 100644
--- a/source/blender/python/intern/bpy_operator.cc
+++ b/source/blender/python/intern/bpy_operator.cc
@@ -18,12 +18,10 @@
 #include "RNA_types.hh"
 
 #include "BLI_listbase.h"
-#include "BLI_utildefines.h"
 
 #include "../generic/py_capi_rna.hh"
 #include "../generic/py_capi_utils.hh"
 #include "../generic/python_compat.hh"
-#include "../generic/python_utildefines.hh"
 
 #include "BPY_extern.hh"
 #include "bpy_capi_utils.hh"
@@ -40,8 +38,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_ghash.h"
-
 #include "BKE_context.hh"
 #include "BKE_global.hh"
 #include "BKE_report.hh"
diff --git a/source/blender/python/intern/bpy_operator.hh b/source/blender/python/intern/bpy_operator.hh
index bfcd86b7789..ba7264cf662 100644
--- a/source/blender/python/intern/bpy_operator.hh
+++ b/source/blender/python/intern/bpy_operator.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 extern PyTypeObject pyop_base_Type;
 
 #define BPy_OperatorBase_Check(v) (PyObject_TypeCheck(v, &pyop_base_Type))
diff --git a/source/blender/python/intern/bpy_operator_wrap.cc b/source/blender/python/intern/bpy_operator_wrap.cc
index b77c9c4d08f..0faee8d4ae1 100644
--- a/source/blender/python/intern/bpy_operator_wrap.cc
+++ b/source/blender/python/intern/bpy_operator_wrap.cc
@@ -13,8 +13,6 @@
 
 #include <Python.h>
 
-#include "BLI_utildefines.h"
-
 #include "WM_api.hh"
 #include "WM_types.hh"
 
diff --git a/source/blender/python/intern/bpy_operator_wrap.hh b/source/blender/python/intern/bpy_operator_wrap.hh
index 30dd961baef..8bd16ce6f42 100644
--- a/source/blender/python/intern/bpy_operator_wrap.hh
+++ b/source/blender/python/intern/bpy_operator_wrap.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 struct wmOperatorType;
 
 /**
diff --git a/source/blender/python/intern/bpy_path.cc b/source/blender/python/intern/bpy_path.cc
index 981838c318d..ce9d0be9b0c 100644
--- a/source/blender/python/intern/bpy_path.cc
+++ b/source/blender/python/intern/bpy_path.cc
@@ -10,8 +10,6 @@
 
 #include <Python.h>
 
-#include "BLI_utildefines.h"
-
 #include "bpy_path.hh"
 
 #include "../generic/py_capi_utils.hh"
diff --git a/source/blender/python/intern/bpy_path.hh b/source/blender/python/intern/bpy_path.hh
index 620d81f32a7..79037995680 100644
--- a/source/blender/python/intern/bpy_path.hh
+++ b/source/blender/python/intern/bpy_path.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPyInit__bpy_path();
diff --git a/source/blender/python/intern/bpy_props.hh b/source/blender/python/intern/bpy_props.hh
index d0628a53c95..31262fd2f5a 100644
--- a/source/blender/python/intern/bpy_props.hh
+++ b/source/blender/python/intern/bpy_props.hh
@@ -8,6 +8,10 @@
 
 #pragma once
 
+#include <Python.h>
+
+struct StructRNA;
+
 PyObject *BPY_rna_props();
 /**
  * Run this on exit, clearing all Python callback users and disable the RNA callback,
diff --git a/source/blender/python/intern/bpy_rna.cc b/source/blender/python/intern/bpy_rna.cc
index ac28b369c97..f1b653475eb 100644
--- a/source/blender/python/intern/bpy_rna.cc
+++ b/source/blender/python/intern/bpy_rna.cc
@@ -16,13 +16,11 @@
 
 #include <cfloat> /* FLT_MIN/MAX */
 #include <cstddef>
-#include <new>
 #include <optional>
 
 #include "RNA_path.hh"
 #include "RNA_types.hh"
 
-#include "BLI_bitmap.h"
 #include "BLI_dynstr.h"
 #include "BLI_listbase.h"
 #include "BLI_math_rotation.h"
diff --git a/source/blender/python/intern/bpy_rna.hh b/source/blender/python/intern/bpy_rna.hh
index b366271673e..13c17168d7e 100644
--- a/source/blender/python/intern/bpy_rna.hh
+++ b/source/blender/python/intern/bpy_rna.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 #include <optional>
 
 /* --- bpy build options --- */
diff --git a/source/blender/python/intern/bpy_rna_anim.cc b/source/blender/python/intern/bpy_rna_anim.cc
index 6ef403b999d..3bc6e117a4e 100644
--- a/source/blender/python/intern/bpy_rna_anim.cc
+++ b/source/blender/python/intern/bpy_rna_anim.cc
@@ -15,7 +15,6 @@
 
 #include "BLI_string.h"
 #include "BLI_string_utils.hh"
-#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/python/intern/bpy_rna_anim.hh b/source/blender/python/intern/bpy_rna_anim.hh
index 190a8ff0c48..3ac9a1878e0 100644
--- a/source/blender/python/intern/bpy_rna_anim.hh
+++ b/source/blender/python/intern/bpy_rna_anim.hh
@@ -4,6 +4,10 @@
 
 #pragma once
 
+#include <Python.h>
+
+#include "intern/bpy_rna.hh"
+
 /** \file
  * \ingroup pythonintern
  */
diff --git a/source/blender/python/intern/bpy_rna_callback.hh b/source/blender/python/intern/bpy_rna_callback.hh
index e30602daf33..9b0aff4f628 100644
--- a/source/blender/python/intern/bpy_rna_callback.hh
+++ b/source/blender/python/intern/bpy_rna_callback.hh
@@ -8,6 +8,8 @@
  * \ingroup pythonintern
  */
 
+#include <Python.h>
+
 struct BPy_StructRNA;
 
 #if 0
diff --git a/source/blender/python/intern/bpy_rna_context.hh b/source/blender/python/intern/bpy_rna_context.hh
index 24cc66456c0..d14649b09fd 100644
--- a/source/blender/python/intern/bpy_rna_context.hh
+++ b/source/blender/python/intern/bpy_rna_context.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 extern PyMethodDef BPY_rna_context_temp_override_method_def;
 
 void bpy_rna_context_types_init();
diff --git a/source/blender/python/intern/bpy_rna_data.cc b/source/blender/python/intern/bpy_rna_data.cc
index a4a94b105d8..b8dc0056fe7 100644
--- a/source/blender/python/intern/bpy_rna_data.cc
+++ b/source/blender/python/intern/bpy_rna_data.cc
@@ -20,7 +20,6 @@
 #include "../generic/python_compat.hh"
 
 #include "BLI_string.h"
-#include "BLI_utildefines.h"
 
 #include "BKE_global.hh"
 #include "BKE_main.hh"
diff --git a/source/blender/python/intern/bpy_rna_data.hh b/source/blender/python/intern/bpy_rna_data.hh
index b74aa2dcbfa..bcc36682486 100644
--- a/source/blender/python/intern/bpy_rna_data.hh
+++ b/source/blender/python/intern/bpy_rna_data.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 int BPY_rna_data_context_type_ready();
 
 extern PyMethodDef BPY_rna_data_context_method_def;
diff --git a/source/blender/python/intern/bpy_rna_driver.cc b/source/blender/python/intern/bpy_rna_driver.cc
index 4e140f4c8e2..93bce0903ce 100644
--- a/source/blender/python/intern/bpy_rna_driver.cc
+++ b/source/blender/python/intern/bpy_rna_driver.cc
@@ -10,12 +10,8 @@
 
 #include <Python.h>
 
-#include "MEM_guardedalloc.h"
-
 #include "DNA_anim_types.h"
 
-#include "BLI_utildefines.h"
-
 #include "BKE_fcurve_driver.h"
 
 #include "RNA_access.hh"
diff --git a/source/blender/python/intern/bpy_rna_driver.hh b/source/blender/python/intern/bpy_rna_driver.hh
index fcfd2bfc615..1039bd0b19c 100644
--- a/source/blender/python/intern/bpy_rna_driver.hh
+++ b/source/blender/python/intern/bpy_rna_driver.hh
@@ -8,6 +8,8 @@
  * \ingroup pythonintern
  */
 
+#include <Python.h>
+
 struct AnimationEvalContext;
 struct ChannelDriver;
 struct DriverTarget;
diff --git a/source/blender/python/intern/bpy_rna_gizmo.hh b/source/blender/python/intern/bpy_rna_gizmo.hh
index 86f59781a24..80396c65ac4 100644
--- a/source/blender/python/intern/bpy_rna_gizmo.hh
+++ b/source/blender/python/intern/bpy_rna_gizmo.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 bool BPY_rna_gizmo_module(PyObject *);
diff --git a/source/blender/python/intern/bpy_rna_id_collection.cc b/source/blender/python/intern/bpy_rna_id_collection.cc
index e04fabc35b2..741818a4aae 100644
--- a/source/blender/python/intern/bpy_rna_id_collection.cc
+++ b/source/blender/python/intern/bpy_rna_id_collection.cc
@@ -14,7 +14,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_bitmap.h"
-#include "BLI_utildefines.h"
 
 #include "BKE_global.hh"
 #include "BKE_lib_id.hh"
diff --git a/source/blender/python/intern/bpy_rna_id_collection.hh b/source/blender/python/intern/bpy_rna_id_collection.hh
index 586c50e57ca..2afcac8b87d 100644
--- a/source/blender/python/intern/bpy_rna_id_collection.hh
+++ b/source/blender/python/intern/bpy_rna_id_collection.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 extern PyMethodDef BPY_rna_id_collection_user_map_method_def;
 extern PyMethodDef BPY_rna_id_collection_batch_remove_method_def;
 extern PyMethodDef BPY_rna_id_collection_orphans_purge_method_def;
diff --git a/source/blender/python/intern/bpy_rna_operator.cc b/source/blender/python/intern/bpy_rna_operator.cc
index 513de046770..522e02e9923 100644
--- a/source/blender/python/intern/bpy_rna_operator.cc
+++ b/source/blender/python/intern/bpy_rna_operator.cc
@@ -14,8 +14,6 @@
 
 #include "BKE_context.hh"
 
-#include "../generic/python_utildefines.hh"
-
 #include "BPY_extern.hh"
 #include "bpy_capi_utils.hh"
 
diff --git a/source/blender/python/intern/bpy_rna_operator.hh b/source/blender/python/intern/bpy_rna_operator.hh
index eeced684898..a374c5e9ac3 100644
--- a/source/blender/python/intern/bpy_rna_operator.hh
+++ b/source/blender/python/intern/bpy_rna_operator.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 extern PyMethodDef BPY_rna_operator_poll_message_set_method_def;
diff --git a/source/blender/python/intern/bpy_rna_text.hh b/source/blender/python/intern/bpy_rna_text.hh
index 7fd854db5c1..41f4a813cf3 100644
--- a/source/blender/python/intern/bpy_rna_text.hh
+++ b/source/blender/python/intern/bpy_rna_text.hh
@@ -8,5 +8,7 @@
 
 #pragma once
 
+#include <Python.h>
+
 extern PyMethodDef BPY_rna_region_as_string_method_def;
 extern PyMethodDef BPY_rna_region_from_string_method_def;
diff --git a/source/blender/python/intern/bpy_rna_types_capi.cc b/source/blender/python/intern/bpy_rna_types_capi.cc
index 063c0d0f4ca..3472f1e17cd 100644
--- a/source/blender/python/intern/bpy_rna_types_capi.cc
+++ b/source/blender/python/intern/bpy_rna_types_capi.cc
@@ -17,8 +17,6 @@
 #include <Python.h>
 #include <descrobject.h>
 
-#include "RNA_types.hh"
-
 #include "BLI_utildefines.h"
 
 #include "bpy_library.hh"
diff --git a/source/blender/python/intern/bpy_rna_ui.hh b/source/blender/python/intern/bpy_rna_ui.hh
index 5d228dc36c6..dd8a357972c 100644
--- a/source/blender/python/intern/bpy_rna_ui.hh
+++ b/source/blender/python/intern/bpy_rna_ui.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 extern PyMethodDef BPY_rna_uilayout_introspect_method_def;
diff --git a/source/blender/python/intern/bpy_utils_previews.cc b/source/blender/python/intern/bpy_utils_previews.cc
index 5fad943a03e..18ce7dafcb7 100644
--- a/source/blender/python/intern/bpy_utils_previews.cc
+++ b/source/blender/python/intern/bpy_utils_previews.cc
@@ -14,8 +14,6 @@
 #include <Python.h>
 #include <structmember.h>
 
-#include "BLI_utildefines.h"
-
 #include "RNA_access.hh"
 #include "RNA_prototypes.hh"
 
@@ -24,8 +22,6 @@
 
 #include "../generic/py_capi_utils.hh"
 
-#include "MEM_guardedalloc.h"
-
 #include "IMB_thumbs.hh"
 
 #include "BKE_preview_image.hh"
diff --git a/source/blender/python/intern/bpy_utils_previews.hh b/source/blender/python/intern/bpy_utils_previews.hh
index a23a159be13..aaeb92e1a41 100644
--- a/source/blender/python/intern/bpy_utils_previews.hh
+++ b/source/blender/python/intern/bpy_utils_previews.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_utils_previews_module();
diff --git a/source/blender/python/intern/bpy_utils_units.hh b/source/blender/python/intern/bpy_utils_units.hh
index 75cfa39254b..49262e05e0f 100644
--- a/source/blender/python/intern/bpy_utils_units.hh
+++ b/source/blender/python/intern/bpy_utils_units.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyObject *BPY_utils_units();
diff --git a/source/blender/python/intern/stubs.cc b/source/blender/python/intern/stubs.cc
index 7c75064c44a..45eb2f51570 100644
--- a/source/blender/python/intern/stubs.cc
+++ b/source/blender/python/intern/stubs.cc
@@ -6,8 +6,6 @@
  * \ingroup pythonintern
  */
 
-#include "BLI_utildefines.h"
-
 #include "BPY_extern.hh"
 
 /* python, will come back */
diff --git a/source/blender/python/mathutils/mathutils.cc b/source/blender/python/mathutils/mathutils.cc
index fca69d6a7eb..5b3fe15e45e 100644
--- a/source/blender/python/mathutils/mathutils.cc
+++ b/source/blender/python/mathutils/mathutils.cc
@@ -15,7 +15,6 @@
 #include "BLI_utildefines.h"
 
 #include "../generic/py_capi_utils.hh"
-#include "../generic/python_utildefines.hh"
 
 #ifndef MATH_STANDALONE
 #  include "BLI_dynstr.h"
diff --git a/source/blender/python/mathutils/mathutils.hh b/source/blender/python/mathutils/mathutils.hh
index 166c86d8b0e..a57ff196d4b 100644
--- a/source/blender/python/mathutils/mathutils.hh
+++ b/source/blender/python/mathutils/mathutils.hh
@@ -8,10 +8,11 @@
  * \ingroup pymathutils
  */
 
+#include <Python.h>
+
 /* Can cast different mathutils types to this, use for generic functions. */
 
 #include "BLI_array.hh"
-#include "BLI_compiler_attrs.h"
 #include "BLI_vector.hh"
 
 struct DynStr;
@@ -61,11 +62,11 @@ struct BaseMathObject {
 };
 
 /* types */
-#include "mathutils_Color.hh"
-#include "mathutils_Euler.hh"
-#include "mathutils_Matrix.hh"
-#include "mathutils_Quaternion.hh"
-#include "mathutils_Vector.hh"
+#include "mathutils_Color.hh"       // IWYU pragma: export
+#include "mathutils_Euler.hh"       // IWYU pragma: export
+#include "mathutils_Matrix.hh"      // IWYU pragma: export
+#include "mathutils_Quaternion.hh"  // IWYU pragma: export
+#include "mathutils_Vector.hh"      // IWYU pragma: export
 
 /* avoid checking all types */
 #define BaseMathObject_CheckExact(v) (Py_TYPE(v)->tp_dealloc == (destructor)BaseMathObject_dealloc)
diff --git a/source/blender/python/mathutils/mathutils_Color.hh b/source/blender/python/mathutils/mathutils_Color.hh
index 2575cee7e72..ae6fd136339 100644
--- a/source/blender/python/mathutils/mathutils_Color.hh
+++ b/source/blender/python/mathutils/mathutils_Color.hh
@@ -8,6 +8,10 @@
 
 #pragma once
 
+#include <Python.h>
+
+#include "mathutils.hh"
+
 extern PyTypeObject color_Type;
 #define ColorObject_Check(v) PyObject_TypeCheck((v), &color_Type)
 #define ColorObject_CheckExact(v) (Py_TYPE(v) == &color_Type)
diff --git a/source/blender/python/mathutils/mathutils_Euler.cc b/source/blender/python/mathutils/mathutils_Euler.cc
index 131f7172135..97df28b3568 100644
--- a/source/blender/python/mathutils/mathutils_Euler.cc
+++ b/source/blender/python/mathutils/mathutils_Euler.cc
@@ -13,7 +13,6 @@
 #include "mathutils.hh"
 
 #include "../generic/py_capi_utils.hh"
-#include "../generic/python_utildefines.hh"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
diff --git a/source/blender/python/mathutils/mathutils_Euler.hh b/source/blender/python/mathutils/mathutils_Euler.hh
index f61839917d6..54bce975963 100644
--- a/source/blender/python/mathutils/mathutils_Euler.hh
+++ b/source/blender/python/mathutils/mathutils_Euler.hh
@@ -8,6 +8,10 @@
  * \ingroup pymathutils
  */
 
+#include <Python.h>
+
+#include "mathutils.hh"
+
 extern PyTypeObject euler_Type;
 #define EulerObject_Check(v) PyObject_TypeCheck((v), &euler_Type)
 #define EulerObject_CheckExact(v) (Py_TYPE(v) == &euler_Type)
diff --git a/source/blender/python/mathutils/mathutils_Matrix.hh b/source/blender/python/mathutils/mathutils_Matrix.hh
index 924334d214b..96f70946bba 100644
--- a/source/blender/python/mathutils/mathutils_Matrix.hh
+++ b/source/blender/python/mathutils/mathutils_Matrix.hh
@@ -8,6 +8,10 @@
 
 #pragma once
 
+#include <Python.h>
+
+#include "mathutils.hh"
+
 extern PyTypeObject matrix_Type;
 extern PyTypeObject matrix_access_Type;
 
diff --git a/source/blender/python/mathutils/mathutils_Quaternion.hh b/source/blender/python/mathutils/mathutils_Quaternion.hh
index 81b41e7dd84..b320e2d5909 100644
--- a/source/blender/python/mathutils/mathutils_Quaternion.hh
+++ b/source/blender/python/mathutils/mathutils_Quaternion.hh
@@ -8,6 +8,10 @@
  * \ingroup pymathutils
  */
 
+#include <Python.h>
+
+#include "mathutils.hh"
+
 extern PyTypeObject quaternion_Type;
 
 #define QuaternionObject_Check(v) PyObject_TypeCheck((v), &quaternion_Type)
diff --git a/source/blender/python/mathutils/mathutils_Vector.hh b/source/blender/python/mathutils/mathutils_Vector.hh
index 03091055c43..4baa2217f22 100644
--- a/source/blender/python/mathutils/mathutils_Vector.hh
+++ b/source/blender/python/mathutils/mathutils_Vector.hh
@@ -8,6 +8,10 @@
 
 #pragma once
 
+#include <Python.h>
+
+#include "mathutils.hh"
+
 extern PyTypeObject vector_Type;
 
 #define VectorObject_Check(v) PyObject_TypeCheck((v), &vector_Type)
diff --git a/source/blender/python/mathutils/mathutils_bvhtree.hh b/source/blender/python/mathutils/mathutils_bvhtree.hh
index 52fa7d5e833..024ddc72de1 100644
--- a/source/blender/python/mathutils/mathutils_bvhtree.hh
+++ b/source/blender/python/mathutils/mathutils_bvhtree.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyMODINIT_FUNC PyInit_mathutils_bvhtree();
 
 extern PyTypeObject PyBVHTree_Type;
diff --git a/source/blender/python/mathutils/mathutils_geometry.cc b/source/blender/python/mathutils/mathutils_geometry.cc
index 31b40a17ca4..514f891a036 100644
--- a/source/blender/python/mathutils/mathutils_geometry.cc
+++ b/source/blender/python/mathutils/mathutils_geometry.cc
@@ -15,10 +15,10 @@
 #ifndef MATH_STANDALONE /* define when building outside blender */
 #  include "BKE_curve.hh"
 #  include "BKE_displist.h"
-#  include "BLI_blenlib.h"
 #  include "BLI_boxpack_2d.h"
 #  include "BLI_convexhull_2d.h"
 #  include "BLI_delaunay_2d.hh"
+#  include "BLI_listbase.h"
 #  include "MEM_guardedalloc.h"
 #endif /* !MATH_STANDALONE */
 
diff --git a/source/blender/python/mathutils/mathutils_geometry.hh b/source/blender/python/mathutils/mathutils_geometry.hh
index 760cd2a11fa..5967449bb9b 100644
--- a/source/blender/python/mathutils/mathutils_geometry.hh
+++ b/source/blender/python/mathutils/mathutils_geometry.hh
@@ -8,4 +8,6 @@
  * \ingroup pymathutils
  */
 
+#include <Python.h>
+
 PyMODINIT_FUNC PyInit_mathutils_geometry();
diff --git a/source/blender/python/mathutils/mathutils_interpolate.cc b/source/blender/python/mathutils/mathutils_interpolate.cc
index f613a70e619..5f4a1cd1786 100644
--- a/source/blender/python/mathutils/mathutils_interpolate.cc
+++ b/source/blender/python/mathutils/mathutils_interpolate.cc
@@ -12,7 +12,6 @@
 #include "mathutils_interpolate.hh"
 
 #include "BLI_math_geom.h"
-#include "BLI_utildefines.h"
 
 #ifndef MATH_STANDALONE /* define when building outside blender */
 #  include "MEM_guardedalloc.h"
diff --git a/source/blender/python/mathutils/mathutils_interpolate.hh b/source/blender/python/mathutils/mathutils_interpolate.hh
index 8c993b6a623..86124fabeca 100644
--- a/source/blender/python/mathutils/mathutils_interpolate.hh
+++ b/source/blender/python/mathutils/mathutils_interpolate.hh
@@ -8,4 +8,6 @@
  * \ingroup pymathutils
  */
 
+#include <Python.h>
+
 PyMODINIT_FUNC PyInit_mathutils_interpolate();
diff --git a/source/blender/python/mathutils/mathutils_kdtree.hh b/source/blender/python/mathutils/mathutils_kdtree.hh
index fffe8e7ccf6..3dad6a4c589 100644
--- a/source/blender/python/mathutils/mathutils_kdtree.hh
+++ b/source/blender/python/mathutils/mathutils_kdtree.hh
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyMODINIT_FUNC PyInit_mathutils_kdtree();
 
 extern PyTypeObject PyKDTree_Type;
diff --git a/source/blender/python/mathutils/mathutils_noise.hh b/source/blender/python/mathutils/mathutils_noise.hh
index 674ba4c8c76..c134b1ef5f1 100644
--- a/source/blender/python/mathutils/mathutils_noise.hh
+++ b/source/blender/python/mathutils/mathutils_noise.hh
@@ -8,4 +8,6 @@
 
 #pragma once
 
+#include <Python.h>
+
 PyMODINIT_FUNC PyInit_mathutils_noise();
diff --git a/source/blender/render/RE_bake.h b/source/blender/render/RE_bake.h
index 9670ff0d017..2a60a77fe89 100644
--- a/source/blender/render/RE_bake.h
+++ b/source/blender/render/RE_bake.h
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include "DNA_scene_types.h"
+
 #include "RE_pipeline.h"
 
 struct Depsgraph;
diff --git a/source/blender/render/RE_compositor.hh b/source/blender/render/RE_compositor.hh
index e7f30f13bf9..7adf5e5bd5b 100644
--- a/source/blender/render/RE_compositor.hh
+++ b/source/blender/render/RE_compositor.hh
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <memory>
-
 namespace blender::compositor {
 class RenderContext;
 class Profiler;
diff --git a/source/blender/render/RE_multires_bake.h b/source/blender/render/RE_multires_bake.h
index 94e121515df..f66c3c2bc3d 100644
--- a/source/blender/render/RE_multires_bake.h
+++ b/source/blender/render/RE_multires_bake.h
@@ -8,6 +8,10 @@
 
 #pragma once
 
+#include "DNA_listBase.h"
+
+struct Image;
+struct DerivedMesh;
 struct MultiresBakeRender;
 struct Scene;
 
diff --git a/source/blender/render/RE_pipeline.h b/source/blender/render/RE_pipeline.h
index 0d486ae8eba..9baaee9a94f 100644
--- a/source/blender/render/RE_pipeline.h
+++ b/source/blender/render/RE_pipeline.h
@@ -12,8 +12,6 @@
 #include "DNA_listBase.h"
 #include "DNA_vec_types.h"
 
-#include "BLI_implicit_sharing.h"
-
 struct GPUTexture;
 struct ImBuf;
 struct Image;
diff --git a/source/blender/render/intern/texture_image.cc b/source/blender/render/intern/texture_image.cc
index 1061d7ca4e3..89bbc7c1f10 100644
--- a/source/blender/render/intern/texture_image.cc
+++ b/source/blender/render/intern/texture_image.cc
@@ -9,7 +9,6 @@
 #include <algorithm>
 #include <cfloat>
 #include <cmath>
-#include <cstdio>
 #include <cstring>
 #include <fcntl.h>
 #ifndef WIN32
@@ -27,6 +26,7 @@
 #include "BLI_math_color.h"
 #include "BLI_math_interp.hh"
 #include "BLI_math_vector.h"
+#include "BLI_rect.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/render/intern/tile_highlight.cc b/source/blender/render/intern/tile_highlight.cc
index 6f34079bce9..b2186de4cdb 100644
--- a/source/blender/render/intern/tile_highlight.cc
+++ b/source/blender/render/intern/tile_highlight.cc
@@ -8,9 +8,8 @@
 
 #include "tile_highlight.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_hash.hh"
+#include "BLI_rect.h"
 
 #include "RE_pipeline.h"
 
diff --git a/source/blender/render/intern/tile_highlight.h b/source/blender/render/intern/tile_highlight.h
index 249fe34b36a..f7daaf46820 100644
--- a/source/blender/render/intern/tile_highlight.h
+++ b/source/blender/render/intern/tile_highlight.h
@@ -8,7 +8,8 @@
 
 #pragma once
 
-#include "BLI_rect.h"
+#include "DNA_vec_types.h"
+
 #include "BLI_set.hh"
 #include "BLI_vector.hh"
 
diff --git a/source/blender/sequencer/SEQ_animation.hh b/source/blender/sequencer/SEQ_animation.hh
index de6712799b2..43e5c3efd72 100644
--- a/source/blender/sequencer/SEQ_animation.hh
+++ b/source/blender/sequencer/SEQ_animation.hh
@@ -11,7 +11,6 @@
 #include "DNA_listBase.h"
 
 #include "ANIM_action.hh"
-#include "ANIM_action_legacy.hh"
 
 struct ListBase;
 struct Scene;
diff --git a/source/blender/sequencer/SEQ_edit.hh b/source/blender/sequencer/SEQ_edit.hh
index 67005e9e85f..d2a0d4c6e75 100644
--- a/source/blender/sequencer/SEQ_edit.hh
+++ b/source/blender/sequencer/SEQ_edit.hh
@@ -8,6 +8,7 @@
  * \ingroup sequencer
  */
 
+struct Editing;
 struct ListBase;
 struct Main;
 struct Scene;
diff --git a/source/blender/sequencer/SEQ_effects.hh b/source/blender/sequencer/SEQ_effects.hh
index b015671f8ce..9f37128404e 100644
--- a/source/blender/sequencer/SEQ_effects.hh
+++ b/source/blender/sequencer/SEQ_effects.hh
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "DNA_vec_types.h"
+
 #include "BLI_math_vector_types.hh"
 #include "BLI_vector.hh"
 
@@ -12,6 +14,7 @@
  */
 
 struct ImBuf;
+struct Scene;
 struct SeqRenderData;
 struct Strip;
 struct TextVars;
diff --git a/source/blender/sequencer/SEQ_iterator.hh b/source/blender/sequencer/SEQ_iterator.hh
index bc44c69355c..c908f380e60 100644
--- a/source/blender/sequencer/SEQ_iterator.hh
+++ b/source/blender/sequencer/SEQ_iterator.hh
@@ -10,6 +10,8 @@
 
 #include "BLI_vector_set.hh"
 
+struct ListBase;
+struct Scene;
 struct Strip;
 
 /**
diff --git a/source/blender/sequencer/SEQ_proxy.hh b/source/blender/sequencer/SEQ_proxy.hh
index 5ef306b96ca..e9bd46524c7 100644
--- a/source/blender/sequencer/SEQ_proxy.hh
+++ b/source/blender/sequencer/SEQ_proxy.hh
@@ -8,6 +8,8 @@
  * \ingroup sequencer
  */
 
+#include "DNA_listBase.h"
+
 #include "BLI_set.hh"
 
 struct Depsgraph;
diff --git a/source/blender/sequencer/SEQ_relations.hh b/source/blender/sequencer/SEQ_relations.hh
index 2f809e91c1e..5490c8b4c13 100644
--- a/source/blender/sequencer/SEQ_relations.hh
+++ b/source/blender/sequencer/SEQ_relations.hh
@@ -8,6 +8,8 @@
  * \ingroup sequencer
  */
 
+#include <cstddef>
+
 struct ListBase;
 struct Main;
 struct MovieClip;
diff --git a/source/blender/sequencer/SEQ_thumbnail_cache.hh b/source/blender/sequencer/SEQ_thumbnail_cache.hh
index 1162be4a517..578aef30694 100644
--- a/source/blender/sequencer/SEQ_thumbnail_cache.hh
+++ b/source/blender/sequencer/SEQ_thumbnail_cache.hh
@@ -14,10 +14,6 @@ struct rctf;
 struct Strip;
 struct Scene;
 
-#include "BLI_function_ref.hh"
-
-#include <string>
-
 namespace blender::seq {
 
 static constexpr int SEQ_THUMB_SIZE = 256;
diff --git a/source/blender/sequencer/SEQ_transform.hh b/source/blender/sequencer/SEQ_transform.hh
index 098a3771142..e8b00e506dd 100644
--- a/source/blender/sequencer/SEQ_transform.hh
+++ b/source/blender/sequencer/SEQ_transform.hh
@@ -8,6 +8,8 @@
  * \ingroup sequencer
  */
 
+#include "BLI_span.hh"
+
 struct ListBase;
 struct Scene;
 struct Strip;
diff --git a/source/blender/sequencer/intern/effects/vse_effect_wipe.cc b/source/blender/sequencer/intern/effects/vse_effect_wipe.cc
index 1dade625685..8cc71826286 100644
--- a/source/blender/sequencer/intern/effects/vse_effect_wipe.cc
+++ b/source/blender/sequencer/intern/effects/vse_effect_wipe.cc
@@ -6,7 +6,6 @@
  * \ingroup sequencer
  */
 
-#include "BLI_math_vector.hh"
 #include "BLI_task.hh"
 
 #include "DNA_sequence_types.h"
diff --git a/source/blender/sequencer/intern/image_cache.cc b/source/blender/sequencer/intern/image_cache.cc
index 89323f48a05..25ac8340ba1 100644
--- a/source/blender/sequencer/intern/image_cache.cc
+++ b/source/blender/sequencer/intern/image_cache.cc
@@ -14,13 +14,12 @@
 
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
-#include "DNA_space_types.h" /* for FILE_MAX. */
 
 #include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"
 
-#include "BLI_fileops_types.h"
 #include "BLI_ghash.h"
+#include "BLI_math_base.h"
 #include "BLI_mempool.h"
 #include "BLI_threads.h"
 
diff --git a/source/blender/sequencer/intern/iterator.cc b/source/blender/sequencer/intern/iterator.cc
index 5ed5db8caee..41d3d73118c 100644
--- a/source/blender/sequencer/intern/iterator.cc
+++ b/source/blender/sequencer/intern/iterator.cc
@@ -10,8 +10,6 @@
 
 #include <cstring>
 
-#include "MEM_guardedalloc.h"
-
 #include "DNA_sequence_types.h"
 
 #include "BLI_listbase.h"
diff --git a/source/blender/sequencer/intern/multiview.cc b/source/blender/sequencer/intern/multiview.cc
index c580dc297dc..033e31d1efc 100644
--- a/source/blender/sequencer/intern/multiview.cc
+++ b/source/blender/sequencer/intern/multiview.cc
@@ -14,8 +14,6 @@
 
 #include "BKE_scene.hh"
 
-#include "IMB_imbuf.hh"
-
 #include "MOV_read.hh"
 
 #include "multiview.hh"
diff --git a/source/blender/sequencer/intern/multiview.hh b/source/blender/sequencer/intern/multiview.hh
index 9dd82910593..20b8ba4d693 100644
--- a/source/blender/sequencer/intern/multiview.hh
+++ b/source/blender/sequencer/intern/multiview.hh
@@ -8,6 +8,9 @@
  * \ingroup sequencer
  */
 
+#include <cstddef>
+
+struct MovieReader;
 struct Scene;
 
 /* **********************************************************************
diff --git a/source/blender/sequencer/intern/prefetch.cc b/source/blender/sequencer/intern/prefetch.cc
index ef640109733..c63279f1038 100644
--- a/source/blender/sequencer/intern/prefetch.cc
+++ b/source/blender/sequencer/intern/prefetch.cc
@@ -19,6 +19,7 @@
 
 #include "BLI_listbase.h"
 #include "BLI_threads.h"
+#include "BLI_vector_set.hh"
 
 #include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"
@@ -36,7 +37,6 @@
 #include "DEG_depsgraph_query.hh"
 
 #include "SEQ_channels.hh"
-#include "SEQ_iterator.hh"
 #include "SEQ_prefetch.hh"
 #include "SEQ_relations.hh"
 #include "SEQ_render.hh"
diff --git a/source/blender/sequencer/intern/proxy.hh b/source/blender/sequencer/intern/proxy.hh
index 884bbe7dced..ce2e4dd88b8 100644
--- a/source/blender/sequencer/intern/proxy.hh
+++ b/source/blender/sequencer/intern/proxy.hh
@@ -9,6 +9,7 @@
  */
 
 struct ImBuf;
+struct MovieReader;
 struct SeqRenderData;
 struct Strip;
 struct anim;
diff --git a/source/blender/sequencer/intern/render.hh b/source/blender/sequencer/intern/render.hh
index 2099e93c354..579076bc1df 100644
--- a/source/blender/sequencer/intern/render.hh
+++ b/source/blender/sequencer/intern/render.hh
@@ -14,6 +14,7 @@
 struct ImBuf;
 struct LinkNode;
 struct ListBase;
+struct Mask;
 struct Scene;
 struct SeqEffectHandle;
 struct SeqRenderData;
diff --git a/source/blender/sequencer/intern/sequence_lookup.cc b/source/blender/sequencer/intern/sequence_lookup.cc
index 4f1799aec40..70bd1e2c1a8 100644
--- a/source/blender/sequencer/intern/sequence_lookup.cc
+++ b/source/blender/sequencer/intern/sequence_lookup.cc
@@ -15,7 +15,6 @@
 
 #include "BLI_listbase.h"
 #include "BLI_map.hh"
-#include "BLI_sys_types.h"
 #include "BLI_vector_set.hh"
 
 #include <cstring>
diff --git a/source/blender/sequencer/intern/sequencer.cc b/source/blender/sequencer/intern/sequencer.cc
index 2473381e5f0..512edca66d7 100644
--- a/source/blender/sequencer/intern/sequencer.cc
+++ b/source/blender/sequencer/intern/sequencer.cc
@@ -17,7 +17,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_anim_types.h"
 #include "DNA_listBase.h"
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
@@ -35,8 +34,6 @@
 
 #include "DEG_depsgraph.hh"
 
-#include "IMB_imbuf.hh"
-
 #include "MOV_read.hh"
 
 #include "SEQ_channels.hh"
diff --git a/source/blender/sequencer/intern/sequencer.hh b/source/blender/sequencer/intern/sequencer.hh
index ed0a1dae836..ecd8b39d7b2 100644
--- a/source/blender/sequencer/intern/sequencer.hh
+++ b/source/blender/sequencer/intern/sequencer.hh
@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "BLI_vector_set.hh"
-
 /** \file
  * \ingroup sequencer
  */
 
+#include "BLI_span.hh"
+
 struct Scene;
 struct Strip;
 struct StripProxy;
diff --git a/source/blender/sequencer/intern/strip_connect.cc b/source/blender/sequencer/intern/strip_connect.cc
index 0045ce51f41..1c7102122f9 100644
--- a/source/blender/sequencer/intern/strip_connect.cc
+++ b/source/blender/sequencer/intern/strip_connect.cc
@@ -11,7 +11,6 @@
 #include "DNA_sequence_types.h"
 
 #include "SEQ_connect.hh"
-#include "SEQ_time.hh"
 
 static void seq_connections_free(Strip *seq)
 {
diff --git a/source/blender/sequencer/intern/strip_relations.cc b/source/blender/sequencer/intern/strip_relations.cc
index 457a27514ce..519b1015052 100644
--- a/source/blender/sequencer/intern/strip_relations.cc
+++ b/source/blender/sequencer/intern/strip_relations.cc
@@ -21,8 +21,6 @@
 
 #include "DEG_depsgraph.hh"
 
-#include "IMB_imbuf.hh"
-
 #include "MOV_read.hh"
 
 #include "SEQ_iterator.hh"
diff --git a/source/blender/sequencer/intern/strip_retiming.cc b/source/blender/sequencer/intern/strip_retiming.cc
index 03ed3d0dad0..e9df0306c2b 100644
--- a/source/blender/sequencer/intern/strip_retiming.cc
+++ b/source/blender/sequencer/intern/strip_retiming.cc
@@ -6,7 +6,6 @@
  * \ingroup bke
  */
 
-#include "BLI_math_base.hh"
 #include "MEM_guardedalloc.h"
 
 #include "DNA_scene_types.h"
diff --git a/source/blender/sequencer/intern/strip_time.cc b/source/blender/sequencer/intern/strip_time.cc
index b5b4466f9c6..20d3e1c7625 100644
--- a/source/blender/sequencer/intern/strip_time.cc
+++ b/source/blender/sequencer/intern/strip_time.cc
@@ -8,8 +8,6 @@
  * \ingroup bke
  */
 
-#include "MEM_guardedalloc.h"
-
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
 
@@ -21,8 +19,6 @@
 
 #include "DNA_sound_types.h"
 
-#include "IMB_imbuf.hh"
-
 #include "MOV_read.hh"
 
 #include "SEQ_channels.hh"
diff --git a/source/blender/sequencer/intern/strip_transform.cc b/source/blender/sequencer/intern/strip_transform.cc
index 14a34f4117f..1dde9b2a798 100644
--- a/source/blender/sequencer/intern/strip_transform.cc
+++ b/source/blender/sequencer/intern/strip_transform.cc
@@ -8,7 +8,6 @@
  * \ingroup bke
  */
 
-#include "BLI_math_matrix_types.hh"
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
 
@@ -17,7 +16,6 @@
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
 #include "BLI_math_vector_types.hh"
-#include "BLI_rect.h"
 
 #include "SEQ_animation.hh"
 #include "SEQ_channels.hh"
diff --git a/source/blender/sequencer/intern/utils.cc b/source/blender/sequencer/intern/utils.cc
index 82f3dded9a9..c068634086e 100644
--- a/source/blender/sequencer/intern/utils.cc
+++ b/source/blender/sequencer/intern/utils.cc
@@ -17,8 +17,9 @@
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
 
-#include "BLI_blenlib.h"
-#include "BLI_vector_set.hh"
+#include "BLI_path_utils.hh"
+#include "BLI_string.h"
+#include "BLI_string_utf8.h"
 
 #include "BLT_translation.hh"
 
@@ -37,7 +38,6 @@
 #include "SEQ_time.hh"
 #include "SEQ_utils.hh"
 
-#include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"
 
 #include "MOV_read.hh"
diff --git a/source/blender/sequencer/intern/utils.hh b/source/blender/sequencer/intern/utils.hh
index 1278f991be4..a2a49444834 100644
--- a/source/blender/sequencer/intern/utils.hh
+++ b/source/blender/sequencer/intern/utils.hh
@@ -10,6 +10,7 @@
 
 struct ListBase;
 struct Scene;
+struct Sequence;
 
 bool sequencer_seq_generates_image(Strip *seq);
 void seq_open_anim_file(Scene *scene, Strip *seq, bool openfile);
diff --git a/source/blender/shader_fx/intern/FX_shader_blur.cc b/source/blender/shader_fx/intern/FX_shader_blur.cc
index a65020ee51f..32a9eb93d68 100644
--- a/source/blender/shader_fx/intern/FX_shader_blur.cc
+++ b/source/blender/shader_fx/intern/FX_shader_blur.cc
@@ -6,10 +6,7 @@
  * \ingroup shader_fx
  */
 
-#include <cstdio>
-
 #include "BLI_math_vector.h"
-#include "BLI_utildefines.h"
 
 #include "BLT_translation.hh"
 
diff --git a/source/blender/shader_fx/intern/FX_shader_colorize.cc b/source/blender/shader_fx/intern/FX_shader_colorize.cc
index 6bee4b48981..7fc7b5c17f0 100644
--- a/source/blender/shader_fx/intern/FX_shader_colorize.cc
+++ b/source/blender/shader_fx/intern/FX_shader_colorize.cc
@@ -6,8 +6,6 @@
  * \ingroup shader_fx
  */
 
-#include <cstdio>
-
 #include "BKE_context.hh"
 #include "BKE_screen.hh"
 
diff --git a/source/blender/shader_fx/intern/FX_shader_flip.cc b/source/blender/shader_fx/intern/FX_shader_flip.cc
index 421c27a04b6..bdd2a968c47 100644
--- a/source/blender/shader_fx/intern/FX_shader_flip.cc
+++ b/source/blender/shader_fx/intern/FX_shader_flip.cc
@@ -6,15 +6,8 @@
  * \ingroup shader_fx
  */
 
-#include <cstdio>
-
-#include "DNA_gpencil_legacy_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 
-#include "BLI_utildefines.h"
-
 #include "BLT_translation.hh"
 
 #include "BKE_context.hh"
diff --git a/source/blender/shader_fx/intern/FX_shader_glow.cc b/source/blender/shader_fx/intern/FX_shader_glow.cc
index e298777aa42..68db2f0d7c5 100644
--- a/source/blender/shader_fx/intern/FX_shader_glow.cc
+++ b/source/blender/shader_fx/intern/FX_shader_glow.cc
@@ -6,11 +6,6 @@
  * \ingroup shader_fx
  */
 
-#include <cstdio>
-
-#include "DNA_gpencil_legacy_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 
 #include "BLI_math_vector.h"
diff --git a/source/blender/shader_fx/intern/FX_shader_pixel.cc b/source/blender/shader_fx/intern/FX_shader_pixel.cc
index ff65b33ec8a..89006c8d858 100644
--- a/source/blender/shader_fx/intern/FX_shader_pixel.cc
+++ b/source/blender/shader_fx/intern/FX_shader_pixel.cc
@@ -6,8 +6,6 @@
  * \ingroup shader_fx
  */
 
-#include <cstdio>
-
 #include "BLI_utildefines.h"
 
 #include "BLT_translation.hh"
diff --git a/source/blender/shader_fx/intern/FX_shader_rim.cc b/source/blender/shader_fx/intern/FX_shader_rim.cc
index ddcdf9d6c15..9e445348d24 100644
--- a/source/blender/shader_fx/intern/FX_shader_rim.cc
+++ b/source/blender/shader_fx/intern/FX_shader_rim.cc
@@ -6,8 +6,6 @@
  * \ingroup shader_fx
  */
 
-#include <cstdio>
-
 #include "DNA_screen_types.h"
 #include "DNA_shader_fx_types.h"
 
diff --git a/source/blender/shader_fx/intern/FX_shader_shadow.cc b/source/blender/shader_fx/intern/FX_shader_shadow.cc
index 69605275d6f..44de4e1ea43 100644
--- a/source/blender/shader_fx/intern/FX_shader_shadow.cc
+++ b/source/blender/shader_fx/intern/FX_shader_shadow.cc
@@ -6,11 +6,6 @@
  * \ingroup shader_fx
  */
 
-#include <cstdio>
-
-#include "DNA_gpencil_legacy_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 
 #include "BLI_utildefines.h"
@@ -31,7 +26,6 @@
 #include "FX_shader_types.h"
 #include "FX_ui_common.h"
 
-#include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
 
 static void init_data(ShaderFxData *md)
diff --git a/source/blender/shader_fx/intern/FX_shader_swirl.cc b/source/blender/shader_fx/intern/FX_shader_swirl.cc
index 8ceb3c08b43..1589882aa7e 100644
--- a/source/blender/shader_fx/intern/FX_shader_swirl.cc
+++ b/source/blender/shader_fx/intern/FX_shader_swirl.cc
@@ -6,15 +6,7 @@
  * \ingroup shader_fx
  */
 
-#include <cstdio>
-
-#include "DNA_gpencil_legacy_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-
 #include "BLI_math_base.h"
-#include "BLI_utildefines.h"
 
 #include "BLT_translation.hh"
 
@@ -32,7 +24,6 @@
 #include "FX_shader_types.h"
 #include "FX_ui_common.h"
 
-#include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
 
 static void init_data(ShaderFxData *md)
diff --git a/source/blender/shader_fx/intern/FX_shader_util.cc b/source/blender/shader_fx/intern/FX_shader_util.cc
index 04c20bb12c0..64513df01cf 100644
--- a/source/blender/shader_fx/intern/FX_shader_util.cc
+++ b/source/blender/shader_fx/intern/FX_shader_util.cc
@@ -6,16 +6,9 @@
  * \ingroup shader_fx
  */
 
-#include <cstdio>
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_utildefines.h"
-
 #include "BKE_shader_fx.h"
 
 #include "FX_shader_types.h"
-#include "FX_shader_util.h"
 
 void shaderfx_type_init(ShaderFxTypeInfo *types[])
 {
diff --git a/source/blender/shader_fx/intern/FX_shader_wave.cc b/source/blender/shader_fx/intern/FX_shader_wave.cc
index 8c857823d2c..2da235dfe38 100644
--- a/source/blender/shader_fx/intern/FX_shader_wave.cc
+++ b/source/blender/shader_fx/intern/FX_shader_wave.cc
@@ -6,18 +6,11 @@
  * \ingroup shader_fx
  */
 
-#include <cstdio>
-
-#include "DNA_gpencil_legacy_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 
 #include "BKE_context.hh"
 #include "BKE_screen.hh"
 
-#include "BLI_utildefines.h"
-
 #include "BLT_translation.hh"
 
 #include "UI_interface.hh"
diff --git a/source/blender/shader_fx/intern/FX_ui_common.cc b/source/blender/shader_fx/intern/FX_ui_common.cc
index 0e0d2238569..0c4bfaf02a4 100644
--- a/source/blender/shader_fx/intern/FX_ui_common.cc
+++ b/source/blender/shader_fx/intern/FX_ui_common.cc
@@ -12,12 +12,10 @@
 #include "MEM_guardedalloc.h"
 
 #include "BKE_context.hh"
-#include "BKE_object.hh"
 #include "BKE_screen.hh"
 #include "BKE_shader_fx.h"
 
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_shader_fx_types.h"
 
diff --git a/source/blender/shader_fx/intern/FX_ui_common.h b/source/blender/shader_fx/intern/FX_ui_common.h
index d702866b0b8..c441e32094a 100644
--- a/source/blender/shader_fx/intern/FX_ui_common.h
+++ b/source/blender/shader_fx/intern/FX_ui_common.h
@@ -8,17 +8,19 @@
 
 #pragma once
 
-#include "FX_shader_types.h"
+#include "FX_shader_types.h"  // IWYU pragma: export
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct PointerRNA;
+struct Panel;
 struct ARegionType;
 struct PanelType;
 struct bContext;
 struct uiLayout;
-typedef void (*PanelDrawFn)(const bContext *, Panel *);
+using PanelDrawFn = void (*)(const bContext *, Panel *);
 
 /**
  * Draw shaderfx error message.
diff --git a/source/blender/simulation/intern/ConstrainedConjugateGradient.h b/source/blender/simulation/intern/ConstrainedConjugateGradient.h
index 465e8fe6cfa..38656a23e6a 100644
--- a/source/blender/simulation/intern/ConstrainedConjugateGradient.h
+++ b/source/blender/simulation/intern/ConstrainedConjugateGradient.h
@@ -9,6 +9,7 @@
  */
 
 #include <Eigen/Core>
+#include <Eigen/Sparse>
 
 namespace Eigen {
 
diff --git a/source/blender/simulation/intern/SIM_mass_spring.cc b/source/blender/simulation/intern/SIM_mass_spring.cc
index 16b84e204f1..165559dbee5 100644
--- a/source/blender/simulation/intern/SIM_mass_spring.cc
+++ b/source/blender/simulation/intern/SIM_mass_spring.cc
@@ -6,8 +6,6 @@
  * \ingroup sim
  */
 
-#include <algorithm>
-
 #include "MEM_guardedalloc.h"
 
 #include "DNA_cloth_types.h"
diff --git a/source/blender/simulation/intern/hair_volume.cc b/source/blender/simulation/intern/hair_volume.cc
index 64fd7786ad7..b9b42865d20 100644
--- a/source/blender/simulation/intern/hair_volume.cc
+++ b/source/blender/simulation/intern/hair_volume.cc
@@ -6,17 +6,10 @@
  * \ingroup sim
  */
 
-#include <algorithm>
-
 #include "MEM_guardedalloc.h"
 
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
-#include "BLI_utildefines.h"
-
-#include "DNA_texture_types.h"
-
-#include "BKE_effect.h"
 
 #include "eigen_utils.h"
 #include "implicit.h"
diff --git a/source/blender/simulation/intern/implicit_blender.cc b/source/blender/simulation/intern/implicit_blender.cc
index a53a15676bf..c88fcea782a 100644
--- a/source/blender/simulation/intern/implicit_blender.cc
+++ b/source/blender/simulation/intern/implicit_blender.cc
@@ -12,19 +12,11 @@
 
 #  include "MEM_guardedalloc.h"
 
-#  include "DNA_object_force_types.h"
-#  include "DNA_object_types.h"
-#  include "DNA_scene_types.h"
-#  include "DNA_texture_types.h"
-
 #  include "BLI_math_geom.h"
 #  include "BLI_math_matrix.h"
 #  include "BLI_math_vector.h"
-#  include "BLI_utildefines.h"
 
 #  include "BKE_cloth.hh"
-#  include "BKE_collision.h"
-#  include "BKE_effect.h"
 
 #  include "SIM_mass_spring.h"
 
diff --git a/source/blender/windowmanager/WM_message.hh b/source/blender/windowmanager/WM_message.hh
index 3a70d21f573..8d075ab7df9 100644
--- a/source/blender/windowmanager/WM_message.hh
+++ b/source/blender/windowmanager/WM_message.hh
@@ -8,4 +8,4 @@
 
 #pragma once
 
-#include "message_bus/wm_message_bus.hh"
+#include "message_bus/wm_message_bus.hh"  // IWYU pragma: export
diff --git a/source/blender/windowmanager/WM_types.hh b/source/blender/windowmanager/WM_types.hh
index 3016885a8d6..bb6823f8396 100644
--- a/source/blender/windowmanager/WM_types.hh
+++ b/source/blender/windowmanager/WM_types.hh
@@ -123,12 +123,12 @@ struct wmWindowManager;
 #include "RNA_types.hh"
 
 /* Exported types for WM. */
-#include "gizmo/WM_gizmo_types.hh"
-#include "wm_cursors.hh"
-#include "wm_event_types.hh"
+#include "gizmo/WM_gizmo_types.hh"  // IWYU pragma: export
+#include "wm_cursors.hh"            // IWYU pragma: export
+#include "wm_event_types.hh"        // IWYU pragma: export
 
 /* Include external gizmo API's. */
-#include "gizmo/WM_gizmo_api.hh"
+#include "gizmo/WM_gizmo_api.hh"  // IWYU pragma: export
 
 namespace blender::asset_system {
 class AssetRepresentation;
diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_api.hh b/source/blender/windowmanager/gizmo/WM_gizmo_api.hh
index 5a46fcc32a2..8e77e58ae97 100644
--- a/source/blender/windowmanager/gizmo/WM_gizmo_api.hh
+++ b/source/blender/windowmanager/gizmo/WM_gizmo_api.hh
@@ -14,24 +14,31 @@
 #pragma once
 
 struct ARegion;
+struct bContext;
 struct GHashIterator;
 struct IDProperty;
+struct ListBase;
 struct Main;
+struct PointerRNA;
 struct PropertyRNA;
 struct ScrArea;
 struct bToolRef;
 struct wmGizmo;
 struct wmGizmoGroup;
 struct wmGizmoGroupType;
+struct wmGizmoGroupTypeRef;
 struct wmGizmoMap;
 struct wmGizmoMapType;
 struct wmGizmoMapType_Params;
+struct wmGizmoOpElem;
 struct wmGizmoProperty;
 struct wmGizmoPropertyType;
 struct wmGizmoType;
 struct wmKeyConfig;
 struct wmMsgSubscribeKey;
 struct wmMsgSubscribeValue;
+struct wmOperatorType;
+struct wmWindow;
 struct wmWindowManager;
 
 #include "wm_gizmo_fn.hh"
diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_types.hh b/source/blender/windowmanager/gizmo/WM_gizmo_types.hh
index 39f77ac98fc..f13cb8679c4 100644
--- a/source/blender/windowmanager/gizmo/WM_gizmo_types.hh
+++ b/source/blender/windowmanager/gizmo/WM_gizmo_types.hh
@@ -13,12 +13,14 @@
 
 #pragma once
 
-#include "BLI_compiler_attrs.h"
 #include "BLI_utildefines.h"
 #include "BLI_vector.hh"
 
 #include "DNA_listBase.h"
 
+#include "RNA_types.hh"
+
+struct IDProperty;
 struct wmGizmo;
 struct wmGizmoType;
 struct wmGizmoGroup;
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc
index d7069a0ce0a..d3d80eed40c 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc
@@ -6,8 +6,6 @@
  * \ingroup wm
  */
 
-#include <new>
-
 #include "MEM_guardedalloc.h"
 
 #include "BLI_listbase.h"
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.cc
index a3d1d40a9c9..b077cf9a04e 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.cc
@@ -23,12 +23,10 @@
 
 #include "BKE_context.hh"
 #include "BKE_main.hh"
-#include "BKE_report.hh"
 #include "BKE_screen.hh"
 #include "BKE_workspace.hh"
 
 #include "RNA_access.hh"
-#include "RNA_define.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.cc
index d04b90134b5..ec50937c02a 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.cc
@@ -9,7 +9,6 @@
 #include <cstdio>
 
 #include "BLI_ghash.h"
-#include "BLI_utildefines.h"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.hh b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.hh
index 95118602140..57a2a9a1f26 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.hh
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.hh
@@ -8,9 +8,16 @@
 
 #pragma once
 
+#include "DNA_listBase.h"
+#include "WM_gizmo_types.hh"
+
 struct BLI_Buffer;
 struct wmGizmoMap;
+struct wmGizmoGroupType;
+struct wmGizmoMapType;
+struct wmGizmoType;
 struct wmKeyConfig;
+struct wmWindowManager;
 
 #include "wm_gizmo_fn.hh"
 
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc
index 2445f2a0231..628d35d779e 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc
@@ -11,7 +11,6 @@
 #include "BLI_buffer.h"
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
-#include "BLI_math_bits.h"
 #include "BLI_math_vector.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_rect.h"
@@ -27,7 +26,6 @@
 
 #include "GPU_framebuffer.hh"
 #include "GPU_matrix.hh"
-#include "GPU_platform.hh"
 #include "GPU_select.hh"
 #include "GPU_state.hh"
 #include "GPU_viewport.hh"
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.cc
index 6a47de63504..22e2b4f7725 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.cc
@@ -10,7 +10,6 @@
 
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
-#include "BLI_utildefines.h"
 
 #include "BKE_main.hh"
 #include "BKE_screen.hh"
diff --git a/source/blender/windowmanager/gizmo/wm_gizmo_fn.hh b/source/blender/windowmanager/gizmo/wm_gizmo_fn.hh
index f7a5fd324d7..b74539ea9c2 100644
--- a/source/blender/windowmanager/gizmo/wm_gizmo_fn.hh
+++ b/source/blender/windowmanager/gizmo/wm_gizmo_fn.hh
@@ -10,8 +10,14 @@
 
 #pragma once
 
-#include "BLI_compiler_attrs.h"
-
+struct bContext;
+struct rcti;
+struct wmEvent;
+struct wmGizmo;
+struct wmGizmoGroup;
+struct wmGizmoGroupType;
+struct wmGizmoProperty;
+struct wmKeyConfig;
 struct wmKeyMap;
 struct wmMsgBus;
 
diff --git a/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.hh b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.hh
index a4b5fd9e0ef..83f3d470131 100644
--- a/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.hh
+++ b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.hh
@@ -15,10 +15,16 @@
 
 #pragma once
 
+struct bContext;
+struct wmEvent;
 struct wmEventHandler_Gizmo;
 struct wmEventHandler_Op;
+struct wmGizmo;
+struct wmGizmoGroup;
 struct wmGizmoMap;
+struct wmKeyConfig;
 struct wmOperatorType;
+struct ListBase;
 
 /* -------------------------------------------------------------------- */
 /** \name #wmGizmo
diff --git a/source/blender/windowmanager/intern/wm.cc b/source/blender/windowmanager/intern/wm.cc
index ebe544d45c2..d082a65a13a 100644
--- a/source/blender/windowmanager/intern/wm.cc
+++ b/source/blender/windowmanager/intern/wm.cc
@@ -16,14 +16,12 @@
 #include <cstddef>
 #include <cstring>
 
-#include "BLI_ghash.h"
-#include "BLI_sys_types.h"
-
 #include "DNA_windowmanager_types.h"
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_blenlib.h"
+#include "BLI_ghash.h"
+#include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "BLT_translation.hh"
diff --git a/source/blender/windowmanager/intern/wm_cursors.cc b/source/blender/windowmanager/intern/wm_cursors.cc
index 709549ed61f..38c90ae553c 100644
--- a/source/blender/windowmanager/intern/wm_cursors.cc
+++ b/source/blender/windowmanager/intern/wm_cursors.cc
@@ -8,7 +8,6 @@
  * Cursor pixmap and cursor utility functions to change the cursor.
  */
 
-#include <cstdio>
 #include <cstring>
 
 #include "GHOST_C-api.h"
@@ -16,7 +15,6 @@
 #include "BLI_utildefines.h"
 
 #include "DNA_listBase.h"
-#include "DNA_userdef_types.h"
 #include "DNA_workspace_types.h"
 
 #include "BKE_global.hh"
diff --git a/source/blender/windowmanager/intern/wm_dragdrop.cc b/source/blender/windowmanager/intern/wm_dragdrop.cc
index 8b49b81b14c..e74e03e1de0 100644
--- a/source/blender/windowmanager/intern/wm_dragdrop.cc
+++ b/source/blender/windowmanager/intern/wm_dragdrop.cc
@@ -21,7 +21,6 @@
 
 #include "BLT_translation.hh"
 
-#include "BLI_bitmap.h"
 #include "BLI_blenlib.h"
 #include "BLI_math_color.h"
 
@@ -39,13 +38,11 @@
 
 #include "BLO_readfile.hh"
 
-#include "ED_asset.hh"
 #include "ED_fileselect.hh"
 #include "ED_screen.hh"
 
 #include "GPU_shader.hh"
 #include "GPU_state.hh"
-#include "GPU_viewport.hh"
 
 #include "IMB_imbuf_types.hh"
 
diff --git a/source/blender/windowmanager/intern/wm_draw.cc b/source/blender/windowmanager/intern/wm_draw.cc
index 48fc53f921e..6d95f01a086 100644
--- a/source/blender/windowmanager/intern/wm_draw.cc
+++ b/source/blender/windowmanager/intern/wm_draw.cc
@@ -23,6 +23,7 @@
 
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector_types.hh"
+#include "BLI_rect.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_context.hh"
diff --git a/source/blender/windowmanager/intern/wm_event_query.cc b/source/blender/windowmanager/intern/wm_event_query.cc
index 6829fa534cb..52317caea01 100644
--- a/source/blender/windowmanager/intern/wm_event_query.cc
+++ b/source/blender/windowmanager/intern/wm_event_query.cc
@@ -11,7 +11,6 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "DNA_listBase.h"
 #include "DNA_screen_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_windowmanager_types.h"
diff --git a/source/blender/windowmanager/intern/wm_event_system.cc b/source/blender/windowmanager/intern/wm_event_system.cc
index 5dfeaa40f57..23faed618c1 100644
--- a/source/blender/windowmanager/intern/wm_event_system.cc
+++ b/source/blender/windowmanager/intern/wm_event_system.cc
@@ -10,7 +10,6 @@
  * Also some operator reports utility functions.
  */
 
-#include <cmath>
 #include <cstdlib>
 #include <cstring>
 #include <fmt/format.h>
diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc
index 0fc117c992d..942bcca74d1 100644
--- a/source/blender/windowmanager/intern/wm_files.cc
+++ b/source/blender/windowmanager/intern/wm_files.cc
@@ -51,10 +51,8 @@
 
 #include "BLF_api.hh"
 
-#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
-#include "DNA_sequence_types.h"
 #include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_windowmanager_types.h"
@@ -62,7 +60,9 @@
 
 #include "AS_asset_library.hh"
 
-#include "BKE_addon.h"
+#ifndef WITH_CYCLES
+#  include "BKE_addon.h"
+#endif
 #include "BKE_appdir.hh"
 #include "BKE_autoexec.hh"
 #include "BKE_blender.hh"
diff --git a/source/blender/windowmanager/intern/wm_files_link.cc b/source/blender/windowmanager/intern/wm_files_link.cc
index d309b5a2c4f..1678f854d13 100644
--- a/source/blender/windowmanager/intern/wm_files_link.cc
+++ b/source/blender/windowmanager/intern/wm_files_link.cc
@@ -12,27 +12,17 @@
 #include <cerrno>
 #include <cfloat>
 #include <cstddef>
-#include <cstdio>
 #include <cstring>
 
 #include "CLG_log.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "DNA_ID.h"
-#include "DNA_collection_types.h"
-#include "DNA_key_types.h"
-#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_windowmanager_types.h"
 
-#include "BLI_bitmap.h"
 #include "BLI_blenlib.h"
-#include "BLI_linklist.h"
 #include "BLI_map.hh"
-#include "BLI_memarena.h"
-#include "BLI_utildefines.h"
 
 #include "BLO_readfile.hh"
 
diff --git a/source/blender/windowmanager/intern/wm_gesture_ops.cc b/source/blender/windowmanager/intern/wm_gesture_ops.cc
index f7b9afbd618..799fdf7a99d 100644
--- a/source/blender/windowmanager/intern/wm_gesture_ops.cc
+++ b/source/blender/windowmanager/intern/wm_gesture_ops.cc
@@ -17,15 +17,12 @@
 #include "DNA_space_types.h"
 #include "DNA_windowmanager_types.h"
 
-#include "BLI_math_base.hh"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
 #include "BLI_math_vector.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_rect.h"
 
-#include "BLT_translation.hh"
-
 #include "BKE_context.hh"
 
 #include "WM_api.hh"
diff --git a/source/blender/windowmanager/intern/wm_init_exit.cc b/source/blender/windowmanager/intern/wm_init_exit.cc
index 92f677d3fcb..2de8dc457e2 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.cc
+++ b/source/blender/windowmanager/intern/wm_init_exit.cc
@@ -21,7 +21,6 @@
 #include "DNA_userdef_types.h"
 #include "DNA_windowmanager_types.h"
 
-#include "BLI_fileops.h"
 #include "BLI_listbase.h"
 #include "BLI_path_utils.hh"
 #include "BLI_string.h"
diff --git a/source/blender/windowmanager/intern/wm_keymap.cc b/source/blender/windowmanager/intern/wm_keymap.cc
index 3f97ab84ba7..023593b8c16 100644
--- a/source/blender/windowmanager/intern/wm_keymap.cc
+++ b/source/blender/windowmanager/intern/wm_keymap.cc
@@ -11,7 +11,6 @@
 #include <cstring>
 #include <fmt/format.h>
 
-#include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
@@ -22,7 +21,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_string_utils.hh"
 #include "BLI_utildefines.h"
 
 #include "BLF_api.hh"
diff --git a/source/blender/windowmanager/intern/wm_keymap_utils.cc b/source/blender/windowmanager/intern/wm_keymap_utils.cc
index 33fe2d20c5a..50611aa334d 100644
--- a/source/blender/windowmanager/intern/wm_keymap_utils.cc
+++ b/source/blender/windowmanager/intern/wm_keymap_utils.cc
@@ -10,9 +10,7 @@
 
 #include <cstring>
 
-#include "DNA_object_types.h"
 #include "DNA_space_types.h"
-#include "DNA_userdef_types.h"
 #include "DNA_windowmanager_types.h"
 
 #include "BLI_listbase.h"
diff --git a/source/blender/windowmanager/intern/wm_operator_type.cc b/source/blender/windowmanager/intern/wm_operator_type.cc
index 542eec4b44c..c0b9068baeb 100644
--- a/source/blender/windowmanager/intern/wm_operator_type.cc
+++ b/source/blender/windowmanager/intern/wm_operator_type.cc
@@ -12,17 +12,12 @@
 
 #include "CLG_log.h"
 
-#include "DNA_ID.h"
-#include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
-#include "DNA_userdef_types.h"
 #include "DNA_windowmanager_types.h"
 
 #include "BLT_translation.hh"
 
 #include "BLI_blenlib.h"
-#include "BLI_map.hh"
-#include "BLI_utildefines.h"
 
 #include "BKE_context.hh"
 #include "BKE_idprop.hh"
diff --git a/source/blender/windowmanager/intern/wm_operator_utils.cc b/source/blender/windowmanager/intern/wm_operator_utils.cc
index a1954ec0158..09cd123923c 100644
--- a/source/blender/windowmanager/intern/wm_operator_utils.cc
+++ b/source/blender/windowmanager/intern/wm_operator_utils.cc
@@ -12,7 +12,6 @@
 
 #include "BLI_array.hh"
 #include "BLI_string.h"
-#include "BLI_utildefines.h"
 
 #include "BKE_context.hh"
 #include "BKE_global.hh"
diff --git a/source/blender/windowmanager/intern/wm_operators.cc b/source/blender/windowmanager/intern/wm_operators.cc
index cd8c8f767da..1e491b94bbf 100644
--- a/source/blender/windowmanager/intern/wm_operators.cc
+++ b/source/blender/windowmanager/intern/wm_operators.cc
@@ -16,7 +16,6 @@
 #include <cstddef>
 #include <cstdio>
 #include <cstring>
-#include <iostream>
 #include <sstream>
 
 #include <fmt/format.h>
@@ -42,10 +41,8 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_dial_2d.h"
-#include "BLI_math_matrix.hh"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector_types.hh"
-#include "BLI_string_utils.hh"
 #include "BLI_time.h"
 #include "BLI_utildefines.h"
 
@@ -65,7 +62,6 @@
 #include "BKE_report.hh"
 #include "BKE_scene.hh"
 #include "BKE_screen.hh" /* #BKE_ST_MAXNAME. */
-#include "BKE_unit.hh"
 
 #include "BKE_idtype.hh"
 
diff --git a/source/blender/windowmanager/intern/wm_panel_type.cc b/source/blender/windowmanager/intern/wm_panel_type.cc
index 32e73466bf1..2cfef43689d 100644
--- a/source/blender/windowmanager/intern/wm_panel_type.cc
+++ b/source/blender/windowmanager/intern/wm_panel_type.cc
@@ -14,8 +14,6 @@
 
 #include <cstdio>
 
-#include "BLI_sys_types.h"
-
 #include "DNA_windowmanager_types.h"
 
 #include "BLI_ghash.h"
diff --git a/source/blender/windowmanager/intern/wm_platform.cc b/source/blender/windowmanager/intern/wm_platform.cc
index 83a088a7cb4..94034464ee6 100644
--- a/source/blender/windowmanager/intern/wm_platform.cc
+++ b/source/blender/windowmanager/intern/wm_platform.cc
@@ -8,8 +8,6 @@
  * Interactions with the underlying platform.
  */
 
-#include "BLI_string.h"
-
 #include "WM_api.hh" /* Own include. */
 
 #ifdef WIN32
@@ -17,6 +15,8 @@
 #elif defined(__APPLE__)
 /* Pass. */
 #else
+#  include "BLI_string.h"
+
 #  include "BKE_context.hh"
 
 #  include "BPY_extern_run.hh"
diff --git a/source/blender/windowmanager/intern/wm_playanim.cc b/source/blender/windowmanager/intern/wm_playanim.cc
index 2a5e0d6ce1b..c7fcc1bb152 100644
--- a/source/blender/windowmanager/intern/wm_playanim.cc
+++ b/source/blender/windowmanager/intern/wm_playanim.cc
@@ -13,7 +13,6 @@
  */
 
 #include <cerrno>
-#include <cmath>
 #include <cstdlib>
 #include <cstring>
 #include <fcntl.h>
diff --git a/source/blender/windowmanager/intern/wm_splash_screen.cc b/source/blender/windowmanager/intern/wm_splash_screen.cc
index 81259d39596..17b452f637c 100644
--- a/source/blender/windowmanager/intern/wm_splash_screen.cc
+++ b/source/blender/windowmanager/intern/wm_splash_screen.cc
@@ -14,17 +14,12 @@
  * - Links to web sites.
  */
 
-#include <algorithm>
 #include <cstring>
 
-#include "DNA_ID.h"
-#include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_windowmanager_types.h"
 
-#include "BLF_api.hh"
-
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/windowmanager/intern/wm_stereo.cc b/source/blender/windowmanager/intern/wm_stereo.cc
index 3a9ce1592af..40772cfd0ed 100644
--- a/source/blender/windowmanager/intern/wm_stereo.cc
+++ b/source/blender/windowmanager/intern/wm_stereo.cc
@@ -9,8 +9,6 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "DNA_listBase.h"
-
 #include "RNA_access.hh"
 #include "RNA_prototypes.hh"
 
@@ -30,7 +28,6 @@
 
 #include "GPU_capabilities.hh"
 #include "GPU_immediate.hh"
-#include "GPU_texture.hh"
 #include "GPU_viewport.hh"
 
 #include "WM_api.hh"
diff --git a/source/blender/windowmanager/intern/wm_tooltip.cc b/source/blender/windowmanager/intern/wm_tooltip.cc
index e19a58c64d4..a2f8b774de6 100644
--- a/source/blender/windowmanager/intern/wm_tooltip.cc
+++ b/source/blender/windowmanager/intern/wm_tooltip.cc
@@ -12,7 +12,6 @@
 
 #include "BLI_math_vector.h"
 #include "BLI_time.h"
-#include "BLI_utildefines.h"
 
 #include "BKE_context.hh"
 
diff --git a/source/blender/windowmanager/intern/wm_uilist_type.cc b/source/blender/windowmanager/intern/wm_uilist_type.cc
index 78283a36251..22a90714115 100644
--- a/source/blender/windowmanager/intern/wm_uilist_type.cc
+++ b/source/blender/windowmanager/intern/wm_uilist_type.cc
@@ -12,7 +12,6 @@
 #include <cstring>
 
 #include "BLI_listbase.h"
-#include "BLI_sys_types.h"
 
 #include "DNA_space_types.h"
 #include "DNA_windowmanager_types.h"
diff --git a/source/blender/windowmanager/intern/wm_window.cc b/source/blender/windowmanager/intern/wm_window.cc
index 45884bd6834..69251f53316 100644
--- a/source/blender/windowmanager/intern/wm_window.cc
+++ b/source/blender/windowmanager/intern/wm_window.cc
@@ -44,9 +44,7 @@
 #include "BKE_workspace.hh"
 
 #include "RNA_access.hh"
-#include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
@@ -54,7 +52,6 @@
 #include "wm_draw.hh"
 #include "wm_event_system.hh"
 #include "wm_files.hh"
-#include "wm_platform_support.hh"
 #include "wm_window.hh"
 #include "wm_window_private.hh"
 #ifdef WITH_XR_OPENXR
@@ -74,15 +71,9 @@
 #include "UI_interface_icons.hh"
 
 #include "BLF_api.hh"
-#include "GPU_batch.hh"
-#include "GPU_batch_presets.hh"
 #include "GPU_context.hh"
 #include "GPU_framebuffer.hh"
-#include "GPU_immediate.hh"
 #include "GPU_init_exit.hh"
-#include "GPU_platform.hh"
-#include "GPU_state.hh"
-#include "GPU_texture.hh"
 
 #include "UI_resources.hh"
 
diff --git a/source/blender/windowmanager/message_bus/intern/wm_message_bus_intern.hh b/source/blender/windowmanager/message_bus/intern/wm_message_bus_intern.hh
index 5914552c85e..7eeb78695c2 100644
--- a/source/blender/windowmanager/message_bus/intern/wm_message_bus_intern.hh
+++ b/source/blender/windowmanager/message_bus/intern/wm_message_bus_intern.hh
@@ -10,6 +10,8 @@
 
 #include "../wm_message_bus.hh"
 
+struct GSet;
+
 struct wmMsgBus {
   GSet *messages_gset[WM_MSG_TYPE_NUM];
   /** Messages in order of being added. */
diff --git a/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.cc b/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.cc
index 44032a03973..f8a7a47b0a2 100644
--- a/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.cc
+++ b/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.cc
@@ -16,7 +16,6 @@
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
 #include "BLI_string.h"
-#include "BLI_utildefines.h"
 
 #include "WM_message.hh"
 #include "WM_types.hh"
diff --git a/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.cc b/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.cc
index a60d458494b..c988544cd81 100644
--- a/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.cc
+++ b/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.cc
@@ -14,7 +14,6 @@
 
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
-#include "BLI_utildefines.h"
 
 #include "WM_message.hh"
 #include "WM_types.hh"
diff --git a/source/blender/windowmanager/message_bus/wm_message_bus.hh b/source/blender/windowmanager/message_bus/wm_message_bus.hh
index 6a60cd106c8..4b47ecb16b2 100644
--- a/source/blender/windowmanager/message_bus/wm_message_bus.hh
+++ b/source/blender/windowmanager/message_bus/wm_message_bus.hh
@@ -8,9 +8,11 @@
 
 #pragma once
 
+#include "DNA_listBase.h"
+
 #include "RNA_prototypes.hh"
 #include "RNA_types.hh"
-#include <stdio.h>
+#include <cstdio>
 
 struct ID;
 struct bContext;
diff --git a/source/blender/windowmanager/wm.hh b/source/blender/windowmanager/wm.hh
index 42e6f5b5b10..db554a4dc34 100644
--- a/source/blender/windowmanager/wm.hh
+++ b/source/blender/windowmanager/wm.hh
@@ -8,7 +8,11 @@
 
 #pragma once
 
+struct wmOperator;
+struct wmTimer;
 struct wmWindow;
+struct wmWindowManager;
+struct Main;
 
 #include "gizmo/wm_gizmo_wmapi.hh"
 
diff --git a/source/blender/windowmanager/wm_surface.hh b/source/blender/windowmanager/wm_surface.hh
index 754f17b3e99..41d29adc235 100644
--- a/source/blender/windowmanager/wm_surface.hh
+++ b/source/blender/windowmanager/wm_surface.hh
@@ -12,6 +12,8 @@
 
 #pragma once
 
+#include "GHOST_Types.h"
+
 struct bContext;
 struct GPUContext;
 
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_intern.hh b/source/blender/windowmanager/xr/intern/wm_xr_intern.hh
index 6570c968a5c..d2391e2cd5e 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_intern.hh
+++ b/source/blender/windowmanager/xr/intern/wm_xr_intern.hh
@@ -17,8 +17,13 @@
 
 #include "wm_xr.hh"
 
+struct bContext;
+struct ARegion;
 struct Object;
+struct wmWindow;
+struct wmWindowManager;
 struct wmXrActionSet;
+struct wmXrData;
 
 struct wmXrSessionState {
   bool is_started;