Cleanup: redundant struct declarations

149 files changed, 10 insertions, 308 deletions

diff --git a/source/blender/alembic/intern/abc_mball.h b/source/blender/alembic/intern/abc_mball.h
index 770fa6fdf8c..4be977fa8f5 100644
--- a/source/blender/alembic/intern/abc_mball.h
+++ b/source/blender/alembic/intern/abc_mball.h
@@ -24,9 +24,7 @@
 #include "abc_object.h"
 #include "abc_mesh.h"
 
-struct EvaluationContext;
 struct Main;
-struct MetaBall;
 struct Object;
 
 /* AbcMBallWriter converts the metaballs to meshes at every frame,
diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h
index f7f662212fd..5eb0ed70599 100644
--- a/source/blender/alembic/intern/abc_util.h
+++ b/source/blender/alembic/intern/abc_util.h
@@ -44,7 +44,6 @@ using Alembic::Abc::chrono_t;
 class AbcObjectReader;
 struct ImportSettings;
 
-struct Base;
 struct ID;
 struct Object;
 
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"
diff --git a/source/blender/blenlib/BLI_dynstr.h b/source/blender/blenlib/BLI_dynstr.h
index 72a6a1b0150..87e58d90d3f 100644
--- a/source/blender/blenlib/BLI_dynstr.h
+++ b/source/blender/blenlib/BLI_dynstr.h
@@ -35,7 +35,6 @@
 #include "BLI_compiler_attrs.h"
 
 struct DynStr;
-struct MemArena;
 
 /** The abstract DynStr type */
 typedef struct DynStr DynStr;
diff --git a/source/blender/blenlib/BLI_memiter.h b/source/blender/blenlib/BLI_memiter.h
index 6f6316e15e4..9f5be292dd8 100644
--- a/source/blender/blenlib/BLI_memiter.h
+++ b/source/blender/blenlib/BLI_memiter.h
@@ -33,7 +33,6 @@ extern "C" {
 #define BLI_MEMITER_DEFAULT_SIZE (1 << 19)
 
 struct BLI_memiter;
-struct BLI_memiter_chunk;
 
 typedef struct BLI_memiter BLI_memiter;
 
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h
index 99e86615e50..75d5cb286ac 100644
--- a/source/blender/blenlib/BLI_path_util.h
+++ b/source/blender/blenlib/BLI_path_util.h
@@ -29,8 +29,6 @@ extern "C" {
 
 #include "BLI_compiler_attrs.h"
 
-struct ListBase;
-
 void BLI_setenv(const char *env, const char *val) ATTR_NONNULL(1);
 void BLI_setenv_if_new(const char *env, const char *val) ATTR_NONNULL(1);
 const char *BLI_getenv(const char *env) ATTR_NONNULL(1);
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h
index 8944dfdb711..adf3bf00d48 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -41,7 +41,6 @@ struct UserDef;
 struct View3D;
 struct ViewLayer;
 struct WorkSpace;
-struct bContext;
 struct bScreen;
 struct wmWindowManager;
 
diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h
index 27474cc2b58..2be2dadeeeb 100644
--- a/source/blender/collada/AnimationExporter.h
+++ b/source/blender/collada/AnimationExporter.h
@@ -78,8 +78,6 @@ extern "C" {
 #include <map>
 #include <algorithm>  // std::find
 
-struct Depsgraph;
-
 typedef enum BC_animation_source_type {
   BC_SOURCE_TYPE_VALUE,
   BC_SOURCE_TYPE_ANGLE,
diff --git a/source/blender/collada/ControllerExporter.h b/source/blender/collada/ControllerExporter.h
index 200f8431f62..ce2ed9fe453 100644
--- a/source/blender/collada/ControllerExporter.h
+++ b/source/blender/collada/ControllerExporter.h
@@ -47,7 +47,6 @@
 
 #include "BKE_key.h"
 
-struct Depsgraph;
 class SceneExporter;
 
 class ControllerExporter : public COLLADASW::LibraryControllers,
diff --git a/source/blender/collada/GeometryExporter.h b/source/blender/collada/GeometryExporter.h
index 7262784db82..55f7251c538 100644
--- a/source/blender/collada/GeometryExporter.h
+++ b/source/blender/collada/GeometryExporter.h
@@ -39,8 +39,6 @@
 #include "BlenderContext.h"
 #include "BKE_key.h"
 
-struct Depsgraph;
-
 class Normal {
  public:
   float x;
diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h
index df6e72cbf3a..72753e170a3 100644
--- a/source/blender/collada/collada.h
+++ b/source/blender/collada/collada.h
@@ -34,9 +34,6 @@ extern "C" {
 #include "BLI_path_util.h"
 #include "RNA_types.h"
 
-struct Depsgraph;
-struct Scene;
-struct ViewLayer;
 struct bContext;
 
 /*
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h
index c23e33df76d..c0425e59d1a 100644
--- a/source/blender/collada/collada_utils.h
+++ b/source/blender/collada/collada_utils.h
@@ -69,8 +69,6 @@ extern "C" {
 
 constexpr int LIMITTED_PRECISION = 6;
 
-struct Depsgraph;
-
 typedef std::map<COLLADAFW::UniqueId, Image *> UidImageMap;
 typedef std::map<std::string, Image *> KeyImageMap;
 typedef std::map<COLLADAFW::TextureMapId, std::vector<MTex *>> TexIndexTextureArrayMap;
diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.h
index bdcb4061096..fd12f90016b 100644
--- a/source/blender/depsgraph/DEG_depsgraph.h
+++ b/source/blender/depsgraph/DEG_depsgraph.h
@@ -55,9 +55,6 @@ typedef struct Depsgraph Depsgraph;
 
 struct Main;
 
-struct PointerRNA;
-struct PropertyRNA;
-struct RenderEngineType;
 struct Scene;
 struct ViewLayer;
 
diff --git a/source/blender/depsgraph/DEG_depsgraph_build.h b/source/blender/depsgraph/DEG_depsgraph_build.h
index 18e06410adf..37dfaf2c3e2 100644
--- a/source/blender/depsgraph/DEG_depsgraph_build.h
+++ b/source/blender/depsgraph/DEG_depsgraph_build.h
@@ -34,12 +34,9 @@ struct Depsgraph;
 /* ------------------------------------------------ */
 
 struct CacheFile;
-struct Collection;
 struct CustomData_MeshMasks;
-struct EffectorWeights;
 struct ID;
 struct Main;
-struct ModifierData;
 struct Object;
 struct Scene;
 struct ViewLayer;
diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.h
index e3381e79e9c..82f7f33411a 100644
--- a/source/blender/depsgraph/DEG_depsgraph_query.h
+++ b/source/blender/depsgraph/DEG_depsgraph_query.h
@@ -32,14 +32,13 @@
 /* Needed for the instance iterator. */
 #include "DNA_object_types.h"
 
-struct ID;
-
 struct BLI_Iterator;
-struct Base;
 struct CustomData_MeshMasks;
 struct Depsgraph;
 struct DupliObject;
+struct ID;
 struct ListBase;
+struct PointerRNA;
 struct Scene;
 struct ViewLayer;
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_map.h b/source/blender/depsgraph/intern/builder/deg_builder_map.h
index 0767837a587..65b493e2467 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_map.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_map.h
@@ -25,7 +25,6 @@
 
 #include "intern/depsgraph_type.h"
 
-struct GSet;
 struct ID;
 
 namespace DEG {
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
index de9f0e4d6cd..65f3521b556 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
@@ -31,7 +31,6 @@
 
 #include "DEG_depsgraph.h"
 
-struct Base;
 struct CacheFile;
 struct Camera;
 struct Collection;
@@ -44,14 +43,12 @@ struct LayerCollection;
 struct Light;
 struct LightProbe;
 struct ListBase;
-struct MTex;
 struct Main;
 struct Mask;
 struct Material;
 struct MovieClip;
 struct Object;
 struct ParticleSettings;
-struct Probe;
 struct Scene;
 struct Speaker;
 struct Tex;
@@ -64,15 +61,12 @@ struct bNodeTree;
 struct bPoseChannel;
 struct bSound;
 
-struct PropertyRNA;
-
 namespace DEG {
 
 struct ComponentNode;
 struct Depsgraph;
 class DepsgraphBuilderCache;
 struct IDNode;
-struct Node;
 struct OperationNode;
 struct TimeSourceNode;
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index 0e15818622f..e58ef989ac9 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -51,7 +51,6 @@ struct Camera;
 struct Collection;
 struct EffectorWeights;
 struct FCurve;
-struct GHash;
 struct ID;
 struct Image;
 struct Key;
@@ -59,11 +58,9 @@ struct LayerCollection;
 struct Light;
 struct LightProbe;
 struct ListBase;
-struct MTex;
 struct Main;
 struct Mask;
 struct Material;
-struct ModifierData;
 struct MovieClip;
 struct Object;
 struct ParticleSettings;
diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.h
index 15ce57cb169..96b1a2a1f8a 100644
--- a/source/blender/depsgraph/intern/depsgraph.h
+++ b/source/blender/depsgraph/intern/depsgraph.h
@@ -45,13 +45,11 @@
 struct GHash;
 struct GSet;
 struct ID;
-struct Main;
 struct Scene;
 struct ViewLayer;
 
 namespace DEG {
 
-struct ComponentNode;
 struct IDNode;
 struct Node;
 struct OperationNode;
diff --git a/source/blender/depsgraph/intern/node/deg_node.h b/source/blender/depsgraph/intern/node/deg_node.h
index eea69502baa..acfc8d19bc7 100644
--- a/source/blender/depsgraph/intern/node/deg_node.h
+++ b/source/blender/depsgraph/intern/node/deg_node.h
@@ -29,7 +29,6 @@
 
 #include "DEG_depsgraph_build.h"
 
-struct GHash;
 struct ID;
 struct Scene;
 
diff --git a/source/blender/depsgraph/intern/node/deg_node_id.h b/source/blender/depsgraph/intern/node/deg_node_id.h
index e6eb91a6b2d..35184253f5c 100644
--- a/source/blender/depsgraph/intern/node/deg_node_id.h
+++ b/source/blender/depsgraph/intern/node/deg_node_id.h
@@ -26,6 +26,8 @@
 #include "intern/node/deg_node.h"
 #include "BLI_sys_types.h"
 
+struct GHash;
+
 namespace DEG {
 
 struct ComponentNode;
diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.h b/source/blender/depsgraph/intern/node/deg_node_operation.h
index b0776d186bb..87c1a7f10a1 100644
--- a/source/blender/depsgraph/intern/node/deg_node_operation.h
+++ b/source/blender/depsgraph/intern/node/deg_node_operation.h
@@ -28,7 +28,6 @@
 #include "intern/depsgraph_type.h"
 
 struct Depsgraph;
-struct ID;
 
 namespace DEG {
 
diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h
index 58cf0c2a8e0..34d3ae1d207 100644
--- a/source/blender/draw/DRW_engine.h
+++ b/source/blender/draw/DRW_engine.h
@@ -26,28 +26,20 @@
 #include "BLI_sys_types.h" /* for bool */
 
 struct ARegion;
-struct Base;
 struct DRWInstanceDataList;
-struct DRWPass;
 struct Depsgraph;
 struct DrawEngineType;
 struct GPUMaterial;
 struct GPUOffScreen;
 struct GPUViewport;
 struct ID;
-struct IDProperty;
 struct Main;
-struct Material;
 struct Object;
-struct RegionView3D;
 struct RenderEngine;
 struct RenderEngineType;
 struct Scene;
 struct View3D;
-struct ViewContext;
 struct ViewLayer;
-struct ViewportEngineData;
-struct WorkSpace;
 struct bContext;
 struct rcti;
 
diff --git a/source/blender/draw/DRW_select_buffer.h b/source/blender/draw/DRW_select_buffer.h
index 51d8672cd2b..0ad13af81ba 100644
--- a/source/blender/draw/DRW_select_buffer.h
+++ b/source/blender/draw/DRW_select_buffer.h
@@ -30,7 +30,6 @@ struct Base;
 struct Depsgraph;
 struct Object;
 struct View3D;
-struct ViewLayer;
 struct rcti;
 
 typedef struct SELECTID_ObjectData {
diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.h b/source/blender/draw/engines/eevee/eevee_lightcache.h
index 5aea712a910..ede2de13dce 100644
--- a/source/blender/draw/engines/eevee/eevee_lightcache.h
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.h
@@ -26,7 +26,6 @@
 #include "BLI_sys_types.h" /* for bool */
 
 struct EEVEE_Data;
-struct EEVEE_LightBake;
 struct EEVEE_ViewLayerData;
 struct LightCache;
 struct Scene;
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index 27edd44075b..3cdafee95a2 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -30,7 +30,6 @@ struct EEVEE_ShadowCasterBuffer;
 struct GPUFrameBuffer;
 struct Object;
 struct RenderLayer;
-struct RenderResult;
 
 extern struct DrawEngineType draw_engine_eevee_type;
 
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index 6c2c9583979..ed71cdbb9e8 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -28,12 +28,10 @@
 struct GPENCIL_Data;
 struct GPENCIL_StorageList;
 struct MaterialGPencilStyle;
-struct ModifierData;
 struct Object;
 struct RenderEngine;
 struct RenderLayer;
 struct bGPDstroke;
-struct tGPspoint;
 
 struct GPUBatch;
 struct GPUVertBuf;
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 3379aa28d0f..10ab7c13631 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -61,7 +61,6 @@
 
 #include "DEG_depsgraph.h"
 
-struct DRWTextStore;
 struct DefaultFramebufferList;
 struct DefaultTextureList;
 struct GPUBatch;
@@ -70,12 +69,9 @@ struct GPUMaterial;
 struct GPUShader;
 struct GPUTexture;
 struct GPUUniformBuffer;
-struct LightEngineData;
 struct Object;
 struct ParticleSystem;
 struct RenderEngineType;
-struct ViewportEngineData;
-struct ViewportEngineData_Info;
 struct bContext;
 struct rcti;
 
diff --git a/source/blender/draw/intern/draw_cache_impl.h b/source/blender/draw/intern/draw_cache_impl.h
index d392db63938..3e33346c7d8 100644
--- a/source/blender/draw/intern/draw_cache_impl.h
+++ b/source/blender/draw/intern/draw_cache_impl.h
@@ -23,18 +23,14 @@
 #ifndef __DRAW_CACHE_IMPL_H__
 #define __DRAW_CACHE_IMPL_H__
 
-struct CurveCache;
 struct GPUBatch;
 struct GPUIndexBuf;
 struct GPUMaterial;
-struct GPUTexture;
 struct GPUVertBuf;
 struct ListBase;
 struct ModifierData;
 struct PTCacheEdit;
 struct ParticleSystem;
-struct SpaceImage;
-struct ToolSettings;
 
 struct Curve;
 struct Lattice;
diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h
index 52b94689679..8e6b8895dd3 100644
--- a/source/blender/draw/intern/draw_common.h
+++ b/source/blender/draw/intern/draw_common.h
@@ -30,7 +30,6 @@ struct GPUBatch;
 struct GPUMaterial;
 struct ModifierData;
 struct Object;
-struct PTCacheEdit;
 struct ParticleSystem;
 struct ViewLayer;
 
diff --git a/source/blender/draw/intern/draw_instance_data.h b/source/blender/draw/intern/draw_instance_data.h
index d88de1a58e2..2ede68e16d8 100644
--- a/source/blender/draw/intern/draw_instance_data.h
+++ b/source/blender/draw/intern/draw_instance_data.h
@@ -35,8 +35,6 @@
 typedef struct DRWInstanceData DRWInstanceData;
 typedef struct DRWInstanceDataList DRWInstanceDataList;
 
-struct DRWShadingGroup;
-
 void *DRW_instance_data_next(DRWInstanceData *idata);
 DRWInstanceData *DRW_instance_data_request(DRWInstanceDataList *idatalist, uint attr_size);
 
diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h
index 569eb7e2e04..fa562ab0f44 100644
--- a/source/blender/editors/armature/armature_intern.h
+++ b/source/blender/editors/armature/armature_intern.h
@@ -30,7 +30,6 @@ struct wmOperatorType;
 struct Base;
 struct Object;
 struct Scene;
-struct bAction;
 struct bContext;
 struct bPoseChannel;
 
diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h
index 101a65d151a..a49f02d28fe 100644
--- a/source/blender/editors/include/BIF_glutil.h
+++ b/source/blender/editors/include/BIF_glutil.h
@@ -24,7 +24,6 @@
 #ifndef __BIF_GLUTIL_H__
 #define __BIF_GLUTIL_H__
 
-struct rctf;
 struct rcti;
 
 struct ColorManagedDisplaySettings;
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index 8dbe832d18b..48d0a5fe8be 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -42,7 +42,6 @@ struct ReportList;
 struct Scene;
 struct UndoType;
 struct View3D;
-struct ViewContext;
 struct ViewLayer;
 struct bArmature;
 struct bContext;
diff --git a/source/blender/editors/include/ED_clip.h b/source/blender/editors/include/ED_clip.h
index 7cee5a358f4..22bf22e04d3 100644
--- a/source/blender/editors/include/ED_clip.h
+++ b/source/blender/editors/include/ED_clip.h
@@ -29,7 +29,6 @@ struct ImBuf;
 struct Main;
 struct Mask;
 struct MovieClip;
-struct Scene;
 struct SpaceClip;
 struct bContext;
 struct bScreen;
diff --git a/source/blender/editors/include/ED_gizmo_library.h b/source/blender/editors/include/ED_gizmo_library.h
index f14648bc026..a3e2e643509 100644
--- a/source/blender/editors/include/ED_gizmo_library.h
+++ b/source/blender/editors/include/ED_gizmo_library.h
@@ -43,10 +43,8 @@ void ED_gizmotypes_value_2d(void);
 void ED_gizmogrouptypes_value_2d(void);
 
 struct Object;
-struct Scene;
 struct bContext;
 struct wmGizmo;
-struct wmGizmoGroup;
 
 /* -------------------------------------------------------------------- */
 /* Shape Presets
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 6410e6630a7..470eb58c72b 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -27,7 +27,6 @@
 struct ID;
 struct ListBase;
 struct PointerRNA;
-struct rcti;
 
 struct Brush;
 struct bGPDframe;
@@ -39,13 +38,11 @@ struct tGPspoint;
 
 struct ARegion;
 struct Depsgraph;
-struct EvaluationContext;
 struct Main;
 struct RegionView3D;
 struct ReportList;
 struct Scene;
 struct ScrArea;
-struct ToolSettings;
 struct View3D;
 struct ViewLayer;
 struct bContext;
@@ -58,8 +55,6 @@ struct bAnimContext;
 
 struct wmKeyConfig;
 struct wmOperator;
-struct wmWindow;
-struct wmWindowManager;
 
 /* ------------- Grease-Pencil Runtime Data ---------------- */
 
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h
index a09e1d579fd..7d69f86dbf8 100644
--- a/source/blender/editors/include/ED_image.h
+++ b/source/blender/editors/include/ED_image.h
@@ -31,7 +31,6 @@ struct ImageUser;
 struct ReportList;
 struct Scene;
 struct SpaceImage;
-struct ToolSettings;
 struct ViewLayer;
 struct bContext;
 struct wmWindowManager;
diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h
index 05f641abe91..2630feaa9d3 100644
--- a/source/blender/editors/include/ED_keyframes_draw.h
+++ b/source/blender/editors/include/ED_keyframes_draw.h
@@ -31,7 +31,6 @@ struct FCurve;
 struct ListBase;
 struct MaskLayer;
 struct Object;
-struct Palette;
 struct Scene;
 struct View2D;
 struct bAction;
diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h
index bbeeeade822..42e5add2ef0 100644
--- a/source/blender/editors/include/ED_keyframing.h
+++ b/source/blender/editors/include/ED_keyframing.h
@@ -44,8 +44,6 @@ struct bPoseChannel;
 struct ReportList;
 struct bContext;
 
-struct Depsgraph;
-
 struct EnumPropertyItem;
 struct PointerRNA;
 struct PropertyRNA;
diff --git a/source/blender/editors/include/ED_markers.h b/source/blender/editors/include/ED_markers.h
index a883187327f..a9e57ecc13d 100644
--- a/source/blender/editors/include/ED_markers.h
+++ b/source/blender/editors/include/ED_markers.h
@@ -29,7 +29,6 @@ struct TimeMarker;
 struct bAnimContext;
 struct bContext;
 struct wmKeyConfig;
-struct wmKeyMap;
 
 /* Drawing API ------------------------------ */
 
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index 233a8161020..0b2adfed531 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -45,7 +45,6 @@ struct Mesh;
 struct Object;
 struct ReportList;
 struct Scene;
-struct ToolSettings;
 struct UndoType;
 struct UvMapVert;
 struct UvMapVert;
@@ -55,7 +54,6 @@ struct View3D;
 struct ViewContext;
 struct bContext;
 struct bDeformGroup;
-struct rcti;
 struct wmKeyConfig;
 struct wmOperator;
 
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index de590d124ea..c481c19a552 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -34,7 +34,6 @@ struct EnumPropertyItem;
 struct EnumPropertyItem;
 struct ID;
 struct Main;
-struct Menu;
 struct ModifierData;
 struct Object;
 struct PointerRNA;
@@ -51,10 +50,8 @@ struct bFaceMap;
 struct bPoseChannel;
 struct uiLayout;
 struct wmKeyConfig;
-struct wmKeyMap;
 struct wmOperator;
 struct wmOperatorType;
-struct wmWindow;
 struct wmWindowManager;
 
 #include "DNA_object_enums.h"
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index c7ee7be49b5..d0fab134dcc 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -39,10 +39,8 @@ struct Depsgraph;
 struct IDProperty;
 struct Main;
 struct MenuType;
-struct PropertyRNA;
 struct Scene;
 struct SpaceLink;
-struct ViewLayer;
 struct WorkSpace;
 struct WorkSpaceInstanceHook;
 struct bContext;
@@ -50,7 +48,6 @@ struct bScreen;
 struct rcti;
 struct uiBlock;
 struct uiLayout;
-struct wmEvent;
 struct wmKeyConfig;
 struct wmMsgBus;
 struct wmMsgSubscribeKey;
diff --git a/source/blender/editors/include/ED_sculpt.h b/source/blender/editors/include/ED_sculpt.h
index 034e002f86a..d907ba4e581 100644
--- a/source/blender/editors/include/ED_sculpt.h
+++ b/source/blender/editors/include/ED_sculpt.h
@@ -25,10 +25,7 @@
 #define __ED_SCULPT_H__
 
 struct ARegion;
-struct ListBase;
 struct Object;
-struct RegionView3D;
-struct UndoStep;
 struct UndoType;
 struct ViewContext;
 struct bContext;
diff --git a/source/blender/editors/include/ED_time_scrub_ui.h b/source/blender/editors/include/ED_time_scrub_ui.h
index b43e674224c..f010c45d939 100644
--- a/source/blender/editors/include/ED_time_scrub_ui.h
+++ b/source/blender/editors/include/ED_time_scrub_ui.h
@@ -24,7 +24,6 @@
 #ifndef __ED_TIME_SCRUB_UI_H__
 #define __ED_TIME_SCRUB_UI_H__
 
-struct View2DGrid;
 struct bContext;
 struct bDopeSheet;
 struct wmEvent;
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h
index 675c0227b22..192af8f5273 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -26,18 +26,11 @@
 
 /* ******************* Registration Function ********************** */
 
-struct ARegion;
-struct ListBase;
-struct Main;
 struct Object;
 struct SnapObjectContext;
 struct SnapObjectParams;
-struct View3D;
-struct WorkSpace;
 struct bContext;
-struct wmEvent;
 struct wmKeyConfig;
-struct wmKeyMap;
 struct wmOperatorType;
 
 void ED_keymap_transform(struct wmKeyConfig *keyconf);
@@ -112,7 +105,6 @@ struct Scene;
 struct TransInfo;
 struct wmGizmoGroup;
 struct wmGizmoGroupType;
-struct wmOperator;
 
 /* UNUSED */
 // int BIF_snappingSupported(struct Object *obedit);
diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.h
index 97bef25dee8..40e0005b487 100644
--- a/source/blender/editors/include/ED_transform_snap_object_context.h
+++ b/source/blender/editors/include/ED_transform_snap_object_context.h
@@ -32,8 +32,6 @@ struct Main;
 struct Object;
 struct Scene;
 struct View3D;
-struct ViewLayer;
-struct bContext;
 
 /* transform_snap_object.c */
 
diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h
index 8dd2dab5209..1856ad8454b 100644
--- a/source/blender/editors/include/ED_uvedit.h
+++ b/source/blender/editors/include/ED_uvedit.h
@@ -37,7 +37,6 @@ struct Object;
 struct Scene;
 struct SpaceImage;
 struct ToolSettings;
-struct View3D;
 struct ViewLayer;
 struct bNode;
 struct wmKeyConfig;
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index 56661b992c4..139b306b533 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -38,8 +38,6 @@ struct Camera;
 struct CustomData_MeshMasks;
 struct Depsgraph;
 struct EditBone;
-struct GPUFX;
-struct GPUFXSettings;
 struct GPUOffScreen;
 struct GPUViewport;
 struct ID;
@@ -58,7 +56,6 @@ struct View3D;
 struct View3DShading;
 struct ViewContext;
 struct ViewLayer;
-struct WorkSpace;
 struct bContext;
 struct bPoseChannel;
 struct bScreen;
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 5ef3e5d8987..a61daa11c36 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -31,7 +31,6 @@
 /* Struct Declarations */
 
 struct ARegion;
-struct ARegionType;
 struct AutoComplete;
 struct ID;
 struct IDProperty;
diff --git a/source/blender/editors/physics/physics_intern.h b/source/blender/editors/physics/physics_intern.h
index 9ebbba07fdf..fc2f3d21bb6 100644
--- a/source/blender/editors/physics/physics_intern.h
+++ b/source/blender/editors/physics/physics_intern.h
@@ -30,7 +30,6 @@ struct PTCacheEdit;
 struct ParticleSystem;
 struct PointCache;
 struct Scene;
-struct ViewLayer;
 struct wmOperatorType;
 
 /* particle_edit.c */
diff --git a/source/blender/editors/render/render_intern.h b/source/blender/editors/render/render_intern.h
index 50f0b53c037..88b913b84ca 100644
--- a/source/blender/editors/render/render_intern.h
+++ b/source/blender/editors/render/render_intern.h
@@ -24,7 +24,6 @@
 #ifndef __RENDER_INTERN_H__
 #define __RENDER_INTERN_H__
 
-struct RenderEngine;
 struct ScrArea;
 struct bContext;
 struct wmOperatorType;
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index ea4814857ba..5efedf69fe4 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -33,7 +33,6 @@ struct ListBase;
 struct MTex;
 struct Object;
 struct Paint;
-struct PaintCurve;
 struct PaintStroke;
 struct PointerRNA;
 struct RegionView3D;
diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h
index 928af8cc77f..bc9a4c1d85b 100644
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@ -34,9 +34,7 @@
 #include "BKE_pbvh.h"
 
 struct KeyBlock;
-struct Main;
 struct Object;
-struct SculptOrigVertData;
 struct SculptUndoNode;
 struct bContext;
 
diff --git a/source/blender/editors/space_action/action_intern.h b/source/blender/editors/space_action/action_intern.h
index eaca7968a34..c227b794ae7 100644
--- a/source/blender/editors/space_action/action_intern.h
+++ b/source/blender/editors/space_action/action_intern.h
@@ -28,9 +28,7 @@ struct ARegion;
 struct ARegionType;
 struct Object;
 struct Scene;
-struct ScrArea;
 struct SpaceAction;
-struct View2D;
 struct bAnimContext;
 struct bContext;
 struct wmOperatorType;
diff --git a/source/blender/editors/space_graph/graph_intern.h b/source/blender/editors/space_graph/graph_intern.h
index 168c38b66a4..320240221b5 100644
--- a/source/blender/editors/space_graph/graph_intern.h
+++ b/source/blender/editors/space_graph/graph_intern.h
@@ -26,7 +26,6 @@
 
 struct ARegion;
 struct ARegionType;
-struct ScrArea;
 struct SpaceGraph;
 struct bAnimContext;
 struct bAnimListElem;
diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h
index 2c723f45e94..1abb6715fdb 100644
--- a/source/blender/editors/space_image/image_intern.h
+++ b/source/blender/editors/space_image/image_intern.h
@@ -27,7 +27,6 @@
 /* internal exports only */
 struct ARegion;
 struct ARegionType;
-struct ScrArea;
 struct SpaceImage;
 struct bContext;
 struct bNodeTree;
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 466e6684eca..95e37dea249 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -40,7 +40,6 @@ struct TreeStoreElem;
 struct ViewLayer;
 struct bContext;
 struct bPoseChannel;
-struct wmEvent;
 struct wmKeyConfig;
 struct wmOperatorType;
 
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h
index dd04260d80e..851d3b5f3aa 100644
--- a/source/blender/editors/space_sequencer/sequencer_intern.h
+++ b/source/blender/editors/space_sequencer/sequencer_intern.h
@@ -34,7 +34,6 @@ struct ARegionType;
 struct Depsgraph;
 struct Main;
 struct Scene;
-struct ScrArea;
 struct Sequence;
 struct SpaceSeq;
 struct StripElem;
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index 3a6825aacb4..6b5c27b68f4 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -30,18 +30,11 @@
 
 struct ARegion;
 struct ARegionType;
-struct Base;
 struct BoundBox;
 struct Depsgraph;
-struct GPUBatch;
-struct Mesh;
 struct Object;
-struct SmokeDomainSettings;
 struct ViewLayer;
-struct bAnimVizSettings;
 struct bContext;
-struct bMotionPath;
-struct bPoseChannel;
 struct wmGizmoGroupType;
 struct wmGizmoType;
 struct wmKeyConfig;
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index ff7c8c506e6..358e4825278 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -42,7 +42,6 @@ struct EditBone;
 struct NumInput;
 struct Object;
 struct RNG;
-struct RenderEngineType;
 struct ReportList;
 struct Scene;
 struct ScrArea;
@@ -52,7 +51,6 @@ struct TransDataContainer;
 struct TransInfo;
 struct TransSnap;
 struct TransformOrientation;
-struct View3D;
 struct ViewLayer;
 struct bConstraint;
 struct bContext;
diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h
index 3f544ad90d1..7bc6b048585 100644
--- a/source/blender/editors/uvedit/uvedit_intern.h
+++ b/source/blender/editors/uvedit/uvedit_intern.h
@@ -24,7 +24,6 @@
 #ifndef __UVEDIT_INTERN_H__
 #define __UVEDIT_INTERN_H__
 
-struct BMEditMesh;
 struct BMFace;
 struct BMLoop;
 struct Image;
diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h
index bad279ed9d9..dc8a0c79072 100644
--- a/source/blender/freestyle/FRS_freestyle.h
+++ b/source/blender/freestyle/FRS_freestyle.h
@@ -29,7 +29,6 @@ struct FreestyleConfig;
 struct FreestyleLineStyle;
 struct Material;
 struct Render;
-struct RenderLayer;
 
 struct FreestyleGlobals {
   struct Scene *scene;
diff --git a/source/blender/gpu/GPU_batch_presets.h b/source/blender/gpu/GPU_batch_presets.h
index 4b95783e6fa..55d2e461b30 100644
--- a/source/blender/gpu/GPU_batch_presets.h
+++ b/source/blender/gpu/GPU_batch_presets.h
@@ -27,9 +27,6 @@
 #ifndef __GPU_BATCH_PRESETS_H__
 #define __GPU_BATCH_PRESETS_H__
 
-struct GPUVertFormat;
-struct rctf;
-
 #include "BLI_compiler_attrs.h"
 #include "BLI_sys_types.h"
 
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h
index 507baa9531e..7814c723fec 100644
--- a/source/blender/gpu/GPU_draw.h
+++ b/source/blender/gpu/GPU_draw.h
@@ -28,17 +28,11 @@
 extern "C" {
 #endif
 
-struct DupliObject;
 struct ImBuf;
 struct Image;
 struct ImageUser;
 struct Main;
-struct Object;
-struct RegionView3D;
-struct Scene;
 struct SmokeModifierData;
-struct View3D;
-struct ViewLayer;
 
 #include "DNA_object_enums.h"
 
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h
index 2e0dc750e46..4dc0019978a 100644
--- a/source/blender/gpu/GPU_material.h
+++ b/source/blender/gpu/GPU_material.h
@@ -45,10 +45,7 @@ struct ImageUser;
 struct ListBase;
 struct Main;
 struct Material;
-struct Object;
-struct PreviewImage;
 struct Scene;
-struct World;
 struct bNode;
 struct bNodeTree;
 
diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h
index 2b61d99e852..a8e8ca72023 100644
--- a/source/blender/gpu/GPU_texture.h
+++ b/source/blender/gpu/GPU_texture.h
@@ -36,7 +36,6 @@ struct ImageUser;
 struct MovieClip;
 struct MovieClipUser;
 struct PreviewImage;
-struct rcti;
 
 struct GPUFrameBuffer;
 typedef struct GPUTexture GPUTexture;
diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h
index ae34e21b9cd..6eb6bc2f05f 100644
--- a/source/blender/gpu/intern/gpu_codegen.h
+++ b/source/blender/gpu/intern/gpu_codegen.h
@@ -34,7 +34,6 @@ struct GPUOutput;
 struct GPUShader;
 struct GPUVertAttrLayers;
 struct ListBase;
-struct PreviewImage;
 
 /* Pass Generation
  * - Takes a list of nodes and a desired output, and makes a pass. This
diff --git a/source/blender/gpu/intern/gpu_private.h b/source/blender/gpu/intern/gpu_private.h
index 4b90f8daa8c..43b2da13e28 100644
--- a/source/blender/gpu/intern/gpu_private.h
+++ b/source/blender/gpu/intern/gpu_private.h
@@ -21,9 +21,6 @@
 #ifndef __GPU_PRIVATE_H__
 #define __GPU_PRIVATE_H__
 
-struct GPUContext;
-struct GPUFrameBuffer;
-
 /* call this before running any of the functions below */
 void gpu_extensions_init(void);
 void gpu_extensions_exit(void);
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h
index bb6457ee5b8..f094d630fc8 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@ -28,8 +28,6 @@
  * (ONLY ADD NEW ITEMS AT THE END)
  */
 
-struct RNG;
-
 typedef enum GpencilModifierType {
   eGpencilModifierType_None = 0,
   eGpencilModifierType_Noise = 1,
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index 58a7bf8f8b4..2dffdf82688 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -30,8 +30,6 @@
 
 struct ARegion;
 struct AnimData;
-struct CurveMapping;
-struct GHash;
 struct MDeformVert;
 
 #define GP_DEFAULT_PIX_FACTOR 1.0f
diff --git a/source/blender/makesdna/DNA_light_types.h b/source/blender/makesdna/DNA_light_types.h
index 5e881053910..82cab5d1594 100644
--- a/source/blender/makesdna/DNA_light_types.h
+++ b/source/blender/makesdna/DNA_light_types.h
@@ -34,7 +34,6 @@
 struct AnimData;
 struct CurveMapping;
 struct Ipo;
-struct MTex;
 struct bNodeTree;
 
 typedef struct Light {
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index 39bcec8bb45..cb6991ce67a 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -40,7 +40,6 @@ struct MLoopCol;
 struct MLoopTri;
 struct MLoopUV;
 struct MPoly;
-struct MTexPoly;
 struct MVert;
 struct Material;
 struct Mesh;
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index af350cfee48..f6a7a8a5f5b 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -27,8 +27,6 @@
 #include "DNA_customdata_types.h"
 #include "DNA_listBase.h"
 
-struct Image;
-
 /*tessellation face, see MLoop/MPoly for the real face data*/
 typedef struct MFace {
   unsigned int v1, v2, v3, v4;
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index a81bff60146..5243dc1aecd 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -29,8 +29,6 @@
  */
 
 struct Mesh;
-struct Scene;
-struct Subdiv;
 
 typedef enum ModifierType {
   eModifierType_None = 0,
diff --git a/source/blender/makesdna/DNA_object_fluidsim_types.h b/source/blender/makesdna/DNA_object_fluidsim_types.h
index 40502fc27c9..4e821ad5f07 100644
--- a/source/blender/makesdna/DNA_object_fluidsim_types.h
+++ b/source/blender/makesdna/DNA_object_fluidsim_types.h
@@ -32,7 +32,6 @@ extern "C" {
 #endif
 
 struct Ipo;
-struct Mesh;
 
 typedef struct FluidVertexVelocity {
   float vel[3];
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 1b82e7463c1..e006014b71f 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -47,7 +47,6 @@ struct Material;
 struct Mesh;
 struct Object;
 struct PartDeflect;
-struct ParticleSystem;
 struct Path;
 struct RigidBodyOb;
 struct SculptSession;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index bda74f9abe0..412bf358a44 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -58,8 +58,6 @@ struct MovieClip;
 struct Object;
 struct Scene;
 struct SceneCollection;
-struct SceneStats;
-struct Text;
 struct World;
 struct bGPdata;
 struct bNodeTree;
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 3fad1c57427..ead1bcc943d 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -35,7 +35,6 @@ extern "C" {
 struct AnimData;
 struct ColorBand;
 struct CurveMapping;
-struct ImBuf;
 struct Image;
 struct Ipo;
 struct Object;
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 3ba33cfe3d4..51655790fbd 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -25,11 +25,6 @@
 #define __DNA_VIEW3D_TYPES_H__
 
 struct BoundBox;
-struct GPUViewport;
-struct Image;
-struct Material;
-struct MovieClip;
-struct MovieClipUser;
 struct Object;
 struct RenderEngine;
 struct SmoothView3DStore;
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index cacc79608ad..57c0a29382d 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -48,7 +48,6 @@ struct PointerRNA;
 struct Report;
 struct ReportList;
 struct Stereo3dFormat;
-struct UndoStep;
 struct bContext;
 struct bScreen;
 struct uiLayout;
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index 5143f667083..af1e5123dc8 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -29,7 +29,6 @@
 
 struct AnimData;
 struct Ipo;
-struct MTex;
 struct bNodeTree;
 
 #ifndef MAX_MTEX
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index 3db41a9a6ea..26f25e4988d 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -29,15 +29,12 @@
 
 #define RNA_MAGIC ((int)~0)
 
-struct Depsgraph;
 struct FreestyleSettings;
 struct ID;
 struct IDOverrideLibrary;
-struct IDOverrideLibraryProperty;
 struct IDOverrideLibraryPropertyOperation;
 struct IDProperty;
 struct Main;
-struct Mesh;
 struct Object;
 struct ReportList;
 struct SDNA;
diff --git a/source/blender/makesrna/intern/rna_internal_types.h b/source/blender/makesrna/intern/rna_internal_types.h
index 60cf443383e..7c6a471b1d7 100644
--- a/source/blender/makesrna/intern/rna_internal_types.h
+++ b/source/blender/makesrna/intern/rna_internal_types.h
@@ -31,7 +31,6 @@ struct ContainerRNA;
 struct FunctionRNA;
 struct GHash;
 struct IDOverrideLibrary;
-struct IDOverrideLibraryProperty;
 struct IDOverrideLibraryPropertyOperation;
 struct IDProperty;
 struct Main;
diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.h b/source/blender/modifiers/intern/MOD_fluidsim_util.h
index 0d2be3e7074..da70568353e 100644
--- a/source/blender/modifiers/intern/MOD_fluidsim_util.h
+++ b/source/blender/modifiers/intern/MOD_fluidsim_util.h
@@ -27,8 +27,6 @@
 struct FluidsimModifierData;
 struct Mesh;
 struct ModifierEvalContext;
-struct Object;
-struct Scene;
 
 /* new fluid-modifier interface */
 void fluidsim_init(struct FluidsimModifierData *fluidmd);
diff --git a/source/blender/modifiers/intern/MOD_util.h b/source/blender/modifiers/intern/MOD_util.h
index ba3ca44c026..e1991de3bb8 100644
--- a/source/blender/modifiers/intern/MOD_util.h
+++ b/source/blender/modifiers/intern/MOD_util.h
@@ -31,8 +31,6 @@ struct Mesh;
 struct ModifierData;
 struct ModifierEvalContext;
 struct Object;
-struct Scene;
-struct Tex;
 
 void MOD_init_texture(struct MappingInfoModifierData *dmd, const struct ModifierEvalContext *ctx);
 void MOD_get_texture_coords(struct MappingInfoModifierData *dmd,
diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c
index 8aeada7bde0..3485bd41660 100644
--- a/source/blender/nodes/intern/node_socket.c
+++ b/source/blender/nodes/intern/node_socket.c
@@ -39,8 +39,6 @@
 
 #include "NOD_socket.h"
 
-struct Main;
-
 struct bNodeSocket *node_add_socket_from_template(struct bNodeTree *ntree,
                                                   struct bNode *node,
                                                   struct bNodeSocketTemplate *stemp,
diff --git a/source/blender/physics/BPH_mass_spring.h b/source/blender/physics/BPH_mass_spring.h
index 9666f9ba9ed..c0ceff4d8cf 100644
--- a/source/blender/physics/BPH_mass_spring.h
+++ b/source/blender/physics/BPH_mass_spring.h
@@ -33,7 +33,6 @@ struct Depsgraph;
 struct Implicit_Data;
 struct ListBase;
 struct Object;
-struct VoxelData;
 
 typedef enum eMassSpringSolverStatus {
   BPH_SOLVER_SUCCESS = (1 << 0),
diff --git a/source/blender/physics/intern/implicit.h b/source/blender/physics/intern/implicit.h
index a88a5785fee..32416fa01ab 100644
--- a/source/blender/physics/intern/implicit.h
+++ b/source/blender/physics/intern/implicit.h
@@ -186,8 +186,6 @@ bool BPH_mass_spring_force_spring_goal(struct Implicit_Data *data,
 
 struct HairGrid;
 
-struct VoxelData;
-
 #define MAX_HAIR_GRID_RES 256
 
 struct HairGrid *BPH_hair_volume_create_vertex_grid(float cellsize,
diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h
index dee8dbfaa24..12e9123b5cb 100644
--- a/source/blender/render/extern/include/RE_engine.h
+++ b/source/blender/render/extern/include/RE_engine.h
@@ -33,7 +33,6 @@
 
 struct BakePixel;
 struct Depsgraph;
-struct IDProperty;
 struct Main;
 struct Object;
 struct Render;
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index 01a9e1a538b..dc18bac541f 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -28,11 +28,9 @@
 #include "DNA_vec_types.h"
 #include "DEG_depsgraph.h"
 
-struct Depsgraph;
 struct Image;
 struct ImageFormatData;
 struct Main;
-struct NodeBlurData;
 struct Object;
 struct RenderData;
 struct RenderResult;
@@ -41,7 +39,6 @@ struct Scene;
 struct StampData;
 struct ViewLayer;
 struct bMovieHandle;
-struct bNodeTree;
 
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* this include is what is exposed of render to outside world */
diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h
index 6771eb53abd..bca3b749192 100644
--- a/source/blender/render/extern/include/RE_render_ext.h
+++ b/source/blender/render/extern/include/RE_render_ext.h
@@ -31,9 +31,6 @@
 struct Depsgraph;
 struct ImagePool;
 struct MTex;
-struct Render;
-struct Scene;
-struct ViewLayer;
 
 /* render_texture.c */
 /* used by particle.c, effect.c, editmesh_modes.c and brush.c, returns 1 if rgb, 0 otherwise */
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h
index c5e3575d1f9..792b2b7e071 100644
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -41,10 +41,8 @@ typedef struct BakeImBufuserData {
 } BakeImBufuserData;
 
 /* node shaders... */
-struct ImBuf;
 struct ImagePool;
 struct MTex;
-struct Object;
 struct Tex;
 
 /* this one uses nodes */
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 0f0d74c259b..13be8701c27 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -53,19 +53,15 @@ struct PropertyRNA;
 struct ScrArea;
 struct ViewLayer;
 struct bContext;
-struct bToolRef_Runtime;
 struct rcti;
 struct wmDrag;
 struct wmDropBox;
 struct wmEvent;
-struct wmEventHandler;
 struct wmEventHandler_Keymap;
 struct wmEventHandler_UI;
 struct wmGenericUserData;
 struct wmGesture;
 struct wmJob;
-struct wmMsgSubscribeKey;
-struct wmMsgSubscribeValue;
 struct wmOperator;
 struct wmOperatorType;
 struct wmPaintCursor;
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 195822efd7e..7fdbf79248b 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -117,7 +117,6 @@ struct ID;
 struct ImBuf;
 struct bContext;
 struct wmEvent;
-struct wmMsgBus;
 struct wmOperator;
 struct wmWindowManager;
 
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
index f0771437518..00df6edef22 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
@@ -22,8 +22,6 @@
 #define __WM_GIZMO_INTERN_H__
 
 struct BLI_Buffer;
-struct GHashIterator;
-struct GizmoGeomInfo;
 struct wmGizmoMap;
 struct wmKeyConfig;
 
diff --git a/source/blender/windowmanager/gizmo/wm_gizmo_fn.h b/source/blender/windowmanager/gizmo/wm_gizmo_fn.h
index 242b0f6de80..58b58fa01d0 100644
--- a/source/blender/windowmanager/gizmo/wm_gizmo_fn.h
+++ b/source/blender/windowmanager/gizmo/wm_gizmo_fn.h
@@ -25,6 +25,8 @@
 
 #include "BLI_compiler_attrs.h"
 
+struct wmMsgBus;
+
 /* wmGizmoGroup */
 typedef bool (*wmGizmoGroupFnPoll)(const struct bContext *,
                                    struct wmGizmoGroupType *) ATTR_WARN_UNUSED_RESULT;
diff --git a/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
index 33c0d305e59..cc9ccc5f4bb 100644
--- a/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
+++ b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
@@ -31,11 +31,9 @@
 #ifndef __WM_GIZMO_WMAPI_H__
 #define __WM_GIZMO_WMAPI_H__
 
-struct wmEventHandler;
 struct wmEventHandler_Gizmo;
 struct wmEventHandler_Op;
 struct wmGizmoMap;
-struct wmOperator;
 struct wmOperatorType;
 
 /* -------------------------------------------------------------------- */
diff --git a/source/blender/windowmanager/message_bus/wm_message_bus.h b/source/blender/windowmanager/message_bus/wm_message_bus.h
index b25f8eeae71..4ee087593ac 100644
--- a/source/blender/windowmanager/message_bus/wm_message_bus.h
+++ b/source/blender/windowmanager/message_bus/wm_message_bus.h
@@ -23,7 +23,6 @@
 
 #include <stdio.h>
 
-struct GSet;
 struct ID;
 struct bContext;
 struct wmMsg;
diff --git a/source/blender/windowmanager/wm_window.h b/source/blender/windowmanager/wm_window.h
index 90c580818c9..b0329f7415e 100644
--- a/source/blender/windowmanager/wm_window.h
+++ b/source/blender/windowmanager/wm_window.h
@@ -24,10 +24,6 @@
 #ifndef __WM_WINDOW_H__
 #define __WM_WINDOW_H__
 
-struct EnumPropertyItem;
-struct PointerRNA;
-struct PropertyRNA;
-struct wmEvent;
 struct wmOperator;
 
 /* *************** internal api ************** */