chart2/source/controller/dialogs/tp_AxisPositions.hxx      |    2 +
 chart2/source/controller/dialogs/tp_Scale.hxx              |    2 +
 chart2/source/controller/inc/dlg_ObjectProperties.hxx      |    2 +
 extensions/source/bibliography/toolbar.hxx                 |    1 
 formula/source/core/api/FormulaOpCodeMapperObj.cxx         |    2 +
 framework/source/layoutmanager/toolbarlayoutmanager.hxx    |    2 +
 include/basctl/scriptdocument.hxx                          |    2 -
 include/basegfx/utils/canvastools.hxx                      |    2 -
 include/codemaker/commoncpp.hxx                            |    1 
 include/comphelper/MasterPropertySet.hxx                   |    1 
 include/comphelper/docpasswordrequest.hxx                  |    2 -
 include/comphelper/interfacecontainer3.hxx                 |    4 ---
 include/comphelper/multiinterfacecontainer3.hxx            |    5 ----
 include/comphelper/types.hxx                               |    1 
 include/dbaccess/genericcontroller.hxx                     |    2 -
 include/drawinglayer/attribute/fillgradientattribute.hxx   |    2 -
 include/drawinglayer/primitive2d/borderlineprimitive2d.hxx |    2 -
 include/drawinglayer/primitive2d/textlayoutdevice.hxx      |    4 ---
 include/editeng/editeng.hxx                                |    1 
 include/editeng/eeitem.hxx                                 |    1 
 include/editeng/legacyitem.hxx                             |    1 
 include/editeng/svxacorr.hxx                               |    1 
 include/editeng/svxrtf.hxx                                 |    1 
 include/editeng/unoipset.hxx                               |    2 -
 include/filter/msfilter/msvbahelper.hxx                    |    2 -
 include/formula/FormulaOpCodeMapperObj.hxx                 |    2 -
 include/formula/formula.hxx                                |    1 
 include/framework/dispatchhelper.hxx                       |    8 -------
 include/oox/core/binarycodec.hxx                           |    4 ---
 include/oox/core/fastparser.hxx                            |    2 -
 include/oox/core/filterbase.hxx                            |    1 
 include/oox/core/xmlfilterbase.hxx                         |    4 ---
 include/oox/crypto/DocumentDecryption.hxx                  |    1 
 include/oox/drawingml/connectorshapecontext.hxx            |    1 
 include/oox/drawingml/shape.hxx                            |    4 ---
 include/oox/dump/xlsbdumper.hxx                            |    1 
 include/oox/export/vmlexport.hxx                           |    1 
 include/oox/helper/graphichelper.hxx                       |    3 --
 include/oox/ppt/pptshape.hxx                               |    1 
 include/oox/ppt/pptshapegroupcontext.hxx                   |    1 
 include/sfx2/childwin.hxx                                  |    1 
 include/sfx2/dispatch.hxx                                  |    1 
 include/sfx2/dockwin.hxx                                   |    1 
 include/sfx2/notebookbar/SfxNotebookBar.hxx                |    1 
 include/sfx2/objsh.hxx                                     |    1 
 include/sfx2/sfxbasemodel.hxx                              |    1 
 include/sfx2/sfxmodelfactory.hxx                           |    3 --
 include/sfx2/sidebar/ControllerItem.hxx                    |    2 -
 include/sfx2/sidebar/SidebarDockingWindow.hxx              |    2 -
 include/sfx2/thumbnailviewitem.hxx                         |    1 
 include/sfx2/viewsh.hxx                                    |    4 ---
 include/svl/flagitem.hxx                                   |    2 -
 include/svl/imageitm.hxx                                   |    1 
 include/svl/itempool.hxx                                   |    2 +
 include/svl/poolitem.hxx                                   |    1 
 include/svl/ptitem.hxx                                     |    2 -
 include/svl/rectitem.hxx                                   |    2 -
 include/svl/rngitem.hxx                                    |    2 -
 include/svl/style.hxx                                      |    1 
 include/svl/whiter.hxx                                     |    3 --
 include/svl/zformat.hxx                                    |    1 
 include/svtools/editbrowsebox.hxx                          |    2 -
 include/svtools/genericunodialog.hxx                       |    2 -
 include/svtools/miscopt.hxx                                |    1 
 include/svtools/prnsetup.hxx                               |    1 
 include/svtools/valueset.hxx                               |    4 ---
 include/svx/AccessibleShape.hxx                            |    1 
 include/svx/SmartTagMgr.hxx                                |    1 
 include/svx/colorwindow.hxx                                |    2 -
 include/svx/ctredlin.hxx                                   |    2 -
 include/svx/cuicharmap.hxx                                 |    6 -----
 include/svx/diagram/IDiagramHelper.hxx                     |    1 
 include/svx/dialcontrol.hxx                                |    2 -
 include/svx/dialog/ThemeDialog.hxx                         |    2 -
 include/svx/extedit.hxx                                    |    2 -
 include/svx/fmview.hxx                                     |    2 +
 include/svx/gallery1.hxx                                   |    1 
 include/svx/galleryobjectcollection.hxx                    |    2 -
 include/svx/galmisc.hxx                                    |    1 
 include/svx/gridctrl.hxx                                   |    2 -
 include/svx/itemwin.hxx                                    |    1 
 include/svx/linectrl.hxx                                   |    3 --
 include/svx/nbdtmg.hxx                                     |    2 +
 include/svx/optgrid.hxx                                    |    1 
 include/svx/sdr/contact/objectcontact.hxx                  |    3 --
 include/svx/sdr/contact/viewcontact.hxx                    |    2 -
 include/svx/sdr/contact/viewobjectcontact.hxx              |    3 --
 include/svx/sdr/overlay/overlaymanager.hxx                 |    5 ----
 include/svx/sdr/overlay/overlayobject.hxx                  |    8 -------
 include/svx/sdr/properties/properties.hxx                  |    2 -
 include/svx/sdr/table/tablecontroller.hxx                  |    1 
 include/svx/sidebar/LinePropertyPanelBase.hxx              |    6 -----
 include/svx/sidebar/SelectionChangeHandler.hxx             |    2 -
 include/svx/srchdlg.hxx                                    |    1 
 include/svx/svdcrtv.hxx                                    |    3 --
 include/svx/svddrgv.hxx                                    |    2 -
 include/svx/svdedtv.hxx                                    |    4 ---
 include/svx/svdedxv.hxx                                    |    1 
 include/svx/svdhdl.hxx                                     |    2 -
 include/svx/svdmark.hxx                                    |    2 -
 include/svx/svdoattr.hxx                                   |    7 ------
 include/svx/svdobj.hxx                                     |   11 ----------
 include/svx/svdomedia.hxx                                  |    2 -
 include/svx/svdoole2.hxx                                   |    2 -
 include/svx/svdotable.hxx                                  |    6 -----
 include/svx/svdotext.hxx                                   |    4 ---
 include/svx/svdouno.hxx                                    |    2 -
 include/svx/svdpagv.hxx                                    |    5 ----
 include/svx/svdpntv.hxx                                    |   14 -------------
 include/svx/svdpool.hxx                                    |    3 --
 include/svx/svdsnpv.hxx                                    |    1 
 include/svx/svdtext.hxx                                    |    7 ------
 include/svx/svdundo.hxx                                    |    3 --
 include/svx/svdview.hxx                                    |    1 
 include/svx/svdviter.hxx                                   |    1 
 include/svx/svxdlg.hxx                                     |   13 ------------
 include/svx/tabline.hxx                                    |    4 ---
 include/svx/tbcontrl.hxx                                   |    3 --
 include/svx/ucsubset.hxx                                   |    2 -
 include/svx/unoapi.hxx                                     |    2 -
 include/svx/unopage.hxx                                    |    2 -
 include/svx/unoshape.hxx                                   |    3 --
 include/svx/unoshtxt.hxx                                   |   11 ----------
 include/svx/viewpt3d.hxx                                   |    3 --
 include/svx/xcolit.hxx                                     |    2 -
 include/svx/xmlsecctrl.hxx                                 |    2 -
 include/svx/xoutbmp.hxx                                    |    5 ----
 include/svx/xpoly.hxx                                      |    3 --
 include/toolkit/helper/vclunohelper.hxx                    |    2 -
 include/tools/fract.hxx                                    |    2 -
 include/tools/gen.hxx                                      |    5 ----
 include/tools/stream.hxx                                   |    2 -
 include/ucbhelper/resultsethelper.hxx                      |    4 ---
 include/unotest/macros_test.hxx                            |    4 ---
 include/unotools/cmdoptions.hxx                            |    4 ---
 include/unotools/configitem.hxx                            |    3 --
 include/unotools/configvaluecontainer.hxx                  |    1 
 include/unotools/localedatawrapper.hxx                     |    1 
 include/unotools/textsearch.hxx                            |    2 -
 include/unotools/useroptions.hxx                           |    2 -
 include/vbahelper/vbaeventshelperbase.hxx                  |    1 
 include/vcl/IDialogRenderable.hxx                          |    2 -
 include/vcl/QueueInfo.hxx                                  |    2 -
 include/vcl/abstdlg.hxx                                    |    1 
 include/vcl/accessibility/vclxaccessiblecomponent.hxx      |    1 
 include/vcl/accessiblefactory.hxx                          |    1 
 include/vcl/bitmap.hxx                                     |    6 -----
 include/vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx   |    1 
 include/vcl/bitmap/Vectorizer.hxx                          |    2 +
 include/vcl/errinf.hxx                                     |    1 
 include/vcl/filter/pdfdocument.hxx                         |   10 ---------
 include/vcl/gradient.hxx                                   |    1 
 include/vcl/graph.hxx                                      |    2 -
 include/vcl/graphicfilter.hxx                              |    1 
 include/vcl/imap.hxx                                       |    1 
 include/vcl/layout.hxx                                     |    1 
 include/vcl/mapmod.hxx                                     |    1 
 include/vcl/metaact.hxx                                    |    1 
 include/vcl/mtfxmldump.hxx                                 |    2 -
 include/vcl/notebookbar/notebookbar.hxx                    |    3 --
 include/vcl/outdev.hxx                                     |   11 ----------
 include/vcl/pdfread.hxx                                    |    6 -----
 include/vcl/svapp.hxx                                      |    1 
 include/vcl/toolkit/vclmedit.hxx                           |    1 
 include/vcl/transfer.hxx                                   |    2 -
 include/vcl/uitest/logger.hxx                              |    8 -------
 include/vcl/unohelp.hxx                                    |    3 --
 include/vcl/vclevent.hxx                                   |    4 ---
 include/vcl/vcllayout.hxx                                  |    1 
 include/vcl/wall.hxx                                       |    4 ---
 include/vcl/weld.hxx                                       |    1 
 include/vcl/window.hxx                                     |   11 ----------
 include/vcl/wizardmachine.hxx                              |    6 -----
 include/xmloff/DocumentSettingsContext.hxx                 |    2 -
 include/xmloff/SchXMLImportHelper.hxx                      |    5 ----
 include/xmloff/XMLBase64ImportContext.hxx                  |    1 
 include/xmloff/XMLTextMasterPageContext.hxx                |    4 +--
 include/xmloff/animexp.hxx                                 |    1 
 include/xmloff/formlayerimport.hxx                         |    1 
 include/xmloff/shapeimport.hxx                             |    2 -
 include/xmloff/txtimp.hxx                                  |    2 -
 include/xmloff/xmlexp.hxx                                  |    1 
 include/xmloff/xmlictxt.hxx                                |    2 -
 include/xmloff/xmlimppr.hxx                                |    1 
 include/xmloff/xmlnume.hxx                                 |    1 
 include/xmloff/xmlnumfe.hxx                                |    1 
 include/xmloff/xmlnumfi.hxx                                |    1 
 include/xmloff/xmlstyle.hxx                                |    1 
 oox/source/ppt/pptshapegroupcontext.cxx                    |    1 
 sc/inc/autoform.hxx                                        |    1 
 sc/source/filter/inc/lotfntbf.hxx                          |    1 
 sd/inc/sdpage.hxx                                          |    1 
 sd/source/ui/sidebar/MasterPageContainer.hxx               |    2 +
 sd/source/ui/slideshow/slideshowimpl.hxx                   |    1 
 sw/inc/fmtautofmt.hxx                                      |    2 +
 sw/inc/unoparagraph.hxx                                    |    1 
 sw/source/ui/vba/vbaeventshelper.hxx                       |    2 +
 vcl/inc/textlayout.hxx                                     |    1 
 vcl/inc/wizdlg.hxx                                         |    2 +
 199 files changed, 41 insertions(+), 465 deletions(-)

New commits:
commit 72df5a6fdf3e14d9994ebd1de269ab712136a27a
Author:     Gabor Kelemen <[email protected]>
AuthorDate: Tue Dec 24 23:16:02 2024 +0100
Commit:     Miklos Vajna <[email protected]>
CommitDate: Fri Jan 3 09:32:27 2025 +0100

    Drop unneeded forward declarations from include/
    
    test drive the new bin/find-unneeded-includes --fwdecl mode
    
    Change-Id: I507fa2b172ec9e348d1d91066ea241f02187b5ed
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179321
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <[email protected]>

diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx 
b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index 86f749a26850..0b570d651d1f 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -20,6 +20,8 @@
 
 #include <sfx2/tabdlg.hxx>
 
+class SvNumberFormatter;
+
 namespace chart
 {
 class AxisPositionsTabPage : public SfxTabPage
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx 
b/chart2/source/controller/dialogs/tp_Scale.hxx
index b90d3ef20211..928637101a67 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -21,6 +21,8 @@
 #include <sfx2/tabdlg.hxx>
 #include <unotools/resmgr.hxx>
 
+class SvNumberFormatter;
+
 namespace chart
 {
 
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx 
b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index 621f096753e4..f16aee1e611b 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -22,6 +22,8 @@
 #include <sfx2/tabdlg.hxx>
 #include <vcl/graph.hxx>
 
+class SvNumberFormatter;
+
 namespace com::sun::star::util { class XNumberFormatsSupplier; }
 
 namespace chart
diff --git a/extensions/source/bibliography/toolbar.hxx 
b/extensions/source/bibliography/toolbar.hxx
index d4e45b2e0b80..2ccc43cfff7a 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -28,6 +28,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <vector>
 
+class VclSimpleEvent;
 class BibDataManager;
 class BibToolBar;
 
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx 
b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index cc5331b741d4..ad50ff1942c5 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -28,6 +28,8 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
+namespace com::sun::star::uno { class XComponentContext; }
+
 namespace formula
 {
     using namespace ::com::sun::star;
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx 
b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 629f50b2b4a2..f892b3af816d 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -39,6 +39,8 @@
 
 #include <cppuhelper/implbase.hxx>
 
+class VclSimpleEvent;
+
 namespace framework
 {
 
diff --git a/include/basctl/scriptdocument.hxx 
b/include/basctl/scriptdocument.hxx
index 645ca1ab055f..bb0c529a7f3c 100644
--- a/include/basctl/scriptdocument.hxx
+++ b/include/basctl/scriptdocument.hxx
@@ -29,8 +29,6 @@
 #include <memory>
 #include <vector>
 
-class SfxListener;
-
 class BasicManager;
 
 
diff --git a/include/basegfx/utils/canvastools.hxx 
b/include/basegfx/utils/canvastools.hxx
index 46466097723d..a7e1d4ef373b 100644
--- a/include/basegfx/utils/canvastools.hxx
+++ b/include/basegfx/utils/canvastools.hxx
@@ -52,11 +52,9 @@ namespace basegfx
 {
     class B2DHomMatrix;
     class B3DHomMatrix;
-    class B2DVector;
     class B2DPoint;
     class B2DRange;
     class B3DRange;
-    class B2IVector;
     class B2IRange;
     class B2DPolygon;
     class B2DPolyPolygon;
diff --git a/include/codemaker/commoncpp.hxx b/include/codemaker/commoncpp.hxx
index 8d00cc799c24..13d9c54582f1 100644
--- a/include/codemaker/commoncpp.hxx
+++ b/include/codemaker/commoncpp.hxx
@@ -27,7 +27,6 @@
 
 namespace rtl {
     class OString;
-    class OUString;
 }
 
 namespace codemaker::cpp {
diff --git a/include/comphelper/MasterPropertySet.hxx 
b/include/comphelper/MasterPropertySet.hxx
index f69c28299d03..3288a866ccb4 100644
--- a/include/comphelper/MasterPropertySet.hxx
+++ b/include/comphelper/MasterPropertySet.hxx
@@ -33,7 +33,6 @@ namespace comphelper { struct PropertyInfo; }
 namespace comphelper
 {
     class MasterPropertySetInfo;
-    class ChainablePropertySet;
     struct SlaveData
     {
         rtl::Reference < ChainablePropertySet > mxSlave;
diff --git a/include/comphelper/docpasswordrequest.hxx 
b/include/comphelper/docpasswordrequest.hxx
index e57c293df9fd..c1c4b7b9d87e 100644
--- a/include/comphelper/docpasswordrequest.hxx
+++ b/include/comphelper/docpasswordrequest.hxx
@@ -26,8 +26,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
-namespace com::sun::star::task { class XInteractionAbort; }
-
 namespace comphelper {
 
 class PasswordContinuation;
diff --git a/include/comphelper/interfacecontainer3.hxx 
b/include/comphelper/interfacecontainer3.hxx
index be140d32289f..ebed65aad3ea 100644
--- a/include/comphelper/interfacecontainer3.hxx
+++ b/include/comphelper/interfacecontainer3.hxx
@@ -29,10 +29,6 @@ namespace com::sun::star::uno
 {
 class XInterface;
 }
-namespace osl
-{
-class Mutex;
-}
 
 namespace comphelper
 {
diff --git a/include/comphelper/multiinterfacecontainer3.hxx 
b/include/comphelper/multiinterfacecontainer3.hxx
index 87199885e71e..2ce01aaaae54 100644
--- a/include/comphelper/multiinterfacecontainer3.hxx
+++ b/include/comphelper/multiinterfacecontainer3.hxx
@@ -25,11 +25,6 @@
 #include <memory>
 #include <vector>
 
-namespace osl
-{
-class Mutex;
-}
-
 namespace comphelper
 {
 /**
diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx
index 9e6a4eff0e5d..9f58a2e1442d 100644
--- a/include/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
@@ -30,7 +30,6 @@ namespace com::sun::star::awt {
 }
 
 namespace com::sun::star::uno { class Any; }
-namespace com::sun::star::uno { class XInterface; }
 
 
 namespace comphelper
diff --git a/include/dbaccess/genericcontroller.hxx 
b/include/dbaccess/genericcontroller.hxx
index eabf2b67ff24..c155b35d0889 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -198,8 +198,6 @@ namespace dbaui
                                            ,   css::awt::XUserInputInterception
                                            >   OGenericUnoController_Base;
 
-    struct OGenericUnoController_Data;
-
     class UNLESS_MERGELIBS_MORE(DBACCESS_DLLPUBLIC) OGenericUnoController
                                 :public OGenericUnoController_MBASE
                                 ,public OGenericUnoController_Base
diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx 
b/include/drawinglayer/attribute/fillgradientattribute.hxx
index 62b890b5f0c1..374953fbf1c4 100644
--- a/include/drawinglayer/attribute/fillgradientattribute.hxx
+++ b/include/drawinglayer/attribute/fillgradientattribute.hxx
@@ -25,8 +25,6 @@
 
 namespace basegfx
 {
-class BColorStop;
-class BColor;
 class BColorStops;
 }
 
diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx 
b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index 3dcb3153a1ba..210e74b9534e 100644
--- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -25,8 +25,6 @@
 #include <drawinglayer/attribute/lineattribute.hxx>
 #include <drawinglayer/attribute/strokeattribute.hxx>
 
-enum class SvxBorderLineStyle : sal_Int16;
-
 namespace drawinglayer::primitive2d
 {
 /** BorderLine class
diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx 
b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
index 7aacceeef7fd..9c4bf48060ea 100644
--- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx
+++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
@@ -39,10 +39,6 @@ namespace vcl
 {
 class Font;
 }
-namespace vcl::font
-{
-class EmphasisMark;
-}
 namespace tools
 {
 class Rectangle;
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index a5dde05c00c7..8695b3ae0f14 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -71,7 +71,6 @@ struct SpellPortion;
 typedef std::vector<SpellPortion> SpellPortions;
 }
 
-class SfxUndoManager;
 namespace basegfx { class B2DPolyPolygon; }
 namespace editeng {
     struct MisspellRanges;
diff --git a/include/editeng/eeitem.hxx b/include/editeng/eeitem.hxx
index eb3c6a3e91e9..f8c3d585fc24 100644
--- a/include/editeng/eeitem.hxx
+++ b/include/editeng/eeitem.hxx
@@ -60,7 +60,6 @@ class SvxBulletItem;
 class SvxNumBulletItem;
 class SvxJustifyMethodItem;
 class SvxVerJustifyItem;
-class SfxVoidItem;
 
 /*
  * NOTE: Changes in this file will probably require
diff --git a/include/editeng/legacyitem.hxx b/include/editeng/legacyitem.hxx
index d92bcb59da43..ddeb7c4e64bd 100644
--- a/include/editeng/legacyitem.hxx
+++ b/include/editeng/legacyitem.hxx
@@ -50,7 +50,6 @@ class SvxWeightItem;
 class SvxPostureItem;
 class SvxTextLineItem;
 class SvxCrossedOutItem;
-class SvxShadowedItem;
 class SvxColorItem;
 class SvxBoxItem;
 class SvxLineItem;
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index d30a9795a743..f99df2a51612 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -43,7 +43,6 @@ class SvxAutoCorrect;
 class SfxObjectShell;
 namespace vcl { class Window; }
 namespace com::sun::star::embed { class XStorage; }
-namespace tools { template <typename T> class SvRef; }
 
 struct CompareSvStringsISortDtor
 {
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 33e6eaf32b11..e7d836518ab4 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -33,7 +33,6 @@
 #include <map>
 #include <memory>
 
-struct SvxRTFStyleType;
 class SvxRTFItemStackType;
 class SvxRTFItemStackList : public 
std::vector<std::unique_ptr<SvxRTFItemStackType>> {};
 
diff --git a/include/editeng/unoipset.hxx b/include/editeng/unoipset.hxx
index e1e84b8270ac..9c7f88985d47 100644
--- a/include/editeng/unoipset.hxx
+++ b/include/editeng/unoipset.hxx
@@ -25,8 +25,6 @@
 #include <svl/itemprop.hxx>
 #include <vector>
 
-namespace com::sun::star::beans { class XPropertySetInfo; }
-
 class SfxItemSet;
 class SvxItemPropertySetUsrAnys;
 
diff --git a/include/filter/msfilter/msvbahelper.hxx 
b/include/filter/msfilter/msvbahelper.hxx
index 90f1f8a2b90f..7a2d9e88584d 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -37,8 +37,6 @@
 
 namespace com::sun::star {
     namespace frame { class XModel; }
-    namespace uno { class XComponentContext; }
-    namespace uno { class XInterface; }
 }
 
 class SfxObjectShell;
diff --git a/include/formula/FormulaOpCodeMapperObj.hxx 
b/include/formula/FormulaOpCodeMapperObj.hxx
index 7e5928a1b3ba..7904506231a3 100644
--- a/include/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
@@ -33,8 +33,6 @@
 namespace com::sun::star {
     namespace sheet { struct FormulaOpCodeMapEntry; }
     namespace sheet { struct FormulaToken; }
-    namespace uno { class XComponentContext; }
-    namespace uno { class XInterface; }
 }
 
 namespace formula
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index 06a932b272b3..c99daabcfe97 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -32,7 +32,6 @@
 #include <sfx2/basedlgs.hxx>
 #include <tools/gen.hxx>
 
-class NotifyEvent;
 class SfxBindings;
 class SfxChildWindow;
 
diff --git a/include/framework/dispatchhelper.hxx 
b/include/framework/dispatchhelper.hxx
index 399d3f0ecb02..e25ff291def4 100644
--- a/include/framework/dispatchhelper.hxx
+++ b/include/framework/dispatchhelper.hxx
@@ -31,14 +31,6 @@
 #include <condition_variable>
 #include <mutex>
 
-namespace com::sun::star::lang
-{
-class XMultiServiceFactory;
-}
-namespace com::sun::star::lang
-{
-class XSingleServiceFactory;
-}
 namespace com::sun::star::uno
 {
 class XComponentContext;
diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx
index e7bfbaaa4360..05f6daffee40 100644
--- a/include/oox/core/binarycodec.hxx
+++ b/include/oox/core/binarycodec.hxx
@@ -25,10 +25,6 @@
 #include <oox/dllapi.h>
 #include <sal/types.h>
 
-namespace com::sun::star {
-    namespace beans { struct NamedValue; }
-}
-
 namespace oox { class AttributeList; }
 
 namespace oox::core::CodecHelper
diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx
index 058bd344b5e6..c3a85ef1f854 100644
--- a/include/oox/core/fastparser.hxx
+++ b/include/oox/core/fastparser.hxx
@@ -28,9 +28,7 @@
 
 namespace com::sun::star {
     namespace io { class XInputStream; }
-    namespace uno { class XComponentContext; }
     namespace xml::sax { class XFastDocumentHandler; }
-    namespace xml::sax { class XFastParser; }
     namespace xml::sax { class XFastTokenHandler; }
     namespace xml::sax { struct InputSource; }
 }
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index eec0d6a19cef..8390f27de233 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -39,7 +39,6 @@
 
 namespace com::sun::star {
     namespace beans { struct PropertyValue; }
-    namespace drawing { class XShape; }
     namespace frame { class XFrame; }
     namespace frame { class XModel; }
     namespace io { class XInputStream; }
diff --git a/include/oox/core/xmlfilterbase.hxx 
b/include/oox/core/xmlfilterbase.hxx
index 0c6226452d5d..a5b6e7f4e47d 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -33,12 +33,10 @@
 
 namespace com::sun::star {
     namespace document { class XDocumentProperties; }
+    namespace drawing { class XShape; }
     namespace io { class XInputStream; }
     namespace io { class XOutputStream; }
     namespace io { class XStream; }
-    namespace text { class XText; }
-    namespace text { class XTextCursor; }
-    namespace text { class XTextField; }
     namespace uno { class XComponentContext; }
     namespace xml::dom { class XDocument; }
     namespace xml::sax { class XFastSAXSerializable; }
diff --git a/include/oox/crypto/DocumentDecryption.hxx 
b/include/oox/crypto/DocumentDecryption.hxx
index fc3c4af6a5b2..f03cb37199de 100644
--- a/include/oox/crypto/DocumentDecryption.hxx
+++ b/include/oox/crypto/DocumentDecryption.hxx
@@ -18,7 +18,6 @@
 
 namespace com::sun::star {
     namespace beans { struct NamedValue; }
-    namespace io { class XInputStream; }
     namespace io { class XStream; }
     namespace uno { class XComponentContext; }
     namespace packages { class XPackageEncryption; }
diff --git a/include/oox/drawingml/connectorshapecontext.hxx 
b/include/oox/drawingml/connectorshapecontext.hxx
index 2b95ff4f3d4c..9831b5639d02 100644
--- a/include/oox/drawingml/connectorshapecontext.hxx
+++ b/include/oox/drawingml/connectorshapecontext.hxx
@@ -28,7 +28,6 @@
 #include <vector>
 
 namespace oox { class AttributeList; }
-namespace oox::core { class ContextHandler2Helper; }
 
 namespace oox::drawingml {
 
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 81797757faaf..244c579548b2 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -57,10 +57,6 @@ namespace oox::vml {
     struct OleObjectInfo;
 }
 
-namespace svx::diagram {
-    class IDiagramHelper;
-}
-
 namespace oox::drawingml {
 
 class Theme;
diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx
index 96acd26168e9..42cc969b2a89 100644
--- a/include/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
@@ -34,7 +34,6 @@ namespace com::sun::star {
 
 namespace oox {
     class BinaryInputStream;
-    class SequenceInputStream;
 }
 
 namespace oox::core { class FilterBase; }
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 97084b827559..139001a2369f 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -50,7 +50,6 @@ namespace sax_fastparser {
     class FastAttributeList;
 }
 
-class Point;
 namespace tools { class Rectangle; }
 class SdrObject;
 
diff --git a/include/oox/helper/graphichelper.hxx 
b/include/oox/helper/graphichelper.hxx
index 906d7330dff3..87e7e85c9415 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -40,12 +40,9 @@ class OutputDevice;
 namespace com::sun::star {
     namespace awt { struct Point; }
     namespace awt { struct Size; }
-    namespace awt { class XUnitConversion; }
     namespace io { class XInputStream; }
     namespace frame { class XFrame; }
     namespace graphic { class XGraphic; }
-    namespace graphic { class XGraphicObject; }
-    namespace graphic { class XGraphicProvider; }
     namespace uno { class XComponentContext; }
 }
 
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index 02c60a69a759..aff08926bcfa 100644
--- a/include/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
@@ -32,7 +32,6 @@
 namespace basegfx { class B2DHomMatrix; }
 
 namespace com::sun::star {
-    namespace awt { struct Rectangle; }
     namespace drawing { class XShapes; }
 }
 
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx 
b/include/oox/ppt/pptshapegroupcontext.hxx
index 22a02e5a63ac..f593d3b3b20c 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -28,7 +28,6 @@
 
 namespace oox {
     class AttributeList;
-    namespace core { class ContextHandler2Helper; }
     namespace drawingml { class Color; }
 }
 
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 216b101923d4..c52a1258b700 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -37,7 +37,6 @@ class SfxWorkWindow;
 class SfxModule;
 class SfxChildWindow;
 class SfxBindings;
-class SfxModelessDialogController;
 
 enum class SfxChildWindowFlags
 {
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 6963484b3b0e..5bf9a313a904 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -43,7 +43,6 @@ struct SfxDispatcher_Impl;
 class VCLXPopupMenu;
 class SfxPoolItemHolder;
 
-namespace com::sun::star::awt { class XPopupMenu; }
 namespace vcl { class Window; }
 
 enum class SfxDispatcherPopFlags
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 4054770002c9..d45b9094c9f7 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -32,7 +32,6 @@
 namespace com::sun::star::frame { class XFrame; }
 
 class SfxDockingWindow_Impl;
-enum class SplitWindowItemFlags;
 
 void SfxDockingWindowFactory( const css::uno::Reference< css::frame::XFrame >& 
rFrame, std::u16string_view rDockingWindowName );
 bool IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& 
rFrame, std::u16string_view rDockingWindowName );
diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx 
b/include/sfx2/notebookbar/SfxNotebookBar.hxx
index 47bd9cc79901..b19db5d2cf2d 100644
--- a/include/sfx2/notebookbar/SfxNotebookBar.hxx
+++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx
@@ -32,7 +32,6 @@ class SfxBindings;
 class SfxViewFrame;
 class SfxViewShell;
 class SystemWindow;
-class ViewInstanceManager;
 
 namespace sfx2
 {
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 7e6682c57bee..de6b46e23ea8 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -101,7 +101,6 @@ namespace com::sun::star::beans { struct PropertyValue; }
 namespace com::sun::star::document { struct CmisVersion; }
 namespace com::sun::star::document { class XDocumentProperties; }
 namespace com::sun::star::embed { class XStorage; }
-namespace com::sun::star::frame { class XModel; }
 namespace com::sun::star::graphic { class XGraphic; }
 namespace com::sun::star::io { class XStream; }
 namespace com::sun::star::script { class XLibraryContainer; }
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 9a07c16c0c23..ac736e4709cd 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -65,7 +65,6 @@
 
 #include <memory>
 
-class ErrCode;
 class ErrCodeMsg;
 class SfxMedium;
 class   SfxObjectShell                      ;
diff --git a/include/sfx2/sfxmodelfactory.hxx b/include/sfx2/sfxmodelfactory.hxx
index 4d166c4d4eed..dd5e19346509 100644
--- a/include/sfx2/sfxmodelfactory.hxx
+++ b/include/sfx2/sfxmodelfactory.hxx
@@ -26,10 +26,7 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <functional>
 
-namespace com::sun::star::lang { class XMultiServiceFactory; }
-namespace com::sun::star::lang { class XSingleServiceFactory; }
 namespace com::sun::star::uno { class XInterface; }
-namespace com::sun::star::uno { class XComponentContext; }
 namespace com::sun::star::uno { template <class E> class Sequence; }
 
 enum class SfxModelFlags
diff --git a/include/sfx2/sidebar/ControllerItem.hxx 
b/include/sfx2/sidebar/ControllerItem.hxx
index 5d7e7918a71b..1184bbad6bc1 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -20,8 +20,6 @@
 
 #include <sfx2/ctrlitem.hxx>
 
-namespace com::sun::star::lang { class XComponent; }
-
 
 namespace sfx2::sidebar {
 
diff --git a/include/sfx2/sidebar/SidebarDockingWindow.hxx 
b/include/sfx2/sidebar/SidebarDockingWindow.hxx
index f433086297cf..84b87b837611 100644
--- a/include/sfx2/sidebar/SidebarDockingWindow.hxx
+++ b/include/sfx2/sidebar/SidebarDockingWindow.hxx
@@ -22,8 +22,6 @@
 
 #include <rtl/ref.hxx>
 
-class SfxViewShell;
-
 namespace svt { class AcceleratorExecute; }
 
 namespace sfx2::sidebar {
diff --git a/include/sfx2/thumbnailviewitem.hxx 
b/include/sfx2/thumbnailviewitem.hxx
index 2aced41486c0..dd417d8d4cad 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -26,7 +26,6 @@
 #include <sfx2/dllapi.h>
 #include <rtl/ref.hxx>
 
-namespace com::sun::star::accessibility { class XAccessible; }
 namespace drawinglayer::primitive2d { class Primitive2DContainer; }
 class ThumbnailViewItemAcc;
 
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index bfd43c67101e..b32668725b50 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -39,8 +39,6 @@
 
 class SfxTabPage;
 class SfxBaseController;
-class Size;
-class Point;
 class Fraction;
 namespace weld {
     class Container;
@@ -63,7 +61,6 @@ class VCLXPopupMenu;
 namespace rtl { class OStringBuffer; }
 namespace vcl { class PrinterController; }
 
-namespace com::sun::star::awt{ class XPopupMenu; }
 namespace com::sun::star::beans { struct PropertyValue; }
 namespace com::sun::star::datatransfer::clipboard { class XClipboardListener; }
 namespace com::sun::star::datatransfer::clipboard { class XClipboardNotifier; }
@@ -74,7 +71,6 @@ namespace com::sun::star::ui { class XContextMenuInterceptor; 
}
 namespace com::sun::star::ui { struct ContextMenuExecuteEvent; }
 namespace com::sun::star::view { class XRenderable; }
 namespace com::sun::star::security { class XCertificate; }
-namespace tools { class Rectangle; }
 namespace svtools { enum ColorConfigEntry : int; }
 
 enum class SfxPrinterChangeFlags
diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx
index ac32bab18ca9..f269e65582a8 100644
--- a/include/svl/flagitem.hxx
+++ b/include/svl/flagitem.hxx
@@ -23,8 +23,6 @@
 #include <svl/svldllapi.h>
 #include <tools/debug.hxx>
 
-class SvStream;
-
 class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem
 {
     sal_uInt16                   nVal;
diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx
index f06eb7fd6902..4ef7e4d47f1e 100644
--- a/include/svl/imageitm.hxx
+++ b/include/svl/imageitm.hxx
@@ -24,7 +24,6 @@
 #include <svl/intitem.hxx>
 #include <tools/degree.hxx>
 
-struct SfxImageItem_Impl;
 class SVL_DLLPUBLIC SfxImageItem final : public SfxInt16Item
 {
 public:
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 873d56bc0e75..d4e078d94b90 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -44,6 +44,8 @@
 // GetItemSurrogates impl that will mention that
 #define SFX_ITEMINFOFLAG_SUPPORT_SURROGATE  0x0001
 
+class SfxItemSet;
+
 class SVL_DLLPUBLIC ItemInfo
 {
     sal_uInt16          m_nWhich;
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 85bdef1c563e..43dc82143339 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -534,7 +534,6 @@ SVL_DLLPUBLIC void listAllocatedSfxPoolItems();
 #endif
 
 class SfxItemPool;
-class SfxItemSet;
 typedef struct _xmlTextWriter* xmlTextWriterPtr;
 class ItemInstanceManager;
 
diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx
index 90db98bbc869..763d2d859663 100644
--- a/include/svl/ptitem.hxx
+++ b/include/svl/ptitem.hxx
@@ -24,8 +24,6 @@
 #include <tools/gen.hxx>
 #include <tools/debug.hxx>
 
-class SvStream;
-
 class SVL_DLLPUBLIC SfxPointItem final : public SfxPoolItem
 {
     Point                    aVal;
diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx
index 26c2acd37b65..0b7dadb88a33 100644
--- a/include/svl/rectitem.hxx
+++ b/include/svl/rectitem.hxx
@@ -23,8 +23,6 @@
 #include <tools/gen.hxx>
 #include <svl/poolitem.hxx>
 
-class SvStream;
-
 class SVL_DLLPUBLIC SfxRectangleItem final : public SfxPoolItem
 {
     tools::Rectangle                maVal;
diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx
index 8e41184749b1..6276863a47de 100644
--- a/include/svl/rngitem.hxx
+++ b/include/svl/rngitem.hxx
@@ -24,8 +24,6 @@
 #include <svl/svldllapi.h>
 #include <svl/poolitem.hxx>
 
-class SvStream;
-
 
 class UNLESS_MERGELIBS_MORE(SVL_DLLPUBLIC) SfxRangeItem final : public 
SfxPoolItem
 {
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 1882a1a2f5e8..1a1d589fd684 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -80,7 +80,6 @@ namespace o3tl {
 class SfxItemSet;
 class SfxItemPool;
 class SfxStyleSheetBasePool;
-class SvStream;
 
 namespace svl { class IndexedStyleSheets; }
 /*
diff --git a/include/svl/whiter.hxx b/include/svl/whiter.hxx
index f83126a8ccdb..c72cd06b72ca 100644
--- a/include/svl/whiter.hxx
+++ b/include/svl/whiter.hxx
@@ -22,9 +22,6 @@
 #include <svl/whichranges.hxx>
 #include <svl/itemset.hxx>
 
-class SfxPoolItem;
-enum class SfxItemState;
-
 /**
  * Iterates over the which ids and the pool items arrays together (which are 
stored in parallel arrays).
  * Primarily so that we can call GetItemSet on the SfxItemSet and pass in a 
hint, which avoids
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 2ff0d9df756c..82aa5e845b09 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -31,6 +31,7 @@ namespace utl {
 namespace com::sun::star::i18n { struct NativeNumberXmlAttributes2; }
 
 class Color;
+class CalendarWrapper;
 
 class SvNFLanguageData;
 
diff --git a/include/svtools/editbrowsebox.hxx 
b/include/svtools/editbrowsebox.hxx
index 8acd3fd760c9..10110c44f867 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -30,8 +30,6 @@
 #include <vcl/weldutils.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-class BrowserDataWin;
-
 // EditBrowseBoxFlags (EBBF)
 enum class EditBrowseBoxFlags
 {
diff --git a/include/svtools/genericunodialog.hxx 
b/include/svtools/genericunodialog.hxx
index d21d76291d8d..c163ee203f13 100644
--- a/include/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
@@ -34,8 +34,6 @@
 namespace com :: sun :: star :: awt { class XWindow; }
 namespace com :: sun :: star :: uno { class XComponentContext; }
 
-class VclWindowEvent;
-
 
 namespace svt
 {
diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx
index 226e92bc68d3..ff9320c0fc9d 100644
--- a/include/svtools/miscopt.hxx
+++ b/include/svtools/miscopt.hxx
@@ -35,7 +35,6 @@ class LinkParamNone;
 
*//*-*************************************************************************************************************/
 
 class SvtMiscOptions_Impl;
-enum class ToolBoxButtonSize;
 
 
/*-************************************************************************************************************
     @short          collect information about misc group
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 2ec0cfbfef6d..e7a9e97275b8 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -24,7 +24,6 @@
 #include <vcl/weld.hxx>
 #include <vcl/timer.hxx>
 
-class Printer;
 class QueueInfo;
 class VclSimpleEvent;
 
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 2244dfc805af..b2b7d5a12673 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -28,11 +28,7 @@
 #include <vector>
 
 class MouseEvent;
-class TrackingEvent;
-class HelpEvent;
 class KeyEvent;
-class DataChangedEvent;
-class ScrollBar;
 class UserDrawEvent;
 class VirtualDevice;
 class ValueSetAcc;
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index 4149721e16de..3ee141cddcd8 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -55,7 +55,6 @@ namespace com::sun::star {
     namespace beans { struct PropertyValue; }
     namespace document { struct EventObject; }
     namespace drawing { class XShape; }
-    namespace uno { class XInterface; }
 }
 
 class SdrObject;
diff --git a/include/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx
index 6ee235cb7a95..f821d339a7f3 100644
--- a/include/svx/SmartTagMgr.hxx
+++ b/include/svx/SmartTagMgr.hxx
@@ -53,7 +53,6 @@ namespace com::sun::star::i18n {
 namespace com::sun::star::lang {
     struct Locale;
     struct EventObject;
-    struct ChangesEvent;
 }
 
 namespace com::sun::star::beans {
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index d88db32426a7..5ec8004cd8f3 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -43,8 +43,6 @@ public:
     Color GetColor();
 };
 
-class Button;
-
 #define COL_NONE_COLOR    ::Color(ColorTransparency, 0x80, 0xFF, 0xFF, 0xFF)
 
 class SvxColorToolBoxControl;
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index c098efa6a11b..9a0551698e95 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -37,8 +37,6 @@ namespace utl {
 
 namespace comphelper::string { class NaturalStringSorter; }
 
-class Point;
-class SvViewDataEntry;
 class SvtCalendarBox;
 
 enum class SvxRedlinDateMode
diff --git a/include/svx/cuicharmap.hxx b/include/svx/cuicharmap.hxx
index 006cdba0a402..44779c02ddef 100644
--- a/include/svx/cuicharmap.hxx
+++ b/include/svx/cuicharmap.hxx
@@ -33,12 +33,6 @@
 #include <memory>
 
 using namespace ::com::sun::star;
-class SubsetMap;
-
-namespace svx
-{
-struct SvxShowCharSetItem;
-}
 
 /// Provides the show characters or texts in a drawing area with special sizes 
and fonts.
 class SVX_DLLPUBLIC SvxShowText final : public weld::CustomWidgetController
diff --git a/include/svx/diagram/IDiagramHelper.hxx 
b/include/svx/diagram/IDiagramHelper.hxx
index 67142c26e2a7..a6d23b1ab63c 100644
--- a/include/svx/diagram/IDiagramHelper.hxx
+++ b/include/svx/diagram/IDiagramHelper.hxx
@@ -26,7 +26,6 @@
 
 // Forward declarations
 class SdrObjGroup;
-class SdrHdlList;
 
 namespace svx { namespace diagram {
 
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index 8fafb3fc03aa..42ed35598405 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -25,8 +25,6 @@
 #include <vcl/virdev.hxx>
 #include <svx/svxdllapi.h>
 
-class Edit;
-
 namespace svx {
 
 
diff --git a/include/svx/dialog/ThemeDialog.hxx 
b/include/svx/dialog/ThemeDialog.hxx
index 5b534ea4785a..6716bbbe2bea 100644
--- a/include/svx/dialog/ThemeDialog.hxx
+++ b/include/svx/dialog/ThemeDialog.hxx
@@ -20,8 +20,6 @@ namespace model
 class Theme;
 }
 
-class ColorListBox;
-
 namespace svx
 {
 class SVX_DLLPUBLIC ThemeDialog final : public weld::GenericDialogController
diff --git a/include/svx/extedit.hxx b/include/svx/extedit.hxx
index 39d8dba7959a..ec5bde109e44 100644
--- a/include/svx/extedit.hxx
+++ b/include/svx/extedit.hxx
@@ -42,8 +42,6 @@ public:
 };
 
 class FmFormView;
-class SdrObject;
-class SdrGrafObj;
 
 class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SdrExternalToolEdit final
 :   public ExternalToolEdit
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index 0dfc5628b810..34031b6d3f4f 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -32,6 +32,8 @@ namespace com::sun::star {
     }
 }
 
+namespace com::sun::star::awt { class XControlContainer; };
+
 class OutputDevice;
 class FmFormObj;
 class FmFormPage;
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index c889435568a3..b28081695630 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -86,7 +86,6 @@ public:
 };
 
 class SfxListener;
-class GalleryTheme;
 class GalleryThemeCacheEntry;
 
 
diff --git a/include/svx/galleryobjectcollection.hxx 
b/include/svx/galleryobjectcollection.hxx
index 7a3a3af1ef72..c4c8f245723b 100644
--- a/include/svx/galleryobjectcollection.hxx
+++ b/include/svx/galleryobjectcollection.hxx
@@ -28,8 +28,6 @@
 #include <optional>
 #include <vector>
 
-class GalleryObjectStorage;
-
 struct SVXCORE_DLLPUBLIC GalleryObject
 {
     std::optional<INetURLObject> m_oStorageUrl;
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index be4e0330b0e3..bfb1b6bfbf36 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -35,7 +35,6 @@ namespace com::sun::star::awt { class XProgressBar; }
 
 class INetURLObject;
 class GalleryTheme;
-class SotStorageStream;
 
 struct ExchangeData
 {
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 6bdee5cc6477..c3d7d0c185dd 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -35,10 +35,8 @@ namespace comphelper { class OPropertyChangeMultiplexer; }
 namespace com::sun::star::beans { struct PropertyChangeEvent; }
 namespace com::sun::star::container { class XIndexAccess; }
 namespace com::sun::star::sdbc { class XRowSet; }
-namespace com::sun::star::sdb { class XRowsChangeListener; }
 namespace com::sun::star::uno { class XComponentContext; }
 namespace com::sun::star::util { class XNumberFormatter; }
-namespace weld { class Menu; }
 
 class CursorWrapper;
 class GridFieldValueListener;
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index 5d434d1ae9b8..3c72ca4c9060 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -24,7 +24,6 @@
 #include <svx/xtable.hxx>
 #include <vcl/customweld.hxx>
 
-class SfxObjectShell;
 class ValueSet;
 class SvxLineStyleToolBoxControl;
 
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index e7ab9172631d..240cc7a97c88 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -28,9 +28,6 @@ namespace svx {
     class ToolboxButtonLineStyleUpdater;
 }
 
-class XLineStyleItem;
-class XLineDashItem;
-
 typedef std::function<bool(const OUString&, const css::uno::Any&)> 
LineStyleSelectFunction;
 typedef std::function<void(bool)> LineStyleIsNoneFunction;
 
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index dcba2e89d1f6..2b1856188370 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -24,6 +24,8 @@
 #include <editeng/numitem.hxx>
 #include <vcl/font.hxx>
 
+class SfxItemSet;
+
 namespace svx::sidebar {
 
 #define DEFAULT_BULLET_TYPES                            8
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 6876d0c25b30..09ceb4f3e509 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -26,7 +26,6 @@
 namespace weld { class CheckButton; }
 namespace weld { class MetricSpinButton; }
 namespace weld { class SpinButton; }
-namespace weld { class ToggleButton; }
 namespace weld { class Widget; }
 
 class SVX_DLLPUBLIC SvxOptionsGrid
diff --git a/include/svx/sdr/contact/objectcontact.hxx 
b/include/svx/sdr/contact/objectcontact.hxx
index 8d2dc8c6ad8c..eebd209b94aa 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -25,8 +25,6 @@
 #include <svx/svxdllapi.h>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 
-class SdrLayerIDSet;
-namespace tools { class Rectangle; }
 class SdrPageView;
 class OutputDevice;
 
@@ -36,7 +34,6 @@ namespace vcl {
 
 namespace basegfx {
     class B2DRange;
-    class B2DHomMatrix;
 }
 
 namespace sdr::contact {
diff --git a/include/svx/sdr/contact/viewcontact.hxx 
b/include/svx/sdr/contact/viewcontact.hxx
index a3ddcf760a58..9de7b0994b8b 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -24,8 +24,6 @@
 #include <svx/svxdllapi.h>
 #include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 
-class SdrLayerIDSet;
-class SdrPage;
 class SdrObject;
 class SdrPageView;
 
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx 
b/include/svx/sdr/contact/viewobjectcontact.hxx
index 8f903d93e04b..393a23599a6e 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -26,8 +26,6 @@
 
 class SdrPageView;
 
-namespace vcl { class Region; }
-
 namespace sdr::animation {
     class PrimitiveAnimation;
 }
@@ -38,7 +36,6 @@ namespace sdr::contact {
 class DisplayInfo;
 class ObjectContact;
 class ViewContact;
-class ViewObjectContactRedirector;
 
 class SVXCORE_DLLPUBLIC ViewObjectContact
 {
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx 
b/include/svx/sdr/overlay/overlaymanager.hxx
index 696cf5c992c9..350aca310ff1 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -31,13 +31,8 @@
 #include <salhelper/simplereferenceobject.hxx>
 
 class OutputDevice;
-class SdrModel;
 namespace vcl { class Region; }
 
-namespace sdr::overlay {
-    class OverlayObject;
-}
-
 namespace basegfx {
     class B2DRange;
 }
diff --git a/include/svx/sdr/overlay/overlayobject.hxx 
b/include/svx/sdr/overlay/overlayobject.hxx
index 1c8d1d43b17a..1c86264c4540 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -29,18 +29,10 @@
 
 #include <vector>
 
-class OutputDevice;
-
 namespace sdr::overlay
 {
     class OverlayManager;
 }
-namespace basegfx
-{
-    class B2DPolygon;
-    class B2DPolyPolygon;
-    class B2DRange;
-}
 
 namespace sdr::overlay
     {
diff --git a/include/svx/sdr/properties/properties.hxx 
b/include/svx/sdr/properties/properties.hxx
index 24f4baf380cd..dce0c01c1e2b 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -34,9 +34,7 @@ class SdrObject;
 class SfxItemSet;
 class SfxPoolItem;
 class SfxStyleSheet;
-class Fraction;
 class SfxItemPool;
-class SdrModel;
 
 namespace sdr::properties
 {
diff --git a/include/svx/sdr/table/tablecontroller.hxx 
b/include/svx/sdr/table/tablecontroller.hxx
index 2e90e2cbd540..eb86ae2c292a 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -31,7 +31,6 @@
 #include <unotools/weakref.hxx>
 
 struct ImplSVEvent;
-class SdrView;
 class SdrObject;
 class SfxItemSet;
 class SvxBoxInfoItem;
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx 
b/include/svx/sidebar/LinePropertyPanelBase.hxx
index f15f0de9fc2b..dec342627083 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -28,14 +28,8 @@
 #include <com/sun/star/frame/XFrame.hpp>
 
 class ToolbarUnoDispatcher;
-class XLineStyleItem;
-class XLineDashItem;
-class XLineStartItem;
 class XLineWidthItem;
-class XLineEndItem;
-class XLineEndList;
 class XLineTransparenceItem;
-class XDashList;
 
 namespace svx::sidebar
 {
diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx 
b/include/svx/sidebar/SelectionChangeHandler.hxx
index 0a714debb833..2502cb97812f 100644
--- a/include/svx/sidebar/SelectionChangeHandler.hxx
+++ b/include/svx/sidebar/SelectionChangeHandler.hxx
@@ -28,8 +28,6 @@
 
 #include <functional>
 
-class SdrMarkView;
-
 
 namespace svx::sidebar {
 
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index a5ee0f8d8cf1..b862e2db217d 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -32,7 +32,6 @@
 
 class SvxSearchItem;
 class SfxStyleSheetBasePool;
-class SvxJSearchOptionsPage;
 class SvxSearchController;
 class VclAbstractDialog;
 struct SearchDlg_Impl;
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index 71cdf1d17134..68d3a2b49032 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -24,9 +24,6 @@
 #include <svx/svxdllapi.h>
 #include <memory>
 
-class XLineAttrSetItem;
-class XFillAttrSetItem;
-class SdrEdgeObj;
 class SdrObjConnection;
 
 class ImplConnectMarkerOverlay;
diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx
index 0fb939bec6fb..2d7d6a7b86d3 100644
--- a/include/svx/svddrgv.hxx
+++ b/include/svx/svddrgv.hxx
@@ -24,8 +24,6 @@
 #include <svx/svdxcgv.hxx>
 #include <memory>
 
-class SdrUndoGeoObj;
-
 class SVXCORE_DLLPUBLIC SdrDragView : public SdrExchangeView
 {
     friend class                SdrPageView;
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 7d7670048a59..4520c5411b5e 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -27,11 +27,7 @@
 #include <svx/svdundo.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-class SfxUndoAction;
-class SdrUndoAction;
-class SdrUndoGroup;
 class SfxStyleSheet;
-class SdrLayer;
 class SvdProgressInfo;
 
 enum class SdrHorAlign  {
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index b76db7fb9309..aebc9fac5934 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -33,7 +33,6 @@ class SdrOutliner;
 class OutlinerView;
 class EditStatus;
 class EditFieldInfo;
-class ImpSdrEditPara;
 struct PasteOrDropInfos;
 class SdrUndoManager;
 class TextChainCursorManager;
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index bbe8e531028e..da82e1d64245 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -29,13 +29,11 @@
 #include <svx/svxdllapi.h>
 #include <deque>
 
-class OutputDevice;
 class SdrHdlList;
 class SdrMarkView;
 class SdrObject;
 class SdrPageView;
 class MouseEvent;
-class HelpEvent;
 
 namespace sdr::contact {
     class ObjectContact;
diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx
index 3d09b0c4c224..5c7fce68efff 100644
--- a/include/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx
@@ -30,8 +30,6 @@
 #include <vector>
 
 namespace tools { class Rectangle; }
-class SdrPage;
-class SdrObjList;
 class SdrObject;
 class SdrPageView;
 
diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx
index 45f0effd4fed..efea9240bb80 100644
--- a/include/svx/svdoattr.hxx
+++ b/include/svx/svdoattr.hxx
@@ -22,13 +22,6 @@
 #include <svx/svdobj.hxx>
 #include <svx/svxdllapi.h>
 
-//   Initial Declarations
-class SfxPoolItem;
-class SfxSetItem;
-class SdrOutliner;
-class SfxItemSet;
-class SfxItemPool;
-
 //   SdrAttrObj. This is an abstract class, we only instantiate its subclasses.
 class SVXCORE_DLLPUBLIC SdrAttrObj : public SdrObject
 {
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 927d0f55fba2..f5ee902d7778 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -38,12 +38,10 @@
 #include <unordered_set>
 
 class SfxBroadcaster;
-class AutoTimer;
 class E3dObject;
 class E3dScene;
 class OutlinerParaObject;
 class Outliner;
-class SdrOutliner;
 class SdrDragStat;
 class SdrHdl;
 class SdrHdlList;
@@ -55,20 +53,11 @@ class SdrOle2Obj;
 class SdrPage;
 class SdrPageView;
 class SdrTextObj;
-class SdrView;
 class SfxItemSet;
 class SfxGrabBagItem;
-class SfxSetItem;
 class SfxStyleSheet;
-class SfxUndoAction;
-class XFillAttrSetItem;
-class XLineAttrSetItem;
 class SfxItemPool;
-namespace tools { class PolyPolygon; }
-class SfxPoolItem;
 class SdrVirtObj;
-class SdrDragView;
-class SdrObjUserDataList;
 class SdrObjPlusData;
 class SdrGluePoint;
 class SdrGluePointList;
diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx
index b1c5959f4b91..0b705c9d3e08 100644
--- a/include/svx/svdomedia.hxx
+++ b/include/svx/svdomedia.hxx
@@ -24,8 +24,6 @@
 #include <avmedia/mediaitem.hxx>
 #include <svx/svxdllapi.h>
 
-class Graphic;
-
 namespace sdr::contact { class ViewContactOfSdrMediaObj; }
 namespace com::sun::star::graphic { class XGraphic; }
 
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index f116765a16ce..2ccdfae6a284 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -30,8 +30,6 @@ namespace com::sun::star {
 
 namespace awt { class XWindow; }
 
-namespace datatransfer { class XTransferable; }
-
 namespace embed { class XEmbeddedObject; }
 
 namespace frame { class XModel; }
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 54688c17e499..e175185b94c9 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -28,17 +28,11 @@
 #include <boost/property_tree/ptree_fwd.hpp>
 
 class SvStream;
-class SfxStyleSheet;
 class SdrUndoAction;
 
-namespace sdr::contact {
-    class ViewContactOfTableObj;
-}
-
 namespace sdr::table {
 
 class TableLayouter;
-struct ImplTableShadowPaintInfo;
 class TableModel;
 
 #ifndef CellRef
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index c69cfee4c4d6..899e81de4a0a 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -38,17 +38,13 @@
 
 //   forward declarations
 
-class OutlinerParaObject;
-class OverflowingText;
 class SdrOutliner;
 class SdrPathObj;
-class SdrTextObj;
 class SdrTextObjTest;
 class SvxFieldItem;
 class ImpSdrObjTextLink;
 class EditStatus;
 class TextChain;
-class TextChainFlow;
 
 enum class EEAnchorMode;
 enum class EETextFormat;
diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx
index 6054076f30c7..2a96f2a5f1b3 100644
--- a/include/svx/svdouno.hxx
+++ b/include/svx/svdouno.hxx
@@ -30,8 +30,6 @@
 
 // Forward declaration
 class SdrView;
-class SdrPageWindow;
-class SdrControlEventListenerImpl;
 
 namespace sdr::contact {
     class ViewContactOfUnoControl;
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index e52814bb08ae..88b6cab3ee8a 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -36,17 +36,12 @@ namespace vcl { class Region; }
 class SdrObjList;
 class SdrObject;
 class SdrPage;
-class SdrUnoObj;
 class SdrPaintWindow;
 class SdrView;
-class SdrPageObj;
-class SdrPageView;
 
 namespace sdr::contact
 {
     class ViewObjectContactRedirector;
-    class DisplayInfo;
-    class ViewObjectContactRedirector;
 }
 
 // typedefs for a list of SdrPageWindow
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index af03e455914c..e3c9fc1dcc03 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -35,25 +35,12 @@
 
 
 // Pre defines
-class SdrPageWindow;
-
-namespace com::sun::star::awt {
-    class XControlContainer;
-}
 namespace sdr::overlay { class OverlayManager; }
 
 class SdrPage;
-class SdrView;
-class SfxItemSet;
 class SfxStyleSheet;
 class SdrOle2Obj;
 class SdrModel;
-class SdrObject;
-enum class GraphicManagerDrawFlags;
-
-namespace sdr::contact {
-    class ViewObjectContactRedirector;
-}
 
 // Defines for AnimationMode
 enum class SdrAnimationMode
@@ -62,7 +49,6 @@ enum class SdrAnimationMode
     Disable
 };
 
-class SdrPaintView;
 namespace sdr::contact { class ViewObjectContactRedirector; }
 
 namespace vcl {
diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx
index 4889fbb710a6..352b46cdb66f 100644
--- a/include/svx/svdpool.hxx
+++ b/include/svx/svdpool.hxx
@@ -22,9 +22,6 @@
 #include <svx/svxdllapi.h>
 #include <svl/itempool.hxx>
 
-class XLineAttrSetItem;
-class XFillAttrSetItem;
-
 class SVXCORE_DLLPUBLIC SdrItemPool final : public SfxItemPool
 {
 public:
diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx
index 373bbf1d0fbb..5b2dc7fa5987 100644
--- a/include/svx/svdsnpv.hxx
+++ b/include/svx/svdsnpv.hxx
@@ -88,7 +88,6 @@ enum class SdrCrookMode {
 
 
 // #114409#-1 Migrate PageOrigin
-class ImplPageOriginOverlay;
 
 class SVXCORE_DLLPUBLIC SdrSnapView : public SdrPaintView
 {
diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx
index 8a76e435b8e6..63fee82abad7 100644
--- a/include/svx/svdtext.hxx
+++ b/include/svx/svdtext.hxx
@@ -23,18 +23,11 @@
 #include <svx/sdr/properties/defaultproperties.hxx>
 #include <svx/svxdllapi.h>
 
-class OutlinerParaObject;
 class SdrOutliner;
 class SdrTextObj;
-class SdrModel;
 class SfxItemSet;
 enum class OutlinerMode;
 
-namespace sdr::properties
-{
-class TextProperties;
-}
-
 /** This class stores information about one text inside a shape.
 */
 
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index d73dbfd728da..21cc57e6caac 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -35,11 +35,9 @@
 #include <svx/svxdllapi.h>
 #include <unotools/resmgr.hxx>
 
-class SfxItemSet;
 class SfxPoolItem;
 class SfxStyleSheet;
 class SdrView;
-class SdrPageView;
 class SdrModel;
 class SdrObject;
 class SdrPage;
@@ -47,7 +45,6 @@ class SdrObjList;
 class SdrLayer;
 class SdrLayerAdmin;
 class SdrObjGeoData;
-class OutlinerParaObject;
 
 namespace svx { namespace diagram {
     class DiagramDataState;
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index 3e48e4a904c9..afdcda6cf910 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -48,6 +48,7 @@
 //         SdrView         View
 
 class SvxURLField;
+class SdrPageWindow;
 namespace sdr::contact { class ObjectContact; }
 
 enum class SdrViewContext {
diff --git a/include/svx/svdviter.hxx b/include/svx/svdviter.hxx
index 9782efa033e8..c6dfa73266b4 100644
--- a/include/svx/svdviter.hxx
+++ b/include/svx/svdviter.hxx
@@ -52,7 +52,6 @@ Not considered are:
 */
 
 class SdrView;
-class SdrModel;
 class SdrPage;
 class SdrObject;
 
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 90951647ee45..f5def889f668 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -29,30 +29,17 @@
 #include <svx/svxdllapi.h>
 #include <vector>
 
-namespace sd {
-    class View;
-}
-
 namespace com::sun::star::linguistic2 {
     class XDictionary;
-    class XSpellChecker1;
-    class XSpellChecker;
-    class XThesaurus;
-    class XHyphenator;
 }
 class SdrModel;
 class SdrView;
-class SvxSpellWrapper;
 enum class TransliterationFlags;
 struct ExchangeData;
-class INetURLObject;
 class GalleryTheme;
-class SvxHyperlinkTabPageBase;
 class SearchAttrItemList;
-class FmFormShell;
 class Graphic;
 class SdrObject;
-class SvxSpellWrapper;
 struct FmSearchContext;
 
 typedef const WhichRangesContainer & (*DialogGetRanges)();
diff --git a/include/svx/tabline.hxx b/include/svx/tabline.hxx
index 2b6e318da2a2..5383455719ba 100644
--- a/include/svx/tabline.hxx
+++ b/include/svx/tabline.hxx
@@ -19,10 +19,6 @@
 #ifndef INCLUDED_SVX_TABLINE_HXX
 #define INCLUDED_SVX_TABLINE_HXX
 
-class SvxBrushItem;
-class SdrModel;
-class SdrObject;
-
 //defines for the symbol selection on the page
 //Positive value (0,...n) declares the index in pSymbollist, else:
 #define SVX_SYMBOLTYPE_NONE (-3) //symbol hidden
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 6f6a15b7c33c..cad153b999b0 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -138,9 +138,6 @@
 #include <memory>
 
 // important in the tbxctrls.hxx created with HeDaBu !!!
-class SvxLineItem;
-class SvxBoxInfoItem;
-class SvxFontItem;
 class SfxStyleControllerItem_Impl;
 class SfxStyleSheetBasePool;
 class SfxTemplateItem;
diff --git a/include/svx/ucsubset.hxx b/include/svx/ucsubset.hxx
index 78f96d68563b..b4f7a57ffb4f 100644
--- a/include/svx/ucsubset.hxx
+++ b/include/svx/ucsubset.hxx
@@ -27,8 +27,6 @@
 
 #include <vector>
 
-class FontCharMap;
-
 // TODO: should be moved into Font Attributes territory,
 // we let them mature here though because this is currently the only use
 
diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx
index 6ee2d2cb27c4..1ff3e9a45d17 100644
--- a/include/svx/unoapi.hxx
+++ b/include/svx/unoapi.hxx
@@ -31,8 +31,6 @@
 class SvxShape;
 class SdrObject;
 class SdrPage;
-class SvxNumBulletItem;
-class SfxItemPool;
 enum class SdrInventor : sal_uInt32;
 enum class SdrObjKind  : sal_uInt16;
 
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index 8136603fdceb..304fa1ff203c 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -45,8 +45,6 @@ class SdrView;
 class SdrPageView;
 class SdrObject;
 class SvxShape;
-class SvxShapeGroup;
-class SvxShapeConnector;
 enum class SdrInventor : sal_uInt32;
 
 class SVXCORE_DLLPUBLIC SvxDrawPage :
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 589aa4250d8f..15494ab4c8a4 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -61,7 +61,6 @@ class SfxItemSet;
 class SdrModel;
 class SvxDrawPage;
 class SvGlobalName;
-class Pair;
 
 // Dimension arrows change size/position on save/reload (#i59051#)
 namespace basegfx
@@ -71,8 +70,6 @@ namespace basegfx
 
 struct SvxShapeImpl;
 class SvxShapeMaster;
-class SvxItemPropertySet;
-class SfxItemSet;
 
 void SVXCORE_DLLPUBLIC SvxItemPropertySet_setPropertyValue( const 
SfxItemPropertyMapEntry* pMap,
         const css::uno::Any& rVal, SfxItemSet& rSet );
diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx
index 6f75fe95ab66..101df5807107 100644
--- a/include/svx/unoshtxt.hxx
+++ b/include/svx/unoshtxt.hxx
@@ -24,18 +24,7 @@
 #include <editeng/unoedsrc.hxx>
 #include <svx/svxdllapi.h>
 
-namespace com::sun::star {
-    namespace uno {
-        class XInterface;
-    }
-    namespace accessibility {
-        struct TextSegment;
-    }
-}
-
-class SvxTextForwarder;
 class SdrObject;
-class SdrModel;
 class SdrView;
 class OutputDevice;
 class SvxTextEditSourceImpl;
diff --git a/include/svx/viewpt3d.hxx b/include/svx/viewpt3d.hxx
index 06b808326f2d..48bf2cd84dae 100644
--- a/include/svx/viewpt3d.hxx
+++ b/include/svx/viewpt3d.hxx
@@ -26,9 +26,6 @@
 #include <basegfx/vector/b3dvector.hxx>
 #include <tools/gen.hxx>
 
-// predefines
-namespace basegfx { class B3DRange; } // end of namespace basegfx
-
 /*************************************************************************
 |*
 |* enums for projection
diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx
index 8f3594a8e70f..abb38c6d8b4c 100644
--- a/include/svx/xcolit.hxx
+++ b/include/svx/xcolit.hxx
@@ -26,8 +26,6 @@
 #include <svx/svxdllapi.h>
 #include <svx/xit.hxx>
 
-class XColorList;
-
 class SVXCORE_DLLPUBLIC XColorItem : public NameOrIndex
 {
     Color   m_aColor;
diff --git a/include/svx/xmlsecctrl.hxx b/include/svx/xmlsecctrl.hxx
index b9019cf25d0d..abd13d1968d6 100644
--- a/include/svx/xmlsecctrl.hxx
+++ b/include/svx/xmlsecctrl.hxx
@@ -23,8 +23,6 @@
 #include <sfx2/stbitem.hxx>
 #include <svx/svxdllapi.h>
 
-class  SvxSizeItem;
-
 class SVX_DLLPUBLIC XmlSecStatusBarControl final : public SfxStatusBarControl
 {
 private:
diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx
index d2137f670c8a..2a3c04c68397 100644
--- a/include/svx/xoutbmp.hxx
+++ b/include/svx/xoutbmp.hxx
@@ -1,3 +1,4 @@
+
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
@@ -44,11 +45,7 @@ namespace o3tl {
 }
 
 class GraphicFilter;
-class VirtualDevice;
 class INetURLObject;
-namespace tools {
-    class Polygon;
-}
 
 class SVXCORE_DLLPUBLIC XOutBitmap
 {
diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx
index 9d550aeda364..10141a24c5bc 100644
--- a/include/svx/xpoly.hxx
+++ b/include/svx/xpoly.hxx
@@ -27,12 +27,9 @@
 
 class Point;
 namespace tools { class Rectangle; }
-class SvStream;
 namespace tools {
     class Polygon;
-    class PolyPolygon;
 }
-class OutputDevice;
 
 #define XPOLY_APPEND         0xFFFF
 
diff --git a/include/toolkit/helper/vclunohelper.hxx 
b/include/toolkit/helper/vclunohelper.hxx
index 4c364963b36b..b0099d547e79 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -51,8 +51,6 @@ namespace com::sun::star::awt {
     class XToolkit;
     class XFont;
     class XControlContainer;
-    struct Size;
-    struct Point;
     struct SimpleFontMetric;
     struct FontDescriptor;
     struct Rectangle;
diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx
index e1305ca8a8fd..0eb3ba2694ff 100644
--- a/include/tools/fract.hxx
+++ b/include/tools/fract.hxx
@@ -25,8 +25,6 @@
 #include <ostream>
 #include <type_traits>
 
-class SvStream;
-
 class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Fraction final
 {
     /// these two fields form a boost::rational, but I didn't want to put more 
boost headers into the global space
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index d6ac5f2ec787..95213a8d2f7c 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -28,7 +28,6 @@
 #include <ostream>
 #include <o3tl/unit_conversion.hxx>
 
-class SvStream;
 namespace rtl
 {
     class OString;
@@ -72,8 +71,6 @@ inline bool equal(Pair const & p1, Pair const & p2)
 
 // Point
 
-class RectangleTemplateBase;
-
 class TOOLS_DLLPUBLIC PointTemplateBase : protected Pair
 {
 friend class RectangleTemplateBase;
@@ -165,7 +162,6 @@ public:
 
 class Size;
 class AbsoluteScreenPixelSize;
-class Point;
 class AbsoluteScreenPixelPoint;
 namespace tools { class Rectangle; }
 class AbsoluteScreenPixelRectangle;
@@ -180,7 +176,6 @@ public:
 };
 
 // A point relative to top-level parent or screen, in screen pixels
-class AbsoluteScreenPixelSize;
 class SAL_WARN_UNUSED AbsoluteScreenPixelPoint : public 
PointTemplate<AbsoluteScreenPixelPoint, AbsoluteScreenPixelSize> {
 public:
     constexpr AbsoluteScreenPixelPoint() {}
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 8a3bccad121c..1ea019866e7e 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -30,8 +30,6 @@
 #include <memory>
 #include <string_view>
 
-class StreamData;
-
 inline rtl_TextEncoding GetStoreCharSet( rtl_TextEncoding eEncoding )
 {
     if ( eEncoding == RTL_TEXTENCODING_ISO_8859_1 )
diff --git a/include/ucbhelper/resultsethelper.hxx 
b/include/ucbhelper/resultsethelper.hxx
index 2fdf9a38a095..7085e41f23f0 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -30,10 +30,6 @@
 
 namespace com::sun::star::uno { class XComponentContext; }
 
-namespace cppu {
-    class OInterfaceContainerHelper;
-}
-
 namespace ucbhelper {
 
 
diff --git a/include/unotest/macros_test.hxx b/include/unotest/macros_test.hxx
index 7757e1436545..646bddd12f52 100644
--- a/include/unotest/macros_test.hxx
+++ b/include/unotest/macros_test.hxx
@@ -37,10 +37,6 @@ namespace test
 {
 class Directories;
 }
-namespace utl
-{
-class TempFileNamed;
-}
 
 namespace com::sun::star::security
 {
diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx
index 73c76ffa1154..b616d35cfdcd 100644
--- a/include/unotools/cmdoptions.hxx
+++ b/include/unotools/cmdoptions.hxx
@@ -34,10 +34,6 @@ namespace com::sun::star::frame
 {
 class XFrame;
 }
-namespace osl
-{
-class Mutex;
-}
 
 
/*-************************************************************************************************************
     @descr          The method GetList() returns a list of property values.
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index 649c05fdbe28..f2587ac97797 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -39,9 +39,6 @@ namespace com::sun::star {
     namespace container{
         class XHierarchicalNameAccess;
     }
-    namespace util{
-        class XChangesListener;
-    }
 }
 
 enum class ConfigItemMode
diff --git a/include/unotools/configvaluecontainer.hxx 
b/include/unotools/configvaluecontainer.hxx
index 34a01f7c7c59..3ac73f85f056 100644
--- a/include/unotools/configvaluecontainer.hxx
+++ b/include/unotools/configvaluecontainer.hxx
@@ -28,7 +28,6 @@
 
 namespace com::sun::star::uno { template <typename > class Reference; }
 namespace com::sun::star::uno { class XComponentContext; }
-namespace osl { class Mutex; }
 
 namespace utl
 {
diff --git a/include/unotools/localedatawrapper.hxx 
b/include/unotools/localedatawrapper.hxx
index d22e5fc7a482..22fd3e07035c 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -47,7 +47,6 @@ namespace tools
 class Time;
 class Duration;
 }
-class CalendarWrapper;
 
 enum class DateOrder {
     Invalid = -1,
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 3b06c93549d5..019ff6f1ac82 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -36,10 +36,8 @@ namespace com::sun::star::lang { struct Locale; }
 namespace com::sun::star::util { class XTextSearch2; }
 namespace com::sun::star::util { struct SearchResult; }
 namespace i18nutil {
-    struct SearchOptions;
     struct SearchOptions2;
 }
-enum class TransliterationFlags;
 
 namespace utl
 {
diff --git a/include/unotools/useroptions.hxx b/include/unotools/useroptions.hxx
index cd44524e6cba..a50b53c352ce 100644
--- a/include/unotools/useroptions.hxx
+++ b/include/unotools/useroptions.hxx
@@ -24,8 +24,6 @@
 #include <unotools/options.hxx>
 #include <memory>
 
-namespace osl { class Mutex; }
-
 // define ----------------------------------------------------------------
 enum class UserOptToken
 {
diff --git a/include/vbahelper/vbaeventshelperbase.hxx 
b/include/vbahelper/vbaeventshelperbase.hxx
index e7038da7ab75..420554363c2a 100644
--- a/include/vbahelper/vbaeventshelperbase.hxx
+++ b/include/vbahelper/vbaeventshelperbase.hxx
@@ -42,7 +42,6 @@ namespace com::sun::star {
     namespace document { struct EventObject; }
     namespace frame { class XModel; }
     namespace script::vba { class XVBAModuleInfo; }
-    namespace uno { class XComponentContext; }
     namespace util { struct ChangesEvent; }
 }
 
diff --git a/include/vcl/IDialogRenderable.hxx 
b/include/vcl/IDialogRenderable.hxx
index d92eb88ed25c..79ed78765212 100644
--- a/include/vcl/IDialogRenderable.hxx
+++ b/include/vcl/IDialogRenderable.hxx
@@ -18,8 +18,6 @@
 
 namespace tools { class Rectangle; }
 
-class SfxItemSet;
-
 namespace vcl
 {
 
diff --git a/include/vcl/QueueInfo.hxx b/include/vcl/QueueInfo.hxx
index a011e125e27c..bec365043ff0 100644
--- a/include/vcl/QueueInfo.hxx
+++ b/include/vcl/QueueInfo.hxx
@@ -25,8 +25,6 @@
 #include <vcl/dllapi.h>
 #include <vcl/prntypes.hxx>
 
-class Printer;
-
 class VCL_DLLPUBLIC QueueInfo
 {
     friend class Printer;
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index 50c12b6cd7c9..1a6a83fc77ef 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -32,7 +32,6 @@ namespace com::sun::star::uno { template <class 
interface_type> class Reference;
 
 namespace com::sun::star::frame { class XModel; }
 
-class Dialog;
 class BitmapEx;
 class SdrObjGroup;
 namespace weld
diff --git a/include/vcl/accessibility/vclxaccessiblecomponent.hxx 
b/include/vcl/accessibility/vclxaccessiblecomponent.hxx
index f658d73e962c..1026da164bf7 100644
--- a/include/vcl/accessibility/vclxaccessiblecomponent.hxx
+++ b/include/vcl/accessibility/vclxaccessiblecomponent.hxx
@@ -31,7 +31,6 @@
 namespace com::sun::star::accessibility { class XAccessible; }
 
 namespace vcl { class Window; }
-class VCLXWindow;
 class VclWindowEvent;
 
 namespace utl {
diff --git a/include/vcl/accessiblefactory.hxx 
b/include/vcl/accessiblefactory.hxx
index b65d60895c97..e1897e9dc4a5 100644
--- a/include/vcl/accessiblefactory.hxx
+++ b/include/vcl/accessiblefactory.hxx
@@ -59,7 +59,6 @@ class SvHeaderTabListBox;
 class SvtIconChoiceCtrl;
 class ToolBox;
 class SvTreeListBox;
-class VCLXWindow;
 class TextEngine;
 class TextView;
 
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index f7cc49850f8f..ca13e2cc1a69 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -43,8 +43,6 @@ inline sal_uInt8 GAMMA(double _def_cVal, double _def_InvGamma)
 
 class Color;
 
-template <typename Arg, typename Ret> class Link;
-
 enum class BmpMirrorFlags
 {
     NONE             = 0x00,
@@ -85,11 +83,7 @@ enum class BmpConversion
     N8BitNoConversion // make 8bit without color conversion (e.g. take the red 
channel)
 };
 
-class   BitmapInfoAccess;
-class   BitmapReadAccess;
-class   BitmapWriteAccess;
 class   BitmapPalette;
-class   GDIMetaFile;
 class   AlphaMask;
 class   OutputDevice;
 class   SalBitmap;
diff --git a/include/vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx 
b/include/vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx
index e4e8e944b21b..b17d2fcefe00 100644
--- a/include/vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx
+++ b/include/vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx
@@ -15,6 +15,7 @@
 #include <vector>
 
 class BitmapEx;
+class BitmapReadAccess;
 
 class BitmapGaussianSeparableBlurFilter final : public BitmapFilter
 {
diff --git a/include/vcl/bitmap/Vectorizer.hxx 
b/include/vcl/bitmap/Vectorizer.hxx
index 225d924233ae..16f810e428e4 100644
--- a/include/vcl/bitmap/Vectorizer.hxx
+++ b/include/vcl/bitmap/Vectorizer.hxx
@@ -24,6 +24,8 @@
 class GDIMetaFile;
 class BitmapEx;
 
+template <typename Arg, typename Ret> class Link;
+
 namespace vcl
 {
 
diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx
index e46f679d07fb..cc743223025b 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -31,7 +31,6 @@ namespace weld { class Window; }
 
 class ErrorHandler;
 class ErrorContext;
-enum class DialogMask;
 
 class UNLESS_MERGELIBS(VCL_DLLPUBLIC) ErrorStringFactory
 {
diff --git a/include/vcl/filter/pdfdocument.hxx 
b/include/vcl/filter/pdfdocument.hxx
index d1eaf06b126e..961468668a2a 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -21,16 +21,6 @@
 
 #include <vcl/filter/pdfobjectcontainer.hxx>
 
-namespace com::sun::star::security
-{
-class XCertificate;
-}
-
-namespace com::sun::star::uno
-{
-template <class interface_type> class Reference;
-}
-
 namespace tools
 {
 class Rectangle;
diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx
index 0f67dca52f1b..6c0f580b842c 100644
--- a/include/vcl/gradient.hxx
+++ b/include/vcl/gradient.hxx
@@ -32,7 +32,6 @@
 namespace tools { class Rectangle; }
 
 class Point;
-class SvStream;
 class GDIMetaFile;
 
 class VCL_DLLPUBLIC Gradient
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 0bea2ad9535d..38cf0f3b1d30 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -42,9 +42,7 @@ enum class GraphicType
 namespace com::sun::star::graphic { class XGraphic; }
 namespace vcl { class Font; }
 
-class Bitmap;
 class GDIMetaFile;
-class SvStream;
 class ImpGraphic;
 class OutputDevice;
 
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 3c09f949ba26..293e2720b76f 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -37,7 +37,6 @@ class INetURLObject;
 
 class FilterConfigCache;
 class SvStream;
-struct WmfExternal;
 struct ConvertData;
 
 #define ERRCODE_GRFILTER_OPENERROR    ErrCode(ErrCodeArea::Vcl, 
ErrCodeClass::General, 1)
diff --git a/include/vcl/imap.hxx b/include/vcl/imap.hxx
index deee9acd0666..8565f321ac83 100644
--- a/include/vcl/imap.hxx
+++ b/include/vcl/imap.hxx
@@ -30,7 +30,6 @@
 class Point;
 class Size;
 class Fraction;
-class IMapObject;
 
 class VCL_DLLPUBLIC ImageMap final
 {
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 5f1c63049486..c42802cc328d 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -22,7 +22,6 @@
 #include <vcl/commandevent.hxx>
 #include <set>
 
-class HelpEvent;
 class ScrollBar;
 class ScrollBarBox;
 class Splitter;
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index f3c937a5f915..fc5af32f9284 100644
--- a/include/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
@@ -28,7 +28,6 @@
 
 class Point;
 class Fraction;
-class SvStream;
 
 class SAL_WARN_UNUSED VCL_DLLPUBLIC MapMode
 {
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index aa2eaeedc696..d9bd66c9db11 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -46,7 +46,6 @@
 #include <span>
 
 class OutputDevice;
-class SvStream;
 enum class DrawTextFlags;
 
 struct ImplMetaReadData
diff --git a/include/vcl/mtfxmldump.hxx b/include/vcl/mtfxmldump.hxx
index 9970ea8a0d5a..6c0723bdcf71 100644
--- a/include/vcl/mtfxmldump.hxx
+++ b/include/vcl/mtfxmldump.hxx
@@ -22,8 +22,6 @@ class XmlWriter;
 class GDIMetaFile;
 class SvStream;
 
-enum class MetaActionType;
-
 /**
  * Class that is used for testing of the decomposition into shapes.  Used like
  * this:
diff --git a/include/vcl/notebookbar/notebookbar.hxx 
b/include/vcl/notebookbar/notebookbar.hxx
index 057315952941..05707a29ae6f 100644
--- a/include/vcl/notebookbar/notebookbar.hxx
+++ b/include/vcl/notebookbar/notebookbar.hxx
@@ -15,11 +15,8 @@
 #include <vcl/settings.hxx>
 #include <vector>
 
-namespace com::sun::star::ui { class XContextChangeEventListener; }
-
 class NotebookBarContextChangeEventListener;
 class NotebookbarContextControl;
-class SystemWindow;
 class SfxViewShell;
 
 /// This implements Widget Layout-based notebook-like menu bar.
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 3f534c50b29a..4f7bcd250afb 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -76,12 +76,10 @@ struct ImplOutDevData;
 class LogicalFontInstance;
 struct SystemGraphicsData;
 class ImplFontCache;
-class ImplMultiTextLineInfo;
 class SalGraphics;
 class Gradient;
 class Hatch;
 class BitmapReadAccess;
-class BitmapEx;
 class Image;
 class TextRectInfo;
 class FontMetric;
@@ -98,7 +96,6 @@ class VirtualDevice;
 struct SalTwoRect;
 class Printer;
 class VCLXGraphics;
-class OutDevStateStack;
 class SalLayoutGlyphs;
 
 namespace vcl
@@ -122,8 +119,6 @@ namespace vcl
 
 namespace basegfx {
     class B2DHomMatrix;
-    class B2DPolygon;
-    class B2IVector;
     class B2ISize;
 }
 
@@ -135,12 +130,6 @@ namespace com::sun::star::rendering {
     class XCanvas;
     class XSpriteCanvas;
 }
-namespace com::sun::star::linguistic2 {
-    class XHyphenator;
-}
-namespace com::sun::star::i18n {
-    class XBreakIterator;
-}
 
 // OutputDevice-Types
 
diff --git a/include/vcl/pdfread.hxx b/include/vcl/pdfread.hxx
index 72508a548293..00b6b44969c1 100644
--- a/include/vcl/pdfread.hxx
+++ b/include/vcl/pdfread.hxx
@@ -21,12 +21,6 @@
 #include <vcl/pdf/PDFAnnotationSubType.hxx>
 #include <vcl/pdf/PDFAnnotationMarker.hxx>
 
-namespace com::sun::star::uno
-{
-template <typename> class Sequence;
-}
-class Bitmap;
-
 namespace vcl
 {
 /// Fills the rBitmaps vector with rendered pages.
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 979068233d36..e169246cd32d 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -60,7 +60,6 @@ class Help;
 class OutputDevice;
 namespace vcl {
     class KeyCode;
-    class ILibreOfficeKitNotifier;
     class Window;
 }
 
diff --git a/include/vcl/toolkit/vclmedit.hxx b/include/vcl/toolkit/vclmedit.hxx
index fd17e75fb48d..746fd681ca8b 100644
--- a/include/vcl/toolkit/vclmedit.hxx
+++ b/include/vcl/toolkit/vclmedit.hxx
@@ -33,6 +33,7 @@
 
 class ImpVclMEdit;
 class ExtTextEngine;
+class ScrollBar;
 class TextView;
 
 class TextWindow final : public vcl::Window
diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx
index 4a13f99db1b1..0d1e0687d11e 100644
--- a/include/vcl/transfer.hxx
+++ b/include/vcl/transfer.hxx
@@ -48,7 +48,6 @@ namespace com::sun::star::datatransfer::dnd { class 
XDragGestureRecognizer; }
 namespace com::sun::star::io { class XInputStream; }
 namespace com::sun::star::datatransfer::dnd { class XDropTarget; }
 
-namespace tools { template <typename T> class SvRef; }
 template <typename Arg, typename Ret> class Link;
 
 class BitmapEx;
@@ -58,7 +57,6 @@ class ImageMap;
 class INetBookmark;
 class INetImage;
 class FileList;
-class SotStorageStream;
 namespace vcl { class Window; }
 
 // Drag&Drop defines
diff --git a/include/vcl/uitest/logger.hxx b/include/vcl/uitest/logger.hxx
index 9888fab60493..d7ec17775f24 100644
--- a/include/vcl/uitest/logger.hxx
+++ b/include/vcl/uitest/logger.hxx
@@ -19,14 +19,6 @@
 #include <tools/stream.hxx>
 #include <vcl/vclevent.hxx>
 
-namespace com::sun::star::beans
-{
-struct PropertyValue;
-}
-namespace com::sun::star::uno
-{
-template <class E> class Sequence;
-}
 struct EventDescription;
 class Control;
 class KeyEvent;
diff --git a/include/vcl/unohelp.hxx b/include/vcl/unohelp.hxx
index 9c6aa3470855..aaf4c0f313a8 100644
--- a/include/vcl/unohelp.hxx
+++ b/include/vcl/unohelp.hxx
@@ -33,9 +33,6 @@ namespace com::sun::star::i18n {
     class XBreakIterator;
     class XCharacterClassification;
 }
-namespace com::sun::star::accessibility {
-    struct AccessibleEventObject;
-}
 
 namespace vcl::unohelper
 {
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index bd6a473fa149..2bdf07d9c254 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -25,10 +25,6 @@
 
 class Menu;
 
-namespace com::sun::star::accessibility {
-    class XAccessible;
-}
-
 namespace vcl
 {
     class Window;
diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx
index e6b743f626d5..0bb529402202 100644
--- a/include/vcl/vcllayout.hxx
+++ b/include/vcl/vcllayout.hxx
@@ -31,7 +31,6 @@
 
 class LogicalFontInstance;
 namespace vcl::text { class ImplLayoutArgs; }
-namespace vcl::font { class PhysicalFontFace; }
 namespace basegfx { class BColor; }
 class SalGraphics;
 class GlyphItem;
diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx
index b756d447c5ed..c7e068fffbea 100644
--- a/include/vcl/wall.hxx
+++ b/include/vcl/wall.hxx
@@ -27,10 +27,6 @@
 #include <vcl/dllapi.h>
 #include <optional>
 
-class Gradient;
-class BitmapEx;
-class ImplWallpaper;
-
 enum class WallpaperStyle
 {
     NONE,
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 450abb0ee88a..1be002fe55ac 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -56,7 +56,6 @@ class Formatter;
 class InputContext;
 class KeyEvent;
 class MouseEvent;
-class SvNumberFormatter;
 class TransferDataContainer;
 class OutputDevice;
 class VirtualDevice;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index a9a6ac6eee3a..31d0cdfde720 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <memory>
 
-class VirtualDevice;
 struct ImplSVEvent;
 struct ImplWinData;
 struct ImplFrameData;
@@ -44,7 +43,6 @@ class ImplBorderWindow;
 class Timer;
 class DockingManager;
 class Scrollable;
-class ScrollBar;
 class FixedText;
 class MouseEvent;
 class KeyEvent;
@@ -52,7 +50,6 @@ class CommandEvent;
 class TrackingEvent;
 class HelpEvent;
 class DataChangedEvent;
-class VclSimpleEvent;
 class NotifyEvent;
 class SystemWindow;
 class SalFrame;
@@ -69,19 +66,11 @@ enum class PointerStyle;
 
 namespace com::sun::star {
     namespace accessibility {
-        struct AccessibleRelation;
         class XAccessible;
     }
-    namespace rendering {
-        class XCanvas;
-        class XSpriteCanvas;
-    }
     namespace awt {
         class XVclWindowPeer;
     }
-    namespace uno {
-        class Any;
-    }
     namespace datatransfer::clipboard {
         class XClipboard;
     }
diff --git a/include/vcl/wizardmachine.hxx b/include/vcl/wizardmachine.hxx
index 664e137187f9..1858f76fc536 100644
--- a/include/vcl/wizardmachine.hxx
+++ b/include/vcl/wizardmachine.hxx
@@ -23,13 +23,7 @@
 #include <vcl/dllapi.h>
 #include <vcl/builderpage.hxx>
 
-namespace weld {
-    class Builder;
-    class Container;
-}
-
 struct WizPageData;
-struct ImplWizButtonData;
 
 // wizard states
 #define WZS_INVALID_STATE (::vcl::WizardTypes::WizardState(-1))
diff --git a/include/xmloff/DocumentSettingsContext.hxx 
b/include/xmloff/DocumentSettingsContext.hxx
index 130da3814631..06a09aa2b4b5 100644
--- a/include/xmloff/DocumentSettingsContext.hxx
+++ b/include/xmloff/DocumentSettingsContext.hxx
@@ -26,8 +26,6 @@
 
 #include <vector>
 
-struct XMLDocumentSettingsContext_Data;
-
 class XMLOFF_DLLPUBLIC XMLDocumentSettingsContext final : public 
SvXMLImportContext
 {
     struct SettingsGroup
diff --git a/include/xmloff/SchXMLImportHelper.hxx 
b/include/xmloff/SchXMLImportHelper.hxx
index 446b07387f29..76c80a88725d 100644
--- a/include/xmloff/SchXMLImportHelper.hxx
+++ b/include/xmloff/SchXMLImportHelper.hxx
@@ -31,11 +31,6 @@ namespace com::sun::star {
     namespace frame {
         class XModel;
     }
-    namespace xml {
-        namespace sax {
-            class XAttributeList;
-        }
-    }
     namespace chart2 {
         class XChartDocument;
         class XDataSeries;
diff --git a/include/xmloff/XMLBase64ImportContext.hxx 
b/include/xmloff/XMLBase64ImportContext.hxx
index 053ec8cec56c..75ad8101ae24 100644
--- a/include/xmloff/XMLBase64ImportContext.hxx
+++ b/include/xmloff/XMLBase64ImportContext.hxx
@@ -25,7 +25,6 @@
 #include <xmloff/dllapi.h>
 #include <xmloff/xmlictxt.hxx>
 
-namespace com::sun::star::xml::sax { class XAttributeList; }
 namespace com::sun::star::io { class XOutputStream; }
 
 class XMLOFF_DLLPUBLIC XMLBase64ImportContext final : public SvXMLImportContext
diff --git a/include/xmloff/XMLTextMasterPageContext.hxx 
b/include/xmloff/XMLTextMasterPageContext.hxx
index f9e28ee8f776..a2b6cfd42b6f 100644
--- a/include/xmloff/XMLTextMasterPageContext.hxx
+++ b/include/xmloff/XMLTextMasterPageContext.hxx
@@ -25,6 +25,8 @@
 
 #include <xmloff/xmlstyle.hxx>
 
+struct ContextID_Index_Pair;
+
 namespace com::sun::star {
     namespace style { class XStyle; }
 }
@@ -71,8 +73,6 @@ public:
     virtual void Finish( bool bOverwrite ) override;
 };
 
-struct ContextID_Index_Pair;
-
 XMLOFF_DLLPUBLIC extern ContextID_Index_Pair const g_MasterPageContextIDs[];
 XMLOFF_DLLPUBLIC extern XmlStyleFamily const g_MasterPageFamilies[];
 
diff --git a/include/xmloff/animexp.hxx b/include/xmloff/animexp.hxx
index 286cb21d35d0..cbb11a9672fb 100644
--- a/include/xmloff/animexp.hxx
+++ b/include/xmloff/animexp.hxx
@@ -34,7 +34,6 @@ template <typename> class Reference;
 
 class AnimExpImpl;
 class SvXMLExport;
-class XMLShapeExport;
 
 class XMLAnimationsExporter final : public salhelper::SimpleReferenceObject
 {
diff --git a/include/xmloff/formlayerimport.hxx 
b/include/xmloff/formlayerimport.hxx
index ae9c5ed7e336..5897df7340bd 100644
--- a/include/xmloff/formlayerimport.hxx
+++ b/include/xmloff/formlayerimport.hxx
@@ -28,7 +28,6 @@
 
 namespace com::sun::star::beans { class XPropertySet; }
 namespace com::sun::star::drawing { class XDrawPage; }
-namespace com::sun::star::xml::sax { class XAttributeList; }
 namespace com::sun::star::xml::sax { class XFastAttributeList; }
 
 class SvXMLImport;
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 12cb9f8fd581..7ce6019cd306 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -37,10 +37,8 @@ namespace com::sun::star::beans { class XPropertySet; }
 namespace com::sun::star::drawing { class XShape; }
 namespace com::sun::star::drawing { class XShapes; }
 namespace com::sun::star::frame { class XModel; }
-namespace com::sun::star::xml::sax { class XAttributeList; }
 
 class SvXMLImport;
-class SvXMLTokenMap;
 class SvXMLStylesContext;
 class XMLSdPropHdlFactory;
 class SvXMLImportPropertyMapper;
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index c04e577c6573..061b2e3b34ba 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -33,7 +33,6 @@
 
 class XMLTextListsHelper;
 class SvXMLImportContext;
-class SvXMLTokenMap;
 class SvXMLImportPropertyMapper;
 class SvXMLImport;
 class SvXMLStylesContext;
@@ -58,7 +57,6 @@ namespace text {
 namespace frame { class XModel; }
 namespace container { class XNameContainer; class XIndexReplace; }
 namespace beans { class XPropertySet; }
-namespace xml::sax { class XAttributeList; }
 namespace xml::sax { class XFastAttributeList; }
 namespace util { struct DateTime; }
 }
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 2d978852e0cf..9dafd90cda3e 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -68,7 +68,6 @@ namespace com::sun::star::xml::sax { class 
XExtendedDocumentHandler; }
 namespace com::sun::star::xml::sax { class XLocator; }
 
 class SvXMLNamespaceMap;
-class SvtSecurityMapPersonalInfo;
 class SvXMLExport_Impl;
 class ProgressBarHelper;
 class XMLEventExport;
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 6dfcbb449755..173c129c32ee 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -31,8 +31,6 @@
 #include <xmloff/namespacemap.hxx>
 #include <optional>
 
-namespace com::sun::star::xml::sax { class XAttributeList; }
-
 class SvXMLImport;
 
 class SvXMLImportContext;
diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index 1f537a322eea..456eeb05a1ff 100644
--- a/include/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
@@ -37,7 +37,6 @@ namespace com::sun::star::container { class XNameContainer; }
 namespace com::sun::star::uno { class Any; }
 namespace com::sun::star::uno { template <typename > class Reference; }
 namespace com::sun::star::uno { template <typename > class Sequence; }
-namespace com::sun::star::xml::sax { class XAttributeList; }
 namespace com::sun::star::xml::sax { class XFastAttributeList; }
 #if defined __GNUC__ // gcc does not like visibility annotation on enum
 namespace com::sun::star::drawing { enum class FillStyle; }
diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index 705af6e78d0c..3ef3521d051a 100644
--- a/include/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
@@ -33,7 +33,6 @@ namespace com::sun::star::uno { template <class E> class 
Sequence; }
 namespace com::sun::star::uno { template <class interface_type> class 
Reference; }
 
 class SvXMLExport;
-class XMLTextListAutoStylePool;
 
 class XMLOFF_DLLPUBLIC SvxXMLNumRuleExport final
 {
diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index e367fef2b89e..9ac4e755f99c 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -37,7 +37,6 @@ inline constexpr OUString XML_WRITTENNUMBERSTYLES = 
u"WrittenNumberStyles"_ustr;
 
 class Color;
 class LocaleDataWrapper;
-class CharClass;
 class SvXMLExport;
 class SvNumberFormatter;
 class SvNumberformat;
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index 0a2f752ea511..f55b4ba8ff80 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -31,7 +31,6 @@
 
 namespace com::sun::star::uno { class XComponentContext; }
 namespace com::sun::star::util { class XNumberFormatsSupplier; }
-namespace com::sun::star::xml::sax { class XAttributeList; }
 
 inline constexpr OUString XML_NUMBERSTYLES = u"NumberStyles"_ustr;
 
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index b370899de3c7..e4c9021a2a9e 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -31,7 +31,6 @@
 
 class SvXMLStylesContext_Impl;
 class SvXMLImportPropertyMapper;
-class SvXMLTokenMap;
 
 namespace com::sun::star {
 namespace container { class XNameContainer; }
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx 
b/oox/source/ppt/pptshapegroupcontext.cxx
index 66b18c056872..ef8934835bed 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -39,7 +39,6 @@
 
 using namespace oox::core;
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::xml::sax;
 
 namespace oox::ppt {
diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index 923a8f0afd58..7581d8a64e2e 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -40,6 +40,7 @@
 #include <map>
 #include <climits>
 
+class SfxItemSet;
 class ScDocument;
 
 /**
diff --git a/sc/source/filter/inc/lotfntbf.hxx 
b/sc/source/filter/inc/lotfntbf.hxx
index 99d1c9a9d8ed..34adf8fabec0 100644
--- a/sc/source/filter/inc/lotfntbf.hxx
+++ b/sc/source/filter/inc/lotfntbf.hxx
@@ -24,6 +24,7 @@
 #include <optional>
 
 // Code in fontbuff.cxx (excel)
+class SfxItemSet;
 
 class LotusFontBuffer
 {
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index def50b4fe043..208c5888a69b 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -44,6 +44,7 @@ namespace com::sun::star::animations {
 
 class SfxStyleSheet;
 class SdDrawDocument;
+class SdrOutliner;
 class SdrTextObj;
 class SdPageLink;
 class SfxItemSet;
diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx 
b/sd/source/ui/sidebar/MasterPageContainer.hxx
index 9de4eb6bc8cc..d9d3cc2311a7 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.hxx
@@ -25,6 +25,8 @@
 
 class SdPage;
 
+template <typename Arg, typename Ret> class Link;
+
 namespace sd::sidebar
 {
 class MasterPageDescriptor;
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx 
b/sd/source/ui/slideshow/slideshowimpl.hxx
index 00f9c80003b7..c86c6e9b192f 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -44,6 +44,7 @@ class SfxBindings;
 class SfxDispatcher;
 class SfxViewFrame;
 class StarBASIC;
+class VclSimpleEvent;
 
 namespace sd
 {
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 1523389083bd..85a67ef9ebb2 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -23,6 +23,8 @@
 #include <svl/poolitem.hxx>
 #include <memory>
 
+class SfxItemSet;
+
 /// Has a shared reference to an "auto-style", i.e. a not named collection of 
character formats. It
 /// is owned by an SwTextAttrEnd, which is then stored in the SwpHints of an 
SwTextNode.
 ///
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index a4936991fd60..42572649ded2 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -42,6 +42,7 @@
 #include "unobaseclass.hxx"
 
 class SfxItemPropertySet;
+class SfxItemSet;
 struct SfxItemPropertyMapEntry;
 class SwPaM;
 class SwUnoCursor;
diff --git a/sw/source/ui/vba/vbaeventshelper.hxx 
b/sw/source/ui/vba/vbaeventshelper.hxx
index 31a6b2808ee9..b5755c819d81 100644
--- a/sw/source/ui/vba/vbaeventshelper.hxx
+++ b/sw/source/ui/vba/vbaeventshelper.hxx
@@ -22,6 +22,8 @@
 
 #include <vbahelper/vbaeventshelperbase.hxx>
 
+namespace com::sun::star::uno { class XComponentContext; };
+
 class SwVbaEventsHelper : public VbaEventsHelperBase
 {
 public:
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index 4b1d8fd5d3d6..80332237be27 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
 
 class Control;
+class ImplMultiTextLineInfo;
 
 namespace vcl
 {
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index 56a9ed5261d7..f708be01a511 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -31,6 +31,8 @@ struct ImplWizPageData
     VclPtr<TabPage>     mpPage;
 };
 
+struct ImplWizButtonData;
+
 namespace vcl
 {
     struct RoadmapWizardImpl;

Reply via email to