Cleanup: redundant struct declarations

49 files changed, 4 insertions, 103 deletions

diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index f6bf516d8db..2145a673e45 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -79,12 +79,10 @@ struct CustomData_MeshMasks;
 struct Depsgraph;
 struct MEdge;
 struct MFace;
-struct MLoopNorSpaceArray;
 struct MVert;
 struct Mesh;
 struct ModifierData;
 struct Object;
-struct PBVH;
 struct Scene;
 
 /*
diff --git a/source/blender/blenkernel/BKE_anim.h b/source/blender/blenkernel/BKE_anim.h
index dab76fb79f1..dce6f337885 100644
--- a/source/blender/blenkernel/BKE_anim.h
+++ b/source/blender/blenkernel/BKE_anim.h
@@ -24,7 +24,6 @@
  */
 struct Depsgraph;
 struct ListBase;
-struct Main;
 struct Object;
 struct ParticleSystem;
 struct Path;
diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h
index fa8e294bdc1..a2a14011595 100644
--- a/source/blender/blenkernel/BKE_animsys.h
+++ b/source/blender/blenkernel/BKE_animsys.h
@@ -34,7 +34,6 @@ struct KeyingSet;
 struct ListBase;
 struct Main;
 struct NlaKeyframingContext;
-struct PathResolvedRNA;
 struct PointerRNA;
 struct PropertyRNA;
 struct ReportList;
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index ee6336a98db..3beae7a1f9d 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -25,7 +25,6 @@
 
 struct Bone;
 struct Depsgraph;
-struct GHash;
 struct ListBase;
 struct Main;
 struct Object;
diff --git a/source/blender/blenkernel/BKE_blender_undo.h b/source/blender/blenkernel/BKE_blender_undo.h
index 6c2221326e9..7392d3947a2 100644
--- a/source/blender/blenkernel/BKE_blender_undo.h
+++ b/source/blender/blenkernel/BKE_blender_undo.h
@@ -26,7 +26,6 @@ extern "C" {
 
 struct Main;
 struct MemFileUndoData;
-struct Scene;
 struct bContext;
 
 #define BKE_UNDO_STR_MAX 64
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h
index eeebfe1f2f6..26ab7f8ba0c 100644
--- a/source/blender/blenkernel/BKE_brush.h
+++ b/source/blender/blenkernel/BKE_brush.h
@@ -28,8 +28,6 @@ struct Brush;
 struct ImBuf;
 struct ImagePool;
 struct Main;
-struct Material;
-struct Paint;
 struct Scene;
 struct ToolSettings;
 struct UnifiedPaintSettings;
diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h
index a2d45625f42..fdcb4066482 100644
--- a/source/blender/blenkernel/BKE_bvhutils.h
+++ b/source/blender/blenkernel/BKE_bvhutils.h
@@ -31,7 +31,6 @@
  */
 
 struct BMEditMesh;
-struct DerivedMesh;
 struct MFace;
 struct MVert;
 struct Mesh;
diff --git a/source/blender/blenkernel/BKE_cachefile.h b/source/blender/blenkernel/BKE_cachefile.h
index 257975e3c17..c8393fd3666 100644
--- a/source/blender/blenkernel/BKE_cachefile.h
+++ b/source/blender/blenkernel/BKE_cachefile.h
@@ -33,7 +33,6 @@ struct CacheReader;
 struct Depsgraph;
 struct Main;
 struct Object;
-struct Scene;
 
 void BKE_cachefiles_init(void);
 void BKE_cachefiles_exit(void);
diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h
index caed4959eff..da80b3d5032 100644
--- a/source/blender/blenkernel/BKE_camera.h
+++ b/source/blender/blenkernel/BKE_camera.h
@@ -32,14 +32,12 @@ extern "C" {
 
 struct Camera;
 struct Depsgraph;
-struct GPUFXSettings;
 struct Main;
 struct Object;
 struct RegionView3D;
 struct RenderData;
 struct Scene;
 struct View3D;
-struct ViewLayer;
 struct rctf;
 
 /* Camera Datablock */
diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h
index 43df78c33e4..01f94c39215 100644
--- a/source/blender/blenkernel/BKE_cloth.h
+++ b/source/blender/blenkernel/BKE_cloth.h
@@ -29,7 +29,6 @@
 struct ClothModifierData;
 struct CollisionModifierData;
 struct Depsgraph;
-struct MFace;
 struct Mesh;
 struct Object;
 struct Scene;
diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h
index 0ab101f065d..757b1c64db3 100644
--- a/source/blender/blenkernel/BKE_collection.h
+++ b/source/blender/blenkernel/BKE_collection.h
@@ -35,8 +35,6 @@ extern "C" {
 struct BLI_Iterator;
 struct Base;
 struct Collection;
-struct Depsgraph;
-struct ID;
 struct Main;
 struct Object;
 struct Scene;
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h
index 291502a0c28..5d7a5094eb5 100644
--- a/source/blender/blenkernel/BKE_collision.h
+++ b/source/blender/blenkernel/BKE_collision.h
@@ -37,11 +37,9 @@
 struct Collection;
 struct CollisionModifierData;
 struct Depsgraph;
-struct MFace;
 struct MVert;
 struct MVertTri;
 struct Object;
-struct Scene;
 
 ////////////////////////////////////////
 // used for collisions in collision.c
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index bfcfd753975..6bd7440eeea 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -33,7 +33,6 @@ extern "C" {
 
 struct ARegion;
 struct Base;
-struct Brush;
 struct CacheFile;
 struct Collection;
 struct Depsgraph;
@@ -59,7 +58,6 @@ struct Text;
 struct ToolSettings;
 struct View3D;
 struct ViewLayer;
-struct ViewRender;
 struct bGPDframe;
 struct bGPDlayer;
 struct bGPdata;
diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h
index af783a6ae8a..be49ca150b2 100644
--- a/source/blender/blenkernel/BKE_curve.h
+++ b/source/blender/blenkernel/BKE_curve.h
@@ -26,15 +26,12 @@
 struct BezTriple;
 struct Curve;
 struct Depsgraph;
-struct EditNurb;
 struct GHash;
-struct LinkNode;
 struct ListBase;
 struct Main;
 struct Nurb;
 struct Object;
 struct Path;
-struct Scene;
 struct TextBox;
 struct rctf;
 
diff --git a/source/blender/blenkernel/BKE_displist.h b/source/blender/blenkernel/BKE_displist.h
index c57639a8193..cfacbfe0a21 100644
--- a/source/blender/blenkernel/BKE_displist.h
+++ b/source/blender/blenkernel/BKE_displist.h
@@ -49,9 +49,7 @@ enum {
 /* prototypes */
 
 struct Depsgraph;
-struct LinkNode;
 struct ListBase;
-struct Main;
 struct Mesh;
 struct Object;
 struct Scene;
diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h
index c4f05d404ce..734bfbc019a 100644
--- a/source/blender/blenkernel/BKE_dynamicpaint.h
+++ b/source/blender/blenkernel/BKE_dynamicpaint.h
@@ -25,9 +25,7 @@ struct Depsgraph;
 struct DynamicPaintCanvasSettings;
 struct DynamicPaintModifierData;
 struct DynamicPaintRuntime;
-struct Main;
 struct Scene;
-struct ViewLayer;
 
 /* Actual surface point */
 typedef struct PaintSurfaceData {
diff --git a/source/blender/blenkernel/BKE_editmesh.h b/source/blender/blenkernel/BKE_editmesh.h
index c4f02dea5c7..062968eddfc 100644
--- a/source/blender/blenkernel/BKE_editmesh.h
+++ b/source/blender/blenkernel/BKE_editmesh.h
@@ -31,7 +31,6 @@
 struct BMLoop;
 struct BMesh;
 struct Depsgraph;
-struct DerivedMesh;
 struct EditMeshData;
 struct Mesh;
 struct MeshStatVis;
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index a05c3d68e3a..f1cf87ea1b5 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -24,31 +24,23 @@
  * \ingroup bke
  */
 
-struct Scene;
-struct ArrayGpencilModifierData;
 struct BoundBox;
 struct Brush;
 struct CurveMapping;
 struct Depsgraph;
-struct GpencilModifierData;
-struct LatticeGpencilModifierData;
 struct ListBase;
 struct Main;
 struct Material;
 struct Object;
-struct SimplifyGpencilModifierData;
 struct ToolSettings;
 struct bDeformGroup;
 struct bGPDframe;
 struct bGPDlayer;
-struct bGPDpalette;
-struct bGPDpalettecolor;
 struct bGPDspoint;
 struct bGPDstroke;
 struct bGPdata;
 
 struct MDeformVert;
-struct MDeformWeight;
 
 #define GPENCIL_SIMPLIFY(scene) ((scene->r.simplify_gpencil & SIMPLIFY_GPENCIL_ENABLE))
 #define GPENCIL_SIMPLIFY_ONPLAY(playing) \
diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h
index c2a4462dcbd..36f38996c36 100644
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@ -24,22 +24,16 @@
 #include "BLI_compiler_attrs.h"
 #include "BKE_customdata.h"
 
-struct BMEditMesh;
-struct DepsNodeHandle;
 struct Depsgraph;
 struct GpencilModifierData;
 struct ID;
 struct ListBase;
 struct Main;
-struct Mesh;
 struct ModifierUpdateDepsgraphContext;
 struct Object;
 struct Scene;
-struct ViewLayer;
-struct bArmature;
 /* NOTE: bakeModifier() called from UI:
  * needs to create new databloc-ks, hence the need for this. */
-struct bContext;
 struct bGPDframe;
 struct bGPDlayer;
 struct bGPDstroke;
diff --git a/source/blender/blenkernel/BKE_image_save.h b/source/blender/blenkernel/BKE_image_save.h
index 26c377a2574..8dfece944ff 100644
--- a/source/blender/blenkernel/BKE_image_save.h
+++ b/source/blender/blenkernel/BKE_image_save.h
@@ -31,7 +31,6 @@ extern "C" {
 
 struct Image;
 struct Main;
-struct RenderResult;
 struct ReportList;
 struct Scene;
 
diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h
index 6e34f4f07d9..477a22b07bb 100644
--- a/source/blender/blenkernel/BKE_key.h
+++ b/source/blender/blenkernel/BKE_key.h
@@ -31,7 +31,6 @@ struct ListBase;
 struct Main;
 struct Mesh;
 struct Object;
-struct WeightsArrayCache;
 
 /* Kernel prototypes */
 #ifdef __cplusplus
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index daac35a1196..eb65b7641e1 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -37,17 +37,12 @@ extern "C" {
 struct Base;
 struct Collection;
 struct Depsgraph;
-struct ID;
-struct IDProperty;
 struct LayerCollection;
-struct ListBase;
 struct Main;
 struct Object;
-struct RenderEngine;
 struct Scene;
 struct View3D;
 struct ViewLayer;
-struct WorkSpace;
 
 struct ViewLayer *BKE_view_layer_default_view(const struct Scene *scene);
 struct ViewLayer *BKE_view_layer_default_render(const struct Scene *scene);
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h
index c0ac71f9c96..c8d85cd0c87 100644
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@ -46,17 +46,14 @@ extern "C" {
  * except in some specific cases requiring advanced (and potentially dangerous) handling.
  */
 
-struct BlendThumbnail;
 struct GHash;
 struct ID;
-struct ImBuf;
 struct Library;
 struct ListBase;
 struct Main;
 struct PointerRNA;
 struct PropertyRNA;
 struct bContext;
-struct wmWindowManager;
 
 size_t BKE_libblock_get_alloc_info(short type, const char **name);
 void *BKE_libblock_alloc_notest(short type) ATTR_WARN_UNUSED_RESULT;
diff --git a/source/blender/blenkernel/BKE_library_remap.h b/source/blender/blenkernel/BKE_library_remap.h
index d51bc5c2bce..917582e385a 100644
--- a/source/blender/blenkernel/BKE_library_remap.h
+++ b/source/blender/blenkernel/BKE_library_remap.h
@@ -25,6 +25,8 @@ extern "C" {
 
 #include "BLI_compiler_attrs.h"
 
+struct wmWindowManager;
+
 /* BKE_libblock_free, delete are declared in BKE_library.h for convenience. */
 
 /* Also IDRemap->flag. */
diff --git a/source/blender/blenkernel/BKE_light.h b/source/blender/blenkernel/BKE_light.h
index 72bd5857526..e060f587afe 100644
--- a/source/blender/blenkernel/BKE_light.h
+++ b/source/blender/blenkernel/BKE_light.h
@@ -32,7 +32,6 @@ extern "C" {
 
 struct Light;
 struct Main;
-struct Scene;
 
 void BKE_light_init(struct Light *la);
 struct Light *BKE_light_add(struct Main *bmain, const char *name) ATTR_WARN_UNUSED_RESULT;
diff --git a/source/blender/blenkernel/BKE_linestyle.h b/source/blender/blenkernel/BKE_linestyle.h
index 79579b43446..b8950e5df88 100644
--- a/source/blender/blenkernel/BKE_linestyle.h
+++ b/source/blender/blenkernel/BKE_linestyle.h
@@ -38,7 +38,6 @@ extern "C" {
 
 struct ColorBand;
 struct Main;
-struct Object;
 struct ViewLayer;
 struct bContext;
 
diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h
index 1c987d5eb8e..1b2e8bcbf42 100644
--- a/source/blender/blenkernel/BKE_main.h
+++ b/source/blender/blenkernel/BKE_main.h
@@ -40,7 +40,6 @@ extern "C" {
 
 struct BLI_mempool;
 struct BlendThumbnail;
-struct Depsgraph;
 struct GHash;
 struct GSet;
 struct ImBuf;
diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h
index f87c73e35a2..47644ce82e9 100644
--- a/source/blender/blenkernel/BKE_mask.h
+++ b/source/blender/blenkernel/BKE_mask.h
@@ -38,7 +38,6 @@ struct MaskSplinePoint;
 struct MaskSplinePointUW;
 struct MovieClip;
 struct MovieClipUser;
-struct Scene;
 
 /* mask_ops.c */
 typedef enum {
diff --git a/source/blender/blenkernel/BKE_mball_tessellate.h b/source/blender/blenkernel/BKE_mball_tessellate.h
index ab8fbc44caf..39740458f2f 100644
--- a/source/blender/blenkernel/BKE_mball_tessellate.h
+++ b/source/blender/blenkernel/BKE_mball_tessellate.h
@@ -20,7 +20,6 @@
  * \ingroup bke
  */
 struct Depsgraph;
-struct Main;
 struct Object;
 struct Scene;
 
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 53b7b16057a..15df0cff6fc 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -53,13 +53,11 @@ struct MLoopTri;
 struct MLoopUV;
 struct MPoly;
 struct MVert;
-struct MVertTri;
 struct Main;
 struct MemArena;
 struct Mesh;
 struct ModifierData;
 struct Object;
-struct ReportList;
 struct Scene;
 
 #ifdef __cplusplus
diff --git a/source/blender/blenkernel/BKE_mesh_iterators.h b/source/blender/blenkernel/BKE_mesh_iterators.h
index 28fd4b8bc28..b5b65944079 100644
--- a/source/blender/blenkernel/BKE_mesh_iterators.h
+++ b/source/blender/blenkernel/BKE_mesh_iterators.h
@@ -20,12 +20,6 @@
  * \ingroup bke
  */
 
-struct MEdge;
-struct MLoop;
-struct MLoopTri;
-struct MLoopUV;
-struct MPoly;
-struct MVert;
 struct Mesh;
 
 typedef enum MeshForeachFlag {
diff --git a/source/blender/blenkernel/BKE_mesh_runtime.h b/source/blender/blenkernel/BKE_mesh_runtime.h
index 93d952bcae5..4dc9ac988e7 100644
--- a/source/blender/blenkernel/BKE_mesh_runtime.h
+++ b/source/blender/blenkernel/BKE_mesh_runtime.h
@@ -27,7 +27,6 @@
 
 //#include "BKE_customdata.h"  /* for CustomDataMask */
 
-struct ColorBand;
 struct CustomData;
 struct CustomData_MeshMasks;
 struct Depsgraph;
diff --git a/source/blender/blenkernel/BKE_mesh_tangent.h b/source/blender/blenkernel/BKE_mesh_tangent.h
index bca825ce91c..4a86dfa3832 100644
--- a/source/blender/blenkernel/BKE_mesh_tangent.h
+++ b/source/blender/blenkernel/BKE_mesh_tangent.h
@@ -20,6 +20,8 @@
  * \ingroup bke
  */
 
+struct ReportList;
+
 void BKE_mesh_calc_loop_tangent_single_ex(const struct MVert *mverts,
                                           const int numVerts,
                                           const struct MLoop *mloops,
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 4aab2a346e7..b2bc30c107c 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -35,7 +35,6 @@ struct Mesh;
 struct ModifierData;
 struct Object;
 struct Scene;
-struct ViewLayer;
 struct bArmature;
 
 typedef enum {
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index e3d0588b607..efc4e4fdc12 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -59,7 +59,6 @@ struct RenderData;
 struct Scene;
 struct SpaceNode;
 struct Tex;
-struct ViewRender;
 struct bContext;
 struct bNode;
 struct bNodeExecContext;
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index f59bf3579be..cf4bce3a209 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -43,7 +43,6 @@ struct RegionView3D;
 struct RigidBodyWorld;
 struct Scene;
 struct ShaderFxData;
-struct SoftBody;
 struct View3D;
 struct ViewLayer;
 
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 37667599488..8db27bd4118 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -32,7 +32,6 @@ struct Depsgraph;
 struct EnumPropertyItem;
 struct GridPaintMask;
 struct ImagePool;
-struct MFace;
 struct MLoop;
 struct MLoopTri;
 struct MVert;
@@ -47,7 +46,6 @@ struct Palette;
 struct PaletteColor;
 struct ReportList;
 struct Scene;
-struct Sculpt;
 struct StrokeCache;
 struct SubdivCCG;
 struct SubdivCCG;
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index 164dbbbf482..e9b4c2b5a66 100644
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -57,7 +57,6 @@ struct ModifierData;
 struct Object;
 struct RNG;
 struct Scene;
-struct ViewLayer;
 
 #define PARTICLE_COLLISION_MAX_COLLISIONS 10
 
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 245345d9f1d..93a826f3324 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -28,12 +28,10 @@
 
 struct BMLog;
 struct BMesh;
-struct CCGDerivedMesh;
 struct CCGElem;
 struct CCGKey;
 struct CustomData;
 struct DMFlagMat;
-struct GPUBatch;
 struct GPU_PBVH_Buffers;
 struct IsectRayPrecalc;
 struct MLoop;
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index 83477a71d17..d25288fc240 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -38,8 +38,6 @@ struct TransformOrientation;
 struct UnitSettings;
 struct View3DCursor;
 struct ViewLayer;
-struct ViewRender;
-struct WorkSpace;
 
 typedef enum eSceneCopyMethod {
   SCE_COPY_NEW = 0,
diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h
index 5d3e7ad5ec2..a2ce522a895 100644
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@ -24,7 +24,6 @@
  */
 
 struct ARegion;
-struct GPUFXSettings;
 struct Header;
 struct ID;
 struct ListBase;
@@ -35,7 +34,6 @@ struct ScrArea;
 struct ScrAreaMap;
 struct ScrVert;
 struct SpaceType;
-struct TransformOrientation;
 struct View3D;
 struct View3DShading;
 struct WorkSpace;
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h
index a9e1dfb2392..e1bc16702d5 100644
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@ -26,13 +26,11 @@
 
 struct Depsgraph;
 struct Editing;
-struct GPUFX;
 struct GPUOffScreen;
 struct GSet;
 struct ImBuf;
 struct Main;
 struct Mask;
-struct RenderEngineType;
 struct Scene;
 struct Sequence;
 struct SequenceModifierData;
diff --git a/source/blender/blenkernel/BKE_shader_fx.h b/source/blender/blenkernel/BKE_shader_fx.h
index e90dbfcf68d..9fe42a214e9 100644
--- a/source/blender/blenkernel/BKE_shader_fx.h
+++ b/source/blender/blenkernel/BKE_shader_fx.h
@@ -24,22 +24,11 @@
 #include "BLI_compiler_attrs.h"
 #include "BKE_customdata.h"
 
-struct DepsNodeHandle;
-struct Depsgraph;
-struct DerivedMesh;
 struct ID;
 struct ListBase;
-struct Main;
-struct Mesh;
 struct ModifierUpdateDepsgraphContext;
 struct Object;
-struct Scene;
 struct ShaderFxData;
-struct ViewLayer;
-struct bArmature;
-struct bGPDframe;
-struct bGPDlayer;
-struct bGPDstroke;
 
 #define SHADER_FX_ACTIVE(_fx, _is_render) \
   (((_fx->mode & eShaderFxMode_Realtime) && (_is_render == false)) || \
diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h
index 8993654254e..9ec75c39fcf 100644
--- a/source/blender/blenkernel/BKE_shrinkwrap.h
+++ b/source/blender/blenkernel/BKE_shrinkwrap.h
@@ -41,7 +41,6 @@
 
 struct BVHTree;
 struct MDeformVert;
-struct MVert;
 struct Mesh;
 struct ModifierEvalContext;
 struct Object;
diff --git a/source/blender/blenkernel/BKE_subdiv.h b/source/blender/blenkernel/BKE_subdiv.h
index dd139233ee3..700bf5139e0 100644
--- a/source/blender/blenkernel/BKE_subdiv.h
+++ b/source/blender/blenkernel/BKE_subdiv.h
@@ -29,12 +29,10 @@
 
 struct Mesh;
 struct MultiresModifierData;
-struct Object;
 struct OpenSubdiv_Converter;
 struct OpenSubdiv_Evaluator;
 struct OpenSubdiv_TopologyRefiner;
 struct Subdiv;
-struct SubdivToMeshSettings;
 
 typedef enum eSubdivVtxBoundaryInterpolation {
   /* Do not interpolate boundaries. */
diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h
index c17db591981..39216e98e82 100644
--- a/source/blender/blenkernel/BKE_texture.h
+++ b/source/blender/blenkernel/BKE_texture.h
@@ -31,17 +31,13 @@ struct Brush;
 struct ColorBand;
 struct FreestyleLineStyle;
 struct ImagePool;
-struct Light;
 struct MTex;
 struct Main;
-struct Material;
 struct ParticleSettings;
 struct PointDensity;
 struct Tex;
 struct TexMapping;
 struct TexResult;
-struct World;
-struct bNode;
 
 /*  in ColorBand struct */
 #define MAXCOLORBAND 32
diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h
index bf417403d43..c64d684de5a 100644
--- a/source/blender/blenkernel/BKE_tracking.h
+++ b/source/blender/blenkernel/BKE_tracking.h
@@ -25,7 +25,6 @@
  */
 
 struct Camera;
-struct Depsgraph;
 struct ImBuf;
 struct ListBase;
 struct MovieClipUser;
diff --git a/source/blender/blenkernel/BKE_workspace.h b/source/blender/blenkernel/BKE_workspace.h
index 133cf2d6cf5..ea8978b7374 100644
--- a/source/blender/blenkernel/BKE_workspace.h
+++ b/source/blender/blenkernel/BKE_workspace.h
@@ -24,9 +24,6 @@
 #include "BLI_compiler_attrs.h"
 
 struct Main;
-struct Scene;
-struct TransformOrientation;
-struct ViewLayer;
 struct bScreen;
 struct bToolRef;
 
diff --git a/source/blender/blenkernel/nla_private.h b/source/blender/blenkernel/nla_private.h
index 1705cd4effc..ed653182a3e 100644
--- a/source/blender/blenkernel/nla_private.h
+++ b/source/blender/blenkernel/nla_private.h
@@ -24,8 +24,6 @@
 #ifndef __NLA_PRIVATE_H__
 #define __NLA_PRIVATE_H__
 
-struct Depsgraph;
-
 #include "RNA_types.h"
 #include "BLI_bitmap.h"
 #include "BLI_ghash.h"