include/IwyuFilter_include.yaml                          |   18 +++++++++++++
 include/basic/sbx.hxx                                    |    2 -
 include/comphelper/configurationlistener.hxx             |    1 
 include/comphelper/propertycontainer.hxx                 |    1 
 include/comphelper/propertycontainer2.hxx                |    4 ---
 include/comphelper/simplefileaccessinteraction.hxx       |    1 
 include/comphelper/stillreadwriteinteraction.hxx         |    1 
 include/connectivity/sdbcx/VCollection.hxx               |    2 -
 include/dbaccess/dataview.hxx                            |    1 
 include/dbaccess/dbaundomanager.hxx                      |    6 ----
 include/dbaccess/dbsubcomponentcontroller.hxx            |    3 --
 include/dbaccess/genericcontroller.hxx                   |    9 ------
 include/editeng/AccessibleComponentBase.hxx              |    5 ---
 include/editeng/AccessibleContextBase.hxx                |    1 
 include/editeng/unofield.hxx                             |    2 -
 include/editeng/unotext.hxx                              |    1 
 include/filter/msfilter/msdffimp.hxx                     |    1 
 include/filter/msfilter/svdfppt.hxx                      |    2 -
 include/formula/FormulaOpCodeMapperObj.hxx               |    5 ---
 include/oox/core/contexthandler.hxx                      |    1 
 include/oox/core/filterbase.hxx                          |    1 
 include/oox/core/filterdetect.hxx                        |    4 ---
 include/oox/core/fragmenthandler.hxx                     |    1 
 include/oox/core/fragmenthandler2.hxx                    |   10 -------
 include/oox/core/relationshandler.hxx                    |    5 ---
 include/oox/core/xmlfilterbase.hxx                       |    4 ---
 include/oox/crypto/AgileEngine.hxx                       |    5 ---
 include/oox/crypto/Standard2007Engine.hxx                |    5 ---
 include/oox/drawingml/connectorshapecontext.hxx          |    2 -
 include/oox/drawingml/graphicshapecontext.hxx            |    1 
 include/oox/drawingml/shapecontext.hxx                   |    2 -
 include/oox/drawingml/shapegroupcontext.hxx              |    2 -
 include/oox/drawingml/themefragmenthandler.hxx           |    1 
 include/oox/dump/dffdumper.hxx                           |    2 -
 include/oox/dump/oledumper.hxx                           |    4 ---
 include/oox/dump/xlsbdumper.hxx                          |    4 ---
 include/oox/helper/zipstorage.hxx                        |    1 
 include/oox/ole/axcontrolfragment.hxx                    |    1 
 include/oox/ole/olestorage.hxx                           |    2 -
 include/oox/ppt/backgroundproperties.hxx                 |    1 
 include/oox/ppt/customshowlistcontext.hxx                |    2 -
 include/oox/ppt/layoutfragmenthandler.hxx                |    1 
 include/oox/ppt/pptgraphicshapecontext.hxx               |    1 
 include/oox/ppt/pptimport.hxx                            |    4 ---
 include/oox/ppt/pptshapecontext.hxx                      |    1 
 include/oox/ppt/pptshapegroupcontext.hxx                 |    1 
 include/oox/ppt/presentationfragmenthandler.hxx          |    1 
 include/oox/ppt/slidefragmenthandler.hxx                 |    1 
 include/oox/ppt/slidemastertextstylescontext.hxx         |    2 -
 include/oox/ppt/slidetimingcontext.hxx                   |    2 -
 include/oox/ppt/soundactioncontext.hxx                   |    1 
 include/oox/ppt/timenodelistcontext.hxx                  |    2 -
 include/oox/vml/vmldrawingfragment.hxx                   |    5 ---
 include/sax/fastattribs.hxx                              |    1 
 include/sax/fastparser.hxx                               |    5 ---
 include/sfx2/DocumentMetadataAccess.hxx                  |    3 --
 include/sfx2/dinfdlg.hxx                                 |    9 ------
 include/sfx2/listview.hxx                                |    2 -
 include/sfx2/sfxbasecontroller.hxx                       |    9 ------
 include/sfx2/sfxbasemodel.hxx                            |    8 ------
 include/sfx2/sfxstatuslistener.hxx                       |    1 
 include/sfx2/sidebar/TabBar.hxx                          |    4 ---
 include/sfx2/thumbnailview.hxx                           |    4 ---
 include/svl/nfengine.hxx                                 |    2 -
 include/svl/numformat.hxx                                |    3 ++
 include/svtools/asynclink.hxx                            |    1 
 include/svtools/brwbox.hxx                               |    4 ---
 include/svtools/ctrlbox.hxx                              |    1 
 include/svtools/javainteractionhandler.hxx               |    2 -
 include/svtools/ruler.hxx                                |    3 --
 include/svtools/tabbar.hxx                               |    1 
 include/svtools/valueset.hxx                             |    2 -
 include/svx/AccessibleControlShape.hxx                   |    6 ----
 include/svx/AccessibleOLEShape.hxx                       |    4 ---
 include/svx/AccessibleShape.hxx                          |    6 ----
 include/svx/CommonStyleManager.hxx                       |    4 ---
 include/svx/PaletteManager.hxx                           |    2 -
 include/svx/ParaSpacingControl.hxx                       |    8 ------
 include/svx/SmartTagMgr.hxx                              |    1 
 include/svx/algitem.hxx                                  |    3 --
 include/svx/charmap.hxx                                  |    2 -
 include/svx/chrtitem.hxx                                 |    3 --
 include/svx/clipfmtitem.hxx                              |    1 
 include/svx/cube3d.hxx                                   |    2 -
 include/svx/galtheme.hxx                                 |    1 
 include/svx/obj3d.hxx                                    |    1 
 include/svx/ruler.hxx                                    |    1 
 include/svx/scene3d.hxx                                  |    4 ---
 include/svx/sdr/table/tablecontroller.hxx                |    1 
 include/svx/searchcharmap.hxx                            |    2 -
 include/svx/svddrgmt.hxx                                 |    1 
 include/svx/svdetc.hxx                                   |    5 ---
 include/svx/svdmodel.hxx                                 |   20 ---------------
 include/svx/svdomeas.hxx                                 |    1 
 include/svx/svdoutl.hxx                                  |    1 
 include/svx/svdpage.hxx                                  |    2 -
 include/svx/xtable.hxx                                   |   14 +++++-----
 include/vbahelper/vbaeventshelperbase.hxx                |    2 -
 include/vcl/bitmap/BitmapConvolutionMatrixFilter.hxx     |    2 -
 include/vcl/bitmap/BitmapDuoToneFilter.hxx               |    2 -
 include/vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx |    1 
 include/vcl/bitmap/BitmapMedianFilter.hxx                |    2 -
 include/vcl/bitmap/BitmapSeparableUnsharpenFilter.hxx    |    2 -
 include/vcl/bitmap/BitmapSepiaFilter.hxx                 |    2 -
 include/vcl/bitmap/BitmapSmoothenFilter.hxx              |    2 -
 include/vcl/bitmap/BitmapSolarizeFilter.hxx              |    2 -
 include/vcl/builder.hxx                                  |    7 -----
 include/vcl/dndhelp.hxx                                  |    2 -
 include/vcl/filter/SvmReader.hxx                         |    1 
 include/vcl/gdimtf.hxx                                   |    2 -
 include/vcl/menu.hxx                                     |    2 -
 include/vcl/status.hxx                                   |    3 --
 include/vcl/syschild.hxx                                 |    1 
 include/xmloff/XMLEventsImportContext.hxx                |    1 
 include/xmloff/shapeexport.hxx                           |    1 
 include/xmloff/txtparae.hxx                              |    5 +--
 include/xmloff/xmlimp.hxx                                |    3 --
 sw/source/uibase/inc/workctrl.hxx                        |    1 
 118 files changed, 32 insertions(+), 324 deletions(-)

New commits:
commit de8b935e16d463c632f3311294869479c56f1201
Author:     Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Fri Dec 27 12:03:26 2024 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jan 6 09:28:27 2025 +0100

    Drop unneeded forward declarations from include/ even harder
    
    test drive the new bin/find-unneeded-includes --fwdecl mode
    with iwyu 0.23 instead of 0.21, this seems to find more unneeded
    fw declarations
    
    Change-Id: I451e571c70eb74f46c799753e3c5a53c0110da36
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179707
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 49b5ee647d7f..dd9a4944ae7f 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -109,6 +109,9 @@ excludelist:
     - cppuhelper/typeprovider.hxx
     - cppuhelper/supportsservice.hxx
     - cppuhelper/factory.hxx
+    include/ucbhelper/propertyvalueset.hxx:
+    # needed in --fwdecl mode
+    - namespace ucbhelper_impl { struct PropertyValue; }
     include/comphelper/accessiblekeybindinghelper.hxx:
     # base class has to be a complete type
     - com/sun/star/accessibility/XAccessibleKeyBinding.hpp
@@ -243,6 +246,12 @@ excludelist:
     include/sot/exchange.hxx:
     # Used in a macro #define
     - com/sun/star/datatransfer/dnd/DNDConstants.hpp
+    include/package/Inflater.hxx:
+    # Needed in --fwdecl mode
+    - struct z_stream_s
+    include/package/Deflater.hxx:
+    # Needed in --fwdecl mode
+    - struct z_stream_s
     include/tools/debug.hxx:
     # Used behind #ifndef
     - tools/toolsdllapi.h
@@ -419,6 +428,9 @@ excludelist:
     - com/sun/star/lang/XUnoTunnel.hpp
     - com/sun/star/xml/sax/XFastDocumentHandler.hpp
     - com/sun/star/xml/sax/XFastParser.hpp
+    include/xmloff/XMLTextMasterPageContext.hxx:
+    # needed in --fwdecl mode
+    - struct ContextID_Index_Pair
     include/svtools/cliplistener.hxx:
     # base class has to be a complete type
     - com/sun/star/datatransfer/clipboard/XClipboardListener.hpp
@@ -814,6 +826,12 @@ excludelist:
     include/svx/svxids.hrc:
     # Used in macro definition
     - svl/typedwhich.hxx
+    include/svx/sdr/properties/properties.hxx:
+    # Needed for fwdecl mode
+    - struct _xmlTextWriter
+    include/svx/sdr/properties/defaultproperties.hxx:
+    # Needed for fwdecl mode
+    - struct _xmlTextWriter
     include/svx/unopage.hxx:
     # Don't propose hxx -> h change in URE libs
     - cppuhelper/interfacecontainer.hxx
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 26cd2654b345..cc1796202e5f 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -33,8 +33,6 @@
 
 class SvStream;
 
-class SfxBroadcaster;
-
 // Parameter information
 struct SbxParamInfo
 {
diff --git a/include/comphelper/configurationlistener.hxx 
b/include/comphelper/configurationlistener.hxx
index 55342514c2ba..3f2410c76022 100644
--- a/include/comphelper/configurationlistener.hxx
+++ b/include/comphelper/configurationlistener.hxx
@@ -19,7 +19,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/configurationhelper.hxx>
 
-namespace com::sun::star::beans { struct PropertyChangeEvent; }
 namespace com::sun::star::uno { class XComponentContext; }
 
 namespace comphelper {
diff --git a/include/comphelper/propertycontainer.hxx 
b/include/comphelper/propertycontainer.hxx
index 0c663e7bacab..5c73b550c2ee 100644
--- a/include/comphelper/propertycontainer.hxx
+++ b/include/comphelper/propertycontainer.hxx
@@ -25,7 +25,6 @@
 #include <comphelper/comphelperdllapi.h>
 
 
-namespace com::sun::star::uno { class Any; }
 namespace com::sun::star::uno { class Type; }
 
 namespace comphelper
diff --git a/include/comphelper/propertycontainer2.hxx 
b/include/comphelper/propertycontainer2.hxx
index e49a8a6febf2..c86a7d98013c 100644
--- a/include/comphelper/propertycontainer2.hxx
+++ b/include/comphelper/propertycontainer2.hxx
@@ -22,10 +22,6 @@
 #include <comphelper/propertycontainerhelper.hxx>
 #include <comphelper/propshlp.hxx>
 
-namespace com::sun::star::uno
-{
-class Any;
-}
 namespace com::sun::star::uno
 {
 class Type;
diff --git a/include/comphelper/simplefileaccessinteraction.hxx 
b/include/comphelper/simplefileaccessinteraction.hxx
index e9295d4d7e83..41f145df61b8 100644
--- a/include/comphelper/simplefileaccessinteraction.hxx
+++ b/include/comphelper/simplefileaccessinteraction.hxx
@@ -15,7 +15,6 @@
 #include <comphelper/comphelperdllapi.h>
 
 namespace com::sun::star::task { class XInteractionHandler; }
-namespace com::sun::star::task { class XInteractionRequest; }
 
 namespace comphelper {
 /** An interaction handler wrapper for simple file access.
diff --git a/include/comphelper/stillreadwriteinteraction.hxx 
b/include/comphelper/stillreadwriteinteraction.hxx
index fb03a7ad1d84..e05ee007eea4 100644
--- a/include/comphelper/stillreadwriteinteraction.hxx
+++ b/include/comphelper/stillreadwriteinteraction.hxx
@@ -26,7 +26,6 @@
 #include <comphelper/comphelperdllapi.h>
 
 namespace com::sun::star::task { class XInteractionHandler; }
-namespace com::sun::star::task { class XInteractionRequest; }
 
 
 namespace comphelper{
diff --git a/include/connectivity/sdbcx/VCollection.hxx 
b/include/connectivity/sdbcx/VCollection.hxx
index dc1ceccb2ae2..c0dfc98510a9 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -37,8 +37,6 @@
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <memory>
 
-namespace com::sun::star::container { class XEnumeration; }
-
 
 namespace connectivity::sdbcx
     {
diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx
index 702f785b0a52..83927de84700 100644
--- a/include/dbaccess/dataview.hxx
+++ b/include/dbaccess/dataview.hxx
@@ -37,7 +37,6 @@ namespace svt {
     class AcceleratorExecute;
 }
 
-class NotifyEvent;
 namespace tools { class Rectangle; }
 
 namespace dbaui
diff --git a/include/dbaccess/dbaundomanager.hxx 
b/include/dbaccess/dbaundomanager.hxx
index 7c25c3655ad2..c1b2c05c9db2 100644
--- a/include/dbaccess/dbaundomanager.hxx
+++ b/include/dbaccess/dbaundomanager.hxx
@@ -30,12 +30,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com::sun::star {
-    namespace document { class XUndoAction; }
-    namespace document { class XUndoManagerListener; }
-    namespace uno { class XInterface; }
-}
-
 namespace cppu {
     class OWeakObject;
 }
diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx 
b/include/dbaccess/dbsubcomponentcontroller.hxx
index d4ed948d1bff..10687a2c2d4d 100644
--- a/include/dbaccess/dbsubcomponentcontroller.hxx
+++ b/include/dbaccess/dbsubcomponentcontroller.hxx
@@ -37,13 +37,10 @@
 
 namespace com::sun::star {
     namespace beans { class XPropertySet; }
-    namespace beans { struct PropertyValue; }
-    namespace document { class XEmbeddedScripts; }
     namespace frame { class XModel; }
     namespace sdbc { class XConnection; }
     namespace sdbc { class XDatabaseMetaData; }
     namespace uno { class XComponentContext; }
-    namespace util { class XModifyListener; }
     namespace util { class XNumberFormatter; }
 }
 
diff --git a/include/dbaccess/genericcontroller.hxx 
b/include/dbaccess/genericcontroller.hxx
index c155b35d0889..5e05581d2ae5 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -65,24 +65,16 @@
 #include <sfx2/userinputinterception.hxx>
 
 namespace com::sun::star {
-    namespace awt { class XKeyHandler; }
-    namespace awt { class XMouseClickHandler; }
     namespace awt { class XWindow; }
     namespace beans { struct PropertyValue; }
-    namespace frame { class XController; }
     namespace frame { class XDispatchProvider; }
     namespace frame { class XFrame; }
     namespace frame { class XFrameActionListener; }
     namespace frame { class XModel; }
     namespace frame { class XStatusListener; }
-    namespace frame { class XTitleChangeListener; }
-    namespace frame { struct DispatchDescriptor; }
-    namespace frame { struct FrameActionEvent; }
-    namespace lang { class XEventListener; }
     namespace sdb { class XDatabaseContext; }
     namespace sdbc { class XConnection; }
     namespace sdbc { class XDataSource; }
-    namespace ui { class XSidebarProvider; }
     namespace uno { class XComponentContext; }
     namespace util { class XURLTransformer; }
 }
@@ -90,7 +82,6 @@ namespace com::sun::star {
 namespace vcl { class Window; }
 namespace weld { class Window; }
 namespace framework { class TitleHelper; }
-class NotifyEvent;
 
 namespace dbaui
 {
diff --git a/include/editeng/AccessibleComponentBase.hxx 
b/include/editeng/AccessibleComponentBase.hxx
index cf73a5bd2144..343957f317ad 100644
--- a/include/editeng/AccessibleComponentBase.hxx
+++ b/include/editeng/AccessibleComponentBase.hxx
@@ -23,11 +23,6 @@
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
 #include <editeng/editengdllapi.h>
 
-namespace com::sun::star::accessibility
-{
-class XAccessible;
-}
-
 namespace accessibility
 {
 /** @descr
diff --git a/include/editeng/AccessibleContextBase.hxx 
b/include/editeng/AccessibleContextBase.hxx
index 02ae07b1f9e5..21ec7335102c 100644
--- a/include/editeng/AccessibleContextBase.hxx
+++ b/include/editeng/AccessibleContextBase.hxx
@@ -30,7 +30,6 @@
 #include <editeng/editengdllapi.h>
 #include <rtl/ref.hxx>
 
-namespace com::sun::star::accessibility { class XAccessibleRelationSet; }
 namespace com::sun::star::accessibility { struct AccessibleEventObject; }
 namespace utl { class AccessibleRelationSetHelper; }
 
diff --git a/include/editeng/unofield.hxx b/include/editeng/unofield.hxx
index 62a702904b08..34ec2d4a86f2 100644
--- a/include/editeng/unofield.hxx
+++ b/include/editeng/unofield.hxx
@@ -30,8 +30,6 @@
 #include <memory>
 #include <string_view>
 
-namespace com::sun::star::beans { class XPropertySetInfo; }
-
 class SvxUnoFieldData_Impl;
 class SfxItemPropertySet;
 class SvxFieldData;
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 168b9ce063ee..8605e36219f0 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -162,7 +162,6 @@ struct SfxItemPropertyMapEntry;
     { UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES,    EE_PARA_FORBIDDENRULES,     
cppu::UnoType<bool>::get(),                0 ,0 },\
     {u"WritingMode"_ustr,              EE_PARA_WRITINGDIR, 
::cppu::UnoType<sal_Int16>::get(),            0, 0 }
 
-class SvxFieldItem;
 class SvxFieldData;
 
 EDITENG_DLLPUBLIC void GetSelection( struct ESelection& rSel, SvxTextForwarder 
const * pForwarder ) noexcept;
diff --git a/include/filter/msfilter/msdffimp.hxx 
b/include/filter/msfilter/msdffimp.hxx
index 3b51d5b71424..968670335990 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -48,7 +48,6 @@
 #include <tools/poly.hxx>
 #include <vcl/graph.hxx>
 
-class Color;
 class GDIMetaFile;
 class SotStorage;
 class SvStream;
diff --git a/include/filter/msfilter/svdfppt.hxx 
b/include/filter/msfilter/svdfppt.hxx
index f1dfa6332c7e..981d2fd3512e 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -50,14 +50,12 @@
 #include <salhelper/simplereferenceobject.hxx>
 
 namespace com::sun::star {
-    namespace awt { struct Size; }
     namespace drawing { class XShape; }
     namespace form { class XFormComponent; }
     namespace frame { class XModel; }
 }
 
 class SdrPage;
-class SdrObject;
 class SvStream;
 class SfxItemSet;
 class SdrOutliner;
diff --git a/include/formula/FormulaOpCodeMapperObj.hxx 
b/include/formula/FormulaOpCodeMapperObj.hxx
index 7904506231a3..24496aa21469 100644
--- a/include/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
@@ -30,11 +30,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com::sun::star {
-    namespace sheet { struct FormulaOpCodeMapEntry; }
-    namespace sheet { struct FormulaToken; }
-}
-
 namespace formula
 {
 
diff --git a/include/oox/core/contexthandler.hxx 
b/include/oox/core/contexthandler.hxx
index 89bdb2b9affd..8f3f34e08211 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -34,7 +34,6 @@
 #include <sal/types.h>
 
 namespace com::sun::star {
-    namespace xml::sax { class XFastAttributeList; }
     namespace xml::sax { class XLocator; }
 }
 
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index 8390f27de233..cba5df99c544 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -44,7 +44,6 @@ namespace com::sun::star {
     namespace io { class XInputStream; }
     namespace io { class XOutputStream; }
     namespace io { class XStream; }
-    namespace lang { class XComponent; }
     namespace lang { class XMultiServiceFactory; }
     namespace task { class XStatusIndicator; }
     namespace uno { class XComponentContext; }
diff --git a/include/oox/core/filterdetect.hxx 
b/include/oox/core/filterdetect.hxx
index 8b01bcc5f285..47be88c19019 100644
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -34,12 +34,8 @@
 #include <sal/types.h>
 
 namespace com::sun::star {
-    namespace beans { struct PropertyValue; }
     namespace io { class XInputStream; }
     namespace uno { class XComponentContext; }
-    namespace xml::sax { class XFastAttributeList; }
-    namespace xml::sax { class XFastContextHandler; }
-    namespace xml::sax { class XLocator; }
 }
 
 namespace utl { class MediaDescriptor; }
diff --git a/include/oox/core/fragmenthandler.hxx 
b/include/oox/core/fragmenthandler.hxx
index b39eae011616..ee787c37a35f 100644
--- a/include/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
@@ -34,7 +34,6 @@
 
 namespace com::sun::star {
     namespace io { class XInputStream; }
-    namespace xml::sax { class XFastAttributeList; }
     namespace xml::sax { class XFastContextHandler; }
     namespace xml::sax { class XLocator; }
 }
diff --git a/include/oox/core/fragmenthandler2.hxx 
b/include/oox/core/fragmenthandler2.hxx
index 05b2b2d0bef3..8b3665b26953 100644
--- a/include/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
@@ -29,16 +29,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com::sun::star {
-    namespace xml::sax { class XFastAttributeList; }
-    namespace xml::sax { class XFastContextHandler; }
-}
-
-namespace oox {
-    class AttributeList;
-    class SequenceInputStream;
-}
-
 namespace oox::core {
 
 class XmlFilterBase;
diff --git a/include/oox/core/relationshandler.hxx 
b/include/oox/core/relationshandler.hxx
index ec8f77e92dad..3a4d4fec7dae 100644
--- a/include/oox/core/relationshandler.hxx
+++ b/include/oox/core/relationshandler.hxx
@@ -25,11 +25,6 @@
 #include <oox/core/relations.hxx>
 #include <sal/types.h>
 
-namespace com::sun::star {
-    namespace xml::sax { class XFastAttributeList; }
-    namespace xml::sax { class XFastContextHandler; }
-}
-
 namespace oox::core {
 
 class XmlFilterBase;
diff --git a/include/oox/core/xmlfilterbase.hxx 
b/include/oox/core/xmlfilterbase.hxx
index a5b6e7f4e47d..1afa282f3346 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -34,9 +34,7 @@
 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 uno { class XComponentContext; }
     namespace xml::dom { class XDocument; }
     namespace xml::sax { class XFastSAXSerializable; }
@@ -60,8 +58,6 @@ namespace sax_fastparser {
     typedef std::shared_ptr< FastSerializerHelper > FSHelperPtr;
 }
 
-namespace utl { class MediaDescriptor; }
-
 namespace oox::drawingml
 {
 class Shape;
diff --git a/include/oox/crypto/AgileEngine.hxx 
b/include/oox/crypto/AgileEngine.hxx
index bccb30eaef3e..e3daf7f971a9 100644
--- a/include/oox/crypto/AgileEngine.hxx
+++ b/include/oox/crypto/AgileEngine.hxx
@@ -18,11 +18,6 @@
 #include <sal/types.h>
 #include <comphelper/crypto/Crypto.hxx>
 
-namespace oox {
-    class BinaryXInputStream;
-    class BinaryXOutputStream;
-}
-
 namespace oox::crypto {
 
 struct OOX_DLLPUBLIC AgileEncryptionInfo
diff --git a/include/oox/crypto/Standard2007Engine.hxx 
b/include/oox/crypto/Standard2007Engine.hxx
index 17ebbccd2556..24f12bf97f7a 100644
--- a/include/oox/crypto/Standard2007Engine.hxx
+++ b/include/oox/crypto/Standard2007Engine.hxx
@@ -17,11 +17,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace oox {
-    class BinaryXInputStream;
-    class BinaryXOutputStream;
-}
-
 namespace oox::crypto {
 
 class OOX_DLLPUBLIC Standard2007Engine final : public CryptoEngine
diff --git a/include/oox/drawingml/connectorshapecontext.hxx 
b/include/oox/drawingml/connectorshapecontext.hxx
index 9831b5639d02..9130d9091db5 100644
--- a/include/oox/drawingml/connectorshapecontext.hxx
+++ b/include/oox/drawingml/connectorshapecontext.hxx
@@ -27,8 +27,6 @@
 #include <sal/types.h>
 #include <vector>
 
-namespace oox { class AttributeList; }
-
 namespace oox::drawingml {
 
     struct ConnectorShapeProperties
diff --git a/include/oox/drawingml/graphicshapecontext.hxx 
b/include/oox/drawingml/graphicshapecontext.hxx
index ffd579f00bb1..277210b3a546 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -27,7 +27,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace oox { class AttributeList; }
 namespace oox::core { class ContextHandler2Helper; }
 namespace oox::vml { struct OleObjectInfo; }
 
diff --git a/include/oox/drawingml/shapecontext.hxx 
b/include/oox/drawingml/shapecontext.hxx
index 4edd472283bc..0d6475fed7d4 100644
--- a/include/oox/drawingml/shapecontext.hxx
+++ b/include/oox/drawingml/shapecontext.hxx
@@ -26,8 +26,6 @@
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <sal/types.h>
 
-namespace oox { class AttributeList; }
-
 namespace oox::drawingml {
 
 class OOX_DLLPUBLIC ShapeContext : public ::oox::core::ContextHandler2
diff --git a/include/oox/drawingml/shapegroupcontext.hxx 
b/include/oox/drawingml/shapegroupcontext.hxx
index 9a677d28cdc3..243e8f86b6b4 100644
--- a/include/oox/drawingml/shapegroupcontext.hxx
+++ b/include/oox/drawingml/shapegroupcontext.hxx
@@ -25,8 +25,6 @@
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <sal/types.h>
 
-namespace oox { class AttributeList; }
-
 namespace oox::drawingml {
 
 class OOX_DLLPUBLIC ShapeGroupContext : public ::oox::core::FragmentHandler2
diff --git a/include/oox/drawingml/themefragmenthandler.hxx 
b/include/oox/drawingml/themefragmenthandler.hxx
index 5c193544fe65..c5b223734a83 100644
--- a/include/oox/drawingml/themefragmenthandler.hxx
+++ b/include/oox/drawingml/themefragmenthandler.hxx
@@ -27,7 +27,6 @@
 #include <sal/types.h>
 #include <docmodel/theme/Theme.hxx>
 
-namespace oox { class AttributeList; }
 namespace oox::core { class XmlFilterBase; }
 
 namespace oox::drawingml
diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx
index e129b0a7f0fa..c2441b747e66 100644
--- a/include/oox/dump/dffdumper.hxx
+++ b/include/oox/dump/dffdumper.hxx
@@ -25,8 +25,6 @@
 
 #ifdef DBG_UTIL
 
-namespace oox { class BinaryInputStream; }
-
 namespace oox::dump {
 
 
diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx
index 585e9e5226eb..df3e6c8309dd 100644
--- a/include/oox/dump/oledumper.hxx
+++ b/include/oox/dump/oledumper.hxx
@@ -35,10 +35,6 @@
 
 #ifdef DBG_UTIL
 
-namespace com::sun::star {
-    namespace io { class XInputStream; }
-}
-
 namespace oox::dump {
 
 
diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx
index 42cc969b2a89..395f23d46b14 100644
--- a/include/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
@@ -32,10 +32,6 @@ namespace com::sun::star {
     namespace uno { class XComponentContext; }
 }
 
-namespace oox {
-    class BinaryInputStream;
-}
-
 namespace oox::core { class FilterBase; }
 
 namespace oox::dump::xlsb {
diff --git a/include/oox/helper/zipstorage.hxx 
b/include/oox/helper/zipstorage.hxx
index dd56a1f75a71..a5d0e0eda7c7 100644
--- a/include/oox/helper/zipstorage.hxx
+++ b/include/oox/helper/zipstorage.hxx
@@ -29,7 +29,6 @@
 namespace com::sun::star {
     namespace embed { class XStorage; }
     namespace io { class XInputStream; }
-    namespace io { class XOutputStream; }
     namespace io { class XStream; }
     namespace uno { class XComponentContext; }
 }
diff --git a/include/oox/ole/axcontrolfragment.hxx 
b/include/oox/ole/axcontrolfragment.hxx
index e6b87b416041..01d0b7b378bd 100644
--- a/include/oox/ole/axcontrolfragment.hxx
+++ b/include/oox/ole/axcontrolfragment.hxx
@@ -26,7 +26,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace oox { class AttributeList; }
 namespace oox::core { class XmlFilterBase; }
 
 namespace oox::ole {
diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx
index b7ac512f11bf..49b6f8181a66 100644
--- a/include/oox/ole/olestorage.hxx
+++ b/include/oox/ole/olestorage.hxx
@@ -29,9 +29,7 @@
 
 namespace com::sun::star {
     namespace container { class XNameContainer; }
-    namespace embed { class XStorage; }
     namespace io { class XInputStream; }
-    namespace io { class XOutputStream; }
     namespace io { class XStream; }
     namespace uno { class XComponentContext; }
 }
diff --git a/include/oox/ppt/backgroundproperties.hxx 
b/include/oox/ppt/backgroundproperties.hxx
index 35a209b3067d..ed28a1f5873f 100644
--- a/include/oox/ppt/backgroundproperties.hxx
+++ b/include/oox/ppt/backgroundproperties.hxx
@@ -24,7 +24,6 @@
 #include <oox/core/fragmenthandler2.hxx>
 #include <sal/types.h>
 
-namespace oox { class AttributeList; }
 namespace oox::drawingml { struct FillProperties; }
 
 namespace oox::ppt {
diff --git a/include/oox/ppt/customshowlistcontext.hxx 
b/include/oox/ppt/customshowlistcontext.hxx
index d79cfc6370e2..221bd041361f 100644
--- a/include/oox/ppt/customshowlistcontext.hxx
+++ b/include/oox/ppt/customshowlistcontext.hxx
@@ -27,8 +27,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace oox { class AttributeList; }
-
 namespace oox::ppt {
 
 
diff --git a/include/oox/ppt/layoutfragmenthandler.hxx 
b/include/oox/ppt/layoutfragmenthandler.hxx
index 41fb7a85bd78..0d8be35c0ec9 100644
--- a/include/oox/ppt/layoutfragmenthandler.hxx
+++ b/include/oox/ppt/layoutfragmenthandler.hxx
@@ -26,7 +26,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace oox { class AttributeList; }
 namespace oox::core { class XmlFilterBase; }
 
 namespace oox::ppt {
diff --git a/include/oox/ppt/pptgraphicshapecontext.hxx 
b/include/oox/ppt/pptgraphicshapecontext.hxx
index 2d0f2b69fac6..88d717eb2ba2 100644
--- a/include/oox/ppt/pptgraphicshapecontext.hxx
+++ b/include/oox/ppt/pptgraphicshapecontext.hxx
@@ -26,7 +26,6 @@
 #include <oox/ppt/slidepersist.hxx>
 #include <sal/types.h>
 
-namespace oox { class AttributeList; }
 namespace oox::core { class ContextHandler2Helper; }
 
 namespace oox::ppt {
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index d4212f8140e2..f7d786fc6fd4 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -35,15 +35,11 @@
 #include <sal/types.h>
 
 namespace com::sun::star {
-    namespace beans { struct PropertyValue; }
     namespace uno { class XComponentContext; }
 }
 
 namespace oox {
-    class GraphicHelper;
     namespace drawingml::chart { class ChartConverter; }
-    namespace ole { class VbaProject; }
-    namespace vml { class Drawing; }
 }
 
 namespace oox::ppt {
diff --git a/include/oox/ppt/pptshapecontext.hxx 
b/include/oox/ppt/pptshapecontext.hxx
index 7f2857ae758a..7b634eb00344 100644
--- a/include/oox/ppt/pptshapecontext.hxx
+++ b/include/oox/ppt/pptshapecontext.hxx
@@ -26,7 +26,6 @@
 #include <oox/ppt/slidepersist.hxx>
 #include <sal/types.h>
 
-namespace oox { class AttributeList; }
 namespace oox::core { class ContextHandler2Helper; }
 
 namespace oox::ppt {
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx 
b/include/oox/ppt/pptshapegroupcontext.hxx
index f593d3b3b20c..79494bdb82c2 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -27,7 +27,6 @@
 #include <sal/types.h>
 
 namespace oox {
-    class AttributeList;
     namespace drawingml { class Color; }
 }
 
diff --git a/include/oox/ppt/presentationfragmenthandler.hxx 
b/include/oox/ppt/presentationfragmenthandler.hxx
index cd9084235221..9a7937e2a4d2 100644
--- a/include/oox/ppt/presentationfragmenthandler.hxx
+++ b/include/oox/ppt/presentationfragmenthandler.hxx
@@ -33,7 +33,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace oox { class AttributeList; }
 namespace oox::core { class XmlFilterBase; }
 
 namespace oox::ppt {
diff --git a/include/oox/ppt/slidefragmenthandler.hxx 
b/include/oox/ppt/slidefragmenthandler.hxx
index b7d1d59b32ba..9055dfc9abef 100644
--- a/include/oox/ppt/slidefragmenthandler.hxx
+++ b/include/oox/ppt/slidefragmenthandler.hxx
@@ -29,7 +29,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace oox { class AttributeList; }
 namespace oox::core { class XmlFilterBase; }
 
 namespace oox::ppt {
diff --git a/include/oox/ppt/slidemastertextstylescontext.hxx 
b/include/oox/ppt/slidemastertextstylescontext.hxx
index 1173fd9a6278..ef9c792d7f98 100644
--- a/include/oox/ppt/slidemastertextstylescontext.hxx
+++ b/include/oox/ppt/slidemastertextstylescontext.hxx
@@ -25,8 +25,6 @@
 #include <oox/ppt/slidepersist.hxx>
 #include <sal/types.h>
 
-namespace oox { class AttributeList; }
-
 namespace oox::ppt {
 
 class SlideMasterTextStylesContext final : public oox::core::FragmentHandler2
diff --git a/include/oox/ppt/slidetimingcontext.hxx 
b/include/oox/ppt/slidetimingcontext.hxx
index 7b147ab85610..d3d0f1a21915 100644
--- a/include/oox/ppt/slidetimingcontext.hxx
+++ b/include/oox/ppt/slidetimingcontext.hxx
@@ -25,8 +25,6 @@
 #include <oox/ppt/timenode.hxx>
 #include <sal/types.h>
 
-namespace oox { class AttributeList; }
-
 namespace oox::ppt {
 
 class SlideTimingContext final : public ::oox::core::FragmentHandler2
diff --git a/include/oox/ppt/soundactioncontext.hxx 
b/include/oox/ppt/soundactioncontext.hxx
index 4bf66a5f713d..65dd9b8c415c 100644
--- a/include/oox/ppt/soundactioncontext.hxx
+++ b/include/oox/ppt/soundactioncontext.hxx
@@ -27,7 +27,6 @@
 #include <sal/types.h>
 
 namespace oox {
-    class AttributeList;
     class PropertyMap;
 }
 
diff --git a/include/oox/ppt/timenodelistcontext.hxx 
b/include/oox/ppt/timenodelistcontext.hxx
index 4de13e07040e..31a2b61dc2de 100644
--- a/include/oox/ppt/timenodelistcontext.hxx
+++ b/include/oox/ppt/timenodelistcontext.hxx
@@ -30,8 +30,6 @@ namespace com::sun::star {
     namespace xml::sax { class XFastAttributeList; }
 }
 
-namespace oox { class AttributeList; }
-
 namespace oox::ppt {
 
 
diff --git a/include/oox/vml/vmldrawingfragment.hxx 
b/include/oox/vml/vmldrawingfragment.hxx
index f7fa4d0bd605..0300b4933666 100644
--- a/include/oox/vml/vmldrawingfragment.hxx
+++ b/include/oox/vml/vmldrawingfragment.hxx
@@ -27,11 +27,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com::sun::star {
-    namespace io { class XInputStream; }
-}
-
-namespace oox { class AttributeList; }
 namespace oox::core { class XmlFilterBase; }
 
 namespace oox::vml {
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index 72eb9cf890d3..b42c356003db 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -33,7 +33,6 @@
 
 namespace com::sun::star::xml::sax { class XFastTokenHandler; }
 namespace com::sun::star::xml { struct Attribute; }
-namespace com::sun::star::xml { struct FastAttribute; }
 
 namespace sax_fastparser
 {
diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx
index fe388fce21cc..0c6ce3493917 100644
--- a/include/sax/fastparser.hxx
+++ b/include/sax/fastparser.hxx
@@ -28,11 +28,6 @@
 #include <sax/saxdllapi.h>
 #include <memory>
 
-namespace com::sun::star::xml::sax {
-    class XFastDocumentHandler;
-    class XFastTokenHandler;
-}
-
 namespace sax_fastparser {
 
 
diff --git a/include/sfx2/DocumentMetadataAccess.hxx 
b/include/sfx2/DocumentMetadataAccess.hxx
index bcbf9f1b3849..77a3642c7a06 100644
--- a/include/sfx2/DocumentMetadataAccess.hxx
+++ b/include/sfx2/DocumentMetadataAccess.hxx
@@ -39,9 +39,6 @@
     protected externally.
  */
 
-namespace com::sun::star::embed {
-    class XStorage;
-}
 namespace com::sun::star::frame {
     class XModel;
 }
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 78e7ccbadcb6..5c0641e8ca79 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -50,7 +50,6 @@ namespace com::sun::star {
 }
 
 struct CustomProperty;
-class SvtCalendarBox;
 
 // class SfxDocumentInfoItem ---------------------------------------------
 
@@ -276,9 +275,6 @@ public:
     void AddFontTabPage();
 };
 
-// class CustomPropertiesRemoveButton ------------------------------------
-struct CustomPropertyLine;
-
 class CustomPropertiesDateField
 {
 private:
@@ -293,11 +289,6 @@ public:
     ~CustomPropertiesDateField();
 };
 
-namespace weld
-{
-    class TimeFormatter;
-}
-
 class CustomPropertiesTimeField
 {
 public:
diff --git a/include/sfx2/listview.hxx b/include/sfx2/listview.hxx
index 72d4ae7e79f4..db3cecd813ff 100644
--- a/include/sfx2/listview.hxx
+++ b/include/sfx2/listview.hxx
@@ -16,8 +16,6 @@ enum TemplateViewMode
     eListView,
     eThumbnailView
 };
-class SfxDocumentTemplates;
-class TemplateContainerItem;
 struct ListViewItem;
 
 class ListView
diff --git a/include/sfx2/sfxbasecontroller.hxx 
b/include/sfx2/sfxbasecontroller.hxx
index 978cd5669d45..720f61c5b116 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -41,15 +41,6 @@
 
 #include <sfx2/groupid.hxx>
 
-namespace com::sun::star::awt { class XKeyHandler; }
-namespace com::sun::star::awt { class XMouseClickHandler; }
-namespace com::sun::star::frame { class XDispatch; }
-namespace com::sun::star::frame { class XFrame; }
-namespace com::sun::star::frame { class XModel; }
-namespace com::sun::star::frame { struct DispatchDescriptor; }
-namespace com::sun::star::ui { class XContextMenuInterceptor; }
-namespace com::sun::star::ui { class XSidebarProvider; }
-namespace com::sun::star::util { struct URL; }
 namespace weld { class Button; }
 
 struct  IMPL_SfxBaseController_DataContainer    ;   // impl. struct to hold 
member of class SfxBaseController
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index ac736e4709cd..7f1ca213a7b1 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -76,17 +76,9 @@ namespace sfx::intern {
 }
 
 namespace com::sun::star::beans { struct PropertyValue; }
-namespace com::sun::star::container { class XNameContainer; }
-namespace com::sun::star::container { class XNameReplace; }
-namespace com::sun::star::document { class XEventListener; }
-namespace com::sun::star::document { struct CmisProperty; }
-namespace com::sun::star::document { struct CmisVersion; }
 namespace com::sun::star::document { struct EventObject; }
 namespace com::sun::star::frame { class XController2; }
-namespace com::sun::star::task { class XInteractionHandler; }
 namespace com::sun::star::ui { class XUIConfigurationManager2; }
-namespace com::sun::star::util { class XCloseListener; }
-namespace com::sun::star::util { class XModifyListener; }
 
 
 
diff --git a/include/sfx2/sfxstatuslistener.hxx 
b/include/sfx2/sfxstatuslistener.hxx
index 384d5ac19e3f..53060aa16a31 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -30,7 +30,6 @@
 
 namespace com::sun::star::frame { class XDispatch; }
 namespace com::sun::star::frame { class XDispatchProvider; }
-namespace com::sun::star::frame { struct FeatureStateEvent; }
 
 class SFX2_DLLPUBLIC SfxStatusListener : public cppu::WeakImplHelper<
                           css::frame::XStatusListener,
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index a453c58cc579..7e3bcfeb28a2 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -26,10 +26,6 @@
 
 namespace com::sun::star::frame { class XFrame; }
 
-namespace svt { class AcceleratorExecute; }
-
-namespace weld { class Toolbar; }
-
 namespace sfx2::sidebar {
 
 class FocusManager;
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index d1945dbfe85c..bfc566860939 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -19,10 +19,6 @@
 #include <vcl/customweld.hxx>
 
 class BitmapEx;
-class MouseEvent;
-class KeyEvent;
-class DataChangedEvent;
-class ScrollBar;
 class ThumbnailViewItem;
 typedef ::std::vector< ThumbnailViewItem* > ThumbnailValueItemList;
 class ThumbnailViewAcc;
diff --git a/include/svl/nfengine.hxx b/include/svl/nfengine.hxx
index a057ebef3bee..497f4ed65178 100644
--- a/include/svl/nfengine.hxx
+++ b/include/svl/nfengine.hxx
@@ -34,9 +34,7 @@
 class Color;
 class ImpSvNumberformatScan;
 class ImpSvNumberInputScan;
-class SvNumberFormatterRegistry_Impl;
 class SvNumberFormatter;
-class NfCurrencyTable;
 
 class SVL_DLLPUBLIC SvNFLanguageData
 {
diff --git a/include/svl/numformat.hxx b/include/svl/numformat.hxx
index e82be6e27d22..d499377ed9bf 100644
--- a/include/svl/numformat.hxx
+++ b/include/svl/numformat.hxx
@@ -22,6 +22,9 @@
 
 #include <svl/nfengine.hxx>
 
+class SvNumberFormatterRegistry_Impl;
+class NfCurrencyTable;
+
 class SVL_DLLPUBLIC SvNumberFormatter
 {
     friend class SvNumberFormatterRegistry_Impl;
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx
index ee45d0151d82..a0326a388aae 100644
--- a/include/svtools/asynclink.hxx
+++ b/include/svtools/asynclink.hxx
@@ -24,7 +24,6 @@
 #include <tools/link.hxx>
 #include <mutex>
 
-class Timer;
 struct ImplSVEvent;
 
 namespace svtools {
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 8ceb560e9614..43bd459f18c2 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -41,10 +41,6 @@ class BrowserHeader;
 class ScrollAdaptor;
 class MeasureStatusBar;
 
-namespace svt {
-    class BrowseBoxImpl;
-}
-
 namespace weld {
     class Scrollbar;
 }
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 1ea54f44308d..246e22922320 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -31,7 +31,6 @@
 namespace weld { class CustomWeld; }
 
 class BitmapEx;
-class BorderWidthImpl;
 class FontList;
 class VclSimpleEvent;
 class VirtualDevice;
diff --git a/include/svtools/javainteractionhandler.hxx 
b/include/svtools/javainteractionhandler.hxx
index 8cd220cc4a0f..53974d282993 100644
--- a/include/svtools/javainteractionhandler.hxx
+++ b/include/svtools/javainteractionhandler.hxx
@@ -24,8 +24,6 @@
 
 #include <com/sun/star/task/XInteractionHandler.hpp>
 
-namespace com :: sun :: star :: task { class XInteractionRequest; }
-
 inline constexpr OUString JAVA_INTERACTION_HANDLER_NAME = 
u"java-vm.interaction-handler"_ustr;
 
 namespace svt
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 2cabded3b1be..1b4e2f59cff3 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -31,9 +31,6 @@
 #include <vcl/glyphitem.hxx>
 
 class MouseEvent;
-class TrackingEvent;
-class DataChangedEvent;
-class SvtRulerAccessible;
 
 /*************************************************************************
 
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 5b87858067f9..9cbeb77a9fd9 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -302,7 +302,6 @@ enum TabBarAllowRenamingReturnCode {
 };
 
 class MouseEvent;
-class DataChangedEvent;
 
 struct ImplTabBarItem;
 struct TabBar_Impl;
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index b2b7d5a12673..31893b482aef 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -27,8 +27,6 @@
 #include <memory>
 #include <vector>
 
-class MouseEvent;
-class KeyEvent;
 class UserDrawEvent;
 class VirtualDevice;
 class ValueSetAcc;
diff --git a/include/svx/AccessibleControlShape.hxx 
b/include/svx/AccessibleControlShape.hxx
index e4567ae74e96..cd9b7ab99428 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -34,19 +34,13 @@
 #include <svx/AccessibleShape.hxx>
 
 namespace com::sun::star {
-    namespace accessibility { class XAccessible; }
     namespace accessibility { class XAccessibleContext; }
-    namespace accessibility { struct AccessibleEventObject; }
-    namespace accessibility { class XAccessibleRelationSet; }
     namespace awt { class XControl; }
     namespace beans { class XPropertySet; }
     namespace beans { class XPropertySetInfo; }
-    namespace beans { struct PropertyChangeEvent; }
-    namespace container { struct ContainerEvent; }
     namespace lang { class XComponent; }
     namespace lang { class XTypeProvider; }
     namespace uno { class XAggregation; }
-    namespace util { struct ModeChangeEvent; }
 }
 
 namespace comphelper
diff --git a/include/svx/AccessibleOLEShape.hxx 
b/include/svx/AccessibleOLEShape.hxx
index 5816de24502f..3f34e78cec03 100644
--- a/include/svx/AccessibleOLEShape.hxx
+++ b/include/svx/AccessibleOLEShape.hxx
@@ -30,10 +30,6 @@
 #include <svx/AccessibleShape.hxx>
 #include <svx/svxdllapi.h>
 
-namespace com::sun::star {
-    namespace accessibility { class XAccessibleKeyBinding; }
-}
-
 namespace accessibility {
 
 class AccessibleShapeInfo;
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index 3ee141cddcd8..5414a87321a0 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -48,12 +48,6 @@
 #include <memory>
 
 namespace com::sun::star {
-    namespace accessibility { class XAccessible; }
-    namespace accessibility { class XAccessibleEventListener; }
-    namespace accessibility { class XAccessibleHyperlink; }
-    namespace accessibility { class XAccessibleRelationSet; }
-    namespace beans { struct PropertyValue; }
-    namespace document { struct EventObject; }
     namespace drawing { class XShape; }
 }
 
diff --git a/include/svx/CommonStyleManager.hxx 
b/include/svx/CommonStyleManager.hxx
index a7f2a7ae3ce2..151f591c7269 100644
--- a/include/svx/CommonStyleManager.hxx
+++ b/include/svx/CommonStyleManager.hxx
@@ -13,11 +13,7 @@
 #include <sfx2/StyleManager.hxx>
 #include <svx/svxdllapi.h>
 
-namespace sfx2 { class StylePreviewRenderer; }
-
-class OutputDevice;
 class SfxObjectShell;
-class SfxStyleSheetBase;
 
 namespace svx
 {
diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx
index 5dd053f5a227..44b9d40ad77f 100644
--- a/include/svx/PaletteManager.hxx
+++ b/include/svx/PaletteManager.hxx
@@ -29,10 +29,8 @@
 #include <memory>
 #include <set>
 
-namespace com::sun::star::uno { class XComponentContext; }
 namespace svx { class ToolboxButtonColorUpdaterBase; }
 namespace weld { class Window; }
-namespace model { class ColorSet; }
 namespace tools { class JsonWriter; }
 
 class SVXCORE_DLLPUBLIC PaletteManager : public 
std::enable_shared_from_this<PaletteManager>
diff --git a/include/svx/ParaSpacingControl.hxx 
b/include/svx/ParaSpacingControl.hxx
index 3a5c1d0fa861..1ed39c067762 100644
--- a/include/svx/ParaSpacingControl.hxx
+++ b/include/svx/ParaSpacingControl.hxx
@@ -27,14 +27,6 @@ namespace com::sun::star::ui
 {
 class XContextChangeEventMultiplexer;
 }
-namespace com::sun::star::ui
-{
-struct ContextChangeEventObject;
-}
-namespace vcl
-{
-class Window;
-}
 
 namespace svx
 {
diff --git a/include/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx
index f821d339a7f3..1f5abe8b03db 100644
--- a/include/svx/SmartTagMgr.hxx
+++ b/include/svx/SmartTagMgr.hxx
@@ -52,7 +52,6 @@ namespace com::sun::star::i18n {
 
 namespace com::sun::star::lang {
     struct Locale;
-    struct EventObject;
 }
 
 namespace com::sun::star::beans {
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index d0245403360d..99117d11eb19 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -27,9 +27,6 @@
 #include <svx/svxdllapi.h>
 #include <tools/degree.hxx>
 
-class IntlWrapper;
-class SfxItemPool;
-
 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxOrientationItem final : public 
SfxEnumItem<SvxCellOrientation>
 {
 public:
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index b5567a0c8702..556d10154f36 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -39,8 +39,6 @@ namespace com::sun::star {
     namespace accessibility { class XAccessible; }
 }
 
-namespace com::sun::star::uno { class XComponentContext; }
-
 using namespace ::com::sun::star;
 
 #define COLUMN_COUNT    16
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index eb6d42fde640..88351f285be0 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -26,9 +26,6 @@
 #include <svl/poolitem.hxx>
 #include <svx/svxdllapi.h>
 
-class IntlWrapper;
-class SfxItemPool;
-
 enum class SvxChartTextOrder
 {
     SideBySide,
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index eb87aecbbb60..4c064dbf40bc 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -28,7 +28,6 @@
 #include <svl/poolitem.hxx>
 #include <svx/svxdllapi.h>
 
-class SfxItemPool;
 struct SvxClipboardFormatItem_Impl;
 
 class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxClipboardFormatItem final : public 
SfxPoolItem
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index 30995a070f3c..3c8323197f8e 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -27,8 +27,6 @@
 #include <svx/obj3d.hxx>
 #include <svx/svxdllapi.h>
 
-namespace sdr::contact { class ViewContact; }
-
 class E3dDefaultAttributes;
 
 /*************************************************************************
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 841ccb86442f..fc4d24419edd 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -34,7 +34,6 @@
 class GalleryFileStorage;
 class GalleryThemeEntry;
 class SgaObject;
-class SotStorageStream;
 class FmFormModel;
 class Gallery;
 namespace unogallery
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 54919a49c931..704666d171bb 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -32,7 +32,6 @@
 class E3dScene;
 
 namespace sdr::properties {
-    class BaseProperties;
     class E3dCompoundProperties;
     class E3dExtrudeProperties;
     class E3dLatheProperties;
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index f9d91412b229..a5ce7e0e3612 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -26,7 +26,6 @@
 
 #include <memory>
 
-class Menu;
 class SvxProtectItem;
 class SvxRulerItem;
 class SfxBindings;
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index 786674530792..9a770f06d77c 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -28,10 +28,6 @@
 #include <svx/svx3ditems.hxx>
 #include <memory>
 
-namespace sdr::properties {
-    class BaseProperties;
-}
-
 /*************************************************************************
 |*
 |* GeoData relevant for undo actions
diff --git a/include/svx/sdr/table/tablecontroller.hxx 
b/include/svx/sdr/table/tablecontroller.hxx
index eb86ae2c292a..d5c737bda53d 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 SdrObject;
 class SfxItemSet;
 class SvxBoxInfoItem;
 class SvxBoxItem;
diff --git a/include/svx/searchcharmap.hxx b/include/svx/searchcharmap.hxx
index b07d58a4c8ad..b77c127af2c9 100644
--- a/include/svx/searchcharmap.hxx
+++ b/include/svx/searchcharmap.hxx
@@ -28,8 +28,6 @@
 #include <vcl/vclptr.hxx>
 #include <unordered_map>
 
-namespace svx { struct SvxShowCharSetItem; }
-namespace tools { class Rectangle; }
 namespace weld { class ScrolledWindow; }
 
 class Subset;
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index 291d1c8d6c40..195ae6032f4c 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -25,7 +25,6 @@
 #include <svx/sdr/contact/objectcontact.hxx>
 #include <memory>
 
-class SdrDragView;
 class SdrDragStat;
 
 class SAL_DLLPUBLIC_RTTI SdrDragEntry
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 5f80ead04e4a..d7b3d6295ea8 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -42,13 +42,8 @@
 
 class SdrOutliner;
 class SdrModel;
-class SvtSysLocale;
 class LocaleDataWrapper;
 
-namespace com::sun::star::lang {
-    struct Locale;
-}
-
 /**
  * Create an Outliner with the engine-global default settings on the heap.
  * If pMod != nullptr, the MapMode of the passed model is used.
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index b0d8bd7b36a5..a31e8d61b31a 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -47,31 +47,16 @@
 class OutputDevice;
 class SdrOutliner;
 class SdrLayerAdmin;
-class SdrObjList;
 class SdrObject;
 class SdrPage;
-class SdrPageView;
 class SdrTextObj;
 class SdrUndoAction;
 class SdrUndoGroup;
-class AutoTimer;
 class SfxItemPool;
 class SfxItemSet;
-class SfxRepeatTarget;
-class SfxStyleSheet;
-class SfxUndoAction;
-class SfxUndoManager;
-class XBitmapList;
-class XColorList;
-class XDashList;
-class XGradientList;
-class XHatchList;
-class XLineEndList;
 class SvxForbiddenCharactersTable;
-class SvNumberFormatter;
 class SdrOutlinerCache;
 class SdrUndoFactory;
-class ImageMap;
 class TextChain;
 enum class CharCompressType;
 enum class SdrCompatibilityFlag;
@@ -93,11 +78,6 @@ namespace model
 class Theme;
 }
 
-namespace svx
-{
-class IThemeColorChanger;
-}
-
 constexpr const sal_Unicode DEGREE_CHAR = u'\x00B0'; /* U+00B0 DEGREE SIGN */
 
 
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index dcef67aa2c4c..058278f4b1ef 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -23,7 +23,6 @@
 #include <svx/svxdllapi.h>
 #include <editeng/measfld.hxx>
 
-class SdrOutliner;
 struct ImpMeasureRec;
 struct ImpMeasurePoly;
 
diff --git a/include/svx/svdoutl.hxx b/include/svx/svdoutl.hxx
index 5b60e9cc246f..422399e17c23 100644
--- a/include/svx/svdoutl.hxx
+++ b/include/svx/svdoutl.hxx
@@ -26,7 +26,6 @@
 
 class SdrTextObj;
 class SdrPage;
-enum class SdrCompatibilityFlag;
 
 class SVXCORE_DLLPUBLIC SdrOutliner : public Outliner
 {
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 8371d080cbe2..0ad088889206 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -44,13 +44,11 @@ namespace sdr::contact { class ViewContact; }
 namespace sdr::annotation { class Annotation; }
 class SdrPage;
 class SdrModel;
-class SfxItemPool;
 class SdrPageView;
 class SdrLayerAdmin;
 class SdrLayerIDSet;
 class Color;
 class SfxStyleSheet;
-class SvxUnoDrawPagesAccess;
 
 
////////////////////////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 5725d02dd76e..da8d86fe162c 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -148,13 +148,13 @@ enum class XPropertyListType {
 
 typedef rtl::Reference< class XPropertyList > XPropertyListRef;
 
-class XDashList ; typedef rtl::Reference< class XDashList > XDashListRef;
-class XHatchList ; typedef rtl::Reference< class XHatchList > XHatchListRef;
-class XColorList ; typedef rtl::Reference< class XColorList > XColorListRef;
-class XBitmapList ; typedef rtl::Reference< class XBitmapList > XBitmapListRef;
-class XPatternList ; typedef rtl::Reference< class XPatternList > 
XPatternListRef;
-class XLineEndList ; typedef rtl::Reference< class XLineEndList > 
XLineEndListRef;
-class XGradientList ; typedef rtl::Reference< class XGradientList > 
XGradientListRef;
+typedef rtl::Reference< class XDashList > XDashListRef;
+typedef rtl::Reference< class XHatchList > XHatchListRef;
+typedef rtl::Reference< class XColorList > XColorListRef;
+typedef rtl::Reference< class XBitmapList > XBitmapListRef;
+typedef rtl::Reference< class XPatternList > XPatternListRef;
+typedef rtl::Reference< class XLineEndList > XLineEndListRef;
+typedef rtl::Reference< class XGradientList > XGradientListRef;
 
 class SVXCORE_DLLPUBLIC XPropertyList : public cppu::OWeakObject
 {
diff --git a/include/vbahelper/vbaeventshelperbase.hxx 
b/include/vbahelper/vbaeventshelperbase.hxx
index 420554363c2a..95766403984a 100644
--- a/include/vbahelper/vbaeventshelperbase.hxx
+++ b/include/vbahelper/vbaeventshelperbase.hxx
@@ -39,10 +39,8 @@
 #include <vbahelper/vbadllapi.h>
 
 namespace com::sun::star {
-    namespace document { struct EventObject; }
     namespace frame { class XModel; }
     namespace script::vba { class XVBAModuleInfo; }
-    namespace util { struct ChangesEvent; }
 }
 
 class SfxObjectShell;
diff --git a/include/vcl/bitmap/BitmapConvolutionMatrixFilter.hxx 
b/include/vcl/bitmap/BitmapConvolutionMatrixFilter.hxx
index 71bab0eb5067..b4fca8764bbc 100644
--- a/include/vcl/bitmap/BitmapConvolutionMatrixFilter.hxx
+++ b/include/vcl/bitmap/BitmapConvolutionMatrixFilter.hxx
@@ -12,8 +12,6 @@
 
 #include <vcl/bitmap/BitmapFilter.hxx>
 
-class BitmapEx;
-
 /** Filter image based on a 3x3 convolution matrix
  */
 class VCL_DLLPUBLIC BitmapConvolutionMatrixFilter : public BitmapFilter
diff --git a/include/vcl/bitmap/BitmapDuoToneFilter.hxx 
b/include/vcl/bitmap/BitmapDuoToneFilter.hxx
index abb0b8eeed88..4a8c5d1c5d91 100644
--- a/include/vcl/bitmap/BitmapDuoToneFilter.hxx
+++ b/include/vcl/bitmap/BitmapDuoToneFilter.hxx
@@ -12,8 +12,6 @@
 
 #include <vcl/bitmap/BitmapFilter.hxx>
 
-class BitmapEx;
-
 class BitmapDuoToneFilter final : public BitmapFilter
 {
 public:
diff --git a/include/vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx 
b/include/vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx
index b17d2fcefe00..11d3b331e1c3 100644
--- a/include/vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx
+++ b/include/vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx
@@ -14,7 +14,6 @@
 
 #include <vector>
 
-class BitmapEx;
 class BitmapReadAccess;
 
 class BitmapGaussianSeparableBlurFilter final : public BitmapFilter
diff --git a/include/vcl/bitmap/BitmapMedianFilter.hxx 
b/include/vcl/bitmap/BitmapMedianFilter.hxx
index 8842f8cf6bb3..aeb96ddc3d5e 100644
--- a/include/vcl/bitmap/BitmapMedianFilter.hxx
+++ b/include/vcl/bitmap/BitmapMedianFilter.hxx
@@ -12,8 +12,6 @@
 
 #include <vcl/bitmap/BitmapFilter.hxx>
 
-class BitmapEx;
-
 class VCL_DLLPUBLIC BitmapMedianFilter final : public BitmapFilter
 {
 public:
diff --git a/include/vcl/bitmap/BitmapSeparableUnsharpenFilter.hxx 
b/include/vcl/bitmap/BitmapSeparableUnsharpenFilter.hxx
index a02db451e8c3..a143ad233295 100644
--- a/include/vcl/bitmap/BitmapSeparableUnsharpenFilter.hxx
+++ b/include/vcl/bitmap/BitmapSeparableUnsharpenFilter.hxx
@@ -12,8 +12,6 @@
 
 #include <vcl/bitmap/BitmapFilter.hxx>
 
-class BitmapEx;
-
 /** Separable Unsharpen Mask filter is actually a subtracted blurred
     image from the original image.
  */
diff --git a/include/vcl/bitmap/BitmapSepiaFilter.hxx 
b/include/vcl/bitmap/BitmapSepiaFilter.hxx
index 8f90e3de6e1e..73b40c2e576c 100644
--- a/include/vcl/bitmap/BitmapSepiaFilter.hxx
+++ b/include/vcl/bitmap/BitmapSepiaFilter.hxx
@@ -12,8 +12,6 @@
 
 #include <vcl/bitmap/BitmapFilter.hxx>
 
-class BitmapEx;
-
 class VCL_DLLPUBLIC BitmapSepiaFilter final : public BitmapFilter
 {
 public:
diff --git a/include/vcl/bitmap/BitmapSmoothenFilter.hxx 
b/include/vcl/bitmap/BitmapSmoothenFilter.hxx
index a70761b69516..a7a17a546c54 100644
--- a/include/vcl/bitmap/BitmapSmoothenFilter.hxx
+++ b/include/vcl/bitmap/BitmapSmoothenFilter.hxx
@@ -12,8 +12,6 @@
 
 #include <vcl/bitmap/BitmapFilter.hxx>
 
-class BitmapEx;
-
 class VCL_DLLPUBLIC BitmapSmoothenFilter final : public BitmapFilter
 {
 public:
diff --git a/include/vcl/bitmap/BitmapSolarizeFilter.hxx 
b/include/vcl/bitmap/BitmapSolarizeFilter.hxx
index c47d56cd5856..adfc18e80275 100644
--- a/include/vcl/bitmap/BitmapSolarizeFilter.hxx
+++ b/include/vcl/bitmap/BitmapSolarizeFilter.hxx
@@ -12,8 +12,6 @@
 
 #include <vcl/bitmap/BitmapFilter.hxx>
 
-class BitmapEx;
-
 class VCL_DLLPUBLIC BitmapSolarizeFilter final : public BitmapFilter
 {
 public:
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 96136b04bb4c..d501ef0192de 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -32,21 +32,14 @@
 #  undef check
 #endif
 
-class Button;
 class ComboBox;
 class FormattedField;
 class ListBox;
-class Menu;
 class MessageDialog;
 class NumericFormatter;
-class SalInstanceBuilder;
-class ScreenshotTest;
 class ScrollBar;
 class SvTabListBox;
 class Slider;
-class DateField;
-class TimeField;
-class ToolBox;
 class VclExpander;
 class VclMultiLineEdit;
 struct NotebookBarAddonsItem;
diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx
index bb0f75aef853..35d8f73240b0 100644
--- a/include/vcl/dndhelp.hxx
+++ b/include/vcl/dndhelp.hxx
@@ -28,9 +28,7 @@
 
 namespace com::sun::star::datatransfer::dnd {
     struct DragGestureEvent;
-    struct DragSourceDragEvent;
     struct DragSourceDropEvent;
-    struct DragSourceEvent;
     struct DropTargetDragEvent;
     struct DropTargetDragEnterEvent;
     struct DropTargetDropEvent;
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index 7e9f2c5352d1..c4a6869b064e 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -22,6 +22,7 @@
 #include <vcl/gdimtf.hxx>
 
 class SvStream;
+struct ImplMetaReadData;
 
 class SvmReader
 {
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index 2b24745ede9a..9b458a970a70 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -30,7 +30,6 @@
 
 class OutputDevice;
 class MetaAction;
-class SvStream;
 class Color;
 class BitmapEx;
 namespace tools {
@@ -38,7 +37,6 @@ namespace tools {
     class PolyPolygon;
 }
 class Gradient;
-struct ImplMetaReadData;
 
 #define GDI_METAFILE_END                (size_t(0xFFFFFFFF))
 
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 21344525e2d0..63e68b6b32fc 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -52,7 +52,6 @@ class SalMenu;
 class MenuBarWindow;
 class VclMenuEvent;
 struct SystemMenuData;
-enum class FloatWinPopupFlags;
 enum class VclEventId;
 
 namespace com::sun::star::awt { class XPopupMenu; }
@@ -63,7 +62,6 @@ namespace vcl
 class Window;
 struct MenuLayoutData;
 typedef OutputDevice RenderContext; // same as in include/vcl/outdev.hxx
-class ILibreOfficeKitNotifier;
 }
 
 constexpr sal_uInt16 MENU_APPEND = 0xFFFF;
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index 9f02061418cd..f945c362e605 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -27,9 +27,6 @@
 #include <memory>
 #include <vector>
 
-class DataChangedEvent;
-class HelpEvent;
-class MouseEvent;
 class UserDrawEvent;
 struct ImplStatusItem;
 
diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx
index 11d85b029bf5..cfd392ba9cc5 100644
--- a/include/vcl/syschild.hxx
+++ b/include/vcl/syschild.hxx
@@ -23,7 +23,6 @@
 #include <vcl/dllapi.h>
 #include <vcl/window.hxx>
 
-struct SystemEnvData;
 struct SystemWindowData;
 
 class VCL_DLLPUBLIC SystemChildWindow : public vcl::Window
diff --git a/include/xmloff/XMLEventsImportContext.hxx 
b/include/xmloff/XMLEventsImportContext.hxx
index d33e8bab9254..b65490c28b10 100644
--- a/include/xmloff/XMLEventsImportContext.hxx
+++ b/include/xmloff/XMLEventsImportContext.hxx
@@ -28,7 +28,6 @@
 #include <vector>
 
 namespace com::sun::star {
-    namespace xml::sax { class XAttributeList; }
     namespace beans { struct PropertyValue; }
     namespace container { class XNameReplace; }
     namespace document { class XEventsSupplier; }
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index 0d0e4ce6521e..c38b27850792 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -42,7 +42,6 @@ namespace com::sun::star::drawing { class XShapes; }
 
 class XMLTableExport;
 namespace comphelper { class AttributeList; }
-class XMLPropertyHandlerFactory;
 
 // shape export features are bits used for the nFeature
 // parameter of XMLShapeExport::exportShape
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index c8772907045b..5034641156b8 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -49,9 +49,8 @@ class SvXMLExportPropertyMapper;
 
 namespace com::sun::star
 {
-    namespace beans { class XPropertySet; class XPropertyState;
-                      class XPropertySetInfo; }
-    namespace container { class XEnumeration; class XIndexAccess; class 
XNameReplace; }
+    namespace beans { class XPropertySet; class XPropertySetInfo; }
+    namespace container { class XEnumeration; class XIndexAccess; }
     namespace drawing { class XShape; }
     namespace text { class XTextContent; class XTextRange; class XText;
                      class XFootnote; class XTextFrame; class XTextSection;
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 82eddedd6e45..f963bd791715 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -61,7 +61,6 @@ namespace com::sun::star::uno { class XComponentContext; }
 namespace com::sun::star::util { class XNumberFormatsSupplier; }
 namespace com::sun::star::xml::sax { class XAttributeList; }
 namespace com::sun::star::xml::sax { class XFastAttributeList; }
-namespace com::sun::star::xml::sax { class XFastContextHandler; }
 namespace com::sun::star {
     namespace frame { class XModel; }
     namespace io { class XOutputStream; }
@@ -79,7 +78,6 @@ namespace xmloff::token {
 }
 class EmbeddedFontsHelper;
 class ProgressBarHelper;
-class SvXMLNamespaceMap;
 class SvXMLImport_Impl;
 class SvXMLUnitConverter;
 class SvXMLNumFmtHelper;
@@ -87,7 +85,6 @@ class XMLFontStylesContext;
 class XMLEventImportHelper;
 class XMLErrors;
 class StyleMap;
-enum class SvXMLErrorFlags;
 
 constexpr sal_Int32 LAST_NAMESPACE = 121; // last value in xmloff/xmnspe.hxx
 constexpr size_t NMSP_SHIFT = 16;
diff --git a/sw/source/uibase/inc/workctrl.hxx 
b/sw/source/uibase/inc/workctrl.hxx
index 9c6680d8969d..8193617dcda5 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -24,6 +24,7 @@
 #include <vcl/InterimItemWindow.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
+class Menu;
 class PopupMenu;
 class SwView;
 

Reply via email to