From 867f99c2af0b9015450695fd5ce54a23beefad61 Mon Sep 17 00:00:00 2001
From: Hans Goudey <h.goudey@me.com>
Date: Fri, 22 Sep 2023 03:18:17 +0200
Subject: [PATCH] Cleanup: Move depsgraph headers to C++

Pull Request: https://projects.blender.org/blender/blender/pulls/110816
---
 .../blender/blenkernel/intern/DerivedMesh.cc  |  4 +-
 source/blender/blenkernel/intern/action.cc    |  4 +-
 .../blenkernel/intern/action_mirror.cc        |  2 +-
 source/blender/blenkernel/intern/anim_data.cc |  2 +-
 source/blender/blenkernel/intern/anim_sys.cc  |  4 +-
 source/blender/blenkernel/intern/armature.cc  |  4 +-
 .../blenkernel/intern/armature_deform.cc      |  2 +-
 .../blenkernel/intern/armature_update.cc      |  2 +-
 source/blender/blenkernel/intern/blender.cc   |  2 +-
 .../blenkernel/intern/blender_copybuffer.cc   |  4 +-
 .../blender/blenkernel/intern/blender_undo.cc |  2 +-
 source/blender/blenkernel/intern/bpath.cc     |  2 +-
 source/blender/blenkernel/intern/cachefile.cc |  2 +-
 source/blender/blenkernel/intern/camera.cc    |  2 +-
 source/blender/blenkernel/intern/cloth.cc     |  4 +-
 .../blender/blenkernel/intern/collection.cc   |  4 +-
 source/blender/blenkernel/intern/collision.cc |  6 +--
 .../blender/blenkernel/intern/constraint.cc   |  4 +-
 source/blender/blenkernel/intern/context.cc   |  2 +-
 .../blender/blenkernel/intern/crazyspace.cc   |  2 +-
 source/blender/blenkernel/intern/curve.cc     |  4 +-
 .../blenkernel/intern/curve_convert.cc        |  4 +-
 source/blender/blenkernel/intern/curves.cc    |  2 +-
 .../blenkernel/intern/data_transfer.cc        |  2 +-
 source/blender/blenkernel/intern/displist.cc  |  4 +-
 .../blender/blenkernel/intern/dynamicpaint.cc |  4 +-
 source/blender/blenkernel/intern/editmesh.cc  |  2 +-
 source/blender/blenkernel/intern/effect.cc    |  6 +--
 .../blenkernel/intern/fcurve_driver.cc        |  2 +-
 source/blender/blenkernel/intern/fluid.cc     |  4 +-
 .../blenkernel/intern/gpencil_curve_legacy.cc |  2 +-
 .../blenkernel/intern/gpencil_geom_legacy.cc  |  2 +-
 .../blenkernel/intern/gpencil_legacy.cc       |  2 +-
 .../intern/gpencil_modifier_legacy.cc         |  4 +-
 .../blenkernel/intern/grease_pencil.cc        |  4 +-
 source/blender/blenkernel/intern/image.cc     |  4 +-
 source/blender/blenkernel/intern/lattice.cc   |  2 +-
 source/blender/blenkernel/intern/layer.cc     |  6 +--
 source/blender/blenkernel/intern/lib_id.cc    |  6 +--
 .../blenkernel/intern/lib_id_delete.cc        |  2 +-
 .../blender/blenkernel/intern/lib_override.cc |  4 +-
 .../intern/lib_override_proxy_conversion.cc   |  2 +-
 source/blender/blenkernel/intern/lib_remap.cc |  4 +-
 source/blender/blenkernel/intern/light.cc     |  2 +-
 .../blenkernel/intern/light_linking.cc        |  4 +-
 source/blender/blenkernel/intern/mask.cc      |  2 +-
 .../blenkernel/intern/mask_evaluate.cc        |  4 +-
 source/blender/blenkernel/intern/material.cc  |  6 +--
 source/blender/blenkernel/intern/mball.cc     |  2 +-
 .../blenkernel/intern/mball_tessellate.cc     |  4 +-
 source/blender/blenkernel/intern/mesh.cc      |  4 +-
 .../blender/blenkernel/intern/mesh_convert.cc |  4 +-
 .../blenkernel/intern/mesh_validate.cc        |  2 +-
 .../blender/blenkernel/intern/mesh_wrapper.cc |  4 +-
 source/blender/blenkernel/intern/modifier.cc  |  4 +-
 source/blender/blenkernel/intern/movieclip.cc |  4 +-
 source/blender/blenkernel/intern/multires.cc  |  2 +-
 .../blenkernel/intern/multires_reshape.cc     |  2 +-
 .../intern/multires_reshape_apply_base.cc     |  2 +-
 .../intern/multires_reshape_subdivide.cc      |  2 +-
 .../intern/multires_reshape_util.cc           |  2 +-
 .../blenkernel/intern/multires_unsubdivide.cc |  2 +-
 source/blender/blenkernel/intern/node.cc      |  4 +-
 .../blenkernel/intern/node_tree_update.cc     |  2 +-
 source/blender/blenkernel/intern/object.cc    |  4 +-
 .../blender/blenkernel/intern/object_dupli.cc |  4 +-
 .../blenkernel/intern/object_update.cc        |  4 +-
 source/blender/blenkernel/intern/paint.cc     |  4 +-
 source/blender/blenkernel/intern/particle.cc  |  6 +--
 .../blenkernel/intern/particle_distribute.cc  |  2 +-
 .../blenkernel/intern/particle_system.cc      |  6 +--
 .../blender/blenkernel/intern/pointcloud.cc   |  2 +-
 source/blender/blenkernel/intern/rigidbody.cc |  4 +-
 source/blender/blenkernel/intern/scene.cc     |  8 ++--
 source/blender/blenkernel/intern/shader_fx.cc |  4 +-
 .../blender/blenkernel/intern/shrinkwrap.cc   |  2 +-
 source/blender/blenkernel/intern/softbody.cc  |  4 +-
 source/blender/blenkernel/intern/sound.cc     |  4 +-
 source/blender/blenkernel/intern/volume.cc    |  2 +-
 source/blender/blenkernel/intern/workspace.cc |  2 +-
 source/blender/blenkernel/intern/world.cc     |  2 +-
 source/blender/blenloader/intern/readfile.cc  |  2 +-
 .../blenloader/intern/versioning_280.cc       |  2 +-
 .../tests/blendfile_loading_base_test.cc      |  4 +-
 .../tests/blendfile_loading_base_test.h       |  2 +-
 .../bmesh/intern/bmesh_mesh_convert.cc        |  2 +-
 source/blender/depsgraph/CMakeLists.txt       | 41 +++++++++----------
 .../{DEG_depsgraph.h => DEG_depsgraph.hh}     |  8 ----
 ...psgraph_build.h => DEG_depsgraph_build.hh} |  8 ----
 ...psgraph_debug.h => DEG_depsgraph_debug.hh} |  8 ----
 .../depsgraph/DEG_depsgraph_light_linking.h   | 19 ---------
 ...aph_physics.h => DEG_depsgraph_physics.hh} | 10 +----
 ...psgraph_query.h => DEG_depsgraph_query.hh} | 12 +-----
 .../depsgraph/intern/builder/deg_builder.cc   | 18 ++++----
 .../intern/builder/deg_builder_cache.h        |  2 +-
 .../intern/builder/deg_builder_cycle.cc       | 10 ++---
 .../intern/builder/deg_builder_key.h          |  8 ++--
 .../intern/builder/deg_builder_map.h          |  2 +-
 .../intern/builder/deg_builder_nodes.cc       | 20 ++++-----
 .../intern/builder/deg_builder_nodes.h        |  8 ++--
 .../intern/builder/deg_builder_nodes_rig.cc   | 12 +++---
 .../builder/deg_builder_nodes_view_layer.cc   | 14 +++----
 .../intern/builder/deg_builder_pchanmap.h     |  2 +-
 .../intern/builder/deg_builder_relations.cc   | 24 +++++------
 .../intern/builder/deg_builder_relations.h    | 12 +++---
 .../builder/deg_builder_relations_drivers.cc  |  4 +-
 .../builder/deg_builder_relations_impl.h      |  2 +-
 .../builder/deg_builder_relations_rig.cc      | 14 +++----
 .../deg_builder_relations_view_layer.cc       | 14 +++----
 .../intern/builder/deg_builder_remove_noop.cc | 10 ++---
 .../intern/builder/deg_builder_rna.cc         | 10 ++---
 .../intern/builder/deg_builder_rna.h          |  4 +-
 .../intern/builder/deg_builder_transitive.cc  | 10 ++---
 .../depsgraph/intern/builder/pipeline.h       |  2 +-
 .../intern/builder/pipeline_all_objects.cc    |  2 +-
 .../intern/builder/pipeline_compositor.cc     |  2 +-
 .../intern/builder/pipeline_from_ids.cc       |  2 +-
 .../intern/builder/pipeline_render.cc         |  2 +-
 .../intern/builder/pipeline_view_layer.cc     |  2 +-
 .../depsgraph/intern/debug/deg_debug.h        |  4 +-
 .../debug/deg_debug_relations_graphviz.cc     | 16 ++++----
 .../intern/debug/deg_debug_stats_gnuplot.cc   |  6 +--
 source/blender/depsgraph/intern/depsgraph.cc  | 26 ++++++------
 .../intern/{depsgraph.h => depsgraph.hh}      |  8 ++--
 .../depsgraph/intern/depsgraph_build.cc       | 22 +++++-----
 .../depsgraph/intern/depsgraph_debug.cc       | 20 ++++-----
 .../depsgraph/intern/depsgraph_eval.cc        | 14 +++----
 .../intern/depsgraph_light_linking.cc         |  7 ++--
 ...t_linking.h => depsgraph_light_linking.hh} |  0
 .../depsgraph/intern/depsgraph_physics.cc     | 10 ++---
 ...psgraph_physics.h => depsgraph_physics.hh} |  0
 .../depsgraph/intern/depsgraph_query.cc       |  8 ++--
 .../intern/depsgraph_query_foreach.cc         | 16 ++++----
 .../depsgraph/intern/depsgraph_query_iter.cc  |  8 ++--
 .../depsgraph/intern/depsgraph_registry.cc    |  4 +-
 ...graph_registry.h => depsgraph_registry.hh} |  2 +-
 .../depsgraph/intern/depsgraph_relation.cc    |  6 +--
 ...graph_relation.h => depsgraph_relation.hh} |  0
 .../blender/depsgraph/intern/depsgraph_tag.cc | 26 ++++++------
 .../{depsgraph_tag.h => depsgraph_tag.hh}     |  2 +-
 .../depsgraph/intern/depsgraph_type.cc        | 12 +++---
 .../{depsgraph_type.h => depsgraph_type.hh}   |  0
 .../depsgraph/intern/depsgraph_update.cc      |  6 +--
 ...depsgraph_update.h => depsgraph_update.hh} |  0
 .../blender/depsgraph/intern/eval/deg_eval.cc | 20 ++++-----
 .../intern/eval/deg_eval_copy_on_write.cc     | 10 ++---
 .../depsgraph/intern/eval/deg_eval_flush.cc   | 22 +++++-----
 .../eval/deg_eval_runtime_backup_animation.cc |  2 +-
 .../eval/deg_eval_runtime_backup_animation.h  |  2 +-
 .../eval/deg_eval_runtime_backup_gpencil.cc   |  2 +-
 .../eval/deg_eval_runtime_backup_object.h     |  2 +-
 .../eval/deg_eval_runtime_backup_pose.h       |  2 +-
 .../eval/deg_eval_runtime_backup_sequencer.h  |  2 +-
 .../depsgraph/intern/eval/deg_eval_stats.cc   | 10 ++---
 .../intern/eval/deg_eval_visibility.cc        | 14 +++----
 .../blender/depsgraph/intern/node/deg_node.cc | 16 ++++----
 .../intern/node/{deg_node.h => deg_node.hh}   |  4 +-
 .../intern/node/deg_node_component.cc         |  8 ++--
 ...node_component.h => deg_node_component.hh} |  6 +--
 .../depsgraph/intern/node/deg_node_factory.cc |  2 +-
 ...deg_node_factory.h => deg_node_factory.hh} |  6 +--
 ...actory_impl.h => deg_node_factory_impl.hh} |  2 +-
 .../depsgraph/intern/node/deg_node_id.cc      | 10 ++---
 .../node/{deg_node_id.h => deg_node_id.hh}    |  2 +-
 .../intern/node/deg_node_operation.cc         | 10 ++---
 ...node_operation.h => deg_node_operation.hh} |  4 +-
 .../depsgraph/intern/node/deg_node_time.cc    |  6 +--
 .../{deg_node_time.h => deg_node_time.hh}     |  2 +-
 .../engines/compositor/compositor_engine.cc   |  2 +-
 .../blender/draw/engines/eevee/eevee_bloom.cc |  2 +-
 .../blender/draw/engines/eevee/eevee_data.cc  |  2 +-
 .../engines/eevee/eevee_depth_of_field.cc     |  4 +-
 .../draw/engines/eevee/eevee_engine.cc        |  2 +-
 .../draw/engines/eevee/eevee_lightcache.cc    |  4 +-
 .../draw/engines/eevee/eevee_lightprobes.cc   |  2 +-
 .../draw/engines/eevee/eevee_lights.cc        |  2 +-
 .../draw/engines/eevee/eevee_lookdev.cc       |  2 +-
 .../draw/engines/eevee/eevee_materials.cc     |  2 +-
 .../draw/engines/eevee/eevee_motion_blur.cc   |  4 +-
 .../draw/engines/eevee/eevee_occlusion.cc     |  2 +-
 .../draw/engines/eevee/eevee_render.cc        |  2 +-
 .../draw/engines/eevee/eevee_renderpasses.cc  |  2 +-
 .../engines/eevee/eevee_screen_raytrace.cc    |  2 +-
 .../draw/engines/eevee/eevee_shadows.cc       |  2 +-
 .../draw/engines/eevee/eevee_subsurface.cc    |  2 +-
 .../engines/eevee/eevee_temporal_sampling.cc  |  2 +-
 .../draw/engines/eevee/eevee_volumes.cc       |  2 +-
 .../draw/engines/eevee_next/eevee_camera.cc   |  5 ++-
 .../draw/engines/eevee_next/eevee_instance.cc |  2 +-
 .../draw/engines/eevee_next/eevee_instance.hh |  2 +-
 .../engines/eevee_next/eevee_lightcache.cc    |  4 +-
 .../engines/eevee_next/eevee_motion_blur.cc   |  2 +-
 .../engines/eevee_next/eevee_motion_blur.hh   |  2 +-
 .../draw/engines/eevee_next/eevee_sync.cc     |  2 +-
 .../draw/engines/eevee_next/eevee_velocity.cc |  2 +-
 .../draw/engines/eevee_next/eevee_world.cc    |  2 +-
 .../engines/gpencil/gpencil_cache_utils.cc    |  2 +-
 .../draw/engines/gpencil/gpencil_engine.cc    |  2 +-
 .../draw/engines/gpencil/gpencil_engine_c.cc  |  2 +-
 .../draw/engines/gpencil/gpencil_render.cc    |  2 +-
 .../draw/engines/overlay/overlay_armature.cc  |  2 +-
 .../engines/overlay/overlay_edit_curves.cc    |  2 +-
 .../draw/engines/overlay/overlay_edit_uv.cc   |  2 +-
 .../draw/engines/overlay/overlay_engine.cc    |  2 +-
 .../draw/engines/overlay/overlay_extra.cc     |  2 +-
 .../engines/overlay/overlay_gpencil_legacy.cc |  2 +-
 .../draw/engines/overlay/overlay_grid.cc      |  2 +-
 .../draw/engines/overlay/overlay_image.cc     |  2 +-
 .../draw/engines/overlay/overlay_metaball.cc  |  2 +-
 .../engines/overlay/overlay_motion_path.cc    |  2 +-
 .../engines/overlay/overlay_next_engine.cc    |  2 +-
 .../draw/engines/overlay/overlay_next_grid.hh |  2 +-
 .../engines/overlay/overlay_next_instance.cc  |  4 +-
 .../draw/engines/overlay/overlay_paint.cc     |  2 +-
 .../draw/engines/overlay/overlay_particle.cc  |  2 +-
 .../engines/overlay/overlay_sculpt_curves.cc  |  2 +-
 .../draw/engines/select/select_draw_utils.cc  |  4 +-
 .../engines/workbench/workbench_effect_dof.cc |  2 +-
 .../engines/workbench/workbench_engine.cc     |  2 +-
 .../draw/engines/workbench/workbench_state.cc |  2 +-
 source/blender/draw/intern/DRW_render.h       |  2 +-
 .../draw/intern/draw_cache_impl_curves.cc     |  2 +-
 .../intern/draw_cache_impl_gpencil_legacy.cc  |  2 +-
 .../draw/intern/draw_cache_impl_particles.cc  |  2 +-
 .../draw/intern/draw_cache_impl_volume.cc     |  2 +-
 source/blender/draw/intern/draw_manager_c.cc  |  4 +-
 .../draw/intern/draw_manager_shader.cc        |  2 +-
 .../blender/draw/intern/draw_select_buffer.cc |  4 +-
 source/blender/draw/tests/eevee_test.cc       |  4 +-
 .../animation/anim_channels_defines.cc        |  2 +-
 .../editors/animation/anim_channels_edit.cc   |  4 +-
 source/blender/editors/animation/anim_deps.cc |  2 +-
 .../blender/editors/animation/anim_markers.cc |  4 +-
 .../editors/animation/anim_motion_paths.cc    |  6 +--
 source/blender/editors/animation/anim_ops.cc  |  2 +-
 source/blender/editors/animation/drivers.cc   |  4 +-
 .../blender/editors/animation/fmodifier_ui.cc |  2 +-
 .../blender/editors/animation/keyframing.cc   |  6 +--
 .../blender/editors/animation/keyingsets.cc   |  2 +-
 .../blender/editors/armature/armature_add.cc  |  2 +-
 .../blender/editors/armature/armature_edit.cc |  2 +-
 .../editors/armature/armature_naming.cc       |  2 +-
 .../editors/armature/armature_relations.cc    |  4 +-
 .../editors/armature/armature_select.cc       |  2 +-
 .../editors/armature/armature_skinning.cc     |  4 +-
 .../editors/armature/armature_utils.cc        |  2 +-
 .../editors/armature/bone_collections.cc      |  2 +-
 .../editors/armature/editarmature_undo.cc     |  2 +-
 .../blender/editors/armature/meshlaplacian.cc |  2 +-
 source/blender/editors/armature/pose_edit.cc  |  4 +-
 source/blender/editors/armature/pose_group.cc |  2 +-
 source/blender/editors/armature/pose_lib_2.cc |  2 +-
 .../blender/editors/armature/pose_select.cc   |  2 +-
 .../editors/armature/pose_transform.cc        |  4 +-
 source/blender/editors/armature/pose_utils.cc |  2 +-
 source/blender/editors/curve/editcurve.cc     |  6 +--
 source/blender/editors/curve/editcurve_add.cc |  2 +-
 .../blender/editors/curve/editcurve_paint.cc  |  2 +-
 source/blender/editors/curve/editcurve_pen.cc |  2 +-
 .../blender/editors/curve/editcurve_query.cc  |  4 +-
 .../blender/editors/curve/editcurve_select.cc |  2 +-
 .../blender/editors/curve/editcurve_undo.cc   |  2 +-
 source/blender/editors/curve/editfont.cc      |  4 +-
 source/blender/editors/curve/editfont_undo.cc |  2 +-
 .../editors/curves/intern/curves_ops.cc       |  4 +-
 .../editors/curves/intern/curves_undo.cc      |  2 +-
 .../editors/geometry/geometry_attributes.cc   |  2 +-
 .../editors/geometry/node_group_operator.cc   |  4 +-
 .../gizmo_library/gizmo_library_presets.cc    |  2 +-
 .../editors/gpencil_legacy/annotate_paint.cc  |  2 +-
 .../editors/gpencil_legacy/drawgpencil.cc     |  2 +-
 .../gpencil_legacy/editaction_gpencil.cc      |  2 +-
 .../gpencil_legacy/gpencil_add_blank.cc       |  2 +-
 .../gpencil_legacy/gpencil_add_lineart.cc     |  4 +-
 .../gpencil_legacy/gpencil_add_monkey.cc      |  2 +-
 .../gpencil_legacy/gpencil_add_stroke.cc      |  2 +-
 .../gpencil_legacy/gpencil_armature.cc        |  4 +-
 .../gpencil_legacy/gpencil_bake_animation.cc  |  4 +-
 .../editors/gpencil_legacy/gpencil_convert.cc |  4 +-
 .../editors/gpencil_legacy/gpencil_data.cc    |  6 +--
 .../editors/gpencil_legacy/gpencil_edit.cc    |  6 +--
 .../gpencil_legacy/gpencil_edit_curve.cc      |  2 +-
 .../editors/gpencil_legacy/gpencil_fill.cc    |  4 +-
 .../gpencil_legacy/gpencil_interpolate.cc     |  2 +-
 .../editors/gpencil_legacy/gpencil_merge.cc   |  2 +-
 .../editors/gpencil_legacy/gpencil_mesh.cc    |  4 +-
 .../gpencil_legacy/gpencil_ops_versioning.cc  |  4 +-
 .../editors/gpencil_legacy/gpencil_paint.cc   |  4 +-
 .../gpencil_legacy/gpencil_primitive.cc       |  4 +-
 .../gpencil_legacy/gpencil_sculpt_paint.cc    |  4 +-
 .../editors/gpencil_legacy/gpencil_select.cc  |  4 +-
 .../gpencil_legacy/gpencil_trace_ops.cc       |  4 +-
 .../editors/gpencil_legacy/gpencil_undo.cc    |  2 +-
 .../editors/gpencil_legacy/gpencil_utils.cc   |  4 +-
 .../editors/gpencil_legacy/gpencil_uv.cc      |  4 +-
 .../gpencil_legacy/gpencil_vertex_ops.cc      |  2 +-
 .../gpencil_legacy/gpencil_vertex_paint.cc    |  4 +-
 .../gpencil_legacy/gpencil_weight_paint.cc    |  4 +-
 .../intern/grease_pencil_edit.cc              |  2 +-
 .../intern/grease_pencil_frames.cc            |  2 +-
 .../intern/grease_pencil_layers.cc            |  2 +-
 .../intern/grease_pencil_select.cc            |  2 +-
 .../eyedroppers/eyedropper_driver.cc          |  4 +-
 .../eyedroppers/eyedropper_gpencil_color.cc   |  4 +-
 source/blender/editors/interface/interface.cc |  2 +-
 .../editors/interface/interface_anim.cc       |  4 +-
 .../editors/interface/interface_ops.cc        |  2 +-
 .../editors/interface/interface_templates.cc  |  6 +--
 source/blender/editors/io/io_alembic.cc       |  2 +-
 source/blender/editors/io/io_cache.cc         |  2 +-
 source/blender/editors/io/io_collada.cc       |  2 +-
 .../blender/editors/io/io_gpencil_export.cc   |  4 +-
 .../blender/editors/io/io_gpencil_import.cc   |  4 +-
 source/blender/editors/io/io_obj.cc           |  2 +-
 source/blender/editors/io/io_ply_ops.cc       |  2 +-
 source/blender/editors/io/io_usd.cc           |  2 +-
 .../editors/lattice/editlattice_select.cc     |  2 +-
 .../editors/lattice/editlattice_tools.cc      |  2 +-
 .../editors/lattice/editlattice_undo.cc       |  2 +-
 source/blender/editors/mask/mask_add.cc       |  2 +-
 source/blender/editors/mask/mask_draw.cc      |  2 +-
 source/blender/editors/mask/mask_ops.cc       |  4 +-
 source/blender/editors/mask/mask_query.cc     |  4 +-
 .../editors/mask/mask_relationships.cc        |  2 +-
 source/blender/editors/mask/mask_select.cc    |  4 +-
 source/blender/editors/mask/mask_shapekey.cc  |  2 +-
 source/blender/editors/mesh/editface.cc       |  4 +-
 .../editors/mesh/editmesh_attribute.cc        |  4 +-
 source/blender/editors/mesh/editmesh_knife.cc |  4 +-
 .../editors/mesh/editmesh_knife_project.cc    |  4 +-
 .../blender/editors/mesh/editmesh_loopcut.cc  |  4 +-
 .../editors/mesh/editmesh_mask_extract.cc     |  4 +-
 source/blender/editors/mesh/editmesh_path.cc  |  2 +-
 .../editors/mesh/editmesh_polybuild.cc        |  2 +-
 .../blender/editors/mesh/editmesh_select.cc   |  4 +-
 source/blender/editors/mesh/editmesh_tools.cc |  4 +-
 source/blender/editors/mesh/editmesh_undo.cc  |  2 +-
 source/blender/editors/mesh/editmesh_utils.cc |  2 +-
 source/blender/editors/mesh/mesh_data.cc      |  2 +-
 source/blender/editors/mesh/meshtools.cc      |  6 +--
 .../editors/metaball/editmball_undo.cc        |  2 +-
 source/blender/editors/metaball/mball_edit.cc |  2 +-
 source/blender/editors/object/object_add.cc   |  6 +--
 source/blender/editors/object/object_bake.cc  |  2 +-
 .../blender/editors/object/object_bake_api.cc |  6 +--
 .../editors/object/object_bake_simulation.cc  |  4 +-
 .../editors/object/object_collection.cc       |  4 +-
 .../editors/object/object_constraint.cc       |  6 +--
 .../editors/object/object_data_transfer.cc    |  4 +-
 .../editors/object/object_data_transform.cc   |  4 +-
 source/blender/editors/object/object_edit.cc  |  4 +-
 .../editors/object/object_gpencil_modifier.cc |  6 +--
 source/blender/editors/object/object_hook.cc  |  6 +--
 .../object/object_light_linking_ops.cc        |  2 +-
 source/blender/editors/object/object_modes.cc |  4 +-
 .../blender/editors/object/object_modifier.cc |  6 +--
 .../editors/object/object_relations.cc        |  6 +--
 .../blender/editors/object/object_remesh.cc   |  4 +-
 .../blender/editors/object/object_select.cc   |  2 +-
 .../editors/object/object_shader_fx.cc        |  6 +--
 .../blender/editors/object/object_shapekey.cc |  6 +--
 .../editors/object/object_transform.cc        |  4 +-
 source/blender/editors/object/object_utils.cc |  2 +-
 .../blender/editors/object/object_vgroup.cc   |  6 +--
 .../editors/physics/dynamicpaint_ops.cc       |  6 +--
 .../blender/editors/physics/particle_boids.cc |  4 +-
 .../blender/editors/physics/particle_edit.cc  |  4 +-
 .../editors/physics/particle_edit_undo.cc     |  2 +-
 .../editors/physics/particle_object.cc        |  6 +--
 .../blender/editors/physics/physics_fluid.cc  |  2 +-
 .../editors/physics/physics_pointcache.cc     |  2 +-
 .../editors/physics/rigidbody_constraint.cc   |  4 +-
 .../editors/physics/rigidbody_object.cc       |  6 +--
 .../editors/physics/rigidbody_world.cc        |  4 +-
 .../blender/editors/render/render_internal.cc |  2 +-
 .../blender/editors/render/render_opengl.cc   |  4 +-
 .../blender/editors/render/render_preview.cc  |  6 +--
 .../blender/editors/render/render_shading.cc  |  6 +--
 .../blender/editors/render/render_update.cc   |  4 +-
 source/blender/editors/scene/scene_edit.cc    |  4 +-
 source/blender/editors/screen/screen_edit.cc  |  2 +-
 source/blender/editors/screen/screen_ops.cc   |  4 +-
 .../editors/sculpt_paint/curves_sculpt_add.cc |  4 +-
 .../sculpt_paint/curves_sculpt_brush.cc       |  2 +-
 .../sculpt_paint/curves_sculpt_comb.cc        |  4 +-
 .../sculpt_paint/curves_sculpt_delete.cc      |  2 +-
 .../sculpt_paint/curves_sculpt_density.cc     |  4 +-
 .../sculpt_paint/curves_sculpt_grow_shrink.cc |  2 +-
 .../editors/sculpt_paint/curves_sculpt_ops.cc |  4 +-
 .../sculpt_paint/curves_sculpt_pinch.cc       |  2 +-
 .../sculpt_paint/curves_sculpt_puff.cc        |  2 +-
 .../curves_sculpt_selection_paint.cc          |  2 +-
 .../sculpt_paint/curves_sculpt_slide.cc       |  4 +-
 .../sculpt_paint/curves_sculpt_smooth.cc      |  2 +-
 .../sculpt_paint/curves_sculpt_snake_hook.cc  |  2 +-
 .../sculpt_paint/grease_pencil_draw_ops.cc    |  2 +-
 .../sculpt_paint/grease_pencil_erase.cc       |  2 +-
 .../sculpt_paint/grease_pencil_paint.cc       |  2 +-
 .../editors/sculpt_paint/paint_cursor.cc      |  2 +-
 .../editors/sculpt_paint/paint_hide.cc        |  2 +-
 .../editors/sculpt_paint/paint_image.cc       |  4 +-
 .../editors/sculpt_paint/paint_image_2d.cc    |  2 +-
 .../editors/sculpt_paint/paint_image_proj.cc  |  4 +-
 .../editors/sculpt_paint/paint_mask.cc        |  2 +-
 .../editors/sculpt_paint/paint_utils.cc       |  4 +-
 .../editors/sculpt_paint/paint_vertex.cc      |  2 +-
 .../sculpt_paint/paint_vertex_color_ops.cc    |  2 +-
 .../editors/sculpt_paint/paint_vertex_proj.cc |  4 +-
 .../sculpt_paint/paint_vertex_weight_ops.cc   |  4 +-
 .../sculpt_paint/paint_vertex_weight_utils.cc |  2 +-
 .../editors/sculpt_paint/paint_weight.cc      |  2 +-
 source/blender/editors/sculpt_paint/sculpt.cc |  2 +-
 .../sculpt_paint/sculpt_automasking.cc        |  2 +-
 .../editors/sculpt_paint/sculpt_cloth.cc      |  4 +-
 .../editors/sculpt_paint/sculpt_detail.cc     |  2 +-
 .../editors/sculpt_paint/sculpt_dyntopo.cc    |  2 +-
 .../editors/sculpt_paint/sculpt_expand.cc     |  2 +-
 .../editors/sculpt_paint/sculpt_face_set.cc   |  2 +-
 .../sculpt_paint/sculpt_filter_color.cc       |  2 +-
 .../sculpt_paint/sculpt_filter_mask.cc        |  2 +-
 .../sculpt_paint/sculpt_filter_mesh.cc        |  2 +-
 .../sculpt_paint/sculpt_mask_expand.cc        |  2 +-
 .../editors/sculpt_paint/sculpt_mask_init.cc  |  2 +-
 .../editors/sculpt_paint/sculpt_ops.cc        |  2 +-
 .../editors/sculpt_paint/sculpt_transform.cc  |  2 +-
 .../editors/sculpt_paint/sculpt_undo.cc       |  2 +-
 .../blender/editors/sculpt_paint/sculpt_uv.cc |  2 +-
 source/blender/editors/sound/sound_ops.cc     |  2 +-
 .../editors/space_action/action_data.cc       |  2 +-
 .../editors/space_action/action_edit.cc       |  2 +-
 .../editors/space_clip/clip_buttons.cc        |  2 +-
 .../editors/space_clip/clip_graph_ops.cc      |  2 +-
 source/blender/editors/space_clip/clip_ops.cc |  4 +-
 .../blender/editors/space_clip/clip_utils.cc  |  4 +-
 .../editors/space_clip/tracking_ops.cc        |  2 +-
 .../editors/space_clip/tracking_ops_orient.cc |  4 +-
 .../editors/space_clip/tracking_ops_plane.cc  |  2 +-
 .../editors/space_clip/tracking_ops_solve.cc  |  2 +-
 .../space_clip/tracking_ops_stabilize.cc      |  2 +-
 .../editors/space_clip/tracking_ops_track.cc  |  2 +-
 .../editors/space_clip/tracking_select.cc     |  2 +-
 .../editors/space_graph/graph_buttons.cc      |  4 +-
 .../blender/editors/space_graph/graph_edit.cc |  2 +-
 .../blender/editors/space_graph/graph_ops.cc  |  2 +-
 .../blender/editors/space_image/image_edit.cc |  2 +-
 .../blender/editors/space_image/image_ops.cc  |  2 +-
 .../blender/editors/space_image/image_undo.cc |  2 +-
 .../editors/space_image/space_image.cc        |  2 +-
 .../blender/editors/space_info/info_stats.cc  |  2 +-
 .../blender/editors/space_nla/nla_channels.cc |  4 +-
 source/blender/editors/space_nla/nla_edit.cc  |  2 +-
 .../blender/editors/space_node/clipboard.cc   |  2 +-
 .../editors/space_node/link_drag_search.cc    |  2 +-
 source/blender/editors/space_node/node_add.cc |  2 +-
 .../blender/editors/space_node/node_draw.cc   |  2 +-
 .../blender/editors/space_node/node_edit.cc   |  6 +--
 .../blender/editors/space_node/node_group.cc  |  2 +-
 .../editors/space_node/node_relationships.cc  |  2 +-
 .../blender/editors/space_node/node_select.cc |  2 +-
 .../editors/space_node/node_shader_preview.cc |  2 +-
 .../blender/editors/space_node/space_node.cc  |  2 +-
 .../space_outliner/outliner_collections.cc    |  4 +-
 .../space_outliner/outliner_dragdrop.cc       |  4 +-
 .../editors/space_outliner/outliner_draw.cc   |  4 +-
 .../editors/space_outliner/outliner_edit.cc   |  4 +-
 .../editors/space_outliner/outliner_select.cc |  4 +-
 .../editors/space_outliner/outliner_sync.cc   |  2 +-
 .../editors/space_outliner/outliner_tools.cc  |  4 +-
 .../editors/space_sequencer/sequencer_add.cc  |  4 +-
 .../editors/space_sequencer/sequencer_edit.cc |  4 +-
 .../space_sequencer/sequencer_modifier.cc     |  2 +-
 .../space_sequencer/sequencer_retiming.cc     |  2 +-
 .../space_spreadsheet/space_spreadsheet.cc    |  2 +-
 .../spreadsheet_data_source_geometry.cc       |  2 +-
 .../spreadsheet_row_filter.cc                 |  2 +-
 .../editors/space_view3d/drawobject.cc        |  4 +-
 .../editors/space_view3d/space_view3d.cc      |  4 +-
 .../editors/space_view3d/view3d_buttons.cc    |  2 +-
 .../space_view3d/view3d_camera_control.cc     |  2 +-
 .../space_view3d/view3d_cursor_snap.cc        |  2 +-
 .../editors/space_view3d/view3d_draw.cc       |  2 +-
 .../editors/space_view3d/view3d_edit.cc       |  2 +-
 .../space_view3d/view3d_gizmo_camera.cc       |  2 +-
 .../space_view3d/view3d_gizmo_empty.cc        |  2 +-
 .../space_view3d/view3d_gizmo_light.cc        |  2 +-
 .../view3d_gizmo_preselect_type.cc            |  4 +-
 .../space_view3d/view3d_gizmo_ruler.cc        |  2 +-
 .../editors/space_view3d/view3d_header.cc     |  2 +-
 .../editors/space_view3d/view3d_iterators.cc  |  4 +-
 .../editors/space_view3d/view3d_navigate.cc   |  2 +-
 .../space_view3d/view3d_navigate_fly.cc       |  2 +-
 .../view3d_navigate_smoothview.cc             |  2 +-
 .../space_view3d/view3d_navigate_view_all.cc  |  2 +-
 .../space_view3d/view3d_navigate_view_axis.cc |  2 +-
 .../view3d_navigate_view_camera.cc            |  2 +-
 .../view3d_navigate_view_center_cursor.cc     |  2 +-
 .../view3d_navigate_view_center_pick.cc       |  2 +-
 .../view3d_navigate_view_dolly.cc             |  2 +-
 .../space_view3d/view3d_navigate_view_ndof.cc |  2 +-
 .../view3d_navigate_view_orbit.cc             |  2 +-
 .../space_view3d/view3d_navigate_view_pan.cc  |  2 +-
 .../space_view3d/view3d_navigate_view_roll.cc |  2 +-
 .../space_view3d/view3d_navigate_view_zoom.cc |  2 +-
 .../space_view3d/view3d_navigate_walk.cc      |  2 +-
 .../view3d_navigate_zoom_border.cc            |  2 +-
 .../editors/space_view3d/view3d_select.cc     |  4 +-
 .../editors/space_view3d/view3d_snap.cc       |  4 +-
 .../editors/space_view3d/view3d_utils.cc      |  4 +-
 .../editors/space_view3d/view3d_view.cc       |  2 +-
 source/blender/editors/transform/transform.hh |  2 +-
 .../editors/transform/transform_convert.cc    |  2 +-
 .../transform/transform_convert_armature.cc   |  4 +-
 .../transform/transform_convert_mesh.cc       |  2 +-
 .../transform/transform_convert_mesh_skin.cc  |  2 +-
 .../transform_convert_mesh_vert_cdata.cc      |  2 +-
 .../transform/transform_convert_object.cc     |  2 +-
 .../transform/transform_snap_object.cc        |  2 +-
 .../transform_snap_object_editmesh.cc         |  2 +-
 source/blender/editors/undo/memfile_undo.cc   |  2 +-
 source/blender/editors/util/ed_transverts.cc  |  2 +-
 source/blender/editors/util/ed_util.cc        |  2 +-
 source/blender/editors/util/ed_viewer_path.cc |  2 +-
 .../blender/editors/uvedit/uvedit_buttons.cc  |  2 +-
 .../editors/uvedit/uvedit_clipboard.cc        |  2 +-
 source/blender/editors/uvedit/uvedit_ops.cc   |  4 +-
 source/blender/editors/uvedit/uvedit_path.cc  |  4 +-
 source/blender/editors/uvedit/uvedit_rip.cc   |  2 +-
 .../blender/editors/uvedit/uvedit_select.cc   |  4 +-
 .../editors/uvedit/uvedit_smart_stitch.cc     |  2 +-
 .../editors/uvedit/uvedit_unwrap_ops.cc       |  2 +-
 .../blender_interface/BlenderFileLoader.h     |  2 +-
 .../BlenderStrokeRenderer.cpp                 |  4 +-
 .../blender_interface/FRS_freestyle.cpp       |  2 +-
 .../intern/MOD_gpencil_legacy_armature.cc     |  6 +--
 .../intern/MOD_gpencil_legacy_array.cc        |  6 +--
 .../intern/MOD_gpencil_legacy_build.cc        |  4 +-
 .../intern/MOD_gpencil_legacy_color.cc        |  2 +-
 .../intern/MOD_gpencil_legacy_dash.cc         |  4 +-
 .../intern/MOD_gpencil_legacy_envelope.cc     |  6 +--
 .../intern/MOD_gpencil_legacy_hook.cc         |  6 +--
 .../intern/MOD_gpencil_legacy_lattice.cc      |  6 +--
 .../intern/MOD_gpencil_legacy_length.cc       |  4 +-
 .../intern/MOD_gpencil_legacy_lineart.cc      |  4 +-
 .../intern/MOD_gpencil_legacy_mirror.cc       |  6 +--
 .../intern/MOD_gpencil_legacy_multiply.cc     |  6 +--
 .../intern/MOD_gpencil_legacy_noise.cc        |  4 +-
 .../intern/MOD_gpencil_legacy_offset.cc       |  6 +--
 .../intern/MOD_gpencil_legacy_opacity.cc      |  2 +-
 .../intern/MOD_gpencil_legacy_outline.cc      |  4 +-
 .../intern/MOD_gpencil_legacy_shrinkwrap.cc   |  6 +--
 .../intern/MOD_gpencil_legacy_simplify.cc     |  2 +-
 .../intern/MOD_gpencil_legacy_smooth.cc       |  2 +-
 .../intern/MOD_gpencil_legacy_subdiv.cc       |  2 +-
 .../intern/MOD_gpencil_legacy_texture.cc      |  2 +-
 .../intern/MOD_gpencil_legacy_thick.cc        |  2 +-
 .../intern/MOD_gpencil_legacy_time.cc         |  2 +-
 .../intern/MOD_gpencil_legacy_tint.cc         |  4 +-
 .../intern/MOD_gpencil_legacy_util.cc         |  2 +-
 .../intern/MOD_gpencil_legacy_weight_angle.cc |  4 +-
 .../MOD_gpencil_legacy_weight_proximity.cc    |  4 +-
 .../intern/lineart/lineart_cpu.cc             |  2 +-
 .../intern/lineart/lineart_ops.cc             |  2 +-
 .../intern/lineart/lineart_shadow.cc          |  6 ++-
 source/blender/io/alembic/ABC_alembic.h       |  2 +-
 .../io/alembic/exporter/abc_archive.cc        |  2 +-
 .../io/alembic/exporter/abc_export_capi.cc    |  6 +--
 .../exporter/abc_hierarchy_iterator.cc        |  2 +-
 .../alembic/exporter/abc_subdiv_disabler.cc   |  4 +-
 .../alembic/exporter/abc_writer_abstract.cc   |  2 +-
 .../io/alembic/exporter/abc_writer_abstract.h |  2 +-
 .../io/alembic/exporter/abc_writer_mesh.cc    |  2 +-
 .../io/alembic/exporter/abc_writer_points.cc  |  2 +-
 .../blender/io/alembic/intern/alembic_capi.cc |  4 +-
 .../io/alembic/tests/abc_export_test.cc       |  2 +-
 .../io/collada/AnimationClipExporter.h        |  2 +-
 .../blender/io/collada/ArmatureImporter.cpp   |  2 +-
 source/blender/io/collada/BlenderContext.h    |  4 +-
 .../blender/io/collada/DocumentImporter.cpp   |  4 +-
 source/blender/io/collada/collada.cpp         |  4 +-
 source/blender/io/collada/collada_utils.cpp   |  4 +-
 source/blender/io/collada/collada_utils.h     |  2 +-
 .../common/IO_abstract_hierarchy_iterator.h   |  2 +-
 .../intern/abstract_hierarchy_iterator.cc     |  2 +-
 .../abstract_hierarchy_iterator_test.cc       |  4 +-
 .../io/gpencil/intern/gpencil_io_base.cc      |  4 +-
 .../io/gpencil/intern/gpencil_io_capi.cc      |  4 +-
 .../gpencil/intern/gpencil_io_export_pdf.cc   |  4 +-
 .../gpencil/intern/gpencil_io_export_svg.cc   |  4 +-
 .../gpencil/intern/gpencil_io_import_svg.cc   |  4 +-
 .../ply/exporter/ply_export_load_plydata.cc   |  2 +-
 source/blender/io/ply/importer/ply_import.cc  |  4 +-
 .../io/ply/tests/io_ply_exporter_test.cc      |  2 +-
 source/blender/io/stl/importer/stl_import.cc  |  4 +-
 .../io/usd/hydra/hydra_scene_delegate.cc      |  2 +-
 .../io/usd/hydra/hydra_scene_delegate.h       |  2 +-
 source/blender/io/usd/hydra/instancer.cc      |  2 +-
 source/blender/io/usd/hydra/material.cc       |  2 +-
 source/blender/io/usd/hydra/object.cc         |  2 +-
 .../io/usd/hydra/usd_scene_delegate.cc        |  2 +-
 .../blender/io/usd/intern/usd_capi_export.cc  |  6 +--
 .../blender/io/usd/intern/usd_capi_import.cc  |  6 +--
 .../io/usd/intern/usd_hierarchy_iterator.cc   |  2 +-
 .../io/usd/intern/usd_writer_abstract.h       |  2 +-
 .../blender/io/usd/intern/usd_writer_mesh.cc  |  2 +-
 .../blender/io/usd/tests/usd_curves_test.cc   |  2 +-
 .../blender/io/usd/tests/usd_export_test.cc   |  2 +-
 .../io/usd/tests/usd_usdz_export_test.cc      |  2 +-
 source/blender/io/usd/usd.h                   |  2 +-
 .../io/wavefront_obj/IO_wavefront_obj.hh      |  2 +-
 .../wavefront_obj/exporter/obj_export_mesh.cc |  2 +-
 .../exporter/obj_export_nurbs.cc              |  4 +-
 .../io/wavefront_obj/exporter/obj_exporter.cc |  2 +-
 .../io/wavefront_obj/importer/obj_importer.cc |  2 +-
 .../wavefront_obj/tests/obj_exporter_tests.cc |  2 +-
 .../wavefront_obj/tests/obj_importer_tests.cc |  4 +-
 source/blender/makesrna/intern/rna_ID.cc      |  6 +--
 source/blender/makesrna/intern/rna_access.cc  |  4 +-
 source/blender/makesrna/intern/rna_action.cc  |  2 +-
 .../blender/makesrna/intern/rna_animation.cc  |  4 +-
 .../blender/makesrna/intern/rna_armature.cc   |  4 +-
 .../blender/makesrna/intern/rna_attribute.cc  |  2 +-
 source/blender/makesrna/intern/rna_boid.cc    |  4 +-
 .../blender/makesrna/intern/rna_cachefile.cc  |  4 +-
 source/blender/makesrna/intern/rna_camera.cc  |  4 +-
 source/blender/makesrna/intern/rna_cloth.cc   |  4 +-
 .../blender/makesrna/intern/rna_collection.cc |  6 +--
 source/blender/makesrna/intern/rna_color.cc   |  2 +-
 source/blender/makesrna/intern/rna_curve.cc   |  4 +-
 source/blender/makesrna/intern/rna_curves.cc  |  2 +-
 .../blender/makesrna/intern/rna_depsgraph.cc  |  8 ++--
 .../makesrna/intern/rna_dynamicpaint.cc       |  4 +-
 source/blender/makesrna/intern/rna_fcurve.cc  |  4 +-
 source/blender/makesrna/intern/rna_fluid.cc   |  4 +-
 .../makesrna/intern/rna_gpencil_legacy.cc     |  4 +-
 .../intern/rna_gpencil_legacy_modifier.cc     |  4 +-
 .../makesrna/intern/rna_grease_pencil.cc      |  2 +-
 source/blender/makesrna/intern/rna_image.cc   |  4 +-
 source/blender/makesrna/intern/rna_key.cc     |  2 +-
 source/blender/makesrna/intern/rna_lattice.cc |  2 +-
 source/blender/makesrna/intern/rna_layer.cc   |  4 +-
 source/blender/makesrna/intern/rna_light.cc   |  2 +-
 .../blender/makesrna/intern/rna_lightprobe.cc |  2 +-
 .../blender/makesrna/intern/rna_linestyle.cc  |  2 +-
 .../blender/makesrna/intern/rna_main_api.cc   |  4 +-
 source/blender/makesrna/intern/rna_mask.cc    |  2 +-
 .../blender/makesrna/intern/rna_material.cc   |  4 +-
 source/blender/makesrna/intern/rna_mesh.cc    |  2 +-
 .../blender/makesrna/intern/rna_mesh_api.cc   |  2 +-
 source/blender/makesrna/intern/rna_meta.cc    |  2 +-
 .../blender/makesrna/intern/rna_modifier.cc   |  6 +--
 .../blender/makesrna/intern/rna_movieclip.cc  |  2 +-
 source/blender/makesrna/intern/rna_nla.cc     |  4 +-
 .../makesrna/intern/rna_node_socket.cc        |  2 +-
 .../blender/makesrna/intern/rna_nodetree.cc   |  4 +-
 source/blender/makesrna/intern/rna_object.cc  |  6 +--
 .../blender/makesrna/intern/rna_object_api.cc |  4 +-
 .../makesrna/intern/rna_object_force.cc       |  4 +-
 .../blender/makesrna/intern/rna_particle.cc   |  4 +-
 .../blender/makesrna/intern/rna_pointcloud.cc |  2 +-
 source/blender/makesrna/intern/rna_pose.cc    |  4 +-
 source/blender/makesrna/intern/rna_render.cc  |  4 +-
 .../blender/makesrna/intern/rna_rigidbody.cc  |  2 +-
 source/blender/makesrna/intern/rna_scene.cc   |  6 +--
 .../blender/makesrna/intern/rna_scene_api.cc  |  2 +-
 source/blender/makesrna/intern/rna_screen.cc  |  2 +-
 .../makesrna/intern/rna_sculpt_paint.cc       |  2 +-
 .../blender/makesrna/intern/rna_sequencer.cc  |  4 +-
 .../blender/makesrna/intern/rna_shader_fx.cc  |  4 +-
 source/blender/makesrna/intern/rna_sound.cc   |  2 +-
 source/blender/makesrna/intern/rna_space.cc   |  4 +-
 source/blender/makesrna/intern/rna_texture.cc |  4 +-
 .../blender/makesrna/intern/rna_timeline.cc   |  2 +-
 .../blender/makesrna/intern/rna_tracking.cc   |  2 +-
 source/blender/makesrna/intern/rna_userdef.cc |  2 +-
 source/blender/makesrna/intern/rna_vfont.cc   |  2 +-
 source/blender/makesrna/intern/rna_volume.cc  |  4 +-
 source/blender/makesrna/intern/rna_world.cc   |  4 +-
 .../blender/modifiers/intern/MOD_armature.cc  |  2 +-
 source/blender/modifiers/intern/MOD_array.cc  |  4 +-
 source/blender/modifiers/intern/MOD_bevel.cc  |  2 +-
 .../blender/modifiers/intern/MOD_boolean.cc   |  2 +-
 source/blender/modifiers/intern/MOD_build.cc  |  2 +-
 source/blender/modifiers/intern/MOD_cast.cc   |  2 +-
 source/blender/modifiers/intern/MOD_cloth.cc  |  4 +-
 .../blender/modifiers/intern/MOD_collision.cc |  2 +-
 .../modifiers/intern/MOD_correctivesmooth.cc  |  2 +-
 source/blender/modifiers/intern/MOD_curve.cc  |  6 +--
 .../modifiers/intern/MOD_datatransfer.cc      |  2 +-
 .../blender/modifiers/intern/MOD_decimate.cc  |  2 +-
 .../blender/modifiers/intern/MOD_displace.cc  |  4 +-
 .../modifiers/intern/MOD_dynamicpaint.cc      |  8 ++--
 .../blender/modifiers/intern/MOD_explode.cc   |  2 +-
 source/blender/modifiers/intern/MOD_fluid.cc  |  8 ++--
 source/blender/modifiers/intern/MOD_hook.cc   |  2 +-
 .../blender/modifiers/intern/MOD_lattice.cc   |  2 +-
 source/blender/modifiers/intern/MOD_mask.cc   |  4 +-
 .../modifiers/intern/MOD_mesh_to_volume.cc    |  2 +-
 .../blender/modifiers/intern/MOD_meshcache.cc |  2 +-
 .../modifiers/intern/MOD_meshdeform.cc        |  4 +-
 .../modifiers/intern/MOD_meshsequencecache.cc |  4 +-
 source/blender/modifiers/intern/MOD_mirror.cc |  4 +-
 .../blender/modifiers/intern/MOD_multires.cc  |  2 +-
 source/blender/modifiers/intern/MOD_nodes.cc  |  4 +-
 .../modifiers/intern/MOD_normal_edit.cc       |  2 +-
 source/blender/modifiers/intern/MOD_ocean.cc  |  2 +-
 .../modifiers/intern/MOD_particleinstance.cc  |  4 +-
 .../modifiers/intern/MOD_particlesystem.cc    |  2 +-
 source/blender/modifiers/intern/MOD_screw.cc  |  4 +-
 .../modifiers/intern/MOD_shrinkwrap.cc        |  2 +-
 .../modifiers/intern/MOD_simpledeform.cc      |  2 +-
 .../blender/modifiers/intern/MOD_softbody.cc  |  8 ++--
 .../blender/modifiers/intern/MOD_subsurf.cc   |  4 +-
 .../blender/modifiers/intern/MOD_surface.cc   |  4 +-
 .../modifiers/intern/MOD_surfacedeform.cc     |  4 +-
 .../blender/modifiers/intern/MOD_ui_common.hh |  2 +-
 source/blender/modifiers/intern/MOD_util.cc   |  4 +-
 source/blender/modifiers/intern/MOD_util.hh   |  2 +-
 .../blender/modifiers/intern/MOD_uvproject.cc |  6 +--
 source/blender/modifiers/intern/MOD_uvwarp.cc |  2 +-
 .../modifiers/intern/MOD_volume_displace.cc   |  4 +-
 .../modifiers/intern/MOD_volume_to_mesh.cc    |  2 +-
 source/blender/modifiers/intern/MOD_warp.cc   |  4 +-
 source/blender/modifiers/intern/MOD_wave.cc   |  4 +-
 .../modifiers/intern/MOD_weightvg_util.cc     |  4 +-
 .../modifiers/intern/MOD_weightvgedit.cc      |  4 +-
 .../modifiers/intern/MOD_weightvgmix.cc       |  4 +-
 .../modifiers/intern/MOD_weightvgproximity.cc |  4 +-
 source/blender/modifiers/intern/MOD_weld.cc   |  2 +-
 .../composite/nodes/node_composite_image.cc   |  2 +-
 .../node_geo_deform_curves_on_surface.cc      |  2 +-
 .../node_geo_distribute_points_in_volume.cc   |  2 +-
 .../nodes/node_geo_input_scene_time.cc        |  2 +-
 .../geometry/nodes/node_geo_is_viewport.cc    |  2 +-
 .../nodes/node_geo_mean_filter_sdf_volume.cc  |  2 +-
 .../nodes/node_geo_mesh_to_sdf_volume.cc      |  2 +-
 .../geometry/nodes/node_geo_mesh_to_volume.cc |  2 +-
 .../nodes/node_geo_offset_sdf_volume.cc       |  2 +-
 .../geometry/nodes/node_geo_repeat_input.cc   |  2 +-
 .../geometry/nodes/node_geo_repeat_output.cc  |  2 +-
 .../geometry/nodes/node_geo_sample_volume.cc  |  2 +-
 .../geometry/nodes/node_geo_set_position.cc   |  2 +-
 .../nodes/node_geo_simulation_input.cc        |  2 +-
 .../nodes/node_geo_simulation_output.cc       |  2 +-
 .../nodes/node_geo_transform_geometry.cc      |  2 +-
 .../geometry/nodes/node_geo_volume_to_mesh.cc |  2 +-
 .../intern/geometry_nodes_lazy_function.cc    |  2 +-
 .../nodes/intern/node_geometry_exec.cc        |  2 +-
 .../shader/nodes/node_shader_normal_map.cc    |  2 +-
 .../nodes/shader/nodes/node_shader_tangent.cc |  2 +-
 .../nodes/shader/nodes/node_shader_uvmap.cc   |  2 +-
 .../shader/nodes/node_shader_vertex_color.cc  |  2 +-
 .../nodes/texture/node_texture_tree.cc        |  2 +-
 source/blender/python/bmesh/bmesh_py_types.cc |  4 +-
 source/blender/python/intern/bpy_rna.cc       |  2 +-
 source/blender/python/intern/bpy_rna_anim.cc  |  4 +-
 .../python/mathutils/mathutils_bvhtree.cc     |  2 +-
 source/blender/render/hydra/engine.cc         |  2 +-
 source/blender/render/hydra/final_engine.cc   |  2 +-
 .../blender/render/hydra/viewport_engine.cc   |  2 +-
 source/blender/render/intern/compositor.cc    |  2 +-
 source/blender/render/intern/engine.cc        |  6 +--
 source/blender/render/intern/multires_bake.cc |  2 +-
 source/blender/render/intern/pipeline.cc      |  8 ++--
 .../render/intern/texture_pointdensity.cc     |  4 +-
 source/blender/sequencer/intern/animation.cc  |  2 +-
 source/blender/sequencer/intern/prefetch.cc   |  8 ++--
 source/blender/sequencer/intern/proxy.cc      |  2 +-
 source/blender/sequencer/intern/render.cc     |  4 +-
 source/blender/sequencer/intern/sequencer.cc  |  2 +-
 source/blender/sequencer/intern/strip_add.cc  |  2 +-
 .../sequencer/intern/strip_relations.cc       |  4 +-
 .../shader_fx/intern/FX_shader_shadow.cc      |  4 +-
 .../shader_fx/intern/FX_shader_swirl.cc       |  4 +-
 .../simulation/intern/SIM_mass_spring.cc      |  4 +-
 .../gizmo/intern/wm_gizmo_map.cc              |  2 +-
 .../windowmanager/intern/wm_event_query.cc    |  2 +-
 .../windowmanager/intern/wm_event_system.cc   |  4 +-
 .../blender/windowmanager/intern/wm_files.cc  |  2 +-
 .../windowmanager/intern/wm_files_link.cc     |  4 +-
 .../windowmanager/intern/wm_init_exit.cc      |  4 +-
 .../windowmanager/intern/wm_playanim.cc       |  2 +-
 .../blender/windowmanager/xr/intern/wm_xr.cc  |  2 +-
 .../xr/intern/wm_xr_operators.cc              |  2 +-
 .../windowmanager/xr/intern/wm_xr_session.cc  |  4 +-
 source/creator/creator.cc                     |  2 +-
 source/creator/creator_args.cc                |  6 +--
 786 files changed, 1387 insertions(+), 1437 deletions(-)
 rename source/blender/depsgraph/{DEG_depsgraph.h => DEG_depsgraph.hh} (99%)
 rename source/blender/depsgraph/{DEG_depsgraph_build.h => DEG_depsgraph_build.hh} (98%)
 rename source/blender/depsgraph/{DEG_depsgraph_debug.h => DEG_depsgraph_debug.hh} (96%)
 delete mode 100644 source/blender/depsgraph/DEG_depsgraph_light_linking.h
 rename source/blender/depsgraph/{DEG_depsgraph_physics.h => DEG_depsgraph_physics.hh} (94%)
 rename source/blender/depsgraph/{DEG_depsgraph_query.h => DEG_depsgraph_query.hh} (98%)
 rename source/blender/depsgraph/intern/{depsgraph.h => depsgraph.hh} (97%)
 rename source/blender/depsgraph/intern/{depsgraph_light_linking.h => depsgraph_light_linking.hh} (100%)
 rename source/blender/depsgraph/intern/{depsgraph_physics.h => depsgraph_physics.hh} (100%)
 rename source/blender/depsgraph/intern/{depsgraph_registry.h => depsgraph_registry.hh} (91%)
 rename source/blender/depsgraph/intern/{depsgraph_relation.h => depsgraph_relation.hh} (100%)
 rename source/blender/depsgraph/intern/{depsgraph_tag.h => depsgraph_tag.hh} (96%)
 rename source/blender/depsgraph/intern/{depsgraph_type.h => depsgraph_type.hh} (100%)
 rename source/blender/depsgraph/intern/{depsgraph_update.h => depsgraph_update.hh} (100%)
 rename source/blender/depsgraph/intern/node/{deg_node.h => deg_node.hh} (98%)
 rename source/blender/depsgraph/intern/node/{deg_node_component.h => deg_node_component.hh} (98%)
 rename source/blender/depsgraph/intern/node/{deg_node_factory.h => deg_node_factory.hh} (89%)
 rename source/blender/depsgraph/intern/node/{deg_node_factory_impl.h => deg_node_factory_impl.hh} (96%)
 rename source/blender/depsgraph/intern/node/{deg_node_id.h => deg_node_id.hh} (99%)
 rename source/blender/depsgraph/intern/node/{deg_node_operation.h => deg_node_operation.hh} (99%)
 rename source/blender/depsgraph/intern/node/{deg_node_time.h => deg_node_time.hh} (93%)

diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc
index fac701f50d1..b1180d16960 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.cc
+++ b/source/blender/blenkernel/intern/DerivedMesh.cc
@@ -61,8 +61,8 @@
 #include "BLI_sys_types.h" /* for intptr_t support */
 
 #include "BKE_shrinkwrap.h"
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "CLG_log.h"
 
diff --git a/source/blender/blenkernel/intern/action.cc b/source/blender/blenkernel/intern/action.cc
index 4bd54c0d8a9..42505893ac1 100644
--- a/source/blender/blenkernel/intern/action.cc
+++ b/source/blender/blenkernel/intern/action.cc
@@ -51,8 +51,8 @@
 #include "BKE_object.h"
 #include "BKE_preview_image.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "BIK_api.h"
 
diff --git a/source/blender/blenkernel/intern/action_mirror.cc b/source/blender/blenkernel/intern/action_mirror.cc
index 7e4ab901970..86d3350397e 100644
--- a/source/blender/blenkernel/intern/action_mirror.cc
+++ b/source/blender/blenkernel/intern/action_mirror.cc
@@ -27,7 +27,7 @@
 #include "BKE_armature.h"
 #include "BKE_fcurve.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Flip the Action (Armature/Pose Objects)
diff --git a/source/blender/blenkernel/intern/anim_data.cc b/source/blender/blenkernel/intern/anim_data.cc
index d7d4133f05a..78f95489a72 100644
--- a/source/blender/blenkernel/intern/anim_data.cc
+++ b/source/blender/blenkernel/intern/anim_data.cc
@@ -39,7 +39,7 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/anim_sys.cc b/source/blender/blenkernel/intern/anim_sys.cc
index e38ee701852..ba595a47e5d 100644
--- a/source/blender/blenkernel/intern/anim_sys.cc
+++ b/source/blender/blenkernel/intern/anim_sys.cc
@@ -50,8 +50,8 @@
 #include "BKE_report.h"
 #include "BKE_texture.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
diff --git a/source/blender/blenkernel/intern/armature.cc b/source/blender/blenkernel/intern/armature.cc
index f5d131839c0..d09d55c6f9f 100644
--- a/source/blender/blenkernel/intern/armature.cc
+++ b/source/blender/blenkernel/intern/armature.cc
@@ -50,8 +50,8 @@
 
 #include "ANIM_bone_collections.h"
 
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BIK_api.h"
 
diff --git a/source/blender/blenkernel/intern/armature_deform.cc b/source/blender/blenkernel/intern/armature_deform.cc
index e12fb2a294d..d102260217e 100644
--- a/source/blender/blenkernel/intern/armature_deform.cc
+++ b/source/blender/blenkernel/intern/armature_deform.cc
@@ -40,7 +40,7 @@
 #include "BKE_lattice.h"
 #include "BKE_mesh.hh"
 
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_build.hh"
 
 #include "CLG_log.h"
 
diff --git a/source/blender/blenkernel/intern/armature_update.cc b/source/blender/blenkernel/intern/armature_update.cc
index 294b28d83e0..161f6907ce5 100644
--- a/source/blender/blenkernel/intern/armature_update.cc
+++ b/source/blender/blenkernel/intern/armature_update.cc
@@ -30,7 +30,7 @@
 
 #include "BIK_api.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 /* ********************** SPLINE IK SOLVER ******************* */
 
diff --git a/source/blender/blenkernel/intern/blender.cc b/source/blender/blenkernel/intern/blender.cc
index 4bfa5a0475e..bae593f44f2 100644
--- a/source/blender/blenkernel/intern/blender.cc
+++ b/source/blender/blenkernel/intern/blender.cc
@@ -40,7 +40,7 @@
 #include "BKE_screen.h"
 #include "BKE_studiolight.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RE_pipeline.h"
 #include "RE_texture.h"
diff --git a/source/blender/blenkernel/intern/blender_copybuffer.cc b/source/blender/blenkernel/intern/blender_copybuffer.cc
index 40315e75957..448e43bc1e5 100644
--- a/source/blender/blenkernel/intern/blender_copybuffer.cc
+++ b/source/blender/blenkernel/intern/blender_copybuffer.cc
@@ -34,8 +34,8 @@
 #include "BKE_main.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "BLO_readfile.h"
 #include "BLO_writefile.hh"
diff --git a/source/blender/blenkernel/intern/blender_undo.cc b/source/blender/blenkernel/intern/blender_undo.cc
index 1768c3c90f5..23c0205bc81 100644
--- a/source/blender/blenkernel/intern/blender_undo.cc
+++ b/source/blender/blenkernel/intern/blender_undo.cc
@@ -42,7 +42,7 @@
 #include "BLO_undofile.hh"
 #include "BLO_writefile.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Global Undo
diff --git a/source/blender/blenkernel/intern/bpath.cc b/source/blender/blenkernel/intern/bpath.cc
index 4d6efb305ab..88020c12d3b 100644
--- a/source/blender/blenkernel/intern/bpath.cc
+++ b/source/blender/blenkernel/intern/bpath.cc
@@ -54,7 +54,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BKE_idtype.h"
 #include "BKE_image.h"
diff --git a/source/blender/blenkernel/intern/cachefile.cc b/source/blender/blenkernel/intern/cachefile.cc
index f673b454f8c..08bb7761bb6 100644
--- a/source/blender/blenkernel/intern/cachefile.cc
+++ b/source/blender/blenkernel/intern/cachefile.cc
@@ -33,7 +33,7 @@
 #include "BKE_modifier.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "RE_engine.h"
 
diff --git a/source/blender/blenkernel/intern/camera.cc b/source/blender/blenkernel/intern/camera.cc
index 28a3766e863..41e75f59b25 100644
--- a/source/blender/blenkernel/intern/camera.cc
+++ b/source/blender/blenkernel/intern/camera.cc
@@ -43,7 +43,7 @@
 
 #include "BLT_translation.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/cloth.cc b/source/blender/blenkernel/intern/cloth.cc
index f71885523c1..c50c0ef928c 100644
--- a/source/blender/blenkernel/intern/cloth.cc
+++ b/source/blender/blenkernel/intern/cloth.cc
@@ -22,8 +22,8 @@
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BKE_bvhutils.h"
 #include "BKE_cloth.hh"
diff --git a/source/blender/blenkernel/intern/collection.cc b/source/blender/blenkernel/intern/collection.cc
index b0eec0f036a..cd726587270 100644
--- a/source/blender/blenkernel/intern/collection.cc
+++ b/source/blender/blenkernel/intern/collection.cc
@@ -43,8 +43,8 @@
 #include "DNA_rigidbody_types.h"
 #include "DNA_scene_types.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/collision.cc b/source/blender/blenkernel/intern/collision.cc
index 257ed8924d5..bf633e784e0 100644
--- a/source/blender/blenkernel/intern/collision.cc
+++ b/source/blender/blenkernel/intern/collision.cc
@@ -34,9 +34,9 @@
 #include "BKE_collision.h"
 #include "BLI_kdopbvh.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_physics.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_physics.hh"
+#include "DEG_depsgraph_query.hh"
 
 #ifdef WITH_ELTOPO
 #  include "eltopo-capi.h"
diff --git a/source/blender/blenkernel/intern/constraint.cc b/source/blender/blenkernel/intern/constraint.cc
index a78ba807824..43183eeaa94 100644
--- a/source/blender/blenkernel/intern/constraint.cc
+++ b/source/blender/blenkernel/intern/constraint.cc
@@ -70,8 +70,8 @@
 
 #include "BIK_api.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/context.cc b/source/blender/blenkernel/intern/context.cc
index 005df9a7c9c..a7d6e4138f7 100644
--- a/source/blender/blenkernel/intern/context.cc
+++ b/source/blender/blenkernel/intern/context.cc
@@ -23,7 +23,7 @@
 #include "DNA_windowmanager_types.h"
 #include "DNA_workspace_types.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BLI_listbase.h"
 #include "BLI_string.h"
diff --git a/source/blender/blenkernel/intern/crazyspace.cc b/source/blender/blenkernel/intern/crazyspace.cc
index be79f5d5227..6a92514130f 100644
--- a/source/blender/blenkernel/intern/crazyspace.cc
+++ b/source/blender/blenkernel/intern/crazyspace.cc
@@ -34,7 +34,7 @@
 #include "BKE_multires.hh"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 BLI_INLINE void tan_calc_quat_v3(float r_quat[4],
                                  const float co_1[3],
diff --git a/source/blender/blenkernel/intern/curve.cc b/source/blender/blenkernel/intern/curve.cc
index 1942062c920..eb8b60a1408 100644
--- a/source/blender/blenkernel/intern/curve.cc
+++ b/source/blender/blenkernel/intern/curve.cc
@@ -51,8 +51,8 @@
 #include "BKE_object.h"
 #include "BKE_vfont.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "CLG_log.h"
 
diff --git a/source/blender/blenkernel/intern/curve_convert.cc b/source/blender/blenkernel/intern/curve_convert.cc
index eedeeb48b4d..bcdf02e0964 100644
--- a/source/blender/blenkernel/intern/curve_convert.cc
+++ b/source/blender/blenkernel/intern/curve_convert.cc
@@ -18,8 +18,8 @@
 #include "BKE_modifier.h"
 #include "BKE_vfont.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 static Curve *curve_from_font_object(Object *object, Depsgraph *depsgraph)
 {
diff --git a/source/blender/blenkernel/intern/curves.cc b/source/blender/blenkernel/intern/curves.cc
index 2cfa77c3195..115d14de7e5 100644
--- a/source/blender/blenkernel/intern/curves.cc
+++ b/source/blender/blenkernel/intern/curves.cc
@@ -42,7 +42,7 @@
 
 #include "BLT_translation.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/data_transfer.cc b/source/blender/blenkernel/intern/data_transfer.cc
index 313b4851888..ab55b254be3 100644
--- a/source/blender/blenkernel/intern/data_transfer.cc
+++ b/source/blender/blenkernel/intern/data_transfer.cc
@@ -33,7 +33,7 @@
 #include "BKE_object_deform.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "data_transfer_intern.h"
 
diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc
index d04479bb902..53747a09f3a 100644
--- a/source/blender/blenkernel/intern/displist.cc
+++ b/source/blender/blenkernel/intern/displist.cc
@@ -44,8 +44,8 @@
 
 #include "BLI_sys_types.h" /* For #intptr_t support. */
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 using blender::IndexRange;
 
diff --git a/source/blender/blenkernel/intern/dynamicpaint.cc b/source/blender/blenkernel/intern/dynamicpaint.cc
index 220a8e9181f..32ef61b0627 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.cc
+++ b/source/blender/blenkernel/intern/dynamicpaint.cc
@@ -62,8 +62,8 @@
 #include "BKE_pointcache.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 /* for image output */
 #include "IMB_imbuf.h"
diff --git a/source/blender/blenkernel/intern/editmesh.cc b/source/blender/blenkernel/intern/editmesh.cc
index 9248ea94454..88bfe64da70 100644
--- a/source/blender/blenkernel/intern/editmesh.cc
+++ b/source/blender/blenkernel/intern/editmesh.cc
@@ -26,7 +26,7 @@
 #include "BKE_mesh_wrapper.hh"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 BMEditMesh *BKE_editmesh_create(BMesh *bm)
 {
diff --git a/source/blender/blenkernel/intern/effect.cc b/source/blender/blenkernel/intern/effect.cc
index 35ee6b296d0..a9b26dd898a 100644
--- a/source/blender/blenkernel/intern/effect.cc
+++ b/source/blender/blenkernel/intern/effect.cc
@@ -52,9 +52,9 @@
 #include "BKE_particle.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_physics.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_physics.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RE_texture.h"
 
diff --git a/source/blender/blenkernel/intern/fcurve_driver.cc b/source/blender/blenkernel/intern/fcurve_driver.cc
index 513e6a2b299..4c807135286 100644
--- a/source/blender/blenkernel/intern/fcurve_driver.cc
+++ b/source/blender/blenkernel/intern/fcurve_driver.cc
@@ -42,7 +42,7 @@
 
 #include "CLG_log.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #ifdef WITH_PYTHON
 #  include "BPY_extern.h"
diff --git a/source/blender/blenkernel/intern/fluid.cc b/source/blender/blenkernel/intern/fluid.cc
index b68ecd0aecf..7ced57fa061 100644
--- a/source/blender/blenkernel/intern/fluid.cc
+++ b/source/blender/blenkernel/intern/fluid.cc
@@ -66,8 +66,8 @@
 #  include "BKE_scene.h"
 #  include "BKE_texture.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_query.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_query.hh"
 
 #  include "RE_texture.h"
 
diff --git a/source/blender/blenkernel/intern/gpencil_curve_legacy.cc b/source/blender/blenkernel/intern/gpencil_curve_legacy.cc
index 36007ddfde4..7dfde5631b1 100644
--- a/source/blender/blenkernel/intern/gpencil_curve_legacy.cc
+++ b/source/blender/blenkernel/intern/gpencil_curve_legacy.cc
@@ -42,7 +42,7 @@ extern "C" {
 #include "curve_fit_nd.h"
 }
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #define COORD_FITTING_INFLUENCE 20.0f
 
diff --git a/source/blender/blenkernel/intern/gpencil_geom_legacy.cc b/source/blender/blenkernel/intern/gpencil_geom_legacy.cc
index 0299e721f19..085877fc3e1 100644
--- a/source/blender/blenkernel/intern/gpencil_geom_legacy.cc
+++ b/source/blender/blenkernel/intern/gpencil_geom_legacy.cc
@@ -51,7 +51,7 @@
 #include "BKE_mesh.hh"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 using blender::float3;
 using blender::Span;
diff --git a/source/blender/blenkernel/intern/gpencil_legacy.cc b/source/blender/blenkernel/intern/gpencil_legacy.cc
index 9f46c0efc1b..bf1711fc90c 100644
--- a/source/blender/blenkernel/intern/gpencil_legacy.cc
+++ b/source/blender/blenkernel/intern/gpencil_legacy.cc
@@ -53,7 +53,7 @@
 
 #include "BLI_math_color.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc b/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc
index 3afeb86923d..377b5074a3d 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc
+++ b/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc
@@ -43,8 +43,8 @@
 #include "BKE_screen.h"
 #include "BKE_shrinkwrap.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_gpencil_legacy_lineart.h"
 #include "MOD_gpencil_legacy_modifiertypes.h"
diff --git a/source/blender/blenkernel/intern/grease_pencil.cc b/source/blender/blenkernel/intern/grease_pencil.cc
index e6a3cc24afb..c142769c4b2 100644
--- a/source/blender/blenkernel/intern/grease_pencil.cc
+++ b/source/blender/blenkernel/intern/grease_pencil.cc
@@ -45,8 +45,8 @@
 #include "DNA_material_types.h"
 #include "DNA_modifier_types.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc
index e8c81d18a3e..1ece13d4ce3 100644
--- a/source/blender/blenkernel/intern/image.cc
+++ b/source/blender/blenkernel/intern/image.cc
@@ -93,8 +93,8 @@
 
 #include "BLI_sys_types.h" /* for intptr_t support */
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/lattice.cc b/source/blender/blenkernel/intern/lattice.cc
index 329807fcefe..f5b060da3db 100644
--- a/source/blender/blenkernel/intern/lattice.cc
+++ b/source/blender/blenkernel/intern/lattice.cc
@@ -44,7 +44,7 @@
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/layer.cc b/source/blender/blenkernel/intern/layer.cc
index 9b7042467d7..ceda83bb977 100644
--- a/source/blender/blenkernel/intern/layer.cc
+++ b/source/blender/blenkernel/intern/layer.cc
@@ -43,9 +43,9 @@
 #include "DNA_workspace_types.h"
 #include "DNA_world_types.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_debug.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_debug.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DRW_engine.h"
 
diff --git a/source/blender/blenkernel/intern/lib_id.cc b/source/blender/blenkernel/intern/lib_id.cc
index 55dfc0fe039..b181847e61c 100644
--- a/source/blender/blenkernel/intern/lib_id.cc
+++ b/source/blender/blenkernel/intern/lib_id.cc
@@ -58,9 +58,9 @@
 #include "BKE_node.h"
 #include "BKE_rigidbody.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 
diff --git a/source/blender/blenkernel/intern/lib_id_delete.cc b/source/blender/blenkernel/intern/lib_id_delete.cc
index 4ad3ae72fb4..347d88fbdcd 100644
--- a/source/blender/blenkernel/intern/lib_id_delete.cc
+++ b/source/blender/blenkernel/intern/lib_id_delete.cc
@@ -35,7 +35,7 @@
 
 #include "lib_intern.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #ifdef WITH_PYTHON
 #  include "BPY_extern.h"
diff --git a/source/blender/blenkernel/intern/lib_override.cc b/source/blender/blenkernel/intern/lib_override.cc
index f552cc1c7e3..03ff6a16e93 100644
--- a/source/blender/blenkernel/intern/lib_override.cc
+++ b/source/blender/blenkernel/intern/lib_override.cc
@@ -22,8 +22,8 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "BKE_anim_data.h"
 #include "BKE_armature.h"
diff --git a/source/blender/blenkernel/intern/lib_override_proxy_conversion.cc b/source/blender/blenkernel/intern/lib_override_proxy_conversion.cc
index cf76676a587..3382b2cb216 100644
--- a/source/blender/blenkernel/intern/lib_override_proxy_conversion.cc
+++ b/source/blender/blenkernel/intern/lib_override_proxy_conversion.cc
@@ -20,7 +20,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BKE_collection.h"
 #include "BKE_idtype.h"
diff --git a/source/blender/blenkernel/intern/lib_remap.cc b/source/blender/blenkernel/intern/lib_remap.cc
index 1831839b06b..daa66e61305 100644
--- a/source/blender/blenkernel/intern/lib_remap.cc
+++ b/source/blender/blenkernel/intern/lib_remap.cc
@@ -32,8 +32,8 @@
 #include "BKE_node_tree_update.h"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "lib_intern.h" /* own include */
 
diff --git a/source/blender/blenkernel/intern/light.cc b/source/blender/blenkernel/intern/light.cc
index 532e91127bb..b1c59421928 100644
--- a/source/blender/blenkernel/intern/light.cc
+++ b/source/blender/blenkernel/intern/light.cc
@@ -37,7 +37,7 @@
 
 #include "BLT_translation.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/light_linking.cc b/source/blender/blenkernel/intern/light_linking.cc
index c29f80d3770..7654797ac70 100644
--- a/source/blender/blenkernel/intern/light_linking.cc
+++ b/source/blender/blenkernel/intern/light_linking.cc
@@ -23,8 +23,8 @@
 
 #include "BLT_translation.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 void BKE_light_linking_free_if_empty(Object *object)
 {
diff --git a/source/blender/blenkernel/intern/mask.cc b/source/blender/blenkernel/intern/mask.cc
index 3db89f9bf7b..89acecac576 100644
--- a/source/blender/blenkernel/intern/mask.cc
+++ b/source/blender/blenkernel/intern/mask.cc
@@ -41,7 +41,7 @@
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
 
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_build.hh"
 
 #include "DRW_engine.h"
 
diff --git a/source/blender/blenkernel/intern/mask_evaluate.cc b/source/blender/blenkernel/intern/mask_evaluate.cc
index b674e7684dc..27631a06832 100644
--- a/source/blender/blenkernel/intern/mask_evaluate.cc
+++ b/source/blender/blenkernel/intern/mask_evaluate.cc
@@ -25,8 +25,8 @@
 #include "BKE_curve.h"
 #include "BKE_mask.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 uint BKE_mask_spline_resolution(MaskSpline *spline, int width, int height)
 {
diff --git a/source/blender/blenkernel/intern/material.cc b/source/blender/blenkernel/intern/material.cc
index 1a81f6c89ab..e0a4ab83477 100644
--- a/source/blender/blenkernel/intern/material.cc
+++ b/source/blender/blenkernel/intern/material.cc
@@ -68,9 +68,9 @@
 #include "BKE_scene.h"
 #include "BKE_vfont.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_material.h"
 
diff --git a/source/blender/blenkernel/intern/mball.cc b/source/blender/blenkernel/intern/mball.cc
index 7c8b2ebf321..f1a1fff2961 100644
--- a/source/blender/blenkernel/intern/mball.cc
+++ b/source/blender/blenkernel/intern/mball.cc
@@ -55,7 +55,7 @@
 #include "BKE_object.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/mball_tessellate.cc b/source/blender/blenkernel/intern/mball_tessellate.cc
index 18a1c036d1a..5df659df9ff 100644
--- a/source/blender/blenkernel/intern/mball_tessellate.cc
+++ b/source/blender/blenkernel/intern/mball_tessellate.cc
@@ -38,8 +38,8 @@
 #include "BKE_object.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLI_strict_flags.h"
 
diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index c926a2daa9a..e90079b36e6 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -63,8 +63,8 @@
 
 #include "PIL_time.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc
index 55aa48616c4..8fd22661a18 100644
--- a/source/blender/blenkernel/intern/mesh_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_convert.cc
@@ -54,8 +54,8 @@
 
 #include "BKE_curve_to_mesh.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 using blender::float3;
 using blender::IndexRange;
diff --git a/source/blender/blenkernel/intern/mesh_validate.cc b/source/blender/blenkernel/intern/mesh_validate.cc
index 1b74d5115d2..a9ffc1c4465 100644
--- a/source/blender/blenkernel/intern/mesh_validate.cc
+++ b/source/blender/blenkernel/intern/mesh_validate.cc
@@ -31,7 +31,7 @@
 #include "BKE_deform.h"
 #include "BKE_mesh.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/mesh_wrapper.cc b/source/blender/blenkernel/intern/mesh_wrapper.cc
index 987b8eee25c..c7d05d1267e 100644
--- a/source/blender/blenkernel/intern/mesh_wrapper.cc
+++ b/source/blender/blenkernel/intern/mesh_wrapper.cc
@@ -48,8 +48,8 @@
 #include "BKE_subdiv_mesh.hh"
 #include "BKE_subdiv_modifier.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 using blender::float3;
 using blender::Span;
diff --git a/source/blender/blenkernel/intern/modifier.cc b/source/blender/blenkernel/intern/modifier.cc
index 1fabdeb8219..47b8cae664a 100644
--- a/source/blender/blenkernel/intern/modifier.cc
+++ b/source/blender/blenkernel/intern/modifier.cc
@@ -67,8 +67,8 @@
 #include "BKE_main.h"
 /* end */
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_modifiertypes.hh"
 
diff --git a/source/blender/blenkernel/intern/movieclip.cc b/source/blender/blenkernel/intern/movieclip.cc
index af1ee322637..6ee4ef55051 100644
--- a/source/blender/blenkernel/intern/movieclip.cc
+++ b/source/blender/blenkernel/intern/movieclip.cc
@@ -63,8 +63,8 @@
 #include "IMB_moviecache.h"
 #include "IMB_openexr.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_texture.h"
 
diff --git a/source/blender/blenkernel/intern/multires.cc b/source/blender/blenkernel/intern/multires.cc
index 56489d3626c..636459fddb1 100644
--- a/source/blender/blenkernel/intern/multires.cc
+++ b/source/blender/blenkernel/intern/multires.cc
@@ -40,7 +40,7 @@
 
 #include "CCGSubSurf.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "multires_reshape.hh"
 
diff --git a/source/blender/blenkernel/intern/multires_reshape.cc b/source/blender/blenkernel/intern/multires_reshape.cc
index 32671956c5e..442b7169219 100644
--- a/source/blender/blenkernel/intern/multires_reshape.cc
+++ b/source/blender/blenkernel/intern/multires_reshape.cc
@@ -24,7 +24,7 @@
 #include "BKE_subsurf.hh"
 #include "BLI_math_vector.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "multires_reshape.hh"
 
diff --git a/source/blender/blenkernel/intern/multires_reshape_apply_base.cc b/source/blender/blenkernel/intern/multires_reshape_apply_base.cc
index 60679801ce8..c868f46d290 100644
--- a/source/blender/blenkernel/intern/multires_reshape_apply_base.cc
+++ b/source/blender/blenkernel/intern/multires_reshape_apply_base.cc
@@ -27,7 +27,7 @@
 #include "BKE_multires.hh"
 #include "BKE_subdiv_eval.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 void multires_reshape_apply_base_update_mesh_coords(MultiresReshapeContext *reshape_context)
 {
diff --git a/source/blender/blenkernel/intern/multires_reshape_subdivide.cc b/source/blender/blenkernel/intern/multires_reshape_subdivide.cc
index adf9dce5763..78298a39acb 100644
--- a/source/blender/blenkernel/intern/multires_reshape_subdivide.cc
+++ b/source/blender/blenkernel/intern/multires_reshape_subdivide.cc
@@ -23,7 +23,7 @@
 #include "BKE_subsurf.hh"
 #include "BLI_math_vector.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "multires_reshape.hh"
 
diff --git a/source/blender/blenkernel/intern/multires_reshape_util.cc b/source/blender/blenkernel/intern/multires_reshape_util.cc
index 1d5772ca5aa..934fcefeb34 100644
--- a/source/blender/blenkernel/intern/multires_reshape_util.cc
+++ b/source/blender/blenkernel/intern/multires_reshape_util.cc
@@ -30,7 +30,7 @@
 #include "BKE_subdiv_foreach.hh"
 #include "BKE_subdiv_mesh.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Construct/destruct reshape context
diff --git a/source/blender/blenkernel/intern/multires_unsubdivide.cc b/source/blender/blenkernel/intern/multires_unsubdivide.cc
index c291671705f..ae2aee3ff33 100644
--- a/source/blender/blenkernel/intern/multires_unsubdivide.cc
+++ b/source/blender/blenkernel/intern/multires_unsubdivide.cc
@@ -31,7 +31,7 @@
 
 #include "bmesh.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "multires_reshape.hh"
 #include "multires_unsubdivide.hh"
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index a539e9657e8..d33d0c536d3 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -88,8 +88,8 @@
 #include "NOD_socket.hh"
 #include "NOD_texture.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/node_tree_update.cc b/source/blender/blenkernel/intern/node_tree_update.cc
index 8a183dff476..0af746ce420 100644
--- a/source/blender/blenkernel/intern/node_tree_update.cc
+++ b/source/blender/blenkernel/intern/node_tree_update.cc
@@ -32,7 +32,7 @@
 #include "NOD_socket.hh"
 #include "NOD_texture.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 using namespace blender::nodes;
 
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc
index 7f166bdd779..e13108f20ef 100644
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@@ -131,8 +131,8 @@
 #include "BKE_vfont.h"
 #include "BKE_volume.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DRW_engine.h"
 
diff --git a/source/blender/blenkernel/intern/object_dupli.cc b/source/blender/blenkernel/intern/object_dupli.cc
index c8e4859ee94..fc000d8c922 100644
--- a/source/blender/blenkernel/intern/object_dupli.cc
+++ b/source/blender/blenkernel/intern/object_dupli.cc
@@ -59,8 +59,8 @@
 #include "BKE_type_conversions.hh"
 #include "BKE_vfont.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLI_hash.h"
 #include "DNA_world_types.h"
diff --git a/source/blender/blenkernel/intern/object_update.cc b/source/blender/blenkernel/intern/object_update.cc
index cdabedec490..b7988f0a763 100644
--- a/source/blender/blenkernel/intern/object_update.cc
+++ b/source/blender/blenkernel/intern/object_update.cc
@@ -52,9 +52,9 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_light_linking.hh"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 namespace deg = blender::deg;
 
diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc
index 6f3235abe14..a2e4b016e45 100644
--- a/source/blender/blenkernel/intern/paint.cc
+++ b/source/blender/blenkernel/intern/paint.cc
@@ -63,8 +63,8 @@
 #include "BKE_subdiv_ccg.hh"
 #include "BKE_subsurf.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_enum_types.hh"
 
diff --git a/source/blender/blenkernel/intern/particle.cc b/source/blender/blenkernel/intern/particle.cc
index 97466d1cd47..bada7c60775 100644
--- a/source/blender/blenkernel/intern/particle.cc
+++ b/source/blender/blenkernel/intern/particle.cc
@@ -72,9 +72,9 @@
 #include "BKE_scene.h"
 #include "BKE_texture.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RE_texture.h"
 
diff --git a/source/blender/blenkernel/intern/particle_distribute.cc b/source/blender/blenkernel/intern/particle_distribute.cc
index 149243f108f..d7a56fd23b3 100644
--- a/source/blender/blenkernel/intern/particle_distribute.cc
+++ b/source/blender/blenkernel/intern/particle_distribute.cc
@@ -33,7 +33,7 @@
 #include "BKE_object.h"
 #include "BKE_particle.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 static void alloc_child_particles(ParticleSystem *psys, int tot)
 {
diff --git a/source/blender/blenkernel/intern/particle_system.cc b/source/blender/blenkernel/intern/particle_system.cc
index 8c01043f0d0..e2455d42d83 100644
--- a/source/blender/blenkernel/intern/particle_system.cc
+++ b/source/blender/blenkernel/intern/particle_system.cc
@@ -64,9 +64,9 @@
 #include "BKE_pointcache.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_physics.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_physics.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "PIL_time.h"
 
diff --git a/source/blender/blenkernel/intern/pointcloud.cc b/source/blender/blenkernel/intern/pointcloud.cc
index 9b7a7fd678c..6d0110c9aea 100644
--- a/source/blender/blenkernel/intern/pointcloud.cc
+++ b/source/blender/blenkernel/intern/pointcloud.cc
@@ -40,7 +40,7 @@
 
 #include "BLT_translation.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/rigidbody.cc b/source/blender/blenkernel/intern/rigidbody.cc
index ad83101c395..08240e0669a 100644
--- a/source/blender/blenkernel/intern/rigidbody.cc
+++ b/source/blender/blenkernel/intern/rigidbody.cc
@@ -53,8 +53,8 @@
 #  include "BKE_lib_query.h"
 #endif
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #ifdef WITH_BULLET
 static CLG_LogRef LOG = {"bke.rigidbody"};
diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc
index 036ca8a6c55..9bbdfc3273f 100644
--- a/source/blender/blenkernel/intern/scene.cc
+++ b/source/blender/blenkernel/intern/scene.cc
@@ -92,10 +92,10 @@
 #include "BKE_workspace.h"
 #include "BKE_world.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_debug.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_debug.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RE_engine.h"
 
diff --git a/source/blender/blenkernel/intern/shader_fx.cc b/source/blender/blenkernel/intern/shader_fx.cc
index e50e7da41b8..261065a7a52 100644
--- a/source/blender/blenkernel/intern/shader_fx.cc
+++ b/source/blender/blenkernel/intern/shader_fx.cc
@@ -31,8 +31,8 @@
 #include "BKE_screen.h"
 #include "BKE_shader_fx.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "FX_shader_types.h"
 
diff --git a/source/blender/blenkernel/intern/shrinkwrap.cc b/source/blender/blenkernel/intern/shrinkwrap.cc
index 4e11befe6d2..059874b10a4 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.cc
+++ b/source/blender/blenkernel/intern/shrinkwrap.cc
@@ -41,7 +41,7 @@
 #include "BKE_mesh_wrapper.hh"
 #include "BKE_subsurf.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/softbody.cc b/source/blender/blenkernel/intern/softbody.cc
index 8a13568f011..535c10edb03 100644
--- a/source/blender/blenkernel/intern/softbody.cc
+++ b/source/blender/blenkernel/intern/softbody.cc
@@ -62,8 +62,8 @@
 #include "BKE_scene.h"
 #include "BKE_softbody.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "PIL_time.h"
 
diff --git a/source/blender/blenkernel/intern/sound.cc b/source/blender/blenkernel/intern/sound.cc
index 5f855b221b1..bc7184f88ea 100644
--- a/source/blender/blenkernel/intern/sound.cc
+++ b/source/blender/blenkernel/intern/sound.cc
@@ -50,8 +50,8 @@
 #include "BKE_scene.h"
 #include "BKE_sound.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc
index be68e2dec9c..40570fa6428 100644
--- a/source/blender/blenkernel/intern/volume.cc
+++ b/source/blender/blenkernel/intern/volume.cc
@@ -47,7 +47,7 @@
 
 #include "BLT_translation.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/workspace.cc b/source/blender/blenkernel/intern/workspace.cc
index 65ab8774339..b6777e1e3b3 100644
--- a/source/blender/blenkernel/intern/workspace.cc
+++ b/source/blender/blenkernel/intern/workspace.cc
@@ -35,7 +35,7 @@
 #include "DNA_windowmanager_types.h"
 #include "DNA_workspace_types.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/world.cc b/source/blender/blenkernel/intern/world.cc
index 58822244f30..0085e80a805 100644
--- a/source/blender/blenkernel/intern/world.cc
+++ b/source/blender/blenkernel/intern/world.cc
@@ -37,7 +37,7 @@
 
 #include "DRW_engine.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "GPU_material.h"
 
diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc
index 52ed617748a..21875440e02 100644
--- a/source/blender/blenloader/intern/readfile.cc
+++ b/source/blender/blenloader/intern/readfile.cc
@@ -91,7 +91,7 @@
 
 #include "DRW_engine.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BLO_blend_defs.hh"
 #include "BLO_blend_validate.hh"
diff --git a/source/blender/blenloader/intern/versioning_280.cc b/source/blender/blenloader/intern/versioning_280.cc
index 7ff1d692848..fe3857fa362 100644
--- a/source/blender/blenloader/intern/versioning_280.cc
+++ b/source/blender/blenloader/intern/versioning_280.cc
@@ -97,7 +97,7 @@
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/blenloader/tests/blendfile_loading_base_test.cc b/source/blender/blenloader/tests/blendfile_loading_base_test.cc
index fbc5a56d9fb..c534d0f5a22 100644
--- a/source/blender/blenloader/tests/blendfile_loading_base_test.cc
+++ b/source/blender/blenloader/tests/blendfile_loading_base_test.cc
@@ -25,8 +25,8 @@
 
 #include "BLO_readfile.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "DNA_genfile.h" /* for DNA_sdna_current_init() */
 #include "DNA_windowmanager_types.h"
diff --git a/source/blender/blenloader/tests/blendfile_loading_base_test.h b/source/blender/blenloader/tests/blendfile_loading_base_test.h
index 736d1161c72..fe50bbb584e 100644
--- a/source/blender/blenloader/tests/blendfile_loading_base_test.h
+++ b/source/blender/blenloader/tests/blendfile_loading_base_test.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 #include "testing/testing.h"
 
 struct BlendFileData;
diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.cc b/source/blender/bmesh/intern/bmesh_mesh_convert.cc
index 83cad3b03d7..6d7cbf73620 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_convert.cc
+++ b/source/blender/bmesh/intern/bmesh_mesh_convert.cc
@@ -99,7 +99,7 @@
 #include "BKE_key.h"
 #include "BKE_main.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "bmesh.h"
 #include "intern/bmesh_private.h" /* For element checking. */
diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index 76cb83f73b4..40802b3d719 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -78,7 +78,7 @@ set(SRC
   intern/depsgraph_debug.cc
   intern/depsgraph_eval.cc
   intern/depsgraph_light_linking.cc
-  intern/depsgraph_light_linking.h
+  intern/depsgraph_light_linking.hh
   intern/depsgraph_physics.cc
   intern/depsgraph_query.cc
   intern/depsgraph_query_foreach.cc
@@ -89,13 +89,12 @@ set(SRC
   intern/depsgraph_type.cc
   intern/depsgraph_update.cc
 
-  DEG_depsgraph.h
-  DEG_depsgraph_build.h
-  DEG_depsgraph_debug.h
-  DEG_depsgraph_light_linking.h
+  DEG_depsgraph.hh
+  DEG_depsgraph_build.hh
+  DEG_depsgraph_debug.hh
   DEG_depsgraph_light_linking.hh
-  DEG_depsgraph_physics.h
-  DEG_depsgraph_query.h
+  DEG_depsgraph_physics.hh
+  DEG_depsgraph_query.hh
 
   intern/builder/deg_builder.h
   intern/builder/deg_builder_cache.h
@@ -134,20 +133,20 @@ set(SRC
   intern/eval/deg_eval_runtime_backup_sound.h
   intern/eval/deg_eval_runtime_backup_volume.h
   intern/eval/deg_eval_stats.h
-  intern/node/deg_node.h
-  intern/node/deg_node_component.h
-  intern/node/deg_node_factory.h
-  intern/node/deg_node_factory_impl.h
-  intern/node/deg_node_id.h
-  intern/node/deg_node_operation.h
-  intern/node/deg_node_time.h
-  intern/depsgraph.h
-  intern/depsgraph_physics.h
-  intern/depsgraph_registry.h
-  intern/depsgraph_relation.h
-  intern/depsgraph_tag.h
-  intern/depsgraph_type.h
-  intern/depsgraph_update.h
+  intern/node/deg_node.hh
+  intern/node/deg_node_component.hh
+  intern/node/deg_node_factory.hh
+  intern/node/deg_node_factory_impl.hh
+  intern/node/deg_node_id.hh
+  intern/node/deg_node_operation.hh
+  intern/node/deg_node_time.hh
+  intern/depsgraph.hh
+  intern/depsgraph_physics.hh
+  intern/depsgraph_registry.hh
+  intern/depsgraph_relation.hh
+  intern/depsgraph_tag.hh
+  intern/depsgraph_type.hh
+  intern/depsgraph_update.hh
 )
 
 set(LIB
diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.hh
similarity index 99%
rename from source/blender/depsgraph/DEG_depsgraph.h
rename to source/blender/depsgraph/DEG_depsgraph.hh
index ac5d2b3e28c..7b9e8ca646d 100644
--- a/source/blender/depsgraph/DEG_depsgraph.h
+++ b/source/blender/depsgraph/DEG_depsgraph.hh
@@ -58,10 +58,6 @@ enum {
   DAG_EVAL_NEED_SHRINKWRAP_BOUNDARY = (1 << 1),
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* ************************************************ */
 /* Depsgraph API */
 
@@ -275,7 +271,3 @@ void DEG_debug_print_eval_time(struct Depsgraph *depsgraph,
                                float time);
 
 /** \} */
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
diff --git a/source/blender/depsgraph/DEG_depsgraph_build.h b/source/blender/depsgraph/DEG_depsgraph_build.hh
similarity index 98%
rename from source/blender/depsgraph/DEG_depsgraph_build.h
rename to source/blender/depsgraph/DEG_depsgraph_build.hh
index 27aa8271f62..fde031d17a6 100644
--- a/source/blender/depsgraph/DEG_depsgraph_build.h
+++ b/source/blender/depsgraph/DEG_depsgraph_build.hh
@@ -28,10 +28,6 @@ struct bNodeTree;
 
 #include "BLI_sys_types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Graph Building -------------------------------- */
 
 /** Build depsgraph for the given scene layer, and dump results in given graph container. */
@@ -184,7 +180,3 @@ struct Depsgraph *DEG_get_graph_from_handle(struct DepsNodeHandle *node_handle);
 bool DEG_object_has_geometry_component(struct Object *object);
 
 /* ************************************************ */
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
diff --git a/source/blender/depsgraph/DEG_depsgraph_debug.h b/source/blender/depsgraph/DEG_depsgraph_debug.hh
similarity index 96%
rename from source/blender/depsgraph/DEG_depsgraph_debug.h
rename to source/blender/depsgraph/DEG_depsgraph_debug.hh
index 20eb4a2aebe..9de34d6eddf 100644
--- a/source/blender/depsgraph/DEG_depsgraph_debug.h
+++ b/source/blender/depsgraph/DEG_depsgraph_debug.hh
@@ -12,10 +12,6 @@
 
 #include <stdio.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Depsgraph;
 struct Scene;
 struct ViewLayer;
@@ -66,7 +62,3 @@ bool DEG_debug_graph_relations_validate(struct Depsgraph *graph,
 
 /** Perform consistency check on the graph. */
 bool DEG_debug_consistency_check(struct Depsgraph *graph);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
diff --git a/source/blender/depsgraph/DEG_depsgraph_light_linking.h b/source/blender/depsgraph/DEG_depsgraph_light_linking.h
deleted file mode 100644
index f5df3cfa210..00000000000
--- a/source/blender/depsgraph/DEG_depsgraph_light_linking.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-FileCopyrightText: 2023 Blender Authors
- *
- * SPDX-License-Identifier: GPL-2.0-or-later */
-
-/** \file
- * \ingroup depsgraph
- */
-
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* TODO(sergey): Functions needed to expose the receiver/emitter map to RNA. */
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
diff --git a/source/blender/depsgraph/DEG_depsgraph_physics.h b/source/blender/depsgraph/DEG_depsgraph_physics.hh
similarity index 94%
rename from source/blender/depsgraph/DEG_depsgraph_physics.h
rename to source/blender/depsgraph/DEG_depsgraph_physics.hh
index b7fc3fc7a29..6c1bd2dbdde 100644
--- a/source/blender/depsgraph/DEG_depsgraph_physics.h
+++ b/source/blender/depsgraph/DEG_depsgraph_physics.hh
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 struct DepsNodeHandle;
 struct Depsgraph;
@@ -18,10 +18,6 @@ struct EffectorWeights;
 struct ListBase;
 struct Object;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef enum ePhysicsRelationType {
   DEG_PHYSICS_EFFECTOR = 0,
   DEG_PHYSICS_COLLISION = 1,
@@ -54,7 +50,3 @@ void DEG_add_forcefield_relations(struct DepsNodeHandle *handle,
                                   bool add_absorption,
                                   int skip_forcefield,
                                   const char *name);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.hh
similarity index 98%
rename from source/blender/depsgraph/DEG_depsgraph_query.h
rename to source/blender/depsgraph/DEG_depsgraph_query.hh
index dfe0016106e..f6c98095c4c 100644
--- a/source/blender/depsgraph/DEG_depsgraph_query.h
+++ b/source/blender/depsgraph/DEG_depsgraph_query.hh
@@ -13,8 +13,8 @@
 #include "BLI_iterator.h"
 #include "BLI_utildefines.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 /* Needed for the instance iterator. */
 #include "DNA_object_types.h"
@@ -30,10 +30,6 @@ struct Scene;
 struct ViewLayer;
 struct ViewerPath;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* -------------------------------------------------------------------- */
 /** \name DEG input data
  * \{ */
@@ -294,7 +290,3 @@ void DEG_foreach_dependent_ID_component(const Depsgraph *depsgraph,
 void DEG_foreach_ID(const Depsgraph *depsgraph, DEGForeachIDCallback callback, void *user_data);
 
 /** \} */
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc
index b4d74254913..409b7e7cf6f 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@ -27,18 +27,18 @@
 
 #include "intern/builder/deg_builder_cache.h"
 #include "intern/builder/deg_builder_remove_noop.h"
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_relation.h"
-#include "intern/depsgraph_tag.h"
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_relation.hh"
+#include "intern/depsgraph_tag.hh"
+#include "intern/depsgraph_type.hh"
 #include "intern/eval/deg_eval_copy_on_write.h"
 #include "intern/eval/deg_eval_visibility.h"
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cache.h b/source/blender/depsgraph/intern/builder/deg_builder_cache.h
index dee1081e516..f4904d03d7c 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_cache.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_cache.h
@@ -10,7 +10,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 
 #include "RNA_access.hh"
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
index e790ed250bd..b7515a08bf6 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
@@ -15,12 +15,12 @@
 #include "BLI_stack.h"
 #include "BLI_utildefines.h"
 
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_operation.hh"
 
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_relation.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_relation.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_key.h b/source/blender/depsgraph/intern/builder/deg_builder_key.h
index af447b7910c..eb7751baa27 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_key.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_key.h
@@ -9,10 +9,10 @@
 #pragma once
 
 #include "intern/builder/deg_builder_rna.h"
-#include "intern/depsgraph_type.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/depsgraph_type.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
 
 #include "DNA_ID.h"
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_map.h b/source/blender/depsgraph/intern/builder/deg_builder_map.h
index 4c166a915c9..eca7ccebe16 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_map.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_map.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 
 struct ID;
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index f7649c7cf3e..98de164d39e 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -98,8 +98,8 @@
 #include "RNA_prototypes.h"
 #include "RNA_types.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "SEQ_iterator.h"
 #include "SEQ_sequencer.h"
@@ -107,16 +107,16 @@
 #include "intern/builder/deg_builder.h"
 #include "intern/builder/deg_builder_key.h"
 #include "intern/builder/deg_builder_rna.h"
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_light_linking.h"
-#include "intern/depsgraph_tag.h"
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_light_linking.hh"
+#include "intern/depsgraph_tag.hh"
+#include "intern/depsgraph_type.hh"
 #include "intern/eval/deg_eval_copy_on_write.h"
 #include "intern/eval/deg_eval_visibility.h"
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
index c708ce50ef7..d97db3c380e 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
@@ -11,11 +11,11 @@
 #include "intern/builder/deg_builder.h"
 #include "intern/builder/deg_builder_key.h"
 #include "intern/builder/deg_builder_map.h"
-#include "intern/depsgraph_type.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/depsgraph_type.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 struct CacheFile;
 struct Camera;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
index 272deab9155..c2a47a8d7a8 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
@@ -30,15 +30,15 @@
 #include "BKE_constraint.h"
 #include "BKE_lib_query.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "intern/builder/deg_builder.h"
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 #include "intern/eval/deg_eval_copy_on_write.h"
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_operation.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
index 0650ebd8c26..7f7c8d94f23 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
@@ -31,15 +31,15 @@
 #include "BKE_main.h"
 #include "BKE_node.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "intern/builder/deg_builder.h"
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_type.h"
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_type.hh"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_operation.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h
index 136d72cfff1..4ce52744c8b 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 2b9f094fc82..c7badc756cd 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -90,26 +90,26 @@
 
 #include "SEQ_iterator.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "intern/builder/deg_builder.h"
 #include "intern/builder/deg_builder_pchanmap.h"
 #include "intern/builder/deg_builder_relations_drivers.h"
 #include "intern/debug/deg_debug.h"
-#include "intern/depsgraph_physics.h"
-#include "intern/depsgraph_tag.h"
+#include "intern/depsgraph_physics.hh"
+#include "intern/depsgraph_tag.hh"
 #include "intern/eval/deg_eval_copy_on_write.h"
 
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
-#include "intern/node/deg_node_time.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
+#include "intern/node/deg_node_time.hh"
 
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_relation.h"
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_relation.hh"
+#include "intern/depsgraph_type.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index 8e56560936a..4eafd66b0c0 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -11,7 +11,7 @@
 #include <cstdio>
 #include <cstring>
 
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 
 #include "DNA_ID.h"
 
@@ -25,11 +25,11 @@
 #include "intern/builder/deg_builder_map.h"
 #include "intern/builder/deg_builder_rna.h"
 #include "intern/builder/deg_builder_stack.h"
-#include "intern/depsgraph.h"
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/depsgraph.hh"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
 
 struct CacheFile;
 struct Camera;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_drivers.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_drivers.cc
index 31a31454cf1..4539fb85b51 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_drivers.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_drivers.cc
@@ -19,8 +19,8 @@
 #include "BKE_anim_data.h"
 
 #include "intern/builder/deg_builder_relations.h"
-#include "intern/depsgraph_relation.h"
-#include "intern/node/deg_node.h"
+#include "intern/depsgraph_relation.hh"
+#include "intern/node/deg_node.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h b/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
index 1866d0663d1..cdb68132b1e 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "intern/node/deg_node_id.h"
+#include "intern/node/deg_node_id.hh"
 
 #include <iostream>
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
index fd096133623..077586474a8 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
@@ -33,19 +33,19 @@
 
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "intern/builder/deg_builder.h"
 #include "intern/builder/deg_builder_cache.h"
 #include "intern/builder/deg_builder_pchanmap.h"
 #include "intern/debug/deg_debug.h"
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_operation.hh"
 
-#include "intern/depsgraph_relation.h"
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_relation.hh"
+#include "intern/depsgraph_type.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
index 5532fdde994..287050ebe01 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
@@ -29,18 +29,18 @@
 #include "BKE_main.h"
 #include "BKE_node.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "intern/builder/deg_builder.h"
 #include "intern/builder/deg_builder_pchanmap.h"
 
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
 
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc b/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc
index 4a7b831e5c1..a2098a2fbfb 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc
@@ -10,13 +10,13 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_operation.hh"
 
 #include "intern/debug/deg_debug.h"
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_relation.h"
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_relation.hh"
+#include "intern/depsgraph_type.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc
index fc84cd56f2e..0276925ccef 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc
@@ -28,11 +28,11 @@
 #include "RNA_prototypes.h"
 
 #include "intern/builder/deg_builder.h"
-#include "intern/depsgraph.h"
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/depsgraph.hh"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna.h b/source/blender/depsgraph/intern/builder/deg_builder_rna.h
index caaefdc8ff7..3f136eaca32 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_rna.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_rna.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_operation.hh"
 
 struct ID;
 struct PointerRNA;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
index fd15e11e13c..811741e86d0 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
@@ -10,13 +10,13 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_operation.hh"
 
 #include "intern/debug/deg_debug.h"
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_relation.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_relation.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/pipeline.h b/source/blender/depsgraph/intern/builder/pipeline.h
index e4543aee60e..ff6d50ecae2 100644
--- a/source/blender/depsgraph/intern/builder/pipeline.h
+++ b/source/blender/depsgraph/intern/builder/pipeline.h
@@ -10,7 +10,7 @@
 
 #include "deg_builder_cache.h"
 
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 
 struct Depsgraph;
 struct Main;
diff --git a/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc b/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc
index bdbe619d1f8..1c9c1ff2d27 100644
--- a/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc
+++ b/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc
@@ -6,7 +6,7 @@
 
 #include "intern/builder/deg_builder_nodes.h"
 #include "intern/builder/deg_builder_relations.h"
-#include "intern/depsgraph.h"
+#include "intern/depsgraph.hh"
 
 #include "DNA_layer_types.h"
 
diff --git a/source/blender/depsgraph/intern/builder/pipeline_compositor.cc b/source/blender/depsgraph/intern/builder/pipeline_compositor.cc
index 093c609edaa..e384b5488c3 100644
--- a/source/blender/depsgraph/intern/builder/pipeline_compositor.cc
+++ b/source/blender/depsgraph/intern/builder/pipeline_compositor.cc
@@ -6,7 +6,7 @@
 
 #include "intern/builder/deg_builder_nodes.h"
 #include "intern/builder/deg_builder_relations.h"
-#include "intern/depsgraph.h"
+#include "intern/depsgraph.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/pipeline_from_ids.cc b/source/blender/depsgraph/intern/builder/pipeline_from_ids.cc
index 56c32b31ae8..b3744186699 100644
--- a/source/blender/depsgraph/intern/builder/pipeline_from_ids.cc
+++ b/source/blender/depsgraph/intern/builder/pipeline_from_ids.cc
@@ -8,7 +8,7 @@
 
 #include "intern/builder/deg_builder_nodes.h"
 #include "intern/builder/deg_builder_relations.h"
-#include "intern/depsgraph.h"
+#include "intern/depsgraph.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/pipeline_render.cc b/source/blender/depsgraph/intern/builder/pipeline_render.cc
index b2755d06697..db155e7b040 100644
--- a/source/blender/depsgraph/intern/builder/pipeline_render.cc
+++ b/source/blender/depsgraph/intern/builder/pipeline_render.cc
@@ -6,7 +6,7 @@
 
 #include "intern/builder/deg_builder_nodes.h"
 #include "intern/builder/deg_builder_relations.h"
-#include "intern/depsgraph.h"
+#include "intern/depsgraph.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/pipeline_view_layer.cc b/source/blender/depsgraph/intern/builder/pipeline_view_layer.cc
index 4a1ea37b3f5..caba9a415ca 100644
--- a/source/blender/depsgraph/intern/builder/pipeline_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/pipeline_view_layer.cc
@@ -6,7 +6,7 @@
 
 #include "intern/builder/deg_builder_nodes.h"
 #include "intern/builder/deg_builder_relations.h"
-#include "intern/depsgraph.h"
+#include "intern/depsgraph.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/debug/deg_debug.h b/source/blender/depsgraph/intern/debug/deg_debug.h
index ccdb83b44e9..b737171c99a 100644
--- a/source/blender/depsgraph/intern/debug/deg_debug.h
+++ b/source/blender/depsgraph/intern/debug/deg_debug.h
@@ -9,11 +9,11 @@
 #pragma once
 
 #include "intern/debug/deg_time_average.h"
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 
 #include "BKE_global.h"
 
-#include "DEG_depsgraph_debug.h"
+#include "DEG_depsgraph_debug.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
index 86177c5371e..208f6fcfd06 100644
--- a/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
+++ b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
@@ -15,16 +15,16 @@
 
 #include "DNA_listBase.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_debug.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_debug.hh"
 
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_relation.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_relation.hh"
 
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
-#include "intern/node/deg_node_time.h"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
+#include "intern/node/deg_node_time.hh"
 
 #include <sstream>
 
diff --git a/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc b/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
index c9aadf01195..0c182fc66d4 100644
--- a/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
+++ b/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
@@ -6,7 +6,7 @@
  * \ingroup depsgraph
  */
 
-#include "DEG_depsgraph_debug.h"
+#include "DEG_depsgraph_debug.hh"
 
 #include <algorithm>
 #include <cstdarg>
@@ -14,8 +14,8 @@
 #include "BLI_compiler_attrs.h"
 #include "BLI_math_base.h"
 
-#include "intern/depsgraph.h"
-#include "intern/node/deg_node_id.h"
+#include "intern/depsgraph.hh"
+#include "intern/node/deg_node_id.hh"
 
 #include "DNA_ID.h"
 
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc
index 39750629c36..9c1f4f9ea61 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -8,7 +8,7 @@
  * Core routines for how the Depsgraph works.
  */
 
-#include "intern/depsgraph.h" /* own include */
+#include "intern/depsgraph.hh" /* own include */
 
 #include <algorithm>
 #include <cstring>
@@ -23,22 +23,22 @@
 #include "BKE_idtype.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_debug.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_debug.hh"
 
-#include "intern/depsgraph_physics.h"
-#include "intern/depsgraph_registry.h"
-#include "intern/depsgraph_relation.h"
-#include "intern/depsgraph_update.h"
+#include "intern/depsgraph_physics.hh"
+#include "intern/depsgraph_registry.hh"
+#include "intern/depsgraph_relation.hh"
+#include "intern/depsgraph_update.hh"
 
 #include "intern/eval/deg_eval_copy_on_write.h"
 
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_factory.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
-#include "intern/node/deg_node_time.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_factory.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
+#include "intern/node/deg_node_time.hh"
 
 namespace deg = blender::deg;
 
diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.hh
similarity index 97%
rename from source/blender/depsgraph/intern/depsgraph.h
rename to source/blender/depsgraph/intern/depsgraph.hh
index 4feb9a6ea4d..cba1b5b8c99 100644
--- a/source/blender/depsgraph/intern/depsgraph.h
+++ b/source/blender/depsgraph/intern/depsgraph.hh
@@ -22,12 +22,12 @@
 
 #include "BLI_threads.h" /* for SpinLock */
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_physics.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_physics.hh"
 
 #include "intern/debug/deg_debug.h"
-#include "intern/depsgraph_light_linking.h"
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_light_linking.hh"
+#include "intern/depsgraph_type.hh"
 
 struct ID;
 struct Scene;
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc
index aaa97567c73..e3240d366c6 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@ -26,9 +26,9 @@
 #include "BKE_main.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_debug.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_debug.hh"
 
 #include "builder/deg_builder_relations.h"
 #include "builder/pipeline_all_objects.h"
@@ -39,15 +39,15 @@
 
 #include "intern/debug/deg_debug.h"
 
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
 
-#include "intern/depsgraph_registry.h"
-#include "intern/depsgraph_relation.h"
-#include "intern/depsgraph_tag.h"
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_registry.hh"
+#include "intern/depsgraph_relation.hh"
+#include "intern/depsgraph_tag.hh"
+#include "intern/depsgraph_type.hh"
 
 /* ****************** */
 /* External Build API */
diff --git a/source/blender/depsgraph/intern/depsgraph_debug.cc b/source/blender/depsgraph/intern/depsgraph_debug.cc
index c6be1bd8070..a6e7c1057f1 100644
--- a/source/blender/depsgraph/intern/depsgraph_debug.cc
+++ b/source/blender/depsgraph/intern/depsgraph_debug.cc
@@ -14,18 +14,18 @@
 
 #include "DNA_object_types.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_debug.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_debug.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "intern/debug/deg_debug.h"
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_relation.h"
-#include "intern/depsgraph_type.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_time.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_relation.hh"
+#include "intern/depsgraph_type.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_time.hh"
 
 namespace deg = blender::deg;
 
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc
index 24163d473a4..3a1966a818e 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@ -18,18 +18,18 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "intern/eval/deg_eval.h"
 #include "intern/eval/deg_eval_flush.h"
 
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_operation.h"
-#include "intern/node/deg_node_time.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_operation.hh"
+#include "intern/node/deg_node_time.hh"
 
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_tag.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_tag.hh"
 
 namespace deg = blender::deg;
 
diff --git a/source/blender/depsgraph/intern/depsgraph_light_linking.cc b/source/blender/depsgraph/intern/depsgraph_light_linking.cc
index 9a09b4eaf69..140b57f2583 100644
--- a/source/blender/depsgraph/intern/depsgraph_light_linking.cc
+++ b/source/blender/depsgraph/intern/depsgraph_light_linking.cc
@@ -7,7 +7,7 @@
  *
  * Light linking utilities. */
 
-#include "intern/depsgraph_light_linking.h"
+#include "intern/depsgraph_light_linking.hh"
 
 #include "MEM_guardedalloc.h"
 
@@ -23,11 +23,10 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "DEG_depsgraph_light_linking.h"
 #include "DEG_depsgraph_light_linking.hh"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
-#include "intern/depsgraph.h"
+#include "intern/depsgraph.hh"
 
 namespace deg = blender::deg;
 
diff --git a/source/blender/depsgraph/intern/depsgraph_light_linking.h b/source/blender/depsgraph/intern/depsgraph_light_linking.hh
similarity index 100%
rename from source/blender/depsgraph/intern/depsgraph_light_linking.h
rename to source/blender/depsgraph/intern/depsgraph_light_linking.hh
diff --git a/source/blender/depsgraph/intern/depsgraph_physics.cc b/source/blender/depsgraph/intern/depsgraph_physics.cc
index c75544c1a73..0a5e082d92f 100644
--- a/source/blender/depsgraph/intern/depsgraph_physics.cc
+++ b/source/blender/depsgraph/intern/depsgraph_physics.cc
@@ -8,7 +8,7 @@
  * Physics utilities for effectors and collision.
  */
 
-#include "intern/depsgraph_physics.h"
+#include "intern/depsgraph_physics.hh"
 
 #include "MEM_guardedalloc.h"
 
@@ -23,11 +23,11 @@
 #include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_physics.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_physics.hh"
+#include "DEG_depsgraph_query.hh"
 
-#include "depsgraph.h"
+#include "depsgraph.hh"
 
 namespace deg = blender::deg;
 
diff --git a/source/blender/depsgraph/intern/depsgraph_physics.h b/source/blender/depsgraph/intern/depsgraph_physics.hh
similarity index 100%
rename from source/blender/depsgraph/intern/depsgraph_physics.h
rename to source/blender/depsgraph/intern/depsgraph_physics.hh
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc
index 9c821c898e1..97f6e65f889 100644
--- a/source/blender/depsgraph/intern/depsgraph_query.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query.cc
@@ -27,12 +27,12 @@
 #include "RNA_path.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
-#include "intern/depsgraph.h"
+#include "intern/depsgraph.hh"
 #include "intern/eval/deg_eval_copy_on_write.h"
-#include "intern/node/deg_node_id.h"
+#include "intern/node/deg_node_id.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc
index d1529209331..32ad48597c3 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc
@@ -15,15 +15,15 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_relation.h"
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_relation.hh"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
 
 namespace deg = blender::deg;
 
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index 07fbf48b04e..b2e1c045ca9 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -27,11 +27,11 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
-#include "intern/depsgraph.h"
-#include "intern/node/deg_node_id.h"
+#include "intern/depsgraph.hh"
+#include "intern/node/deg_node_id.hh"
 
 #ifndef NDEBUG
 #  include "intern/eval/deg_eval_copy_on_write.h"
diff --git a/source/blender/depsgraph/intern/depsgraph_registry.cc b/source/blender/depsgraph/intern/depsgraph_registry.cc
index 9e63cffc4c6..0d48e03020a 100644
--- a/source/blender/depsgraph/intern/depsgraph_registry.cc
+++ b/source/blender/depsgraph/intern/depsgraph_registry.cc
@@ -9,11 +9,11 @@
 #include <memory>
 #include <mutex>
 
-#include "intern/depsgraph_registry.h"
+#include "intern/depsgraph_registry.hh"
 
 #include "BLI_utildefines.h"
 
-#include "intern/depsgraph.h"
+#include "intern/depsgraph.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/depsgraph_registry.h b/source/blender/depsgraph/intern/depsgraph_registry.hh
similarity index 91%
rename from source/blender/depsgraph/intern/depsgraph_registry.h
rename to source/blender/depsgraph/intern/depsgraph_registry.hh
index ab14adb966a..a530bbee038 100644
--- a/source/blender/depsgraph/intern/depsgraph_registry.h
+++ b/source/blender/depsgraph/intern/depsgraph_registry.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 
 struct Main;
 
diff --git a/source/blender/depsgraph/intern/depsgraph_relation.cc b/source/blender/depsgraph/intern/depsgraph_relation.cc
index 125ee90930c..7dff713de7b 100644
--- a/source/blender/depsgraph/intern/depsgraph_relation.cc
+++ b/source/blender/depsgraph/intern/depsgraph_relation.cc
@@ -6,12 +6,12 @@
  * \ingroup depsgraph
  */
 
-#include "intern/depsgraph_relation.h" /* own include */
+#include "intern/depsgraph_relation.hh" /* own include */
 
 #include "BLI_utildefines.h"
 
-#include "intern/depsgraph_type.h"
-#include "intern/node/deg_node.h"
+#include "intern/depsgraph_type.hh"
+#include "intern/node/deg_node.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/depsgraph_relation.h b/source/blender/depsgraph/intern/depsgraph_relation.hh
similarity index 100%
rename from source/blender/depsgraph/intern/depsgraph_relation.h
rename to source/blender/depsgraph/intern/depsgraph_relation.hh
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index 587d08b4c2e..3507cd8b449 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -8,7 +8,7 @@
  * Core routines for how the Depsgraph works.
  */
 
-#include "intern/depsgraph_tag.h"
+#include "intern/depsgraph_tag.hh"
 
 #include <cstdio>
 #include <cstring> /* required for memset */
@@ -36,22 +36,22 @@
 #include "BKE_screen.h"
 #include "BKE_workspace.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_debug.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_debug.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "intern/builder/deg_builder.h"
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_registry.h"
-#include "intern/depsgraph_update.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_registry.hh"
+#include "intern/depsgraph_update.hh"
 #include "intern/eval/deg_eval_copy_on_write.h"
 #include "intern/eval/deg_eval_flush.h"
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_factory.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
-#include "intern/node/deg_node_time.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_factory.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
+#include "intern/node/deg_node_time.hh"
 
 namespace deg = blender::deg;
 
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.h b/source/blender/depsgraph/intern/depsgraph_tag.hh
similarity index 96%
rename from source/blender/depsgraph/intern/depsgraph_tag.h
rename to source/blender/depsgraph/intern/depsgraph_tag.hh
index e02befffd46..7724a2e3166 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.h
+++ b/source/blender/depsgraph/intern/depsgraph_tag.hh
@@ -6,7 +6,7 @@
  * \ingroup depsgraph
  */
 
-#include "intern/node/deg_node.h"
+#include "intern/node/deg_node.hh"
 
 struct ID;
 struct Main;
diff --git a/source/blender/depsgraph/intern/depsgraph_type.cc b/source/blender/depsgraph/intern/depsgraph_type.cc
index 0d28f823962..ff20b68bdc0 100644
--- a/source/blender/depsgraph/intern/depsgraph_type.cc
+++ b/source/blender/depsgraph/intern/depsgraph_type.cc
@@ -14,13 +14,13 @@
 
 #include "DNA_customdata_types.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
-#include "intern/depsgraph_type.h"
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_factory.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/depsgraph_type.hh"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_factory.hh"
+#include "intern/node/deg_node_operation.hh"
 
 namespace deg = blender::deg;
 
diff --git a/source/blender/depsgraph/intern/depsgraph_type.h b/source/blender/depsgraph/intern/depsgraph_type.hh
similarity index 100%
rename from source/blender/depsgraph/intern/depsgraph_type.h
rename to source/blender/depsgraph/intern/depsgraph_type.hh
diff --git a/source/blender/depsgraph/intern/depsgraph_update.cc b/source/blender/depsgraph/intern/depsgraph_update.cc
index 25b99cbf1f0..4993772885e 100644
--- a/source/blender/depsgraph/intern/depsgraph_update.cc
+++ b/source/blender/depsgraph/intern/depsgraph_update.cc
@@ -6,11 +6,11 @@
  * \ingroup depsgraph
  */
 
-#include "intern/depsgraph_update.h"
+#include "intern/depsgraph_update.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 
 namespace deg = blender::deg;
 
diff --git a/source/blender/depsgraph/intern/depsgraph_update.h b/source/blender/depsgraph/intern/depsgraph_update.hh
similarity index 100%
rename from source/blender/depsgraph/intern/depsgraph_update.h
rename to source/blender/depsgraph/intern/depsgraph_update.hh
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc
index 0f5e6c34974..e1e0b486b8d 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@ -24,8 +24,8 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #ifdef WITH_PYTHON
 #  include "BPY_extern.h"
@@ -33,18 +33,18 @@
 
 #include "atomic_ops.h"
 
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_relation.h"
-#include "intern/depsgraph_tag.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_relation.hh"
+#include "intern/depsgraph_tag.hh"
 #include "intern/eval/deg_eval_copy_on_write.h"
 #include "intern/eval/deg_eval_flush.h"
 #include "intern/eval/deg_eval_stats.h"
 #include "intern/eval/deg_eval_visibility.h"
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
-#include "intern/node/deg_node_time.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
+#include "intern/node/deg_node_time.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index 06f2e64b585..6b77920e22d 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -34,8 +34,8 @@
 #include "BKE_lib_id.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
@@ -82,10 +82,10 @@
 
 #include "intern/builder/deg_builder.h"
 #include "intern/builder/deg_builder_nodes.h"
-#include "intern/depsgraph.h"
+#include "intern/depsgraph.hh"
 #include "intern/eval/deg_eval_runtime_backup.h"
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_id.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_id.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index 1e39d4639e8..d32d5c1ee61 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -27,19 +27,19 @@
 
 #include "DRW_engine.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "intern/debug/deg_debug.h"
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_relation.h"
-#include "intern/depsgraph_type.h"
-#include "intern/depsgraph_update.h"
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_factory.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
-#include "intern/node/deg_node_time.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_relation.hh"
+#include "intern/depsgraph_type.hh"
+#include "intern/depsgraph_update.hh"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_factory.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
+#include "intern/node/deg_node_time.hh"
 
 #include "intern/eval/deg_eval_copy_on_write.h"
 
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc
index 5cb9ce1a36e..9fc0b9ff55e 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc
@@ -15,7 +15,7 @@
 #include "RNA_access.hh"
 #include "RNA_types.hh"
 
-#include "intern/depsgraph.h"
+#include "intern/depsgraph.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.h
index 18a525d135f..60d263f25bb 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.h
@@ -10,7 +10,7 @@
 
 #include "BKE_modifier.h"
 
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc
index edccc81fc1b..d24bd9630bb 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc
@@ -7,7 +7,7 @@
  */
 
 #include "intern/eval/deg_eval_runtime_backup_gpencil.h"
-#include "intern/depsgraph.h"
+#include "intern/depsgraph.hh"
 
 #include "BKE_gpencil_legacy.h"
 #include "BKE_gpencil_update_cache_legacy.h"
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h
index 6f2e08f21e9..998be07d910 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h
@@ -13,7 +13,7 @@
 
 #include "BLI_session_uuid.h"
 
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 #include "intern/eval/deg_eval_runtime_backup_modifier.h"
 #include "intern/eval/deg_eval_runtime_backup_pose.h"
 
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_pose.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_pose.h
index 1372faeffe4..22835dbc370 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_pose.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_pose.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 
 #include "DNA_action_types.h"
 
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h
index 17ec1a4e072..29e85cb8638 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h
@@ -12,7 +12,7 @@
 
 #include "BLI_session_uuid.h"
 
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 #include "intern/eval/deg_eval_runtime_backup_sequence.h"
 
 struct Scene;
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_stats.cc b/source/blender/depsgraph/intern/eval/deg_eval_stats.cc
index 9c58ff15ab0..ee10f8edf1d 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_stats.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_stats.cc
@@ -10,12 +10,12 @@
 
 #include "BLI_utildefines.h"
 
-#include "intern/depsgraph.h"
+#include "intern/depsgraph.hh"
 
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_visibility.cc b/source/blender/depsgraph/intern/eval/deg_eval_visibility.cc
index 4407cb6449d..a864cef320f 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_visibility.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_visibility.cc
@@ -16,14 +16,14 @@
 #include "BLI_listbase.h"
 #include "BLI_stack.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_relation.h"
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_relation.hh"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/node/deg_node.cc b/source/blender/depsgraph/intern/node/deg_node.cc
index 9bd9b0fef44..31db53d5ae7 100644
--- a/source/blender/depsgraph/intern/node/deg_node.cc
+++ b/source/blender/depsgraph/intern/node/deg_node.cc
@@ -6,20 +6,20 @@
  * \ingroup depsgraph
  */
 
-#include "intern/node/deg_node.h"
+#include "intern/node/deg_node.hh"
 
 #include <cstdio>
 
 #include "BLI_utildefines.h"
 
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_relation.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_relation.hh"
 #include "intern/eval/deg_eval_copy_on_write.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_factory.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
-#include "intern/node/deg_node_time.h"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_factory.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
+#include "intern/node/deg_node_time.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/node/deg_node.h b/source/blender/depsgraph/intern/node/deg_node.hh
similarity index 98%
rename from source/blender/depsgraph/intern/node/deg_node.h
rename to source/blender/depsgraph/intern/node/deg_node.hh
index 537f3e5daf9..8b68fae222b 100644
--- a/source/blender/depsgraph/intern/node/deg_node.h
+++ b/source/blender/depsgraph/intern/node/deg_node.hh
@@ -10,11 +10,11 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 
 #include "BLI_utildefines.h"
 
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_build.hh"
 
 struct ID;
 struct Scene;
diff --git a/source/blender/depsgraph/intern/node/deg_node_component.cc b/source/blender/depsgraph/intern/node/deg_node_component.cc
index 5181227d4b3..227f463fe27 100644
--- a/source/blender/depsgraph/intern/node/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_component.cc
@@ -6,7 +6,7 @@
  * \ingroup depsgraph
  */
 
-#include "intern/node/deg_node_component.h"
+#include "intern/node/deg_node_component.hh"
 
 #include <cstdio>
 #include <cstring> /* required for STREQ later on. */
@@ -19,9 +19,9 @@
 
 #include "BKE_action.h"
 
-#include "intern/node/deg_node_factory.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/node/deg_node_factory.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/node/deg_node_component.h b/source/blender/depsgraph/intern/node/deg_node_component.hh
similarity index 98%
rename from source/blender/depsgraph/intern/node/deg_node_component.h
rename to source/blender/depsgraph/intern/node/deg_node_component.hh
index 9763c2303be..1cec0757a15 100644
--- a/source/blender/depsgraph/intern/node/deg_node_component.h
+++ b/source/blender/depsgraph/intern/node/deg_node_component.hh
@@ -9,9 +9,9 @@
 #pragma once
 
 #include "intern/eval/deg_eval_copy_on_write.h"
-#include "intern/node/deg_node.h"
-#include "intern/node/deg_node_id.h"
-#include "intern/node/deg_node_operation.h"
+#include "intern/node/deg_node.hh"
+#include "intern/node/deg_node_id.hh"
+#include "intern/node/deg_node_operation.hh"
 
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/depsgraph/intern/node/deg_node_factory.cc b/source/blender/depsgraph/intern/node/deg_node_factory.cc
index 3cf69efae98..9db0634ebe5 100644
--- a/source/blender/depsgraph/intern/node/deg_node_factory.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_factory.cc
@@ -6,7 +6,7 @@
  * \ingroup depsgraph
  */
 
-#include "intern/node/deg_node_factory.h"
+#include "intern/node/deg_node_factory.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/node/deg_node_factory.h b/source/blender/depsgraph/intern/node/deg_node_factory.hh
similarity index 89%
rename from source/blender/depsgraph/intern/node/deg_node_factory.h
rename to source/blender/depsgraph/intern/node/deg_node_factory.hh
index 99ee63099b7..4cecb7e5f4e 100644
--- a/source/blender/depsgraph/intern/node/deg_node_factory.h
+++ b/source/blender/depsgraph/intern/node/deg_node_factory.hh
@@ -10,8 +10,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "intern/depsgraph_type.h"
-#include "intern/node/deg_node.h"
+#include "intern/depsgraph_type.hh"
+#include "intern/node/deg_node.hh"
 
 struct ID;
 
@@ -42,4 +42,4 @@ DepsNodeFactory *type_get_factory(NodeType type);
 
 }  // namespace blender::deg
 
-#include "intern/node/deg_node_factory_impl.h"
+#include "intern/node/deg_node_factory_impl.hh"
diff --git a/source/blender/depsgraph/intern/node/deg_node_factory_impl.h b/source/blender/depsgraph/intern/node/deg_node_factory_impl.hh
similarity index 96%
rename from source/blender/depsgraph/intern/node/deg_node_factory_impl.h
rename to source/blender/depsgraph/intern/node/deg_node_factory_impl.hh
index 7d0627fdb0d..2a73ede30de 100644
--- a/source/blender/depsgraph/intern/node/deg_node_factory_impl.h
+++ b/source/blender/depsgraph/intern/node/deg_node_factory_impl.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "intern/node/deg_node_factory.h"
+#include "intern/node/deg_node_factory.hh"
 
 struct ID;
 
diff --git a/source/blender/depsgraph/intern/node/deg_node_id.cc b/source/blender/depsgraph/intern/node/deg_node_id.cc
index f8d60a01ebc..5fde8672c9d 100644
--- a/source/blender/depsgraph/intern/node/deg_node_id.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_id.cc
@@ -6,7 +6,7 @@
  * \ingroup depsgraph
  */
 
-#include "intern/node/deg_node_id.h"
+#include "intern/node/deg_node_id.hh"
 
 #include <cstdio>
 #include <cstring> /* required for STREQ later on. */
@@ -19,12 +19,12 @@
 
 #include "BKE_lib_id.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "intern/eval/deg_eval_copy_on_write.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_factory.h"
-#include "intern/node/deg_node_time.h"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_factory.hh"
+#include "intern/node/deg_node_time.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/node/deg_node_id.h b/source/blender/depsgraph/intern/node/deg_node_id.hh
similarity index 99%
rename from source/blender/depsgraph/intern/node/deg_node_id.h
rename to source/blender/depsgraph/intern/node/deg_node_id.hh
index 1df666c0fdb..d8ec8dbf8f3 100644
--- a/source/blender/depsgraph/intern/node/deg_node_id.h
+++ b/source/blender/depsgraph/intern/node/deg_node_id.hh
@@ -11,7 +11,7 @@
 #include "BLI_ghash.h"
 #include "BLI_sys_types.h"
 #include "DNA_ID.h"
-#include "intern/node/deg_node.h"
+#include "intern/node/deg_node.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc
index 86002308095..dcde5dcae59 100644
--- a/source/blender/depsgraph/intern/node/deg_node_operation.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc
@@ -6,16 +6,16 @@
  * \ingroup depsgraph
  */
 
-#include "intern/node/deg_node_operation.h"
+#include "intern/node/deg_node_operation.hh"
 
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
 
-#include "intern/depsgraph.h"
-#include "intern/node/deg_node_component.h"
-#include "intern/node/deg_node_factory.h"
-#include "intern/node/deg_node_id.h"
+#include "intern/depsgraph.hh"
+#include "intern/node/deg_node_component.hh"
+#include "intern/node/deg_node_factory.hh"
+#include "intern/node/deg_node_id.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.h b/source/blender/depsgraph/intern/node/deg_node_operation.hh
similarity index 99%
rename from source/blender/depsgraph/intern/node/deg_node_operation.h
rename to source/blender/depsgraph/intern/node/deg_node_operation.hh
index 21eaef7e936..223038f1a7c 100644
--- a/source/blender/depsgraph/intern/node/deg_node_operation.h
+++ b/source/blender/depsgraph/intern/node/deg_node_operation.hh
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "intern/node/deg_node.h"
+#include "intern/node/deg_node.hh"
 
-#include "intern/depsgraph_type.h"
+#include "intern/depsgraph_type.hh"
 
 struct Depsgraph;
 
diff --git a/source/blender/depsgraph/intern/node/deg_node_time.cc b/source/blender/depsgraph/intern/node/deg_node_time.cc
index f4131c72a4f..f768b689e65 100644
--- a/source/blender/depsgraph/intern/node/deg_node_time.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_time.cc
@@ -6,12 +6,12 @@
  * \ingroup depsgraph
  */
 
-#include "intern/node/deg_node_time.h"
+#include "intern/node/deg_node_time.hh"
 
 #include "DNA_scene_types.h"
 
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_relation.h"
+#include "intern/depsgraph.hh"
+#include "intern/depsgraph_relation.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/node/deg_node_time.h b/source/blender/depsgraph/intern/node/deg_node_time.hh
similarity index 93%
rename from source/blender/depsgraph/intern/node/deg_node_time.h
rename to source/blender/depsgraph/intern/node/deg_node_time.hh
index 7b8153feba4..5158987c9c6 100644
--- a/source/blender/depsgraph/intern/node/deg_node_time.h
+++ b/source/blender/depsgraph/intern/node/deg_node_time.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "intern/node/deg_node.h"
+#include "intern/node/deg_node.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/draw/engines/compositor/compositor_engine.cc b/source/blender/draw/engines/compositor/compositor_engine.cc
index d967a9ba19e..ece9068a291 100644
--- a/source/blender/draw/engines/compositor/compositor_engine.cc
+++ b/source/blender/draw/engines/compositor/compositor_engine.cc
@@ -18,7 +18,7 @@
 #include "DNA_vec_types.h"
 #include "DNA_view3d_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_view3d.hh"
 
diff --git a/source/blender/draw/engines/eevee/eevee_bloom.cc b/source/blender/draw/engines/eevee/eevee_bloom.cc
index c781594b9e3..8e3026de8c7 100644
--- a/source/blender/draw/engines/eevee/eevee_bloom.cc
+++ b/source/blender/draw/engines/eevee/eevee_bloom.cc
@@ -12,7 +12,7 @@
 
 #include "GPU_texture.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "eevee_private.h"
 
diff --git a/source/blender/draw/engines/eevee/eevee_data.cc b/source/blender/draw/engines/eevee/eevee_data.cc
index 36c64aeb791..30f7faecd0d 100644
--- a/source/blender/draw/engines/eevee/eevee_data.cc
+++ b/source/blender/draw/engines/eevee/eevee_data.cc
@@ -17,7 +17,7 @@
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_vertex_buffer.h"
 
diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.cc b/source/blender/draw/engines/eevee/eevee_depth_of_field.cc
index 83d18ca5f6b..66b5efbad68 100644
--- a/source/blender/draw/engines/eevee/eevee_depth_of_field.cc
+++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.cc
@@ -26,8 +26,8 @@
 
 #include "BLI_string_utils.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_framebuffer.h"
 #include "GPU_texture.h"
diff --git a/source/blender/draw/engines/eevee/eevee_engine.cc b/source/blender/draw/engines/eevee/eevee_engine.cc
index 6e1bee37b9f..4712bb57a89 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.cc
+++ b/source/blender/draw/engines/eevee/eevee_engine.cc
@@ -16,7 +16,7 @@
 
 #include "BKE_object.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_world_types.h"
 
diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.cc b/source/blender/draw/engines/eevee/eevee_lightcache.cc
index b49c0126099..c7098f2ac72 100644
--- a/source/blender/draw/engines/eevee/eevee_lightcache.cc
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.cc
@@ -15,8 +15,8 @@
 #include "BLI_endian_switch.h"
 #include "BLI_threads.h"
 
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BKE_object.h"
 
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.cc b/source/blender/draw/engines/eevee/eevee_lightprobes.cc
index cccb8d56a00..e57460928c8 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.cc
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.cc
@@ -27,7 +27,7 @@
 #include "GPU_texture.h"
 #include "GPU_uniform_buffer.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "eevee_lightcache.h"
 #include "eevee_private.h"
diff --git a/source/blender/draw/engines/eevee/eevee_lights.cc b/source/blender/draw/engines/eevee/eevee_lights.cc
index b1bcfe3b2da..eb13a9cbd88 100644
--- a/source/blender/draw/engines/eevee/eevee_lights.cc
+++ b/source/blender/draw/engines/eevee/eevee_lights.cc
@@ -11,7 +11,7 @@
 
 #include "BKE_object.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "eevee_private.h"
 
diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.cc b/source/blender/draw/engines/eevee/eevee_lookdev.cc
index 6176f63d99b..949f2d12c1e 100644
--- a/source/blender/draw/engines/eevee/eevee_lookdev.cc
+++ b/source/blender/draw/engines/eevee/eevee_lookdev.cc
@@ -17,7 +17,7 @@
 #include "DNA_screen_types.h"
 #include "DNA_world_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_screen.hh"
 
diff --git a/source/blender/draw/engines/eevee/eevee_materials.cc b/source/blender/draw/engines/eevee/eevee_materials.cc
index e18fdf23f8b..11ac755cbf8 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.cc
+++ b/source/blender/draw/engines/eevee/eevee_materials.cc
@@ -27,7 +27,7 @@
 
 #include "GPU_material.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "../eevee_next/eevee_lut.hh"
 #include "eevee_engine.h"
diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.cc b/source/blender/draw/engines/eevee/eevee_motion_blur.cc
index c161d7c3c3c..c530c9a8713 100644
--- a/source/blender/draw/engines/eevee/eevee_motion_blur.cc
+++ b/source/blender/draw/engines/eevee/eevee_motion_blur.cc
@@ -29,8 +29,8 @@
 
 #include "ED_screen.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_batch.h"
 #include "GPU_texture.h"
diff --git a/source/blender/draw/engines/eevee/eevee_occlusion.cc b/source/blender/draw/engines/eevee/eevee_occlusion.cc
index 37a44a3de77..d74401e5b4d 100644
--- a/source/blender/draw/engines/eevee/eevee_occlusion.cc
+++ b/source/blender/draw/engines/eevee/eevee_occlusion.cc
@@ -12,7 +12,7 @@
 
 #include "BLI_string_utils.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "BKE_global.h" /* for G.debug_value */
 
diff --git a/source/blender/draw/engines/eevee/eevee_render.cc b/source/blender/draw/engines/eevee/eevee_render.cc
index ab2a6a191f8..595f205c94f 100644
--- a/source/blender/draw/engines/eevee/eevee_render.cc
+++ b/source/blender/draw/engines/eevee/eevee_render.cc
@@ -22,7 +22,7 @@
 #include "BLI_rand.h"
 #include "BLI_rect.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_capabilities.h"
 #include "GPU_context.h"
diff --git a/source/blender/draw/engines/eevee/eevee_renderpasses.cc b/source/blender/draw/engines/eevee/eevee_renderpasses.cc
index 087e8129f2a..79ef7dbcd9b 100644
--- a/source/blender/draw/engines/eevee/eevee_renderpasses.cc
+++ b/source/blender/draw/engines/eevee/eevee_renderpasses.cc
@@ -16,7 +16,7 @@
 #include "BLI_hash.h"
 #include "BLI_string_utils.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "eevee_private.h"
 
diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.cc b/source/blender/draw/engines/eevee/eevee_screen_raytrace.cc
index 9d52521a73f..f37e4807d3b 100644
--- a/source/blender/draw/engines/eevee/eevee_screen_raytrace.cc
+++ b/source/blender/draw/engines/eevee/eevee_screen_raytrace.cc
@@ -13,7 +13,7 @@
 #include "BLI_dynstr.h"
 #include "BLI_string_utils.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_platform.h"
 #include "GPU_texture.h"
diff --git a/source/blender/draw/engines/eevee/eevee_shadows.cc b/source/blender/draw/engines/eevee/eevee_shadows.cc
index 7067d15cd4f..c6a2e34df3c 100644
--- a/source/blender/draw/engines/eevee/eevee_shadows.cc
+++ b/source/blender/draw/engines/eevee/eevee_shadows.cc
@@ -11,7 +11,7 @@
 
 #include "BKE_object.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "eevee_private.h"
 
diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.cc b/source/blender/draw/engines/eevee/eevee_subsurface.cc
index 027eee811a9..b1878853250 100644
--- a/source/blender/draw/engines/eevee/eevee_subsurface.cc
+++ b/source/blender/draw/engines/eevee/eevee_subsurface.cc
@@ -12,7 +12,7 @@
 
 #include "BLI_string_utils.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_capabilities.h"
 #include "GPU_material.h"
diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.cc b/source/blender/draw/engines/eevee/eevee_temporal_sampling.cc
index 1f55b59258f..aa3c6602d0c 100644
--- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.cc
+++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.cc
@@ -14,7 +14,7 @@
 
 #include "BLI_rand.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_texture.h"
 #include "eevee_private.h"
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.cc b/source/blender/draw/engines/eevee/eevee_volumes.cc
index 5faef223c52..8165c7faf4e 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.cc
+++ b/source/blender/draw/engines/eevee/eevee_volumes.cc
@@ -28,7 +28,7 @@
 
 #include "ED_screen.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_capabilities.h"
 #include "GPU_context.h"
diff --git a/source/blender/draw/engines/eevee_next/eevee_camera.cc b/source/blender/draw/engines/eevee_next/eevee_camera.cc
index 2365b68a4bd..727f4344429 100644
--- a/source/blender/draw/engines/eevee_next/eevee_camera.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_camera.cc
@@ -14,8 +14,11 @@
 #include "DNA_view3d_types.h"
 
 #include "BKE_camera.h"
-#include "DEG_depsgraph_query.h"
+
+#include "DEG_depsgraph_query.hh"
+
 #include "ED_view3d.hh"
+
 #include "RE_pipeline.h"
 #include "render_types.h"
 
diff --git a/source/blender/draw/engines/eevee_next/eevee_instance.cc b/source/blender/draw/engines/eevee_next/eevee_instance.cc
index a8d6db72acd..909d02c0cc7 100644
--- a/source/blender/draw/engines/eevee_next/eevee_instance.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_instance.cc
@@ -13,7 +13,7 @@
 #include "BKE_global.h"
 #include "BKE_object.h"
 #include "BLI_rect.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #include "DNA_ID.h"
 #include "DNA_lightprobe_types.h"
 #include "DNA_modifier_types.h"
diff --git a/source/blender/draw/engines/eevee_next/eevee_instance.hh b/source/blender/draw/engines/eevee_next/eevee_instance.hh
index 0b303a49598..44c56f14ce2 100644
--- a/source/blender/draw/engines/eevee_next/eevee_instance.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_instance.hh
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "BKE_object.h"
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 #include "DNA_lightprobe_types.h"
 #include "DRW_render.h"
 
diff --git a/source/blender/draw/engines/eevee_next/eevee_lightcache.cc b/source/blender/draw/engines/eevee_next/eevee_lightcache.cc
index b55efd4ee41..75e509da014 100644
--- a/source/blender/draw/engines/eevee_next/eevee_lightcache.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_lightcache.cc
@@ -19,8 +19,8 @@
 
 #include "BLI_threads.h"
 
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "PIL_time.h"
 
diff --git a/source/blender/draw/engines/eevee_next/eevee_motion_blur.cc b/source/blender/draw/engines/eevee_next/eevee_motion_blur.cc
index 5240f0265e8..806e6e5128c 100644
--- a/source/blender/draw/engines/eevee_next/eevee_motion_blur.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_motion_blur.cc
@@ -7,7 +7,7 @@
  */
 
 // #include "BLI_map.hh"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "eevee_instance.hh"
 #include "eevee_motion_blur.hh"
diff --git a/source/blender/draw/engines/eevee_next/eevee_motion_blur.hh b/source/blender/draw/engines/eevee_next/eevee_motion_blur.hh
index b24e02246af..290facd368a 100644
--- a/source/blender/draw/engines/eevee_next/eevee_motion_blur.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_motion_blur.hh
@@ -43,7 +43,7 @@
 #pragma once
 
 #include "BLI_map.hh"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "eevee_sampling.hh"
 #include "eevee_shader_shared.hh"
diff --git a/source/blender/draw/engines/eevee_next/eevee_sync.cc b/source/blender/draw/engines/eevee_next/eevee_sync.cc
index 9b6b27d509d..62695810e15 100644
--- a/source/blender/draw/engines/eevee_next/eevee_sync.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_sync.cc
@@ -14,7 +14,7 @@
 #include "BKE_object.h"
 #include "BKE_paint.hh"
 #include "BKE_pbvh_api.hh"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #include "DNA_curves_types.h"
 #include "DNA_gpencil_legacy_types.h"
 #include "DNA_modifier_types.h"
diff --git a/source/blender/draw/engines/eevee_next/eevee_velocity.cc b/source/blender/draw/engines/eevee_next/eevee_velocity.cc
index 6c0b100b663..84eef9f469b 100644
--- a/source/blender/draw/engines/eevee_next/eevee_velocity.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_velocity.cc
@@ -14,7 +14,7 @@
 #include "BKE_duplilist.h"
 #include "BKE_object.h"
 #include "BLI_map.hh"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #include "DNA_modifier_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_rigidbody_types.h"
diff --git a/source/blender/draw/engines/eevee_next/eevee_world.cc b/source/blender/draw/engines/eevee_next/eevee_world.cc
index 1f4745e4922..3c92047213b 100644
--- a/source/blender/draw/engines/eevee_next/eevee_world.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_world.cc
@@ -9,7 +9,7 @@
 #include "BKE_lib_id.h"
 #include "BKE_node.hh"
 #include "BKE_world.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #include "NOD_shader.h"
 
 #include "eevee_instance.hh"
diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.cc b/source/blender/draw/engines/gpencil/gpencil_cache_utils.cc
index ff3d062b19e..5d76ccc1446 100644
--- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.cc
+++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.cc
@@ -28,7 +28,7 @@
 
 #include "draw_cache_impl.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Object
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.cc b/source/blender/draw/engines/gpencil/gpencil_engine.cc
index 3a1c6dbfa68..d47e40f52f0 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.cc
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.cc
@@ -8,7 +8,7 @@
 
 #include "BKE_gpencil_modifier_legacy.h"
 #include "BLI_listbase_wrapper.hh"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #include "DNA_shader_fx_types.h"
 #include "DRW_engine.h"
 #include "DRW_render.h"
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine_c.cc b/source/blender/draw/engines/gpencil/gpencil_engine_c.cc
index 98fe3e27f1f..ea6b2ab6862 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine_c.cc
+++ b/source/blender/draw/engines/gpencil/gpencil_engine_c.cc
@@ -33,7 +33,7 @@
 
 #include "gpencil_engine.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_screen.hh"
 #include "ED_view3d.hh"
diff --git a/source/blender/draw/engines/gpencil/gpencil_render.cc b/source/blender/draw/engines/gpencil/gpencil_render.cc
index dfdaa55087a..6fe6bd90f3d 100644
--- a/source/blender/draw/engines/gpencil/gpencil_render.cc
+++ b/source/blender/draw/engines/gpencil/gpencil_render.cc
@@ -13,7 +13,7 @@
 
 #include "DNA_gpencil_legacy_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "RE_pipeline.h"
 
diff --git a/source/blender/draw/engines/overlay/overlay_armature.cc b/source/blender/draw/engines/overlay/overlay_armature.cc
index 3b89dc643a7..e8b55a78bb7 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.cc
+++ b/source/blender/draw/engines/overlay/overlay_armature.cc
@@ -31,7 +31,7 @@
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_armature.hh"
 #include "ED_view3d.hh"
diff --git a/source/blender/draw/engines/overlay/overlay_edit_curves.cc b/source/blender/draw/engines/overlay/overlay_edit_curves.cc
index 2e9f62644ee..09ddd6f2d2a 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_curves.cc
+++ b/source/blender/draw/engines/overlay/overlay_edit_curves.cc
@@ -12,7 +12,7 @@
 
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "draw_cache_impl.hh"
 
diff --git a/source/blender/draw/engines/overlay/overlay_edit_uv.cc b/source/blender/draw/engines/overlay/overlay_edit_uv.cc
index d5395e52e18..a6f2a2161e0 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_uv.cc
+++ b/source/blender/draw/engines/overlay/overlay_edit_uv.cc
@@ -23,7 +23,7 @@
 #include "DNA_brush_types.h"
 #include "DNA_mesh_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_image.hh"
 
diff --git a/source/blender/draw/engines/overlay/overlay_engine.cc b/source/blender/draw/engines/overlay/overlay_engine.cc
index ba240c46a9c..5ba9e67568a 100644
--- a/source/blender/draw/engines/overlay/overlay_engine.cc
+++ b/source/blender/draw/engines/overlay/overlay_engine.cc
@@ -11,7 +11,7 @@
 #include "DRW_engine.h"
 #include "DRW_render.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_view3d.hh"
 
diff --git a/source/blender/draw/engines/overlay/overlay_extra.cc b/source/blender/draw/engines/overlay/overlay_extra.cc
index 76d40db4bd3..5f0b406db46 100644
--- a/source/blender/draw/engines/overlay/overlay_extra.cc
+++ b/source/blender/draw/engines/overlay/overlay_extra.cc
@@ -39,7 +39,7 @@
 #include "DNA_pointcache_types.h"
 #include "DNA_rigidbody_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_view3d.hh"
 
diff --git a/source/blender/draw/engines/overlay/overlay_gpencil_legacy.cc b/source/blender/draw/engines/overlay/overlay_gpencil_legacy.cc
index 969969bc20e..908c66363fd 100644
--- a/source/blender/draw/engines/overlay/overlay_gpencil_legacy.cc
+++ b/source/blender/draw/engines/overlay/overlay_gpencil_legacy.cc
@@ -14,7 +14,7 @@
 
 #include "DNA_gpencil_legacy_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_view3d.hh"
 
diff --git a/source/blender/draw/engines/overlay/overlay_grid.cc b/source/blender/draw/engines/overlay/overlay_grid.cc
index a3f49df1260..0bb2715941d 100644
--- a/source/blender/draw/engines/overlay/overlay_grid.cc
+++ b/source/blender/draw/engines/overlay/overlay_grid.cc
@@ -13,7 +13,7 @@
 #include "DNA_camera_types.h"
 #include "DNA_screen_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_image.hh"
 #include "ED_view3d.hh"
diff --git a/source/blender/draw/engines/overlay/overlay_image.cc b/source/blender/draw/engines/overlay/overlay_image.cc
index a897b8d3cec..23788502484 100644
--- a/source/blender/draw/engines/overlay/overlay_image.cc
+++ b/source/blender/draw/engines/overlay/overlay_image.cc
@@ -19,7 +19,7 @@
 #include "DNA_camera_types.h"
 #include "DNA_screen_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_view3d.hh"
 
diff --git a/source/blender/draw/engines/overlay/overlay_metaball.cc b/source/blender/draw/engines/overlay/overlay_metaball.cc
index f70d576b2f0..a333f681b98 100644
--- a/source/blender/draw/engines/overlay/overlay_metaball.cc
+++ b/source/blender/draw/engines/overlay/overlay_metaball.cc
@@ -12,7 +12,7 @@
 
 #include "BKE_object.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_mball.hh"
 
diff --git a/source/blender/draw/engines/overlay/overlay_motion_path.cc b/source/blender/draw/engines/overlay/overlay_motion_path.cc
index bebab24a887..8832ba27411 100644
--- a/source/blender/draw/engines/overlay/overlay_motion_path.cc
+++ b/source/blender/draw/engines/overlay/overlay_motion_path.cc
@@ -13,7 +13,7 @@
 
 #include "DNA_armature_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_batch.h"
 
diff --git a/source/blender/draw/engines/overlay/overlay_next_engine.cc b/source/blender/draw/engines/overlay/overlay_next_engine.cc
index 9d35343bc30..a2e424b97f0 100644
--- a/source/blender/draw/engines/overlay/overlay_next_engine.cc
+++ b/source/blender/draw/engines/overlay/overlay_next_engine.cc
@@ -11,7 +11,7 @@
 #include "DRW_engine.h"
 #include "DRW_render.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_view3d.hh"
 
diff --git a/source/blender/draw/engines/overlay/overlay_next_grid.hh b/source/blender/draw/engines/overlay/overlay_next_grid.hh
index 64042599596..e177b9496a5 100644
--- a/source/blender/draw/engines/overlay/overlay_next_grid.hh
+++ b/source/blender/draw/engines/overlay/overlay_next_grid.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #include "DNA_camera_types.h"
 #include "DNA_space_types.h"
 #include "ED_view3d.hh"
diff --git a/source/blender/draw/engines/overlay/overlay_next_instance.cc b/source/blender/draw/engines/overlay/overlay_next_instance.cc
index cfe232a90b3..ceefef9cb95 100644
--- a/source/blender/draw/engines/overlay/overlay_next_instance.cc
+++ b/source/blender/draw/engines/overlay/overlay_next_instance.cc
@@ -6,8 +6,10 @@
  * \ingroup overlay
  */
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
+
 #include "ED_view3d.hh"
+
 #include "draw_debug.hh"
 
 #include "overlay_next_instance.hh"
diff --git a/source/blender/draw/engines/overlay/overlay_paint.cc b/source/blender/draw/engines/overlay/overlay_paint.cc
index e918a03edc3..83d9269e8c3 100644
--- a/source/blender/draw/engines/overlay/overlay_paint.cc
+++ b/source/blender/draw/engines/overlay/overlay_paint.cc
@@ -12,7 +12,7 @@
 
 #include "DNA_mesh_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "overlay_private.hh"
 
diff --git a/source/blender/draw/engines/overlay/overlay_particle.cc b/source/blender/draw/engines/overlay/overlay_particle.cc
index d2698aadf77..14927f9907a 100644
--- a/source/blender/draw/engines/overlay/overlay_particle.cc
+++ b/source/blender/draw/engines/overlay/overlay_particle.cc
@@ -8,7 +8,7 @@
 
 #include "DRW_render.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_particle_types.h"
 
diff --git a/source/blender/draw/engines/overlay/overlay_sculpt_curves.cc b/source/blender/draw/engines/overlay/overlay_sculpt_curves.cc
index fa1cc2f7859..6c5cde0a4cb 100644
--- a/source/blender/draw/engines/overlay/overlay_sculpt_curves.cc
+++ b/source/blender/draw/engines/overlay/overlay_sculpt_curves.cc
@@ -15,7 +15,7 @@
 #include "BKE_crazyspace.hh"
 #include "BKE_curves.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 void OVERLAY_sculpt_curves_cache_init(OVERLAY_Data *vedata)
 {
diff --git a/source/blender/draw/engines/select/select_draw_utils.cc b/source/blender/draw/engines/select/select_draw_utils.cc
index 35492c1ed98..abd3a7bfc3a 100644
--- a/source/blender/draw/engines/select/select_draw_utils.cc
+++ b/source/blender/draw/engines/select/select_draw_utils.cc
@@ -17,8 +17,8 @@
 
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DRW_select_buffer.h"
 
diff --git a/source/blender/draw/engines/workbench/workbench_effect_dof.cc b/source/blender/draw/engines/workbench/workbench_effect_dof.cc
index be9cea59cfc..0fa00ffc031 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_dof.cc
+++ b/source/blender/draw/engines/workbench/workbench_effect_dof.cc
@@ -20,7 +20,7 @@
 #include "workbench_private.hh"
 
 #include "BKE_camera.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 namespace blender::workbench {
 /**
diff --git a/source/blender/draw/engines/workbench/workbench_engine.cc b/source/blender/draw/engines/workbench/workbench_engine.cc
index ccec23d689e..cbc5d3bfafe 100644
--- a/source/blender/draw/engines/workbench/workbench_engine.cc
+++ b/source/blender/draw/engines/workbench/workbench_engine.cc
@@ -9,7 +9,7 @@
 #include "BKE_particle.h"
 #include "BKE_pbvh_api.hh"
 #include "BKE_report.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #include "DNA_fluid_types.h"
 #include "ED_paint.hh"
 #include "ED_view3d.hh"
diff --git a/source/blender/draw/engines/workbench/workbench_state.cc b/source/blender/draw/engines/workbench/workbench_state.cc
index 2d58913aa9e..5819c878b64 100644
--- a/source/blender/draw/engines/workbench/workbench_state.cc
+++ b/source/blender/draw/engines/workbench/workbench_state.cc
@@ -12,7 +12,7 @@
 #include "BKE_paint.hh"
 #include "BKE_particle.h"
 #include "BKE_pbvh_api.hh"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #include "DNA_fluid_types.h"
 #include "ED_paint.hh"
 #include "ED_view3d.hh"
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 294c61c4e6b..ced0dd08473 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -50,7 +50,7 @@
 
 #include "RE_engine.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/draw/intern/draw_cache_impl_curves.cc b/source/blender/draw/intern/draw_cache_impl_curves.cc
index f06051a12c8..3b185f12592 100644
--- a/source/blender/draw/intern/draw_cache_impl_curves.cc
+++ b/source/blender/draw/intern/draw_cache_impl_curves.cc
@@ -24,7 +24,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "BKE_crazyspace.hh"
 #include "BKE_curves.hh"
diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil_legacy.cc b/source/blender/draw/intern/draw_cache_impl_gpencil_legacy.cc
index aa43dc4f01e..03c4fd70a09 100644
--- a/source/blender/draw/intern/draw_cache_impl_gpencil_legacy.cc
+++ b/source/blender/draw/intern/draw_cache_impl_gpencil_legacy.cc
@@ -21,7 +21,7 @@
 #include "ED_gpencil_legacy.hh"
 #include "GPU_batch.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLI_hash.h"
 #include "BLI_math_vector_types.hh"
diff --git a/source/blender/draw/intern/draw_cache_impl_particles.cc b/source/blender/draw/intern/draw_cache_impl_particles.cc
index 59112542021..e19be05df75 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.cc
+++ b/source/blender/draw/intern/draw_cache_impl_particles.cc
@@ -38,7 +38,7 @@
 #include "GPU_context.h"
 #include "GPU_material.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "draw_cache_impl.hh" /* own include */
 #include "draw_hair_private.h"
diff --git a/source/blender/draw/intern/draw_cache_impl_volume.cc b/source/blender/draw/intern/draw_cache_impl_volume.cc
index 4e5e2a3d96d..69753148f28 100644
--- a/source/blender/draw/intern/draw_cache_impl_volume.cc
+++ b/source/blender/draw/intern/draw_cache_impl_volume.cc
@@ -28,7 +28,7 @@
 #include "GPU_capabilities.h"
 #include "GPU_texture.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "DRW_render.h"
 
diff --git a/source/blender/draw/intern/draw_manager_c.cc b/source/blender/draw/intern/draw_manager_c.cc
index 626c4c32fb5..de4e78448c6 100644
--- a/source/blender/draw/intern/draw_manager_c.cc
+++ b/source/blender/draw/intern/draw_manager_c.cc
@@ -100,8 +100,8 @@
 
 #include "GPU_context.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DRW_select_buffer.h"
 
diff --git a/source/blender/draw/intern/draw_manager_shader.cc b/source/blender/draw/intern/draw_manager_shader.cc
index 3cee077e57a..10033e1ac83 100644
--- a/source/blender/draw/intern/draw_manager_shader.cc
+++ b/source/blender/draw/intern/draw_manager_shader.cc
@@ -21,7 +21,7 @@
 #include "BKE_global.h"
 #include "BKE_main.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_capabilities.h"
 #include "GPU_material.h"
diff --git a/source/blender/draw/intern/draw_select_buffer.cc b/source/blender/draw/intern/draw_select_buffer.cc
index e414f77e8ab..15e0782ddaa 100644
--- a/source/blender/draw/intern/draw_select_buffer.cc
+++ b/source/blender/draw/intern/draw_select_buffer.cc
@@ -19,8 +19,8 @@
 
 #include "GPU_select.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DRW_engine.h"
 #include "DRW_select_buffer.h"
diff --git a/source/blender/draw/tests/eevee_test.cc b/source/blender/draw/tests/eevee_test.cc
index 69853bcb612..654e86cdb36 100644
--- a/source/blender/draw/tests/eevee_test.cc
+++ b/source/blender/draw/tests/eevee_test.cc
@@ -9,7 +9,9 @@
 #include "BKE_main.h"
 #include "BKE_node.hh"
 #include "BKE_object.h"
-#include "DEG_depsgraph.h"
+
+#include "DEG_depsgraph.hh"
+
 #include "RNA_define.hh"
 
 #include "GPU_batch.h"
diff --git a/source/blender/editors/animation/anim_channels_defines.cc b/source/blender/editors/animation/anim_channels_defines.cc
index 1770e4c2f00..192015f1232 100644
--- a/source/blender/editors/animation/anim_channels_defines.cc
+++ b/source/blender/editors/animation/anim_channels_defines.cc
@@ -61,7 +61,7 @@
 #include "GPU_immediate.h"
 #include "GPU_state.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "UI_interface.hh"
 #include "UI_interface_icons.hh"
diff --git a/source/blender/editors/animation/anim_channels_edit.cc b/source/blender/editors/animation/anim_channels_edit.cc
index 477033f37e2..5a817cf96e7 100644
--- a/source/blender/editors/animation/anim_channels_edit.cc
+++ b/source/blender/editors/animation/anim_channels_edit.cc
@@ -40,8 +40,8 @@
 #include "BKE_scene.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "UI_interface.hh"
 #include "UI_view2d.hh"
diff --git a/source/blender/editors/animation/anim_deps.cc b/source/blender/editors/animation/anim_deps.cc
index 5259aa86213..ea453c5a6ab 100644
--- a/source/blender/editors/animation/anim_deps.cc
+++ b/source/blender/editors/animation/anim_deps.cc
@@ -32,7 +32,7 @@
 #include "BKE_main.h"
 #include "BKE_node.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
diff --git a/source/blender/editors/animation/anim_markers.cc b/source/blender/editors/animation/anim_markers.cc
index 686ab3cb590..56f832e01b8 100644
--- a/source/blender/editors/animation/anim_markers.cc
+++ b/source/blender/editors/animation/anim_markers.cc
@@ -54,8 +54,8 @@
 #include "ED_transform.hh"
 #include "ED_util.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Marker API
diff --git a/source/blender/editors/animation/anim_motion_paths.cc b/source/blender/editors/animation/anim_motion_paths.cc
index acb88c55f15..f1e4381c26f 100644
--- a/source/blender/editors/animation/anim_motion_paths.cc
+++ b/source/blender/editors/animation/anim_motion_paths.cc
@@ -23,9 +23,9 @@
 #include "BKE_main.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_batch.h"
 #include "GPU_vertex_buffer.h"
diff --git a/source/blender/editors/animation/anim_ops.cc b/source/blender/editors/animation/anim_ops.cc
index 6fa95623069..46418957f35 100644
--- a/source/blender/editors/animation/anim_ops.cc
+++ b/source/blender/editors/animation/anim_ops.cc
@@ -34,7 +34,7 @@
 #include "ED_sequencer.hh"
 #include "ED_time_scrub_ui.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "SEQ_iterator.h"
 #include "SEQ_sequencer.h"
diff --git a/source/blender/editors/animation/drivers.cc b/source/blender/editors/animation/drivers.cc
index 7006fd10755..e649369ec12 100644
--- a/source/blender/editors/animation/drivers.cc
+++ b/source/blender/editors/animation/drivers.cc
@@ -27,8 +27,8 @@
 #include "BKE_fcurve_driver.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_keyframing.hh"
 
diff --git a/source/blender/editors/animation/fmodifier_ui.cc b/source/blender/editors/animation/fmodifier_ui.cc
index abc339455e7..db1d9e935ea 100644
--- a/source/blender/editors/animation/fmodifier_ui.cc
+++ b/source/blender/editors/animation/fmodifier_ui.cc
@@ -42,7 +42,7 @@
 #include "ED_anim_api.hh"
 #include "ED_undo.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 using PanelDrawFn = void (*)(const bContext *, Panel *);
 static void fmodifier_panel_header(const bContext *C, Panel *panel);
diff --git a/source/blender/editors/animation/keyframing.cc b/source/blender/editors/animation/keyframing.cc
index f683ee05720..5779f5186c5 100644
--- a/source/blender/editors/animation/keyframing.cc
+++ b/source/blender/editors/animation/keyframing.cc
@@ -50,9 +50,9 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_anim_api.hh"
 #include "ED_keyframes_edit.hh"
diff --git a/source/blender/editors/animation/keyingsets.cc b/source/blender/editors/animation/keyingsets.cc
index 1faf930b63c..1e351a092d5 100644
--- a/source/blender/editors/animation/keyingsets.cc
+++ b/source/blender/editors/animation/keyingsets.cc
@@ -26,7 +26,7 @@
 #include "BKE_main.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_keyframing.hh"
 #include "ED_screen.hh"
diff --git a/source/blender/editors/armature/armature_add.cc b/source/blender/editors/armature/armature_add.cc
index c63237b6987..86f9fc7a71e 100644
--- a/source/blender/editors/armature/armature_add.cc
+++ b/source/blender/editors/armature/armature_add.cc
@@ -47,7 +47,7 @@
 
 #include "ANIM_bone_collections.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "armature_intern.h"
 
diff --git a/source/blender/editors/armature/armature_edit.cc b/source/blender/editors/armature/armature_edit.cc
index 223c454170a..a114399db0d 100644
--- a/source/blender/editors/armature/armature_edit.cc
+++ b/source/blender/editors/armature/armature_edit.cc
@@ -45,7 +45,7 @@
 
 #include "ANIM_bone_collections.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "armature_intern.h"
 
diff --git a/source/blender/editors/armature/armature_naming.cc b/source/blender/editors/armature/armature_naming.cc
index 1b941dce672..141b18db8b6 100644
--- a/source/blender/editors/armature/armature_naming.cc
+++ b/source/blender/editors/armature/armature_naming.cc
@@ -38,7 +38,7 @@
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/armature/armature_relations.cc b/source/blender/editors/armature/armature_relations.cc
index 92a0891f92f..2418a9ccd48 100644
--- a/source/blender/editors/armature/armature_relations.cc
+++ b/source/blender/editors/armature/armature_relations.cc
@@ -34,8 +34,8 @@
 #include "BKE_main.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/armature/armature_select.cc b/source/blender/editors/armature/armature_select.cc
index 7b5bbd0fcf2..f19d1c7a83b 100644
--- a/source/blender/editors/armature/armature_select.cc
+++ b/source/blender/editors/armature/armature_select.cc
@@ -39,7 +39,7 @@
 #include "ED_select_utils.hh"
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "GPU_select.h"
 
diff --git a/source/blender/editors/armature/armature_skinning.cc b/source/blender/editors/armature/armature_skinning.cc
index b5b5e4112dd..6bef27beb58 100644
--- a/source/blender/editors/armature/armature_skinning.cc
+++ b/source/blender/editors/armature/armature_skinning.cc
@@ -32,8 +32,8 @@
 #include "BKE_report.h"
 #include "BKE_subsurf.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_armature.hh"
 #include "ED_mesh.hh"
diff --git a/source/blender/editors/armature/armature_utils.cc b/source/blender/editors/armature/armature_utils.cc
index da0e3e81e45..7cdb484adcb 100644
--- a/source/blender/editors/armature/armature_utils.cc
+++ b/source/blender/editors/armature/armature_utils.cc
@@ -24,7 +24,7 @@
 #include "BKE_lib_id.h"
 #include "BKE_main.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_armature.hh"
 #include "ED_util.hh"
diff --git a/source/blender/editors/armature/bone_collections.cc b/source/blender/editors/armature/bone_collections.cc
index 9272657583e..ddf9e9932fa 100644
--- a/source/blender/editors/armature/bone_collections.cc
+++ b/source/blender/editors/armature/bone_collections.cc
@@ -18,7 +18,7 @@
 #include "BKE_layer.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/armature/editarmature_undo.cc b/source/blender/editors/armature/editarmature_undo.cc
index 16c44281ea6..29d22de763b 100644
--- a/source/blender/editors/armature/editarmature_undo.cc
+++ b/source/blender/editors/armature/editarmature_undo.cc
@@ -28,7 +28,7 @@
 #include "BKE_object.h"
 #include "BKE_undo_system.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_armature.hh"
 #include "ED_object.hh"
diff --git a/source/blender/editors/armature/meshlaplacian.cc b/source/blender/editors/armature/meshlaplacian.cc
index 954e68b9ed7..fc92e853480 100644
--- a/source/blender/editors/armature/meshlaplacian.cc
+++ b/source/blender/editors/armature/meshlaplacian.cc
@@ -34,7 +34,7 @@
 #include "ED_armature.hh"
 #include "ED_mesh.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "eigen_capi.h"
 
diff --git a/source/blender/editors/armature/pose_edit.cc b/source/blender/editors/armature/pose_edit.cc
index 0d8e6cb2f39..e5589d94c14 100644
--- a/source/blender/editors/armature/pose_edit.cc
+++ b/source/blender/editors/armature/pose_edit.cc
@@ -32,8 +32,8 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/armature/pose_group.cc b/source/blender/editors/armature/pose_group.cc
index fa0c39795b3..5d371d1a0f2 100644
--- a/source/blender/editors/armature/pose_group.cc
+++ b/source/blender/editors/armature/pose_group.cc
@@ -20,7 +20,7 @@
 #include "BKE_armature.h"
 #include "BKE_context.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/armature/pose_lib_2.cc b/source/blender/editors/armature/pose_lib_2.cc
index 2a1f0b76943..96beecc4aec 100644
--- a/source/blender/editors/armature/pose_lib_2.cc
+++ b/source/blender/editors/armature/pose_lib_2.cc
@@ -29,7 +29,7 @@
 #include "BKE_pose_backup.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/armature/pose_select.cc b/source/blender/editors/armature/pose_select.cc
index 2b603384cb2..e3f27a55725 100644
--- a/source/blender/editors/armature/pose_select.cc
+++ b/source/blender/editors/armature/pose_select.cc
@@ -29,7 +29,7 @@
 #include "BKE_object.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/armature/pose_transform.cc b/source/blender/editors/armature/pose_transform.cc
index a37cbff6c95..eb322edfb0c 100644
--- a/source/blender/editors/armature/pose_transform.cc
+++ b/source/blender/editors/armature/pose_transform.cc
@@ -33,8 +33,8 @@
 #include "BKE_object.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/armature/pose_utils.cc b/source/blender/editors/armature/pose_utils.cc
index 0768300f69e..9683dc6305a 100644
--- a/source/blender/editors/armature/pose_utils.cc
+++ b/source/blender/editors/armature/pose_utils.cc
@@ -25,7 +25,7 @@
 
 #include "BKE_context.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
diff --git a/source/blender/editors/curve/editcurve.cc b/source/blender/editors/curve/editcurve.cc
index 9bb2fd8ceb5..ecf1fe29027 100644
--- a/source/blender/editors/curve/editcurve.cc
+++ b/source/blender/editors/curve/editcurve.cc
@@ -37,9 +37,9 @@
 #include "BKE_modifier.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/curve/editcurve_add.cc b/source/blender/editors/curve/editcurve_add.cc
index 5c23df19130..7a37cc3f774 100644
--- a/source/blender/editors/curve/editcurve_add.cc
+++ b/source/blender/editors/curve/editcurve_add.cc
@@ -22,7 +22,7 @@
 #include "BKE_curve.h"
 #include "BKE_layer.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
 
diff --git a/source/blender/editors/curve/editcurve_paint.cc b/source/blender/editors/curve/editcurve_paint.cc
index f07bdae0a6d..134ccfb6562 100644
--- a/source/blender/editors/curve/editcurve_paint.cc
+++ b/source/blender/editors/curve/editcurve_paint.cc
@@ -21,7 +21,7 @@
 #include "BKE_fcurve.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/curve/editcurve_pen.cc b/source/blender/editors/curve/editcurve_pen.cc
index 2c00a7eee75..c75b81f333f 100644
--- a/source/blender/editors/curve/editcurve_pen.cc
+++ b/source/blender/editors/curve/editcurve_pen.cc
@@ -19,7 +19,7 @@
 #include "BKE_context.h"
 #include "BKE_curve.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/curve/editcurve_query.cc b/source/blender/editors/curve/editcurve_query.cc
index 68807a8d9ea..00daa5ff844 100644
--- a/source/blender/editors/curve/editcurve_query.cc
+++ b/source/blender/editors/curve/editcurve_query.cc
@@ -18,8 +18,8 @@
 #include "BKE_fcurve.h"
 #include "BKE_layer.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_curve.hh"
 #include "ED_view3d.hh"
diff --git a/source/blender/editors/curve/editcurve_select.cc b/source/blender/editors/curve/editcurve_select.cc
index eed05a84396..72eb7a3367e 100644
--- a/source/blender/editors/curve/editcurve_select.cc
+++ b/source/blender/editors/curve/editcurve_select.cc
@@ -39,7 +39,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Utilities
diff --git a/source/blender/editors/curve/editcurve_undo.cc b/source/blender/editors/curve/editcurve_undo.cc
index ac8953dc418..89dab16340f 100644
--- a/source/blender/editors/curve/editcurve_undo.cc
+++ b/source/blender/editors/curve/editcurve_undo.cc
@@ -27,7 +27,7 @@
 #include "BKE_object.h"
 #include "BKE_undo_system.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_curve.hh"
 #include "ED_undo.hh"
diff --git a/source/blender/editors/curve/editfont.cc b/source/blender/editors/curve/editfont.cc
index d7612bde38c..1f1a699999a 100644
--- a/source/blender/editors/curve/editfont.cc
+++ b/source/blender/editors/curve/editfont.cc
@@ -40,8 +40,8 @@
 
 #include "BLT_translation.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/curve/editfont_undo.cc b/source/blender/editors/curve/editfont_undo.cc
index 638b2bd532b..13fad653c6f 100644
--- a/source/blender/editors/curve/editfont_undo.cc
+++ b/source/blender/editors/curve/editfont_undo.cc
@@ -26,7 +26,7 @@
 #include "BKE_undo_system.h"
 #include "BKE_vfont.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_curve.hh"
 #include "ED_object.hh"
diff --git a/source/blender/editors/curves/intern/curves_ops.cc b/source/blender/editors/curves/intern/curves_ops.cc
index 6ef71b1f4c9..f76c7b18533 100644
--- a/source/blender/editors/curves/intern/curves_ops.cc
+++ b/source/blender/editors/curves/intern/curves_ops.cc
@@ -51,8 +51,8 @@
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/curves/intern/curves_undo.cc b/source/blender/editors/curves/intern/curves_undo.cc
index d9808b84856..31e32d1c866 100644
--- a/source/blender/editors/curves/intern/curves_undo.cc
+++ b/source/blender/editors/curves/intern/curves_undo.cc
@@ -16,7 +16,7 @@
 
 #include "CLG_log.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_curves.hh"
 #include "ED_undo.hh"
diff --git a/source/blender/editors/geometry/geometry_attributes.cc b/source/blender/editors/geometry/geometry_attributes.cc
index 6770c80edda..f01385f219a 100644
--- a/source/blender/editors/geometry/geometry_attributes.cc
+++ b/source/blender/editors/geometry/geometry_attributes.cc
@@ -26,7 +26,7 @@
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/geometry/node_group_operator.cc b/source/blender/editors/geometry/node_group_operator.cc
index 6cabaee780b..44ca5a989c6 100644
--- a/source/blender/editors/geometry/node_group_operator.cc
+++ b/source/blender/editors/geometry/node_group_operator.cc
@@ -37,8 +37,8 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/gizmo_library/gizmo_library_presets.cc b/source/blender/editors/gizmo_library/gizmo_library_presets.cc
index ef129e68d06..12650dc86ba 100644
--- a/source/blender/editors/gizmo_library/gizmo_library_presets.cc
+++ b/source/blender/editors/gizmo_library/gizmo_library_presets.cc
@@ -21,7 +21,7 @@
 #include "GPU_matrix.h"
 #include "GPU_select.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_types.hh"
 
diff --git a/source/blender/editors/gpencil_legacy/annotate_paint.cc b/source/blender/editors/gpencil_legacy/annotate_paint.cc
index fc83eed62cd..1a6a23ff896 100644
--- a/source/blender/editors/gpencil_legacy/annotate_paint.cc
+++ b/source/blender/editors/gpencil_legacy/annotate_paint.cc
@@ -56,7 +56,7 @@
 #include "WM_api.hh"
 #include "WM_types.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/drawgpencil.cc b/source/blender/editors/gpencil_legacy/drawgpencil.cc
index 97453c7fb50..12a90f6ec1c 100644
--- a/source/blender/editors/gpencil_legacy/drawgpencil.cc
+++ b/source/blender/editors/gpencil_legacy/drawgpencil.cc
@@ -42,7 +42,7 @@
 #include "BKE_material.h"
 #include "BKE_paint.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/gpencil_legacy/editaction_gpencil.cc b/source/blender/editors/gpencil_legacy/editaction_gpencil.cc
index 012d398e22c..549d267833f 100644
--- a/source/blender/editors/gpencil_legacy/editaction_gpencil.cc
+++ b/source/blender/editors/gpencil_legacy/editaction_gpencil.cc
@@ -31,7 +31,7 @@
 
 #include "WM_api.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 /* ***************************************** */
 /* NOTE ABOUT THIS FILE:
diff --git a/source/blender/editors/gpencil_legacy/gpencil_add_blank.cc b/source/blender/editors/gpencil_legacy/gpencil_add_blank.cc
index 0cb0ed6635f..77a76e7c385 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_add_blank.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_add_blank.cc
@@ -23,7 +23,7 @@
 
 #include "BLT_translation.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_gpencil_legacy.hh"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc b/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc
index 058965bd754..22c53495011 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc
@@ -26,8 +26,8 @@
 
 #include "BLT_translation.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_gpencil_legacy.hh"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_add_monkey.cc b/source/blender/editors/gpencil_legacy/gpencil_add_monkey.cc
index a8ef42af478..0d07315c5e7 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_add_monkey.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_add_monkey.cc
@@ -24,7 +24,7 @@
 
 #include "BLT_translation.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_gpencil_legacy.hh"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_add_stroke.cc b/source/blender/editors/gpencil_legacy/gpencil_add_stroke.cc
index ff8aa08b220..48795c62215 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_add_stroke.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_add_stroke.cc
@@ -23,7 +23,7 @@
 
 #include "BLT_translation.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_gpencil_legacy.hh"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_armature.cc b/source/blender/editors/gpencil_legacy/gpencil_armature.cc
index 95a6344f259..3a1fafb6fe3 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_armature.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_armature.cc
@@ -50,8 +50,8 @@
 
 #include "ANIM_bone_collections.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_bake_animation.cc b/source/blender/editors/gpencil_legacy/gpencil_bake_animation.cc
index d092f29ba7d..b648e9df70e 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_bake_animation.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_bake_animation.cc
@@ -32,8 +32,8 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/gpencil_legacy/gpencil_convert.cc b/source/blender/editors/gpencil_legacy/gpencil_convert.cc
index 05f489b8cb0..ce394758eb6 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_convert.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_convert.cc
@@ -52,8 +52,8 @@
 #include "BKE_scene.h"
 #include "BKE_tracking.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_data.cc b/source/blender/editors/gpencil_legacy/gpencil_data.cc
index 03315b4611e..4dc3459ab11 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_data.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_data.cc
@@ -68,9 +68,9 @@
 #include "ED_gpencil_legacy.hh"
 #include "ED_object.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_edit.cc b/source/blender/editors/gpencil_legacy/gpencil_edit.cc
index 6c16eadfe8d..ccd56ee17ad 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_edit.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_edit.cc
@@ -78,9 +78,9 @@
 #include "ED_transform_snap_object_context.hh"
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_edit_curve.cc b/source/blender/editors/gpencil_legacy/gpencil_edit_curve.cc
index 05c43f2a23b..bd541a7094c 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_edit_curve.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_edit_curve.cc
@@ -33,7 +33,7 @@
 
 #include "ED_gpencil_legacy.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_fill.cc b/source/blender/editors/gpencil_legacy/gpencil_fill.cc
index 557ec411eb0..f4c45467495 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_fill.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_fill.cc
@@ -61,8 +61,8 @@
 #include "WM_api.hh"
 #include "WM_types.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc b/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc
index 1ab0a9654a1..deca67eddb1 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc
@@ -53,7 +53,7 @@
 #include "ED_gpencil_legacy.hh"
 #include "ED_screen.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_merge.cc b/source/blender/editors/gpencil_legacy/gpencil_merge.cc
index 5950096bc2c..16ac2029c8e 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_merge.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_merge.cc
@@ -35,7 +35,7 @@
 #include "ED_gpencil_legacy.hh"
 #include "ED_screen.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_mesh.cc b/source/blender/editors/gpencil_legacy/gpencil_mesh.cc
index 970a0edea56..152badc91b8 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_mesh.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_mesh.cc
@@ -29,8 +29,8 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/gpencil_legacy/gpencil_ops_versioning.cc b/source/blender/editors/gpencil_legacy/gpencil_ops_versioning.cc
index 3f71cbc17ce..47a833bd7eb 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_ops_versioning.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_ops_versioning.cc
@@ -35,8 +35,8 @@
 
 #include "ED_gpencil_legacy.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_paint.cc
index dffddf6c5a1..66798ebeeaf 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_paint.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_paint.cc
@@ -71,8 +71,8 @@
 #include "WM_api.hh"
 #include "WM_types.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_primitive.cc b/source/blender/editors/gpencil_legacy/gpencil_primitive.cc
index 23ca7892b55..4447d74a376 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_primitive.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_primitive.cc
@@ -64,8 +64,8 @@
 #include "ED_space_api.hh"
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc
index f0613753336..f88ff0930ef 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc
@@ -67,8 +67,8 @@
 #include "ED_screen.hh"
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_select.cc b/source/blender/editors/gpencil_legacy/gpencil_select.cc
index eeaccca8352..3687a849ae8 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_select.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_select.cc
@@ -52,8 +52,8 @@
 #include "ED_select_utils.hh"
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc b/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc
index 09ec0e3dbf1..21846b698e5 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc
@@ -27,8 +27,8 @@
 #include "BKE_object.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/gpencil_legacy/gpencil_undo.cc b/source/blender/editors/gpencil_legacy/gpencil_undo.cc
index e2f1234c5dd..afdacb1e70a 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_undo.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_undo.cc
@@ -28,7 +28,7 @@
 #include "WM_api.hh"
 #include "WM_types.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_utils.cc b/source/blender/editors/gpencil_legacy/gpencil_utils.cc
index cd99d778a38..3fecfa4f1ef 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_utils.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_utils.cc
@@ -76,8 +76,8 @@
 #include "GPU_immediate_util.h"
 #include "GPU_state.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_uv.cc b/source/blender/editors/gpencil_legacy/gpencil_uv.cc
index 3ca5a7c90e5..8cbecfd2b7a 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_uv.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_uv.cc
@@ -37,8 +37,8 @@
 #include "ED_util.hh"
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc b/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc
index a80ea42bf39..ba82da43d66 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc
@@ -33,7 +33,7 @@
 #include "ED_gpencil_legacy.hh"
 #include "ED_screen.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc
index 8638e1884b6..82bc166ffe4 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc
@@ -40,8 +40,8 @@
 #include "ED_screen.hh"
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc
index e8e2e78b9ca..8fb13d0198d 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc
@@ -48,8 +48,8 @@
 #include "ED_screen.hh"
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "gpencil_intern.h"
 
diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc
index 59fe52dcc61..54db7c8eacd 100644
--- a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc
+++ b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc
@@ -20,7 +20,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_curves.hh"
 #include "ED_grease_pencil.hh"
diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_frames.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_frames.cc
index 07cd83265fe..10793bd6811 100644
--- a/source/blender/editors/grease_pencil/intern/grease_pencil_frames.cc
+++ b/source/blender/editors/grease_pencil/intern/grease_pencil_frames.cc
@@ -13,7 +13,7 @@
 #include "BKE_context.h"
 #include "BKE_grease_pencil.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "DNA_scene_types.h"
 
diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc
index 9a09ca9baa7..6e896d9b882 100644
--- a/source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc
+++ b/source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc
@@ -9,7 +9,7 @@
 #include "BKE_context.h"
 #include "BKE_grease_pencil.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_grease_pencil.hh"
 
diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_select.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_select.cc
index 0202f160259..eaeb43e54fd 100644
--- a/source/blender/editors/grease_pencil/intern/grease_pencil_select.cc
+++ b/source/blender/editors/grease_pencil/intern/grease_pencil_select.cc
@@ -13,7 +13,7 @@
 
 #include "DNA_object_types.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_curves.hh"
 #include "ED_grease_pencil.hh"
diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc b/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc
index 36ce53c8c74..12d1de9501e 100644
--- a/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc
@@ -20,8 +20,8 @@
 #include "BKE_animsys.h"
 #include "BKE_context.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc b/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc
index 8e94bc70b3d..1e8e618c787 100644
--- a/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc
@@ -44,8 +44,8 @@
 #include "ED_screen.hh"
 #include "ED_undo.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "eyedropper_intern.hh"
 #include "interface_intern.hh"
diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc
index 9fa5155cbd6..4602529002d 100644
--- a/source/blender/editors/interface/interface.cc
+++ b/source/blender/editors/interface/interface.cc
@@ -71,7 +71,7 @@
 
 #include "IMB_colormanagement.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "interface_intern.hh"
 
diff --git a/source/blender/editors/interface/interface_anim.cc b/source/blender/editors/interface/interface_anim.cc
index 3d3b8c5a2ce..222786b26d9 100644
--- a/source/blender/editors/interface/interface_anim.cc
+++ b/source/blender/editors/interface/interface_anim.cc
@@ -29,8 +29,8 @@
 #include "BKE_main.h"
 #include "BKE_nla.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_keyframing.hh"
 
diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc
index 970882a12eb..63dd681380c 100644
--- a/source/blender/editors/interface/interface_ops.cc
+++ b/source/blender/editors/interface/interface_ops.cc
@@ -40,7 +40,7 @@
 
 #include "IMB_colormanagement.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/interface/interface_templates.cc b/source/blender/editors/interface/interface_templates.cc
index 4fd1e434afa..28bf9e46f6d 100644
--- a/source/blender/editors/interface/interface_templates.cc
+++ b/source/blender/editors/interface/interface_templates.cc
@@ -69,9 +69,9 @@
 #include "BKE_screen.h"
 #include "BKE_shader_fx.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_fileselect.hh"
 #include "ED_info.hh"
diff --git a/source/blender/editors/io/io_alembic.cc b/source/blender/editors/io/io_alembic.cc
index 60e43c4b496..40ad6bea9f3 100644
--- a/source/blender/editors/io/io_alembic.cc
+++ b/source/blender/editors/io/io_alembic.cc
@@ -49,7 +49,7 @@
 #  include "WM_api.hh"
 #  include "WM_types.hh"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "io_alembic.hh"
 
diff --git a/source/blender/editors/io/io_cache.cc b/source/blender/editors/io/io_cache.cc
index 07e5fab187e..d1300f9ddee 100644
--- a/source/blender/editors/io/io_cache.cc
+++ b/source/blender/editors/io/io_cache.cc
@@ -24,7 +24,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/editors/io/io_collada.cc b/source/blender/editors/io/io_collada.cc
index cf5a0c6a23e..a22f2744bf7 100644
--- a/source/blender/editors/io/io_collada.cc
+++ b/source/blender/editors/io/io_collada.cc
@@ -18,7 +18,7 @@
 #  include "BKE_object.h"
 #  include "BKE_report.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "ED_fileselect.hh"
 #  include "ED_object.hh"
diff --git a/source/blender/editors/io/io_gpencil_export.cc b/source/blender/editors/io/io_gpencil_export.cc
index e2ed12f310c..54f7f133db0 100644
--- a/source/blender/editors/io/io_gpencil_export.cc
+++ b/source/blender/editors/io/io_gpencil_export.cc
@@ -32,8 +32,8 @@
 #  include "WM_api.hh"
 #  include "WM_types.hh"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_query.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_query.hh"
 
 #  include "io_gpencil.hh"
 
diff --git a/source/blender/editors/io/io_gpencil_import.cc b/source/blender/editors/io/io_gpencil_import.cc
index 97ec82d3121..7f306214b38 100644
--- a/source/blender/editors/io/io_gpencil_import.cc
+++ b/source/blender/editors/io/io_gpencil_import.cc
@@ -30,8 +30,8 @@
 #  include "WM_api.hh"
 #  include "WM_types.hh"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_query.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_query.hh"
 
 #  include "ED_gpencil_legacy.hh"
 
diff --git a/source/blender/editors/io/io_obj.cc b/source/blender/editors/io/io_obj.cc
index 504f54dcfcb..579f848d233 100644
--- a/source/blender/editors/io/io_obj.cc
+++ b/source/blender/editors/io/io_obj.cc
@@ -34,7 +34,7 @@
 #  include "WM_api.hh"
 #  include "WM_types.hh"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "IO_orientation.hh"
 #  include "IO_path_util_types.hh"
diff --git a/source/blender/editors/io/io_ply_ops.cc b/source/blender/editors/io/io_ply_ops.cc
index e633706423f..f3372436b4c 100644
--- a/source/blender/editors/io/io_ply_ops.cc
+++ b/source/blender/editors/io/io_ply_ops.cc
@@ -30,7 +30,7 @@
 #  include "UI_interface.hh"
 #  include "UI_resources.hh"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "IO_orientation.hh"
 #  include "IO_path_util_types.hh"
diff --git a/source/blender/editors/io/io_usd.cc b/source/blender/editors/io/io_usd.cc
index a0bbcfa6fe2..e8810b5e7d4 100644
--- a/source/blender/editors/io/io_usd.cc
+++ b/source/blender/editors/io/io_usd.cc
@@ -39,7 +39,7 @@
 #  include "WM_api.hh"
 #  include "WM_types.hh"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "io_usd.hh"
 #  include "usd.h"
diff --git a/source/blender/editors/lattice/editlattice_select.cc b/source/blender/editors/lattice/editlattice_select.cc
index e6ff7f26282..9d02d7c8dfe 100644
--- a/source/blender/editors/lattice/editlattice_select.cc
+++ b/source/blender/editors/lattice/editlattice_select.cc
@@ -40,7 +40,7 @@
 #include "WM_api.hh"
 #include "WM_types.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "lattice_intern.h"
 
diff --git a/source/blender/editors/lattice/editlattice_tools.cc b/source/blender/editors/lattice/editlattice_tools.cc
index 34338966365..f6da4ab1755 100644
--- a/source/blender/editors/lattice/editlattice_tools.cc
+++ b/source/blender/editors/lattice/editlattice_tools.cc
@@ -23,7 +23,7 @@
 #include "BKE_lattice.h"
 #include "BKE_layer.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_screen.hh"
 
diff --git a/source/blender/editors/lattice/editlattice_undo.cc b/source/blender/editors/lattice/editlattice_undo.cc
index f75190c18ac..877ab914cdc 100644
--- a/source/blender/editors/lattice/editlattice_undo.cc
+++ b/source/blender/editors/lattice/editlattice_undo.cc
@@ -30,7 +30,7 @@
 #include "BKE_object.h"
 #include "BKE_undo_system.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_lattice.hh"
 #include "ED_object.hh"
diff --git a/source/blender/editors/mask/mask_add.cc b/source/blender/editors/mask/mask_add.cc
index 46f3e0a97c1..5b846c4da3b 100644
--- a/source/blender/editors/mask/mask_add.cc
+++ b/source/blender/editors/mask/mask_add.cc
@@ -15,7 +15,7 @@
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "DNA_mask_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/editors/mask/mask_draw.cc b/source/blender/editors/mask/mask_draw.cc
index 32863610fd2..730dcb0a279 100644
--- a/source/blender/editors/mask/mask_draw.cc
+++ b/source/blender/editors/mask/mask_draw.cc
@@ -37,7 +37,7 @@
 #include "UI_resources.hh"
 #include "UI_view2d.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 static void mask_spline_color_get(MaskLayer *mask_layer,
                                   MaskSpline *spline,
diff --git a/source/blender/editors/mask/mask_ops.cc b/source/blender/editors/mask/mask_ops.cc
index 32e156e6f1f..e544bc29e08 100644
--- a/source/blender/editors/mask/mask_ops.cc
+++ b/source/blender/editors/mask/mask_ops.cc
@@ -16,8 +16,8 @@
 #include "BKE_main.h"
 #include "BKE_mask.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_mask_types.h"
 #include "DNA_object_types.h" /* SELECT */
diff --git a/source/blender/editors/mask/mask_query.cc b/source/blender/editors/mask/mask_query.cc
index 46969994f49..31c30cc34ef 100644
--- a/source/blender/editors/mask/mask_query.cc
+++ b/source/blender/editors/mask/mask_query.cc
@@ -14,8 +14,8 @@
 #include "BLI_math_geom.h"
 #include "BLI_math_vector.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_mask_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/editors/mask/mask_relationships.cc b/source/blender/editors/mask/mask_relationships.cc
index 8fd7e2a7851..6f9d64099c7 100644
--- a/source/blender/editors/mask/mask_relationships.cc
+++ b/source/blender/editors/mask/mask_relationships.cc
@@ -14,7 +14,7 @@
 #include "BKE_mask.h"
 #include "BKE_tracking.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "DNA_mask_types.h"
 
diff --git a/source/blender/editors/mask/mask_select.cc b/source/blender/editors/mask/mask_select.cc
index efc0ab08659..f2ef1022b7f 100644
--- a/source/blender/editors/mask/mask_select.cc
+++ b/source/blender/editors/mask/mask_select.cc
@@ -16,8 +16,8 @@
 #include "BKE_context.h"
 #include "BKE_mask.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_mask_types.h"
 
diff --git a/source/blender/editors/mask/mask_shapekey.cc b/source/blender/editors/mask/mask_shapekey.cc
index 637e682d407..45725876a88 100644
--- a/source/blender/editors/mask/mask_shapekey.cc
+++ b/source/blender/editors/mask/mask_shapekey.cc
@@ -18,7 +18,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/mesh/editface.cc b/source/blender/editors/mesh/editface.cc
index 0e87dcd7402..560b00e1861 100644
--- a/source/blender/editors/mesh/editface.cc
+++ b/source/blender/editors/mesh/editface.cc
@@ -40,8 +40,8 @@
 #include "WM_api.hh"
 #include "WM_types.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 /* own include */
 
diff --git a/source/blender/editors/mesh/editmesh_attribute.cc b/source/blender/editors/mesh/editmesh_attribute.cc
index cff25b8a4f7..09e5d981781 100644
--- a/source/blender/editors/mesh/editmesh_attribute.cc
+++ b/source/blender/editors/mesh/editmesh_attribute.cc
@@ -40,8 +40,8 @@
 
 #include "bmesh_tools.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "mesh_intern.h"
 
diff --git a/source/blender/editors/mesh/editmesh_knife.cc b/source/blender/editors/mesh/editmesh_knife.cc
index 4d72e981d7e..3ab9ad32d29 100644
--- a/source/blender/editors/mesh/editmesh_knife.cc
+++ b/source/blender/editors/mesh/editmesh_knife.cc
@@ -62,8 +62,8 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "mesh_intern.h" /* Own include. */
 
diff --git a/source/blender/editors/mesh/editmesh_knife_project.cc b/source/blender/editors/mesh/editmesh_knife_project.cc
index 3d3ad9a1f0c..2f51a1ec657 100644
--- a/source/blender/editors/mesh/editmesh_knife_project.cc
+++ b/source/blender/editors/mesh/editmesh_knife_project.cc
@@ -24,8 +24,8 @@
 #include "BKE_object.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/mesh/editmesh_loopcut.cc b/source/blender/editors/mesh/editmesh_loopcut.cc
index a62cb136e40..65e717faa0f 100644
--- a/source/blender/editors/mesh/editmesh_loopcut.cc
+++ b/source/blender/editors/mesh/editmesh_loopcut.cc
@@ -39,8 +39,8 @@
 #include "WM_api.hh"
 #include "WM_types.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "mesh_intern.h" /* own include */
 
diff --git a/source/blender/editors/mesh/editmesh_mask_extract.cc b/source/blender/editors/mesh/editmesh_mask_extract.cc
index 78d4cd35b02..0b2760ffe12 100644
--- a/source/blender/editors/mesh/editmesh_mask_extract.cc
+++ b/source/blender/editors/mesh/editmesh_mask_extract.cc
@@ -25,8 +25,8 @@
 
 #include "BLI_math_vector.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/mesh/editmesh_path.cc b/source/blender/editors/mesh/editmesh_path.cc
index 1343ff37dd7..aa8bfb7a61a 100644
--- a/source/blender/editors/mesh/editmesh_path.cc
+++ b/source/blender/editors/mesh/editmesh_path.cc
@@ -43,7 +43,7 @@
 #include "bmesh.h"
 #include "bmesh_tools.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "mesh_intern.h" /* own include */
 
diff --git a/source/blender/editors/mesh/editmesh_polybuild.cc b/source/blender/editors/mesh/editmesh_polybuild.cc
index d1e3c4b4506..4db31cc18e9 100644
--- a/source/blender/editors/mesh/editmesh_polybuild.cc
+++ b/source/blender/editors/mesh/editmesh_polybuild.cc
@@ -41,7 +41,7 @@
 
 #include "WM_api.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Local Utilities
diff --git a/source/blender/editors/mesh/editmesh_select.cc b/source/blender/editors/mesh/editmesh_select.cc
index 553df96940f..9ee8c5f0e56 100644
--- a/source/blender/editors/mesh/editmesh_select.cc
+++ b/source/blender/editors/mesh/editmesh_select.cc
@@ -55,8 +55,8 @@
 
 #include "bmesh_tools.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DRW_select_buffer.h"
 
diff --git a/source/blender/editors/mesh/editmesh_tools.cc b/source/blender/editors/mesh/editmesh_tools.cc
index 3167c1ff340..62a5b8946fb 100644
--- a/source/blender/editors/mesh/editmesh_tools.cc
+++ b/source/blender/editors/mesh/editmesh_tools.cc
@@ -47,8 +47,8 @@
 #include "BKE_report.h"
 #include "BKE_texture.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/editors/mesh/editmesh_undo.cc b/source/blender/editors/mesh/editmesh_undo.cc
index 7dcb3be9121..4f7bd72b69a 100644
--- a/source/blender/editors/mesh/editmesh_undo.cc
+++ b/source/blender/editors/mesh/editmesh_undo.cc
@@ -34,7 +34,7 @@
 #include "BKE_object.h"
 #include "BKE_undo_system.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_mesh.hh"
 #include "ED_object.hh"
diff --git a/source/blender/editors/mesh/editmesh_utils.cc b/source/blender/editors/mesh/editmesh_utils.cc
index 13474177cd9..f039588bdff 100644
--- a/source/blender/editors/mesh/editmesh_utils.cc
+++ b/source/blender/editors/mesh/editmesh_utils.cc
@@ -32,7 +32,7 @@
 #include "BKE_mesh_mapping.hh"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/mesh/mesh_data.cc b/source/blender/editors/mesh/mesh_data.cc
index 6e23637089c..20b0ec9c5ee 100644
--- a/source/blender/editors/mesh/mesh_data.cc
+++ b/source/blender/editors/mesh/mesh_data.cc
@@ -26,7 +26,7 @@
 #include "BKE_mesh_runtime.hh"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/mesh/meshtools.cc b/source/blender/editors/mesh/meshtools.cc
index e6049b12d98..1fc1e0e587b 100644
--- a/source/blender/editors/mesh/meshtools.cc
+++ b/source/blender/editors/mesh/meshtools.cc
@@ -43,9 +43,9 @@
 #include "BKE_object_deform.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DRW_select_buffer.h"
 
diff --git a/source/blender/editors/metaball/editmball_undo.cc b/source/blender/editors/metaball/editmball_undo.cc
index 286886dc872..2b69fb12493 100644
--- a/source/blender/editors/metaball/editmball_undo.cc
+++ b/source/blender/editors/metaball/editmball_undo.cc
@@ -29,7 +29,7 @@
 #include "BKE_object.h"
 #include "BKE_undo_system.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_mball.hh"
 #include "ED_object.hh"
diff --git a/source/blender/editors/metaball/mball_edit.cc b/source/blender/editors/metaball/mball_edit.cc
index 4d3885f1afd..bcad996efef 100644
--- a/source/blender/editors/metaball/mball_edit.cc
+++ b/source/blender/editors/metaball/mball_edit.cc
@@ -32,7 +32,7 @@
 #include "BKE_mball.h"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "GPU_select.h"
 
diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc
index 6f11ff93dc2..2df1ee5ccf6 100644
--- a/source/blender/editors/object/object_add.cc
+++ b/source/blender/editors/object/object_add.cc
@@ -89,9 +89,9 @@
 #include "BKE_vfont.h"
 #include "BKE_volume.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/object/object_bake.cc b/source/blender/editors/object/object_bake.cc
index c3b8a4bd25b..6fab3adb930 100644
--- a/source/blender/editors/object/object_bake.cc
+++ b/source/blender/editors/object/object_bake.cc
@@ -35,7 +35,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RE_multires_bake.h"
 #include "RE_pipeline.h"
diff --git a/source/blender/editors/object/object_bake_api.cc b/source/blender/editors/object/object_bake_api.cc
index 68a6c49b3bf..4353e86e096 100644
--- a/source/blender/editors/object/object_bake_api.cc
+++ b/source/blender/editors/object/object_bake_api.cc
@@ -43,9 +43,9 @@
 #include "BKE_scene.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RE_engine.h"
 #include "RE_pipeline.h"
diff --git a/source/blender/editors/object/object_bake_simulation.cc b/source/blender/editors/object/object_bake_simulation.cc
index 0b80a2f1d27..768985b60bb 100644
--- a/source/blender/editors/object/object_bake_simulation.cc
+++ b/source/blender/editors/object/object_bake_simulation.cc
@@ -48,8 +48,8 @@
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "MOD_nodes.hh"
 
diff --git a/source/blender/editors/object/object_collection.cc b/source/blender/editors/object/object_collection.cc
index 6e207785999..ff98b269ba4 100644
--- a/source/blender/editors/object/object_collection.cc
+++ b/source/blender/editors/object/object_collection.cc
@@ -23,8 +23,8 @@
 #include "BKE_object.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_object.hh"
 #include "ED_screen.hh"
diff --git a/source/blender/editors/object/object_constraint.cc b/source/blender/editors/object/object_constraint.cc
index ca102458414..034e39fcd2a 100644
--- a/source/blender/editors/object/object_constraint.cc
+++ b/source/blender/editors/object/object_constraint.cc
@@ -39,9 +39,9 @@
 #include "BKE_report.h"
 #include "BKE_tracking.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #ifdef WITH_PYTHON
 #  include "BPY_extern.h"
diff --git a/source/blender/editors/object/object_data_transfer.cc b/source/blender/editors/object/object_data_transfer.cc
index 3f424ef5288..9bb275ab170 100644
--- a/source/blender/editors/object/object_data_transfer.cc
+++ b/source/blender/editors/object/object_data_transfer.cc
@@ -25,8 +25,8 @@
 #include "BKE_object.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/editors/object/object_data_transform.cc b/source/blender/editors/object/object_data_transform.cc
index dd97701d5a8..f8273ac18ba 100644
--- a/source/blender/editors/object/object_data_transform.cc
+++ b/source/blender/editors/object/object_data_transform.cc
@@ -43,8 +43,8 @@
 
 #include "bmesh.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_types.hh"
 
diff --git a/source/blender/editors/object/object_edit.cc b/source/blender/editors/object/object_edit.cc
index 29e8605b90d..01363fbfbd7 100644
--- a/source/blender/editors/object/object_edit.cc
+++ b/source/blender/editors/object/object_edit.cc
@@ -68,8 +68,8 @@
 #include "BKE_softbody.h"
 #include "BKE_workspace.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_anim_api.hh"
 #include "ED_armature.hh"
diff --git a/source/blender/editors/object/object_gpencil_modifier.cc b/source/blender/editors/object/object_gpencil_modifier.cc
index 35eed6cc76e..4ad6447fae9 100644
--- a/source/blender/editors/object/object_gpencil_modifier.cc
+++ b/source/blender/editors/object/object_gpencil_modifier.cc
@@ -33,9 +33,9 @@
 #include "BKE_object.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/object/object_hook.cc b/source/blender/editors/object/object_hook.cc
index 10ff32ae72f..005d3967fa3 100644
--- a/source/blender/editors/object/object_hook.cc
+++ b/source/blender/editors/object/object_hook.cc
@@ -36,9 +36,9 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/object/object_light_linking_ops.cc b/source/blender/editors/object/object_light_linking_ops.cc
index 13a242f8b6c..9e2638ef5e3 100644
--- a/source/blender/editors/object/object_light_linking_ops.cc
+++ b/source/blender/editors/object/object_light_linking_ops.cc
@@ -25,7 +25,7 @@
 #include "RNA_define.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Create New Light Linking Receiver/Blocker Collection Operators
diff --git a/source/blender/editors/object/object_modes.cc b/source/blender/editors/object/object_modes.cc
index 10341d859e5..81343d4a0ba 100644
--- a/source/blender/editors/object/object_modes.cc
+++ b/source/blender/editors/object/object_modes.cc
@@ -40,8 +40,8 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_armature.hh"
 #include "ED_gpencil_legacy.hh"
diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc
index a2de1965484..1840331386f 100644
--- a/source/blender/editors/object/object_modifier.cc
+++ b/source/blender/editors/object/object_modifier.cc
@@ -72,9 +72,9 @@
 #include "BKE_softbody.h"
 #include "BKE_volume.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/editors/object/object_relations.cc b/source/blender/editors/object/object_relations.cc
index e778a5696b6..e966534bb40 100644
--- a/source/blender/editors/object/object_relations.cc
+++ b/source/blender/editors/object/object_relations.cc
@@ -80,9 +80,9 @@
 #include "BKE_texture.h"
 #include "BKE_volume.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc
index ec27166d401..f56790b5af3 100644
--- a/source/blender/editors/object/object_remesh.cc
+++ b/source/blender/editors/object/object_remesh.cc
@@ -44,8 +44,8 @@
 #include "BKE_shrinkwrap.h"
 #include "BKE_unit.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_mesh.hh"
 #include "ED_object.hh"
diff --git a/source/blender/editors/object/object_select.cc b/source/blender/editors/object/object_select.cc
index 8d14683f40c..992864d4431 100644
--- a/source/blender/editors/object/object_select.cc
+++ b/source/blender/editors/object/object_select.cc
@@ -48,7 +48,7 @@
 #include "BKE_scene.h"
 #include "BKE_workspace.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_message.hh"
diff --git a/source/blender/editors/object/object_shader_fx.cc b/source/blender/editors/object/object_shader_fx.cc
index cf139d0fa05..61e3060daac 100644
--- a/source/blender/editors/object/object_shader_fx.cc
+++ b/source/blender/editors/object/object_shader_fx.cc
@@ -32,9 +32,9 @@
 #include "BKE_report.h"
 #include "BKE_shader_fx.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/object/object_shapekey.cc b/source/blender/editors/object/object_shapekey.cc
index b81b585d946..42bf8eeea8b 100644
--- a/source/blender/editors/object/object_shapekey.cc
+++ b/source/blender/editors/object/object_shapekey.cc
@@ -37,9 +37,9 @@
 #include "BKE_object.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLI_sys_types.h" /* for intptr_t support */
 
diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc
index 179025c011a..6957c5d0550 100644
--- a/source/blender/editors/object/object_transform.cc
+++ b/source/blender/editors/object/object_transform.cc
@@ -54,8 +54,8 @@
 #include "BKE_scene.h"
 #include "BKE_tracking.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/object/object_utils.cc b/source/blender/editors/object/object_utils.cc
index e138e4e18df..822832fa935 100644
--- a/source/blender/editors/object/object_utils.cc
+++ b/source/blender/editors/object/object_utils.cc
@@ -29,7 +29,7 @@
 #include "BKE_object.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_types.hh"
 
diff --git a/source/blender/editors/object/object_vgroup.cc b/source/blender/editors/object/object_vgroup.cc
index d128e5643e3..55c1675d7dc 100644
--- a/source/blender/editors/object/object_vgroup.cc
+++ b/source/blender/editors/object/object_vgroup.cc
@@ -46,9 +46,9 @@
 #include "BKE_object_deform.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/editors/physics/dynamicpaint_ops.cc b/source/blender/editors/physics/dynamicpaint_ops.cc
index 24bd9f00593..f9b6c4c74cb 100644
--- a/source/blender/editors/physics/dynamicpaint_ops.cc
+++ b/source/blender/editors/physics/dynamicpaint_ops.cc
@@ -34,9 +34,9 @@
 #include "BKE_report.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_mesh.hh"
 #include "ED_object.hh"
diff --git a/source/blender/editors/physics/particle_boids.cc b/source/blender/editors/physics/particle_boids.cc
index eb4743a24ed..9478ce0ddda 100644
--- a/source/blender/editors/physics/particle_boids.cc
+++ b/source/blender/editors/physics/particle_boids.cc
@@ -19,8 +19,8 @@
 #include "BKE_context.h"
 #include "BKE_main.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/physics/particle_edit.cc b/source/blender/editors/physics/particle_edit.cc
index f8a81e5604f..0c4dc644048 100644
--- a/source/blender/editors/physics/particle_edit.cc
+++ b/source/blender/editors/physics/particle_edit.cc
@@ -43,7 +43,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_mesh.hh"
 #include "ED_object.hh"
@@ -67,7 +67,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "PIL_time_utildefines.h"
 
diff --git a/source/blender/editors/physics/particle_edit_undo.cc b/source/blender/editors/physics/particle_edit_undo.cc
index 6dc9d7205d3..37bc76308ac 100644
--- a/source/blender/editors/physics/particle_edit_undo.cc
+++ b/source/blender/editors/physics/particle_edit_undo.cc
@@ -27,7 +27,7 @@
 #include "BKE_pointcache.h"
 #include "BKE_undo_system.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_object.hh"
 #include "ED_particle.hh"
diff --git a/source/blender/editors/physics/particle_object.cc b/source/blender/editors/physics/particle_object.cc
index ab2fdd0d9e5..df133ba9812 100644
--- a/source/blender/editors/physics/particle_object.cc
+++ b/source/blender/editors/physics/particle_object.cc
@@ -38,9 +38,9 @@
 #include "BKE_pointcache.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/physics/physics_fluid.cc b/source/blender/editors/physics/physics_fluid.cc
index 1baa00f55e3..0819382e175 100644
--- a/source/blender/editors/physics/physics_fluid.cc
+++ b/source/blender/editors/physics/physics_fluid.cc
@@ -31,7 +31,7 @@
 #include "BKE_report.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_object.hh"
 #include "ED_screen.hh"
diff --git a/source/blender/editors/physics/physics_pointcache.cc b/source/blender/editors/physics/physics_pointcache.cc
index 91a0b81817e..e181c1a3d8e 100644
--- a/source/blender/editors/physics/physics_pointcache.cc
+++ b/source/blender/editors/physics/physics_pointcache.cc
@@ -21,7 +21,7 @@
 #include "BKE_layer.h"
 #include "BKE_pointcache.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_particle.hh"
 
diff --git a/source/blender/editors/physics/rigidbody_constraint.cc b/source/blender/editors/physics/rigidbody_constraint.cc
index b8f8f28c965..bb1338f6992 100644
--- a/source/blender/editors/physics/rigidbody_constraint.cc
+++ b/source/blender/editors/physics/rigidbody_constraint.cc
@@ -23,8 +23,8 @@
 #include "BKE_report.h"
 #include "BKE_rigidbody.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/physics/rigidbody_object.cc b/source/blender/editors/physics/rigidbody_object.cc
index 6ec222a13ec..444bdd0226d 100644
--- a/source/blender/editors/physics/rigidbody_object.cc
+++ b/source/blender/editors/physics/rigidbody_object.cc
@@ -24,9 +24,9 @@
 #include "BKE_report.h"
 #include "BKE_rigidbody.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/physics/rigidbody_world.cc b/source/blender/editors/physics/rigidbody_world.cc
index c797f54655b..33b768fd119 100644
--- a/source/blender/editors/physics/rigidbody_world.cc
+++ b/source/blender/editors/physics/rigidbody_world.cc
@@ -23,8 +23,8 @@
 #include "BKE_report.h"
 #include "BKE_rigidbody.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "RNA_access.hh"
 
diff --git a/source/blender/editors/render/render_internal.cc b/source/blender/editors/render/render_internal.cc
index f833ba1dbbc..bcb6b6e0177 100644
--- a/source/blender/editors/render/render_internal.cc
+++ b/source/blender/editors/render/render_internal.cc
@@ -46,7 +46,7 @@
 
 #include "NOD_composite.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/render/render_opengl.cc b/source/blender/editors/render/render_opengl.cc
index c68193729f0..b5614635a32 100644
--- a/source/blender/editors/render/render_opengl.cc
+++ b/source/blender/editors/render/render_opengl.cc
@@ -43,8 +43,8 @@
 #include "BKE_scene.h"
 #include "BKE_writeavi.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DRW_engine.h"
 
diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc
index 60264c108cb..851f507d2c8 100644
--- a/source/blender/editors/render/render_preview.cc
+++ b/source/blender/editors/render/render_preview.cc
@@ -68,9 +68,9 @@
 
 #include "BLI_math_vector.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
diff --git a/source/blender/editors/render/render_shading.cc b/source/blender/editors/render/render_shading.cc
index 60469cb9836..2ee32a84f7a 100644
--- a/source/blender/editors/render/render_shading.cc
+++ b/source/blender/editors/render/render_shading.cc
@@ -61,9 +61,9 @@
 
 #include "NOD_composite.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #ifdef WITH_FREESTYLE
 #  include "BKE_freestyle.h"
diff --git a/source/blender/editors/render/render_update.cc b/source/blender/editors/render/render_update.cc
index 96a76a2e97c..098c11b416c 100644
--- a/source/blender/editors/render/render_update.cc
+++ b/source/blender/editors/render/render_update.cc
@@ -46,8 +46,8 @@
 #include "ED_render.hh"
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/scene/scene_edit.cc b/source/blender/editors/scene/scene_edit.cc
index 4a811502304..9ae1a7719f4 100644
--- a/source/blender/editors/scene/scene_edit.cc
+++ b/source/blender/editors/scene/scene_edit.cc
@@ -24,8 +24,8 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/editors/screen/screen_edit.cc b/source/blender/editors/screen/screen_edit.cc
index c1239458d9a..bd9f0dc3f0a 100644
--- a/source/blender/editors/screen/screen_edit.cc
+++ b/source/blender/editors/screen/screen_edit.cc
@@ -44,7 +44,7 @@
 #include "WM_message.hh"
 #include "WM_toolsystem.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "screen_intern.h" /* own module include */
 
diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc
index 20491faf7df..51b46fbb3f2 100644
--- a/source/blender/editors/screen/screen_ops.cc
+++ b/source/blender/editors/screen/screen_ops.cc
@@ -51,8 +51,8 @@
 #include "WM_api.hh"
 #include "WM_types.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_anim_api.hh"
 #include "ED_armature.hh"
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc
index bcbda2744cf..4dc59c21fa9 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc
@@ -14,7 +14,7 @@
 
 #include "PIL_time.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BKE_attribute_math.hh"
 #include "BKE_brush.hh"
@@ -47,7 +47,7 @@
 
 #include "WM_api.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 /**
  * The code below uses a suffix naming convention to indicate the coordinate space:
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc b/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc
index f507aefc2cd..7e874490d9e 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc
@@ -22,7 +22,7 @@
 #include "BLI_length_parameterize.hh"
 #include "BLI_task.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLT_translation.h"
 
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc
index c2ef191e21a..cc243fcbf96 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc
@@ -14,8 +14,8 @@
 
 #include "PIL_time.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BKE_attribute_math.hh"
 #include "BKE_brush.hh"
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc b/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc
index c528822b984..b72b86c648c 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc
@@ -14,7 +14,7 @@
 
 #include "PIL_time.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BKE_attribute_math.hh"
 #include "BKE_brush.hh"
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc
index 2529171bba2..c131941a80b 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc
@@ -19,8 +19,8 @@
 #include "ED_screen.hh"
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLI_array_utils.hh"
 #include "BLI_enumerable_thread_specific.hh"
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc
index 609d5423da7..5942c93bef5 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc
@@ -13,7 +13,7 @@
 #include "BLI_task.hh"
 #include "BLI_vector.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BKE_attribute_math.hh"
 #include "BKE_brush.hh"
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc
index 924b1782d12..f2ddab09a46 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc
@@ -28,8 +28,8 @@
 #include "ED_space_api.hh"
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_brush_types.h"
 #include "DNA_curves_types.h"
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc b/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc
index b0cb97248c5..0404e9a71de 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc
@@ -12,7 +12,7 @@
 
 #include "PIL_time.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BKE_brush.hh"
 #include "BKE_context.h"
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc b/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc
index 7f89654facc..91627a8cf84 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc
@@ -13,7 +13,7 @@
 #include "ED_screen.hh"
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "DNA_brush_types.h"
 #include "DNA_mesh_types.h"
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc b/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc
index 4d107c0f8a9..617b65e999c 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc
@@ -17,7 +17,7 @@
 #include "BKE_context.h"
 #include "BKE_curves.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_screen.hh"
 #include "ED_view3d.hh"
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc
index f3607301e33..e3c3dfb8435 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc
@@ -10,7 +10,7 @@
 #include "BLI_task.hh"
 #include "BLI_vector.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BKE_attribute_math.hh"
 #include "BKE_brush.hh"
@@ -35,7 +35,7 @@
 
 #include "WM_api.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "GEO_add_curves_on_mesh.hh"
 #include "GEO_reverse_uv_sampler.hh"
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc b/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc
index 225dcbd5777..52c57ff63c0 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc
@@ -9,7 +9,7 @@
 #include "ED_screen.hh"
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "DNA_brush_types.h"
 
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc b/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc
index 8b7b8b2435e..8a09b75b61b 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc
@@ -15,7 +15,7 @@
 
 #include "PIL_time.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BKE_attribute_math.hh"
 #include "BKE_brush.hh"
diff --git a/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc b/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc
index 6a1e1d8810c..10f6cc7b52f 100644
--- a/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc
+++ b/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc
@@ -5,7 +5,7 @@
 #include "BKE_context.h"
 #include "BKE_grease_pencil.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_brush_types.h"
 #include "DNA_grease_pencil_types.h"
diff --git a/source/blender/editors/sculpt_paint/grease_pencil_erase.cc b/source/blender/editors/sculpt_paint/grease_pencil_erase.cc
index 5c6589a74f6..429137b272b 100644
--- a/source/blender/editors/sculpt_paint/grease_pencil_erase.cc
+++ b/source/blender/editors/sculpt_paint/grease_pencil_erase.cc
@@ -20,7 +20,7 @@
 #include "BKE_grease_pencil.hh"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #include "DNA_brush_enums.h"
 
 #include "ED_view3d.hh"
diff --git a/source/blender/editors/sculpt_paint/grease_pencil_paint.cc b/source/blender/editors/sculpt_paint/grease_pencil_paint.cc
index bc15a28bc6f..573e28184f9 100644
--- a/source/blender/editors/sculpt_paint/grease_pencil_paint.cc
+++ b/source/blender/editors/sculpt_paint/grease_pencil_paint.cc
@@ -8,7 +8,7 @@
 #include "BKE_grease_pencil.hh"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_view3d.hh"
 
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.cc b/source/blender/editors/sculpt_paint/paint_cursor.cc
index d783823fd72..44d609eb387 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.cc
+++ b/source/blender/editors/sculpt_paint/paint_cursor.cc
@@ -44,7 +44,7 @@
 #include "ED_image.hh"
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "GPU_immediate.h"
 #include "GPU_immediate_util.h"
diff --git a/source/blender/editors/sculpt_paint/paint_hide.cc b/source/blender/editors/sculpt_paint/paint_hide.cc
index 7e0d7704a4e..1c46d7e577c 100644
--- a/source/blender/editors/sculpt_paint/paint_hide.cc
+++ b/source/blender/editors/sculpt_paint/paint_hide.cc
@@ -29,7 +29,7 @@
 #include "BKE_pbvh_api.hh"
 #include "BKE_subsurf.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/sculpt_paint/paint_image.cc b/source/blender/editors/sculpt_paint/paint_image.cc
index d07ca9046c8..d3678187f7d 100644
--- a/source/blender/editors/sculpt_paint/paint_image.cc
+++ b/source/blender/editors/sculpt_paint/paint_image.cc
@@ -43,8 +43,8 @@
 
 #include "NOD_texture.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "UI_interface.hh"
 #include "UI_view2d.hh"
diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.cc b/source/blender/editors/sculpt_paint/paint_image_2d.cc
index 105d6a3f567..b885245c463 100644
--- a/source/blender/editors/sculpt_paint/paint_image_2d.cc
+++ b/source/blender/editors/sculpt_paint/paint_image_2d.cc
@@ -28,7 +28,7 @@
 #include "BKE_paint.hh"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_paint.hh"
 #include "ED_screen.hh"
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc
index df4c8465699..dbee98b0b2a 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.cc
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc
@@ -75,8 +75,8 @@
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_image.hh"
 #include "ED_node.hh"
diff --git a/source/blender/editors/sculpt_paint/paint_mask.cc b/source/blender/editors/sculpt_paint/paint_mask.cc
index ee1eb813979..f3200ce9c28 100644
--- a/source/blender/editors/sculpt_paint/paint_mask.cc
+++ b/source/blender/editors/sculpt_paint/paint_mask.cc
@@ -37,7 +37,7 @@
 #include "BKE_scene.h"
 #include "BKE_subsurf.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/sculpt_paint/paint_utils.cc b/source/blender/editors/sculpt_paint/paint_utils.cc
index 6b3a04819f8..528bb47432e 100644
--- a/source/blender/editors/sculpt_paint/paint_utils.cc
+++ b/source/blender/editors/sculpt_paint/paint_utils.cc
@@ -37,8 +37,8 @@
 #include "BKE_paint.hh"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.cc b/source/blender/editors/sculpt_paint/paint_vertex.cc
index 4c23947e1b0..0aede3d9b28 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.cc
+++ b/source/blender/editors/sculpt_paint/paint_vertex.cc
@@ -50,7 +50,7 @@
 #include "BKE_paint.hh"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_message.hh"
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc
index 988e856a8d2..7444e7ce97e 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc
+++ b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc
@@ -25,7 +25,7 @@
 #include "BKE_geometry_set.hh"
 #include "BKE_mesh.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_proj.cc b/source/blender/editors/sculpt_paint/paint_vertex_proj.cc
index aed98e9796f..2de2798a09b 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_proj.cc
+++ b/source/blender/editors/sculpt_paint/paint_vertex_proj.cc
@@ -22,8 +22,8 @@
 
 #include "BLI_math_vector.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_screen.hh"
 #include "ED_view3d.hh"
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc
index 0549366f60d..2f52de80797 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc
+++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc
@@ -36,8 +36,8 @@
 #include "BKE_paint.hh"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.cc b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.cc
index d7abfda4666..d1594f7d8c9 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.cc
+++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.cc
@@ -24,7 +24,7 @@
 #include "BKE_object_deform.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_build.hh"
 
 /* Only for blend modes. */
 #include "IMB_imbuf.h"
diff --git a/source/blender/editors/sculpt_paint/paint_weight.cc b/source/blender/editors/sculpt_paint/paint_weight.cc
index 6781ec43cae..7c43bbc8ec1 100644
--- a/source/blender/editors/sculpt_paint/paint_weight.cc
+++ b/source/blender/editors/sculpt_paint/paint_weight.cc
@@ -46,7 +46,7 @@
 #include "BKE_paint.hh"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_message.hh"
diff --git a/source/blender/editors/sculpt_paint/sculpt.cc b/source/blender/editors/sculpt_paint/sculpt.cc
index a3e8cf00313..e9801af977a 100644
--- a/source/blender/editors/sculpt_paint/sculpt.cc
+++ b/source/blender/editors/sculpt_paint/sculpt.cc
@@ -62,7 +62,7 @@
 
 #include "NOD_texture.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/sculpt_paint/sculpt_automasking.cc b/source/blender/editors/sculpt_paint/sculpt_automasking.cc
index 83710f45f02..b1c73d9814a 100644
--- a/source/blender/editors/sculpt_paint/sculpt_automasking.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_automasking.cc
@@ -31,7 +31,7 @@
 #include "BKE_pbvh_api.hh"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_message.hh"
diff --git a/source/blender/editors/sculpt_paint/sculpt_cloth.cc b/source/blender/editors/sculpt_paint/sculpt_cloth.cc
index 7d0e71d33cc..bde355f0aaf 100644
--- a/source/blender/editors/sculpt_paint/sculpt_cloth.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_cloth.cc
@@ -31,8 +31,8 @@
 #include "BKE_paint.hh"
 #include "BKE_pbvh_api.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/sculpt_paint/sculpt_detail.cc b/source/blender/editors/sculpt_paint/sculpt_detail.cc
index 21d1f3cb152..289d3039a62 100644
--- a/source/blender/editors/sculpt_paint/sculpt_detail.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_detail.cc
@@ -21,7 +21,7 @@
 #include "BKE_pbvh_api.hh"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "GPU_immediate.h"
 #include "GPU_immediate_util.h"
diff --git a/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc
index 57656136173..79ebf3c2e1c 100644
--- a/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc
@@ -31,7 +31,7 @@
 
 #include "BLI_index_range.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.cc b/source/blender/editors/sculpt_paint/sculpt_expand.cc
index b08fc1c0c0d..6ec5518ba9a 100644
--- a/source/blender/editors/sculpt_paint/sculpt_expand.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_expand.cc
@@ -34,7 +34,7 @@
 #include "BKE_scene.h"
 #include "BKE_subdiv_ccg.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.cc b/source/blender/editors/sculpt_paint/sculpt_face_set.cc
index fa0c89cff6e..36763b8562a 100644
--- a/source/blender/editors/sculpt_paint/sculpt_face_set.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_face_set.cc
@@ -44,7 +44,7 @@
 #include "BKE_paint.hh"
 #include "BKE_pbvh_api.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_color.cc b/source/blender/editors/sculpt_paint/sculpt_filter_color.cc
index d0f6178f489..e67837b531d 100644
--- a/source/blender/editors/sculpt_paint/sculpt_filter_color.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_filter_color.cc
@@ -23,7 +23,7 @@
 
 #include "IMB_colormanagement.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc b/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc
index 89bc134f0a9..6975a2e6172 100644
--- a/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc
@@ -18,7 +18,7 @@
 #include "BKE_pbvh_api.hh"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc
index b86f0e9b916..247e4c79038 100644
--- a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc
@@ -28,7 +28,7 @@
 #include "BKE_paint.hh"
 #include "BKE_pbvh_api.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/sculpt_paint/sculpt_mask_expand.cc b/source/blender/editors/sculpt_paint/sculpt_mask_expand.cc
index 6ef7a43f96d..a6d7454cbfb 100644
--- a/source/blender/editors/sculpt_paint/sculpt_mask_expand.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_mask_expand.cc
@@ -23,7 +23,7 @@
 #include "BKE_paint.hh"
 #include "BKE_pbvh_api.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/sculpt_paint/sculpt_mask_init.cc b/source/blender/editors/sculpt_paint/sculpt_mask_init.cc
index 595f03ad017..78d7b29ae2a 100644
--- a/source/blender/editors/sculpt_paint/sculpt_mask_init.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_mask_init.cc
@@ -24,7 +24,7 @@
 #include "BKE_paint.hh"
 #include "BKE_pbvh_api.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/sculpt_paint/sculpt_ops.cc b/source/blender/editors/sculpt_paint/sculpt_ops.cc
index 11a84841d7b..514b999dbed 100644
--- a/source/blender/editors/sculpt_paint/sculpt_ops.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_ops.cc
@@ -42,7 +42,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "IMB_colormanagement.h"
 
diff --git a/source/blender/editors/sculpt_paint/sculpt_transform.cc b/source/blender/editors/sculpt_paint/sculpt_transform.cc
index 4bae752602b..a49fd1fd634 100644
--- a/source/blender/editors/sculpt_paint/sculpt_transform.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_transform.cc
@@ -20,7 +20,7 @@
 #include "BKE_paint.hh"
 #include "BKE_pbvh_api.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.cc b/source/blender/editors/sculpt_paint/sculpt_undo.cc
index 034853c27e8..d9f1a6fdf07 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.cc
@@ -67,7 +67,7 @@
 /* TODO(sergey): Ideally should be no direct call to such low level things. */
 #include "BKE_subdiv_eval.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.cc b/source/blender/editors/sculpt_paint/sculpt_uv.cc
index e54b6a6424f..765baa1afd3 100644
--- a/source/blender/editors/sculpt_paint/sculpt_uv.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_uv.cc
@@ -29,7 +29,7 @@
 #include "BKE_mesh_mapping.hh"
 #include "BKE_paint.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_image.hh"
 #include "ED_mesh.hh"
diff --git a/source/blender/editors/sound/sound_ops.cc b/source/blender/editors/sound/sound_ops.cc
index ff1885889bc..c474dc7770c 100644
--- a/source/blender/editors/sound/sound_ops.cc
+++ b/source/blender/editors/sound/sound_ops.cc
@@ -49,7 +49,7 @@
 #  include <AUD_Special.h>
 #endif
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_sound.hh"
 #include "ED_util.hh"
diff --git a/source/blender/editors/space_action/action_data.cc b/source/blender/editors/space_action/action_data.cc
index cc783f6d284..26b77161022 100644
--- a/source/blender/editors/space_action/action_data.cc
+++ b/source/blender/editors/space_action/action_data.cc
@@ -46,7 +46,7 @@
 #include "ED_mask.hh"
 #include "ED_screen.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_action/action_edit.cc b/source/blender/editors/space_action/action_edit.cc
index 2230cbff6d4..932a493b83b 100644
--- a/source/blender/editors/space_action/action_edit.cc
+++ b/source/blender/editors/space_action/action_edit.cc
@@ -17,7 +17,7 @@
 
 #include "BLT_translation.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "DNA_anim_types.h"
 #include "DNA_gpencil_legacy_types.h"
diff --git a/source/blender/editors/space_clip/clip_buttons.cc b/source/blender/editors/space_clip/clip_buttons.cc
index 7a4cf95801b..421d47b5a80 100644
--- a/source/blender/editors/space_clip/clip_buttons.cc
+++ b/source/blender/editors/space_clip/clip_buttons.cc
@@ -28,7 +28,7 @@
 #include "BKE_screen.h"
 #include "BKE_tracking.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_clip.hh"
 #include "ED_screen.hh"
diff --git a/source/blender/editors/space_clip/clip_graph_ops.cc b/source/blender/editors/space_clip/clip_graph_ops.cc
index 299c6fd85f4..776b1eca45e 100644
--- a/source/blender/editors/space_clip/clip_graph_ops.cc
+++ b/source/blender/editors/space_clip/clip_graph_ops.cc
@@ -16,7 +16,7 @@
 #include "BKE_context.h"
 #include "BKE_tracking.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_clip/clip_ops.cc b/source/blender/editors/space_clip/clip_ops.cc
index d43ec36f656..1013e2f54e7 100644
--- a/source/blender/editors/space_clip/clip_ops.cc
+++ b/source/blender/editors/space_clip/clip_ops.cc
@@ -59,8 +59,8 @@
 
 #include "PIL_time.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "clip_intern.h" /* own include */
 
diff --git a/source/blender/editors/space_clip/clip_utils.cc b/source/blender/editors/space_clip/clip_utils.cc
index 1e7a3f9907e..2189f14fba0 100644
--- a/source/blender/editors/space_clip/clip_utils.cc
+++ b/source/blender/editors/space_clip/clip_utils.cc
@@ -21,8 +21,8 @@
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "GPU_immediate.h"
 #include "GPU_state.h"
diff --git a/source/blender/editors/space_clip/tracking_ops.cc b/source/blender/editors/space_clip/tracking_ops.cc
index b0fd0d0e139..0f2162fdd15 100644
--- a/source/blender/editors/space_clip/tracking_ops.cc
+++ b/source/blender/editors/space_clip/tracking_ops.cc
@@ -23,7 +23,7 @@
 #include "BKE_report.h"
 #include "BKE_tracking.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_clip/tracking_ops_orient.cc b/source/blender/editors/space_clip/tracking_ops_orient.cc
index 413c91bb4bd..dcf5c094d58 100644
--- a/source/blender/editors/space_clip/tracking_ops_orient.cc
+++ b/source/blender/editors/space_clip/tracking_ops_orient.cc
@@ -24,8 +24,8 @@
 #include "BKE_report.h"
 #include "BKE_tracking.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_clip/tracking_ops_plane.cc b/source/blender/editors/space_clip/tracking_ops_plane.cc
index 871b66349a6..2a0c7f54561 100644
--- a/source/blender/editors/space_clip/tracking_ops_plane.cc
+++ b/source/blender/editors/space_clip/tracking_ops_plane.cc
@@ -19,7 +19,7 @@
 #include "BKE_report.h"
 #include "BKE_tracking.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_clip/tracking_ops_solve.cc b/source/blender/editors/space_clip/tracking_ops_solve.cc
index cd2ea68e1a0..73f61cc0abf 100644
--- a/source/blender/editors/space_clip/tracking_ops_solve.cc
+++ b/source/blender/editors/space_clip/tracking_ops_solve.cc
@@ -23,7 +23,7 @@
 #include "BKE_report.h"
 #include "BKE_tracking.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_clip/tracking_ops_stabilize.cc b/source/blender/editors/space_clip/tracking_ops_stabilize.cc
index 5d1dd06fb68..3638e407d32 100644
--- a/source/blender/editors/space_clip/tracking_ops_stabilize.cc
+++ b/source/blender/editors/space_clip/tracking_ops_stabilize.cc
@@ -14,7 +14,7 @@
 #include "BKE_context.h"
 #include "BKE_tracking.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_clip/tracking_ops_track.cc b/source/blender/editors/space_clip/tracking_ops_track.cc
index 526fc0363ad..30a20321a61 100644
--- a/source/blender/editors/space_clip/tracking_ops_track.cc
+++ b/source/blender/editors/space_clip/tracking_ops_track.cc
@@ -30,7 +30,7 @@
 
 #include "PIL_time.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "clip_intern.h" /* own include */
 #include "tracking_ops_intern.h"
diff --git a/source/blender/editors/space_clip/tracking_select.cc b/source/blender/editors/space_clip/tracking_select.cc
index 03e3c73f8cf..184b6b2e4b4 100644
--- a/source/blender/editors/space_clip/tracking_select.cc
+++ b/source/blender/editors/space_clip/tracking_select.cc
@@ -34,7 +34,7 @@
 
 #include "UI_view2d.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "clip_intern.h"         /* own include */
 #include "tracking_ops_intern.h" /* own include */
diff --git a/source/blender/editors/space_graph/graph_buttons.cc b/source/blender/editors/space_graph/graph_buttons.cc
index 24441c55ade..7f96fc99233 100644
--- a/source/blender/editors/space_graph/graph_buttons.cc
+++ b/source/blender/editors/space_graph/graph_buttons.cc
@@ -35,8 +35,8 @@
 #include "BKE_screen.h"
 #include "BKE_unit.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_graph/graph_edit.cc b/source/blender/editors/space_graph/graph_edit.cc
index a89cbb0f175..d142b8de18d 100644
--- a/source/blender/editors/space_graph/graph_edit.cc
+++ b/source/blender/editors/space_graph/graph_edit.cc
@@ -42,7 +42,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_build.hh"
 
 #include "UI_interface.hh"
 #include "UI_view2d.hh"
diff --git a/source/blender/editors/space_graph/graph_ops.cc b/source/blender/editors/space_graph/graph_ops.cc
index dc8cb50770d..42386c022cc 100644
--- a/source/blender/editors/space_graph/graph_ops.cc
+++ b/source/blender/editors/space_graph/graph_ops.cc
@@ -29,7 +29,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_image/image_edit.cc b/source/blender/editors/space_image/image_edit.cc
index c0a7ee1f1b4..b98470c5742 100644
--- a/source/blender/editors/space_image/image_edit.cc
+++ b/source/blender/editors/space_image/image_edit.cc
@@ -26,7 +26,7 @@
 
 #include "IMB_imbuf_types.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_image.hh" /* own include */
 #include "ED_mesh.hh"
diff --git a/source/blender/editors/space_image/image_ops.cc b/source/blender/editors/space_image/image_ops.cc
index 31215276e6c..1f11a86d07c 100644
--- a/source/blender/editors/space_image/image_ops.cc
+++ b/source/blender/editors/space_image/image_ops.cc
@@ -47,7 +47,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "GPU_state.h"
 
diff --git a/source/blender/editors/space_image/image_undo.cc b/source/blender/editors/space_image/image_undo.cc
index 0d674200853..d11814e2cb3 100644
--- a/source/blender/editors/space_image/image_undo.cc
+++ b/source/blender/editors/space_image/image_undo.cc
@@ -42,7 +42,7 @@
 #include "BKE_paint.hh"
 #include "BKE_undo_system.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_object.hh"
 #include "ED_paint.hh"
diff --git a/source/blender/editors/space_image/space_image.cc b/source/blender/editors/space_image/space_image.cc
index 07115db0651..b534cb40dfb 100644
--- a/source/blender/editors/space_image/space_image.cc
+++ b/source/blender/editors/space_image/space_image.cc
@@ -31,7 +31,7 @@
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "IMB_imbuf_types.h"
 
diff --git a/source/blender/editors/space_info/info_stats.cc b/source/blender/editors/space_info/info_stats.cc
index 9607fd26685..7874cf163b3 100644
--- a/source/blender/editors/space_info/info_stats.cc
+++ b/source/blender/editors/space_info/info_stats.cc
@@ -57,7 +57,7 @@
 #include "BKE_subdiv_ccg.hh"
 #include "BKE_subdiv_modifier.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_info.hh"
 
diff --git a/source/blender/editors/space_nla/nla_channels.cc b/source/blender/editors/space_nla/nla_channels.cc
index 8ce85017f34..fba1681a468 100644
--- a/source/blender/editors/space_nla/nla_channels.cc
+++ b/source/blender/editors/space_nla/nla_channels.cc
@@ -40,8 +40,8 @@
 
 #include "UI_interface.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "UI_view2d.hh"
 
diff --git a/source/blender/editors/space_nla/nla_edit.cc b/source/blender/editors/space_nla/nla_edit.cc
index 8a9f12a7231..834d6110044 100644
--- a/source/blender/editors/space_nla/nla_edit.cc
+++ b/source/blender/editors/space_nla/nla_edit.cc
@@ -44,7 +44,7 @@
 #include "WM_api.hh"
 #include "WM_types.hh"
 
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_build.hh"
 
 #include "UI_interface.hh"
 #include "UI_view2d.hh"
diff --git a/source/blender/editors/space_node/clipboard.cc b/source/blender/editors/space_node/clipboard.cc
index c8e9a7efce0..9290334dcee 100644
--- a/source/blender/editors/space_node/clipboard.cc
+++ b/source/blender/editors/space_node/clipboard.cc
@@ -22,7 +22,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_build.hh"
 
 #include "node_intern.hh"
 
diff --git a/source/blender/editors/space_node/link_drag_search.cc b/source/blender/editors/space_node/link_drag_search.cc
index 2e89939e74c..d652d52e8ee 100644
--- a/source/blender/editors/space_node/link_drag_search.cc
+++ b/source/blender/editors/space_node/link_drag_search.cc
@@ -26,7 +26,7 @@
 
 #include "WM_api.hh"
 
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_asset.hh"
 #include "ED_node.hh"
diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc
index c572458b2f1..b7e172869de 100644
--- a/source/blender/editors/space_node/node_add.cc
+++ b/source/blender/editors/space_node/node_add.cc
@@ -32,7 +32,7 @@
 #include "BKE_scene.h"
 #include "BKE_texture.h"
 
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_asset.hh"
 #include "ED_asset_menu_utils.hh"
diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc
index 55cf91ca91f..b6d141ca9d6 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -51,7 +51,7 @@
 
 #include "IMB_imbuf.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BLF_api.h"
 
diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc
index 96521417caf..56f8d85fb68 100644
--- a/source/blender/editors/space_node/node_edit.cc
+++ b/source/blender/editors/space_node/node_edit.cc
@@ -37,9 +37,9 @@
 
 #include "BLT_translation.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RE_engine.h"
 #include "RE_pipeline.h"
diff --git a/source/blender/editors/space_node/node_group.cc b/source/blender/editors/space_node/node_group.cc
index 81fe054a761..0095e4eea2a 100644
--- a/source/blender/editors/space_node/node_group.cc
+++ b/source/blender/editors/space_node/node_group.cc
@@ -35,7 +35,7 @@
 #include "BKE_node_tree_update.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_node.hh" /* own include */
 #include "ED_node.hh"
diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc
index fc1071ecc06..02e2ff05404 100644
--- a/source/blender/editors/space_node/node_relationships.cc
+++ b/source/blender/editors/space_node/node_relationships.cc
@@ -36,7 +36,7 @@
 #include "RNA_define.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_node/node_select.cc b/source/blender/editors/space_node/node_select.cc
index 91afeab3540..ff924261678 100644
--- a/source/blender/editors/space_node/node_select.cc
+++ b/source/blender/editors/space_node/node_select.cc
@@ -43,7 +43,7 @@
 #include "UI_resources.hh"
 #include "UI_view2d.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/space_node/node_shader_preview.cc b/source/blender/editors/space_node/node_shader_preview.cc
index 9a4552f76bf..506919316ee 100644
--- a/source/blender/editors/space_node/node_shader_preview.cc
+++ b/source/blender/editors/space_node/node_shader_preview.cc
@@ -44,7 +44,7 @@
 #include "BKE_node_tree_update.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "IMB_imbuf.h"
 
diff --git a/source/blender/editors/space_node/space_node.cc b/source/blender/editors/space_node/space_node.cc
index cace63fd1c8..292b1bf7600 100644
--- a/source/blender/editors/space_node/space_node.cc
+++ b/source/blender/editors/space_node/space_node.cc
@@ -39,7 +39,7 @@
 #include "UI_resources.hh"
 #include "UI_view2d.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/editors/space_outliner/outliner_collections.cc b/source/blender/editors/space_outliner/outliner_collections.cc
index 84b69c4c3fb..ebb7681103a 100644
--- a/source/blender/editors/space_outliner/outliner_collections.cc
+++ b/source/blender/editors/space_outliner/outliner_collections.cc
@@ -23,8 +23,8 @@
 #include "BKE_main.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_object.hh"
 #include "ED_outliner.hh"
diff --git a/source/blender/editors/space_outliner/outliner_dragdrop.cc b/source/blender/editors/space_outliner/outliner_dragdrop.cc
index 460ad668924..b74910f9cf1 100644
--- a/source/blender/editors/space_outliner/outliner_dragdrop.cc
+++ b/source/blender/editors/space_outliner/outliner_dragdrop.cc
@@ -29,8 +29,8 @@
 #include "BKE_object.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_object.hh"
 #include "ED_outliner.hh"
diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc
index 97bd52aba43..3ca30ce6816 100644
--- a/source/blender/editors/space_outliner/outliner_draw.cc
+++ b/source/blender/editors/space_outliner/outliner_draw.cc
@@ -47,8 +47,8 @@
 
 #include "ANIM_bone_collections.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_armature.hh"
 #include "ED_fileselect.hh"
diff --git a/source/blender/editors/space_outliner/outliner_edit.cc b/source/blender/editors/space_outliner/outliner_edit.cc
index 78a63ab9ff7..714a1a12668 100644
--- a/source/blender/editors/space_outliner/outliner_edit.cc
+++ b/source/blender/editors/space_outliner/outliner_edit.cc
@@ -40,8 +40,8 @@
 #include "BKE_report.h"
 #include "BKE_workspace.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_keyframing.hh"
 #include "ED_outliner.hh"
diff --git a/source/blender/editors/space_outliner/outliner_select.cc b/source/blender/editors/space_outliner/outliner_select.cc
index e06d21733fa..feffb67b52c 100644
--- a/source/blender/editors/space_outliner/outliner_select.cc
+++ b/source/blender/editors/space_outliner/outliner_select.cc
@@ -41,8 +41,8 @@
 #include "BKE_report.h"
 #include "BKE_shader_fx.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_armature.hh"
 #include "ED_buttons.hh"
diff --git a/source/blender/editors/space_outliner/outliner_sync.cc b/source/blender/editors/space_outliner/outliner_sync.cc
index 7fd87914b2e..f8ef5d9ea0b 100644
--- a/source/blender/editors/space_outliner/outliner_sync.cc
+++ b/source/blender/editors/space_outliner/outliner_sync.cc
@@ -24,7 +24,7 @@
 #include "BKE_layer.h"
 #include "BKE_main.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_armature.hh"
 #include "ED_object.hh"
diff --git a/source/blender/editors/space_outliner/outliner_tools.cc b/source/blender/editors/space_outliner/outliner_tools.cc
index 23051d5a544..e9cc10cedd7 100644
--- a/source/blender/editors/space_outliner/outliner_tools.cc
+++ b/source/blender/editors/space_outliner/outliner_tools.cc
@@ -58,8 +58,8 @@
 #include "BKE_scene.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_node.hh"
 #include "ED_object.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_add.cc b/source/blender/editors/space_sequencer/sequencer_add.cc
index 411b2ce148d..1e869107e64 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.cc
+++ b/source/blender/editors/space_sequencer/sequencer_add.cc
@@ -66,8 +66,8 @@
 #  include <AUD_Sequence.h>
 #endif
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 /* Own include. */
 #include "sequencer_intern.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.cc b/source/blender/editors/space_sequencer/sequencer_edit.cc
index f5f9a083cc8..685389d3dc7 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.cc
+++ b/source/blender/editors/space_sequencer/sequencer_edit.cc
@@ -68,8 +68,8 @@
 #include "UI_resources.hh"
 #include "UI_view2d.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 /* Own include. */
 #include "sequencer_intern.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_modifier.cc b/source/blender/editors/space_sequencer/sequencer_modifier.cc
index 2bf7b8f40a7..8759f6ffd84 100644
--- a/source/blender/editors/space_sequencer/sequencer_modifier.cc
+++ b/source/blender/editors/space_sequencer/sequencer_modifier.cc
@@ -11,7 +11,7 @@
 
 #include "DNA_scene_types.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BKE_context.h"
 
diff --git a/source/blender/editors/space_sequencer/sequencer_retiming.cc b/source/blender/editors/space_sequencer/sequencer_retiming.cc
index 0b33be18101..554305f120c 100644
--- a/source/blender/editors/space_sequencer/sequencer_retiming.cc
+++ b/source/blender/editors/space_sequencer/sequencer_retiming.cc
@@ -32,7 +32,7 @@
 #include "UI_interface.hh"
 #include "UI_view2d.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 /* Own include. */
 #include "sequencer_intern.hh"
diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
index 81409b3553e..03877605a20 100644
--- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
+++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
@@ -28,7 +28,7 @@
 
 #include "BLO_read_write.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
index 4231de23203..406cb8f6841 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
@@ -27,7 +27,7 @@
 #include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_curves.hh"
 #include "ED_spreadsheet.hh"
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
index 4ad1af85dff..909fe91c6ba 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
@@ -11,7 +11,7 @@
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/editors/space_view3d/drawobject.cc b/source/blender/editors/space_view3d/drawobject.cc
index f1164020418..db1ff1357c9 100644
--- a/source/blender/editors/space_view3d/drawobject.cc
+++ b/source/blender/editors/space_view3d/drawobject.cc
@@ -21,8 +21,8 @@
 #include "BKE_mesh_runtime.hh"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_batch.h"
 #include "GPU_immediate.h"
diff --git a/source/blender/editors/space_view3d/space_view3d.cc b/source/blender/editors/space_view3d/space_view3d.cc
index 21995ceca13..ab193b37218 100644
--- a/source/blender/editors/space_view3d/space_view3d.cc
+++ b/source/blender/editors/space_view3d/space_view3d.cc
@@ -87,8 +87,8 @@
 #  include "BPY_extern.h"
 #endif
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "view3d_intern.h" /* own include */
 #include "view3d_navigate.hh"
diff --git a/source/blender/editors/space_view3d/view3d_buttons.cc b/source/blender/editors/space_view3d/view3d_buttons.cc
index 80b716a5813..7c2d6f06e56 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.cc
+++ b/source/blender/editors/space_view3d/view3d_buttons.cc
@@ -45,7 +45,7 @@
 #include "BKE_report.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_view3d/view3d_camera_control.cc b/source/blender/editors/space_view3d/view3d_camera_control.cc
index 7ef5f2b2577..476bb797aed 100644
--- a/source/blender/editors/space_view3d/view3d_camera_control.cc
+++ b/source/blender/editors/space_view3d/view3d_camera_control.cc
@@ -38,7 +38,7 @@
 
 #include "BKE_object.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "view3d_intern.h" /* own include */
 
diff --git a/source/blender/editors/space_view3d/view3d_cursor_snap.cc b/source/blender/editors/space_view3d/view3d_cursor_snap.cc
index f7c6745cc82..8275704115c 100644
--- a/source/blender/editors/space_view3d/view3d_cursor_snap.cc
+++ b/source/blender/editors/space_view3d/view3d_cursor_snap.cc
@@ -37,7 +37,7 @@
 
 #include "RNA_access.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/space_view3d/view3d_draw.cc b/source/blender/editors/space_view3d/view3d_draw.cc
index 8470ed38586..e90d64540c6 100644
--- a/source/blender/editors/space_view3d/view3d_draw.cc
+++ b/source/blender/editors/space_view3d/view3d_draw.cc
@@ -62,7 +62,7 @@
 
 #include "ANIM_bone_collections.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_batch.h"
 #include "GPU_batch_presets.h"
diff --git a/source/blender/editors/space_view3d/view3d_edit.cc b/source/blender/editors/space_view3d/view3d_edit.cc
index 5acc1929682..fffb3857610 100644
--- a/source/blender/editors/space_view3d/view3d_edit.cc
+++ b/source/blender/editors/space_view3d/view3d_edit.cc
@@ -30,7 +30,7 @@
 #include "BKE_scene.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 #include "WM_message.hh"
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_camera.cc b/source/blender/editors/space_view3d/view3d_gizmo_camera.cc
index 965c6a88279..4aede567749 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_camera.cc
+++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.cc
@@ -33,7 +33,7 @@
 #include "WM_message.hh"
 #include "WM_types.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "view3d_intern.h" /* own include */
 
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_empty.cc b/source/blender/editors/space_view3d/view3d_gizmo_empty.cc
index 4dd6d124f4e..a188ec13d7a 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_empty.cc
+++ b/source/blender/editors/space_view3d/view3d_gizmo_empty.cc
@@ -15,7 +15,7 @@
 #include "BKE_layer.h"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "DNA_light_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_light.cc b/source/blender/editors/space_view3d/view3d_gizmo_light.cc
index 301d430ccd8..daec1d9fcbc 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_light.cc
+++ b/source/blender/editors/space_view3d/view3d_gizmo_light.cc
@@ -15,7 +15,7 @@
 #include "BKE_layer.h"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "DNA_light_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc
index 1ff1dea8383..4a344d1319d 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc
+++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc
@@ -27,8 +27,8 @@
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc b/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc
index 82b0713e687..0da2c1a9ece 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc
+++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc
@@ -52,7 +52,7 @@
 #include "WM_toolsystem.h"
 #include "WM_types.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "view3d_intern.h" /* own include */
 
diff --git a/source/blender/editors/space_view3d/view3d_header.cc b/source/blender/editors/space_view3d/view3d_header.cc
index a47249fcc57..451bb747880 100644
--- a/source/blender/editors/space_view3d/view3d_header.cc
+++ b/source/blender/editors/space_view3d/view3d_header.cc
@@ -23,7 +23,7 @@
 #include "BKE_editmesh.h"
 #include "BKE_layer.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
diff --git a/source/blender/editors/space_view3d/view3d_iterators.cc b/source/blender/editors/space_view3d/view3d_iterators.cc
index 62a4a0a3772..7b4cf555ad7 100644
--- a/source/blender/editors/space_view3d/view3d_iterators.cc
+++ b/source/blender/editors/space_view3d/view3d_iterators.cc
@@ -32,8 +32,8 @@
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ANIM_bone_collections.h"
 
diff --git a/source/blender/editors/space_view3d/view3d_navigate.cc b/source/blender/editors/space_view3d/view3d_navigate.cc
index cf8fa27ff4a..20b3f74a432 100644
--- a/source/blender/editors/space_view3d/view3d_navigate.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate.cc
@@ -29,7 +29,7 @@
 #include "BKE_screen.h"
 #include "BKE_vfont.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_mesh.hh"
 #include "ED_particle.hh"
diff --git a/source/blender/editors/space_view3d/view3d_navigate_fly.cc b/source/blender/editors/space_view3d/view3d_navigate_fly.cc
index 486669ab006..0574261d158 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_fly.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_fly.cc
@@ -45,7 +45,7 @@
 
 #include "GPU_immediate.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "view3d_intern.h" /* own include */
 #include "view3d_navigate.hh"
diff --git a/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc b/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc
index 002480d763c..e97845e08ca 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc
@@ -16,7 +16,7 @@
 
 #include "BKE_context.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_all.cc b/source/blender/editors/space_view3d/view3d_navigate_view_all.cc
index 8270c86ab1e..cdb63cac1fb 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_view_all.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_view_all.cc
@@ -19,7 +19,7 @@
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_mesh.hh"
 #include "ED_particle.hh"
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 e98984fc369..17d0d06c6d2 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc
@@ -27,7 +27,7 @@
 #include "BKE_screen.h"
 #include "BKE_vfont.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_mesh.hh"
 #include "ED_particle.hh"
diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc b/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc
index 933141d1d2a..1dfa6ff9064 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc
@@ -25,7 +25,7 @@
 #include "BKE_screen.h"
 #include "BKE_vfont.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_mesh.hh"
 #include "ED_particle.hh"
diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc b/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc
index df62138b397..bdcbf482cd5 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc
@@ -26,7 +26,7 @@
 #include "BKE_screen.h"
 #include "BKE_vfont.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_mesh.hh"
 #include "ED_particle.hh"
diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc b/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc
index 484dd5127c9..a6a8328116d 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc
@@ -26,7 +26,7 @@
 #include "BKE_screen.h"
 #include "BKE_vfont.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_mesh.hh"
 #include "ED_particle.hh"
diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_dolly.cc b/source/blender/editors/space_view3d/view3d_navigate_view_dolly.cc
index 43c96c376fc..a801d58426c 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_view_dolly.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_view_dolly.cc
@@ -11,7 +11,7 @@
 
 #include "BLI_math_vector.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_ndof.cc b/source/blender/editors/space_view3d/view3d_navigate_view_ndof.cc
index cead0292cc0..eaf862398a6 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_view_ndof.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_view_ndof.cc
@@ -11,7 +11,7 @@
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.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 1f3988cf2b4..bbdc6f898b2 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc
@@ -27,7 +27,7 @@
 #include "BKE_screen.h"
 #include "BKE_vfont.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_mesh.hh"
 #include "ED_particle.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 66eed630dc4..364523b7956 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc
@@ -25,7 +25,7 @@
 #include "BKE_screen.h"
 #include "BKE_vfont.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_mesh.hh"
 #include "ED_particle.hh"
diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_roll.cc b/source/blender/editors/space_view3d/view3d_navigate_view_roll.cc
index 49d9c6926c0..26af7790b4c 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_view_roll.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_view_roll.cc
@@ -18,7 +18,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_screen.hh"
 
diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_zoom.cc b/source/blender/editors/space_view3d/view3d_navigate_view_zoom.cc
index b6f2cd2830d..b6dbad4c219 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_view_zoom.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_view_zoom.cc
@@ -12,7 +12,7 @@
 #include "BKE_context.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/space_view3d/view3d_navigate_walk.cc b/source/blender/editors/space_view3d/view3d_navigate_walk.cc
index 16d2d6ed6b4..9694bda602d 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_walk.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_walk.cc
@@ -45,7 +45,7 @@
 
 #include "GPU_immediate.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "view3d_intern.h" /* own include */
 #include "view3d_navigate.hh"
diff --git a/source/blender/editors/space_view3d/view3d_navigate_zoom_border.cc b/source/blender/editors/space_view3d/view3d_navigate_zoom_border.cc
index 3d1fd207cbb..7c18d26499e 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_zoom_border.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_zoom_border.cc
@@ -16,7 +16,7 @@
 #include "BKE_context.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc
index b50a95f01d8..579ff7b74ac 100644
--- a/source/blender/editors/space_view3d/view3d_select.cc
+++ b/source/blender/editors/space_view3d/view3d_select.cc
@@ -92,8 +92,8 @@
 #include "GPU_matrix.h"
 #include "GPU_select.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DRW_engine.h"
 #include "DRW_select_buffer.h"
diff --git a/source/blender/editors/space_view3d/view3d_snap.cc b/source/blender/editors/space_view3d/view3d_snap.cc
index 9d8820072fd..205cae7ca9e 100644
--- a/source/blender/editors/space_view3d/view3d_snap.cc
+++ b/source/blender/editors/space_view3d/view3d_snap.cc
@@ -28,8 +28,8 @@
 #include "BKE_scene.h"
 #include "BKE_tracking.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_view3d/view3d_utils.cc b/source/blender/editors/space_view3d/view3d_utils.cc
index 63a36e08cdc..c0a5a2492a4 100644
--- a/source/blender/editors/space_view3d/view3d_utils.cc
+++ b/source/blender/editors/space_view3d/view3d_utils.cc
@@ -36,8 +36,8 @@
 #include "BKE_scene.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BIF_glutil.hh"
 
diff --git a/source/blender/editors/space_view3d/view3d_view.cc b/source/blender/editors/space_view3d/view3d_view.cc
index 5c7876f702e..5304cc95991 100644
--- a/source/blender/editors/space_view3d/view3d_view.cc
+++ b/source/blender/editors/space_view3d/view3d_view.cc
@@ -28,7 +28,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "UI_resources.hh"
 
diff --git a/source/blender/editors/transform/transform.hh b/source/blender/editors/transform/transform.hh
index 2680eceac97..71d40860c9b 100644
--- a/source/blender/editors/transform/transform.hh
+++ b/source/blender/editors/transform/transform.hh
@@ -18,7 +18,7 @@
 #include "DNA_object_enums.h"
 #include "DNA_scene_types.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "transform_data.hh"
 
diff --git a/source/blender/editors/transform/transform_convert.cc b/source/blender/editors/transform/transform_convert.cc
index adbb1e8f36a..1a978649fea 100644
--- a/source/blender/editors/transform/transform_convert.cc
+++ b/source/blender/editors/transform/transform_convert.cc
@@ -41,7 +41,7 @@
 
 #include "WM_types.hh"
 
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_build.hh"
 
 #include "transform.hh"
 #include "transform_snap.hh"
diff --git a/source/blender/editors/transform/transform_convert_armature.cc b/source/blender/editors/transform/transform_convert_armature.cc
index bb43eded079..bc6d4862027 100644
--- a/source/blender/editors/transform/transform_convert_armature.cc
+++ b/source/blender/editors/transform/transform_convert_armature.cc
@@ -32,8 +32,8 @@
 #include "ED_armature.hh"
 #include "ED_keyframing.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
diff --git a/source/blender/editors/transform/transform_convert_mesh.cc b/source/blender/editors/transform/transform_convert_mesh.cc
index 1d2fec27393..4f356774dd1 100644
--- a/source/blender/editors/transform/transform_convert_mesh.cc
+++ b/source/blender/editors/transform/transform_convert_mesh.cc
@@ -29,7 +29,7 @@
 
 #include "ED_mesh.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "transform.hh"
 #include "transform_orientations.hh"
diff --git a/source/blender/editors/transform/transform_convert_mesh_skin.cc b/source/blender/editors/transform/transform_convert_mesh_skin.cc
index 421f711fd4c..4697c377db0 100644
--- a/source/blender/editors/transform/transform_convert_mesh_skin.cc
+++ b/source/blender/editors/transform/transform_convert_mesh_skin.cc
@@ -22,7 +22,7 @@
 
 #include "ED_mesh.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "transform.hh"
 #include "transform_orientations.hh"
diff --git a/source/blender/editors/transform/transform_convert_mesh_vert_cdata.cc b/source/blender/editors/transform/transform_convert_mesh_vert_cdata.cc
index dd9a2008b21..9979c8f62e2 100644
--- a/source/blender/editors/transform/transform_convert_mesh_vert_cdata.cc
+++ b/source/blender/editors/transform/transform_convert_mesh_vert_cdata.cc
@@ -22,7 +22,7 @@
 
 #include "ED_mesh.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "transform.hh"
 #include "transform_orientations.hh"
diff --git a/source/blender/editors/transform/transform_convert_object.cc b/source/blender/editors/transform/transform_convert_object.cc
index b71cd7bbc91..a109b8a5ecd 100644
--- a/source/blender/editors/transform/transform_convert_object.cc
+++ b/source/blender/editors/transform/transform_convert_object.cc
@@ -27,7 +27,7 @@
 #include "ED_keyframing.hh"
 #include "ED_object.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "transform.hh"
 #include "transform_orientations.hh"
diff --git a/source/blender/editors/transform/transform_snap_object.cc b/source/blender/editors/transform/transform_snap_object.cc
index 97cb27212c9..a81dc5ff397 100644
--- a/source/blender/editors/transform/transform_snap_object.cc
+++ b/source/blender/editors/transform/transform_snap_object.cc
@@ -20,7 +20,7 @@
 #include "BKE_mesh.hh"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_transform_snap_object_context.hh"
 #include "ED_view3d.hh"
diff --git a/source/blender/editors/transform/transform_snap_object_editmesh.cc b/source/blender/editors/transform/transform_snap_object_editmesh.cc
index f034b547d9c..d2b50596834 100644
--- a/source/blender/editors/transform/transform_snap_object_editmesh.cc
+++ b/source/blender/editors/transform/transform_snap_object_editmesh.cc
@@ -15,7 +15,7 @@
 #include "BKE_mesh.hh"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_transform_snap_object_context.hh"
 #include "ED_view3d.hh"
diff --git a/source/blender/editors/undo/memfile_undo.cc b/source/blender/editors/undo/memfile_undo.cc
index 791fe228459..9339335dfe2 100644
--- a/source/blender/editors/undo/memfile_undo.cc
+++ b/source/blender/editors/undo/memfile_undo.cc
@@ -31,7 +31,7 @@
 #include "BKE_scene.h"
 #include "BKE_undo_system.h"
 
-#include "../depsgraph/DEG_depsgraph.h"
+#include "../depsgraph/DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/util/ed_transverts.cc b/source/blender/editors/util/ed_transverts.cc
index d50939f1eff..4bdae1f7f65 100644
--- a/source/blender/editors/util/ed_transverts.cc
+++ b/source/blender/editors/util/ed_transverts.cc
@@ -28,7 +28,7 @@
 #include "BKE_mesh_iterators.hh"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_armature.hh"
 #include "ED_curves.hh"
diff --git a/source/blender/editors/util/ed_util.cc b/source/blender/editors/util/ed_util.cc
index fcf43988cd6..13a17f95015 100644
--- a/source/blender/editors/util/ed_util.cc
+++ b/source/blender/editors/util/ed_util.cc
@@ -32,7 +32,7 @@
 #include "BKE_screen.h"
 #include "BKE_undo_system.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "DNA_gpencil_legacy_types.h"
 
diff --git a/source/blender/editors/util/ed_viewer_path.cc b/source/blender/editors/util/ed_viewer_path.cc
index a80248f0f91..9db5bcbeb78 100644
--- a/source/blender/editors/util/ed_viewer_path.cc
+++ b/source/blender/editors/util/ed_viewer_path.cc
@@ -18,7 +18,7 @@
 #include "DNA_modifier_types.h"
 #include "DNA_windowmanager_types.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/uvedit/uvedit_buttons.cc b/source/blender/editors/uvedit/uvedit_buttons.cc
index 26bd38dfdb2..00095c09a3d 100644
--- a/source/blender/editors/uvedit/uvedit_buttons.cc
+++ b/source/blender/editors/uvedit/uvedit_buttons.cc
@@ -29,7 +29,7 @@
 #include "BKE_layer.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_image.hh"
 #include "ED_uvedit.hh"
diff --git a/source/blender/editors/uvedit/uvedit_clipboard.cc b/source/blender/editors/uvedit/uvedit_clipboard.cc
index a692283d0f4..9e075af33d8 100644
--- a/source/blender/editors/uvedit/uvedit_clipboard.cc
+++ b/source/blender/editors/uvedit/uvedit_clipboard.cc
@@ -25,7 +25,7 @@
 #include "BKE_mesh_mapping.hh" /* UvElementMap */
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_mesh.hh"
 #include "ED_screen.hh"
diff --git a/source/blender/editors/uvedit/uvedit_ops.cc b/source/blender/editors/uvedit/uvedit_ops.cc
index 8b043323c22..6843c74b5f5 100644
--- a/source/blender/editors/uvedit/uvedit_ops.cc
+++ b/source/blender/editors/uvedit/uvedit_ops.cc
@@ -37,8 +37,8 @@
 #include "BKE_mesh_mapping.hh"
 #include "BKE_node.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_image.hh"
 #include "ED_mesh.hh"
diff --git a/source/blender/editors/uvedit/uvedit_path.cc b/source/blender/editors/uvedit/uvedit_path.cc
index fc034c59862..385855ba1e0 100644
--- a/source/blender/editors/uvedit/uvedit_path.cc
+++ b/source/blender/editors/uvedit/uvedit_path.cc
@@ -36,8 +36,8 @@
 #include "BKE_mesh.hh"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_object.hh"
 #include "ED_screen.hh"
diff --git a/source/blender/editors/uvedit/uvedit_rip.cc b/source/blender/editors/uvedit/uvedit_rip.cc
index e243da63535..0aef529f8c2 100644
--- a/source/blender/editors/uvedit/uvedit_rip.cc
+++ b/source/blender/editors/uvedit/uvedit_rip.cc
@@ -31,7 +31,7 @@
 #include "BKE_layer.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_screen.hh"
 #include "ED_transform.hh"
diff --git a/source/blender/editors/uvedit/uvedit_select.cc b/source/blender/editors/uvedit/uvedit_select.cc
index a3cffe95cbe..8a067855849 100644
--- a/source/blender/editors/uvedit/uvedit_select.cc
+++ b/source/blender/editors/uvedit/uvedit_select.cc
@@ -44,8 +44,8 @@
 #include "BKE_mesh_mapping.hh"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_image.hh"
 #include "ED_mesh.hh"
diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.cc b/source/blender/editors/uvedit/uvedit_smart_stitch.cc
index 3ac952235aa..9e38cb3f5b7 100644
--- a/source/blender/editors/uvedit/uvedit_smart_stitch.cc
+++ b/source/blender/editors/uvedit/uvedit_smart_stitch.cc
@@ -33,7 +33,7 @@
 #include "BKE_mesh_mapping.hh"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc
index ae92dc3b407..640c8aada98 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc
@@ -52,7 +52,7 @@
 #include "BKE_subdiv_mesh.hh"
 #include "BKE_subdiv_modifier.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "GEO_uv_pack.hh"
 #include "GEO_uv_parametrizer.hh"
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
index c11ef4f7e31..8c05fdee667 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
@@ -42,7 +42,7 @@
 #include "BLI_iterator.h"
 #include "BLI_listbase.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 84a10b5507e..368bc47bb61 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -50,8 +50,8 @@
 #include "BLI_math_vector_types.hh"
 #include "BLI_utildefines.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "RE_pipeline.h"
 
diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
index 461a338abea..33f5d43b380 100644
--- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
@@ -46,7 +46,7 @@ using namespace Freestyle;
 
 #include "BPY_extern.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "IMB_imbuf.h"
 
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_armature.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_armature.cc
index d10546ec915..f3213f8778e 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_armature.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_armature.cc
@@ -44,9 +44,9 @@
 #include "MOD_gpencil_legacy_ui_common.h"
 #include "MOD_gpencil_legacy_util.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 static void init_data(GpencilModifierData *md)
 {
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_array.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_array.cc
index 9c5391fa0f7..5b0e8fd74ba 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_array.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_array.cc
@@ -42,9 +42,9 @@
 
 #include "RNA_access.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_gpencil_legacy_modifiertypes.h"
 #include "MOD_gpencil_legacy_ui_common.h"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_build.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_build.cc
index 7160fb29c19..b03b21d18b8 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_build.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_build.cc
@@ -43,8 +43,8 @@
 
 #include "RNA_access.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_gpencil_legacy_modifiertypes.h"
 #include "MOD_gpencil_legacy_ui_common.h"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_color.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_color.cc
index 1396d36d357..ae566080c5e 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_color.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_color.cc
@@ -35,7 +35,7 @@
 
 #include "BKE_modifier.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "MOD_gpencil_legacy_modifiertypes.h"
 #include "MOD_gpencil_legacy_ui_common.h"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_dash.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_dash.cc
index 70f0ed96549..46287a76c91 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_dash.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_dash.cc
@@ -44,8 +44,8 @@
 #include "MOD_gpencil_legacy_ui_common.h"
 #include "MOD_gpencil_legacy_util.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_envelope.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_envelope.cc
index 4919730d9b9..fae625b5406 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_envelope.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_envelope.cc
@@ -32,9 +32,9 @@
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_hook.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_hook.cc
index a1923dcfcfc..d99e42b86bc 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_hook.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_hook.cc
@@ -47,9 +47,9 @@
 #include "MOD_gpencil_legacy_ui_common.h"
 #include "MOD_gpencil_legacy_util.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 /* temp struct to hold data */
 struct GPHookData_cb {
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lattice.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lattice.cc
index fe9e026d5e8..c00a4492799 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lattice.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lattice.cc
@@ -42,9 +42,9 @@
 #include "MOD_gpencil_legacy_ui_common.h"
 #include "MOD_gpencil_legacy_util.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 static void init_data(GpencilModifierData *md)
 {
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_length.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_length.cc
index 74fa37f7bda..e89816368de 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_length.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_length.cc
@@ -43,8 +43,8 @@
 #include "MOD_gpencil_legacy_ui_common.h"
 #include "MOD_gpencil_legacy_util.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 static void init_data(GpencilModifierData *md)
 {
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc
index c94f02a08db..02c59e2b60e 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc
@@ -37,8 +37,8 @@
 #include "BKE_modifier.h"
 #include "RNA_access.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_gpencil_legacy_lineart.h"
 #include "MOD_gpencil_legacy_modifiertypes.h"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_mirror.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_mirror.cc
index 4a5a82dce6f..3fe9092ea3b 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_mirror.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_mirror.cc
@@ -40,9 +40,9 @@
 #include "MOD_gpencil_legacy_ui_common.h"
 #include "MOD_gpencil_legacy_util.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 static void init_data(GpencilModifierData *md)
 {
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_multiply.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_multiply.cc
index 63b75f21e26..09fe056203b 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_multiply.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_multiply.cc
@@ -33,9 +33,9 @@
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_noise.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_noise.cc
index b39057e01d7..79c81b6e60e 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_noise.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_noise.cc
@@ -34,8 +34,8 @@
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_offset.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_offset.cc
index 46ed0fa3aad..2fd29a1bb9d 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_offset.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_offset.cc
@@ -35,9 +35,9 @@
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_opacity.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_opacity.cc
index dc4dd7f565b..fab25b06bc6 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_opacity.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_opacity.cc
@@ -29,7 +29,7 @@
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc
index 0df22e89382..7246d2e152a 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc
@@ -39,8 +39,8 @@
 
 #include "BKE_modifier.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_gpencil_legacy_modifiertypes.h"
 #include "MOD_gpencil_legacy_ui_common.h"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_shrinkwrap.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_shrinkwrap.cc
index 99b9f861363..9e5603af994 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_shrinkwrap.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_shrinkwrap.cc
@@ -45,9 +45,9 @@
 #include "MOD_gpencil_legacy_ui_common.h"
 #include "MOD_gpencil_legacy_util.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 static void init_data(GpencilModifierData *md)
 {
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_simplify.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_simplify.cc
index 252980d4f36..efc8d88a95c 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_simplify.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_simplify.cc
@@ -27,7 +27,7 @@
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_smooth.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_smooth.cc
index 6b725bcbc4f..35b66cfcd48 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_smooth.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_smooth.cc
@@ -30,7 +30,7 @@
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_subdiv.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_subdiv.cc
index 29615c69816..246b4de752c 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_subdiv.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_subdiv.cc
@@ -27,7 +27,7 @@
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_texture.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_texture.cc
index b1644d6bef4..c779e31acaf 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_texture.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_texture.cc
@@ -29,7 +29,7 @@
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_thick.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_thick.cc
index 3df1844b47f..611babaca9e 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_thick.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_thick.cc
@@ -29,7 +29,7 @@
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc
index fdc66c150d4..0fdb4542954 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc
@@ -48,7 +48,7 @@
 
 #include "WM_api.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 static void init_data(GpencilModifierData *md)
 {
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_tint.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_tint.cc
index bfdb2dad853..701fb39a41c 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_tint.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_tint.cc
@@ -49,8 +49,8 @@
 #include "MOD_gpencil_legacy_ui_common.h"
 #include "MOD_gpencil_legacy_util.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 static void init_data(GpencilModifierData *md)
 {
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_util.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_util.cc
index 07994a62b87..27a99137235 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_util.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_util.cc
@@ -27,7 +27,7 @@
 #include "MOD_gpencil_legacy_modifiertypes.h"
 #include "MOD_gpencil_legacy_util.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 void gpencil_modifier_type_init(GpencilModifierTypeInfo *types[])
 {
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_angle.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_angle.cc
index 091cbcbc8ae..22b74fee1b1 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_angle.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_angle.cc
@@ -30,8 +30,8 @@
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_proximity.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_proximity.cc
index 7b165165093..369433c4dca 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_proximity.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_proximity.cc
@@ -31,8 +31,8 @@
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc
index 85b166e958a..3db00cc6656 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc
@@ -40,7 +40,7 @@
 #include "BKE_object.h"
 #include "BKE_pointcache.h"
 #include "BKE_scene.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #include "DNA_camera_types.h"
 #include "DNA_collection_types.h"
 #include "DNA_gpencil_legacy_types.h"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc
index 03405cf36fa..734744e2599 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc
@@ -20,7 +20,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc
index 2c7c55e5ee5..27daa0f9850 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc
@@ -17,9 +17,12 @@
 #include "BKE_material.h"
 #include "BKE_object.h"
 #include "BKE_scene.h"
+
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
-#include "DEG_depsgraph_query.h"
+
+#include "DEG_depsgraph_query.hh"
+
 #include "DNA_collection_types.h"
 #include "DNA_gpencil_legacy_types.h"
 #include "DNA_light_types.h"
@@ -28,6 +31,7 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_scene_types.h"
+
 #include "MEM_guardedalloc.h"
 
 #include "BLI_task.h"
diff --git a/source/blender/io/alembic/ABC_alembic.h b/source/blender/io/alembic/ABC_alembic.h
index 2ec2481d70f..6081a965a01 100644
--- a/source/blender/io/alembic/ABC_alembic.h
+++ b/source/blender/io/alembic/ABC_alembic.h
@@ -7,7 +7,7 @@
  * \ingroup balembic
  */
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/io/alembic/exporter/abc_archive.cc b/source/blender/io/alembic/exporter/abc_archive.cc
index 0a31c3cd1b3..c5fe2bf2d92 100644
--- a/source/blender/io/alembic/exporter/abc_archive.cc
+++ b/source/blender/io/alembic/exporter/abc_archive.cc
@@ -8,7 +8,7 @@
 #include "BKE_main.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_scene_types.h"
 
diff --git a/source/blender/io/alembic/exporter/abc_export_capi.cc b/source/blender/io/alembic/exporter/abc_export_capi.cc
index 6700927fb43..7c540d1e10b 100644
--- a/source/blender/io/alembic/exporter/abc_export_capi.cc
+++ b/source/blender/io/alembic/exporter/abc_export_capi.cc
@@ -9,9 +9,9 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_modifier_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc b/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc
index f18c8ad250d..bcdc66a8239 100644
--- a/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc
+++ b/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc
@@ -19,7 +19,7 @@
 
 #include "BLI_assert.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_ID.h"
 #include "DNA_layer_types.h"
diff --git a/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc b/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc
index 47186e8f75b..fd06e8383fb 100644
--- a/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc
+++ b/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc
@@ -7,8 +7,8 @@
 
 #include "BLI_listbase.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_layer_types.h"
 #include "DNA_mesh_types.h"
diff --git a/source/blender/io/alembic/exporter/abc_writer_abstract.cc b/source/blender/io/alembic/exporter/abc_writer_abstract.cc
index 45a8c63878c..173a5327f2a 100644
--- a/source/blender/io/alembic/exporter/abc_writer_abstract.cc
+++ b/source/blender/io/alembic/exporter/abc_writer_abstract.cc
@@ -10,7 +10,7 @@
 
 #include "DNA_modifier_types.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include <Alembic/AbcGeom/Visibility.h>
 
diff --git a/source/blender/io/alembic/exporter/abc_writer_abstract.h b/source/blender/io/alembic/exporter/abc_writer_abstract.h
index 9ab28680f5d..30487257654 100644
--- a/source/blender/io/alembic/exporter/abc_writer_abstract.h
+++ b/source/blender/io/alembic/exporter/abc_writer_abstract.h
@@ -10,7 +10,7 @@
 #include <Alembic/Abc/OObject.h>
 #include <vector>
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #include "DNA_material_types.h"
 
 struct IDProperty;
diff --git a/source/blender/io/alembic/exporter/abc_writer_mesh.cc b/source/blender/io/alembic/exporter/abc_writer_mesh.cc
index 38f02c5742d..ddfcb0d7ae5 100644
--- a/source/blender/io/alembic/exporter/abc_writer_mesh.cc
+++ b/source/blender/io/alembic/exporter/abc_writer_mesh.cc
@@ -25,7 +25,7 @@
 #include "bmesh.h"
 #include "bmesh_tools.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "DNA_layer_types.h"
 #include "DNA_mesh_types.h"
diff --git a/source/blender/io/alembic/exporter/abc_writer_points.cc b/source/blender/io/alembic/exporter/abc_writer_points.cc
index bd3225a77a2..72071e668b6 100644
--- a/source/blender/io/alembic/exporter/abc_writer_points.cc
+++ b/source/blender/io/alembic/exporter/abc_writer_points.cc
@@ -17,7 +17,7 @@
 #include "BKE_lattice.h"
 #include "BKE_particle.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "CLG_log.h"
 static CLG_LogRef LOG = {"io.alembic"};
diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc
index 3b677c0b59d..a6de5a67341 100644
--- a/source/blender/io/alembic/intern/alembic_capi.cc
+++ b/source/blender/io/alembic/intern/alembic_capi.cc
@@ -40,8 +40,8 @@
 #include "BKE_scene.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "ED_undo.hh"
 
diff --git a/source/blender/io/alembic/tests/abc_export_test.cc b/source/blender/io/alembic/tests/abc_export_test.cc
index ef22e0fbe33..3a6b67a7cf6 100644
--- a/source/blender/io/alembic/tests/abc_export_test.cc
+++ b/source/blender/io/alembic/tests/abc_export_test.cc
@@ -14,7 +14,7 @@
 #include "BLI_utildefines.h"
 #include "DNA_scene_types.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 namespace blender::io::alembic {
 
diff --git a/source/blender/io/collada/AnimationClipExporter.h b/source/blender/io/collada/AnimationClipExporter.h
index abd3e0414b9..7166896cb84 100644
--- a/source/blender/io/collada/AnimationClipExporter.h
+++ b/source/blender/io/collada/AnimationClipExporter.h
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 
 #include "COLLADASWLibraryAnimationClips.h"
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 #include "ExportSettings.h"
 
 class AnimationClipExporter : COLLADASW::LibraryAnimationClips {
diff --git a/source/blender/io/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp
index e04e3fec982..5601d71f8e6 100644
--- a/source/blender/io/collada/ArmatureImporter.cpp
+++ b/source/blender/io/collada/ArmatureImporter.cpp
@@ -23,7 +23,7 @@
 
 #include "ANIM_bone_collections.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ArmatureImporter.h"
 #include "collada_utils.h"
diff --git a/source/blender/io/collada/BlenderContext.h b/source/blender/io/collada/BlenderContext.h
index 9ce0f9fe204..f893b1edc28 100644
--- a/source/blender/io/collada/BlenderContext.h
+++ b/source/blender/io/collada/BlenderContext.h
@@ -12,8 +12,8 @@
 #include "BKE_main.h"
 #include "BLI_linklist.h"
 #include "BlenderTypes.h"
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 #include "DNA_layer_types.h"
 #include "DNA_object_types.h"
 
diff --git a/source/blender/io/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp
index debdfc86fcd..025171680b8 100644
--- a/source/blender/io/collada/DocumentImporter.cpp
+++ b/source/blender/io/collada/DocumentImporter.cpp
@@ -60,8 +60,8 @@
 #include "WM_api.hh"
 #include "WM_types.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "DocumentImporter.h"
 #include "ErrorHandler.h"
diff --git a/source/blender/io/collada/collada.cpp b/source/blender/io/collada/collada.cpp
index 5d4b9c8bcc2..6b257256a4b 100644
--- a/source/blender/io/collada/collada.cpp
+++ b/source/blender/io/collada/collada.cpp
@@ -17,8 +17,8 @@
 
 #include "BKE_context.h"
 #include "BKE_scene.h"
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 /* make dummy file */
 #include "BLI_fileops.h"
diff --git a/source/blender/io/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp
index 2bf4b1acb59..5e23df38e66 100644
--- a/source/blender/io/collada/collada_utils.cpp
+++ b/source/blender/io/collada/collada_utils.cpp
@@ -61,8 +61,8 @@
 #include "bmesh.h"
 #include "bmesh_tools.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 #if 0
 #  include "NOD_common.h"
 #endif
diff --git a/source/blender/io/collada/collada_utils.h b/source/blender/io/collada/collada_utils.h
index 3f1a8a06fa7..36feaafb3fc 100644
--- a/source/blender/io/collada/collada_utils.h
+++ b/source/blender/io/collada/collada_utils.h
@@ -44,7 +44,7 @@
 #include "BKE_object.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "BCSampleData.h"
 #include "BlenderContext.h"
diff --git a/source/blender/io/common/IO_abstract_hierarchy_iterator.h b/source/blender/io/common/IO_abstract_hierarchy_iterator.h
index 998ef762c6b..36be41829c9 100644
--- a/source/blender/io/common/IO_abstract_hierarchy_iterator.h
+++ b/source/blender/io/common/IO_abstract_hierarchy_iterator.h
@@ -22,7 +22,7 @@
 
 #include "IO_dupli_persistent_id.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include <map>
 #include <set>
diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc
index cd1c64ffca4..6c48053664e 100644
--- a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc
+++ b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc
@@ -27,7 +27,7 @@
 #include "DNA_particle_types.h"
 #include "DNA_rigidbody_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 namespace blender::io {
 
diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
index b4e883db69b..8637b200f83 100644
--- a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
+++ b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
@@ -8,8 +8,8 @@
 #include "BKE_scene.h"
 #include "BLI_path_util.h"
 #include "BLO_readfile.h"
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 #include "DNA_object_types.h"
 
 #include <map>
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.cc b/source/blender/io/gpencil/intern/gpencil_io_base.cc
index 7b4f80920e2..791947bf058 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -30,8 +30,8 @@
 
 #include "ED_view3d.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "gpencil_io_base.hh"
 
diff --git a/source/blender/io/gpencil/intern/gpencil_io_capi.cc b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
index 2db819505e4..f4f99954e7c 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_capi.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
@@ -19,8 +19,8 @@
 #include "BKE_main.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "../gpencil_io.h"
 
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
index ebb0f5316cf..5b23f1aeeee 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
@@ -23,8 +23,8 @@
 #include "BKE_main.h"
 #include "BKE_material.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_gpencil_legacy.hh"
 #include "ED_view3d.hh"
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
index 83c8e2dc1a8..1ef2a83f7de 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
@@ -23,8 +23,8 @@
 #include "BKE_main.h"
 #include "BKE_material.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_gpencil_legacy.hh"
 #include "ED_view3d.hh"
diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
index e87bcfaa700..8e658324a19 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
@@ -19,8 +19,8 @@
 #include "BKE_gpencil_geom_legacy.h"
 #include "BKE_gpencil_legacy.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "ED_gpencil_legacy.hh"
 
diff --git a/source/blender/io/ply/exporter/ply_export_load_plydata.cc b/source/blender/io/ply/exporter/ply_export_load_plydata.cc
index d52fc7ad992..570ffd755c6 100644
--- a/source/blender/io/ply/exporter/ply_export_load_plydata.cc
+++ b/source/blender/io/ply/exporter/ply_export_load_plydata.cc
@@ -20,7 +20,7 @@
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
 #include "BLI_vector.hh"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #include "DNA_layer_types.h"
 
 #include "bmesh.h"
diff --git a/source/blender/io/ply/importer/ply_import.cc b/source/blender/io/ply/importer/ply_import.cc
index 65b81c082ea..18c1adccb13 100644
--- a/source/blender/io/ply/importer/ply_import.cc
+++ b/source/blender/io/ply/importer/ply_import.cc
@@ -22,8 +22,8 @@
 #include "BLI_memory_utils.hh"
 #include "BLI_string.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "ply_data.hh"
 #include "ply_import.hh"
diff --git a/source/blender/io/ply/tests/io_ply_exporter_test.cc b/source/blender/io/ply/tests/io_ply_exporter_test.cc
index c275cd5642b..263cffc659b 100644
--- a/source/blender/io/ply/tests/io_ply_exporter_test.cc
+++ b/source/blender/io/ply/tests/io_ply_exporter_test.cc
@@ -10,7 +10,7 @@
 #include "BKE_appdir.h"
 #include "BKE_blender_version.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "IO_ply.hh"
 #include "intern/ply_data.hh"
diff --git a/source/blender/io/stl/importer/stl_import.cc b/source/blender/io/stl/importer/stl_import.cc
index f6f5d032c11..880842758ef 100644
--- a/source/blender/io/stl/importer/stl_import.cc
+++ b/source/blender/io/stl/importer/stl_import.cc
@@ -25,8 +25,8 @@
 
 #include "DNA_object_types.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "stl_import.hh"
 #include "stl_import_ascii_reader.hh"
diff --git a/source/blender/io/usd/hydra/hydra_scene_delegate.cc b/source/blender/io/usd/hydra/hydra_scene_delegate.cc
index f249a70358f..fee135b12b4 100644
--- a/source/blender/io/usd/hydra/hydra_scene_delegate.cc
+++ b/source/blender/io/usd/hydra/hydra_scene_delegate.cc
@@ -11,7 +11,7 @@
 #include "BLI_set.hh"
 #include "BLI_string.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/hydra_scene_delegate.h b/source/blender/io/usd/hydra/hydra_scene_delegate.h
index 157db1e9ab7..583edee3960 100644
--- a/source/blender/io/usd/hydra/hydra_scene_delegate.h
+++ b/source/blender/io/usd/hydra/hydra_scene_delegate.h
@@ -9,7 +9,7 @@
 
 #include "BLI_map.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "CLG_log.h"
 
diff --git a/source/blender/io/usd/hydra/instancer.cc b/source/blender/io/usd/hydra/instancer.cc
index 3447e8e44b8..e3f08279a65 100644
--- a/source/blender/io/usd/hydra/instancer.cc
+++ b/source/blender/io/usd/hydra/instancer.cc
@@ -9,7 +9,7 @@
 
 #include "BLI_string.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "hydra_scene_delegate.h"
 
diff --git a/source/blender/io/usd/hydra/material.cc b/source/blender/io/usd/hydra/material.cc
index aa97b4b4683..655c3f271d6 100644
--- a/source/blender/io/usd/hydra/material.cc
+++ b/source/blender/io/usd/hydra/material.cc
@@ -21,7 +21,7 @@
 #include "RNA_prototypes.h"
 #include "RNA_types.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "bpy_rna.h"
 
diff --git a/source/blender/io/usd/hydra/object.cc b/source/blender/io/usd/hydra/object.cc
index 9fdd5d21697..87412cb45d2 100644
--- a/source/blender/io/usd/hydra/object.cc
+++ b/source/blender/io/usd/hydra/object.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "curves.h"
 #include "hydra_scene_delegate.h"
diff --git a/source/blender/io/usd/hydra/usd_scene_delegate.cc b/source/blender/io/usd/hydra/usd_scene_delegate.cc
index 55ae9a57172..90acbd271a6 100644
--- a/source/blender/io/usd/hydra/usd_scene_delegate.cc
+++ b/source/blender/io/usd/hydra/usd_scene_delegate.cc
@@ -10,7 +10,7 @@
 
 #include "BKE_appdir.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "usd.h"
 #include "usd.hh"
diff --git a/source/blender/io/usd/intern/usd_capi_export.cc b/source/blender/io/usd/intern/usd_capi_export.cc
index 6916799a22a..d8c0b42a26b 100644
--- a/source/blender/io/usd/intern/usd_capi_export.cc
+++ b/source/blender/io/usd/intern/usd_capi_export.cc
@@ -18,9 +18,9 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_scene_types.h"
 
diff --git a/source/blender/io/usd/intern/usd_capi_import.cc b/source/blender/io/usd/intern/usd_capi_import.cc
index a3852119e25..3b760206833 100644
--- a/source/blender/io/usd/intern/usd_capi_import.cc
+++ b/source/blender/io/usd/intern/usd_capi_import.cc
@@ -34,9 +34,9 @@
 
 #include "BLT_translation.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_cachefile_types.h"
 #include "DNA_collection_types.h"
diff --git a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc
index a132338bfa7..ee4ce8bdda9 100644
--- a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc
+++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc
@@ -24,7 +24,7 @@
 #include "BLI_assert.h"
 #include "BLI_utildefines.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_ID.h"
 #include "DNA_layer_types.h"
diff --git a/source/blender/io/usd/intern/usd_writer_abstract.h b/source/blender/io/usd/intern/usd_writer_abstract.h
index 6ea111a2477..b1f8a0e2fb4 100644
--- a/source/blender/io/usd/intern/usd_writer_abstract.h
+++ b/source/blender/io/usd/intern/usd_writer_abstract.h
@@ -14,7 +14,7 @@
 
 #include <vector>
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_material_types.h"
 
diff --git a/source/blender/io/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc
index 1b24821491f..327cf5adf03 100644
--- a/source/blender/io/usd/intern/usd_writer_mesh.cc
+++ b/source/blender/io/usd/intern/usd_writer_mesh.cc
@@ -25,7 +25,7 @@
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "DNA_layer_types.h"
 #include "DNA_mesh_types.h"
diff --git a/source/blender/io/usd/tests/usd_curves_test.cc b/source/blender/io/usd/tests/usd_curves_test.cc
index 943c67fccc1..ccdcc97681f 100644
--- a/source/blender/io/usd/tests/usd_curves_test.cc
+++ b/source/blender/io/usd/tests/usd_curves_test.cc
@@ -35,7 +35,7 @@
 
 #include "BKE_node_runtime.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/io/usd/tests/usd_export_test.cc b/source/blender/io/usd/tests/usd_export_test.cc
index 98d2cdab2d1..90fa3b366f4 100644
--- a/source/blender/io/usd/tests/usd_export_test.cc
+++ b/source/blender/io/usd/tests/usd_export_test.cc
@@ -32,7 +32,7 @@
 
 #include "BKE_node_runtime.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/io/usd/tests/usd_usdz_export_test.cc b/source/blender/io/usd/tests/usd_usdz_export_test.cc
index e7ad29d553c..d04eaae046f 100644
--- a/source/blender/io/usd/tests/usd_usdz_export_test.cc
+++ b/source/blender/io/usd/tests/usd_usdz_export_test.cc
@@ -15,7 +15,7 @@
 #include "BLI_path_util.h"
 #include "BLO_readfile.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/io/usd/usd.h b/source/blender/io/usd/usd.h
index 942c6286053..5908bdfae26 100644
--- a/source/blender/io/usd/usd.h
+++ b/source/blender/io/usd/usd.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_types.hh"
 
diff --git a/source/blender/io/wavefront_obj/IO_wavefront_obj.hh b/source/blender/io/wavefront_obj/IO_wavefront_obj.hh
index 0d28bcd95dc..105e56a88f6 100644
--- a/source/blender/io/wavefront_obj/IO_wavefront_obj.hh
+++ b/source/blender/io/wavefront_obj/IO_wavefront_obj.hh
@@ -12,7 +12,7 @@
 
 #include "BKE_context.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "IO_orientation.hh"
 #include "IO_path_util_types.hh"
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 9ceae9d6bb2..8850ef12b27 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
@@ -22,7 +22,7 @@
 #include "BLI_map.hh"
 #include "BLI_sort.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc b/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc
index c2c908000f1..c11eda4a832 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc
@@ -12,8 +12,8 @@
 #include "BLI_math_vector.h"
 #include "BLI_math_vector_types.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "IO_wavefront_obj.hh"
 #include "obj_export_nurbs.hh"
diff --git a/source/blender/io/wavefront_obj/exporter/obj_exporter.cc b/source/blender/io/wavefront_obj/exporter/obj_exporter.cc
index 043daf428c0..b049addbf04 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_exporter.cc
@@ -17,7 +17,7 @@
 #include "BLI_task.hh"
 #include "BLI_vector.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_scene_types.h"
 
diff --git a/source/blender/io/wavefront_obj/importer/obj_importer.cc b/source/blender/io/wavefront_obj/importer/obj_importer.cc
index c2d58ae34fb..6ac329bc8e7 100644
--- a/source/blender/io/wavefront_obj/importer/obj_importer.cc
+++ b/source/blender/io/wavefront_obj/importer/obj_importer.cc
@@ -18,7 +18,7 @@
 #include "BKE_layer.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_build.hh"
 
 #include "DNA_collection_types.h"
 
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 e1fca05ef0c..b4ca4496361 100644
--- a/source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc
+++ b/source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc
@@ -23,7 +23,7 @@
 
 #include "BLO_readfile.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "obj_export_file_writer.hh"
 #include "obj_export_mesh.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 9c71f8a6734..e27acdb720b 100644
--- a/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
+++ b/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
@@ -22,8 +22,8 @@
 
 #include "BLO_readfile.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_curve_types.h"
 #include "DNA_material_types.h"
diff --git a/source/blender/makesrna/intern/rna_ID.cc b/source/blender/makesrna/intern/rna_ID.cc
index 00e4993de26..894d00b2a44 100644
--- a/source/blender/makesrna/intern/rna_ID.cc
+++ b/source/blender/makesrna/intern/rna_ID.cc
@@ -226,9 +226,9 @@ const IDFilterEnumPropertyItem rna_enum_id_type_filter_items[] = {
 #  include "BKE_preview_image.hh"
 #  include "BKE_vfont.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
-#  include "DEG_depsgraph_query.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
+#  include "DEG_depsgraph_query.hh"
 
 #  include "ED_asset.hh"
 
diff --git a/source/blender/makesrna/intern/rna_access.cc b/source/blender/makesrna/intern/rna_access.cc
index 8703f8ccc82..17e05282b44 100644
--- a/source/blender/makesrna/intern/rna_access.cc
+++ b/source/blender/makesrna/intern/rna_access.cc
@@ -41,8 +41,8 @@
 #include "BKE_node.hh"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/makesrna/intern/rna_action.cc b/source/blender/makesrna/intern/rna_action.cc
index 51bf97270f5..7429ef76eab 100644
--- a/source/blender/makesrna/intern/rna_action.cc
+++ b/source/blender/makesrna/intern/rna_action.cc
@@ -34,7 +34,7 @@
 
 #  include "BKE_fcurve.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "ED_keyframing.hh"
 
diff --git a/source/blender/makesrna/intern/rna_animation.cc b/source/blender/makesrna/intern/rna_animation.cc
index 38a844de266..e37c9bc8f53 100644
--- a/source/blender/makesrna/intern/rna_animation.cc
+++ b/source/blender/makesrna/intern/rna_animation.cc
@@ -106,8 +106,8 @@ const EnumPropertyItem rna_enum_keying_flag_api_items[] = {
 #  include "BKE_fcurve.h"
 #  include "BKE_nla.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 #  include "DNA_object_types.h"
 
diff --git a/source/blender/makesrna/intern/rna_armature.cc b/source/blender/makesrna/intern/rna_armature.cc
index 084d2fec1e6..d399f5d576d 100644
--- a/source/blender/makesrna/intern/rna_armature.cc
+++ b/source/blender/makesrna/intern/rna_armature.cc
@@ -72,8 +72,8 @@ constexpr int COLOR_SETS_MAX_THEMED_INDEX = 20;
 
 #  include "ANIM_bone_collections.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 #  ifndef NDEBUG
 #    include "ANIM_armature_iter.hh"
diff --git a/source/blender/makesrna/intern/rna_attribute.cc b/source/blender/makesrna/intern/rna_attribute.cc
index 2efee19c608..1f534a26be0 100644
--- a/source/blender/makesrna/intern/rna_attribute.cc
+++ b/source/blender/makesrna/intern/rna_attribute.cc
@@ -144,7 +144,7 @@ const EnumPropertyItem rna_enum_attribute_curves_domain_items[] = {
 
 #ifdef RNA_RUNTIME
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "BLT_translation.h"
 
diff --git a/source/blender/makesrna/intern/rna_boid.cc b/source/blender/makesrna/intern/rna_boid.cc
index 4e90ccc2af8..078f7b61dcd 100644
--- a/source/blender/makesrna/intern/rna_boid.cc
+++ b/source/blender/makesrna/intern/rna_boid.cc
@@ -105,8 +105,8 @@ static const EnumPropertyItem boidruleset_type_items[] = {
 #  include "BKE_context.h"
 #  include "BKE_particle.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 static void rna_Boids_reset(Main * /*bmain*/, Scene * /*scene*/, PointerRNA *ptr)
 {
diff --git a/source/blender/makesrna/intern/rna_cachefile.cc b/source/blender/makesrna/intern/rna_cachefile.cc
index 8243e95c717..0f8b55153b4 100644
--- a/source/blender/makesrna/intern/rna_cachefile.cc
+++ b/source/blender/makesrna/intern/rna_cachefile.cc
@@ -29,8 +29,8 @@ const EnumPropertyItem rna_enum_velocity_unit_items[] = {
 
 #  include "BKE_cachefile.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 #  include "WM_api.hh"
 #  include "WM_types.hh"
diff --git a/source/blender/makesrna/intern/rna_camera.cc b/source/blender/makesrna/intern/rna_camera.cc
index ecb021a1d41..22a0dc90abf 100644
--- a/source/blender/makesrna/intern/rna_camera.cc
+++ b/source/blender/makesrna/intern/rna_camera.cc
@@ -27,8 +27,8 @@
 #  include "BKE_camera.h"
 #  include "BKE_object.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 #  include "SEQ_relations.h"
 
diff --git a/source/blender/makesrna/intern/rna_cloth.cc b/source/blender/makesrna/intern/rna_cloth.cc
index 4d179229117..d219588f1f9 100644
--- a/source/blender/makesrna/intern/rna_cloth.cc
+++ b/source/blender/makesrna/intern/rna_cloth.cc
@@ -28,8 +28,8 @@
 #ifdef RNA_RUNTIME
 
 #  include "BKE_context.h"
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 static void rna_cloth_update(Main * /*bmain*/, Scene * /*scene*/, PointerRNA *ptr)
 {
diff --git a/source/blender/makesrna/intern/rna_collection.cc b/source/blender/makesrna/intern/rna_collection.cc
index 4572a32d294..68a0284c0ea 100644
--- a/source/blender/makesrna/intern/rna_collection.cc
+++ b/source/blender/makesrna/intern/rna_collection.cc
@@ -42,9 +42,9 @@ BLI_STATIC_ASSERT(ARRAY_SIZE(rna_enum_collection_color_items) - 2 == COLLECTION_
 #  include "DNA_object_types.h"
 #  include "DNA_scene_types.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
-#  include "DEG_depsgraph_query.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
+#  include "DEG_depsgraph_query.hh"
 
 #  include "BKE_collection.h"
 #  include "BKE_global.h"
diff --git a/source/blender/makesrna/intern/rna_color.cc b/source/blender/makesrna/intern/rna_color.cc
index 9b66d0b35d7..c769668912e 100644
--- a/source/blender/makesrna/intern/rna_color.cc
+++ b/source/blender/makesrna/intern/rna_color.cc
@@ -55,7 +55,7 @@ const EnumPropertyItem rna_enum_color_space_convert_default_items[] = {
 #  include "BKE_movieclip.h"
 #  include "BKE_node.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "ED_node.hh"
 
diff --git a/source/blender/makesrna/intern/rna_curve.cc b/source/blender/makesrna/intern/rna_curve.cc
index 07d32c540c4..9624bb59512 100644
--- a/source/blender/makesrna/intern/rna_curve.cc
+++ b/source/blender/makesrna/intern/rna_curve.cc
@@ -157,8 +157,8 @@ static const EnumPropertyItem curve2d_fill_mode_items[] = {
 #  include "BKE_main.h"
 #  include "BKE_vfont.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 #  include "WM_api.hh"
 
diff --git a/source/blender/makesrna/intern/rna_curves.cc b/source/blender/makesrna/intern/rna_curves.cc
index df74053ab5b..85b8827fa18 100644
--- a/source/blender/makesrna/intern/rna_curves.cc
+++ b/source/blender/makesrna/intern/rna_curves.cc
@@ -47,7 +47,7 @@ const EnumPropertyItem rna_enum_curve_normal_mode_items[] = {
 #  include "BKE_attribute.h"
 #  include "BKE_curves.hh"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "ED_curves.hh"
 
diff --git a/source/blender/makesrna/intern/rna_depsgraph.cc b/source/blender/makesrna/intern/rna_depsgraph.cc
index 43cc3fa7ef0..a5b7e70cc3c 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.cc
+++ b/source/blender/makesrna/intern/rna_depsgraph.cc
@@ -20,7 +20,7 @@
 
 #include "DNA_object_types.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #define STATS_MAX_SIZE 16384
 
@@ -38,9 +38,9 @@
 #  include "BKE_object.h"
 #  include "BKE_scene.h"
 
-#  include "DEG_depsgraph_build.h"
-#  include "DEG_depsgraph_debug.h"
-#  include "DEG_depsgraph_query.h"
+#  include "DEG_depsgraph_build.hh"
+#  include "DEG_depsgraph_debug.hh"
+#  include "DEG_depsgraph_query.hh"
 
 #  include "MEM_guardedalloc.h"
 
diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.cc b/source/blender/makesrna/intern/rna_dynamicpaint.cc
index 3658118627b..dd111af6f39 100644
--- a/source/blender/makesrna/intern/rna_dynamicpaint.cc
+++ b/source/blender/makesrna/intern/rna_dynamicpaint.cc
@@ -40,8 +40,8 @@ const EnumPropertyItem rna_enum_prop_dynamicpaint_type_items[] = {
 #  include "BKE_context.h"
 #  include "BKE_particle.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 static char *rna_DynamicPaintCanvasSettings_path(const PointerRNA *ptr)
 {
diff --git a/source/blender/makesrna/intern/rna_fcurve.cc b/source/blender/makesrna/intern/rna_fcurve.cc
index 661cdf3303c..2597f92e3e1 100644
--- a/source/blender/makesrna/intern/rna_fcurve.cc
+++ b/source/blender/makesrna/intern/rna_fcurve.cc
@@ -217,8 +217,8 @@ static StructRNA *rna_FModifierType_refine(PointerRNA *ptr)
 #  include "BKE_fcurve.h"
 #  include "BKE_fcurve_driver.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 /**
  * \warning this isn't efficient but it's unavoidable
diff --git a/source/blender/makesrna/intern/rna_fluid.cc b/source/blender/makesrna/intern/rna_fluid.cc
index 3b99cc17879..32cf889654c 100644
--- a/source/blender/makesrna/intern/rna_fluid.cc
+++ b/source/blender/makesrna/intern/rna_fluid.cc
@@ -43,8 +43,8 @@
 #  include "BKE_context.h"
 #  include "BKE_particle.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 #  include "manta_fluid_API.h"
 
diff --git a/source/blender/makesrna/intern/rna_gpencil_legacy.cc b/source/blender/makesrna/intern/rna_gpencil_legacy.cc
index 89b66b0f11d..d85fc10a0f7 100644
--- a/source/blender/makesrna/intern/rna_gpencil_legacy.cc
+++ b/source/blender/makesrna/intern/rna_gpencil_legacy.cc
@@ -164,8 +164,8 @@ static const EnumPropertyItem rna_enum_gpencil_caps_modes_items[] = {
 #  include "BKE_gpencil_update_cache_legacy.h"
 #  include "BKE_icons.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 static void rna_GPencil_update(Main * /*bmain*/, Scene * /*scene*/, PointerRNA *ptr)
 {
diff --git a/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.cc b/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.cc
index 5785bb8d7f0..0574a6f69c1 100644
--- a/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.cc
+++ b/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.cc
@@ -282,8 +282,8 @@ static const EnumPropertyItem modifier_noise_random_mode_items[] = {
 #  include "BKE_gpencil_modifier_legacy.h"
 #  include "BKE_object.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 static StructRNA *rna_GpencilModifier_refine(PointerRNA *ptr)
 {
diff --git a/source/blender/makesrna/intern/rna_grease_pencil.cc b/source/blender/makesrna/intern/rna_grease_pencil.cc
index 2979e99b7a7..aba297ae999 100644
--- a/source/blender/makesrna/intern/rna_grease_pencil.cc
+++ b/source/blender/makesrna/intern/rna_grease_pencil.cc
@@ -24,7 +24,7 @@
 
 #  include "BLI_span.hh"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 static GreasePencil *rna_grease_pencil(const PointerRNA *ptr)
 {
diff --git a/source/blender/makesrna/intern/rna_image.cc b/source/blender/makesrna/intern/rna_image.cc
index c66b9e40ada..8b56dcd7825 100644
--- a/source/blender/makesrna/intern/rna_image.cc
+++ b/source/blender/makesrna/intern/rna_image.cc
@@ -18,8 +18,8 @@
 #include "BKE_image_format.h"
 #include "BKE_node_tree_update.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
diff --git a/source/blender/makesrna/intern/rna_key.cc b/source/blender/makesrna/intern/rna_key.cc
index 198300c9308..e9c30aa2503 100644
--- a/source/blender/makesrna/intern/rna_key.cc
+++ b/source/blender/makesrna/intern/rna_key.cc
@@ -49,7 +49,7 @@ const EnumPropertyItem rna_enum_keyblock_type_items[] = {
 #  include "BKE_key.h"
 #  include "BKE_main.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "WM_api.hh"
 #  include "WM_types.hh"
diff --git a/source/blender/makesrna/intern/rna_lattice.cc b/source/blender/makesrna/intern/rna_lattice.cc
index bc0f3eb7f56..478c18c669a 100644
--- a/source/blender/makesrna/intern/rna_lattice.cc
+++ b/source/blender/makesrna/intern/rna_lattice.cc
@@ -30,7 +30,7 @@
 #  include "BKE_main.h"
 #  include "BLI_string.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "ED_lattice.hh"
 #  include "WM_api.hh"
diff --git a/source/blender/makesrna/intern/rna_layer.cc b/source/blender/makesrna/intern/rna_layer.cc
index 6b8d7062e4c..3e58ff83cf9 100644
--- a/source/blender/makesrna/intern/rna_layer.cc
+++ b/source/blender/makesrna/intern/rna_layer.cc
@@ -45,8 +45,8 @@
 
 #  include "BLI_listbase.h"
 
-#  include "DEG_depsgraph_build.h"
-#  include "DEG_depsgraph_query.h"
+#  include "DEG_depsgraph_build.hh"
+#  include "DEG_depsgraph_query.hh"
 
 /***********************************/
 
diff --git a/source/blender/makesrna/intern/rna_light.cc b/source/blender/makesrna/intern/rna_light.cc
index a84b34a29ea..6732fb5ac46 100644
--- a/source/blender/makesrna/intern/rna_light.cc
+++ b/source/blender/makesrna/intern/rna_light.cc
@@ -30,7 +30,7 @@
 #  include "BKE_main.h"
 #  include "BKE_texture.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "ED_node.hh"
 #  include "WM_api.hh"
diff --git a/source/blender/makesrna/intern/rna_lightprobe.cc b/source/blender/makesrna/intern/rna_lightprobe.cc
index 858bd9e3a41..1cc1a45fd93 100644
--- a/source/blender/makesrna/intern/rna_lightprobe.cc
+++ b/source/blender/makesrna/intern/rna_lightprobe.cc
@@ -22,7 +22,7 @@
 #  include "MEM_guardedalloc.h"
 
 #  include "BKE_main.h"
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "DNA_collection_types.h"
 #  include "DNA_object_types.h"
diff --git a/source/blender/makesrna/intern/rna_linestyle.cc b/source/blender/makesrna/intern/rna_linestyle.cc
index f52177783e1..8286e0f7394 100644
--- a/source/blender/makesrna/intern/rna_linestyle.cc
+++ b/source/blender/makesrna/intern/rna_linestyle.cc
@@ -120,7 +120,7 @@ const EnumPropertyItem rna_enum_linestyle_geometry_modifier_type_items[] = {
 #  include "BKE_linestyle.h"
 #  include "BKE_texture.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "ED_node.hh"
 
diff --git a/source/blender/makesrna/intern/rna_main_api.cc b/source/blender/makesrna/intern/rna_main_api.cc
index b6b8e7fc817..cdc85c24e8a 100644
--- a/source/blender/makesrna/intern/rna_main_api.cc
+++ b/source/blender/makesrna/intern/rna_main_api.cc
@@ -62,8 +62,8 @@
 #  include "BKE_workspace.h"
 #  include "BKE_world.h"
 
-#  include "DEG_depsgraph_build.h"
-#  include "DEG_depsgraph_query.h"
+#  include "DEG_depsgraph_build.hh"
+#  include "DEG_depsgraph_query.hh"
 
 #  include "DNA_armature_types.h"
 #  include "DNA_brush_types.h"
diff --git a/source/blender/makesrna/intern/rna_mask.cc b/source/blender/makesrna/intern/rna_mask.cc
index 30cff162272..070e9c92d5d 100644
--- a/source/blender/makesrna/intern/rna_mask.cc
+++ b/source/blender/makesrna/intern/rna_mask.cc
@@ -39,7 +39,7 @@
 
 #  include "BKE_mask.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "RNA_access.hh"
 
diff --git a/source/blender/makesrna/intern/rna_material.cc b/source/blender/makesrna/intern/rna_material.cc
index e0e61b617df..60f6a207e13 100644
--- a/source/blender/makesrna/intern/rna_material.cc
+++ b/source/blender/makesrna/intern/rna_material.cc
@@ -76,8 +76,8 @@ const EnumPropertyItem rna_enum_ramp_blend_items[] = {
 #  include "BKE_texture.h"
 #  include "BKE_workspace.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 #  include "ED_gpencil_legacy.hh"
 #  include "ED_image.hh"
diff --git a/source/blender/makesrna/intern/rna_mesh.cc b/source/blender/makesrna/intern/rna_mesh.cc
index d5cef7a3309..c11f58a94b3 100644
--- a/source/blender/makesrna/intern/rna_mesh.cc
+++ b/source/blender/makesrna/intern/rna_mesh.cc
@@ -60,7 +60,7 @@ static const EnumPropertyItem rna_enum_mesh_remesh_mode_items[] = {
 #  include "BKE_mesh_runtime.hh"
 #  include "BKE_report.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "ED_mesh.hh" /* XXX Bad level call */
 
diff --git a/source/blender/makesrna/intern/rna_mesh_api.cc b/source/blender/makesrna/intern/rna_mesh_api.cc
index d6ff40e4bd4..41123183024 100644
--- a/source/blender/makesrna/intern/rna_mesh_api.cc
+++ b/source/blender/makesrna/intern/rna_mesh_api.cc
@@ -31,7 +31,7 @@
 
 #  include "ED_mesh.hh"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "WM_api.hh"
 
diff --git a/source/blender/makesrna/intern/rna_meta.cc b/source/blender/makesrna/intern/rna_meta.cc
index 9115f9057b0..88ba53c3bc5 100644
--- a/source/blender/makesrna/intern/rna_meta.cc
+++ b/source/blender/makesrna/intern/rna_meta.cc
@@ -32,7 +32,7 @@
 #  include "BKE_mball.h"
 #  include "BKE_scene.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "WM_api.hh"
 #  include "WM_types.hh"
diff --git a/source/blender/makesrna/intern/rna_modifier.cc b/source/blender/makesrna/intern/rna_modifier.cc
index 2b5bfcbcc7c..9f089865188 100644
--- a/source/blender/makesrna/intern/rna_modifier.cc
+++ b/source/blender/makesrna/intern/rna_modifier.cc
@@ -679,9 +679,9 @@ const EnumPropertyItem rna_enum_subdivision_boundary_smooth_items[] = {
 
 #  include "BLI_sort_utils.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
-#  include "DEG_depsgraph_query.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
+#  include "DEG_depsgraph_query.hh"
 
 #  ifdef WITH_ALEMBIC
 #    include "ABC_alembic.h"
diff --git a/source/blender/makesrna/intern/rna_movieclip.cc b/source/blender/makesrna/intern/rna_movieclip.cc
index ca8b2dec2ff..eaf83cba4d0 100644
--- a/source/blender/makesrna/intern/rna_movieclip.cc
+++ b/source/blender/makesrna/intern/rna_movieclip.cc
@@ -30,7 +30,7 @@
 
 #ifdef RNA_RUNTIME
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "ED_clip.hh"
 
diff --git a/source/blender/makesrna/intern/rna_nla.cc b/source/blender/makesrna/intern/rna_nla.cc
index f5604e34795..d4b51443e36 100644
--- a/source/blender/makesrna/intern/rna_nla.cc
+++ b/source/blender/makesrna/intern/rna_nla.cc
@@ -83,8 +83,8 @@ const EnumPropertyItem rna_enum_nla_mode_extend_items[] = {
 
 #  include "ED_anim_api.hh"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 static void rna_NlaStrip_name_set(PointerRNA *ptr, const char *value)
 {
diff --git a/source/blender/makesrna/intern/rna_node_socket.cc b/source/blender/makesrna/intern/rna_node_socket.cc
index d64a9adc3cf..bfd9b15b2a9 100644
--- a/source/blender/makesrna/intern/rna_node_socket.cc
+++ b/source/blender/makesrna/intern/rna_node_socket.cc
@@ -44,7 +44,7 @@ const EnumPropertyItem rna_enum_node_socket_type_items[] = {
 #  include "BKE_node.h"
 #  include "BKE_node_tree_update.h"
 
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph_build.hh"
 
 #  include "ED_node.hh"
 
diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc
index 32a560e9023..7d7f760ed9d 100644
--- a/source/blender/makesrna/intern/rna_nodetree.cc
+++ b/source/blender/makesrna/intern/rna_nodetree.cc
@@ -60,8 +60,8 @@
 #include "NOD_geometry.hh"
 #include "NOD_socket.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLI_string_utils.h"
 
diff --git a/source/blender/makesrna/intern/rna_object.cc b/source/blender/makesrna/intern/rna_object.cc
index d81dd03a8fe..ff5cf0f93ef 100644
--- a/source/blender/makesrna/intern/rna_object.cc
+++ b/source/blender/makesrna/intern/rna_object.cc
@@ -51,7 +51,7 @@
 #include "WM_api.hh"
 #include "WM_types.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 const EnumPropertyItem rna_enum_object_mode_items[] = {
     {OB_MODE_OBJECT, "OBJECT", ICON_OBJECT_DATAMODE, "Object Mode", ""},
@@ -340,8 +340,8 @@ const EnumPropertyItem rna_enum_object_axis_items[] = {
 #  include "BKE_particle.h"
 #  include "BKE_scene.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 #  include "ED_curve.hh"
 #  include "ED_lattice.hh"
diff --git a/source/blender/makesrna/intern/rna_object_api.cc b/source/blender/makesrna/intern/rna_object_api.cc
index f0a413d8a8d..0ae654abe4e 100644
--- a/source/blender/makesrna/intern/rna_object_api.cc
+++ b/source/blender/makesrna/intern/rna_object_api.cc
@@ -25,7 +25,7 @@
 #include "BKE_gpencil_curve_legacy.h"
 #include "BKE_layer.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_outliner.hh"
 
@@ -76,7 +76,7 @@ static const EnumPropertyItem space_items[] = {
 #  include "DNA_scene_types.h"
 #  include "DNA_view3d_types.h"
 
-#  include "DEG_depsgraph_query.h"
+#  include "DEG_depsgraph_query.hh"
 
 #  include "MEM_guardedalloc.h"
 
diff --git a/source/blender/makesrna/intern/rna_object_force.cc b/source/blender/makesrna/intern/rna_object_force.cc
index a1f4779578d..8d199389648 100644
--- a/source/blender/makesrna/intern/rna_object_force.cc
+++ b/source/blender/makesrna/intern/rna_object_force.cc
@@ -110,8 +110,8 @@ static const EnumPropertyItem empty_vortex_shape_items[] = {
 #  include "BKE_modifier.h"
 #  include "BKE_pointcache.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 #  include "ED_object.hh"
 
diff --git a/source/blender/makesrna/intern/rna_particle.cc b/source/blender/makesrna/intern/rna_particle.cc
index 32a87f191e1..be1605966fd 100644
--- a/source/blender/makesrna/intern/rna_particle.cc
+++ b/source/blender/makesrna/intern/rna_particle.cc
@@ -150,8 +150,8 @@ static const EnumPropertyItem part_fluid_type_items[] = {
 #  include "BKE_pointcache.h"
 #  include "BKE_texture.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 /* use for object space hair get/set */
 static void rna_ParticleHairKey_location_object_info(PointerRNA *ptr,
diff --git a/source/blender/makesrna/intern/rna_pointcloud.cc b/source/blender/makesrna/intern/rna_pointcloud.cc
index c1d3ae1973c..d3f490c6526 100644
--- a/source/blender/makesrna/intern/rna_pointcloud.cc
+++ b/source/blender/makesrna/intern/rna_pointcloud.cc
@@ -25,7 +25,7 @@
 #  include "BKE_customdata.h"
 #  include "BKE_pointcloud.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "WM_api.hh"
 #  include "WM_types.hh"
diff --git a/source/blender/makesrna/intern/rna_pose.cc b/source/blender/makesrna/intern/rna_pose.cc
index 76637e5708b..1273f2dfae1 100644
--- a/source/blender/makesrna/intern/rna_pose.cc
+++ b/source/blender/makesrna/intern/rna_pose.cc
@@ -75,8 +75,8 @@ const EnumPropertyItem rna_enum_color_sets_items[] = {
 #  include "BKE_global.h"
 #  include "BKE_idprop.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 #  include "ED_armature.hh"
 #  include "ED_object.hh"
diff --git a/source/blender/makesrna/intern/rna_render.cc b/source/blender/makesrna/intern/rna_render.cc
index bd9b99f43bd..cca244a749a 100644
--- a/source/blender/makesrna/intern/rna_render.cc
+++ b/source/blender/makesrna/intern/rna_render.cc
@@ -19,7 +19,7 @@
 #  include "BPY_extern.h"
 #endif
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "BKE_image.h"
 #include "BKE_scene.h"
@@ -95,7 +95,7 @@ const EnumPropertyItem rna_enum_bake_pass_type_items[] = {
 #  include "IMB_colormanagement.h"
 #  include "IMB_imbuf_types.h"
 
-#  include "DEG_depsgraph_query.h"
+#  include "DEG_depsgraph_query.hh"
 
 /* RenderEngine Callbacks */
 
diff --git a/source/blender/makesrna/intern/rna_rigidbody.cc b/source/blender/makesrna/intern/rna_rigidbody.cc
index 7fd143e1a47..b4ab5339837 100644
--- a/source/blender/makesrna/intern/rna_rigidbody.cc
+++ b/source/blender/makesrna/intern/rna_rigidbody.cc
@@ -23,7 +23,7 @@
 #include "BLI_math_rotation.h"
 #include "BLI_utildefines.h"
 
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_build.hh"
 
 #include "WM_types.hh"
 
diff --git a/source/blender/makesrna/intern/rna_scene.cc b/source/blender/makesrna/intern/rna_scene.cc
index 00b24fc0914..bc5c5a520ac 100644
--- a/source/blender/makesrna/intern/rna_scene.cc
+++ b/source/blender/makesrna/intern/rna_scene.cc
@@ -65,7 +65,7 @@
 
 #include "BLI_threads.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #ifdef WITH_OPENEXR
 const EnumPropertyItem rna_enum_exr_codec_items[] = {
@@ -751,8 +751,8 @@ const EnumPropertyItem rna_enum_grease_pencil_selectmode_items[] = {
 #  include "ED_scene.hh"
 #  include "ED_view3d.hh"
 
-#  include "DEG_depsgraph_build.h"
-#  include "DEG_depsgraph_query.h"
+#  include "DEG_depsgraph_build.hh"
+#  include "DEG_depsgraph_query.hh"
 
 #  include "SEQ_relations.h"
 #  include "SEQ_sequencer.h"
diff --git a/source/blender/makesrna/intern/rna_scene_api.cc b/source/blender/makesrna/intern/rna_scene_api.cc
index 7e5a751458a..10c20392bb1 100644
--- a/source/blender/makesrna/intern/rna_scene_api.cc
+++ b/source/blender/makesrna/intern/rna_scene_api.cc
@@ -34,7 +34,7 @@
 #  include "BKE_scene.h"
 #  include "BKE_writeavi.h"
 
-#  include "DEG_depsgraph_query.h"
+#  include "DEG_depsgraph_query.hh"
 
 #  include "ED_transform.hh"
 #  include "ED_transform_snap_object_context.hh"
diff --git a/source/blender/makesrna/intern/rna_screen.cc b/source/blender/makesrna/intern/rna_screen.cc
index ca524402e04..c548c4af317 100644
--- a/source/blender/makesrna/intern/rna_screen.cc
+++ b/source/blender/makesrna/intern/rna_screen.cc
@@ -53,7 +53,7 @@ const EnumPropertyItem rna_enum_region_type_items[] = {
 #  include "BKE_screen.h"
 #  include "BKE_workspace.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "UI_view2d.hh"
 
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.cc b/source/blender/makesrna/intern/rna_sculpt_paint.cc
index f40e29cd8c0..0003e5ef519 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.cc
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.cc
@@ -114,7 +114,7 @@ const EnumPropertyItem rna_enum_symmetrize_direction_items[] = {
 #  include "BKE_particle.h"
 #  include "BKE_pointcache.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "ED_gpencil_legacy.hh"
 #  include "ED_paint.hh"
diff --git a/source/blender/makesrna/intern/rna_sequencer.cc b/source/blender/makesrna/intern/rna_sequencer.cc
index b8ab225118a..83f1cfa7e72 100644
--- a/source/blender/makesrna/intern/rna_sequencer.cc
+++ b/source/blender/makesrna/intern/rna_sequencer.cc
@@ -118,8 +118,8 @@ const EnumPropertyItem rna_enum_strip_color_items[] = {
 
 #  include "WM_api.hh"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 #  include "IMB_imbuf.h"
 
diff --git a/source/blender/makesrna/intern/rna_shader_fx.cc b/source/blender/makesrna/intern/rna_shader_fx.cc
index 8f204fcad9e..ebb7c9abf43 100644
--- a/source/blender/makesrna/intern/rna_shader_fx.cc
+++ b/source/blender/makesrna/intern/rna_shader_fx.cc
@@ -87,8 +87,8 @@ static const EnumPropertyItem rna_enum_glow_blend_modes_items[] = {
 
 #  include "BKE_shader_fx.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 static StructRNA *rna_ShaderFx_refine(PointerRNA *ptr)
 {
diff --git a/source/blender/makesrna/intern/rna_sound.cc b/source/blender/makesrna/intern/rna_sound.cc
index 84000c42f16..2c5bbe21cb7 100644
--- a/source/blender/makesrna/intern/rna_sound.cc
+++ b/source/blender/makesrna/intern/rna_sound.cc
@@ -35,7 +35,7 @@ static const EnumPropertyItem rna_enum_audio_channels_items[] = {
 #  include "BKE_context.h"
 #  include "BKE_sound.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "SEQ_sequencer.h"
 
diff --git a/source/blender/makesrna/intern/rna_space.cc b/source/blender/makesrna/intern/rna_space.cc
index 7820d9cc235..c1234e573ed 100644
--- a/source/blender/makesrna/intern/rna_space.cc
+++ b/source/blender/makesrna/intern/rna_space.cc
@@ -559,8 +559,8 @@ static const EnumPropertyItem rna_enum_curve_display_handle_items[] = {
 #  include "BKE_screen.h"
 #  include "BKE_workspace.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 #  include "ED_anim_api.hh"
 #  include "ED_asset.hh"
diff --git a/source/blender/makesrna/intern/rna_texture.cc b/source/blender/makesrna/intern/rna_texture.cc
index f0efb385d8a..60e4b85c71d 100644
--- a/source/blender/makesrna/intern/rna_texture.cc
+++ b/source/blender/makesrna/intern/rna_texture.cc
@@ -138,8 +138,8 @@ static const EnumPropertyItem blend_type_items[] = {
 #  include "BKE_main.h"
 #  include "BKE_texture.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 #  include "ED_node.hh"
 #  include "ED_render.hh"
diff --git a/source/blender/makesrna/intern/rna_timeline.cc b/source/blender/makesrna/intern/rna_timeline.cc
index 7c5fd36d551..634671c185c 100644
--- a/source/blender/makesrna/intern/rna_timeline.cc
+++ b/source/blender/makesrna/intern/rna_timeline.cc
@@ -23,7 +23,7 @@
 #  include "BKE_screen.h"
 #  include "WM_api.hh"
 
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph_build.hh"
 
 static IDProperty **rna_TimelineMarker_idprops(PointerRNA *ptr)
 {
diff --git a/source/blender/makesrna/intern/rna_tracking.cc b/source/blender/makesrna/intern/rna_tracking.cc
index 8501e12cca2..df9d87b135d 100644
--- a/source/blender/makesrna/intern/rna_tracking.cc
+++ b/source/blender/makesrna/intern/rna_tracking.cc
@@ -40,7 +40,7 @@
 #  include "BKE_node.h"
 #  include "BKE_report.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "IMB_imbuf.h"
 
diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc
index 1f88897c26f..f47c2af751d 100644
--- a/source/blender/makesrna/intern/rna_userdef.cc
+++ b/source/blender/makesrna/intern/rna_userdef.cc
@@ -175,7 +175,7 @@ static const EnumPropertyItem rna_enum_preference_gpu_backend_items[] = {
 #  include "BKE_preferences.h"
 #  include "BKE_screen.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "GPU_capabilities.h"
 #  include "GPU_select.h"
diff --git a/source/blender/makesrna/intern/rna_vfont.cc b/source/blender/makesrna/intern/rna_vfont.cc
index bc4aea8a30f..090b662daab 100644
--- a/source/blender/makesrna/intern/rna_vfont.cc
+++ b/source/blender/makesrna/intern/rna_vfont.cc
@@ -21,7 +21,7 @@
 #  include "BKE_vfont.h"
 #  include "DNA_object_types.h"
 
-#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph.hh"
 
 #  include "WM_api.hh"
 
diff --git a/source/blender/makesrna/intern/rna_volume.cc b/source/blender/makesrna/intern/rna_volume.cc
index 81fb59ccac4..1d5adcede74 100644
--- a/source/blender/makesrna/intern/rna_volume.cc
+++ b/source/blender/makesrna/intern/rna_volume.cc
@@ -45,8 +45,8 @@ const EnumPropertyItem rna_enum_volume_grid_data_type_items[] = {
 
 #ifdef RNA_RUNTIME
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 #  include "WM_api.hh"
 #  include "WM_types.hh"
diff --git a/source/blender/makesrna/intern/rna_world.cc b/source/blender/makesrna/intern/rna_world.cc
index 3b415ea8502..ce6103d0ca3 100644
--- a/source/blender/makesrna/intern/rna_world.cc
+++ b/source/blender/makesrna/intern/rna_world.cc
@@ -29,8 +29,8 @@
 #  include "BKE_main.h"
 #  include "BKE_texture.h"
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
 
 #  include "ED_node.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_armature.cc b/source/blender/modifiers/intern/MOD_armature.cc
index 149060b4ef6..70179f8cd7e 100644
--- a/source/blender/modifiers/intern/MOD_armature.cc
+++ b/source/blender/modifiers/intern/MOD_armature.cc
@@ -39,7 +39,7 @@
 
 #include "BLO_read_write.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_array.cc b/source/blender/modifiers/intern/MOD_array.cc
index ec0b8c8c1ab..d3365c733d9 100644
--- a/source/blender/modifiers/intern/MOD_array.cc
+++ b/source/blender/modifiers/intern/MOD_array.cc
@@ -47,8 +47,8 @@
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "GEO_mesh_merge_by_distance.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_bevel.cc b/source/blender/modifiers/intern/MOD_bevel.cc
index 0cdebb486c3..f8123c59310 100644
--- a/source/blender/modifiers/intern/MOD_bevel.cc
+++ b/source/blender/modifiers/intern/MOD_bevel.cc
@@ -42,7 +42,7 @@
 #include "bmesh.h"
 #include "bmesh_tools.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 static void init_data(ModifierData *md)
 {
diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc
index 16acef64723..f4444c13a79 100644
--- a/source/blender/modifiers/intern/MOD_boolean.cc
+++ b/source/blender/modifiers/intern/MOD_boolean.cc
@@ -47,7 +47,7 @@
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_build.cc b/source/blender/modifiers/intern/MOD_build.cc
index f1fab066748..d04f253c6fa 100644
--- a/source/blender/modifiers/intern/MOD_build.cc
+++ b/source/blender/modifiers/intern/MOD_build.cc
@@ -22,7 +22,7 @@
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "BKE_context.h"
 #include "BKE_mesh.hh"
diff --git a/source/blender/modifiers/intern/MOD_cast.cc b/source/blender/modifiers/intern/MOD_cast.cc
index 953c709d32f..0b4e37e34cb 100644
--- a/source/blender/modifiers/intern/MOD_cast.cc
+++ b/source/blender/modifiers/intern/MOD_cast.cc
@@ -35,7 +35,7 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
diff --git a/source/blender/modifiers/intern/MOD_cloth.cc b/source/blender/modifiers/intern/MOD_cloth.cc
index e611105fa0d..0bc14ede17d 100644
--- a/source/blender/modifiers/intern/MOD_cloth.cc
+++ b/source/blender/modifiers/intern/MOD_cloth.cc
@@ -43,8 +43,8 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_physics.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_physics.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
diff --git a/source/blender/modifiers/intern/MOD_collision.cc b/source/blender/modifiers/intern/MOD_collision.cc
index d41c342759a..08e02f695a2 100644
--- a/source/blender/modifiers/intern/MOD_collision.cc
+++ b/source/blender/modifiers/intern/MOD_collision.cc
@@ -46,7 +46,7 @@
 
 #include "BLO_read_write.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 static void init_data(ModifierData *md)
 {
diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.cc b/source/blender/modifiers/intern/MOD_correctivesmooth.cc
index ad2dc393077..d6a5194ef18 100644
--- a/source/blender/modifiers/intern/MOD_correctivesmooth.cc
+++ b/source/blender/modifiers/intern/MOD_correctivesmooth.cc
@@ -43,7 +43,7 @@
 
 #include "BLO_read_write.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 // #define DEBUG_TIME
 
diff --git a/source/blender/modifiers/intern/MOD_curve.cc b/source/blender/modifiers/intern/MOD_curve.cc
index e29ffc6a6a4..c7d5c2945e7 100644
--- a/source/blender/modifiers/intern/MOD_curve.cc
+++ b/source/blender/modifiers/intern/MOD_curve.cc
@@ -35,9 +35,9 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.cc b/source/blender/modifiers/intern/MOD_datatransfer.cc
index 4d6bf05a93c..51e1c53b818 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.cc
+++ b/source/blender/modifiers/intern/MOD_datatransfer.cc
@@ -34,7 +34,7 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_decimate.cc b/source/blender/modifiers/intern/MOD_decimate.cc
index 73492c4c989..77253273a2b 100644
--- a/source/blender/modifiers/intern/MOD_decimate.cc
+++ b/source/blender/modifiers/intern/MOD_decimate.cc
@@ -30,7 +30,7 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "bmesh.h"
 #include "bmesh_tools.h"
diff --git a/source/blender/modifiers/intern/MOD_displace.cc b/source/blender/modifiers/intern/MOD_displace.cc
index 6192f355df3..6dd88b45a46 100644
--- a/source/blender/modifiers/intern/MOD_displace.cc
+++ b/source/blender/modifiers/intern/MOD_displace.cc
@@ -40,8 +40,8 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.cc b/source/blender/modifiers/intern/MOD_dynamicpaint.cc
index 9c7abfeb4fb..e19685598fe 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.cc
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.cc
@@ -36,10 +36,10 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_physics.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_physics.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_explode.cc b/source/blender/modifiers/intern/MOD_explode.cc
index fa5fb3e7a22..fa8019f8be4 100644
--- a/source/blender/modifiers/intern/MOD_explode.cc
+++ b/source/blender/modifiers/intern/MOD_explode.cc
@@ -45,7 +45,7 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_fluid.cc b/source/blender/modifiers/intern/MOD_fluid.cc
index 6bed806d7db..c2d79b940c0 100644
--- a/source/blender/modifiers/intern/MOD_fluid.cc
+++ b/source/blender/modifiers/intern/MOD_fluid.cc
@@ -36,10 +36,10 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_physics.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_physics.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_hook.cc b/source/blender/modifiers/intern/MOD_hook.cc
index db78eb8ee52..721d37c15b5 100644
--- a/source/blender/modifiers/intern/MOD_hook.cc
+++ b/source/blender/modifiers/intern/MOD_hook.cc
@@ -40,7 +40,7 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_lattice.cc b/source/blender/modifiers/intern/MOD_lattice.cc
index 150871b528c..ac493aedd92 100644
--- a/source/blender/modifiers/intern/MOD_lattice.cc
+++ b/source/blender/modifiers/intern/MOD_lattice.cc
@@ -32,7 +32,7 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc
index 66b30295999..4041770f954 100644
--- a/source/blender/modifiers/intern/MOD_mask.cc
+++ b/source/blender/modifiers/intern/MOD_mask.cc
@@ -39,8 +39,8 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc
index 2cb40d3b61e..8fd5c102f63 100644
--- a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc
+++ b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc
@@ -25,7 +25,7 @@
 #include "DNA_screen_types.h"
 #include "DNA_volume_types.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "GEO_mesh_to_volume.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_meshcache.cc b/source/blender/modifiers/intern/MOD_meshcache.cc
index 9a6dc50fac5..fc8bb72342c 100644
--- a/source/blender/modifiers/intern/MOD_meshcache.cc
+++ b/source/blender/modifiers/intern/MOD_meshcache.cc
@@ -40,7 +40,7 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_meshdeform.cc b/source/blender/modifiers/intern/MOD_meshdeform.cc
index 95ebe63b74a..7ad3cf9178e 100644
--- a/source/blender/modifiers/intern/MOD_meshdeform.cc
+++ b/source/blender/modifiers/intern/MOD_meshdeform.cc
@@ -43,8 +43,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.cc b/source/blender/modifiers/intern/MOD_meshsequencecache.cc
index b51de6e4bd9..a9ddff30e5c 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.cc
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.cc
@@ -41,8 +41,8 @@
 
 #include "BLO_read_write.hh"
 
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "GEO_mesh_primitive_cuboid.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_mirror.cc b/source/blender/modifiers/intern/MOD_mirror.cc
index 47465323ca1..13a8a92f2ce 100644
--- a/source/blender/modifiers/intern/MOD_mirror.cc
+++ b/source/blender/modifiers/intern/MOD_mirror.cc
@@ -30,8 +30,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_multires.cc b/source/blender/modifiers/intern/MOD_multires.cc
index 85e94dad530..5fa01f949f4 100644
--- a/source/blender/modifiers/intern/MOD_multires.cc
+++ b/source/blender/modifiers/intern/MOD_multires.cc
@@ -41,7 +41,7 @@
 
 #include "WM_types.hh" /* For subdivide operator UI. */
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index 52e15217dce..6959a58f17b 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -72,8 +72,8 @@
 #include "RNA_enum_types.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_nodes.hh"
diff --git a/source/blender/modifiers/intern/MOD_normal_edit.cc b/source/blender/modifiers/intern/MOD_normal_edit.cc
index 954c722fadd..88593e4ebb4 100644
--- a/source/blender/modifiers/intern/MOD_normal_edit.cc
+++ b/source/blender/modifiers/intern/MOD_normal_edit.cc
@@ -38,7 +38,7 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
diff --git a/source/blender/modifiers/intern/MOD_ocean.cc b/source/blender/modifiers/intern/MOD_ocean.cc
index 06caed5001c..351321d467a 100644
--- a/source/blender/modifiers/intern/MOD_ocean.cc
+++ b/source/blender/modifiers/intern/MOD_ocean.cc
@@ -38,7 +38,7 @@
 
 #include "WM_types.hh" /* For UI free bake operator. */
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.cc b/source/blender/modifiers/intern/MOD_particleinstance.cc
index c6708360eeb..04e16d25b12 100644
--- a/source/blender/modifiers/intern/MOD_particleinstance.cc
+++ b/source/blender/modifiers/intern/MOD_particleinstance.cc
@@ -40,8 +40,8 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_particlesystem.cc b/source/blender/modifiers/intern/MOD_particlesystem.cc
index 2cd53fc78d6..091dc5c9f83 100644
--- a/source/blender/modifiers/intern/MOD_particlesystem.cc
+++ b/source/blender/modifiers/intern/MOD_particlesystem.cc
@@ -33,7 +33,7 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_screw.cc b/source/blender/modifiers/intern/MOD_screw.cc
index 492d955c0de..b7a5967ee8f 100644
--- a/source/blender/modifiers/intern/MOD_screw.cc
+++ b/source/blender/modifiers/intern/MOD_screw.cc
@@ -39,8 +39,8 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.cc b/source/blender/modifiers/intern/MOD_shrinkwrap.cc
index 8c825d03320..494e3553623 100644
--- a/source/blender/modifiers/intern/MOD_shrinkwrap.cc
+++ b/source/blender/modifiers/intern/MOD_shrinkwrap.cc
@@ -33,7 +33,7 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
diff --git a/source/blender/modifiers/intern/MOD_simpledeform.cc b/source/blender/modifiers/intern/MOD_simpledeform.cc
index e79dc074986..1f5c155969d 100644
--- a/source/blender/modifiers/intern/MOD_simpledeform.cc
+++ b/source/blender/modifiers/intern/MOD_simpledeform.cc
@@ -34,7 +34,7 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
diff --git a/source/blender/modifiers/intern/MOD_softbody.cc b/source/blender/modifiers/intern/MOD_softbody.cc
index 03598232922..692c3377855 100644
--- a/source/blender/modifiers/intern/MOD_softbody.cc
+++ b/source/blender/modifiers/intern/MOD_softbody.cc
@@ -29,10 +29,10 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_physics.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_physics.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_subsurf.cc b/source/blender/modifiers/intern/MOD_subsurf.cc
index 846eb6e713a..943d52db10f 100644
--- a/source/blender/modifiers/intern/MOD_subsurf.cc
+++ b/source/blender/modifiers/intern/MOD_subsurf.cc
@@ -43,8 +43,8 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_surface.cc b/source/blender/modifiers/intern/MOD_surface.cc
index 92bb218fa23..3d52ccc3a6f 100644
--- a/source/blender/modifiers/intern/MOD_surface.cc
+++ b/source/blender/modifiers/intern/MOD_surface.cc
@@ -31,8 +31,8 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.cc b/source/blender/modifiers/intern/MOD_surfacedeform.cc
index a6f9a19a9ca..e7e2c4265d4 100644
--- a/source/blender/modifiers/intern/MOD_surfacedeform.cc
+++ b/source/blender/modifiers/intern/MOD_surfacedeform.cc
@@ -39,8 +39,8 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_ui_common.hh b/source/blender/modifiers/intern/MOD_ui_common.hh
index 52e2d793f26..a55aa585e17 100644
--- a/source/blender/modifiers/intern/MOD_ui_common.hh
+++ b/source/blender/modifiers/intern/MOD_ui_common.hh
@@ -11,7 +11,7 @@
 /* so modifier types match their defines */
 #include "MOD_modifiertypes.hh"
 
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_build.hh"
 
 struct ARegionType;
 struct Panel;
diff --git a/source/blender/modifiers/intern/MOD_util.cc b/source/blender/modifiers/intern/MOD_util.cc
index 8aacc8fb4f7..30e94df93ed 100644
--- a/source/blender/modifiers/intern/MOD_util.cc
+++ b/source/blender/modifiers/intern/MOD_util.cc
@@ -33,8 +33,8 @@
 
 #include "BKE_modifier.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_util.hh"
diff --git a/source/blender/modifiers/intern/MOD_util.hh b/source/blender/modifiers/intern/MOD_util.hh
index 6f7d8572922..8b30e59ae74 100644
--- a/source/blender/modifiers/intern/MOD_util.hh
+++ b/source/blender/modifiers/intern/MOD_util.hh
@@ -11,7 +11,7 @@
 /* so modifier types match their defines */
 #include "MOD_modifiertypes.hh"
 
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_build.hh"
 
 struct MDeformVert;
 struct Mesh;
diff --git a/source/blender/modifiers/intern/MOD_uvproject.cc b/source/blender/modifiers/intern/MOD_uvproject.cc
index 1c8aa2db953..5c82f060ab6 100644
--- a/source/blender/modifiers/intern/MOD_uvproject.cc
+++ b/source/blender/modifiers/intern/MOD_uvproject.cc
@@ -42,9 +42,9 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 static void init_data(ModifierData *md)
 {
diff --git a/source/blender/modifiers/intern/MOD_uvwarp.cc b/source/blender/modifiers/intern/MOD_uvwarp.cc
index 6e970eab6cf..3870fb28bf9 100644
--- a/source/blender/modifiers/intern/MOD_uvwarp.cc
+++ b/source/blender/modifiers/intern/MOD_uvwarp.cc
@@ -36,7 +36,7 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
diff --git a/source/blender/modifiers/intern/MOD_volume_displace.cc b/source/blender/modifiers/intern/MOD_volume_displace.cc
index 52c2e9a2b8c..d02e2c32e7e 100644
--- a/source/blender/modifiers/intern/MOD_volume_displace.cc
+++ b/source/blender/modifiers/intern/MOD_volume_displace.cc
@@ -24,8 +24,8 @@
 #include "DNA_texture_types.h"
 #include "DNA_volume_types.h"
 
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc
index f92505926f3..482241c1215 100644
--- a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc
+++ b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc
@@ -39,7 +39,7 @@
 #include "BLI_string.h"
 #include "BLI_timeit.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #ifdef WITH_OPENVDB
 #  include <openvdb/tools/GridTransformer.h>
diff --git a/source/blender/modifiers/intern/MOD_warp.cc b/source/blender/modifiers/intern/MOD_warp.cc
index 25bdbce63b7..c4f774d7bff 100644
--- a/source/blender/modifiers/intern/MOD_warp.cc
+++ b/source/blender/modifiers/intern/MOD_warp.cc
@@ -43,8 +43,8 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RE_texture.h"
 
diff --git a/source/blender/modifiers/intern/MOD_wave.cc b/source/blender/modifiers/intern/MOD_wave.cc
index abb2bb3a42c..83037f10674 100644
--- a/source/blender/modifiers/intern/MOD_wave.cc
+++ b/source/blender/modifiers/intern/MOD_wave.cc
@@ -44,8 +44,8 @@
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 static void init_data(ModifierData *md)
 {
diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.cc b/source/blender/modifiers/intern/MOD_weightvg_util.cc
index 9e53b22f4cf..bbe4e518a1f 100644
--- a/source/blender/modifiers/intern/MOD_weightvg_util.cc
+++ b/source/blender/modifiers/intern/MOD_weightvg_util.cc
@@ -34,8 +34,8 @@
 
 #include "RNA_access.hh"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.cc b/source/blender/modifiers/intern/MOD_weightvgedit.cc
index eff81fb48c5..330a9e35af4 100644
--- a/source/blender/modifiers/intern/MOD_weightvgedit.cc
+++ b/source/blender/modifiers/intern/MOD_weightvgedit.cc
@@ -41,8 +41,8 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.cc b/source/blender/modifiers/intern/MOD_weightvgmix.cc
index ff510beeed6..e1465827e68 100644
--- a/source/blender/modifiers/intern/MOD_weightvgmix.cc
+++ b/source/blender/modifiers/intern/MOD_weightvgmix.cc
@@ -34,8 +34,8 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.cc b/source/blender/modifiers/intern/MOD_weightvgproximity.cc
index 35e7b02ac57..4b3fc2424a4 100644
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.cc
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.cc
@@ -47,8 +47,8 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_weld.cc b/source/blender/modifiers/intern/MOD_weld.cc
index f42a82acce0..276b2a6157c 100644
--- a/source/blender/modifiers/intern/MOD_weld.cc
+++ b/source/blender/modifiers/intern/MOD_weld.cc
@@ -40,7 +40,7 @@
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.cc b/source/blender/nodes/composite/nodes/node_composite_image.cc
index 4d40087fa3e..f5a3401c641 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_image.cc
@@ -21,7 +21,7 @@
 #include "BKE_main.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_scene_types.h"
 #include "DNA_vec_types.h"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc
index f75ca14fee7..ed652506869 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc
@@ -25,7 +25,7 @@
 
 #include "GEO_reverse_uv_sampler.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "node_geometry_util.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc
index f2b7962c825..a47b9f9c026 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc
@@ -20,7 +20,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "node_geometry_util.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_scene_time.cc b/source/blender/nodes/geometry/nodes/node_geo_input_scene_time.cc
index b9810bc1551..28313bd40a2 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_input_scene_time.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_input_scene_time.cc
@@ -4,7 +4,7 @@
 
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "node_geometry_util.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_is_viewport.cc b/source/blender/nodes/geometry/nodes/node_geo_is_viewport.cc
index 9b9d14ca144..d4866e2a2ca 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_is_viewport.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_is_viewport.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "node_geometry_util.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mean_filter_sdf_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_mean_filter_sdf_volume.cc
index 1d47c844ba2..5647e3b6f50 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mean_filter_sdf_volume.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mean_filter_sdf_volume.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #ifdef WITH_OPENVDB
 #  include <openvdb/tools/LevelSetFilter.h>
 #endif
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc
index f61f91b9993..86024a40d94 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #include "node_geometry_util.hh"
 
 #include "BKE_lib_id.h"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc
index ee5a986d22e..a47bdd2bc41 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #include "node_geometry_util.hh"
 
 #include "BKE_lib_id.h"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_offset_sdf_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_offset_sdf_volume.cc
index 825244b005b..52e375a4521 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_offset_sdf_volume.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_offset_sdf_volume.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #ifdef WITH_OPENVDB
 #  include <openvdb/tools/LevelSetFilter.h>
 #endif
diff --git a/source/blender/nodes/geometry/nodes/node_geo_repeat_input.cc b/source/blender/nodes/geometry/nodes/node_geo_repeat_input.cc
index b927a269545..be3d69c508d 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_repeat_input.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_repeat_input.cc
@@ -5,7 +5,7 @@
 #include "BKE_compute_contexts.hh"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_repeat_output.cc b/source/blender/nodes/geometry/nodes/node_geo_repeat_output.cc
index c32eeb4ea1a..b641502bc72 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_repeat_output.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_repeat_output.cc
@@ -7,7 +7,7 @@
 #include "BKE_compute_contexts.hh"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_volume.cc
index 0dcb46ad470..ba9c09f78c3 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_sample_volume.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_sample_volume.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "BKE_type_conversions.hh"
 #include "BKE_volume.h"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_position.cc b/source/blender/nodes/geometry/nodes/node_geo_set_position.cc
index 1d408c1dc16..ed35167e22e 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_set_position.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_set_position.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "BLI_task.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc b/source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc
index 8f7d3fd0b5f..ff6b9873e72 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc
@@ -5,7 +5,7 @@
 #include "BKE_compute_contexts.hh"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_simulation_output.cc b/source/blender/nodes/geometry/nodes/node_geo_simulation_output.cc
index 2ca51a7c30e..94b13c4afe9 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_simulation_output.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_simulation_output.cc
@@ -14,7 +14,7 @@
 #include "BKE_instances.hh"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc
index 637c33ad901..adb5cbec593 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc
@@ -22,7 +22,7 @@
 #include "BKE_volume.h"
 #include "BKE_volume_openvdb.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "node_geometry_util.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
index a4976400de2..5aa751b949e 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 #ifdef WITH_OPENVDB
 #  include <openvdb/tools/GridTransformer.h>
 #  include <openvdb/tools/VolumeToMesh.h>
diff --git a/source/blender/nodes/intern/geometry_nodes_lazy_function.cc b/source/blender/nodes/intern/geometry_nodes_lazy_function.cc
index 6ff48e1d54f..a84745bea46 100644
--- a/source/blender/nodes/intern/geometry_nodes_lazy_function.cc
+++ b/source/blender/nodes/intern/geometry_nodes_lazy_function.cc
@@ -46,7 +46,7 @@
 #include "FN_lazy_function_execute.hh"
 #include "FN_lazy_function_graph_executor.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include <fmt/format.h>
 #include <sstream>
diff --git a/source/blender/nodes/intern/node_geometry_exec.cc b/source/blender/nodes/intern/node_geometry_exec.cc
index 58fe3032bfc..206f8bfbf7e 100644
--- a/source/blender/nodes/intern/node_geometry_exec.cc
+++ b/source/blender/nodes/intern/node_geometry_exec.cc
@@ -4,7 +4,7 @@
 
 #include "DNA_modifier_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "BKE_curves.hh"
 #include "BKE_type_conversions.hh"
diff --git a/source/blender/nodes/shader/nodes/node_shader_normal_map.cc b/source/blender/nodes/shader/nodes/node_shader_normal_map.cc
index 9dffb5afc9c..e0f1123c144 100644
--- a/source/blender/nodes/shader/nodes/node_shader_normal_map.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_normal_map.cc
@@ -8,7 +8,7 @@
 #include "BKE_context.h"
 #include "BKE_node_runtime.hh"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tangent.cc b/source/blender/nodes/shader/nodes/node_shader_tangent.cc
index 644c7fb8754..f3e2a2d6107 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tangent.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_tangent.cc
@@ -7,7 +7,7 @@
 
 #include "BKE_context.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_uvmap.cc b/source/blender/nodes/shader/nodes/node_shader_uvmap.cc
index 543400d8e28..b46df2294be 100644
--- a/source/blender/nodes/shader/nodes/node_shader_uvmap.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_uvmap.cc
@@ -9,7 +9,7 @@
 
 #include "DNA_customdata_types.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc b/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc
index 83b64c504e1..bbf66f4898b 100644
--- a/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc
@@ -7,7 +7,7 @@
 
 #include "BKE_context.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "RNA_access.hh"
 
diff --git a/source/blender/nodes/texture/node_texture_tree.cc b/source/blender/nodes/texture/node_texture_tree.cc
index 121b71796cd..986266abbf6 100644
--- a/source/blender/nodes/texture/node_texture_tree.cc
+++ b/source/blender/nodes/texture/node_texture_tree.cc
@@ -31,7 +31,7 @@
 #include "node_texture_util.hh"
 #include "node_util.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
diff --git a/source/blender/python/bmesh/bmesh_py_types.cc b/source/blender/python/bmesh/bmesh_py_types.cc
index 957669aabf9..c09a38c9ba7 100644
--- a/source/blender/python/bmesh/bmesh_py_types.cc
+++ b/source/blender/python/bmesh/bmesh_py_types.cc
@@ -24,8 +24,8 @@
 #include "BKE_mesh_runtime.hh"
 #include "BKE_object.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "bmesh.h"
 
diff --git a/source/blender/python/intern/bpy_rna.cc b/source/blender/python/intern/bpy_rna.cc
index 22e781a5b87..ea959845798 100644
--- a/source/blender/python/intern/bpy_rna.cc
+++ b/source/blender/python/intern/bpy_rna.cc
@@ -60,7 +60,7 @@
 /* Only for types. */
 #include "BKE_node.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "../generic/idprop_py_api.h" /* For IDprop lookups. */
 #include "../generic/idprop_py_ui_api.h"
diff --git a/source/blender/python/intern/bpy_rna_anim.cc b/source/blender/python/intern/bpy_rna_anim.cc
index fa64e49139a..d4339ae42c9 100644
--- a/source/blender/python/intern/bpy_rna_anim.cc
+++ b/source/blender/python/intern/bpy_rna_anim.cc
@@ -47,8 +47,8 @@
 #include "../generic/py_capi_rna.h"
 #include "../generic/python_utildefines.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 /* for keyframes and drivers */
 static int pyrna_struct_anim_args_parse_ex(PointerRNA *ptr,
diff --git a/source/blender/python/mathutils/mathutils_bvhtree.cc b/source/blender/python/mathutils/mathutils_bvhtree.cc
index 1ff455331f6..aa10205e18a 100644
--- a/source/blender/python/mathutils/mathutils_bvhtree.cc
+++ b/source/blender/python/mathutils/mathutils_bvhtree.cc
@@ -42,7 +42,7 @@
 #  include "BKE_mesh_runtime.hh"
 #  include "BKE_object.h"
 
-#  include "DEG_depsgraph_query.h"
+#  include "DEG_depsgraph_query.hh"
 
 #  include "bmesh.h"
 
diff --git a/source/blender/render/hydra/engine.cc b/source/blender/render/hydra/engine.cc
index 82f3c3172d8..9cde3adeac5 100644
--- a/source/blender/render/hydra/engine.cc
+++ b/source/blender/render/hydra/engine.cc
@@ -17,7 +17,7 @@
 
 #include "GPU_context.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "RE_engine.h"
 
diff --git a/source/blender/render/hydra/final_engine.cc b/source/blender/render/hydra/final_engine.cc
index b94ddbf9c88..774a58cde74 100644
--- a/source/blender/render/hydra/final_engine.cc
+++ b/source/blender/render/hydra/final_engine.cc
@@ -14,7 +14,7 @@
 
 #include "BKE_lib_id.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "IMB_imbuf_types.h"
 
diff --git a/source/blender/render/hydra/viewport_engine.cc b/source/blender/render/hydra/viewport_engine.cc
index ce9954be22d..3637ee9b707 100644
--- a/source/blender/render/hydra/viewport_engine.cc
+++ b/source/blender/render/hydra/viewport_engine.cc
@@ -21,7 +21,7 @@
 #include "BKE_camera.h"
 #include "BKE_context.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_context.h"
 #include "GPU_matrix.h"
diff --git a/source/blender/render/intern/compositor.cc b/source/blender/render/intern/compositor.cc
index 20a0b0da722..54daa95f70c 100644
--- a/source/blender/render/intern/compositor.cc
+++ b/source/blender/render/intern/compositor.cc
@@ -20,7 +20,7 @@
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "COM_context.hh"
 #include "COM_evaluator.hh"
diff --git a/source/blender/render/intern/engine.cc b/source/blender/render/intern/engine.cc
index 56386abc761..b8ab59b4597 100644
--- a/source/blender/render/intern/engine.cc
+++ b/source/blender/render/intern/engine.cc
@@ -31,9 +31,9 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_debug.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_debug.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "GPU_context.h"
 
diff --git a/source/blender/render/intern/multires_bake.cc b/source/blender/render/intern/multires_bake.cc
index adad61c6052..c90f34d7dce 100644
--- a/source/blender/render/intern/multires_bake.cc
+++ b/source/blender/render/intern/multires_bake.cc
@@ -33,7 +33,7 @@
 #include "BKE_multires.hh"
 #include "BKE_subsurf.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "RE_multires_bake.h"
 #include "RE_pipeline.h"
diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc
index 01710b4b778..f3d080d6015 100644
--- a/source/blender/render/intern/pipeline.cc
+++ b/source/blender/render/intern/pipeline.cc
@@ -66,10 +66,10 @@
 
 #include "NOD_composite.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_debug.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_debug.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
diff --git a/source/blender/render/intern/texture_pointdensity.cc b/source/blender/render/intern/texture_pointdensity.cc
index c194dddd649..041457d991f 100644
--- a/source/blender/render/intern/texture_pointdensity.cc
+++ b/source/blender/render/intern/texture_pointdensity.cc
@@ -40,8 +40,8 @@
 #include "BKE_particle.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "texture_common.h"
 
diff --git a/source/blender/sequencer/intern/animation.cc b/source/blender/sequencer/intern/animation.cc
index c49ffebeaa4..64ba1f57470 100644
--- a/source/blender/sequencer/intern/animation.cc
+++ b/source/blender/sequencer/intern/animation.cc
@@ -19,7 +19,7 @@
 #include "BLI_listbase.h"
 #include "BLI_string.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "SEQ_animation.h"
 
diff --git a/source/blender/sequencer/intern/prefetch.cc b/source/blender/sequencer/intern/prefetch.cc
index 787d7f533f9..7305123c640 100644
--- a/source/blender/sequencer/intern/prefetch.cc
+++ b/source/blender/sequencer/intern/prefetch.cc
@@ -33,10 +33,10 @@
 #include "BKE_main.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_debug.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_debug.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "SEQ_channels.h"
 #include "SEQ_iterator.h"
diff --git a/source/blender/sequencer/intern/proxy.cc b/source/blender/sequencer/intern/proxy.cc
index 78c4fbb13f3..585c5a49419 100644
--- a/source/blender/sequencer/intern/proxy.cc
+++ b/source/blender/sequencer/intern/proxy.cc
@@ -32,7 +32,7 @@
 #include "BKE_main.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
diff --git a/source/blender/sequencer/intern/render.cc b/source/blender/sequencer/intern/render.cc
index fa87b55250f..7e2b33dfb83 100644
--- a/source/blender/sequencer/intern/render.cc
+++ b/source/blender/sequencer/intern/render.cc
@@ -40,8 +40,8 @@
 #include "BKE_scene.h"
 #include "BKE_sequencer_offscreen.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
diff --git a/source/blender/sequencer/intern/sequencer.cc b/source/blender/sequencer/intern/sequencer.cc
index c6a86585576..79fe0ccfa78 100644
--- a/source/blender/sequencer/intern/sequencer.cc
+++ b/source/blender/sequencer/intern/sequencer.cc
@@ -26,7 +26,7 @@
 #include "BKE_main.h"
 #include "BKE_sound.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
diff --git a/source/blender/sequencer/intern/strip_add.cc b/source/blender/sequencer/intern/strip_add.cc
index 5b09c5d2183..941b8e85c0d 100644
--- a/source/blender/sequencer/intern/strip_add.cc
+++ b/source/blender/sequencer/intern/strip_add.cc
@@ -32,7 +32,7 @@
 #include "BKE_scene.h"
 #include "BKE_sound.h"
 
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
diff --git a/source/blender/sequencer/intern/strip_relations.cc b/source/blender/sequencer/intern/strip_relations.cc
index 465c05a6936..d8d3cacc058 100644
--- a/source/blender/sequencer/intern/strip_relations.cc
+++ b/source/blender/sequencer/intern/strip_relations.cc
@@ -20,8 +20,8 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "IMB_imbuf.h"
 
diff --git a/source/blender/shader_fx/intern/FX_shader_shadow.cc b/source/blender/shader_fx/intern/FX_shader_shadow.cc
index 9055d78e5aa..440593207fc 100644
--- a/source/blender/shader_fx/intern/FX_shader_shadow.cc
+++ b/source/blender/shader_fx/intern/FX_shader_shadow.cc
@@ -31,8 +31,8 @@
 #include "FX_shader_types.h"
 #include "FX_ui_common.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.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 a6bfc8cfd3a..fde1f5b7483 100644
--- a/source/blender/shader_fx/intern/FX_shader_swirl.cc
+++ b/source/blender/shader_fx/intern/FX_shader_swirl.cc
@@ -32,8 +32,8 @@
 #include "FX_shader_types.h"
 #include "FX_ui_common.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 static void init_data(ShaderFxData *md)
 {
diff --git a/source/blender/simulation/intern/SIM_mass_spring.cc b/source/blender/simulation/intern/SIM_mass_spring.cc
index 84094a47f3a..44904f9b2a7 100644
--- a/source/blender/simulation/intern/SIM_mass_spring.cc
+++ b/source/blender/simulation/intern/SIM_mass_spring.cc
@@ -27,8 +27,8 @@
 #include "SIM_mass_spring.h"
 #include "implicit.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 static float I3[3][3] = {{1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {0.0, 0.0, 1.0}};
 
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc
index a7dcc6d0c18..95e5bee3cae 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc
@@ -40,7 +40,7 @@
 /* for tool-tips */
 #include "UI_interface.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 /* own includes */
 #include "wm_gizmo_intern.h"
diff --git a/source/blender/windowmanager/intern/wm_event_query.cc b/source/blender/windowmanager/intern/wm_event_query.cc
index bdaee99d5de..023a5e1c72c 100644
--- a/source/blender/windowmanager/intern/wm_event_query.cc
+++ b/source/blender/windowmanager/intern/wm_event_query.cc
@@ -34,7 +34,7 @@
 
 #include "RNA_enum_types.hh"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Event Printing
diff --git a/source/blender/windowmanager/intern/wm_event_system.cc b/source/blender/windowmanager/intern/wm_event_system.cc
index aa54b92adad..877ddf594c5 100644
--- a/source/blender/windowmanager/intern/wm_event_system.cc
+++ b/source/blender/windowmanager/intern/wm_event_system.cc
@@ -78,8 +78,8 @@
 #include "wm_window.hh"
 #include "wm_window_private.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "RE_pipeline.h"
 
diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc
index 299ea1267d5..a80a88a938d 100644
--- a/source/blender/windowmanager/intern/wm_files.cc
+++ b/source/blender/windowmanager/intern/wm_files.cc
@@ -123,7 +123,7 @@
 #  include "BPY_extern_run.h"
 #endif
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "WM_api.hh"
 #include "WM_message.hh"
diff --git a/source/blender/windowmanager/intern/wm_files_link.cc b/source/blender/windowmanager/intern/wm_files_link.cc
index 500f0da6f6a..9e9005820e8 100644
--- a/source/blender/windowmanager/intern/wm_files_link.cc
+++ b/source/blender/windowmanager/intern/wm_files_link.cc
@@ -56,8 +56,8 @@
 
 #include "BKE_idtype.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_build.hh"
 
 #include "IMB_colormanagement.h"
 
diff --git a/source/blender/windowmanager/intern/wm_init_exit.cc b/source/blender/windowmanager/intern/wm_init_exit.cc
index aa2f2beb301..49df557b921 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.cc
+++ b/source/blender/windowmanager/intern/wm_init_exit.cc
@@ -120,8 +120,8 @@
 
 #include "COM_compositor.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DRW_engine.h"
 
diff --git a/source/blender/windowmanager/intern/wm_playanim.cc b/source/blender/windowmanager/intern/wm_playanim.cc
index ed8c46b9798..4b8bc4965d7 100644
--- a/source/blender/windowmanager/intern/wm_playanim.cc
+++ b/source/blender/windowmanager/intern/wm_playanim.cc
@@ -62,7 +62,7 @@
 #include "ED_datafiles.h" /* for fonts */
 #include "GHOST_C-api.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "wm_window_private.h"
 
diff --git a/source/blender/windowmanager/xr/intern/wm_xr.cc b/source/blender/windowmanager/xr/intern/wm_xr.cc
index c95b79cca9b..35a4afd7828 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr.cc
+++ b/source/blender/windowmanager/xr/intern/wm_xr.cc
@@ -15,7 +15,7 @@
 #include "BKE_main.h"
 #include "BKE_report.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "DNA_scene_types.h"
 #include "DNA_windowmanager_types.h"
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_operators.cc b/source/blender/windowmanager/xr/intern/wm_xr_operators.cc
index 27b6b4d1dc0..67a6ad0af0d 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_operators.cc
+++ b/source/blender/windowmanager/xr/intern/wm_xr_operators.cc
@@ -22,7 +22,7 @@
 #include "BKE_main.h"
 #include "BKE_screen.h"
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "ED_screen.hh"
 #include "ED_space_api.hh"
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.cc b/source/blender/windowmanager/xr/intern/wm_xr_session.cc
index fc801aa1cb7..8c7dcf48806 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_session.cc
+++ b/source/blender/windowmanager/xr/intern/wm_xr_session.cc
@@ -20,8 +20,8 @@
 #include "BLI_math_vector.h"
 #include "BLI_string.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
+#include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_camera_types.h"
 #include "DNA_space_types.h"
diff --git a/source/creator/creator.cc b/source/creator/creator.cc
index 628efe97b52..a336df873fe 100644
--- a/source/creator/creator.cc
+++ b/source/creator/creator.cc
@@ -61,7 +61,7 @@
 #  include "BLI_args.h"
 #endif
 
-#include "DEG_depsgraph.h"
+#include "DEG_depsgraph.hh"
 
 #include "IMB_imbuf.h" /* For #IMB_init. */
 
diff --git a/source/creator/creator_args.cc b/source/creator/creator_args.cc
index 456ad54c9db..62f2f26c43d 100644
--- a/source/creator/creator_args.cc
+++ b/source/creator/creator_args.cc
@@ -71,9 +71,9 @@
 #    include "CCL_api.h"
 #  endif
 
-#  include "DEG_depsgraph.h"
-#  include "DEG_depsgraph_build.h"
-#  include "DEG_depsgraph_debug.h"
+#  include "DEG_depsgraph.hh"
+#  include "DEG_depsgraph_build.hh"
+#  include "DEG_depsgraph_debug.hh"
 
 #  include "WM_types.hh"