diff --git a/source/blender/blenlib/BLI_session_uid.h b/source/blender/blenlib/BLI_session_uid.h
index c6fab034547..66fe3d65746 100644
--- a/source/blender/blenlib/BLI_session_uid.h
+++ b/source/blender/blenlib/BLI_session_uid.h
@@ -43,9 +43,11 @@ bool BLI_session_uid_ghash_compare(const void *lhs_v, const void *rhs_v);
 
 #ifdef __cplusplus
 
+#  include "BLI_hash.hh"
+
 namespace blender {
 
-inline const bool operator==(const SessionUID &lhs, const SessionUID &rhs)
+inline bool operator==(const SessionUID &lhs, const SessionUID &rhs)
 {
   return BLI_session_uid_is_equal(&lhs, &rhs);
 }
diff --git a/source/blender/depsgraph/DEG_depsgraph_build.hh b/source/blender/depsgraph/DEG_depsgraph_build.hh
index 62676697f0b..b82f95d73c5 100644
--- a/source/blender/depsgraph/DEG_depsgraph_build.hh
+++ b/source/blender/depsgraph/DEG_depsgraph_build.hh
@@ -11,7 +11,6 @@
 #pragma once
 
 #include "BLI_span.hh"
-#include "BLI_sys_types.h"
 
 /* ************************************************* */
 
diff --git a/source/blender/depsgraph/DEG_depsgraph_light_linking.hh b/source/blender/depsgraph/DEG_depsgraph_light_linking.hh
index 84102034bfc..802a704080b 100644
--- a/source/blender/depsgraph/DEG_depsgraph_light_linking.hh
+++ b/source/blender/depsgraph/DEG_depsgraph_light_linking.hh
@@ -8,10 +8,6 @@
 
 #pragma once
 
-#include <cstdint>
-
-#include "BLI_span.hh"
-
 struct Object;
 struct Depsgraph;
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc
index f093b246383..7f4d7b32842 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@ -11,14 +11,12 @@
 #include <cstring>
 
 #include "DNA_ID.h"
-#include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_layer_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 
-#include "BLI_stack.h"
-#include "BLI_utildefines.h"
+#include "BLI_string.h"
 
 #include "BKE_action.hh"
 #include "BKE_collection.hh"
@@ -29,7 +27,6 @@
 #include "intern/builder/deg_builder_cache.h"
 #include "intern/builder/deg_builder_remove_noop.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"
@@ -37,7 +34,6 @@
 #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.hh"
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cache.cc b/source/blender/depsgraph/intern/builder/deg_builder_cache.cc
index 4d078f4998a..26690e3478f 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_cache.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_cache.cc
@@ -8,12 +8,8 @@
 
 #include "intern/builder/deg_builder_cache.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "DNA_anim_types.h"
 
-#include "BLI_utildefines.h"
-
 #include "BKE_anim_data.hh"
 
 #include "RNA_path.hh"
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cache.h b/source/blender/depsgraph/intern/builder/deg_builder_cache.h
index f4904d03d7c..57b1365bc25 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_cache.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_cache.h
@@ -10,10 +10,11 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "intern/depsgraph_type.hh"
-
 #include "RNA_access.hh"
 
+#include "BLI_map.hh"
+#include "BLI_set.hh"
+
 struct ID;
 struct PointerRNA;
 struct PropertyRNA;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
index b7515a08bf6..ef65fa90382 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
@@ -13,7 +13,6 @@
 #include <cstdlib>
 
 #include "BLI_stack.h"
-#include "BLI_utildefines.h"
 
 #include "intern/node/deg_node.hh"
 #include "intern/node/deg_node_component.hh"
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_key.cc b/source/blender/depsgraph/intern/builder/deg_builder_key.cc
index 72f3f1ebb00..63b5805369a 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_key.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_key.cc
@@ -10,6 +10,7 @@
 
 #include "intern/builder/deg_builder_key.h"
 
+#include "RNA_access.hh"
 #include "RNA_path.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 eb7751baa27..206d36b2eb8 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_key.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_key.h
@@ -16,7 +16,6 @@
 
 #include "DNA_ID.h"
 
-#include "RNA_access.hh"
 #include "RNA_types.hh"
 
 struct ID;
@@ -33,8 +32,7 @@ struct TimeSourceKey {
 struct ComponentKey {
   ComponentKey() = default;
 
-  inline ComponentKey(const ID *id, NodeType type, const char *name = "")
-      : id(id), type(type), name(name)
+  ComponentKey(const ID *id, NodeType type, const char *name = "") : id(id), type(type), name(name)
   {
   }
 
@@ -48,13 +46,8 @@ struct ComponentKey {
 struct OperationKey {
   OperationKey() = default;
 
-  inline OperationKey(const ID *id, NodeType component_type, const char *name, int name_tag = -1)
-      : id(id),
-        component_type(component_type),
-        component_name(""),
-        opcode(OperationCode::OPERATION),
-        name(name),
-        name_tag(name_tag)
+  OperationKey(const ID *id, NodeType component_type, const char *name, int name_tag = -1)
+      : id(id), component_type(component_type), name(name), name_tag(name_tag)
   {
   }
 
@@ -66,19 +59,13 @@ struct OperationKey {
       : id(id),
         component_type(component_type),
         component_name(component_name),
-        opcode(OperationCode::OPERATION),
         name(name),
         name_tag(name_tag)
   {
   }
 
   OperationKey(const ID *id, NodeType component_type, OperationCode opcode)
-      : id(id),
-        component_type(component_type),
-        component_name(""),
-        opcode(opcode),
-        name(""),
-        name_tag(-1)
+      : id(id), component_type(component_type), opcode(opcode)
   {
   }
 
@@ -86,12 +73,7 @@ struct OperationKey {
                NodeType component_type,
                const char *component_name,
                OperationCode opcode)
-      : id(id),
-        component_type(component_type),
-        component_name(component_name),
-        opcode(opcode),
-        name(""),
-        name_tag(-1)
+      : id(id), component_type(component_type), component_name(component_name), opcode(opcode)
   {
   }
 
@@ -100,15 +82,9 @@ struct OperationKey {
                OperationCode opcode,
                const char *name,
                int name_tag = -1)
-      : id(id),
-        component_type(component_type),
-        component_name(""),
-        opcode(opcode),
-        name(name),
-        name_tag(name_tag)
+      : id(id), component_type(component_type), opcode(opcode), name(name), name_tag(name_tag)
   {
   }
-
   OperationKey(const ID *id,
                NodeType component_type,
                const char *component_name,
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_map.h b/source/blender/depsgraph/intern/builder/deg_builder_map.h
index eca7ccebe16..1d6db171a99 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.hh"
+#include "BLI_map.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 3a32303570c..c083a7ebe99 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -15,9 +15,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_span.hh"
-#include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_action_types.h"
@@ -29,8 +27,6 @@
 #include "DNA_constraint_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_curves_types.h"
-#include "DNA_effect_types.h"
-#include "DNA_gpencil_legacy_types.h"
 #include "DNA_key_types.h"
 #include "DNA_light_types.h"
 #include "DNA_lightprobe_types.h"
@@ -38,7 +34,6 @@
 #include "DNA_mask_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meta_types.h"
 #include "DNA_movieclip_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
@@ -1409,7 +1404,7 @@ void DepsgraphNodeBuilder::build_driver_id_property(const PointerRNA &target_pro
   if (ptr.owner_id) {
     build_id(ptr.owner_id);
   }
-  const char *prop_identifier = RNA_property_identifier((PropertyRNA *)prop);
+  const char *prop_identifier = RNA_property_identifier(prop);
   /* Custom properties of bones are placed in their components to improve granularity. */
   if (RNA_struct_is_a(ptr.type, &RNA_PoseBone)) {
     const bPoseChannel *pchan = static_cast<const bPoseChannel *>(ptr.data);
@@ -1723,7 +1718,7 @@ void DepsgraphNodeBuilder::build_object_data_geometry_datablock(ID *obdata)
   }
   OperationNode *op_node;
   /* Make sure we've got an ID node before requesting evaluated pointer. */
-  (void)add_id_node((ID *)obdata);
+  (void)add_id_node(obdata);
   ID *obdata_cow = get_cow_id(obdata);
   build_idproperties(obdata->properties);
   /* Animation. */
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
index 08462b14796..a0595cd9377 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
@@ -8,10 +8,9 @@
 
 #pragma once
 
-#include "BLI_span.hh"
-
 #include "BKE_lib_query.hh" /* For LibraryForeachIDCallbackFlag enum. */
 
+#include "DNA_armature_types.h"
 #include "intern/builder/deg_builder.h"
 #include "intern/builder/deg_builder_key.h"
 #include "intern/builder/deg_builder_map.h"
@@ -21,6 +20,7 @@
 
 #include "DEG_depsgraph.hh"
 
+struct BoneCollection;
 struct CacheFile;
 struct Camera;
 struct Collection;
@@ -68,7 +68,7 @@ struct TimeSourceNode;
 class DepsgraphNodeBuilder : public DepsgraphBuilder {
  public:
   DepsgraphNodeBuilder(Main *bmain, Depsgraph *graph, DepsgraphBuilderCache *cache);
-  ~DepsgraphNodeBuilder();
+  ~DepsgraphNodeBuilder() override;
 
   /* For given original ID get ID which is created by copy-on-evaluation system. */
   ID *get_cow_id(const ID *id_orig) const;
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 acd285d458d..a3763e97f0b 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
@@ -10,16 +10,8 @@
 
 #include "intern/builder/deg_builder_nodes.h"
 
-#include <cstdio>
 #include <cstdlib>
 
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_string.h"
-#include "BLI_utildefines.h"
-
-#include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_object_types.h"
@@ -33,7 +25,6 @@
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
 
-#include "intern/builder/deg_builder.h"
 #include "intern/depsgraph_type.hh"
 #include "intern/eval/deg_eval_copy_on_write.h"
 #include "intern/node/deg_node.hh"
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 bcd4291f6c0..bb767dbfedc 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
@@ -10,19 +10,11 @@
 
 #include "intern/builder/deg_builder_nodes.h"
 
-#include <cstdio>
 #include <cstdlib>
 
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_string.h"
-#include "BLI_utildefines.h"
-
 #include "DNA_collection_types.h"
 #include "DNA_freestyle_types.h"
 #include "DNA_layer_types.h"
-#include "DNA_linestyle_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc
index 955a3a70b3c..f5fd7f1e073 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc
@@ -11,8 +11,6 @@
 #include <cstdio>
 #include <cstring>
 
-#include "BLI_utildefines.h"
-
 namespace blender::deg {
 
 void RootPChanMap::print_debug()
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h
index 4ce52744c8b..37bd226e0d0 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h
@@ -8,7 +8,9 @@
 
 #pragma once
 
-#include "intern/depsgraph_type.hh"
+#include "BLI_map.hh"
+#include "BLI_set.hh"
+#include "BLI_string_ref.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 e0cb7125d3c..f72458bbff7 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -15,10 +15,9 @@
 #include <cstring> /* required for STREQ later on. */
 #include <optional>
 
+#include "BKE_global.hh"
 #include "DNA_modifier_types.h"
-#include "MEM_guardedalloc.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_span.hh"
 #include "BLI_utildefines.h"
 
@@ -97,10 +96,10 @@
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
+#include "DEG_depsgraph_debug.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.hh"
 #include "intern/depsgraph_tag.hh"
@@ -2180,7 +2179,7 @@ void DepsgraphRelationBuilder::build_driver_id_property(const PointerRNA &target
   if (ptr.owner_id) {
     build_id(ptr.owner_id);
   }
-  const char *prop_identifier = RNA_property_identifier((PropertyRNA *)prop);
+  const char *prop_identifier = RNA_property_identifier(prop);
   /* Custom properties of bones are placed in their components to improve granularity. */
   OperationKey id_property_key;
   if (RNA_struct_is_a(ptr.type, &RNA_PoseBone)) {
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index be789218469..b98762c9b25 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -8,18 +8,13 @@
 
 #pragma once
 
-#include <cstdio>
 #include <cstring>
 
 #include "intern/depsgraph_type.hh"
 
 #include "DNA_ID.h"
 
-#include "RNA_path.hh"
-
 #include "BLI_span.hh"
-#include "BLI_string.h"
-#include "BLI_utildefines.h"
 
 #include "BKE_lib_query.hh" /* For LibraryForeachIDCallbackFlag enum. */
 
@@ -366,4 +361,4 @@ struct DepsNodeHandle {
 
 }  // namespace blender::deg
 
-#include "intern/builder/deg_builder_relations_impl.h"
+#include "intern/builder/deg_builder_relations_impl.h"  // IWYU pragma: export
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 e0eff798592..6919d28d817 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_drivers.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_drivers.cc
@@ -16,6 +16,9 @@
 
 #include "DNA_anim_types.h"
 
+#include "RNA_access.hh"
+#include "RNA_path.hh"
+
 #include "BKE_anim_data.hh"
 
 #include "intern/builder/deg_builder_relations.h"
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_drivers.h b/source/blender/depsgraph/intern/builder/deg_builder_relations_drivers.h
index c23e67ff7f9..c1ea43401b6 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_drivers.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_drivers.h
@@ -36,7 +36,6 @@ class DriverDescriptor {
   StringRef rna_prefix;
   StringRef rna_suffix;
 
- public:
   DriverDescriptor(PointerRNA *id_ptr, FCurve *fcu);
 
   bool driver_relations_needed() const;
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 cdb68132b1e..2fac039c765 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include "intern/builder/deg_builder_relations.h"
 #include "intern/node/deg_node_id.hh"
 
 #include <iostream>
@@ -89,20 +90,19 @@ Relation *DepsgraphRelationBuilder::add_node_handle_relation(const KeyType &key_
   if (op_from != nullptr && op_to != nullptr) {
     return add_operation_relation(op_from, op_to, description, flags);
   }
-  else {
-    if (!op_from) {
-      fprintf(stderr,
-              "add_node_handle_relation(%s) - Could not find op_from (%s)\n",
-              description,
-              key_from.identifier().c_str());
-    }
-    if (!op_to) {
-      fprintf(stderr,
-              "add_node_handle_relation(%s) - Could not find op_to (%s)\n",
-              description,
-              key_from.identifier().c_str());
-    }
+  if (!op_from) {
+    fprintf(stderr,
+            "add_node_handle_relation(%s) - Could not find op_from (%s)\n",
+            description,
+            key_from.identifier().c_str());
   }
+  if (!op_to) {
+    fprintf(stderr,
+            "add_node_handle_relation(%s) - Could not find op_to (%s)\n",
+            description,
+            key_from.identifier().c_str());
+  }
+
   return nullptr;
 }
 
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 3d473d9391f..69618d48e05 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
@@ -8,19 +8,16 @@
  * Methods for constructing depsgraph
  */
 
+#include "DEG_depsgraph_debug.hh"
 #include "intern/builder/deg_builder_relations.h"
 
-#include <cstdio>
 #include <cstdlib>
 #include <cstring> /* required for STREQ later on. */
 
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_action_types.h"
-#include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_customdata_types.h"
@@ -29,7 +26,6 @@
 #include "BKE_action.hh"
 #include "BKE_armature.hh"
 #include "BKE_constraint.h"
-#include "BKE_lib_query.hh"
 
 #include "RNA_prototypes.hh"
 
@@ -41,7 +37,6 @@
 #include "intern/builder/deg_builder_pchanmap.h"
 #include "intern/debug/deg_debug.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.hh"
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 605de2cf886..d0aa1e1f684 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
@@ -10,19 +10,10 @@
 
 #include "intern/builder/deg_builder_relations.h"
 
-#include <cstdio>
 #include <cstdlib>
 #include <cstring> /* required for STREQ later on. */
 
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_utildefines.h"
-
 #include "DNA_collection_types.h"
-#include "DNA_linestyle_types.h"
-#include "DNA_node_types.h"
-#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
 #include "BKE_layer.hh"
@@ -33,15 +24,12 @@
 #include "DEG_depsgraph_build.hh"
 
 #include "intern/builder/deg_builder.h"
-#include "intern/builder/deg_builder_pchanmap.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.hh"
-
 namespace blender::deg {
 
 bool DepsgraphRelationBuilder::build_layer_collection(LayerCollection *layer_collection)
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 a2098a2fbfb..91340db5c66 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc
@@ -8,8 +8,6 @@
 
 #include "intern/builder/deg_builder_remove_noop.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "intern/node/deg_node.hh"
 #include "intern/node/deg_node_operation.hh"
 
@@ -18,6 +16,8 @@
 #include "intern/depsgraph_relation.hh"
 #include "intern/depsgraph_type.hh"
 
+#include "DEG_depsgraph_debug.hh"
+
 namespace blender::deg {
 
 static inline bool is_unused_noop(OperationNode *op_node)
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc
index 898be403ba6..4bc143e56f4 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc
@@ -10,17 +10,14 @@
 
 #include <cstring>
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_listbase.h"
+#include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_action_types.h"
-#include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_key_types.h"
 #include "DNA_object_types.h"
-#include "DNA_sequence_types.h"
 
 #include "BKE_constraint.h"
 
@@ -175,8 +172,7 @@ RNANodeIdentifier RNANodeQuery::construct_node_identifier(const PointerRNA *ptr,
       node_identifier.type = NodeType::PARAMETERS;
     }
     node_identifier.operation_code = OperationCode::ID_PROPERTY;
-    node_identifier.operation_name = RNA_property_identifier(
-        reinterpret_cast<const PropertyRNA *>(prop));
+    node_identifier.operation_name = RNA_property_identifier(prop);
     return node_identifier;
   }
   if (ptr->type == &RNA_PoseBone) {
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna.h b/source/blender/depsgraph/intern/builder/deg_builder_rna.h
index 3f136eaca32..616fde49e4a 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_rna.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_rna.h
@@ -11,6 +11,10 @@
 #include "intern/node/deg_node.hh"
 #include "intern/node/deg_node_operation.hh"
 
+#include "BLI_map.hh"
+
+#include <memory>
+
 struct ID;
 struct PointerRNA;
 struct PropertyRNA;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_stack.h b/source/blender/depsgraph/intern/builder/deg_builder_stack.h
index 8929b0aa2a7..dd604a183eb 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_stack.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_stack.h
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "BLI_utildefines.h"
 #include "BLI_vector.hh"
 
 struct ID;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
index 811741e86d0..d6bcaf7e083 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
@@ -6,9 +6,9 @@
  * \ingroup depsgraph
  */
 
-#include "intern/builder/deg_builder_transitive.h"
+#include "DEG_depsgraph_debug.hh"
 
-#include "MEM_guardedalloc.h"
+#include "intern/builder/deg_builder_transitive.h"
 
 #include "intern/node/deg_node.hh"
 #include "intern/node/deg_node_component.hh"
diff --git a/source/blender/depsgraph/intern/builder/pipeline_all_objects.h b/source/blender/depsgraph/intern/builder/pipeline_all_objects.h
index 4be1b060687..bf33a47fe5b 100644
--- a/source/blender/depsgraph/intern/builder/pipeline_all_objects.h
+++ b/source/blender/depsgraph/intern/builder/pipeline_all_objects.h
@@ -20,8 +20,8 @@ class AllObjectsBuilderPipeline : public ViewLayerBuilderPipeline {
   AllObjectsBuilderPipeline(::Depsgraph *graph);
 
  protected:
-  virtual unique_ptr<DepsgraphNodeBuilder> construct_node_builder() override;
-  virtual unique_ptr<DepsgraphRelationBuilder> construct_relation_builder() override;
+  unique_ptr<DepsgraphNodeBuilder> construct_node_builder() override;
+  unique_ptr<DepsgraphRelationBuilder> construct_relation_builder() override;
 };
 
 }  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/builder/pipeline_compositor.h b/source/blender/depsgraph/intern/builder/pipeline_compositor.h
index e9ed87744ac..6b7436cace2 100644
--- a/source/blender/depsgraph/intern/builder/pipeline_compositor.h
+++ b/source/blender/depsgraph/intern/builder/pipeline_compositor.h
@@ -22,8 +22,8 @@ class CompositorBuilderPipeline : public AbstractBuilderPipeline {
   unique_ptr<DepsgraphNodeBuilder> construct_node_builder() override;
   unique_ptr<DepsgraphRelationBuilder> construct_relation_builder() override;
 
-  virtual void build_nodes(DepsgraphNodeBuilder &node_builder) override;
-  virtual void build_relations(DepsgraphRelationBuilder &relation_builder) override;
+  void build_nodes(DepsgraphNodeBuilder &node_builder) override;
+  void build_relations(DepsgraphRelationBuilder &relation_builder) override;
 
  private:
   bNodeTree *nodetree_;
diff --git a/source/blender/depsgraph/intern/builder/pipeline_from_collection.h b/source/blender/depsgraph/intern/builder/pipeline_from_collection.h
index 62893b77c67..7c1ab28ab21 100644
--- a/source/blender/depsgraph/intern/builder/pipeline_from_collection.h
+++ b/source/blender/depsgraph/intern/builder/pipeline_from_collection.h
@@ -29,11 +29,11 @@ class FromCollectionBuilderPipeline : public AbstractBuilderPipeline {
   FromCollectionBuilderPipeline(::Depsgraph *graph, Collection *collection);
 
  protected:
-  virtual unique_ptr<DepsgraphNodeBuilder> construct_node_builder() override;
-  virtual unique_ptr<DepsgraphRelationBuilder> construct_relation_builder() override;
+  unique_ptr<DepsgraphNodeBuilder> construct_node_builder() override;
+  unique_ptr<DepsgraphRelationBuilder> construct_relation_builder() override;
 
-  virtual void build_nodes(DepsgraphNodeBuilder &node_builder) override;
-  virtual void build_relations(DepsgraphRelationBuilder &relation_builder) override;
+  void build_nodes(DepsgraphNodeBuilder &node_builder) override;
+  void build_relations(DepsgraphRelationBuilder &relation_builder) override;
 
  private:
   Set<ID *> ids_;
diff --git a/source/blender/depsgraph/intern/builder/pipeline_from_ids.h b/source/blender/depsgraph/intern/builder/pipeline_from_ids.h
index c4607658b39..595f65776e6 100644
--- a/source/blender/depsgraph/intern/builder/pipeline_from_ids.h
+++ b/source/blender/depsgraph/intern/builder/pipeline_from_ids.h
@@ -29,11 +29,11 @@ class FromIDsBuilderPipeline : public AbstractBuilderPipeline {
   FromIDsBuilderPipeline(::Depsgraph *graph, Span<ID *> ids);
 
  protected:
-  virtual unique_ptr<DepsgraphNodeBuilder> construct_node_builder() override;
-  virtual unique_ptr<DepsgraphRelationBuilder> construct_relation_builder() override;
+  unique_ptr<DepsgraphNodeBuilder> construct_node_builder() override;
+  unique_ptr<DepsgraphRelationBuilder> construct_relation_builder() override;
 
-  virtual void build_nodes(DepsgraphNodeBuilder &node_builder) override;
-  virtual void build_relations(DepsgraphRelationBuilder &relation_builder) override;
+  void build_nodes(DepsgraphNodeBuilder &node_builder) override;
+  void build_relations(DepsgraphRelationBuilder &relation_builder) override;
 };
 
 }  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/builder/pipeline_render.h b/source/blender/depsgraph/intern/builder/pipeline_render.h
index 32890f006ad..de191f21b32 100644
--- a/source/blender/depsgraph/intern/builder/pipeline_render.h
+++ b/source/blender/depsgraph/intern/builder/pipeline_render.h
@@ -20,8 +20,8 @@ class RenderBuilderPipeline : public AbstractBuilderPipeline {
   unique_ptr<DepsgraphNodeBuilder> construct_node_builder() override;
   unique_ptr<DepsgraphRelationBuilder> construct_relation_builder() override;
 
-  virtual void build_nodes(DepsgraphNodeBuilder &node_builder) override;
-  virtual void build_relations(DepsgraphRelationBuilder &relation_builder) override;
+  void build_nodes(DepsgraphNodeBuilder &node_builder) override;
+  void build_relations(DepsgraphRelationBuilder &relation_builder) override;
 };
 
 }  // 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 caba9a415ca..df859da3d95 100644
--- a/source/blender/depsgraph/intern/builder/pipeline_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/pipeline_view_layer.cc
@@ -6,7 +6,6 @@
 
 #include "intern/builder/deg_builder_nodes.h"
 #include "intern/builder/deg_builder_relations.h"
-#include "intern/depsgraph.hh"
 
 namespace blender::deg {
 
diff --git a/source/blender/depsgraph/intern/builder/pipeline_view_layer.h b/source/blender/depsgraph/intern/builder/pipeline_view_layer.h
index 3ac75467064..0b172e7f077 100644
--- a/source/blender/depsgraph/intern/builder/pipeline_view_layer.h
+++ b/source/blender/depsgraph/intern/builder/pipeline_view_layer.h
@@ -17,8 +17,8 @@ class ViewLayerBuilderPipeline : public AbstractBuilderPipeline {
   ViewLayerBuilderPipeline(::Depsgraph *graph);
 
  protected:
-  virtual void build_nodes(DepsgraphNodeBuilder &node_builder) override;
-  virtual void build_relations(DepsgraphRelationBuilder &relation_builder) override;
+  void build_nodes(DepsgraphNodeBuilder &node_builder) override;
+  void build_relations(DepsgraphRelationBuilder &relation_builder) override;
 };
 
 }  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/debug/deg_debug.cc b/source/blender/depsgraph/intern/debug/deg_debug.cc
index 5ec2fdedb94..d4ba2502f03 100644
--- a/source/blender/depsgraph/intern/debug/deg_debug.cc
+++ b/source/blender/depsgraph/intern/debug/deg_debug.cc
@@ -11,13 +11,10 @@
 #include "BLI_console.h"
 #include "BLI_hash.h"
 #include "BLI_string.h"
-#include "BLI_time_utildefines.h"
-#include "BLI_utildefines.h"
+#include "BLI_time.h"
 
 #include "BKE_global.hh"
 
-#include "intern/depsgraph.hh"
-
 namespace blender::deg {
 
 DepsgraphDebug::DepsgraphDebug() : flags(G.debug), graph_evaluation_start_time_(0) {}
diff --git a/source/blender/depsgraph/intern/debug/deg_debug.h b/source/blender/depsgraph/intern/debug/deg_debug.h
index 29ac35dab67..70059fdcaa6 100644
--- a/source/blender/depsgraph/intern/debug/deg_debug.h
+++ b/source/blender/depsgraph/intern/debug/deg_debug.h
@@ -8,12 +8,10 @@
 
 #pragma once
 
+#include "BKE_global.hh"  // IWYU pragma: keep
+
 #include "intern/depsgraph_type.hh"
 
-#include "BKE_global.hh"
-
-#include "DEG_depsgraph_debug.hh"
-
 namespace blender::deg {
 
 class DepsgraphDebug {
@@ -63,8 +61,8 @@ class DepsgraphDebug {
     fflush(stderr); \
   } while (0)
 
-bool terminal_do_color(void);
+bool terminal_do_color();
 string color_for_pointer(const void *pointer);
-string color_end(void);
+string color_end();
 
 }  // 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 2ef58803e5a..84c659cdb1c 100644
--- a/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
+++ b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
@@ -11,9 +11,6 @@
 #include <cstdarg>
 
 #include "BLI_dot_export.hh"
-#include "BLI_utildefines.h"
-
-#include "DNA_listBase.h"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_debug.hh"
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc
index 4b945de21ed..a4d65598b68 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -10,13 +10,8 @@
 
 #include "intern/depsgraph.hh" /* own include */
 
-#include <algorithm>
 #include <cstring>
 
-#include "MEM_guardedalloc.h"
-
-#include "BLI_console.h"
-#include "BLI_hash.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_global.hh"
@@ -29,7 +24,6 @@
 #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"
 
diff --git a/source/blender/depsgraph/intern/depsgraph.hh b/source/blender/depsgraph/intern/depsgraph.hh
index dd373f93136..1e6443e5fc2 100644
--- a/source/blender/depsgraph/intern/depsgraph.hh
+++ b/source/blender/depsgraph/intern/depsgraph.hh
@@ -14,14 +14,15 @@
 
 #pragma once
 
+#include <cstdlib>
 #include <functional>
 #include <mutex>
-#include <stdlib.h>
 
 #include "MEM_guardedalloc.h"
 
 #include "DNA_ID.h" /* for ID_Type and INDEX_ID_MAX */
 
+#include "BLI_set.hh"
 #include "BLI_threads.h" /* for SpinLock */
 
 #include "DEG_depsgraph.hh"
@@ -29,7 +30,6 @@
 
 #include "intern/debug/deg_debug.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 f99e70bd792..48af9f40874 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@ -8,14 +8,9 @@
  * Methods for constructing depsgraph.
  */
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 
-#include "BLI_time.h"
-#include "BLI_time_utildefines.h"
-
 #include "DNA_cachefile_types.h"
 #include "DNA_collection_types.h"
 #include "DNA_node_types.h"
@@ -23,6 +18,7 @@
 #include "DNA_scene_types.h"
 
 #include "BKE_collection.hh"
+#include "BKE_global.hh"
 #include "BKE_main.hh"
 #include "BKE_scene.hh"
 
diff --git a/source/blender/depsgraph/intern/depsgraph_debug.cc b/source/blender/depsgraph/intern/depsgraph_debug.cc
index a6e7c1057f1..46b4232a831 100644
--- a/source/blender/depsgraph/intern/depsgraph_debug.cc
+++ b/source/blender/depsgraph/intern/depsgraph_debug.cc
@@ -8,11 +8,9 @@
  * Implementation of tools for debugging the depsgraph
  */
 
-#include "BLI_utildefines.h"
-
 #include "DNA_scene_types.h"
 
-#include "DNA_object_types.h"
+#include "BKE_global.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc
index b55a2e35cbe..d6e52b851a5 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@ -8,14 +8,8 @@
  * Evaluation engine entry-points for Depsgraph Engine.
  */
 
-#include "MEM_guardedalloc.h"
-
-#include "BLI_listbase.h"
-#include "BLI_utildefines.h"
-
 #include "BKE_scene.hh"
 
-#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
 #include "DEG_depsgraph.hh"
@@ -27,7 +21,6 @@
 
 #include "intern/node/deg_node.hh"
 #include "intern/node/deg_node_operation.hh"
-#include "intern/node/deg_node_time.hh"
 
 #include "intern/depsgraph.hh"
 #include "intern/depsgraph_tag.hh"
diff --git a/source/blender/depsgraph/intern/depsgraph_light_linking.cc b/source/blender/depsgraph/intern/depsgraph_light_linking.cc
index 50f5f914bee..b1a5d57e8da 100644
--- a/source/blender/depsgraph/intern/depsgraph_light_linking.cc
+++ b/source/blender/depsgraph/intern/depsgraph_light_linking.cc
@@ -14,12 +14,8 @@
 #include "BLI_hash.hh"
 #include "BLI_listbase.h"
 #include "BLI_map.hh"
-#include "BLI_utildefines.h"
-
-#include "BKE_collection.hh"
 
 #include "DNA_collection_types.h"
-#include "DNA_layer_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
@@ -53,7 +49,7 @@ void eval_runtime_data(const ::Depsgraph *depsgraph, Object &object_eval)
 namespace {
 
 /* TODO(sergey): Move to a public API, solving the const-correctness. */
-template<class T> static inline const T *get_original(const T *id)
+template<class T> inline const T *get_original(const T *id)
 {
   if (!id) {
     return nullptr;
@@ -323,10 +319,9 @@ namespace {
  * Note that if an object is reachable from multiple children collection the callback is invoked
  * for all of them. */
 template<class Proc>
-static void foreach_light_collection_object_inner(
-    const CollectionLightLinking &collection_light_linking,
-    const Collection &collection,
-    Proc &&callback)
+void foreach_light_collection_object_inner(const CollectionLightLinking &collection_light_linking,
+                                           const Collection &collection,
+                                           Proc &&callback)
 {
   LISTBASE_FOREACH (const CollectionChild *, collection_child, &collection.children) {
     foreach_light_collection_object_inner(
@@ -347,7 +342,7 @@ static void foreach_light_collection_object_inner(
  * Note that if an object is reachable from multiple children collection the callback is invoked
  * for all of them. */
 template<class Proc>
-static void foreach_light_collection_object(const Collection &collection, Proc &&callback)
+void foreach_light_collection_object(const Collection &collection, Proc &&callback)
 {
   LISTBASE_FOREACH (const CollectionChild *, collection_child, &collection.children) {
     foreach_light_collection_object_inner(
diff --git a/source/blender/depsgraph/intern/depsgraph_light_linking.hh b/source/blender/depsgraph/intern/depsgraph_light_linking.hh
index 4e69b367af7..93232c71664 100644
--- a/source/blender/depsgraph/intern/depsgraph_light_linking.hh
+++ b/source/blender/depsgraph/intern/depsgraph_light_linking.hh
@@ -125,7 +125,7 @@ class EmitterDataMap {
   /* Get linked collection depending on whether this is emitter information for light or shadow
    * linking. */
   /* TODO(sergey): Check whether template specialization is preferred here. */
-  inline const Collection *get_collection(const Object &emitter) const
+  const Collection *get_collection(const Object &emitter) const
   {
     return BKE_light_linking_collection_get(&emitter, link_type_);
   }
@@ -183,7 +183,7 @@ class LinkingData {
   /* Get light set membership information of the emitter data depending whether this linking
    * data is a light or shadow linking. */
   /* TODO(sergey): Check whether template specialization is preferred here. */
-  inline EmitterSetMembership &get_emitter_set_membership(EmitterData &emitter_data) const
+  EmitterSetMembership &get_emitter_set_membership(EmitterData &emitter_data) const
   {
     if (link_type_ == LIGHT_LINKING_BLOCKER) {
       return emitter_data.shadow_membership;
diff --git a/source/blender/depsgraph/intern/depsgraph_physics.cc b/source/blender/depsgraph/intern/depsgraph_physics.cc
index 2f4a5af814a..9b11a1a7fc2 100644
--- a/source/blender/depsgraph/intern/depsgraph_physics.cc
+++ b/source/blender/depsgraph/intern/depsgraph_physics.cc
@@ -10,9 +10,6 @@
 
 #include "intern/depsgraph_physics.hh"
 
-#include "MEM_guardedalloc.h"
-
-#include "BLI_compiler_compat.h"
 #include "BLI_listbase.h"
 
 #include "BKE_collision.h"
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc
index 7e579abef26..0a12f21dd81 100644
--- a/source/blender/depsgraph/intern/depsgraph_query.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query.cc
@@ -8,15 +8,11 @@
  * Implementation of Querying API
  */
 
-#include "MEM_guardedalloc.h"
-
 #include <cstring> /* XXX: `memcpy`. */
 
 #include "BLI_listbase.h"
-#include "BLI_utildefines.h"
 
 #include "BKE_action.hh" /* XXX: BKE_pose_channel_find_name */
-#include "BKE_customdata.hh"
 #include "BKE_idtype.hh"
 #include "BKE_main.hh"
 
diff --git a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc
index 589bad8483a..7bfc9844bd3 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc
@@ -8,13 +8,6 @@
  * Implementation of Querying and Filtering API's
  */
 
-#include "MEM_guardedalloc.h"
-
-#include "BLI_utildefines.h"
-
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
 
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index a22fa8c8c44..88b31f6159b 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -11,10 +11,7 @@
 /* Silence warnings from copying deprecated fields. */
 #define DNA_DEPRECATED_ALLOW
 
-#include "MEM_guardedalloc.h"
-
 #include "BKE_duplilist.hh"
-#include "BKE_geometry_set.hh"
 #include "BKE_idprop.hh"
 #include "BKE_layer.hh"
 #include "BKE_modifier.hh"
diff --git a/source/blender/depsgraph/intern/depsgraph_registry.cc b/source/blender/depsgraph/intern/depsgraph_registry.cc
index 0d48e03020a..3d87d02ca6b 100644
--- a/source/blender/depsgraph/intern/depsgraph_registry.cc
+++ b/source/blender/depsgraph/intern/depsgraph_registry.cc
@@ -6,12 +6,12 @@
  * \ingroup depsgraph
  */
 
-#include <memory>
 #include <mutex>
 
-#include "intern/depsgraph_registry.hh"
+#include "BLI_map.hh"
+#include "BLI_vector_set.hh"
 
-#include "BLI_utildefines.h"
+#include "intern/depsgraph_registry.hh"
 
 #include "intern/depsgraph.hh"
 
diff --git a/source/blender/depsgraph/intern/depsgraph_registry.hh b/source/blender/depsgraph/intern/depsgraph_registry.hh
index a530bbee038..cbbdb8ff54a 100644
--- a/source/blender/depsgraph/intern/depsgraph_registry.hh
+++ b/source/blender/depsgraph/intern/depsgraph_registry.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "intern/depsgraph_type.hh"
+#include "BLI_span.hh"
 
 struct Main;
 
diff --git a/source/blender/depsgraph/intern/depsgraph_relation.cc b/source/blender/depsgraph/intern/depsgraph_relation.cc
index 7dff713de7b..0b76374892f 100644
--- a/source/blender/depsgraph/intern/depsgraph_relation.cc
+++ b/source/blender/depsgraph/intern/depsgraph_relation.cc
@@ -8,9 +8,6 @@
 
 #include "intern/depsgraph_relation.hh" /* own include */
 
-#include "BLI_utildefines.h"
-
-#include "intern/depsgraph_type.hh"
 #include "intern/node/deg_node.hh"
 
 namespace blender::deg {
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index 09e6efd2b8d..cb2561d7e59 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -12,22 +12,16 @@
 
 #include <cstdio>
 #include <cstring> /* required for memset */
-#include <queue>
 
 #include "BLI_index_range.hh"
 #include "BLI_math_bits.h"
-#include "BLI_task.h"
 #include "BLI_utildefines.h"
 
-#include "DNA_anim_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_key_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
-#include "DNA_particle_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_windowmanager_types.h"
 
 #include "BKE_anim_data.hh"
 #include "BKE_global.hh"
@@ -35,7 +29,6 @@
 #include "BKE_lib_override.hh"
 #include "BKE_node.hh"
 #include "BKE_scene.hh"
-#include "BKE_screen.hh"
 #include "BKE_workspace.hh"
 
 #include "DEG_depsgraph.hh"
@@ -53,7 +46,6 @@
 #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_type.cc b/source/blender/depsgraph/intern/depsgraph_type.cc
index ff20b68bdc0..5830f92f963 100644
--- a/source/blender/depsgraph/intern/depsgraph_type.cc
+++ b/source/blender/depsgraph/intern/depsgraph_type.cc
@@ -10,8 +10,6 @@
 
 #include <cstdlib> /* for BLI_assert() */
 
-#include "BLI_utildefines.h"
-
 #include "DNA_customdata_types.h"
 
 #include "DEG_depsgraph.hh"
@@ -19,7 +17,6 @@
 #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.hh b/source/blender/depsgraph/intern/depsgraph_type.hh
index daa6991ac60..c139f555f10 100644
--- a/source/blender/depsgraph/intern/depsgraph_type.hh
+++ b/source/blender/depsgraph/intern/depsgraph_type.hh
@@ -15,21 +15,14 @@
 #pragma once
 
 #include <functional>
+#include <memory>
+#include <optional>
 
 /* TODO(sergey): Ideally we'll just use char* and statically allocated strings
  * to avoid any possible overhead caused by string (re)allocation/formatting. */
 #include <algorithm>
 #include <deque>
-#include <map>
-#include <set>
 #include <string>
-#include <vector>
-
-#include "BLI_map.hh"
-#include "BLI_set.hh"
-#include "BLI_string_ref.hh"
-#include "BLI_vector.hh"
-#include "BLI_vector_set.hh"
 
 struct Depsgraph;
 struct CustomData_MeshMasks;
diff --git a/source/blender/depsgraph/intern/depsgraph_update.cc b/source/blender/depsgraph/intern/depsgraph_update.cc
index 4993772885e..d1f89127f23 100644
--- a/source/blender/depsgraph/intern/depsgraph_update.cc
+++ b/source/blender/depsgraph/intern/depsgraph_update.cc
@@ -10,8 +10,6 @@
 
 #include "DEG_depsgraph.hh"
 
-#include "intern/depsgraph_type.hh"
-
 namespace deg = blender::deg;
 
 namespace blender::deg {
diff --git a/source/blender/depsgraph/intern/depsgraph_writeback_sync.cc b/source/blender/depsgraph/intern/depsgraph_writeback_sync.cc
index bcc56947042..f67b61ebb71 100644
--- a/source/blender/depsgraph/intern/depsgraph_writeback_sync.cc
+++ b/source/blender/depsgraph/intern/depsgraph_writeback_sync.cc
@@ -7,8 +7,6 @@
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_writeback_sync.hh"
 
-#include "BLI_map.hh"
-
 #include "depsgraph.hh"
 
 namespace blender::deg::sync_writeback {
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc
index fa397a0a9e5..ae5350a22e7 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@ -10,16 +10,13 @@
 
 #include "intern/eval/deg_eval.h"
 
-#include "BLI_compiler_attrs.h"
 #include "BLI_function_ref.hh"
 #include "BLI_gsqueue.h"
 #include "BLI_task.h"
 #include "BLI_time.h"
-#include "BLI_utildefines.h"
 
 #include "BKE_global.hh"
 
-#include "DNA_node_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
@@ -43,7 +40,6 @@
 #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 ce5eed78cf9..2e23463f97f 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
@@ -21,18 +21,13 @@
 #include <cstring>
 
 #include "BLI_listbase.h"
-#include "BLI_string.h"
-#include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_curve.hh"
 #include "BKE_global.hh"
 #include "BKE_gpencil_legacy.h"
-#include "BKE_idprop.hh"
 #include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
-#include "BKE_mesh_types.hh"
-#include "BKE_object_types.hh"
 #include "BKE_scene.hh"
 
 #include "DEG_depsgraph.hh"
@@ -43,15 +38,11 @@
 #include "DNA_ID.h"
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
-#include "DNA_gpencil_legacy_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 #include "DNA_particle_types.h"
-#include "DNA_rigidbody_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_sequence_types.h"
-#include "DNA_sound_types.h"
 
 #include "DRW_engine.hh"
 
@@ -68,12 +59,12 @@
 #  include "DNA_world_types.h"
 #endif
 
-#include "BKE_action.hh"
 #include "BKE_anim_data.hh"
 #include "BKE_animsys.h"
 #include "BKE_armature.hh"
 #include "BKE_editmesh.hh"
 #include "BKE_lib_query.hh"
+#include "BKE_mesh_types.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_pointcache.h"
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h
index f722f374ff3..7da923ae296 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <stddef.h>
+#include <cstddef>
 
 #include "DNA_ID.h"
 
@@ -26,8 +26,6 @@ struct ID;
 #  define DEG_COW_PRINT(format, ...)
 #endif
 
-struct Depsgraph;
-
 namespace blender::deg {
 
 struct Depsgraph;
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index 22a8585bdbe..91d0015ed6a 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -10,24 +10,19 @@
 
 #include "intern/eval/deg_eval_flush.h"
 
-#include <cmath>
-
 #include "BLI_listbase.h"
-#include "BLI_math_vector.h"
 #include "BLI_task.h"
 #include "BLI_utildefines.h"
 
+#include "BKE_global.hh"
 #include "BKE_key.hh"
 #include "BKE_object.hh"
 #include "BKE_scene.hh"
 
-#include "DNA_key_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-
 #include "DRW_engine.hh"
 
 #include "DEG_depsgraph.hh"
+#include "DEG_depsgraph_debug.hh"
 
 #include "intern/debug/deg_debug.h"
 #include "intern/depsgraph.hh"
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.cc
index 79fcf5e4040..8675dc7e393 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.cc
@@ -10,8 +10,6 @@
 
 #include "intern/eval/deg_eval_copy_on_write.h"
 
-#include "BLI_utildefines.h"
-
 #include "DRW_engine.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 1aae5fd1f2c..b5228d38771 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
@@ -8,7 +8,9 @@
 
 #pragma once
 
-#include "BKE_modifier.hh"
+#include "DNA_ID.h"
+
+#include "BLI_vector.hh"
 
 #include "intern/depsgraph_type.hh"
 
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_modifier.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_modifier.h
index 5d35555404b..9995a608bd5 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_modifier.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_modifier.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "BKE_modifier.hh"
+#include "DNA_modifier_types.h"
 
 struct ModifierData;
 
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.cc
index 6690d7de969..f9729d0dd90 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.cc
@@ -10,8 +10,6 @@
 
 #include "DNA_movieclip_types.h"
 
-#include "BLI_utildefines.h"
-
 namespace blender::deg {
 
 MovieClipBackup::MovieClipBackup(const Depsgraph * /*depsgraph*/)
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc
index 6417c293b6c..3bf269e62ff 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc
@@ -6,6 +6,8 @@
  * \ingroup depsgraph
  */
 
+#include "BLI_session_uid.h"
+
 #include "intern/eval/deg_eval_runtime_backup_object.h"
 
 #include <cstring>
@@ -16,6 +18,7 @@
 
 #include "BKE_action.hh"
 #include "BKE_mesh_types.hh"
+#include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_object_types.hh"
 
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 e9ad26ab45f..fb89251e7fc 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,11 +13,10 @@
 
 #include "BKE_object_types.hh"
 
-#include "BLI_session_uid.h"
+#include "BLI_map.hh"
 
 #include "intern/depsgraph_type.hh"
 #include "intern/eval/deg_eval_runtime_backup_modifier.h"
-#include "intern/eval/deg_eval_runtime_backup_pose.h"
 
 struct Object;
 
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 22835dbc370..ff190861234 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,10 +8,6 @@
 
 #pragma once
 
-#include "intern/depsgraph_type.hh"
-
-#include "DNA_action_types.h"
-
 namespace blender::deg {
 
 }  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.cc
index 784e3c05e06..148c78fa6bb 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.cc
@@ -10,6 +10,8 @@
 
 #include "DNA_sequence_types.h"
 
+#include "BLI_listbase.h"
+
 namespace blender::deg {
 
 SequenceBackup::SequenceBackup(const Depsgraph * /*depsgraph*/)
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.h
index 32621935d13..b7394bd7b35 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "BLI_listbase.h"
+#include "DNA_listBase.h"
 
 struct Strip;
 
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc
index 858f84dda8a..6a0bc649621 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc
@@ -6,6 +6,8 @@
  * \ingroup depsgraph
  */
 
+#include "BLI_session_uid.h"
+
 #include "intern/eval/deg_eval_runtime_backup_sequencer.h"
 
 #include "DNA_scene_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 9d321a42ea2..212b1d548c3 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
@@ -10,9 +10,8 @@
 
 #include "DNA_session_uid_types.h"
 
-#include "BLI_session_uid.h"
+#include "BLI_map.hh"
 
-#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_runtime_backup_sound.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sound.cc
index c677575f8d6..64e249a38c6 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sound.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sound.cc
@@ -8,8 +8,6 @@
 
 #include "intern/eval/deg_eval_runtime_backup_sound.h"
 
-#include "BLI_utildefines.h"
-
 #include "DNA_sound_types.h"
 
 namespace blender::deg {
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.cc
index 44e9dc79a9f..59715bafb86 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.cc
@@ -10,14 +10,11 @@
 
 #include "BLI_assert.h"
 #include "BLI_string.h"
-#include "BLI_utildefines.h"
 
 #include "DNA_volume_types.h"
 
 #include "BKE_volume.hh"
 
-#include <cstdio>
-
 namespace blender::deg {
 
 VolumeBackup::VolumeBackup(const Depsgraph * /*depsgraph*/) : grids(nullptr) {}
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_stats.cc b/source/blender/depsgraph/intern/eval/deg_eval_stats.cc
index ee10f8edf1d..a1c381379c6 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_stats.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_stats.cc
@@ -8,8 +8,6 @@
 
 #include "intern/eval/deg_eval_stats.h"
 
-#include "BLI_utildefines.h"
-
 #include "intern/depsgraph.hh"
 
 #include "intern/node/deg_node.hh"
diff --git a/source/blender/depsgraph/intern/node/deg_node.cc b/source/blender/depsgraph/intern/node/deg_node.cc
index 4e591ee2550..d5ef264e8d2 100644
--- a/source/blender/depsgraph/intern/node/deg_node.cc
+++ b/source/blender/depsgraph/intern/node/deg_node.cc
@@ -8,17 +8,12 @@
 
 #include "intern/node/deg_node.hh"
 
-#include <cstdio>
-
-#include "BLI_utildefines.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.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.hh b/source/blender/depsgraph/intern/node/deg_node.hh
index 8359b4a3195..89d530f6c74 100644
--- a/source/blender/depsgraph/intern/node/deg_node.hh
+++ b/source/blender/depsgraph/intern/node/deg_node.hh
@@ -12,10 +12,10 @@
 
 #include "intern/depsgraph_type.hh"
 
-#include "BLI_utildefines.h"
-
 #include "DEG_depsgraph_build.hh"
 
+#include "BLI_vector.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 81370a49d0a..d8359d664e3 100644
--- a/source/blender/depsgraph/intern/node/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_component.cc
@@ -12,7 +12,6 @@
 #include <cstring> /* required for STREQ later on. */
 
 #include "BLI_ghash.h"
-#include "BLI_hash.hh"
 #include "BLI_utildefines.h"
 
 #include "DNA_object_types.h"
diff --git a/source/blender/depsgraph/intern/node/deg_node_component.hh b/source/blender/depsgraph/intern/node/deg_node_component.hh
index d39f704d90a..0f6b60fd23e 100644
--- a/source/blender/depsgraph/intern/node/deg_node_component.hh
+++ b/source/blender/depsgraph/intern/node/deg_node_component.hh
@@ -13,12 +13,8 @@
 #include "intern/node/deg_node_id.hh"
 #include "intern/node/deg_node_operation.hh"
 
-#include "BLI_string.h"
-#include "BLI_utildefines.h"
-
-#include "BKE_object.hh"
-
-#include "DNA_object_types.h"
+#include "BLI_map.hh"
+#include "BLI_vector.hh"
 
 struct ID;
 struct bPoseChannel;
@@ -48,12 +44,12 @@ struct ComponentNode : public Node {
 
   /* Typedef for container of operations */
   ComponentNode();
-  ~ComponentNode();
+  ~ComponentNode() override;
 
   /** Initialize 'component' node - from pointer data given. */
   void init(const ID *id, const char *subdata) override;
 
-  virtual string identifier() const override;
+  string identifier() const override;
 
   /* Find an existing operation, if requested operation does not exist nullptr will be returned.
    * See #add_operation for the meaning and examples of #name and #name_tag.
@@ -103,10 +99,10 @@ struct ComponentNode : public Node {
 
   void clear_operations();
 
-  virtual void tag_update(Depsgraph *graph, eUpdateSource source) override;
+  void tag_update(Depsgraph *graph, eUpdateSource source) override;
 
-  virtual OperationNode *get_entry_operation() override;
-  virtual OperationNode *get_exit_operation() override;
+  OperationNode *get_entry_operation() override;
+  OperationNode *get_exit_operation() override;
 
   void finalize_build(Depsgraph *graph);
 
@@ -215,7 +211,7 @@ DEG_COMPONENT_NODE_DECLARE_GENERIC(NTreeGeometryPreprocess);
 /* Bone Component */
 struct BoneComponentNode : public ComponentNode {
   /** Initialize 'bone component' node - from pointer data given. */
-  void init(const ID *id, const char *subdata);
+  void init(const ID *id, const char *subdata) override;
 
   struct bPoseChannel *pchan; /* the bone that this component represents */
 
@@ -225,7 +221,7 @@ struct BoneComponentNode : public ComponentNode {
 /* Eventually we would not tag parameters in all cases.
  * Support for this each ID needs to be added on an individual basis. */
 struct ParametersComponentNode : public ComponentNode {
-  virtual bool need_tag_cow_before_update(const IDRecalcFlag /*tag*/) override
+  bool need_tag_cow_before_update(const IDRecalcFlag /*tag*/) override
   {
     if (ID_TYPE_SUPPORTS_PARAMS_WITHOUT_COW(owner->id_type)) {
       /* Disabled as this is not true for newly added objects, needs investigation. */
@@ -240,7 +236,7 @@ struct ParametersComponentNode : public ComponentNode {
 
 /* Audio component. */
 struct AudioComponentNode : public ComponentNode {
-  virtual bool need_tag_cow_before_update(const IDRecalcFlag tag) override
+  bool need_tag_cow_before_update(const IDRecalcFlag tag) override
   {
     /* Frame change doesn't require a copy of the scene, doing so can be a heavy operation
      * especially when the collection contains many objects, see #104798. */
diff --git a/source/blender/depsgraph/intern/node/deg_node_factory.hh b/source/blender/depsgraph/intern/node/deg_node_factory.hh
index 4cecb7e5f4e..7d6928d6c1e 100644
--- a/source/blender/depsgraph/intern/node/deg_node_factory.hh
+++ b/source/blender/depsgraph/intern/node/deg_node_factory.hh
@@ -8,9 +8,6 @@
 
 #pragma once
 
-#include "MEM_guardedalloc.h"
-
-#include "intern/depsgraph_type.hh"
 #include "intern/node/deg_node.hh"
 
 struct ID;
@@ -26,12 +23,12 @@ struct DepsNodeFactory {
 };
 
 template<class ModeObjectType> struct DepsNodeFactoryImpl : public DepsNodeFactory {
-  virtual NodeType type() const override;
-  virtual const char *type_name() const override;
+  NodeType type() const override;
+  const char *type_name() const override;
 
-  virtual int id_recalc_tag() const override;
+  int id_recalc_tag() const override;
 
-  virtual Node *create_node(const ID *id, const char *subdata, const char *name) const override;
+  Node *create_node(const ID *id, const char *subdata, const char *name) const override;
 };
 
 /* Register typeinfo */
diff --git a/source/blender/depsgraph/intern/node/deg_node_id.cc b/source/blender/depsgraph/intern/node/deg_node_id.cc
index 791134e76d1..ecc885233fb 100644
--- a/source/blender/depsgraph/intern/node/deg_node_id.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_id.cc
@@ -8,23 +8,19 @@
 
 #include "intern/node/deg_node_id.hh"
 
-#include <cstdio>
 #include <cstring> /* required for STREQ later on. */
 
+#include "BLI_ghash.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_ID.h"
-#include "DNA_anim_types.h"
 
 #include "BKE_lib_id.hh"
 
-#include "DEG_depsgraph.hh"
-
 #include "intern/eval/deg_eval_copy_on_write.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.hh b/source/blender/depsgraph/intern/node/deg_node_id.hh
index cf87e9f3c63..7b7e30e19db 100644
--- a/source/blender/depsgraph/intern/node/deg_node_id.hh
+++ b/source/blender/depsgraph/intern/node/deg_node_id.hh
@@ -8,11 +8,13 @@
 
 #pragma once
 
-#include "BLI_ghash.h"
-#include "BLI_sys_types.h"
-#include "DNA_ID.h"
 #include "intern/node/deg_node.hh"
 
+#include "DNA_ID.h"
+
+#include "BLI_map.hh"
+#include "BLI_sys_types.h"
+
 namespace blender::deg {
 
 struct ComponentNode;
@@ -43,17 +45,17 @@ struct IDNode : public Node {
   };
 
   /** Initialize 'id' node - from pointer data given. */
-  virtual void init(const ID *id, const char *subdata) override;
+  void init(const ID *id, const char *subdata) override;
   void init_copy_on_write(Depsgraph &depsgraph, ID *id_cow_hint = nullptr);
-  ~IDNode();
+  ~IDNode() override;
   void destroy();
 
-  virtual string identifier() const override;
+  string identifier() const override;
 
   ComponentNode *find_component(NodeType type, const char *name = "") const;
   ComponentNode *add_component(NodeType type, const char *name = "");
 
-  virtual void tag_update(Depsgraph *graph, eUpdateSource source) override;
+  void tag_update(Depsgraph *graph, eUpdateSource source) override;
 
   void finalize_build(Depsgraph *graph);
 
diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc
index bef9f9ee69a..8ad7b8fa76d 100644
--- a/source/blender/depsgraph/intern/node/deg_node_operation.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc
@@ -8,10 +8,6 @@
 
 #include "intern/node/deg_node_operation.hh"
 
-#include "MEM_guardedalloc.h"
-
-#include "BLI_utildefines.h"
-
 #include "intern/depsgraph.hh"
 #include "intern/node/deg_node_component.hh"
 #include "intern/node/deg_node_factory.hh"
diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.hh b/source/blender/depsgraph/intern/node/deg_node_operation.hh
index eab963c1881..1e67033bfbf 100644
--- a/source/blender/depsgraph/intern/node/deg_node_operation.hh
+++ b/source/blender/depsgraph/intern/node/deg_node_operation.hh
@@ -245,25 +245,25 @@ enum OperationFlag {
 struct OperationNode : public Node {
   OperationNode();
 
-  virtual string identifier() const override;
+  string identifier() const override;
   /**
    * Full node identifier, including owner name.
    * used for logging and debug prints.
    */
   string full_identifier() const;
 
-  virtual void tag_update(Depsgraph *graph, eUpdateSource source) override;
+  void tag_update(Depsgraph *graph, eUpdateSource source) override;
 
   bool is_noop() const
   {
     return (bool)evaluate == false;
   }
 
-  virtual OperationNode *get_entry_operation() override
+  OperationNode *get_entry_operation() override
   {
     return this;
   }
-  virtual OperationNode *get_exit_operation() override
+  OperationNode *get_exit_operation() override
   {
     return this;
   }
diff --git a/source/blender/depsgraph/intern/node/deg_node_time.cc b/source/blender/depsgraph/intern/node/deg_node_time.cc
index f768b689e65..f3ffcbeedc2 100644
--- a/source/blender/depsgraph/intern/node/deg_node_time.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_time.cc
@@ -8,8 +8,6 @@
 
 #include "intern/node/deg_node_time.hh"
 
-#include "DNA_scene_types.h"
-
 #include "intern/depsgraph.hh"
 #include "intern/depsgraph_relation.hh"
 
diff --git a/source/blender/depsgraph/intern/node/deg_node_time.hh b/source/blender/depsgraph/intern/node/deg_node_time.hh
index 5158987c9c6..07e53f32ca0 100644
--- a/source/blender/depsgraph/intern/node/deg_node_time.hh
+++ b/source/blender/depsgraph/intern/node/deg_node_time.hh
@@ -18,7 +18,7 @@ struct TimeSourceNode : public Node {
 
   /* TODO: evaluate() operation needed */
 
-  virtual void tag_update(Depsgraph *graph, eUpdateSource source) override;
+  void tag_update(Depsgraph *graph, eUpdateSource source) override;
 
   void flush_update_tag(Depsgraph *graph);