diff --git a/source/blender/blenkernel/BKE_attribute_math.hh b/source/blender/blenkernel/BKE_attribute_math.hh
index 646017d39a4..97b9bef5f46 100644
--- a/source/blender/blenkernel/BKE_attribute_math.hh
+++ b/source/blender/blenkernel/BKE_attribute_math.hh
@@ -8,7 +8,6 @@
 #include "BLI_color.hh"
 #include "BLI_cpp_type.hh"
 #include "BLI_generic_span.hh"
-#include "BLI_generic_virtual_array.hh"
 #include "BLI_math_axis_angle.hh"
 #include "BLI_math_color.hh"
 #include "BLI_math_quaternion.hh"
@@ -18,6 +17,10 @@
 
 #include "BKE_attribute.hh"
 
+namespace blender {
+class GVArray;
+}
+
 namespace blender::bke::attribute_math {
 
 /**
diff --git a/source/blender/blenkernel/BKE_curves.hh b/source/blender/blenkernel/BKE_curves.hh
index 6c6c6e18f10..91e5fe007da 100644
--- a/source/blender/blenkernel/BKE_curves.hh
+++ b/source/blender/blenkernel/BKE_curves.hh
@@ -10,7 +10,6 @@
  */
 
 #include "BLI_bounds_types.hh"
-#include "BLI_generic_virtual_array.hh"
 #include "BLI_implicit_sharing_ptr.hh"
 #include "BLI_index_mask_fwd.hh"
 #include "BLI_math_matrix_types.hh"
@@ -37,6 +36,9 @@ struct AttributeAccessorFunctions;
 namespace blender::bke::bake {
 struct BakeMaterialsList;
 }
+namespace blender {
+class GVArray;
+}
 
 namespace blender::bke {
 
diff --git a/source/blender/blenkernel/BKE_grease_pencil.hh b/source/blender/blenkernel/BKE_grease_pencil.hh
index e6825b4f0f4..a5e0d87ef45 100644
--- a/source/blender/blenkernel/BKE_grease_pencil.hh
+++ b/source/blender/blenkernel/BKE_grease_pencil.hh
@@ -860,11 +860,6 @@ inline TreeNode &LayerGroup::as_node()
 {
   return *reinterpret_cast<TreeNode *>(this);
 }
-inline bool LayerGroup::is_empty() const
-{
-  return BLI_listbase_is_empty(&this->children);
-}
-
 inline const TreeNode &Layer::as_node() const
 {
   return *reinterpret_cast<const TreeNode *>(this);
diff --git a/source/blender/blenkernel/intern/bake_items_serialize.cc b/source/blender/blenkernel/intern/bake_items_serialize.cc
index ee71efed77d..9c6c9da9d65 100644
--- a/source/blender/blenkernel/intern/bake_items_serialize.cc
+++ b/source/blender/blenkernel/intern/bake_items_serialize.cc
@@ -16,12 +16,14 @@
 
 #include "BLI_endian_defines.h"
 #include "BLI_endian_switch.h"
+#include "BLI_listbase.h"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_path_utils.hh"
 #include "BLI_string.h"
 
 #include "DNA_material_types.h"
 #include "DNA_modifier_types.h"
+#include "DNA_object_types.h"
 #include "DNA_volume_types.h"
 
 #include "RNA_access.hh"
diff --git a/source/blender/blenkernel/intern/curves_attributes.cc b/source/blender/blenkernel/intern/curves_attributes.cc
index fa5bb5eb2b0..cc09ce96fb0 100644
--- a/source/blender/blenkernel/intern/curves_attributes.cc
+++ b/source/blender/blenkernel/intern/curves_attributes.cc
@@ -2,6 +2,10 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "BLI_listbase.h"
+
+#include "DNA_object_types.h"
+
 #include "BKE_curves.hh"
 #include "BKE_deform.hh"
 
diff --git a/source/blender/blenkernel/intern/grease_pencil.cc b/source/blender/blenkernel/intern/grease_pencil.cc
index 3df78387948..bdb9b0144bd 100644
--- a/source/blender/blenkernel/intern/grease_pencil.cc
+++ b/source/blender/blenkernel/intern/grease_pencil.cc
@@ -1583,6 +1583,11 @@ LayerGroup &LayerGroup::operator=(const LayerGroup &other)
   return *this;
 }
 
+bool LayerGroup::is_empty() const
+{
+  return BLI_listbase_is_empty(&this->children);
+}
+
 TreeNode &LayerGroup::add_node(TreeNode &node)
 {
   BLI_addtail(&this->children, &node);
diff --git a/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc b/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc
index a90b77d3def..c774592949a 100644
--- a/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc
+++ b/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc
@@ -40,6 +40,7 @@
 #include "BLI_listbase.h"
 #include "BLI_map.hh"
 #include "BLI_math_matrix.h"
+#include "BLI_math_matrix.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
diff --git a/source/blender/blenkernel/intern/grease_pencil_vertex_groups.cc b/source/blender/blenkernel/intern/grease_pencil_vertex_groups.cc
index 767ed238083..8ae9103ff56 100644
--- a/source/blender/blenkernel/intern/grease_pencil_vertex_groups.cc
+++ b/source/blender/blenkernel/intern/grease_pencil_vertex_groups.cc
@@ -7,10 +7,10 @@
  */
 
 #include "DNA_meshdata_types.h"
+#include "DNA_object_types.h"
 
 #include "BLI_listbase.h"
 #include "BLI_set.hh"
-#include "BLI_string.h"
 
 #include "BKE_curves.hh"
 #include "BKE_deform.hh"
diff --git a/source/blender/blenkernel/intern/mesh_attributes.cc b/source/blender/blenkernel/intern/mesh_attributes.cc
index 2c5d043b72e..3ba7d37c6d7 100644
--- a/source/blender/blenkernel/intern/mesh_attributes.cc
+++ b/source/blender/blenkernel/intern/mesh_attributes.cc
@@ -2,6 +2,10 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "BLI_generic_virtual_array.hh"
+#include "BLI_math_quaternion.hh"
+#include "BLI_virtual_array.hh"
+
 #include "BKE_attribute_math.hh"
 #include "BKE_deform.hh"
 #include "BKE_mesh.hh"
diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_merge.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_merge.cc
index 795c1c9f9db..25440f2171d 100644
--- a/source/blender/editors/grease_pencil/intern/grease_pencil_merge.cc
+++ b/source/blender/editors/grease_pencil/intern/grease_pencil_merge.cc
@@ -6,8 +6,7 @@
  * \ingroup edgreasepencil
  */
 
-#include "BLI_math_matrix.h"
-#include "BLI_math_vector.h"
+#include "BLI_math_matrix.hh"
 
 #include "BKE_attribute_math.hh"
 #include "BKE_curves.hh"
diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_primitive.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_primitive.cc
index bb83c404734..e7ca5deaedf 100644
--- a/source/blender/editors/grease_pencil/intern/grease_pencil_primitive.cc
+++ b/source/blender/editors/grease_pencil/intern/grease_pencil_primitive.cc
@@ -28,7 +28,7 @@
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
 
-#include "DEG_depsgraph_query.hh"
+#include "DEG_depsgraph.hh"
 
 #include "DNA_brush_types.h"
 #include "DNA_material_types.h"
@@ -39,7 +39,7 @@
 #include "ED_view3d.hh"
 
 #include "BLI_array_utils.hh"
-#include "BLI_string.h"
+#include "BLI_math_matrix.hh"
 #include "BLI_vector.hh"
 
 #include "BLT_translation.hh"
diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc
index 0c3390ab2b6..77a45c9f77f 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -27,6 +27,8 @@
 #include "BLI_convexhull_2d.h"
 #include "BLI_function_ref.hh"
 #include "BLI_map.hh"
+#include "BLI_math_matrix.hh"
+#include "BLI_math_quaternion.hh"
 #include "BLI_set.hh"
 #include "BLI_span.hh"
 #include "BLI_string.h"
diff --git a/source/blender/editors/transform/transform_mode_edge_slide.cc b/source/blender/editors/transform/transform_mode_edge_slide.cc
index 544e37208f2..567386ba3f1 100644
--- a/source/blender/editors/transform/transform_mode_edge_slide.cc
+++ b/source/blender/editors/transform/transform_mode_edge_slide.cc
@@ -7,6 +7,7 @@
  */
 
 #include "BLI_math_matrix.h"
+#include "BLI_math_matrix.hh"
 #include "BLI_string.h"
 
 #include "BKE_editmesh.hh"
diff --git a/source/blender/editors/transform/transform_mode_translate.cc b/source/blender/editors/transform/transform_mode_translate.cc
index f5e90fcfadb..a0b605a328b 100644
--- a/source/blender/editors/transform/transform_mode_translate.cc
+++ b/source/blender/editors/transform/transform_mode_translate.cc
@@ -10,9 +10,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_gpencil_legacy_types.h"
-
 #include "BLI_math_matrix.h"
+#include "BLI_math_matrix.hh"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
 #include "BLI_string.h"
diff --git a/source/blender/editors/transform/transform_mode_vert_slide.cc b/source/blender/editors/transform/transform_mode_vert_slide.cc
index a4c2db33289..6f0fcdfb1b9 100644
--- a/source/blender/editors/transform/transform_mode_vert_slide.cc
+++ b/source/blender/editors/transform/transform_mode_vert_slide.cc
@@ -7,6 +7,7 @@
  */
 
 #include "BLI_math_matrix.h"
+#include "BLI_math_matrix.hh"
 #include "BLI_string.h"
 
 #include "BKE_unit.hh"
diff --git a/source/blender/geometry/intern/interpolate_curves.cc b/source/blender/geometry/intern/interpolate_curves.cc
index ffcee822dcf..428f790a0a6 100644
--- a/source/blender/geometry/intern/interpolate_curves.cc
+++ b/source/blender/geometry/intern/interpolate_curves.cc
@@ -2,6 +2,8 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "BLI_math_quaternion.hh"
+
 #include "BKE_attribute_math.hh"
 #include "BKE_curves.hh"
 
diff --git a/source/blender/geometry/intern/merge_layers.cc b/source/blender/geometry/intern/merge_layers.cc
index 3cd6b654501..59fb3abdc8a 100644
--- a/source/blender/geometry/intern/merge_layers.cc
+++ b/source/blender/geometry/intern/merge_layers.cc
@@ -4,10 +4,11 @@
 
 #include "GEO_merge_layers.hh"
 
+#include "BLI_math_matrix.hh"
+
 #include "BKE_attribute_math.hh"
 #include "BKE_curves.hh"
 #include "BKE_grease_pencil.hh"
-#include "BKE_lib_id.hh"
 
 #include "GEO_join_geometries.hh"
 
diff --git a/source/blender/geometry/intern/realize_instances.cc b/source/blender/geometry/intern/realize_instances.cc
index 60f975b1b15..7509ec221f3 100644
--- a/source/blender/geometry/intern/realize_instances.cc
+++ b/source/blender/geometry/intern/realize_instances.cc
@@ -5,16 +5,16 @@
 #include "GEO_join_geometries.hh"
 #include "GEO_realize_instances.hh"
 
-#include "DNA_collection_types.h"
+#include "DNA_object_types.h"
 
 #include "BLI_array_utils.hh"
+#include "BLI_listbase.h"
+#include "BLI_math_matrix.hh"
 #include "BLI_noise.hh"
 
 #include "BKE_curves.hh"
 #include "BKE_customdata.hh"
-#include "BKE_deform.hh"
 #include "BKE_geometry_nodes_gizmos_transforms.hh"
-#include "BKE_geometry_set_instances.hh"
 #include "BKE_grease_pencil.hh"
 #include "BKE_instances.hh"
 #include "BKE_material.hh"
diff --git a/source/blender/geometry/intern/transform.cc b/source/blender/geometry/intern/transform.cc
index d4856e441f6..45582e93fd3 100644
--- a/source/blender/geometry/intern/transform.cc
+++ b/source/blender/geometry/intern/transform.cc
@@ -8,8 +8,8 @@
 
 #include "GEO_transform.hh"
 
-#include "BLI_math_base.h"
 #include "BLI_math_matrix.h"
+#include "BLI_math_matrix.hh"
 #include "BLI_math_vector.hh"
 #include "BLI_task.hh"
 
diff --git a/source/blender/makesdna/DNA_curves_types.h b/source/blender/makesdna/DNA_curves_types.h
index 45bc5d2fcae..953c3249037 100644
--- a/source/blender/makesdna/DNA_curves_types.h
+++ b/source/blender/makesdna/DNA_curves_types.h
@@ -10,9 +10,8 @@
 
 #include "DNA_ID.h"
 #include "DNA_customdata_types.h"
-#include "DNA_object_types.h"
+#include "DNA_listBase.h"
 
-#include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_mirror.cc b/source/blender/modifiers/intern/MOD_grease_pencil_mirror.cc
index ac2725d8ad6..ecbe2a2ff95 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_mirror.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_mirror.cc
@@ -6,6 +6,8 @@
  * \ingroup modifiers
  */
 
+#include "BLI_math_matrix.hh"
+
 #include "DNA_defaults.h"
 #include "DNA_modifier_types.h"
 
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_texture.cc b/source/blender/modifiers/intern/MOD_grease_pencil_texture.cc
index 5cbed848ace..909d48ec569 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_texture.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_texture.cc
@@ -9,6 +9,7 @@
 #include "BKE_attribute.hh"
 #include "BLI_index_range.hh"
 #include "BLI_math_base.hh"
+#include "BLI_math_matrix.hh"
 #include "BLI_span.hh"
 
 #include "DNA_defaults.h"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc
index 66089d5169d..79e93a00fc4 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc
@@ -4,6 +4,7 @@
 
 #include "BLI_kdtree.h"
 #include "BLI_math_geom.h"
+#include "BLI_math_quaternion.hh"
 #include "BLI_math_rotation.h"
 #include "BLI_noise.hh"
 #include "BLI_rand.hh"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc b/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc
index b882d090507..2a58d7e86d7 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc
@@ -8,6 +8,7 @@
 
 #include "BLI_kdtree.h"
 #include "BLI_length_parameterize.hh"
+#include "BLI_math_quaternion.hh"
 #include "BLI_math_rotation.h"
 #include "BLI_task.hh"