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.

1 files changed, 11 insertions, 10 deletions

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
 }