Cleanup: reduce indirect DNA header inclusion

Remove DNA headers, using forward declarations where possible.

Also removed duplicate header, header including it's self
and unnecessary inclusion of libc system headers from BKE header.

38 files changed, 140 insertions, 128 deletions

diff --git a/source/blender/blenkernel/BKE_boids.h b/source/blender/blenkernel/BKE_boids.h
index c9e6f0e7346..71a4d35767f 100644
--- a/source/blender/blenkernel/BKE_boids.h
+++ b/source/blender/blenkernel/BKE_boids.h
@@ -23,13 +23,16 @@
  * \ingroup bke
  */
 
-#include "DNA_boid_types.h"
-#include "DNA_particle_types.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct BoidSettings;
+struct BoidState;
+struct Object;
+struct ParticleData;
+struct ParticleSettings;
+struct ParticleSimulationData;
 struct RNG;
 
 typedef struct BoidBrainData {
@@ -50,13 +53,13 @@ typedef struct BoidBrainData {
 void boids_precalc_rules(struct ParticleSettings *part, float cfra);
 void boid_brain(BoidBrainData *bbd, int p, struct ParticleData *pa);
 void boid_body(BoidBrainData *bbd, struct ParticleData *pa);
-void boid_default_settings(BoidSettings *boids);
-BoidRule *boid_new_rule(int type);
-BoidState *boid_new_state(BoidSettings *boids);
-BoidState *boid_duplicate_state(BoidSettings *boids, BoidState *state);
-void boid_free_settings(BoidSettings *boids);
-BoidSettings *boid_copy_settings(const BoidSettings *boids);
-BoidState *boid_get_current_state(BoidSettings *boids);
+void boid_default_settings(struct BoidSettings *boids);
+struct BoidRule *boid_new_rule(int type);
+struct BoidState *boid_new_state(struct BoidSettings *boids);
+struct BoidState *boid_duplicate_state(struct BoidSettings *boids, struct BoidState *state);
+void boid_free_settings(struct BoidSettings *boids);
+struct BoidSettings *boid_copy_settings(const struct BoidSettings *boids);
+struct BoidState *boid_get_current_state(struct BoidSettings *boids);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h
index 3a5328a33e2..a10a4e3c7fd 100644
--- a/source/blender/blenkernel/BKE_collision.h
+++ b/source/blender/blenkernel/BKE_collision.h
@@ -22,23 +22,13 @@
  * \ingroup bke
  */
 
-#include <float.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* types */
-#include "BKE_collision.h"
-#include "DNA_cloth_types.h"
-
-#include "BLI_kdopbvh.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct Collection;
 struct CollisionModifierData;
+struct BVHTree;
 struct Depsgraph;
 struct MVert;
 struct MVertTri;
@@ -113,11 +103,11 @@ typedef struct FaceCollPair {
 // used in modifier.c from collision.c
 /////////////////////////////////////////////////
 
-BVHTree *bvhtree_build_from_mvert(const struct MVert *mvert,
-                                  const struct MVertTri *tri,
-                                  int tri_num,
-                                  float epsilon);
-void bvhtree_update_from_mvert(BVHTree *bvhtree,
+struct BVHTree *bvhtree_build_from_mvert(const struct MVert *mvert,
+                                         const struct MVertTri *tri,
+                                         int tri_num,
+                                         float epsilon);
+void bvhtree_update_from_mvert(struct BVHTree *bvhtree,
                                const struct MVert *mvert,
                                const struct MVert *mvert_moving,
                                const struct MVertTri *tri,
diff --git a/source/blender/blenkernel/BKE_cryptomatte.h b/source/blender/blenkernel/BKE_cryptomatte.h
index c3c17f72cae..71b15e47203 100644
--- a/source/blender/blenkernel/BKE_cryptomatte.h
+++ b/source/blender/blenkernel/BKE_cryptomatte.h
@@ -25,8 +25,6 @@
 
 #include "BLI_sys_types.h"
 
-#include "DNA_layer_types.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h
index dcb4a993da1..881b93fe709 100644
--- a/source/blender/blenkernel/BKE_curve.h
+++ b/source/blender/blenkernel/BKE_curve.h
@@ -22,7 +22,9 @@
  * \ingroup bke
  */
 
-#include "DNA_scene_types.h"
+#include "BLI_sys_types.h"
+
+#include "DNA_listBase.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -318,8 +320,8 @@ void BKE_curve_deform_coords(const struct Object *ob_curve,
                              const short flag,
                              const short defaxis);
 
-void BKE_curve_deform_coords_with_editmesh(const Object *ob_curve,
-                                           const Object *ob_target,
+void BKE_curve_deform_coords_with_editmesh(const struct Object *ob_curve,
+                                           const struct Object *ob_target,
                                            float (*vert_coords)[3],
                                            const int vert_coords_len,
                                            const int defgrp_index,
diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h
index 0585f67703c..3cba47afc46 100644
--- a/source/blender/blenkernel/BKE_effect.h
+++ b/source/blender/blenkernel/BKE_effect.h
@@ -22,8 +22,6 @@
  * \ingroup bke
  */
 
-#include "DNA_modifier_types.h"
-
 #include "BLI_utildefines.h"
 
 #ifdef __cplusplus
@@ -147,7 +145,7 @@ float effector_falloff(struct EffectorCache *eff,
                        struct EffectorData *efd,
                        struct EffectedPoint *point,
                        struct EffectorWeights *weights);
-int closest_point_on_surface(SurfaceModifierData *surmd,
+int closest_point_on_surface(struct SurfaceModifierData *surmd,
                              const float co[3],
                              float surface_co[3],
                              float surface_nor[3],
diff --git a/source/blender/blenkernel/BKE_freestyle.h b/source/blender/blenkernel/BKE_freestyle.h
index 47f0b547d83..5e29665d728 100644
--- a/source/blender/blenkernel/BKE_freestyle.h
+++ b/source/blender/blenkernel/BKE_freestyle.h
@@ -23,8 +23,6 @@
  * \ingroup bke
  */
 
-#include "DNA_scene_types.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -39,28 +37,31 @@ typedef struct FreestyleModuleSettings FreestyleModuleSettings;
 typedef struct FreestyleSettings FreestyleSettings;
 
 /* FreestyleConfig */
-void BKE_freestyle_config_init(FreestyleConfig *config);
-void BKE_freestyle_config_free(FreestyleConfig *config, const bool do_id_user);
-void BKE_freestyle_config_copy(FreestyleConfig *new_config,
-                               const FreestyleConfig *config,
+void BKE_freestyle_config_init(struct FreestyleConfig *config);
+void BKE_freestyle_config_free(struct FreestyleConfig *config, const bool do_id_user);
+void BKE_freestyle_config_copy(struct FreestyleConfig *new_config,
+                               const struct FreestyleConfig *config,
                                const int flag);
 
 /* FreestyleConfig.modules */
-FreestyleModuleConfig *BKE_freestyle_module_add(FreestyleConfig *config);
-bool BKE_freestyle_module_delete(FreestyleConfig *config, FreestyleModuleConfig *module_conf);
-bool BKE_freestyle_module_move(FreestyleConfig *config,
-                               FreestyleModuleConfig *module_conf,
+struct FreestyleModuleConfig *BKE_freestyle_module_add(struct FreestyleConfig *config);
+bool BKE_freestyle_module_delete(struct FreestyleConfig *config,
+                                 struct FreestyleModuleConfig *module_conf);
+bool BKE_freestyle_module_move(struct FreestyleConfig *config,
+                               struct FreestyleModuleConfig *module_conf,
                                int direction);
 
 /* FreestyleConfig.linesets */
-FreestyleLineSet *BKE_freestyle_lineset_add(struct Main *bmain,
-                                            FreestyleConfig *config,
-                                            const char *name);
-bool BKE_freestyle_lineset_delete(FreestyleConfig *config, FreestyleLineSet *lineset);
-FreestyleLineSet *BKE_freestyle_lineset_get_active(FreestyleConfig *config);
-short BKE_freestyle_lineset_get_active_index(FreestyleConfig *config);
-void BKE_freestyle_lineset_set_active_index(FreestyleConfig *config, short index);
-void BKE_freestyle_lineset_unique_name(FreestyleConfig *config, FreestyleLineSet *lineset);
+struct FreestyleLineSet *BKE_freestyle_lineset_add(struct Main *bmain,
+                                                   struct FreestyleConfig *config,
+                                                   const char *name);
+bool BKE_freestyle_lineset_delete(struct FreestyleConfig *config,
+                                  struct FreestyleLineSet *lineset);
+struct FreestyleLineSet *BKE_freestyle_lineset_get_active(struct FreestyleConfig *config);
+short BKE_freestyle_lineset_get_active_index(struct FreestyleConfig *config);
+void BKE_freestyle_lineset_set_active_index(struct FreestyleConfig *config, short index);
+void BKE_freestyle_lineset_unique_name(struct FreestyleConfig *config,
+                                       struct FreestyleLineSet *lineset);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h
index 9c250240e5e..bcf35bf1197 100644
--- a/source/blender/blenkernel/BKE_idprop.h
+++ b/source/blender/blenkernel/BKE_idprop.h
@@ -20,8 +20,6 @@
  * \ingroup bke
  */
 
-#include "DNA_ID.h"
-
 #include "BLI_compiler_attrs.h"
 
 #ifdef __cplusplus
@@ -57,9 +55,9 @@ typedef union IDPropertyTemplate {
 
 /* ----------- Property Array Type ---------- */
 
-IDProperty *IDP_NewIDPArray(const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
-IDProperty *IDP_CopyIDPArray(const IDProperty *array, const int flag) ATTR_WARN_UNUSED_RESULT
-    ATTR_NONNULL();
+struct IDProperty *IDP_NewIDPArray(const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
+struct IDProperty *IDP_CopyIDPArray(const struct IDProperty *array,
+                                    const int flag) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
 
 /* shallow copies item */
 void IDP_SetIndexArray(struct IDProperty *prop, int index, struct IDProperty *item) ATTR_NONNULL();
@@ -74,7 +72,9 @@ void IDP_ResizeArray(struct IDProperty *prop, int newlen);
 void IDP_FreeArray(struct IDProperty *prop);
 
 /* ---------- String Type ------------ */
-IDProperty *IDP_NewString(const char *st, const char *name, int maxlen) ATTR_WARN_UNUSED_RESULT
+struct IDProperty *IDP_NewString(const char *st,
+                                 const char *name,
+                                 int maxlen) ATTR_WARN_UNUSED_RESULT
     ATTR_NONNULL(2 /* 'name 'arg */); /* maxlen excludes '\0' */
 void IDP_AssignString(struct IDProperty *prop, const char *st, int maxlen)
     ATTR_NONNULL(); /* maxlen excludes '\0' */
@@ -84,9 +84,9 @@ void IDP_FreeString(struct IDProperty *prop) ATTR_NONNULL();
 
 /*-------- ID Type -------*/
 
-typedef void (*IDPWalkFunc)(void *userData, IDProperty *idp);
+typedef void (*IDPWalkFunc)(void *userData, struct IDProperty *idp);
 
-void IDP_AssignID(IDProperty *prop, ID *id, const int flag);
+void IDP_AssignID(struct IDProperty *prop, struct ID *id, const int flag);
 
 /*-------- Group Functions -------*/
 
@@ -100,10 +100,10 @@ void IDP_ReplaceInGroup(struct IDProperty *group, struct IDProperty *prop) ATTR_
 void IDP_ReplaceInGroup_ex(struct IDProperty *group,
                            struct IDProperty *prop,
                            struct IDProperty *prop_exist);
-void IDP_MergeGroup(IDProperty *dest, const IDProperty *src, const bool do_overwrite)
+void IDP_MergeGroup(struct IDProperty *dest, const struct IDProperty *src, const bool do_overwrite)
     ATTR_NONNULL();
-void IDP_MergeGroup_ex(IDProperty *dest,
-                       const IDProperty *src,
+void IDP_MergeGroup_ex(struct IDProperty *dest,
+                       const struct IDProperty *src,
                        const bool do_overwrite,
                        const int flag) ATTR_NONNULL();
 bool IDP_AddToGroup(struct IDProperty *group, struct IDProperty *prop) ATTR_NONNULL();
@@ -113,11 +113,13 @@ bool IDP_InsertToGroup(struct IDProperty *group,
 void IDP_RemoveFromGroup(struct IDProperty *group, struct IDProperty *prop) ATTR_NONNULL();
 void IDP_FreeFromGroup(struct IDProperty *group, struct IDProperty *prop) ATTR_NONNULL();
 
-IDProperty *IDP_GetPropertyFromGroup(const struct IDProperty *prop,
-                                     const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
-IDProperty *IDP_GetPropertyTypeFromGroup(const struct IDProperty *prop,
-                                         const char *name,
-                                         const char type) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
+struct IDProperty *IDP_GetPropertyFromGroup(const struct IDProperty *prop,
+                                            const char *name) ATTR_WARN_UNUSED_RESULT
+    ATTR_NONNULL();
+struct IDProperty *IDP_GetPropertyTypeFromGroup(const struct IDProperty *prop,
+                                                const char *name,
+                                                const char type) ATTR_WARN_UNUSED_RESULT
+    ATTR_NONNULL();
 
 /*-------- Main Functions --------*/
 struct IDProperty *IDP_GetProperties(struct ID *id,
@@ -127,10 +129,10 @@ struct IDProperty *IDP_CopyProperty(const struct IDProperty *prop) ATTR_WARN_UNU
     ATTR_NONNULL();
 struct IDProperty *IDP_CopyProperty_ex(const struct IDProperty *prop,
                                        const int flag) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
-void IDP_CopyPropertyContent(IDProperty *dst, IDProperty *src) ATTR_NONNULL();
+void IDP_CopyPropertyContent(struct IDProperty *dst, struct IDProperty *src) ATTR_NONNULL();
 
-bool IDP_EqualsProperties_ex(IDProperty *prop1,
-                             IDProperty *prop2,
+bool IDP_EqualsProperties_ex(struct IDProperty *prop1,
+                             struct IDProperty *prop2,
                              const bool is_strict) ATTR_WARN_UNUSED_RESULT;
 
 bool IDP_EqualsProperties(struct IDProperty *prop1,
@@ -142,12 +144,12 @@ struct IDProperty *IDP_New(const char type,
 
 void IDP_FreePropertyContent_ex(struct IDProperty *prop, const bool do_id_user);
 void IDP_FreePropertyContent(struct IDProperty *prop);
-void IDP_FreeProperty_ex(IDProperty *prop, const bool do_id_user);
+void IDP_FreeProperty_ex(struct IDProperty *prop, const bool do_id_user);
 void IDP_FreeProperty(struct IDProperty *prop);
 
-void IDP_ClearProperty(IDProperty *prop);
+void IDP_ClearProperty(struct IDProperty *prop);
 
-void IDP_Reset(IDProperty *prop, const IDProperty *reference);
+void IDP_Reset(struct IDProperty *prop, const struct IDProperty *reference);
 
 #define IDP_Int(prop) ((prop)->data.val)
 #define IDP_Array(prop) ((prop)->data.pointer)
@@ -155,29 +157,29 @@ void IDP_Reset(IDProperty *prop, const IDProperty *reference);
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
 #  define IDP_Float(prop) \
     _Generic((prop), \
-  IDProperty *:             (*(float *)&(prop)->data.val), \
-  const IDProperty *: (*(const float *)&(prop)->data.val))
+  struct IDProperty *:             (*(float *)&(prop)->data.val), \
+  const struct IDProperty *: (*(const float *)&(prop)->data.val))
 #  define IDP_Double(prop) \
     _Generic((prop), \
-  IDProperty *:             (*(double *)&(prop)->data.val), \
-  const IDProperty *: (*(const double *)&(prop)->data.val))
+  struct IDProperty *:             (*(double *)&(prop)->data.val), \
+  const struct IDProperty *: (*(const double *)&(prop)->data.val))
 #  define IDP_String(prop) \
     _Generic((prop), \
-  IDProperty *:             ((char *) (prop)->data.pointer), \
-  const IDProperty *: ((const char *) (prop)->data.pointer))
+  struct IDProperty *:             ((char *) (prop)->data.pointer), \
+  const struct IDProperty *: ((const char *) (prop)->data.pointer))
 #  define IDP_IDPArray(prop) \
     _Generic((prop), \
-  IDProperty *:             ((IDProperty *) (prop)->data.pointer), \
-  const IDProperty *: ((const IDProperty *) (prop)->data.pointer))
+  struct IDProperty *:             ((struct IDProperty *) (prop)->data.pointer), \
+  const struct IDProperty *: ((const struct IDProperty *) (prop)->data.pointer))
 #  define IDP_Id(prop) \
     _Generic((prop), \
-  IDProperty *:             ((ID *) (prop)->data.pointer), \
-  const IDProperty *: ((const ID *) (prop)->data.pointer))
+  struct IDProperty *:             ((ID *) (prop)->data.pointer), \
+  const struct IDProperty *: ((const ID *) (prop)->data.pointer))
 #else
 #  define IDP_Float(prop) (*(float *)&(prop)->data.val)
 #  define IDP_Double(prop) (*(double *)&(prop)->data.val)
 #  define IDP_String(prop) ((char *)(prop)->data.pointer)
-#  define IDP_IDPArray(prop) ((IDProperty *)(prop)->data.pointer)
+#  define IDP_IDPArray(prop) ((struct IDProperty *)(prop)->data.pointer)
 #  define IDP_Id(prop) ((ID *)(prop)->data.pointer)
 #endif
 
@@ -185,7 +187,7 @@ void IDP_Reset(IDProperty *prop, const IDProperty *reference);
  * Call a callback for each idproperty in the hierarchy under given root one (included).
  *
  */
-typedef void (*IDPForeachPropertyCallback)(IDProperty *id_property, void *user_data);
+typedef void (*IDPForeachPropertyCallback)(struct IDProperty *id_property, void *user_data);
 
 void IDP_foreach_property(struct IDProperty *id_property_root,
                           const int type_filter,
@@ -194,18 +196,18 @@ void IDP_foreach_property(struct IDProperty *id_property_root,
 
 /* Format IDProperty as strings */
 char *IDP_reprN(const struct IDProperty *prop, uint *r_len);
-void IDP_repr_fn(const IDProperty *prop,
+void IDP_repr_fn(const struct IDProperty *prop,
                  void (*str_append_fn)(void *user_data, const char *str, uint str_len),
                  void *user_data);
 void IDP_print(const struct IDProperty *prop);
 
 void IDP_BlendWrite(struct BlendWriter *writer, const struct IDProperty *prop);
 void IDP_BlendReadData_impl(struct BlendDataReader *reader,
-                            IDProperty **prop,
+                            struct IDProperty **prop,
                             const char *caller_func_id);
 #define IDP_BlendDataRead(reader, prop) IDP_BlendReadData_impl(reader, prop, __func__)
-void IDP_BlendReadLib(struct BlendLibReader *reader, IDProperty *prop);
-void IDP_BlendReadExpand(struct BlendExpander *expander, IDProperty *prop);
+void IDP_BlendReadLib(struct BlendLibReader *reader, struct IDProperty *prop);
+void IDP_BlendReadExpand(struct BlendExpander *expander, struct IDProperty *prop);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index e5fab35891c..aa95ac2a8cf 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -23,15 +23,14 @@
 #include "BKE_collection.h"
 
 #include "DNA_listBase.h"
-#include "DNA_scene_types.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define TODO_LAYER_OVERRIDE  /* CollectionOverride */
+#define TODO_LAYER_OVERRIDE /* CollectionOverride */
 #define TODO_LAYER_OPERATORS /* collection mamanger and property panel operators */
-#define TODO_LAYER           /* generic todo */
+#define TODO_LAYER /* generic todo */
 
 struct Base;
 struct BlendDataReader;
@@ -56,9 +55,9 @@ typedef enum eViewLayerCopyMethod {
 struct ViewLayer *BKE_view_layer_default_view(const struct Scene *scene);
 struct ViewLayer *BKE_view_layer_default_render(const struct Scene *scene);
 struct ViewLayer *BKE_view_layer_find(const struct Scene *scene, const char *layer_name);
-struct ViewLayer *BKE_view_layer_add(Scene *scene,
+struct ViewLayer *BKE_view_layer_add(struct Scene *scene,
                                      const char *name,
-                                     ViewLayer *view_layer_source,
+                                     struct ViewLayer *view_layer_source,
                                      const int type);
 
 /* DEPRECATED */
@@ -393,10 +392,11 @@ struct ObjectsInModeParams {
   void *filter_userdata;
 };
 
-Base **BKE_view_layer_array_from_bases_in_mode_params(struct ViewLayer *view_layer,
-                                                      const struct View3D *v3d,
-                                                      uint *r_len,
-                                                      const struct ObjectsInModeParams *params);
+struct Base **BKE_view_layer_array_from_bases_in_mode_params(
+    struct ViewLayer *view_layer,
+    const struct View3D *v3d,
+    uint *r_len,
+    const struct ObjectsInModeParams *params);
 
 struct Object **BKE_view_layer_array_from_objects_in_mode_params(
     struct ViewLayer *view_layer,
@@ -452,7 +452,8 @@ void BKE_view_layer_verify_aov(struct RenderEngine *engine,
                                struct Scene *scene,
                                struct ViewLayer *view_layer);
 bool BKE_view_layer_has_valid_aov(struct ViewLayer *view_layer);
-ViewLayer *BKE_view_layer_find_with_aov(struct Scene *scene, struct ViewLayerAOV *view_layer_aov);
+struct ViewLayer *BKE_view_layer_find_with_aov(struct Scene *scene,
+                                               struct ViewLayerAOV *view_layer_aov);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index 73815325594..2ac39be7eb3 100644
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -29,11 +29,8 @@
 #include "BLI_buffer.h"
 #include "BLI_utildefines.h"
 
-#include "DNA_object_types.h"
 #include "DNA_particle_types.h"
 
-#include "BKE_customdata.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -302,7 +299,7 @@ int psys_get_tot_child(struct Scene *scene,
 struct ParticleSystem *psys_get_current(struct Object *ob);
 /* for rna */
 short psys_get_current_num(struct Object *ob);
-void psys_set_current_num(Object *ob, int index);
+void psys_set_current_num(struct Object *ob, int index);
 /* UNUSED */
 // struct Object *psys_find_object(struct Scene *scene, struct ParticleSystem *psys);
 
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h
index f2edebededc..d3ae043588d 100644
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@@ -23,12 +23,10 @@
  * \ingroup bke
  */
 
-#include "DNA_ID.h"
-#include "DNA_boid_types.h"
-#include "DNA_dynamicpaint_types.h"
-#include "DNA_object_force_types.h"
-#include "DNA_pointcache_types.h"
-#include <stdio.h> /* for FILE */
+#include "DNA_boid_types.h"       /* for #BoidData */
+#include "DNA_pointcache_types.h" /* for #BPHYS_TOT_DATA */
+
+#include <stdio.h> /* for #FILE */
 
 #ifdef __cplusplus
 extern "C" {
@@ -93,6 +91,7 @@ struct SoftBody;
 struct ViewLayer;
 struct BlendWriter;
 struct BlendDataReader;
+struct DynamicPaintSurface;
 
 /* temp structure for read/write */
 typedef struct PTCacheData {
diff --git a/source/blender/blenkernel/BKE_sequencer_offscreen.h b/source/blender/blenkernel/BKE_sequencer_offscreen.h
index f5f6067b06e..25a78fcfbad 100644
--- a/source/blender/blenkernel/BKE_sequencer_offscreen.h
+++ b/source/blender/blenkernel/BKE_sequencer_offscreen.h
@@ -23,26 +23,23 @@
  * \ingroup bke
  */
 
-#include "DNA_object_enums.h"
-
-#include "DNA_view3d_types.h"
-
-#include "IMB_imbuf_types.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct GPUOffScreen;
 
+enum eDrawType;
+enum eImBufFlags;
+
 typedef struct ImBuf *(*SequencerDrawView)(struct Depsgraph *depsgraph,
                                            struct Scene *scene,
                                            struct View3DShading *shading_override,
-                                           eDrawType drawtype,
+                                           enum eDrawType drawtype,
                                            struct Object *camera,
                                            int width,
                                            int height,
-                                           eImBufFlags flag,
+                                           enum eImBufFlags flag,
                                            eV3DOffscreenDrawFlag draw_flags,
                                            int alpha_mode,
                                            const char *viewname,
diff --git a/source/blender/blenkernel/BKE_shader_fx.h b/source/blender/blenkernel/BKE_shader_fx.h
index 7c2d363be5c..b5b5f61a6a6 100644
--- a/source/blender/blenkernel/BKE_shader_fx.h
+++ b/source/blender/blenkernel/BKE_shader_fx.h
@@ -19,7 +19,6 @@
  * \ingroup bke
  */
 
-#include "BKE_customdata.h"
 #include "BLI_compiler_attrs.h"
 #include "DNA_shader_fx_types.h" /* needed for all enum typdefs */
 
diff --git a/source/blender/blenkernel/BKE_simulation.h b/source/blender/blenkernel/BKE_simulation.h
index 23735990079..37372036130 100644
--- a/source/blender/blenkernel/BKE_simulation.h
+++ b/source/blender/blenkernel/BKE_simulation.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "DNA_simulation_types.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -25,6 +23,7 @@ extern "C" {
 struct Depsgraph;
 struct Main;
 struct Scene;
+struct Simulation;
 
 void *BKE_simulation_add(struct Main *bmain, const char *name);
 
diff --git a/source/blender/blenkernel/BKE_studiolight.h b/source/blender/blenkernel/BKE_studiolight.h
index 614523be123..70b8743bcd2 100644
--- a/source/blender/blenkernel/BKE_studiolight.h
+++ b/source/blender/blenkernel/BKE_studiolight.h
@@ -29,7 +29,7 @@
 
 #include "BLI_path_util.h"
 
-#include "DNA_userdef_types.h"
+#include "DNA_userdef_types.h" /* for #SolidLight */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/blenkernel/BKE_text_suggestions.h b/source/blender/blenkernel/BKE_text_suggestions.h
index f54e45b6c2f..7561e1d1d08 100644
--- a/source/blender/blenkernel/BKE_text_suggestions.h
+++ b/source/blender/blenkernel/BKE_text_suggestions.h
@@ -22,8 +22,6 @@
  * \ingroup bke
  */
 
-#include "DNA_text_types.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -62,9 +60,9 @@ typedef struct SuggList {
 void free_texttools(void);
 
 /* Used to identify which Text object the current tools should appear against */
-void texttool_text_set_active(Text *text);
+void texttool_text_set_active(struct Text *text);
 void texttool_text_clear(void);
-short texttool_text_is_active(Text *text);
+short texttool_text_is_active(struct Text *text);
 
 /* Suggestions */
 void texttool_suggest_add(const char *name, char type);
diff --git a/source/blender/blenkernel/intern/anim_data.c b/source/blender/blenkernel/intern/anim_data.c
index 13abfa92032..633d6202222 100644
--- a/source/blender/blenkernel/intern/anim_data.c
+++ b/source/blender/blenkernel/intern/anim_data.c
@@ -42,6 +42,7 @@
 #include "DNA_ID.h"
 #include "DNA_anim_types.h"
 #include "DNA_light_types.h"
+#include "DNA_material_types.h"
 #include "DNA_node_types.h"
 #include "DNA_space_types.h"
 #include "DNA_windowmanager_types.h"
diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c
index 96bf9fbe8d2..e69173cc1d5 100644
--- a/source/blender/blenkernel/intern/boids.c
+++ b/source/blender/blenkernel/intern/boids.c
@@ -39,6 +39,7 @@
 #include "BKE_collision.h"
 #include "BKE_effect.h"
 #include "BKE_particle.h"
+#include "BLI_kdopbvh.h"
 
 #include "BKE_modifier.h"
 
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 96791aed2c3..33686cea4fc 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -23,6 +23,7 @@
 #include "DNA_brush_types.h"
 #include "DNA_defaults.h"
 #include "DNA_gpencil_types.h"
+#include "DNA_material_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index b56a15b3d45..e18b2d87459 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -42,6 +42,7 @@
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
+#include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_texture_types.h"
diff --git a/source/blender/blenkernel/intern/gpencil_curve.c b/source/blender/blenkernel/intern/gpencil_curve.c
index 8cc11468771..be14d74de7a 100644
--- a/source/blender/blenkernel/intern/gpencil_curve.c
+++ b/source/blender/blenkernel/intern/gpencil_curve.c
@@ -36,8 +36,11 @@
 
 #include "BLT_translation.h"
 
+#include "DNA_collection_types.h"
 #include "DNA_gpencil_types.h"
+#include "DNA_material_types.h"
 #include "DNA_meshdata_types.h"
+#include "DNA_scene_types.h"
 
 #include "BKE_collection.h"
 #include "BKE_context.h"
diff --git a/source/blender/blenkernel/intern/gpencil_geom.c b/source/blender/blenkernel/intern/gpencil_geom.c
index 85b02d2ba3b..df755e96216 100644
--- a/source/blender/blenkernel/intern/gpencil_geom.c
+++ b/source/blender/blenkernel/intern/gpencil_geom.c
@@ -42,6 +42,7 @@
 
 #include "DNA_gpencil_modifier_types.h"
 #include "DNA_gpencil_types.h"
+#include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/blenkernel/intern/idprop_utils.c b/source/blender/blenkernel/intern/idprop_utils.c
index f8a1113f69b..433f0e97844 100644
--- a/source/blender/blenkernel/intern/idprop_utils.c
+++ b/source/blender/blenkernel/intern/idprop_utils.c
@@ -26,6 +26,8 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
+#include "DNA_ID.h"
+
 #include "BKE_idprop.h"
 #include "BKE_idtype.h"
 
diff --git a/source/blender/blenkernel/intern/idtype.c b/source/blender/blenkernel/intern/idtype.c
index 44bf8f0e4db..1889d1c4eb0 100644
--- a/source/blender/blenkernel/intern/idtype.c
+++ b/source/blender/blenkernel/intern/idtype.c
@@ -36,6 +36,7 @@
 #include "BLT_translation.h"
 
 #include "DNA_ID.h"
+#include "DNA_collection_types.h"
 #include "DNA_node_types.h"
 #include "DNA_scene_types.h"
 
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index f72cce8ba2e..228aed265cf 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -54,6 +54,7 @@
 #include "DNA_camera_types.h"
 #include "DNA_defaults.h"
 #include "DNA_light_types.h"
+#include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index 21a77e2b45a..8113417b55f 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -37,6 +37,7 @@
 /* all types are needed here, in order to do memory operations */
 #include "DNA_ID.h"
 #include "DNA_anim_types.h"
+#include "DNA_collection_types.h"
 #include "DNA_gpencil_types.h"
 #include "DNA_key_types.h"
 #include "DNA_node_types.h"
diff --git a/source/blender/blenkernel/intern/lib_remap.c b/source/blender/blenkernel/intern/lib_remap.c
index f0031d4191d..56f7bb0be6f 100644
--- a/source/blender/blenkernel/intern/lib_remap.c
+++ b/source/blender/blenkernel/intern/lib_remap.c
@@ -24,6 +24,7 @@
 
 #include "BLI_utildefines.h"
 
+#include "DNA_collection_types.h"
 #include "DNA_object_types.h"
 
 #include "BKE_armature.h"
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 3496e05c6e5..418fe0a9502 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -38,6 +38,7 @@
 
 #include "DNA_armature_types.h"
 #include "DNA_cloth_types.h"
+#include "DNA_dynamicpaint_types.h"
 #include "DNA_fluid_types.h"
 #include "DNA_gpencil_modifier_types.h"
 #include "DNA_mesh_types.h"
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index a90d2ea36c9..a9a1740f4a8 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -35,6 +35,7 @@
 
 #include "DNA_action_types.h"
 #include "DNA_anim_types.h"
+#include "DNA_collection_types.h"
 #include "DNA_gpencil_types.h"
 #include "DNA_light_types.h"
 #include "DNA_linestyle_types.h"
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index f11e7bc429d..8764232e56b 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -38,6 +38,7 @@
 #include "DNA_collection_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_defaults.h"
+#include "DNA_dynamicpaint_types.h"
 #include "DNA_effect_types.h"
 #include "DNA_fluid_types.h"
 #include "DNA_gpencil_modifier_types.h"
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 915ee56e2f7..1b4dc98252a 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -28,6 +28,7 @@
 #include "DNA_key_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_modifier_types.h"
 #include "DNA_scene_types.h"
 
 #include "BLI_blenlib.h"
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index d516de535f9..dce45f44583 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -41,6 +41,7 @@
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
+#include "DNA_object_force_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
 
diff --git a/source/blender/blenkernel/intern/particle_child.c b/source/blender/blenkernel/intern/particle_child.c
index 98a55c3de95..6e0965650d3 100644
--- a/source/blender/blenkernel/intern/particle_child.c
+++ b/source/blender/blenkernel/intern/particle_child.c
@@ -25,6 +25,7 @@
 #include "BLI_noise.h"
 
 #include "DNA_material_types.h"
+#include "DNA_object_types.h"
 
 #include "BKE_colortools.h"
 #include "BKE_particle.h"
diff --git a/source/blender/blenkernel/intern/particle_distribute.c b/source/blender/blenkernel/intern/particle_distribute.c
index 194593be4ff..c3cc9136057 100644
--- a/source/blender/blenkernel/intern/particle_distribute.c
+++ b/source/blender/blenkernel/intern/particle_distribute.c
@@ -40,6 +40,7 @@
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
 
+#include "BKE_customdata.h"
 #include "BKE_global.h"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.h"
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 79ce6769160..71df28c8b42 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -34,6 +34,7 @@
 
 #include "DNA_anim_types.h"
 #include "DNA_boid_types.h"
+#include "DNA_cloth_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_listBase.h"
 #include "DNA_mesh_types.h"
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index bed10df5ace..f63d443d29f 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -37,6 +37,7 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_linestyle_types.h"
 #include "DNA_mask_types.h"
+#include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
@@ -47,6 +48,7 @@
 #include "DNA_sound_types.h"
 #include "DNA_space_types.h"
 #include "DNA_text_types.h"
+#include "DNA_vfont_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_windowmanager_types.h"
 #include "DNA_workspace_types.h"
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index 355db8f0d60..ae817c46931 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -34,6 +34,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_collection_types.h"
 #include "DNA_defaults.h"
 #include "DNA_gpencil_types.h"
 #include "DNA_mask_types.h"
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 25d812884bc..cf02dd4d160 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -52,6 +52,7 @@
 #include "DNA_lattice_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
+#include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
@@ -149,7 +150,7 @@ typedef struct SB_thread_context {
 #define BSF_INTERSECT 1 /* edge intersects collider face */
 
 /* private definitions for bodypoint states */
-#define SBF_DOFUZZY 1        /* Bodypoint do fuzzy */
+#define SBF_DOFUZZY 1 /* Bodypoint do fuzzy */
 #define SBF_OUTOFCOLLISION 2 /* Bodypoint does not collide  */
 
 #define BFF_INTERSECT 1 /* collider edge   intrudes face */
diff --git a/source/blender/blenkernel/particle_private.h b/source/blender/blenkernel/particle_private.h
index 33277d1caac..1c183aab3b7 100644
--- a/source/blender/blenkernel/particle_private.h
+++ b/source/blender/blenkernel/particle_private.h
@@ -27,6 +27,8 @@
 extern "C" {
 #endif
 
+struct CurveMapping;
+
 typedef struct ParticleChildModifierContext {
   ParticleThreadContext *thread_ctx;
   ParticleSimulationData *sim;
@@ -62,7 +64,7 @@ float do_clump(ParticleKey *state,
                float pa_clump,
                bool use_clump_noise,
                float clump_noise_size,
-               CurveMapping *clumpcurve);
+               struct CurveMapping *clumpcurve);
 void do_child_modifiers(const ParticleChildModifierContext *modifier_ctx,
                         float mat[4][4],
                         ParticleKey *state,