Cleanup: Remove unused and transitive includes in draw module

Especially through DRW_render.hh, there were a lot of unnecessary
includes almost everywhere in the module. This typically makes
dependencies less explicit and slows down compile times, so switch
to including what files actual use.

Pull Request: https://projects.blender.org/blender/blender/pulls/133450

source/blender/blenkernel/BKE_mesh.h

@@ -7,10 +7,9 @@
  * \ingroup bke
  */
 
+#include <cstdint>
+
 #include "BLI_array.hh"
-#include "BLI_compiler_attrs.h"
-#include "BLI_compiler_compat.h"
-#include "BLI_utildefines.h"
 
 #include "DNA_mesh_types.h"
 
@@ -34,7 +33,7 @@ struct Object;
 struct Scene;
 
 /* TODO: Move to `BKE_mesh_types.hh` when possible. */
-enum eMeshBatchDirtyMode {
+enum eMeshBatchDirtyMode : int8_t {
   BKE_MESH_BATCH_DIRTY_ALL = 0,
   BKE_MESH_BATCH_DIRTY_SELECT,
   BKE_MESH_BATCH_DIRTY_SELECT_PAINT,

source/blender/draw/DRW_engine.hh

@@ -8,10 +8,6 @@
 
 #pragma once
 
-#include "BLI_sys_types.h" /* for bool */
-
-#include "DNA_object_enums.h"
-
 struct ARegion;
 struct DRWData;
 struct DRWInstanceDataList;

source/blender/draw/engines/compositor/compositor_engine.cc

@@ -34,6 +34,8 @@
 #include "GPU_context.hh"
 #include "GPU_texture.hh"
 
+#include "draw_view_data.hh"
+
 #include "compositor_engine.h" /* Own include. */
 
 namespace blender::draw::compositor_engine {

source/blender/draw/engines/eevee_next/eevee_camera.cc

@@ -6,21 +6,16 @@
  * \ingroup eevee
  */
 
-#include <array>
+#include "BLI_bounds.hh"
 
 #include "DRW_render.hh"
 
-#include "BLI_bounds.hh"
-
 #include "DNA_camera_types.h"
 #include "DNA_view3d_types.h"
 
 #include "BKE_camera.h"
 
-#include "DEG_depsgraph_query.hh"
-
-#include "ED_view3d.hh"
-
+#include "RE_engine.h"
 #include "RE_pipeline.h"
 #include "render_types.h"
 

source/blender/draw/engines/eevee_next/eevee_camera.hh

@@ -8,6 +8,8 @@
  * \ingroup eevee
  */
 
+#include "BLI_math_matrix.h"
+
 #include "eevee_shader_shared.hh"
 
 namespace blender::eevee {

source/blender/draw/engines/eevee_next/eevee_depth_of_field.cc

@@ -24,7 +24,8 @@
 
 #include "GPU_platform.hh"
 #include "GPU_texture.hh"
-#include "GPU_uniform_buffer.hh"
+
+#include "draw_manager_profiling.hh"
 
 #include "eevee_camera.hh"
 #include "eevee_instance.hh"

source/blender/draw/engines/eevee_next/eevee_engine.cc

@@ -2,10 +2,8 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "BKE_global.hh"
 #include "BLI_rect.h"
 
-#include "GPU_capabilities.hh"
 #include "GPU_framebuffer.hh"
 
 #include "ED_screen.hh"
@@ -17,6 +15,8 @@
 
 #include "eevee_engine.h" /* Own include. */
 
+#include "draw_view_data.hh"
+
 #include "eevee_instance.hh"
 
 using namespace blender;

source/blender/draw/engines/eevee_next/eevee_film.cc

@@ -17,14 +17,16 @@
 #include "BLI_set.hh"
 
 #include "BKE_compositor.hh"
+#include "BKE_scene.hh"
 
-#include "GPU_debug.hh"
 #include "GPU_framebuffer.hh"
 #include "GPU_texture.hh"
 
 #include "DRW_render.hh"
 #include "RE_pipeline.h"
 
+#include "draw_view_data.hh"
+
 #include "eevee_film.hh"
 #include "eevee_instance.hh"
 

source/blender/draw/engines/eevee_next/eevee_instance.cc

@@ -8,17 +8,22 @@
  * An instance contains all structures needed to do a complete render.
  */
 
-#include <sstream>
-
 #include "BKE_global.hh"
 #include "BKE_object.hh"
+
 #include "BLI_rect.h"
+#include "BLI_time.h"
+
 #include "BLT_translation.hh"
+
 #include "DEG_depsgraph_query.hh"
+
 #include "DNA_ID.h"
 #include "DNA_lightprobe_types.h"
 #include "DNA_modifier_types.h"
+
 #include "IMB_imbuf_types.hh"
+
 #include "RE_pipeline.h"
 
 #include "eevee_engine.h"
@@ -27,6 +32,7 @@
 #include "DNA_particle_types.h"
 
 #include "draw_common.hh"
+#include "draw_view_data.hh"
 
 namespace blender::eevee {
 

source/blender/draw/engines/eevee_next/eevee_instance.hh

@@ -12,9 +12,16 @@
 
 #include <fmt/format.h>
 
+#include "BLI_string.h"
+
+#include "BLT_translation.hh"
+
 #include "BKE_object.hh"
+
 #include "DEG_depsgraph.hh"
+
 #include "DNA_lightprobe_types.h"
+
 #include "DRW_render.hh"
 
 #include "eevee_ambient_occlusion.hh"

source/blender/draw/engines/eevee_next/eevee_lightprobe.hh

@@ -15,6 +15,8 @@
 #include "BLI_bit_vector.hh"
 #include "BLI_map.hh"
 
+#include "DNA_world_types.h"
+
 #include "eevee_defines.hh"
 #include "eevee_sync.hh"
 

source/blender/draw/engines/eevee_next/eevee_lightprobe_sphere.hh

@@ -8,14 +8,11 @@
 
 #pragma once
 
+#include "DNA_world_types.h"
+
 #include "eevee_lightprobe.hh"
 #include "eevee_shader_shared.hh"
 
-#include "BKE_cryptomatte.hh"
-
-extern "C" {
-}
-
 namespace blender::eevee {
 
 class Instance;

source/blender/draw/engines/eevee_next/eevee_lightprobe_volume.cc

@@ -8,9 +8,8 @@
 #include "BKE_lightprobe.h"
 
 #include "GPU_capabilities.hh"
-#include "GPU_debug.hh"
 
-#include "BLI_math_rotation.hh"
+#include "draw_manager_profiling.hh"
 
 #include "eevee_instance.hh"
 

source/blender/draw/engines/eevee_next/eevee_lookdev.cc

@@ -18,6 +18,9 @@
 
 #include "GPU_material.hh"
 
+#include "draw_cache.hh"
+#include "draw_view_data.hh"
+
 #include "eevee_instance.hh"
 
 namespace blender::eevee {

source/blender/draw/engines/eevee_next/eevee_material.cc

@@ -15,8 +15,9 @@
 
 #include "NOD_shader.h"
 
-#include "eevee_instance.hh"
+#include "draw_cache.hh"
 
+#include "eevee_instance.hh"
 #include "eevee_material.hh"
 
 namespace blender::eevee {

source/blender/draw/engines/eevee_next/eevee_material.hh

@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include "DNA_material_types.h"
+
 #include "DRW_render.hh"
 
 #include "BLI_map.hh"
@@ -16,6 +18,9 @@
 
 #include "eevee_sync.hh"
 
+struct bNodeSocketValueFloat;
+struct bNodeSocketValueRGBA;
+
 namespace blender::eevee {
 
 class Instance;

source/blender/draw/engines/eevee_next/eevee_motion_blur.cc

@@ -6,15 +6,14 @@
  * \ingroup eevee
  */
 
-// #include "BLI_map.hh"
 #include "BKE_colortools.hh"
-#include "DEG_depsgraph_query.hh"
+
+#include "RE_engine.h"
+
+#include "draw_manager_profiling.hh"
 
 #include "eevee_instance.hh"
 #include "eevee_motion_blur.hh"
-// #include "eevee_sampling.hh"
-// #include "eevee_shader_shared.hh"
-// #include "eevee_velocity.hh"
 
 namespace blender::eevee {
 

source/blender/draw/engines/eevee_next/eevee_pipeline.cc

@@ -17,7 +17,7 @@
 #include "eevee_pipeline.hh"
 #include "eevee_shadow.hh"
 
-#include <iostream>
+#include "draw_manager_profiling.hh"
 
 #include "draw_common.hh"
 

source/blender/draw/engines/eevee_next/eevee_raytrace.cc

@@ -8,10 +8,7 @@
  * The ray-tracing module class handles ray generation, scheduling, tracing and denoising.
  */
 
-#include <fstream>
-#include <iostream>
-
-#include "BKE_global.hh"
+#include "draw_manager_profiling.hh"
 
 #include "eevee_instance.hh"
 

source/blender/draw/engines/eevee_next/eevee_sampling.cc

@@ -9,6 +9,7 @@
  */
 
 #include "BKE_colortools.hh"
+#include "BKE_scene.hh"
 
 #include "BLI_rand.h"
 

source/blender/draw/engines/eevee_next/eevee_shader.cc

@@ -11,6 +11,8 @@
 
 #include "GPU_capabilities.hh"
 
+#include "BKE_material.hh"
+
 #include "gpu_shader_create_info.hh"
 
 #include "eevee_shader.hh"

source/blender/draw/engines/eevee_next/eevee_shadow.cc

@@ -8,14 +8,14 @@
  * The shadow module manages shadow update tagging & shadow rendering.
  */
 
-#include "BKE_global.hh"
 #include "BLI_math_matrix.hh"
 #include "GPU_compute.hh"
 
 #include "eevee_instance.hh"
 
+#include "draw_cache.hh"
 #include "draw_debug.hh"
-#include <iostream>
+#include "draw_manager_profiling.hh"
 
 namespace blender::eevee {
 

source/blender/draw/engines/eevee_next/eevee_sync.cc

@@ -8,20 +8,15 @@
  * Converts the different renderable object types to drawcalls.
  */
 
-#include "eevee_engine.h"
-
-#include "BKE_gpencil_legacy.h"
-#include "BKE_object.hh"
 #include "BKE_paint.hh"
 #include "BKE_paint_bvh.hh"
-#include "DEG_depsgraph_query.hh"
 #include "DNA_curves_types.h"
-#include "DNA_gpencil_legacy_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_pointcloud_types.h"
 #include "DNA_volume_types.h"
 
+#include "draw_cache.hh"
 #include "draw_common.hh"
 #include "draw_sculpt.hh"
 

source/blender/draw/engines/eevee_next/eevee_velocity.cc

@@ -19,6 +19,7 @@
 #include "DNA_particle_types.h"
 #include "DNA_rigidbody_types.h"
 
+#include "draw_cache.hh"
 #include "draw_cache_impl.hh"
 
 #include "eevee_instance.hh"

source/blender/draw/engines/eevee_next/eevee_view.cc

@@ -15,9 +15,10 @@
  * its type. Passes are shared between views.
  */
 
-#include "BKE_global.hh"
 #include "DRW_render.hh"
 
+#include "draw_manager_profiling.hh"
+
 #include "eevee_instance.hh"
 
 #include "eevee_view.hh"

source/blender/draw/engines/eevee_next/eevee_volume.cc

@@ -10,10 +10,9 @@
  * https://www.ea.com/frostbite/news/physically-based-unified-volumetric-rendering-in-frostbite
  */
 
-#include "DNA_volume_types.h"
 #include "GPU_capabilities.hh"
 
-#include "draw_common.hh"
+#include "draw_manager_profiling.hh"
 
 #include "eevee_instance.hh"
 #include "eevee_pipeline.hh"

source/blender/draw/engines/external/external_engine.cc

@@ -12,29 +12,27 @@
 #include "DRW_engine.hh"
 #include "DRW_render.hh"
 
-#include "DNA_modifier_types.h"
+#include "BLI_string.h"
+
+#include "BLT_translation.hh"
+
 #include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
 
-#include "BKE_object.hh"
-#include "BKE_particle.h"
-#include "BKE_screen.hh"
-
 #include "ED_image.hh"
 #include "ED_screen.hh"
 
-#include "GPU_batch.hh"
 #include "GPU_debug.hh"
 #include "GPU_matrix.hh"
-#include "GPU_shader.hh"
 #include "GPU_state.hh"
-#include "GPU_viewport.hh"
 
 #include "RE_engine.h"
 #include "RE_pipeline.h"
 
 #include "draw_command.hh"
 #include "draw_view.hh"
+#include "draw_view_data.hh"
+
 #include "external_engine.h" /* own include */
 
 /* Shaders */

source/blender/draw/engines/gpencil/gpencil_cache_utils.cc

@@ -9,28 +9,25 @@
 #include "DRW_engine.hh"
 #include "DRW_render.hh"
 
-#include "ED_gpencil_legacy.hh"
 #include "ED_view3d.hh"
 
-#include "DNA_gpencil_legacy_types.h"
-#include "DNA_view3d_types.h"
+#include "DNA_material_types.h"
 
-#include "BKE_gpencil_geom_legacy.h"
 #include "BKE_gpencil_legacy.h"
 #include "BKE_grease_pencil.hh"
-#include "BKE_lib_id.hh"
+#include "BKE_material.hh"
 #include "BKE_object.hh"
 
+#include "BLI_ghash.h"
 #include "BLI_hash.h"
 #include "BLI_link_utils.h"
 #include "BLI_math_color.h"
+#include "BLI_math_matrix.h"
 #include "BLI_math_vector.hh"
 #include "BLI_memblock.h"
 
 #include "gpencil_engine.h"
 
-#include "draw_cache_impl.hh"
-
 #include "DEG_depsgraph.hh"
 
 #include "UI_resources.hh"

source/blender/draw/engines/gpencil/gpencil_draw_data.cc

@@ -9,11 +9,12 @@
 #include "DRW_render.hh"
 
 #include "DNA_light_types.h"
+#include "DNA_material_types.h"
 
 #include "BKE_image.hh"
+#include "BKE_material.hh"
 
-#include "BLI_hash.h"
-#include "BLI_math_color.h"
+#include "BLI_math_matrix.h"
 #include "BLI_memblock.h"
 
 #include "GPU_uniform_buffer.hh"

source/blender/draw/engines/gpencil/gpencil_engine.h

@@ -8,18 +8,16 @@
 
 #pragma once
 
-#include "DNA_gpencil_legacy_types.h"
-
 #include "DRW_render.hh"
 
 #include "BLI_bitmap.h"
-#include "BLI_bounds.hh"
 
 #include "BKE_grease_pencil.hh"
 
 #include "GPU_batch.hh"
 
 #include "draw_pass.hh"
+#include "draw_view_data.hh"
 
 #define GP_LIGHT
 

source/blender/draw/engines/gpencil/gpencil_engine_c.cc

@@ -8,33 +8,34 @@
 #include "DRW_engine.hh"
 #include "DRW_render.hh"
 
+#include "BKE_context.hh"
 #include "BKE_curves.hh"
 #include "BKE_gpencil_geom_legacy.h"
 #include "BKE_gpencil_legacy.h"
-#include "BKE_grease_pencil.h"
 #include "BKE_grease_pencil.hh"
-#include "BKE_lib_id.hh"
-#include "BKE_main.hh"
+#include "BKE_material.hh"
 #include "BKE_object.hh"
 #include "BKE_paint.hh"
 #include "BKE_shader_fx.h"
 
 #include "BKE_camera.h"
-#include "BKE_global.hh" /* for G.debug */
 
-#include "BLI_link_utils.h"
 #include "BLI_listbase.h"
 #include "BLI_memblock.h"
 #include "BLI_virtual_array.hh"
 
+#include "BLT_translation.hh"
+
 #include "DNA_camera_types.h"
-#include "DNA_gpencil_legacy_types.h"
+#include "DNA_material_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
+#include "DNA_world_types.h"
 
 #include "GPU_texture.hh"
 #include "GPU_uniform_buffer.hh"
 
+#include "draw_cache.hh"
 #include "draw_manager.hh"
 #include "draw_view.hh"
 
@@ -46,7 +47,7 @@
 #include "ED_screen.hh"
 #include "ED_view3d.hh"
 
-#include "UI_resources.hh"
+#include "draw_manager_profiling.hh"
 
 /* *********** FUNCTIONS *********** */
 

source/blender/draw/engines/gpencil/gpencil_render.cc

@@ -5,16 +5,16 @@
 /** \file
  * \ingroup draw
  */
+#include "BLI_math_matrix.h"
 #include "BLI_rect.h"
 
 #include "DRW_render.hh"
 
 #include "BKE_object.hh"
 
-#include "DNA_gpencil_legacy_types.h"
-
 #include "DEG_depsgraph_query.hh"
 
+#include "RE_engine.h"
 #include "RE_pipeline.h"
 
 #include "IMB_imbuf_types.hh"

source/blender/draw/engines/gpencil/gpencil_shader_c.cc

@@ -7,6 +7,8 @@
  */
 #include "DRW_render.hh"
 
+#include "BLI_string.h"
+
 #include "gpencil_engine.h"
 
 extern "C" char datatoc_gpencil_common_lib_glsl[];

source/blender/draw/engines/gpencil/gpencil_shader_fx.cc

@@ -13,7 +13,7 @@
 #include "BKE_gpencil_legacy.h"
 
 #include "BLI_link_utils.h"
-#include "BLI_memblock.h"
+#include "BLI_math_matrix.h"
 
 #include "DRW_render.hh"
 

source/blender/draw/engines/image/image_drawing_mode.cc

@@ -2,6 +2,8 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "draw_view_data.hh"
+
 #include "image_drawing_mode.hh"
 #include "image_instance.hh"
 #include "image_shader.hh"

source/blender/draw/engines/image/image_engine.cc

@@ -10,30 +10,21 @@
 
 #include "DRW_render.hh"
 
-#include <memory>
-#include <optional>
+#include "BLT_translation.hh"
 
+#include "BKE_context.hh"
 #include "BKE_image.hh"
 #include "BKE_main.hh"
 #include "BKE_object.hh"
 
-#include "DNA_camera_types.h"
-#include "DNA_screen_types.h"
-
-#include "IMB_imbuf.hh"
-#include "IMB_imbuf_types.hh"
-
 #include "ED_image.hh"
 
-#include "GPU_batch.hh"
+#include "draw_view_data.hh"
 
 #include "image_drawing_mode.hh"
 #include "image_engine.h"
 #include "image_instance.hh"
-#include "image_private.hh"
 #include "image_shader.hh"
-#include "image_space_image.hh"
-#include "image_space_node.hh"
 
 namespace blender::image_engine {
 

source/blender/draw/engines/overlay/overlay_armature.cc

@@ -15,12 +15,12 @@
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_view3d_types.h"
 
 #include "DRW_render.hh"
 
 #include "BLI_listbase_wrapper.hh"
 #include "BLI_math_color.h"
+#include "BLI_math_matrix.h"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_rotation.h"
 #include "BLI_utildefines.h"
@@ -28,9 +28,7 @@
 #include "BKE_action.hh"
 #include "BKE_armature.hh"
 #include "BKE_deform.hh"
-#include "BKE_modifier.hh"
 #include "BKE_object.hh"
-#include "BKE_object_types.hh"
 
 #include "DEG_depsgraph_query.hh"
 
@@ -42,11 +40,11 @@
 
 #include "UI_resources.hh"
 
+#include "draw_cache.hh"
 #include "draw_common_c.hh"
 #include "draw_manager_text.hh"
 
 #include "overlay_next_armature.hh"
-#include "overlay_private.hh"
 
 #include "draw_cache_impl.hh"
 

source/blender/draw/engines/overlay/overlay_next_attribute_text.hh

@@ -7,16 +7,16 @@
  */
 
 #include "BLI_math_quaternion_types.hh"
+#include "BLI_string.h"
 
 #include "DNA_curve_types.h"
+#include "DNA_pointcloud_types.h"
 
 #include "BKE_attribute.hh"
 #include "BKE_curves.hh"
 #include "BKE_duplilist.hh"
 #include "BKE_geometry_set.hh"
 #include "BKE_instances.hh"
-#include "BKE_mesh.hh"
-#include "BKE_pointcloud.hh"
 
 #include "DRW_render.hh"
 

source/blender/draw/engines/overlay/overlay_next_attribute_viewer.hh

@@ -14,6 +14,7 @@
 #include "DNA_curve_types.h"
 #include "DNA_pointcloud_types.h"
 
+#include "draw_cache.hh"
 #include "draw_cache_impl.hh"
 #include "overlay_next_base.hh"
 

source/blender/draw/engines/overlay/overlay_next_background.hh

@@ -8,6 +8,10 @@
 
 #pragma once
 
+#include "DNA_world_types.h"
+
+#include "draw_cache.hh"
+
 #include "overlay_next_base.hh"
 
 namespace blender::draw::overlay {

source/blender/draw/engines/overlay/overlay_next_engine.cc

@@ -11,19 +11,7 @@
 #include "DRW_engine.hh"
 #include "DRW_render.hh"
 
-#include "DEG_depsgraph_query.hh"
-
-#include "ED_view3d.hh"
-
-#include "UI_interface.hh"
-
-#include "BKE_duplilist.hh"
-#include "BKE_object.hh"
-#include "BKE_paint.hh"
-
-#include "GPU_capabilities.hh"
-
-#include "DNA_space_types.h"
+#include "BLT_translation.hh"
 
 #include "draw_manager.hh"
 #include "overlay_next_instance.hh"

source/blender/draw/engines/overlay/overlay_next_grease_pencil.hh

@@ -9,14 +9,19 @@
 #pragma once
 
 #include "BLI_bounds.hh"
+#include "BLI_math_matrix.h"
 #include "BLI_math_matrix.hh"
 
 #include "BKE_curves.hh"
 #include "BKE_grease_pencil.hh"
+#include "BKE_material.hh"
 #include "BKE_object.hh"
 
+#include "DNA_material_types.h"
+
 #include "ED_grease_pencil.hh"
 
+#include "draw_cache.hh"
 #include "draw_manager_text.hh"
 
 #include "overlay_next_base.hh"

source/blender/draw/engines/overlay/overlay_next_instance.cc

@@ -12,8 +12,6 @@
 
 #include "BKE_paint.hh"
 
-#include "draw_debug.hh"
-
 #include "overlay_next_instance.hh"
 
 namespace blender::draw::overlay {

source/blender/draw/engines/overlay/overlay_next_light.hh

@@ -8,6 +8,10 @@
 
 #pragma once
 
+#include "DNA_light_types.h"
+
+#include "BLI_math_matrix.h"
+
 #include "overlay_next_base.hh"
 
 namespace blender::draw::overlay {

source/blender/draw/engines/overlay/overlay_next_mode_transfer.hh

@@ -8,8 +8,11 @@
 
 #pragma once
 
+#include "BLI_time.h"
+
 #include "BKE_paint.hh"
 
+#include "draw_cache.hh"
 #include "draw_sculpt.hh"
 
 #include "overlay_next_base.hh"

source/blender/draw/engines/overlay/overlay_next_origin.hh

@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include "BKE_layer.hh"
+
 #include "overlay_next_base.hh"
 
 namespace blender::draw::overlay {

source/blender/draw/engines/overlay/overlay_next_paint.hh

@@ -10,9 +10,11 @@
 
 #include "BKE_image.hh"
 #include "BKE_paint.hh"
+#include "BKE_scene.hh"
 
 #include "DEG_depsgraph_query.hh"
 
+#include "draw_cache.hh"
 #include "draw_cache_impl.hh"
 
 #include "overlay_next_base.hh"

source/blender/draw/engines/overlay/overlay_next_private.hh

@@ -8,11 +8,14 @@
 
 #pragma once
 
+#include "BKE_context.hh"
 #include "BKE_movieclip.h"
 #include "BKE_object.hh"
 
 #include "BLI_function_ref.hh"
 
+#include "DNA_world_types.h"
+
 #include "GPU_matrix.hh"
 
 #include "DRW_gpu_wrapper.hh"
@@ -20,6 +23,7 @@
 #include "UI_resources.hh"
 #include "draw_manager.hh"
 #include "draw_pass.hh"
+#include "draw_view_data.hh"
 #include "gpu_shader_create_info.hh"
 
 #include "../select/select_instance.hh"

source/blender/draw/engines/overlay/overlay_next_shape.cc

@@ -6,6 +6,8 @@
  * \ingroup overlay
  */
 
+#include "draw_cache.hh"
+
 #include "overlay_next_private.hh"
 
 namespace blender::draw::overlay {

source/blender/draw/engines/select/select_engine.cc

@@ -8,16 +8,19 @@
  * Engine for drawing a selection map where the pixels indicate the selection indices.
  */
 
-#include "DNA_screen_types.h"
+#include "BLI_math_matrix.h"
+
+#include "BLT_translation.hh"
 
 #include "ED_view3d.hh"
 
-#include "UI_resources.hh"
+#include "RE_engine.h"
 
 #include "DRW_engine.hh"
 #include "DRW_select_buffer.hh"
 
 #include "draw_cache_impl.hh"
+#include "draw_common_c.hh"
 #include "draw_manager_c.hh"
 
 #include "select_engine.hh"

source/blender/draw/engines/select/select_instance.cc

@@ -8,7 +8,7 @@
 
 #include "DRW_render.hh"
 
-#include "GPU_capabilities.hh"
+#include "BLT_translation.hh"
 
 #include "select_engine.hh"
 

source/blender/draw/engines/select/select_private.hh

@@ -12,6 +12,7 @@
 
 #include "draw_manager.hh"
 #include "draw_pass.hh"
+#include "draw_view_data.hh"
 
 #include "DRW_render.hh"
 

source/blender/draw/engines/workbench/workbench_effect_dof.cc

@@ -20,7 +20,8 @@
 #include "workbench_private.hh"
 
 #include "BKE_camera.h"
-#include "DEG_depsgraph_query.hh"
+
+#include "draw_manager_profiling.hh"
 
 namespace blender::workbench {
 /**

source/blender/draw/engines/workbench/workbench_engine.cc

@@ -7,24 +7,30 @@
 #include "DNA_fluid_types.h"
 
 #include "BKE_editmesh.hh"
+#include "BKE_material.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_paint.hh"
 #include "BKE_paint_bvh.hh"
 #include "BKE_particle.h"
-#include "BKE_report.hh"
 
 #include "DEG_depsgraph_query.hh"
 
+#include "DNA_windowmanager_types.h"
 #include "ED_paint.hh"
 #include "ED_view3d.hh"
 
-#include "GPU_capabilities.hh"
+#include "BLT_translation.hh"
 
 #include "IMB_imbuf_types.hh"
 
+#include "RE_engine.h"
+#include "RE_pipeline.h"
+
+#include "draw_cache.hh"
 #include "draw_common.hh"
 #include "draw_sculpt.hh"
+#include "draw_view_data.hh"
 
 #include "workbench_private.hh"
 

source/blender/draw/engines/workbench/workbench_materials.cc

@@ -4,11 +4,12 @@
 
 #include "workbench_private.hh"
 
+#include "BLI_ghash.h"
 #include "BLI_hash.h"
 #include "BLI_math_color.h"
 /* get_image */
-#include "BKE_node.hh"
 #include "BKE_node_legacy_types.hh"
+#include "DNA_material_types.h"
 #include "DNA_node_types.h"
 #include "ED_uvedit.hh"
 /* get_image */

source/blender/draw/engines/workbench/workbench_private.hh

@@ -2,6 +2,8 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "BKE_context.hh"
+
 #include "DNA_camera_types.h"
 #include "DRW_render.hh"
 #include "draw_manager.hh"

source/blender/draw/engines/workbench/workbench_resources.cc

@@ -3,10 +3,15 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "../eevee_next/eevee_lut.hh" /* TODO: find somewhere to share blue noise Table. */
+
 #include "BKE_studiolight.h"
+
+#include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
+
 #include "IMB_imbuf_types.hh"
 
+#include "draw_common_c.hh"
 #include "workbench_private.hh"
 
 namespace blender::workbench {

source/blender/draw/engines/workbench/workbench_shadow.cc

@@ -19,6 +19,8 @@
 #include "DRW_render.hh"
 #include "GPU_compute.hh"
 
+#include "draw_cache.hh"
+
 #include "workbench_private.hh"
 
 namespace blender::workbench {

source/blender/draw/engines/workbench/workbench_state.cc

@@ -5,18 +5,19 @@
 #include "workbench_private.hh"
 
 #include "BKE_camera.h"
+#include "BKE_customdata.hh"
 #include "BKE_editmesh.hh"
 #include "BKE_mesh_types.hh"
-#include "BKE_modifier.hh"
-#include "BKE_object.hh"
 #include "BKE_paint.hh"
 #include "BKE_paint_bvh.hh"
-#include "BKE_particle.h"
 
 #include "DEG_depsgraph_query.hh"
-#include "DNA_fluid_types.h"
+
+#include "DNA_world_types.h"
+
 #include "ED_paint.hh"
 #include "ED_view3d.hh"
+
 #include "GPU_capabilities.hh"
 
 namespace blender::workbench {

source/blender/draw/engines/workbench/workbench_volume.cc

@@ -2,6 +2,9 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "draw_cache.hh"
+#include "draw_common_c.hh"
+
 #include "workbench_private.hh"
 
 #include "BKE_volume.hh"

source/blender/draw/intern/DRW_gpu_wrapper.hh

@@ -57,8 +57,6 @@
  *   Simple wrapper to #GPUFramebuffer that can be moved.
  */
 
-#include "DRW_render.hh"
-
 #include "MEM_guardedalloc.h"
 
 #include "draw_manager_c.hh"

source/blender/draw/intern/DRW_render.hh

@@ -10,45 +10,9 @@
 
 #pragma once
 
-#include "BLI_listbase.h"
-#include "BLI_math_matrix.h"
-#include "BLI_string.h"
+#include "DNA_object_enums.h"
 
-#include "BKE_context.hh"
-#include "BKE_layer.hh"
-#include "BKE_material.hh"
-#include "BKE_scene.hh"
-
-#include "BLT_translation.hh"
-
-#include "DNA_light_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_world_types.h"
-
-#include "GPU_framebuffer.hh"
 #include "GPU_material.hh"
-#include "GPU_primitive.hh"
-#include "GPU_shader.hh"
-#include "GPU_storage_buffer.hh"
-#include "GPU_texture.hh"
-#include "GPU_uniform_buffer.hh"
-
-#include "draw_cache.hh"
-#include "draw_common_c.hh"
-#include "draw_view_c.hh"
-
-#include "draw_debug_c.hh"
-#include "draw_manager_profiling.hh"
-#include "draw_state.hh"
-#include "draw_view_data.hh"
-
-#include "MEM_guardedalloc.h"
-
-#include "RE_engine.h"
-
-#include "DEG_depsgraph.hh"
 
 /* Uncomment to track unused resource bindings. */
 // #define DRW_UNUSED_RESOURCE_TRACKING
@@ -62,16 +26,29 @@
 namespace blender::gpu {
 class Batch;
 }
+struct ARegion;
+struct bContext;
+struct Depsgraph;
+struct DefaultFramebufferList;
+struct DefaultTextureList;
+struct DupliObject;
 struct GPUMaterial;
 struct GPUShader;
 struct GPUTexture;
 struct GPUUniformBuf;
 struct Object;
 struct ParticleSystem;
-struct RenderEngineType;
-struct bContext;
 struct rcti;
+struct RegionView3D;
+struct RenderEngine;
+struct RenderEngineType;
+struct RenderLayer;
+struct RenderResult;
+struct SpaceLink;
 struct TaskGraph;
+struct View3D;
+struct ViewLayer;
+struct World;
 namespace blender::draw {
 class TextureFromPool;
 }  // namespace blender::draw

source/blender/draw/intern/draw_cache.cc

@@ -11,7 +11,6 @@
 #include "DNA_grease_pencil_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meta_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 #include "DNA_particle_types.h"
@@ -21,17 +20,18 @@
 
 #include "UI_resources.hh"
 
+#include "BLI_ghash.h"
+#include "BLI_string.h"
 #include "BLI_utildefines.h"
 
+#include "BKE_context.hh"
+#include "BKE_material.hh"
 #include "BKE_object.hh"
-#include "BKE_paint.hh"
 
 #include "GPU_batch.hh"
 #include "GPU_batch_utils.hh"
 #include "GPU_capabilities.hh"
 
-#include "MEM_guardedalloc.h"
-
 #include "draw_cache.hh"
 #include "draw_cache_impl.hh"
 #include "draw_manager_c.hh"

source/blender/draw/intern/draw_cache.hh

@@ -9,10 +9,12 @@
 #pragma once
 
 #include "BLI_math_matrix_types.hh"
+#include "BLI_span.hh"
 
 #include "BKE_volume_grid_fwd.hh"
 
 struct GPUMaterial;
+struct GPUTexture;
 namespace blender::gpu {
 class Batch;
 class VertBuf;

source/blender/draw/intern/draw_cache_extract.hh

@@ -8,9 +8,12 @@
 
 #pragma once
 
+#include "BLI_array.hh"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_utildefines.h"
 
+#include "DNA_view3d_enums.h"
+
 #include "GPU_shader.hh"
 
 #include "draw_attributes.hh"
@@ -19,7 +22,11 @@ namespace blender::gpu {
 class Batch;
 class IndexBuf;
 }  // namespace blender::gpu
+struct Mesh;
+struct Object;
+struct Scene;
 struct TaskGraph;
+struct ToolSettings;
 
 namespace blender::draw {
 

source/blender/draw/intern/draw_cache_extract_mesh.cc

@@ -7,17 +7,11 @@
  *
  * \brief Extraction of Mesh data into VBO to feed to GPU.
  */
-#include "MEM_guardedalloc.h"
 
 #include "DNA_mesh_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_array.hh"
 #include "BLI_task.h"
-#include "BLI_vector.hh"
-
-#include "BKE_editmesh.hh"
-#include "BKE_object.hh"
 
 #include "GPU_capabilities.hh"
 

source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc

@@ -8,13 +8,9 @@
  * \brief Extraction of Mesh data into VBO to feed to GPU.
  */
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_array.hh"
 #include "BLI_array_utils.hh"
 #include "BLI_enumerable_thread_specific.hh"
-#include "BLI_index_mask.hh"
-#include "BLI_math_matrix.h"
 #include "BLI_task.hh"
 #include "BLI_virtual_array.hh"
 
@@ -23,11 +19,8 @@
 #include "BKE_editmesh_cache.hh"
 #include "BKE_material.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.hh"
 #include "BKE_object.hh"
 
-#include "GPU_batch.hh"
-
 #include "ED_mesh.hh"
 
 #include "mesh_extractors/extract_mesh.hh"

source/blender/draw/intern/draw_cache_impl.hh

@@ -8,6 +8,10 @@
 
 #pragma once
 
+#include <cstdint>
+
+#include "BLI_span.hh"
+
 struct GPUMaterial;
 namespace blender::gpu {
 class Batch;
@@ -23,11 +27,13 @@ struct Curve;
 struct Curves;
 struct Lattice;
 struct Mesh;
+struct Object;
+struct Scene;
 struct PointCloud;
 struct Volume;
 struct GreasePencil;
 
-#include "BKE_mesh.h"
+enum eMeshBatchDirtyMode : int8_t;
 
 namespace blender::draw {
 

source/blender/draw/intern/draw_cache_impl_curve.cc

@@ -10,27 +10,25 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_array.hh"
 #include "BLI_color.hh"
 #include "BLI_listbase.h"
 #include "BLI_math_rotation.h"
-#include "BLI_math_vector.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_span.hh"
 #include "BLI_utildefines.h"
 
 #include "DNA_curve_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 
 #include "BKE_curve.hh"
 #include "BKE_curves.hh"
-#include "BKE_displist.h"
 #include "BKE_geometry_set.hh"
 #include "BKE_object_types.hh"
 #include "BKE_vfont.hh"
 
 #include "GPU_batch.hh"
 #include "GPU_capabilities.hh"
-#include "GPU_material.hh"
 #include "GPU_texture.hh"
 
 #include "UI_resources.hh"

source/blender/draw/intern/draw_cache_impl_curves.cc

@@ -15,16 +15,15 @@
 #include "BLI_array_utils.hh"
 #include "BLI_listbase.h"
 #include "BLI_math_base.h"
-#include "BLI_math_matrix.hh"
 #include "BLI_math_vector.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_span.hh"
+#include "BLI_string.h"
 #include "BLI_task.hh"
 #include "BLI_utildefines.h"
 
 #include "DNA_curves_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 
 #include "DEG_depsgraph_query.hh"
 

source/blender/draw/intern/draw_cache_impl_grease_pencil.cc

@@ -10,7 +10,6 @@
 
 #include "BKE_attribute.hh"
 #include "BKE_curves.hh"
-#include "BKE_deform.hh"
 #include "BKE_grease_pencil.h"
 #include "BKE_grease_pencil.hh"
 
@@ -28,6 +27,7 @@
 
 #include "GPU_batch.hh"
 
+#include "draw_cache.hh"
 #include "draw_cache_impl.hh"
 
 #include "../engines/gpencil/gpencil_defines.h"

source/blender/draw/intern/draw_cache_impl_lattice.cc

@@ -10,13 +10,11 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math_vector.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_curve_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_userdef_types.h"
 
 #include "BKE_deform.hh"
 #include "BKE_lattice.hh"

source/blender/draw/intern/draw_cache_impl_mesh.cc

@@ -8,23 +8,15 @@
  * \brief Mesh API for render engines
  */
 
-#include <memory>
 #include <optional>
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_bitmap.h"
-#include "BLI_buffer.h"
 #include "BLI_index_range.hh"
 #include "BLI_listbase.h"
-#include "BLI_map.hh"
-#include "BLI_math_bits.h"
-#include "BLI_math_vector.h"
 #include "BLI_span.hh"
-#include "BLI_string.h"
 #include "BLI_string_ref.hh"
 #include "BLI_task.h"
-#include "BLI_utildefines.h"
 
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
@@ -32,14 +24,9 @@
 
 #include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
-#include "BKE_deform.hh"
 #include "BKE_editmesh.hh"
-#include "BKE_editmesh_cache.hh"
-#include "BKE_editmesh_tangent.hh"
+#include "BKE_material.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.hh"
-#include "BKE_mesh_tangent.hh"
-#include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_object_deform.h"
 #include "BKE_paint.hh"
@@ -48,16 +35,11 @@
 
 #include "atomic_ops.h"
 
-#include "bmesh.hh"
-
 #include "GPU_batch.hh"
 #include "GPU_material.hh"
 
 #include "DRW_render.hh"
 
-#include "ED_mesh.hh"
-#include "ED_uvedit.hh"
-
 #include "draw_cache_extract.hh"
 #include "draw_cache_inline.hh"
 #include "draw_subdivision.hh"

source/blender/draw/intern/draw_cache_impl_particles.cc

@@ -13,7 +13,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_alloca.h"
-#include "BLI_ghash.h"
 #include "BLI_math_color.h"
 #include "BLI_math_vector.h"
 #include "BLI_string.h"
@@ -35,7 +34,6 @@
 
 #include "GPU_batch.hh"
 #include "GPU_capabilities.hh"
-#include "GPU_context.hh"
 #include "GPU_material.hh"
 
 #include "DEG_depsgraph_query.hh"

source/blender/draw/intern/draw_cache_impl_pointcloud.cc

@@ -12,10 +12,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_color.hh"
 #include "BLI_listbase.h"
-#include "BLI_math_base.h"
-#include "BLI_math_color.hh"
-#include "BLI_math_vector.h"
 #include "BLI_task.hh"
 #include "BLI_utildefines.h"
 

source/blender/draw/intern/draw_cache_impl_subdivision.cc

@@ -12,9 +12,7 @@
 #include "BKE_editmesh.hh"
 #include "BKE_mesh.hh"
 #include "BKE_mesh_mapping.hh"
-#include "BKE_modifier.hh"
 #include "BKE_object.hh"
-#include "BKE_scene.hh"
 #include "BKE_subdiv.hh"
 #include "BKE_subdiv_eval.hh"
 #include "BKE_subdiv_foreach.hh"
@@ -22,9 +20,7 @@
 #include "BKE_subdiv_modifier.hh"
 
 #include "BLI_linklist.h"
-#include "BLI_string.h"
-#include "BLI_string_utils.hh"
-#include "BLI_time.h"
+#include "BLI_threads.h"
 #include "BLI_virtual_array.hh"
 
 #include "DRW_engine.hh"

source/blender/draw/intern/draw_cache_impl_volume.cc

@@ -13,12 +13,11 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_listbase.h"
-#include "BLI_math_base.h"
 #include "BLI_math_matrix.hh"
-#include "BLI_math_vector.h"
+#include "BLI_string.h"
 #include "BLI_utildefines.h"
 
-#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 #include "DNA_volume_types.h"
 
 #include "BKE_global.hh"
@@ -30,8 +29,6 @@
 #include "GPU_capabilities.hh"
 #include "GPU_texture.hh"
 
-#include "DEG_depsgraph_query.hh"
-
 #include "DRW_render.hh"
 
 #include "draw_cache.hh"      /* own include */

source/blender/draw/intern/draw_cache_inline.hh

@@ -9,7 +9,6 @@
 #pragma once
 
 #include "GPU_batch.hh"
-#include "MEM_guardedalloc.h"
 
 /* Common */
 // #define DRW_DEBUG_MESH_CACHE_REQUEST

source/blender/draw/intern/draw_color_management.cc

@@ -6,20 +6,18 @@
  * \ingroup draw
  */
 
-#include "draw_manager_c.hh"
+#include "GPU_viewport.hh"
+
+#include "BLI_string.h"
 
 #include "DRW_render.hh"
 
-#include "GPU_batch.hh"
-#include "GPU_framebuffer.hh"
-#include "GPU_matrix.hh"
-#include "GPU_texture.hh"
-
 #include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
 
 #include "BKE_colortools.hh"
 #include "BKE_image.hh"
+#include "BKE_scene.hh"
 
 #include "DEG_depsgraph_query.hh"
 

source/blender/draw/intern/draw_common.cc

@@ -6,20 +6,20 @@
  * \ingroup draw
  */
 
+#include "DNA_texture_types.h"
+#include "DNA_view3d_types.h"
 #include "DRW_render.hh"
 
-#include "GPU_matrix.hh"
-#include "GPU_shader.hh"
 #include "GPU_texture.hh"
+#include "GPU_uniform_buffer.hh"
 
 #include "UI_resources.hh"
 
 #include "BLI_index_range.hh"
 #include "BLI_math_color.h"
+#include "BLI_math_vector.h"
 
 #include "BKE_colorband.hh"
-#include "BKE_global.hh"
-#include "BKE_object.hh"
 
 #include "draw_common_c.hh"
 

source/blender/draw/intern/draw_curves.cc

@@ -8,7 +8,6 @@
  * \brief Contains procedural GPU hair drawing methods.
  */
 
-#include "BLI_string_utils.hh"
 #include "BLI_utildefines.h"
 
 #include "DNA_curves_types.h"
@@ -19,7 +18,6 @@
 
 #include "GPU_batch.hh"
 #include "GPU_capabilities.hh"
-#include "GPU_compute.hh"
 #include "GPU_material.hh"
 #include "GPU_shader.hh"
 #include "GPU_texture.hh"

source/blender/draw/intern/draw_debug.cc

@@ -9,10 +9,9 @@
  */
 
 #include "BKE_object.hh"
-#include "BLI_link_utils.h"
+#include "BLI_math_matrix.h"
 #include "BLI_math_matrix.hh"
 #include "GPU_batch.hh"
-#include "GPU_capabilities.hh"
 #include "GPU_debug.hh"
 
 #include "draw_debug.hh"
@@ -21,9 +20,6 @@
 #include "draw_shader.hh"
 #include "draw_shader_shared.hh"
 
-#include <iomanip>
-#include <sstream>
-
 #if defined(_DEBUG) || defined(WITH_DRAW_DEBUG)
 #  define DRAW_DEBUG
 #else

source/blender/draw/intern/draw_debug.hh

@@ -17,7 +17,11 @@
 
 #include "BLI_math_vector_types.hh"
 #include "BLI_vector.hh"
+
 #include "DNA_object_types.h"
+
+#include "draw_shader_shared.hh"
+
 #include "DRW_gpu_wrapper.hh"
 
 namespace blender::draw {

source/blender/draw/intern/draw_hair.cc

@@ -10,11 +10,9 @@
 
 #include "DRW_render.hh"
 
-#include "BLI_string_utils.hh"
-#include "BLI_utildefines.h"
+#include "BLI_math_matrix.h"
 
 #include "DNA_collection_types.h"
-#include "DNA_customdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_particle_types.h"
 
@@ -22,8 +20,6 @@
 
 #include "GPU_batch.hh"
 #include "GPU_capabilities.hh"
-#include "GPU_compute.hh"
-#include "GPU_context.hh"
 #include "GPU_material.hh"
 #include "GPU_shader.hh"
 #include "GPU_texture.hh"
@@ -31,6 +27,7 @@
 
 #include "DRW_gpu_wrapper.hh"
 
+#include "draw_common_c.hh"
 #include "draw_hair_private.hh"
 #include "draw_manager.hh"
 #include "draw_shader.hh"

source/blender/draw/intern/draw_instance_data.cc

@@ -16,24 +16,13 @@
  */
 
 #include "draw_instance_data.hh"
-#include "draw_manager_c.hh"
 
 #include "DRW_engine.hh"
 #include "DRW_render.hh" /* For DRW_shgroup_get_instance_count() */
 
-#include "GPU_material.hh"
-
-#include "DNA_particle_types.h"
-
-#include "BKE_duplilist.hh"
-
-#include "RNA_access.hh"
-#include "RNA_path.hh"
-
-#include "BLI_bitmap.h"
-#include "BLI_memblock.h"
+#include "BLI_listbase.h"
 #include "BLI_mempool.h"
-#include "BLI_utildefines.h"
+
 #include "MEM_guardedalloc.h"
 
 struct DRWInstanceData {

source/blender/draw/intern/draw_manager.cc

@@ -6,21 +6,17 @@
  * \ingroup draw
  */
 
-#include "BKE_global.hh"
 #include "BKE_paint.hh"
 #include "BKE_paint_bvh.hh"
 
 #include "BLI_math_base.h"
 #include "GPU_compute.hh"
 
-#include "draw_debug.hh"
 #include "draw_defines.hh"
 #include "draw_manager.hh"
 #include "draw_manager_c.hh"
 #include "draw_pass.hh"
 #include "draw_shader.hh"
-#include <iostream>
-#include <string>
 
 namespace blender::draw {
 

source/blender/draw/intern/draw_manager_c.cc

@@ -10,9 +10,8 @@
 
 #include "CLG_log.h"
 
-#include "BLI_alloca.h"
 #include "BLI_listbase.h"
-#include "BLI_memblock.h"
+#include "BLI_math_matrix.h"
 #include "BLI_rect.h"
 #include "BLI_string.h"
 #include "BLI_task.h"
@@ -31,6 +30,7 @@
 #include "BKE_gpencil_legacy.h"
 #include "BKE_grease_pencil.h"
 #include "BKE_lattice.hh"
+#include "BKE_layer.hh"
 #include "BKE_main.hh"
 #include "BKE_mball.hh"
 #include "BKE_mesh.hh"
@@ -41,9 +41,9 @@
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 #include "BKE_pointcloud.hh"
+#include "BKE_scene.hh"
 #include "BKE_screen.hh"
 #include "BKE_subdiv_modifier.hh"
-#include "BKE_viewer_path.hh"
 #include "BKE_volume.hh"
 
 #include "DNA_camera_types.h"
@@ -59,7 +59,6 @@
 
 #include "GPU_capabilities.hh"
 #include "GPU_framebuffer.hh"
-#include "GPU_immediate.hh"
 #include "GPU_matrix.hh"
 #include "GPU_platform.hh"
 #include "GPU_shader_shared.hh"
@@ -76,14 +75,16 @@
 #include "WM_api.hh"
 #include "wm_window.hh"
 
+#include "draw_cache.hh"
 #include "draw_color_management.hh"
+#include "draw_common_c.hh"
 #include "draw_manager_c.hh"
 #include "draw_manager_profiling.hh"
-#include "draw_manager_testing.hh"
 #include "draw_manager_text.hh"
 #include "draw_shader.hh"
 #include "draw_subdivision.hh"
 #include "draw_texture_pool.hh"
+#include "draw_view_c.hh"
 
 /* only for callbacks */
 #include "draw_cache_impl.hh"
@@ -102,6 +103,8 @@
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
 
+#include "BLI_time.h"
+
 #include "DRW_select_buffer.hh"
 
 static CLG_LogRef LOG = {"draw.manager"};

source/blender/draw/intern/draw_manager_c.hh

@@ -20,17 +20,18 @@
 #include "GPU_context.hh"
 #include "GPU_framebuffer.hh"
 #include "GPU_shader.hh"
-#include "GPU_uniform_buffer.hh"
 #include "GPU_viewport.hh"
 
 #include "draw_instance_data.hh"
-#include "draw_shader_shared.hh"
 
 struct DRWDebugModule;
 struct DRWTexturePool;
 struct DRWUniformChunk;
+struct DRWViewData;
+struct DRWTextStore;
 struct DupliObject;
 struct Object;
+struct Mesh;
 namespace blender::draw {
 struct CurvesUniformBufPool;
 struct DRW_Attributes;
@@ -39,6 +40,7 @@ class CurveRefinePass;
 class View;
 }  // namespace blender::draw
 struct GPUMaterial;
+struct GSet;
 
 /** Use draw manager to call GPU_select, see: #DRW_draw_select_loop */
 #define USE_GPU_SELECT
@@ -57,7 +59,6 @@ struct GPUMaterial;
 #define USE_PROFILE
 
 #ifdef USE_PROFILE
-#  include "BLI_time.h"
 
 #  define PROFILE_TIMER_FALLOFF 0.04
 

source/blender/draw/intern/draw_manager_profiling.cc

@@ -8,8 +8,6 @@
 
 #include <algorithm>
 
-#include "BLI_listbase.h"
-#include "BLI_rect.h"
 #include "BLI_string.h"
 
 #include "BKE_global.hh"
@@ -26,6 +24,7 @@
 #include "UI_resources.hh"
 
 #include "draw_manager_profiling.hh"
+#include "draw_view_data.hh"
 
 #define MAX_TIMER_NAME 32
 #define MAX_NESTED_TIMER 8

source/blender/draw/intern/draw_manager_shader.cc

@@ -7,30 +7,17 @@
  */
 
 #include "DNA_material_types.h"
-#include "DNA_object_types.h"
 #include "DNA_world_types.h"
 
-#include "BLI_dynstr.h"
-#include "BLI_listbase.h"
-#include "BLI_map.hh"
-#include "BLI_string_utils.hh"
 #include "BLI_threads.h"
 #include "BLI_time.h"
 
-#include "BKE_context.hh"
-#include "BKE_global.hh"
-#include "BKE_main.hh"
-
 #include "DEG_depsgraph_query.hh"
 
 #include "GPU_capabilities.hh"
 #include "GPU_material.hh"
-#include "GPU_shader.hh"
 
 #include "WM_api.hh"
-#include "WM_types.hh"
-
-#include "wm_window.hh"
 
 #include "draw_manager_c.hh"
 

source/blender/draw/intern/draw_manager_text.cc

@@ -8,6 +8,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_math_color.h"
 #include "BLI_math_geom.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_matrix.hh"
@@ -35,7 +36,6 @@
 #include "GPU_matrix.hh"
 #include "GPU_state.hh"
 
-#include "ED_screen.hh"
 #include "ED_view3d.hh"
 
 #include "UI_interface.hh"

source/blender/draw/intern/draw_pointcloud.cc

@@ -6,23 +6,16 @@
  * \ingroup draw
  */
 
-#include "BLI_string_utils.hh"
-#include "BLI_utildefines.h"
-
 #include "DNA_pointcloud_types.h"
 
 #include "GPU_batch.hh"
-#include "GPU_capabilities.hh"
-#include "GPU_compute.hh"
 #include "GPU_material.hh"
 #include "GPU_shader.hh"
 #include "GPU_texture.hh"
 #include "GPU_vertex_buffer.hh"
 
-#include "DRW_gpu_wrapper.hh"
 #include "DRW_render.hh"
 
-#include "draw_attributes.hh"
 #include "draw_cache_impl.hh"
 #include "draw_common.hh"
 #include "draw_common_c.hh"

source/blender/draw/intern/draw_resource.cc

@@ -6,13 +6,10 @@
  * \ingroup draw
  */
 
-#include "DNA_particle_types.h"
-#include "RNA_access.hh"
-#include "RNA_path.hh"
-#include "RNA_types.hh"
+#include "BKE_duplilist.hh"
+#include "GPU_material.hh"
 
 #include "draw_handle.hh"
-#include "draw_manager.hh"
 #include "draw_shader_shared.hh"
 
 /* -------------------------------------------------------------------- */

source/blender/draw/intern/draw_resource.hh

@@ -26,7 +26,6 @@
 #include "DNA_object_types.h"
 
 #include "draw_handle.hh"
-#include "draw_manager.hh"
 #include "draw_shader_shared.hh"
 
 /* -------------------------------------------------------------------- */

source/blender/draw/intern/draw_sculpt.cc

@@ -8,14 +8,19 @@
 
 #include "draw_sculpt.hh"
 
+#include "DNA_mesh_types.h"
 #include "draw_attributes.hh"
+#include "draw_view.hh"
 
 #include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
-#include "BKE_mesh_types.hh"
+#include "BKE_object.hh"
 #include "BKE_paint.hh"
 
+#include "BLI_math_matrix.hh"
+
 #include "DRW_pbvh.hh"
+#include "DRW_render.hh"
 
 namespace blender::draw {
 

source/blender/draw/intern/draw_sculpt.hh

@@ -8,7 +8,14 @@
 
 #pragma once
 
-#include "draw_manager.hh"
+#include "BLI_math_vector_types.hh"
+#include "BLI_vector.hh"
+
+struct GPUMaterial;
+struct Object;
+namespace blender::gpu {
+class Batch;
+}
 
 namespace blender::draw {
 

source/blender/draw/intern/draw_select_buffer.cc

@@ -8,25 +8,30 @@
  * Utilities to read id buffer created in select_engine.
  */
 
+#include <cfloat>
+
 #include "MEM_guardedalloc.h"
 
 #include "BLI_array_utils.h"
 #include "BLI_bitmap.h"
 #include "BLI_bitmap_draw_2d.h"
+#include "BLI_math_matrix.h"
 #include "BLI_rect.h"
 
+#include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_view3d_types.h"
 
+#include "GPU_framebuffer.hh"
 #include "GPU_select.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
 
 #include "DRW_engine.hh"
+#include "DRW_render.hh"
 #include "DRW_select_buffer.hh"
 
-#include "draw_manager_c.hh"
-
 #include "../engines/select/select_engine.hh"
 
 using blender::int2;

source/blender/draw/intern/draw_shader.cc

@@ -8,12 +8,7 @@
 
 #include "DRW_render.hh"
 
-#include "BLI_dynstr.h"
-#include "BLI_string_utils.hh"
-
 #include "GPU_batch.hh"
-#include "GPU_index_buffer.hh"
-#include "GPU_vertex_buffer.hh"
 
 #include "draw_shader.hh"
 

source/blender/draw/intern/draw_view.cc

@@ -7,7 +7,9 @@
  */
 
 #include "BLI_math_geom.h"
+#include "BLI_math_matrix.h"
 #include "BLI_math_matrix.hh"
+
 #include "GPU_compute.hh"
 #include "GPU_debug.hh"
 

source/blender/draw/intern/draw_view.hh

@@ -17,7 +17,6 @@
  * setting `drw_view_id` accordingly.
  */
 
-#include "DNA_view3d_types.h"
 #include "DRW_gpu_wrapper.hh"
 #include "GPU_matrix.hh"
 

source/blender/draw/intern/draw_view_c.cc

@@ -14,7 +14,6 @@
 #include "DNA_view3d_types.h"
 
 #include "ED_screen.hh"
-#include "ED_util.hh"
 #include "ED_view3d.hh"
 
 #include "GPU_debug.hh"
@@ -34,9 +33,13 @@
 #include "BKE_paint.hh"
 #include "BKE_screen.hh"
 
-#include "view3d_intern.hh"
+#include "DRW_engine.hh"
+#include "DRW_render.hh"
 
-#include "draw_manager_c.hh"
+#include "draw_cache.hh"
+#include "draw_view_c.hh"
+
+#include "view3d_intern.hh"
 
 /* ******************** region info ***************** */
 

source/blender/draw/intern/draw_view_data.cc

@@ -10,14 +10,11 @@
 
 #include "BLI_vector.hh"
 
-#include "GPU_capabilities.hh"
 #include "GPU_viewport.hh"
 
 #include "DRW_gpu_wrapper.hh"
 #include "DRW_render.hh"
 
-#include "draw_instance_data.hh"
-
 #include "draw_manager_text.hh"
 
 #include "draw_manager.hh"

source/blender/draw/intern/draw_volume.cc

@@ -14,7 +14,8 @@
 #include "DNA_fluid_types.h"
 #include "DNA_volume_types.h"
 
-#include "BKE_fluid.h"
+#include "BLI_string.h"
+
 #include "BKE_global.hh"
 #include "BKE_mesh.hh"
 #include "BKE_modifier.hh"
@@ -23,6 +24,7 @@
 
 #include "GPU_material.hh"
 
+#include "draw_cache.hh"
 #include "draw_common_c.hh"
 #include "draw_manager_c.hh"
 

source/blender/draw/intern/mesh_extractors/extract_mesh.cc

@@ -8,10 +8,7 @@
  * \brief Extraction of Mesh data into VBO to feed to GPU.
  */
 
-#include "MEM_guardedalloc.h"
-
 #include "DNA_meshdata_types.h"
-#include "DNA_object_types.h"
 
 #include "ED_uvedit.hh"
 

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc

@@ -8,7 +8,6 @@
 
 #include "BLI_map.hh"
 #include "BLI_ordered_edge.hh"
-#include "BLI_vector.hh"
 
 #include "BKE_editmesh.hh"
 

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc

@@ -6,8 +6,6 @@
  * \ingroup draw
  */
 
-#include "BLI_array_utils.hh"
-
 #include "GPU_index_buffer.hh"
 
 #include "draw_subdivision.hh"

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc

@@ -6,10 +6,7 @@
  * \ingroup draw
  */
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_array_utils.hh"
-#include "BLI_math_vector_types.hh"
 #include "BLI_string.h"
 
 #include "BKE_attribute.hh"

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc

@@ -8,8 +8,6 @@
 
 #include "BLI_math_vector_types.hh"
 
-#include "MEM_guardedalloc.h"
-
 #include "BKE_attribute.hh"
 #include "BKE_mesh.hh"
 

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc

@@ -6,10 +6,7 @@
  * \ingroup draw
  */
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_array_utils.hh"
-#include "BLI_string.h"
 
 #include "BKE_attribute.hh"
 #include "BKE_mesh.hh"

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc

@@ -6,11 +6,8 @@
  * \ingroup draw
  */
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_string.h"
 
-#include "BKE_editmesh.hh"
 #include "BKE_editmesh_tangent.hh"
 #include "BKE_mesh.hh"
 #include "BKE_mesh_tangent.hh"

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc

@@ -11,7 +11,6 @@
 #include "BLI_array_utils.hh"
 
 #include "BKE_deform.hh"
-#include "BKE_mesh.hh"
 
 #include "draw_subdivision.hh"
 #include "extract_mesh.hh"