Cleanup: remove redundant struct declarations

67 files changed, 3 insertions, 112 deletions

diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h
index e812d04c7d1..8d904bd6019 100644
--- a/source/blender/blenkernel/BKE_animsys.h
+++ b/source/blender/blenkernel/BKE_animsys.h
@@ -45,8 +45,6 @@ struct NlaKeyframingContext;
 struct PathResolvedRNA;
 struct PointerRNA;
 struct PropertyRNA;
-struct ReportList;
-struct Scene;
 struct bAction;
 struct bActionGroup;
 struct bContext;
diff --git a/source/blender/blenkernel/BKE_attribute.h b/source/blender/blenkernel/BKE_attribute.h
index 55a841d8fd1..574d9904dc4 100644
--- a/source/blender/blenkernel/BKE_attribute.h
+++ b/source/blender/blenkernel/BKE_attribute.h
@@ -35,7 +35,6 @@ extern "C" {
 struct CustomData;
 struct CustomDataLayer;
 struct ID;
-struct PointerRNA;
 struct ReportList;
 
 /* Attribute.domain */
diff --git a/source/blender/blenkernel/BKE_attribute_access.hh b/source/blender/blenkernel/BKE_attribute_access.hh
index c4a704ef385..564e912551a 100644
--- a/source/blender/blenkernel/BKE_attribute_access.hh
+++ b/source/blender/blenkernel/BKE_attribute_access.hh
@@ -26,8 +26,6 @@
 #include "BLI_color.hh"
 #include "BLI_float3.hh"
 
-struct Mesh;
-
 namespace blender::bke {
 
 using fn::CPPType;
diff --git a/source/blender/blenkernel/BKE_cryptomatte.h b/source/blender/blenkernel/BKE_cryptomatte.h
index 71b15e47203..d984b3824b1 100644
--- a/source/blender/blenkernel/BKE_cryptomatte.h
+++ b/source/blender/blenkernel/BKE_cryptomatte.h
@@ -31,7 +31,6 @@ extern "C" {
 
 struct Object;
 struct Material;
-struct ID;
 struct Main;
 
 uint32_t BKE_cryptomatte_hash(const char *name, int name_len);
diff --git a/source/blender/blenkernel/BKE_editmesh.h b/source/blender/blenkernel/BKE_editmesh.h
index 0c84ad70845..2fb713a4299 100644
--- a/source/blender/blenkernel/BKE_editmesh.h
+++ b/source/blender/blenkernel/BKE_editmesh.h
@@ -35,9 +35,7 @@ struct BMLoop;
 struct BMesh;
 struct BoundBox;
 struct Depsgraph;
-struct EditMeshData;
 struct Mesh;
-struct MeshStatVis;
 struct Object;
 struct Scene;
 
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index 6dc8d1ef06e..9177931cf9b 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -36,7 +36,6 @@ struct ListBase;
 struct MDeformVert;
 struct Main;
 struct Material;
-struct MaterialGPencilStyle;
 struct Object;
 struct Scene;
 struct SpaceImage;
@@ -46,7 +45,6 @@ struct bDeformGroup;
 struct bGPDframe;
 struct bGPDlayer;
 struct bGPDlayer_Mask;
-struct bGPDspoint;
 struct bGPDstroke;
 struct bGPDcurve;
 struct bGPdata;
diff --git a/source/blender/blenkernel/BKE_gpencil_geom.h b/source/blender/blenkernel/BKE_gpencil_geom.h
index 111f9030463..8cb7137e1f0 100644
--- a/source/blender/blenkernel/BKE_gpencil_geom.h
+++ b/source/blender/blenkernel/BKE_gpencil_geom.h
@@ -33,7 +33,6 @@ struct Main;
 struct Object;
 struct Scene;
 struct bGPDframe;
-struct bGPDlayer;
 struct bGPDspoint;
 struct bGPDstroke;
 struct bGPdata;
diff --git a/source/blender/blenkernel/BKE_ipo.h b/source/blender/blenkernel/BKE_ipo.h
index 40b9f738bfd..f4871c83caf 100644
--- a/source/blender/blenkernel/BKE_ipo.h
+++ b/source/blender/blenkernel/BKE_ipo.h
@@ -26,7 +26,6 @@
 extern "C" {
 #endif
 
-struct Ipo;
 struct Main;
 
 void do_versions_ipos_to_animato(struct Main *main);
diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h
index f4c1a6fdcb4..02fa8b306d3 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -38,7 +38,6 @@ struct Main;
 struct Mesh;
 struct Object;
 struct Scene;
-struct bGPDstroke;
 
 void BKE_lattice_resize(struct Lattice *lt, int u, int v, int w, struct Object *ltOb);
 struct Lattice *BKE_lattice_add(struct Main *bmain, const char *name);
diff --git a/source/blender/blenkernel/BKE_lib_id.h b/source/blender/blenkernel/BKE_lib_id.h
index 9f3536c9314..b0971278dc7 100644
--- a/source/blender/blenkernel/BKE_lib_id.h
+++ b/source/blender/blenkernel/BKE_lib_id.h
@@ -51,7 +51,6 @@
 extern "C" {
 #endif
 
-struct BlendDataReader;
 struct BlendWriter;
 struct GHash;
 struct ID;
diff --git a/source/blender/blenkernel/BKE_lib_remap.h b/source/blender/blenkernel/BKE_lib_remap.h
index fb14e340d8b..a8d75213d39 100644
--- a/source/blender/blenkernel/BKE_lib_remap.h
+++ b/source/blender/blenkernel/BKE_lib_remap.h
@@ -38,8 +38,6 @@
 extern "C" {
 #endif
 
-struct wmWindowManager;
-
 /* BKE_libblock_free, delete are declared in BKE_lib_id.h for convenience. */
 
 /* Also IDRemap->flag. */
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 0f34549a3cd..2d8dc852d7c 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -26,7 +26,6 @@
 #include "BLI_utildefines.h"
 
 struct BLI_Stack;
-struct BMEditMesh;
 struct BMesh;
 struct BMeshCreateParams;
 struct BMeshFromMeshParams;
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 0a50dde1874..f679533e1a9 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -55,7 +55,6 @@ struct Paint;
 struct PaintCurve;
 struct Palette;
 struct PaletteColor;
-struct ReportList;
 struct Scene;
 struct StrokeCache;
 struct SubdivCCG;
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index fd600a41796..0fa44067b16 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -48,7 +48,6 @@ struct PBVH;
 struct PBVHNode;
 struct SubdivCCG;
 struct TaskParallelSettings;
-struct TaskParallelTLS;
 
 typedef struct PBVH PBVH;
 typedef struct PBVHNode PBVHNode;
diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h
index 473a684eaba..7b5df98d148 100644
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@ -51,7 +51,6 @@ struct View3D;
 struct View3DShading;
 struct WorkSpace;
 struct bContext;
-struct bContextDataResult;
 struct bScreen;
 struct uiLayout;
 struct uiList;
diff --git a/source/blender/blenkernel/BKE_speaker.h b/source/blender/blenkernel/BKE_speaker.h
index e288c9f3eb4..9defa887d3c 100644
--- a/source/blender/blenkernel/BKE_speaker.h
+++ b/source/blender/blenkernel/BKE_speaker.h
@@ -26,7 +26,6 @@ extern "C" {
 #endif
 
 struct Main;
-struct Speaker;
 
 void *BKE_speaker_add(struct Main *bmain, const char *name);
 
diff --git a/source/blender/blenkernel/intern/multires_unsubdivide.h b/source/blender/blenkernel/intern/multires_unsubdivide.h
index 39c6da0b6c8..0a03387282f 100644
--- a/source/blender/blenkernel/intern/multires_unsubdivide.h
+++ b/source/blender/blenkernel/intern/multires_unsubdivide.h
@@ -26,10 +26,8 @@
 #include "BLI_sys_types.h"
 
 struct BMesh;
-struct Depsgraph;
 struct Mesh;
 struct MultiresModifierData;
-struct Object;
 
 typedef struct MultiresUnsubdivideGrid {
   /* For sanity checks. */
diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h
index d19b5393aa7..eefde1afefb 100644
--- a/source/blender/blenlib/BLI_threads.h
+++ b/source/blender/blenlib/BLI_threads.h
@@ -35,7 +35,6 @@ extern "C" {
 #define BLENDER_MAX_THREADS 1024
 
 struct ListBase;
-struct TaskScheduler;
 
 /* Threading API */
 
diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h
index 3e7cdb30e1f..c724cc32051 100644
--- a/source/blender/blenloader/intern/readfile.h
+++ b/source/blender/blenloader/intern/readfile.h
@@ -34,16 +34,13 @@
 #include "zlib.h"
 
 struct BLOCacheStorage;
-struct GSet;
 struct IDNameLib_Map;
 struct Key;
 struct MemFile;
 struct Object;
 struct OldNewMap;
-struct PartEff;
 struct ReportList;
 struct UserDef;
-struct View3D;
 
 typedef struct IDNameLib_Map IDNameLib_Map;
 
diff --git a/source/blender/depsgraph/DEG_depsgraph_build.h b/source/blender/depsgraph/DEG_depsgraph_build.h
index f894bdabba4..4e618d8625d 100644
--- a/source/blender/depsgraph/DEG_depsgraph_build.h
+++ b/source/blender/depsgraph/DEG_depsgraph_build.h
@@ -39,7 +39,6 @@ struct Main;
 struct Object;
 struct Scene;
 struct Simulation;
-struct ViewLayer;
 struct bNodeTree;
 
 #include "BLI_sys_types.h"
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index cbfb51c59a6..5587379089c 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -45,7 +45,6 @@
 #include "intern/node/deg_node_id.h"
 #include "intern/node/deg_node_operation.h"
 
-struct Base;
 struct CacheFile;
 struct Camera;
 struct Collection;
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.h b/source/blender/depsgraph/intern/eval/deg_eval_flush.h
index 1f58c54dbf4..ec661360fdf 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.h
@@ -25,8 +25,6 @@
 
 #pragma once
 
-struct Main;
-
 namespace blender {
 namespace deg {
 
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index 04128dc157e..d0bd56b42dd 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -39,10 +39,7 @@ extern DrawEngineType draw_engine_gpencil_type;
 struct GPENCIL_Data;
 struct GPENCIL_StorageList;
 struct GPUBatch;
-struct GPUVertBuf;
-struct GPUVertFormat;
 struct GpencilBatchCache;
-struct MaterialGPencilStyle;
 struct Object;
 struct RenderEngine;
 struct RenderLayer;
diff --git a/source/blender/draw/engines/image/image_private.h b/source/blender/draw/engines/image/image_private.h
index d5821cc5d70..76a94e68da1 100644
--- a/source/blender/draw/engines/image/image_private.h
+++ b/source/blender/draw/engines/image/image_private.h
@@ -25,11 +25,9 @@ extern "C" {
 #endif
 
 /* Forward declarations */
-struct GPUBatch;
 struct GPUTexture;
 struct ImBuf;
 struct Image;
-struct rcti;
 
 /* *********** LISTS *********** */
 
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index fbe71900915..4df2ba1e913 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -64,7 +64,6 @@
 #include "DEG_depsgraph.h"
 
 struct GPUBatch;
-struct GPUFrameBuffer;
 struct GPUMaterial;
 struct GPUShader;
 struct GPUTexture;
diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h
index 23dd47d4ab5..a059ac32311 100644
--- a/source/blender/draw/intern/draw_common.h
+++ b/source/blender/draw/intern/draw_common.h
@@ -22,10 +22,8 @@
 
 #pragma once
 
-struct DRWPass;
 struct DRWShadingGroup;
 struct FluidModifierData;
-struct GPUMaterial;
 struct ModifierData;
 struct Object;
 struct ParticleSystem;
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index 3501acd4fdf..0c4576096fb 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -31,7 +31,6 @@ struct Base;
 struct Bone;
 struct Depsgraph;
 struct EditBone;
-struct IDProperty;
 struct ListBase;
 struct Main;
 struct Mesh;
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index be2f714dfe1..1b7caf27ecf 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -51,7 +51,6 @@ struct ScrArea;
 struct SnapObjectContext;
 struct ToolSettings;
 struct View3D;
-struct ViewLayer;
 struct bContext;
 
 struct Material;
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h
index c1d3a17b9b6..b139b0765a3 100644
--- a/source/blender/editors/include/ED_image.h
+++ b/source/blender/editors/include/ED_image.h
@@ -34,12 +34,10 @@ struct ARegion;
 struct ImBuf;
 struct Image;
 struct ImageUser;
-struct LinkNodePair;
 struct Main;
 struct ReportList;
 struct Scene;
 struct SpaceImage;
-struct ViewLayer;
 struct bContext;
 struct wmOperator;
 struct wmWindowManager;
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 2e9b711c99a..f9358f62274 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -53,7 +53,6 @@ struct uiLayout;
 struct wmKeyConfig;
 struct wmOperator;
 struct wmOperatorType;
-struct wmWindowManager;
 
 /* object_edit.c */
 /* context.object */
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h
index 0ea86e006e0..ca3e351a052 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -32,7 +32,6 @@ extern "C" {
 struct Object;
 struct bContext;
 struct wmKeyConfig;
-struct wmMsgBus;
 struct wmOperatorType;
 
 void ED_keymap_transform(struct wmKeyConfig *keyconf);
@@ -108,7 +107,6 @@ bool calculateTransformCenter(struct bContext *C,
 
 struct Object;
 struct Scene;
-struct wmGizmoGroup;
 struct wmGizmoGroupType;
 
 /* UNUSED */
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 ebaa32941f2..b7174964ef6 100644
--- a/source/blender/editors/include/ED_transform_snap_object_context.h
+++ b/source/blender/editors/include/ED_transform_snap_object_context.h
@@ -31,7 +31,6 @@ struct BMVert;
 struct ARegion;
 struct Depsgraph;
 struct ListBase;
-struct Main;
 struct Object;
 struct Scene;
 struct View3D;
diff --git a/source/blender/editors/include/ED_util_imbuf.h b/source/blender/editors/include/ED_util_imbuf.h
index d142d3d6425..4bbaa68e849 100644
--- a/source/blender/editors/include/ED_util_imbuf.h
+++ b/source/blender/editors/include/ED_util_imbuf.h
@@ -31,7 +31,6 @@ extern "C" {
 #endif
 
 struct ARegion;
-struct Main;
 struct bContext;
 struct wmEvent;
 struct wmOperator;
diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h
index d08bc0b0b3d..4de97411059 100644
--- a/source/blender/editors/include/ED_uvedit.h
+++ b/source/blender/editors/include/ED_uvedit.h
@@ -33,7 +33,6 @@ struct BMEditMesh;
 struct BMFace;
 struct BMLoop;
 struct BMesh;
-struct Depsgraph;
 struct Image;
 struct ImageUser;
 struct Main;
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index 13687bf0450..a4856845a65 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -41,8 +41,6 @@ struct Camera;
 struct CustomData_MeshMasks;
 struct Depsgraph;
 struct EditBone;
-struct GPUOffScreen;
-struct GPUViewport;
 struct ID;
 struct MVert;
 struct Main;
@@ -55,7 +53,6 @@ struct RenderEngineType;
 struct Scene;
 struct ScrArea;
 struct View3D;
-struct View3DShading;
 struct ViewContext;
 struct ViewLayer;
 struct bContext;
@@ -64,8 +61,6 @@ struct bScreen;
 struct rctf;
 struct rcti;
 struct wmGizmo;
-struct wmOperator;
-struct wmOperatorType;
 struct wmWindow;
 struct wmWindowManager;
 
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 83e94664c0b..7c128cbf1e6 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -50,7 +50,6 @@ struct PointerRNA;
 struct PropertyRNA;
 struct ReportList;
 struct ResultBLF;
-struct ScrArea;
 struct bContext;
 struct bContextStore;
 struct bNode;
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index 175d98ba9aa..3ca0d853d6a 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -43,7 +43,6 @@ struct wmEvent;
 struct wmKeyConfig;
 struct wmOperator;
 struct wmOperatorType;
-struct wmWindowManager;
 enum ePaintMode;
 enum ePaintSymmetryFlags;
 
diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h
index bd5ba15b493..853b221e92a 100644
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@ -39,7 +39,6 @@
 struct AutomaskingCache;
 struct KeyBlock;
 struct Object;
-struct SculptPoseIKChainSegment;
 struct SculptUndoNode;
 struct bContext;
 
diff --git a/source/blender/editors/space_buttons/buttons_intern.h b/source/blender/editors/space_buttons/buttons_intern.h
index 0a0846cf216..74e7bc11c26 100644
--- a/source/blender/editors/space_buttons/buttons_intern.h
+++ b/source/blender/editors/space_buttons/buttons_intern.h
@@ -35,7 +35,6 @@ struct bContext;
 struct bContextDataResult;
 struct bNode;
 struct bNodeTree;
-struct uiLayout;
 struct wmOperatorType;
 
 struct SpaceProperties_Runtime {
diff --git a/source/blender/editors/space_outliner/tree/tree_element_nla.hh b/source/blender/editors/space_outliner/tree/tree_element_nla.hh
index 3ca62b13bd8..c94287ce576 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_nla.hh
+++ b/source/blender/editors/space_outliner/tree/tree_element_nla.hh
@@ -23,7 +23,6 @@
 #include "tree_element.hh"
 
 struct NlaTrack;
-struct NlaStrip;
 
 namespace blender::ed::outliner {
 
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 227330e8524..91bf2bf8aac 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -52,12 +52,12 @@ struct SnapObjectContext;
 struct TransDataContainer;
 struct TransInfo;
 struct TransSnap;
-struct TransformOrientation;
 struct ViewLayer;
 struct bContext;
 struct wmEvent;
 struct wmKeyConfig;
 struct wmKeyMap;
+struct wmOperator;
 struct wmTimer;
 
 /** #TransInfo.redraw */
diff --git a/source/blender/editors/transform/transform_convert.h b/source/blender/editors/transform/transform_convert.h
index b753572ea7b..59fcd016020 100644
--- a/source/blender/editors/transform/transform_convert.h
+++ b/source/blender/editors/transform/transform_convert.h
@@ -29,12 +29,9 @@ struct FCurve;
 struct ListBase;
 struct Object;
 struct TransData;
-struct TransDataContainer;
 struct TransDataCurveHandleFlags;
 struct TransInfo;
 struct bContext;
-struct bKinematicConstraint;
-struct bPoseChannel;
 
 /* transform_convert.c */
 void transform_autoik_update(TransInfo *t, short mode);
diff --git a/source/blender/editors/transform/transform_snap.h b/source/blender/editors/transform/transform_snap.h
index 5bee572c603..db8ec943bfd 100644
--- a/source/blender/editors/transform/transform_snap.h
+++ b/source/blender/editors/transform/transform_snap.h
@@ -25,8 +25,6 @@
 /* For enum. */
 #include "DNA_space_types.h"
 
-struct SnapObjectParams;
-
 bool peelObjectsTransform(struct TransInfo *t,
                           const float mval[2],
                           const bool use_peel_object,
diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h
index 306f8a2c561..28567234fab 100644
--- a/source/blender/editors/uvedit/uvedit_intern.h
+++ b/source/blender/editors/uvedit/uvedit_intern.h
@@ -25,7 +25,6 @@
 
 struct BMFace;
 struct BMLoop;
-struct Image;
 struct Object;
 struct Scene;
 struct SpaceImage;
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h
index e5a6d9e6a8f..30e54f44499 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h
@@ -23,9 +23,7 @@
 
 #pragma once
 
-struct GHash;
 struct MDeformVert;
-struct Main;
 struct Material;
 struct Object;
 struct bGPDlayer;
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h
index 27a7ea1e6a5..55716b584c3 100644
--- a/source/blender/gpu/GPU_shader.h
+++ b/source/blender/gpu/GPU_shader.h
@@ -27,8 +27,6 @@
 extern "C" {
 #endif
 
-struct GPUTexture;
-struct GPUUniformBuf;
 struct GPUVertBuf;
 
 /** Opaque type hidding blender::gpu::Shader */
diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h
index e9c081abd22..91119bd05a1 100644
--- a/source/blender/gpu/GPU_texture.h
+++ b/source/blender/gpu/GPU_texture.h
@@ -28,14 +28,6 @@
 #include "GPU_state.h"
 
 struct GPUVertBuf;
-struct ImBuf;
-struct Image;
-struct ImageUser;
-struct MovieClip;
-struct MovieClipUser;
-struct PreviewImage;
-
-struct GPUFrameBuffer;
 
 /** Opaque type hiding blender::gpu::Texture. */
 typedef struct GPUTexture GPUTexture;
diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h
index 5d130d75d2c..f3d58a55814 100644
--- a/source/blender/gpu/intern/gpu_codegen.h
+++ b/source/blender/gpu/intern/gpu_codegen.h
@@ -31,10 +31,7 @@ extern "C" {
 
 struct GPUMaterial;
 struct GPUNodeGraph;
-struct GPUOutput;
 struct GPUShader;
-struct GSet;
-struct ListBase;
 
 typedef struct GPUPass {
   struct GPUPass *next;
diff --git a/source/blender/gpu/intern/gpu_node_graph.h b/source/blender/gpu/intern/gpu_node_graph.h
index 0ef95d94c0d..929191cff73 100644
--- a/source/blender/gpu/intern/gpu_node_graph.h
+++ b/source/blender/gpu/intern/gpu_node_graph.h
@@ -33,8 +33,6 @@
 
 struct GPUNode;
 struct GPUOutput;
-struct GPUShader;
-struct GPUVertAttrLayers;
 struct ListBase;
 
 typedef enum eGPUDataSource {
diff --git a/source/blender/gpu/intern/gpu_uniform_buffer_private.hh b/source/blender/gpu/intern/gpu_uniform_buffer_private.hh
index 00d10776864..18ea6d18caf 100644
--- a/source/blender/gpu/intern/gpu_uniform_buffer_private.hh
+++ b/source/blender/gpu/intern/gpu_uniform_buffer_private.hh
@@ -24,6 +24,8 @@
 
 #include "BLI_sys_types.h"
 
+struct GPUUniformBuf;
+
 namespace blender {
 namespace gpu {
 
diff --git a/source/blender/io/alembic/exporter/abc_hierarchy_iterator.h b/source/blender/io/alembic/exporter/abc_hierarchy_iterator.h
index a0d9257b822..2098b8b2505 100644
--- a/source/blender/io/alembic/exporter/abc_hierarchy_iterator.h
+++ b/source/blender/io/alembic/exporter/abc_hierarchy_iterator.h
@@ -29,7 +29,6 @@
 #include <Alembic/Abc/OObject.h>
 
 struct Depsgraph;
-struct ID;
 struct Object;
 
 namespace blender::io::alembic {
diff --git a/source/blender/io/alembic/exporter/abc_writer_abstract.h b/source/blender/io/alembic/exporter/abc_writer_abstract.h
index d23e69cf73e..4997e498199 100644
--- a/source/blender/io/alembic/exporter/abc_writer_abstract.h
+++ b/source/blender/io/alembic/exporter/abc_writer_abstract.h
@@ -29,7 +29,6 @@
 #include "DNA_material_types.h"
 
 struct IDProperty;
-struct Material;
 struct Object;
 
 namespace blender::io::alembic {
diff --git a/source/blender/io/alembic/exporter/abc_writer_hair.h b/source/blender/io/alembic/exporter/abc_writer_hair.h
index 3759ffa4310..901fd70601f 100644
--- a/source/blender/io/alembic/exporter/abc_writer_hair.h
+++ b/source/blender/io/alembic/exporter/abc_writer_hair.h
@@ -23,9 +23,6 @@
 #include <Alembic/AbcGeom/OCurves.h>
 #include <vector>
 
-struct ParticleSettings;
-struct ParticleSystem;
-
 namespace blender::io::alembic {
 
 class ABCHairWriter : public ABCAbstractWriter {
diff --git a/source/blender/io/alembic/intern/abc_reader_archive.h b/source/blender/io/alembic/intern/abc_reader_archive.h
index 2a4fd6bd8fb..67000194aa1 100644
--- a/source/blender/io/alembic/intern/abc_reader_archive.h
+++ b/source/blender/io/alembic/intern/abc_reader_archive.h
@@ -28,7 +28,6 @@
 #include <fstream>
 
 struct Main;
-struct Scene;
 
 namespace blender::io::alembic {
 
diff --git a/source/blender/io/common/IO_abstract_hierarchy_iterator.h b/source/blender/io/common/IO_abstract_hierarchy_iterator.h
index e066ca8ba8f..300c555ac8f 100644
--- a/source/blender/io/common/IO_abstract_hierarchy_iterator.h
+++ b/source/blender/io/common/IO_abstract_hierarchy_iterator.h
@@ -43,13 +43,11 @@
 #include <set>
 #include <string>
 
-struct Base;
 struct Depsgraph;
 struct DupliObject;
 struct ID;
 struct Object;
 struct ParticleSystem;
-struct ViewLayer;
 
 namespace blender::io {
 
diff --git a/source/blender/io/usd/intern/usd_exporter_context.h b/source/blender/io/usd/intern/usd_exporter_context.h
index 41ff34b327e..66e87f0eed1 100644
--- a/source/blender/io/usd/intern/usd_exporter_context.h
+++ b/source/blender/io/usd/intern/usd_exporter_context.h
@@ -24,7 +24,6 @@
 #include <pxr/usd/usd/common.h>
 
 struct Depsgraph;
-struct Object;
 
 namespace blender::io::usd {
 
diff --git a/source/blender/io/usd/intern/usd_hierarchy_iterator.h b/source/blender/io/usd/intern/usd_hierarchy_iterator.h
index 922ab761bd9..cd19becbb07 100644
--- a/source/blender/io/usd/intern/usd_hierarchy_iterator.h
+++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.h
@@ -28,7 +28,6 @@
 #include <pxr/usd/usd/timeCode.h>
 
 struct Depsgraph;
-struct ID;
 struct Object;
 
 namespace blender::io::usd {
diff --git a/source/blender/io/usd/intern/usd_writer_abstract.h b/source/blender/io/usd/intern/usd_writer_abstract.h
index 6a3b8d515dc..2143164e3dd 100644
--- a/source/blender/io/usd/intern/usd_writer_abstract.h
+++ b/source/blender/io/usd/intern/usd_writer_abstract.h
@@ -33,7 +33,6 @@
 #include "DNA_material_types.h"
 
 struct Material;
-struct Object;
 
 namespace blender::io::usd {
 
diff --git a/source/blender/io/usd/usd.h b/source/blender/io/usd/usd.h
index b9ea90736ff..40e2d0d8674 100644
--- a/source/blender/io/usd/usd.h
+++ b/source/blender/io/usd/usd.h
@@ -25,7 +25,6 @@
 extern "C" {
 #endif
 
-struct Scene;
 struct bContext;
 
 struct USDExportParams {
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index 04fbc030ed9..c2337b28e54 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -35,7 +35,6 @@ struct AnimData;
 struct BVHCache;
 struct Ipo;
 struct Key;
-struct LinkNode;
 struct MCol;
 struct MEdge;
 struct MFace;
@@ -44,7 +43,6 @@ struct MLoopCol;
 struct MLoopTri;
 struct MLoopUV;
 struct MPoly;
-struct MPropCol;
 struct MVert;
 struct Material;
 struct Mesh;
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 0a3a2cd0b64..25447d8f20a 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -38,9 +38,7 @@ extern "C" {
 
 struct AnimData;
 struct BoundBox;
-struct DerivedMesh;
 struct FluidsimSettings;
-struct GpencilBatchCache;
 struct Ipo;
 struct Material;
 struct Mesh;
diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h
index 46b4dbc96d7..366d801a888 100644
--- a/source/blender/python/BPY_extern.h
+++ b/source/blender/python/BPY_extern.h
@@ -26,7 +26,6 @@ struct ID;            /* DNA_ID.h */
 struct ListBase;      /* DNA_listBase.h */
 struct Object;        /* DNA_object_types.h */
 struct PathResolvedRNA;
-struct ReportList;
 struct Text;              /* defined in DNA_text_types.h */
 struct bConstraint;       /* DNA_constraint_types.h */
 struct bConstraintOb;     /* DNA_constraint_types.h */
diff --git a/source/blender/sequencer/intern/multiview.h b/source/blender/sequencer/intern/multiview.h
index e1f998d18e2..bbc66c6f84c 100644
--- a/source/blender/sequencer/intern/multiview.h
+++ b/source/blender/sequencer/intern/multiview.h
@@ -27,14 +27,7 @@
 extern "C" {
 #endif
 
-struct Editing;
-struct ImBuf;
-struct Main;
-struct Mask;
 struct Scene;
-struct Sequence;
-struct StripColorBalance;
-struct StripElem;
 
 /* **********************************************************************
  * sequencer.c
diff --git a/source/blender/sequencer/intern/prefetch.h b/source/blender/sequencer/intern/prefetch.h
index aa47a9dbcfc..6b9d936133d 100644
--- a/source/blender/sequencer/intern/prefetch.h
+++ b/source/blender/sequencer/intern/prefetch.h
@@ -27,8 +27,6 @@
 extern "C" {
 #endif
 
-struct ImBuf;
-struct Main;
 struct Scene;
 struct Sequence;
 struct SeqRenderData;
diff --git a/source/blender/sequencer/intern/render.h b/source/blender/sequencer/intern/render.h
index d5affeb547b..46748415187 100644
--- a/source/blender/sequencer/intern/render.h
+++ b/source/blender/sequencer/intern/render.h
@@ -27,7 +27,6 @@
 extern "C" {
 #endif
 
-struct Editing;
 struct ImBuf;
 struct ListBase;
 struct Scene;
diff --git a/source/blender/sequencer/intern/utils.h b/source/blender/sequencer/intern/utils.h
index fe6041ec5e8..f30ea753d37 100644
--- a/source/blender/sequencer/intern/utils.h
+++ b/source/blender/sequencer/intern/utils.h
@@ -28,7 +28,6 @@ extern "C" {
 #endif
 
 struct Scene;
-struct anim;
 
 bool sequencer_seq_generates_image(struct Sequence *seq);
 void seq_open_anim_file(struct Scene *scene, struct Sequence *seq, bool openfile);
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index baa47098bd3..c26acfc9802 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -23,7 +23,6 @@
 
 #pragma once
 
-struct ARegion;
 struct ReportList;
 struct wmWindow;