sw/IwyuFilter_sw.yaml                           |    3 +++
 sw/source/filter/html/htmlreqifreader.hxx       |    1 -
 sw/source/filter/html/svxcss1.hxx               |    2 --
 sw/source/filter/html/wrthtml.hxx               |    5 -----
 sw/source/filter/inc/fltini.hxx                 |    6 ------
 sw/source/filter/inc/fltshell.hxx               |    5 -----
 sw/source/filter/inc/msfilter.hxx               |    2 --
 sw/source/filter/ww8/attributeoutputbase.hxx    |   21 ---------------------
 sw/source/filter/ww8/docxexport.hxx             |    6 ------
 sw/source/filter/ww8/rtfexport.hxx              |    4 ----
 sw/source/filter/ww8/writerhelper.hxx           |    1 -
 sw/source/filter/ww8/wrtww8.hxx                 |   13 +------------
 sw/source/filter/ww8/ww8glsy.hxx                |    1 -
 sw/source/filter/ww8/ww8par2.hxx                |    2 --
 sw/source/filter/ww8/ww8scan.hxx                |    3 ---
 sw/source/filter/xml/XMLRedlineImportHelper.hxx |    2 --
 sw/source/filter/xml/wrtxml.hxx                 |    4 ----
 sw/source/filter/xml/xmlexp.hxx                 |    3 ---
 sw/source/filter/xml/xmlimp.hxx                 |    2 --
 sw/source/filter/xml/xmlimpit.hxx               |    1 -
 sw/source/filter/xml/xmltbli.hxx                |    1 -
 sw/source/ui/dbui/addresslistdialog.hxx         |    3 ---
 sw/source/ui/dbui/dbtablepreviewdialog.hxx      |    1 -
 sw/source/ui/dbui/mmaddressblockpage.hxx        |    2 --
 sw/source/ui/envelp/envprt.hxx                  |    2 --
 sw/source/ui/envelp/labfmt.hxx                  |    2 --
 sw/source/ui/envelp/labprt.hxx                  |    1 -
 sw/source/ui/envelp/mailmrge.cxx                |    2 ++
 sw/source/ui/inc/bookmark.hxx                   |    1 -
 sw/source/ui/inc/mmresultdialogs.hxx            |    3 ---
 sw/source/ui/uno/swdetect.hxx                   |    6 ------
 sw/source/ui/vba/wordvbahelper.hxx              |    1 -
 sw/source/uibase/docvw/SidebarTxtControl.hxx    |    1 -
 sw/source/uibase/docvw/romenu.hxx               |    2 --
 sw/source/uibase/inc/FrameControl.hxx           |    1 -
 sw/source/uibase/inc/FrameControlsManager.hxx   |    2 --
 sw/source/uibase/inc/PageBreakWin.hxx           |    3 ---
 sw/source/uibase/inc/cfgitems.hxx               |    9 ---------
 sw/source/uibase/inc/changedb.hxx               |    1 -
 sw/source/uibase/inc/content.hxx                |    1 -
 sw/source/uibase/inc/conttree.hxx               |    3 ---
 sw/source/uibase/inc/convert.hxx                |    2 --
 sw/source/uibase/inc/drawbase.hxx               |    1 -
 sw/source/uibase/inc/drawsh.hxx                 |    2 --
 sw/source/uibase/inc/drformsh.hxx               |    2 --
 sw/source/uibase/inc/drpcps.hxx                 |    2 --
 sw/source/uibase/inc/drwbassh.hxx               |    1 -
 sw/source/uibase/inc/edtwin.hxx                 |    4 ----
 sw/source/uibase/inc/envlop.hxx                 |    2 --
 sw/source/uibase/inc/fldmgr.hxx                 |    6 ------
 sw/source/uibase/inc/fldtdlg.hxx                |    1 -
 sw/source/uibase/inc/fldwrap.hxx                |    1 -
 sw/source/uibase/inc/frmmgr.hxx                 |    1 -
 sw/source/uibase/inc/glossary.hxx               |    3 ---
 sw/source/uibase/inc/inpdlg.hxx                 |    1 -
 sw/source/uibase/inc/insfnote.hxx               |    2 --
 sw/source/uibase/inc/labimg.hxx                 |    2 --
 sw/source/uibase/inc/macassgn.hxx               |    2 --
 sw/source/uibase/inc/mailconfigpage.hxx         |    1 -
 sw/source/uibase/inc/mailmrge.hxx               |    1 -
 sw/source/uibase/inc/navipi.hxx                 |    1 -
 sw/source/uibase/inc/navmgr.hxx                 |    1 -
 sw/source/uibase/inc/num.hxx                    |    1 -
 sw/source/uibase/inc/numfmtlb.hxx               |    2 --
 sw/source/uibase/inc/numprevw.hxx               |    1 -
 sw/source/uibase/inc/pagenumberdlg.hxx          |    2 --
 sw/source/uibase/inc/pview.hxx                  |    4 ----
 sw/source/uibase/inc/redlndlg.hxx               |    2 --
 sw/source/uibase/inc/srcedtw.hxx                |    2 --
 sw/source/uibase/inc/swdtflvr.hxx               |    3 ---
 sw/source/uibase/inc/swruler.hxx                |    1 -
 sw/source/uibase/inc/swuiccoll.hxx              |    1 -
 sw/source/uibase/inc/swuiidxmrk.hxx             |    7 +------
 sw/source/uibase/inc/tabledlg.hxx               |    1 -
 sw/source/uibase/inc/tblnumfm.hxx               |    5 -----
 sw/source/uibase/inc/textsh.hxx                 |    2 --
 sw/source/uibase/inc/titlepage.hxx              |    5 -----
 sw/source/uibase/inc/tmpdlg.hxx                 |    1 -
 sw/source/uibase/inc/toxmgr.hxx                 |    1 -
 sw/source/uibase/inc/translatehelper.hxx        |    2 --
 sw/source/uibase/inc/uiitems.hxx                |    1 -
 sw/source/uibase/inc/uitool.hxx                 |    1 -
 sw/source/uibase/inc/uivwimp.hxx                |    9 ---------
 sw/source/uibase/inc/unoatxt.hxx                |    2 --
 sw/source/uibase/inc/unomailmerge.hxx           |    5 -----
 sw/source/uibase/inc/workctrl.hxx               |    4 ----
 sw/source/uibase/inc/wrap.hxx                   |    1 -
 sw/source/uibase/inc/wrtsh.hxx                  |    2 --
 sw/source/uibase/sidebar/CommentsPanel.hxx      |    5 -----
 sw/source/uibase/sidebar/PageStylesPanel.hxx    |    1 -
 sw/source/uibase/uiview/viewfunc.hxx            |    4 ----
 sw/source/uibase/uno/unomodule.hxx              |   18 ------------------
 92 files changed, 7 insertions(+), 263 deletions(-)

New commits:
commit 7becd80d9773eb056b85945c5e51277b2481aa0e
Author:     Gabor Kelemen <[email protected]>
AuthorDate: Wed Apr 9 09:30:46 2025 +0200
Commit:     Gabor Kelemen <[email protected]>
CommitDate: Tue May 20 08:09:42 2025 +0200

    Remove obsolete fw declarations from sw/ (part2)
    
    found with bin/find-unneeded-includes --fwdecl
    
    checked rest of sw/source
    
    Change-Id: I70cf272ef543e5424ba10ffec761c446d25f29ef
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183909
    Tested-by: Jenkins
    Reviewed-by: Gabor Kelemen <[email protected]>

diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index e08eaa1649cd..542c657ade0e 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -641,6 +641,9 @@ excludelist:
     sw/source/filter/xml/xmlimp.cxx:
     # Actually used
     - com/sun/star/text/XTextRange.hpp
+    sw/source/uibase/inc/basesh.hxx:
+    # Needed in --fwdecl mode to avoid "externally available entity 
"DBTextStruct_Impl" is not previously declared in an included file" error
+    - struct DBTextStruct_Impl
     sw/source/uibase/app/docsh2.cxx:
     # Needed for direct member access
     - ooo/vba/word/XDocument.hpp
diff --git a/sw/source/filter/html/htmlreqifreader.hxx 
b/sw/source/filter/html/htmlreqifreader.hxx
index 84169bb7c087..e62b2e1e1c2d 100644
--- a/sw/source/filter/html/htmlreqifreader.hxx
+++ b/sw/source/filter/html/htmlreqifreader.hxx
@@ -10,7 +10,6 @@
 #define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLREQIFREADER_HXX
 
 class Graphic;
-class Size;
 class SvStream;
 class SwOLENode;
 class SwFrameFormat;
diff --git a/sw/source/filter/html/svxcss1.hxx 
b/sw/source/filter/html/svxcss1.hxx
index 669ed92a5b95..7ffde5473e19 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -89,8 +89,6 @@ struct CSS1PropertyEnum
     sal_uInt16 nEnum;       // and the corresponding value of enum
 };
 
-namespace editeng { class SvxBorderLine; }
-
 #define SVX_CSS1_BORDERINFO_WIDTH 1
 #define SVX_CSS1_BORDERINFO_COLOR 2
 #define SVX_CSS1_BORDERINFO_STYLE 4
diff --git a/sw/source/filter/html/wrthtml.hxx 
b/sw/source/filter/html/wrthtml.hxx
index 61368a485b91..4830efb753bb 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -41,12 +41,9 @@
 #include "htmlfly.hxx"
 
 // some forward declarations
-class Color;
 class SwFrameFormat;
-class SwFlyFrameFormat;
 class SwDrawFrameFormat;
 class SwFormatINetFormat;
-class SwFormatVertOrient;
 class SwFormatFootnote;
 class SwStartNode;
 class SwTableNode;
@@ -59,9 +56,7 @@ class SdrUnoObj;
 class SvxBrushItem;
 class SvxFontItem;
 class SwHTMLNumRuleInfo;
-class SwHTMLPosFlyFrames;
 class SwTextFootnote;
-enum class HtmlPosition;
 enum class HtmlTokenId : sal_Int16;
 namespace utl { class TempFileNamed; }
 
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index 3ee0b3b539a9..3028217a729c 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -21,12 +21,6 @@
 
 #include <shellio.hxx>
 
-class SwNumRuleTable;
-class SwDoc;
-class SwTextNode;
-class SwNumRule;
-class SwNodeIndex;
-
 // the special readers
 
 class HTMLReader final : public Reader
diff --git a/sw/source/filter/inc/fltshell.hxx 
b/sw/source/filter/inc/fltshell.hxx
index e53d5e42679c..c374d14c14b3 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -32,12 +32,7 @@
 #include <memory>
 
 class SwTOXBase;
-class SwField;
-class SwFieldType;
-class Graphic;
-class SwTableBox;
 class SwDoc;
-class SwPaM;
 
 inline bool SwFltGetFlag(sal_uLong nFieldFlags, int no)
     { return (nFieldFlags & (sal_uLong(1) << no)) != 0; }
diff --git a/sw/source/filter/inc/msfilter.hxx 
b/sw/source/filter/inc/msfilter.hxx
index b4a697f79111..997a2fc99c74 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -35,8 +35,6 @@
 class SwDoc;
 class SwPaM;
 class SwTableNode;
-class SwNodeIndex;
-class SwNoTextNode;
 class SwTextNode;
 class WW8TabDesc;
 
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx 
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 66978890435b..6739c577b823 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -33,7 +33,6 @@
 #include <fldbas.hxx>
 #include <utility>
 
-class Point;
 class SvxCaseMapItem;
 class SvxColorItem;
 class SvxContourItem;
@@ -52,16 +51,6 @@ class SvxBlinkItem;
 class SvxBrushItem;
 class XFillStyleItem;
 class XFillGradientItem;
-class SvxFontItem;
-class SvxFontHeightItem;
-class SvxLanguageItem;
-class SvxPostureItem;
-class SvxWeightItem;
-class SvxFontItem;
-class SvxFontHeightItem;
-class SvxLanguageItem;
-class SvxPostureItem;
-class SvxWeightItem;
 class SvxCharRotateItem;
 class SvxEmphasisMarkItem;
 class SvxTwoLinesItem;
@@ -96,8 +85,6 @@ class SwFormatSurround;
 class SwFormatVertOrient;
 class SwFormatHoriOrient;
 class SwFormatAnchor;
-class SvxBrushItem;
-class SvxBoxItem;
 class SwFormatCol;
 class SvxFormatKeepItem;
 class SwTextGridItem;
@@ -112,19 +99,11 @@ class SwRedlineData;
 class SwSection;
 class SwFormatDrop;
 class SwFrameFormat;
-class SwNumFormat;
-class SwFormat;
-struct WW8_SepInfo;
 class SwLineNumberInfo;
 class SwNumRule;
-class wwFont;
 
 namespace editeng { class SvxBorderLine; }
 
-namespace rtl { class OUString; }
-
-class MSWordExportBase;
-
 namespace ww8 { class Frame; }
 
 namespace msword {
diff --git a/sw/source/filter/ww8/docxexport.hxx 
b/sw/source/filter/ww8/docxexport.hxx
index 8343417f1b19..36d45f197338 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -32,12 +32,6 @@
 
 class DocxAttributeOutput;
 class DocxExportFilter;
-class SwNode;
-class SwEndNode;
-class SwTableNode;
-class SwTextNode;
-class SwGrfNode;
-class SwOLENode;
 class DocxSdrExport;
 
 namespace oox {
diff --git a/sw/source/filter/ww8/rtfexport.hxx 
b/sw/source/filter/ww8/rtfexport.hxx
index 71d242ef8647..04d98a3cdfff 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -29,10 +29,6 @@ class RtfAttributeOutput;
 class RtfExportFilter;
 class RtfSdrExport;
 using RtfColorTable = std::map<sal_uInt16, Color>;
-class SwNode;
-class SwTextNode;
-class SwGrfNode;
-class SwOLENode;
 
 /// The class that does all the actual RTF export-related work.
 class RtfExport : public MSWordExportBase
diff --git a/sw/source/filter/ww8/writerhelper.hxx 
b/sw/source/filter/ww8/writerhelper.hxx
index 50de5b0920ef..710a9aa922af 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -38,7 +38,6 @@ class SwTextFormatColl;
 class SwCharFormat;
 class SdrObject;
 class SdrOle2Obj;
-class OutlinerParaObject;
 class SwNumFormat;
 class SwTextNode;
 class SwNoTextNode;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index bd116fa83f12..bd28580aa436 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -56,8 +56,8 @@
 #include <unordered_map>
 
 
-class SvxBrushItem;
 class EditTextObject;
+class OutlinerParaObject;
 
 // some forward declarations
 class SwWW8AttrIter;
@@ -71,15 +71,11 @@ namespace editeng { class SvxBorderLine; }
 class AttributeOutputBase;
 class DocxAttributeOutput;
 class RtfAttributeOutput;
-class BitmapPalette;
 class SwEscherEx;
-class DateTime;
-namespace vcl { class Font; }
 class MSWordExportBase;
 class SdrObject;
 class SdrTextObj;
 class SfxItemSet;
-class SvStream;
 class SvxFontItem;
 class SvxBoxItem;
 class SwAttrSet;
@@ -93,7 +89,6 @@ class SwFrameFormat;
 class SwGrfNode;
 class SwNumFormat;
 class SwNumRule;
-class SwNumRuleTable;
 class SwPageDesc;
 class SwFormatPageDesc;
 class SwOLENode;
@@ -101,30 +96,24 @@ class SwPostItField;
 class SwRedlineData;
 class SwSectionFormat;
 class SwSectionNode;
-class SwTableNode;
 class SwTOXType;
 class SwTextFormatColl;
 class SwTextNode;
 class SwWW8WrGrf;
-class SwWW8Writer;
 class MSWordStyles;
 class WW8AttributeOutput;
 class WW8Export;
 class MSWordAttrIter;
 class WW8_WrFkp;
 class WW8_WrPlc0;
-class WW8_WrPlc1;
 class WW8_WrPlcField;
 class WW8_WrMagicTable;
 class WW8_WrPlcFootnoteEdn;
 class WW8_WrPlcPn;
 class WW8_WrPlcAnnotations;
 class WW8_WrtFactoids;
-class MSWordSections;
 class WW8_WrPlcTextBoxes;
-class WW8_WrPct;            // administration
 class WW8_WrtBookmarks;
-class WW8_WrtRedlineAuthor;
 class SwMSConvertControls;
 class WW8_WrPc;
 struct WW8_PdAttrDesc;
diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx
index 65dfc328effc..2344d134d8ca 100644
--- a/sw/source/filter/ww8/ww8glsy.hxx
+++ b/sw/source/filter/ww8/ww8glsy.hxx
@@ -27,7 +27,6 @@
 #include "ww8scan.hxx"
 
 class SwTextBlocks;
-class SwNodeIndex;
 
 /*
  * GlossaryFib takes the document fib and finds the glossary fib which may
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index 4ea805d08115..f6136e9b0314 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -28,8 +28,6 @@
 #include "ww8scan.hxx"
 #include "ww8par.hxx"
 
-class WW8RStyle;
-
 class WW8DupProperties
 {
 public:
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index b2f7a311d742..c5dbd6d28500 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -37,8 +37,6 @@
 #include "ww8struc.hxx"
 #include "types.hxx"
 
-class SvStream;
-
 //Commonly used string literals for stream and storage names in word docs
 namespace SL
 {
@@ -173,7 +171,6 @@ OUString read_uInt16_BeltAndBracesString(SvStream& rStrm);
 //--Line above which the code has meaningful comments
 
 class  WW8ScannerBase;
-class  WW8PLCFspecial;
 struct WW8PLCFxDesc;
 class  WW8PLCFx_PCD;
 
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx 
b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index 8a15f53dfb88..63d34d405f62 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
@@ -28,7 +28,6 @@
 
 #include <map>
 
-class SvXMLImport;
 class RedlineInfo;
 class SwRedlineData;
 class SwDoc;
@@ -36,7 +35,6 @@ class SwXMLImport;
 namespace com::sun::star {
     namespace text { class XTextCursor; }
     namespace text { class XTextRange; }
-    namespace frame { class XModel; }
 }
 
 typedef std::map< OUString, RedlineInfo* > RedlineMapType;
diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx
index abbdd7aa7bde..a945e1e424f2 100644
--- a/sw/source/filter/xml/wrtxml.hxx
+++ b/sw/source/filter/xml/wrtxml.hxx
@@ -25,15 +25,11 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <shellio.hxx>
 
-class SwPaM;
-class SfxMedium;
-
 namespace com::sun::star {
     namespace uno { template<class A> class Reference; }
     namespace uno { template<class A> class Sequence; }
     namespace uno { class Any; }
     namespace lang { class XComponent; }
-    namespace lang { class XMultiServiceFactory; }
     namespace beans { struct PropertyValue; }
 }
 
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 6e095396db61..462d0e8b8c9a 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -33,7 +33,6 @@ class SwFormat;
 class SwFrameFormat;
 class SvXMLUnitConverter;
 class SvXMLExportItemMapper;
-class SvXMLAutoStylePoolP;
 class SwTableLine;
 class SwTableLines;
 class SwTableBox;
@@ -43,8 +42,6 @@ class SwXMLTableColumnsSortByWidth_Impl;
 class SwXMLTableFrameFormatsSort_Impl;
 class SwXMLTableInfo_Impl;
 class SwTableNode;
-class XMLPropertySetMapper;
-class SwXMLTableLines_Impl;
 
 typedef std::vector< SwXMLTableLines_Impl* > SwXMLTableLinesCache_Impl;
 
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 4e800da42017..b62e1573db85 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -36,10 +36,8 @@
 
 class SwDoc;
 class SvXMLUnitConverter;
-class SvXMLTokenMap;
 class SvXMLImportItemMapper;
 class SfxItemSet;
-class XMLTextImportHelper;
 class SvXMLGraphicHelper;
 class SvXMLEmbeddedObjectHelper;
 enum class SfxStyleFamily;
diff --git a/sw/source/filter/xml/xmlimpit.hxx 
b/sw/source/filter/xml/xmlimpit.hxx
index 5df248fac6a8..18b41210e41d 100644
--- a/sw/source/filter/xml/xmlimpit.hxx
+++ b/sw/source/filter/xml/xmlimpit.hxx
@@ -26,7 +26,6 @@ class SvXMLUnitConverter;
 class SfxPoolItem;
 class SfxItemSet;
 class SvXMLNamespaceMap;
-struct SvXMLItemMapEntry;
 class SvXMLAttrContainerItem;
 
 class SvXMLImportItemMapper
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index 6b7219f84323..5057a33f1a1c 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -28,7 +28,6 @@
 #include <unordered_map>
 #include <vector>
 
-class SwXMLImport;
 class SwTableNode;
 class SwTableBox;
 class SwTableLine;
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx 
b/sw/source/ui/dbui/addresslistdialog.hxx
index 6669ad06509e..3e2ec045b669 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -23,9 +23,6 @@
 #include <sharedconnection.hxx>
 
 namespace com::sun::star{
-    namespace container{
-        class XNameAccess;
-    }
     namespace sdb{
         class XDatabaseContext;
     }
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx 
b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
index 99315fa01771..242f06ad75a0 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
@@ -24,7 +24,6 @@
 
 namespace com::sun::star{
     namespace beans{  struct PropertyValue; }
-    namespace frame{ class XFrame2;     }
 }
 
 class DBTablePreviewFrame;
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx 
b/sw/source/ui/dbui/mmaddressblockpage.hxx
index f69b446169ba..928c357ccc6c 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -131,8 +131,6 @@ namespace o3tl {
     template<> struct typed_flags<MoveItemFlags> : 
is_typed_flags<MoveItemFlags, 0x0f> {};
 }
 
-class AddressMultiLineEdit;
-
 class AddressMultiLineEdit : public WeldEditView
                            , public SfxListener
 {
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 4cc3bf4f784b..926d983b8158 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -26,8 +26,6 @@
 #include <envimg.hxx>
 #include <envlop.hxx>
 
-class SwEnvDlg;
-
 class SwEnvPrtPage : public SfxTabPage
 {
     std::unique_ptr<weld::Widget> m_xUpper;
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index bfb1ef309738..12e7d501703f 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -26,8 +26,6 @@
 #include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>
 
-class SwLabFormatPage;
-
 class SwLabPreview : public weld::CustomWidgetController
 {
     Color m_aGrayColor;
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 66a4c1365725..17251081229b 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -22,7 +22,6 @@
 
 #include <label.hxx>
 
-class SwLabDlg;
 class SwLabItem;
 
 class SwLabPrtPage : public SfxTabPage
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index ab4b32cb7f53..74053e7b8f95 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -67,6 +67,8 @@ using namespace ::com::sun::star::form;
 using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::ui::dialogs;
 
+class SwXSelChgLstnr_Impl;
+
 struct SwMailMergeDlg_Impl {
     uno::Reference<runtime::XFormController> xFController;
     rtl::Reference<SwXSelChgLstnr_Impl> xChgLstnr;
diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx
index 3863d6caa797..c7e801c75778 100644
--- a/sw/source/ui/inc/bookmark.hxx
+++ b/sw/source/ui/inc/bookmark.hxx
@@ -24,7 +24,6 @@
 #include "condedit.hxx"
 
 class SwWrtShell;
-class SfxRequest;
 
 class BookmarkTable
 {
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx 
b/sw/source/ui/inc/mmresultdialogs.hxx
index 3af52dc4c5d1..78795e0a6fe7 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -24,9 +24,6 @@
 #include <sfx2/basedlgs.hxx>
 #include <mailmergehelper.hxx>
 
-class SwMailMergeWizard;
-class SfxPrinter;
-class SwSendMailDialog;
 class Timer;
 namespace com::sun::star::mail { class XMailMessage; }
 
diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx
index a72521004aad..dadfb9442049 100644
--- a/sw/source/ui/uno/swdetect.hxx
+++ b/sw/source/ui/uno/swdetect.hxx
@@ -25,12 +25,6 @@
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-namespace com::sun::star::beans { struct PropertyValue; }
-
-class SfxMedium;
-class SfxFilter;
-class SfxMedium;
-
 class SwFilterDetect : public ::cppu::WeakImplHelper< 
css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
 {
 public:
diff --git a/sw/source/ui/vba/wordvbahelper.hxx 
b/sw/source/ui/vba/wordvbahelper.hxx
index f80f710c422f..4b5366894d0a 100644
--- a/sw/source/ui/vba/wordvbahelper.hxx
+++ b/sw/source/ui/vba/wordvbahelper.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <rtl/ref.hxx>
 
-class SwDocShell;
 class SwView;
 class SwXTextDocument;
 class SwXBaseStyle;
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx 
b/sw/source/uibase/docvw/SidebarTxtControl.hxx
index eebdea539d1a..dd460028fb62 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx
@@ -21,7 +21,6 @@
 
 #include <svx/weldeditview.hxx>
 
-class OutlinerView;
 class SwView;
 class SwPostItMgr;
 struct SpellCallbackInfo;
diff --git a/sw/source/uibase/docvw/romenu.hxx 
b/sw/source/uibase/docvw/romenu.hxx
index fed747f33d18..4fb3c54b150d 100644
--- a/sw/source/uibase/docvw/romenu.hxx
+++ b/sw/source/uibase/docvw/romenu.hxx
@@ -27,8 +27,6 @@
 
 class SwView;
 class SfxDispatcher;
-class ImageMap;
-class INetImage;
 
 class SwReadOnlyPopup
 {
diff --git a/sw/source/uibase/inc/FrameControl.hxx 
b/sw/source/uibase/inc/FrameControl.hxx
index 4043f834f94b..b6a761feef6a 100644
--- a/sw/source/uibase/inc/FrameControl.hxx
+++ b/sw/source/uibase/inc/FrameControl.hxx
@@ -14,7 +14,6 @@
 
 #include "edtwin.hxx"
 
-class SwEditWin;
 class SwPageFrame;
 class SwFrame;
 class Point;
diff --git a/sw/source/uibase/inc/FrameControlsManager.hxx 
b/sw/source/uibase/inc/FrameControlsManager.hxx
index 945534fcd31c..b544dfe5d627 100644
--- a/sw/source/uibase/inc/FrameControlsManager.hxx
+++ b/sw/source/uibase/inc/FrameControlsManager.hxx
@@ -17,9 +17,7 @@
 #include <memory>
 
 class SwPageFrame;
-class SwEditWin;
 class SwContentFrame;
-class SwTextNode;
 class SwContentControl;
 
 typedef std::shared_ptr< SwFrameControl > SwFrameControlPtr;
diff --git a/sw/source/uibase/inc/PageBreakWin.hxx 
b/sw/source/uibase/inc/PageBreakWin.hxx
index ee494f78ba04..6f6c51217ca7 100644
--- a/sw/source/uibase/inc/PageBreakWin.hxx
+++ b/sw/source/uibase/inc/PageBreakWin.hxx
@@ -15,9 +15,6 @@
 #include <vcl/timer.hxx>
 #include <optional>
 
-class Menu;
-class SwPageFrame;
-
 class SwPageBreakWin;
 
 /** Class for the page break control window.
diff --git a/sw/source/uibase/inc/cfgitems.hxx 
b/sw/source/uibase/inc/cfgitems.hxx
index 9102ac6757b6..f5b335c7a8cc 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -26,16 +26,7 @@
 #include <cmdid.h>
 #include <sfx2/zoomitem.hxx>
 
-class SwModule;
-#ifdef DBG_UTIL
-class SwTestTabPage;
-#endif
-class SwAddPrinterTabPage;
-class SfxPrinter;
-class SwViewShell;
 class SwViewOption;
-class SwContentOptPage;
-class SwShdwCursorOptionsTabPage;
 enum class SwFillMode;
 
 /// Item for settings dialog - document view
diff --git a/sw/source/uibase/inc/changedb.hxx 
b/sw/source/uibase/inc/changedb.hxx
index d9c42c1984d9..3070e83f175f 100644
--- a/sw/source/uibase/inc/changedb.hxx
+++ b/sw/source/uibase/inc/changedb.hxx
@@ -22,7 +22,6 @@
 #include <sfx2/basedlgs.hxx>
 #include "dbtree.hxx"
 
-class SwFieldMgr;
 class SwView;
 class SwWrtShell;
 struct SwDBData;
diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index f0aad555619c..21ed85f8e0d3 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -31,7 +31,6 @@ class SwContentType;
 class SwFormatField;
 class SwTextINetFormat;
 class SwTOXBase;
-class SwRangeRedline;
 class SwTextFootnote;
 
 //  helper classes
diff --git a/sw/source/uibase/inc/conttree.hxx 
b/sw/source/uibase/inc/conttree.hxx
index a3f754668489..7512c574d178 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -40,9 +40,6 @@ class SwWrtShell;
 class SwContentType;
 class SwNavigationPI;
 class SwNavigationConfig;
-class Menu;
-class ToolBox;
-class SwGlblDocContents;
 class SfxObjectShell;
 class SdrObject;
 
diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx
index a0b83f823714..3707dc0b1a31 100644
--- a/sw/source/uibase/inc/convert.hxx
+++ b/sw/source/uibase/inc/convert.hxx
@@ -29,10 +29,8 @@
 #include "autoformatpreview.hxx"
 #include <tblafmt.hxx>
 
-class VclContainer;
 class SwTableAutoFormat;
 class SwView;
-class SwWrtShell;
 struct SwInsertTableOptions;
 
 class SwConvertTableDlg final : public SfxDialogController
diff --git a/sw/source/uibase/inc/drawbase.hxx 
b/sw/source/uibase/inc/drawbase.hxx
index eaea9df78a3d..4ab007cc443d 100644
--- a/sw/source/uibase/inc/drawbase.hxx
+++ b/sw/source/uibase/inc/drawbase.hxx
@@ -25,7 +25,6 @@
 class SwView;
 class SwWrtShell;
 class SwEditWin;
-class KeyEvent;
 class MouseEvent;
 
 // base class for all functions
diff --git a/sw/source/uibase/inc/drawsh.hxx b/sw/source/uibase/inc/drawsh.hxx
index ca164e95eb2a..ec128e8d36bf 100644
--- a/sw/source/uibase/inc/drawsh.hxx
+++ b/sw/source/uibase/inc/drawsh.hxx
@@ -23,8 +23,6 @@
 
 #include <svx/svdobj.hxx>
 
-class SwDrawBaseShell;
-
 class SwDrawShell final : public SwDrawBaseShell
 {
 public:
diff --git a/sw/source/uibase/inc/drformsh.hxx 
b/sw/source/uibase/inc/drformsh.hxx
index 9c8602d149ba..785c63597222 100644
--- a/sw/source/uibase/inc/drformsh.hxx
+++ b/sw/source/uibase/inc/drformsh.hxx
@@ -21,8 +21,6 @@
 
 #include "drwbassh.hxx"
 
-class SwDrawBaseShell;
-
 class SwDrawFormShell: public SwDrawBaseShell
 {
 public:
diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx
index 4542ebc24749..62c34ce59e5c 100644
--- a/sw/source/uibase/inc/drpcps.hxx
+++ b/sw/source/uibase/inc/drpcps.hxx
@@ -26,8 +26,6 @@
 #include <vcl/customweld.hxx>
 #include <vcl/print.hxx>
 
-class SwWrtShell;
-
 /// Dedicated drop caps dialog, opened by the .uno:FormatDropcap UNO command, 
which is not in the
 /// default menus.
 class SwDropCapsDlg final : public SfxSingleTabDialogController
diff --git a/sw/source/uibase/inc/drwbassh.hxx 
b/sw/source/uibase/inc/drwbassh.hxx
index 16b273bdef8b..b25bdc5ad59b 100644
--- a/sw/source/uibase/inc/drwbassh.hxx
+++ b/sw/source/uibase/inc/drwbassh.hxx
@@ -24,7 +24,6 @@
 
 class SwView;
 class SfxItemSet;
-class SwDrawBase;
 class AbstractSvxObjectNameDialog;
 struct SvxSwFrameValidation;
 
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index bd227cc0b661..5cea01ab6a46 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -32,13 +32,9 @@
 
 class   SwWrtShell;
 class   SwView;
-class   SwRect;
-class   SwViewShell;
 class   SwAnchorMarker;
 class   SdrObject;
 class   SwShadowCursor;
-class   DataChangedEvent;
-class   SvxAutoCorrCfg;
 class   SvxAutoCorrect;
 class   SwPaM;
 struct  SwApplyTemplate;
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index 327e3d136394..822a653473e8 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.hxx
@@ -35,8 +35,6 @@ inline void setfieldval(weld::MetricSpinButton& rField, int 
lValue)
 }
 
 class SwEnvDlg;
-class SwEnvPage;
-class SwEnvFormatPage;
 class SwWrtShell;
 class Printer;
 
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index 90076628297d..6afddcafb4bf 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -31,9 +31,6 @@
 #include <vector>
 
 namespace com::sun::star{
-    namespace container{
-        class XNameAccess;
-    }
     namespace text{
         class XNumberingTypeInfo;
     }
@@ -42,9 +39,6 @@ namespace com::sun::star{
 class SwWrtShell;
 class SwField;
 class SwFieldType;
-class SwPaM;
-class SbModule;
-class SvxMacroItem;
 class SvNumberFormatter;
 namespace weld { class Widget; class Window; }
 enum class SwFieldIds : sal_uInt16;
diff --git a/sw/source/uibase/inc/fldtdlg.hxx b/sw/source/uibase/inc/fldtdlg.hxx
index a77aa3edc6fd..d4135be49327 100644
--- a/sw/source/uibase/inc/fldtdlg.hxx
+++ b/sw/source/uibase/inc/fldtdlg.hxx
@@ -26,7 +26,6 @@
 #include <sfx2/tabdlg.hxx>
 
 class SfxBindings;
-class SfxTabPage;
 class SwChildWinWrapper;
 struct SfxChildWinInfo;
 
diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx
index 3f0621396e54..e1c4aea1557b 100644
--- a/sw/source/uibase/inc/fldwrap.hxx
+++ b/sw/source/uibase/inc/fldwrap.hxx
@@ -24,7 +24,6 @@
 #include <swabstdlg.hxx>
 
 #include "chldwrap.hxx"
-class AbstractSwFieldDlg;
 
 class SwFieldDlgWrapper final : public SwChildWinWrapper
 {
diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx
index c21901a1d3e5..edf38ff3e830 100644
--- a/sw/source/uibase/inc/frmmgr.hxx
+++ b/sw/source/uibase/inc/frmmgr.hxx
@@ -30,7 +30,6 @@
 
 class   SwWrtShell;
 struct  SvxSwFrameValidation;
-struct  SwPosition;
 
 class   SwFormatCol;
 class SvGlobalName;
diff --git a/sw/source/uibase/inc/glossary.hxx 
b/sw/source/uibase/inc/glossary.hxx
index c65ece04ea49..b6406c0f6458 100644
--- a/sw/source/uibase/inc/glossary.hxx
+++ b/sw/source/uibase/inc/glossary.hxx
@@ -30,11 +30,8 @@
 
 struct GroupUserData;
 class SwGlossaryHdl;
-class SwNewGlosNameDlg;
 class SwWrtShell;
 class SfxViewFrame;
-class PopupMenu;
-class Menu;
 class SwOneExampleFrame;
 
 const short RET_EDIT = 100;
diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx
index 26ffc960d547..82ae25d0b48c 100644
--- a/sw/source/uibase/inc/inpdlg.hxx
+++ b/sw/source/uibase/inc/inpdlg.hxx
@@ -26,7 +26,6 @@ class SwSetExpField;
 class SwUserFieldType;
 class SwField;
 class SwWrtShell;
-class SwFieldMgr;
 
 // insert fields
 class SwFieldInputDlg final : public weld::GenericDialogController
diff --git a/sw/source/uibase/inc/insfnote.hxx 
b/sw/source/uibase/inc/insfnote.hxx
index 291ad7c14018..14704318b51d 100644
--- a/sw/source/uibase/inc/insfnote.hxx
+++ b/sw/source/uibase/inc/insfnote.hxx
@@ -23,8 +23,6 @@
 
 class SwWrtShell;
 
-class VclFrame;
-
 class SwInsFootNoteDlg final : public weld::GenericDialogController
 {
     SwWrtShell     &m_rSh;
diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx
index 1b27f4efbfeb..73975338f3ad 100644
--- a/sw/source/uibase/inc/labimg.hxx
+++ b/sw/source/uibase/inc/labimg.hxx
@@ -24,8 +24,6 @@
 #include <unotools/configitem.hxx>
 #include <swdllapi.h>
 
-class SwLabCfgItem;
-
 class SW_DLLPUBLIC SwLabItem final : public SfxPoolItem
 {
 
diff --git a/sw/source/uibase/inc/macassgn.hxx 
b/sw/source/uibase/inc/macassgn.hxx
index 29761b396780..65b8638cbb8d 100644
--- a/sw/source/uibase/inc/macassgn.hxx
+++ b/sw/source/uibase/inc/macassgn.hxx
@@ -24,8 +24,6 @@
 #include <svl/macitem.hxx>
 #include <optional>
 
-class SwWrtShell;
-
 enum DlgEventType
 {
     MACASSGN_AUTOTEXT,
diff --git a/sw/source/uibase/inc/mailconfigpage.hxx 
b/sw/source/uibase/inc/mailconfigpage.hxx
index 138739c2c4b4..a96874124310 100644
--- a/sw/source/uibase/inc/mailconfigpage.hxx
+++ b/sw/source/uibase/inc/mailconfigpage.hxx
@@ -22,7 +22,6 @@
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/basedlgs.hxx>
 
-class SwTestAccountSettingsDialog;
 class SwMailMergeConfigItem;
 
 class SwMailConfigPage final : public SfxTabPage
diff --git a/sw/source/uibase/inc/mailmrge.hxx 
b/sw/source/uibase/inc/mailmrge.hxx
index 5d5363222ccc..4e9c561489b9 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -29,7 +29,6 @@
 
 class SwWrtShell;
 class SwModuleOptions;
-class SwXSelChgLstnr_Impl;
 struct SwMailMergeDlg_Impl;
 namespace com::sun::star{
     namespace frame{
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 5068c10315fd..b72d6de2099f 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -37,7 +37,6 @@ class SwWrtShell;
 class SfxBindings;
 class SwNavigationConfig;
 class SwView;
-class SpinField;
 
 class SwNavigationPI final : public PanelLayout
                      , public 
::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
diff --git a/sw/source/uibase/inc/navmgr.hxx b/sw/source/uibase/inc/navmgr.hxx
index 858b990fd11d..de0ba1bc1bd7 100644
--- a/sw/source/uibase/inc/navmgr.hxx
+++ b/sw/source/uibase/inc/navmgr.hxx
@@ -15,7 +15,6 @@
 
 class   SwWrtShell;
 struct  SwPosition;
-class SwUnoCursor;
 
 class SwNavigationMgr final : public SfxListener
 {
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index 1799ad3296cc..8fc91f3c4c86 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.hxx
@@ -24,7 +24,6 @@
 #include <numrule.hxx>
 
 class SwWrtShell;
-class SvxBrushItem;
 class SwOutlineTabDialog;
 
 class SwNumPositionTabPage final : public SfxTabPage
diff --git a/sw/source/uibase/inc/numfmtlb.hxx 
b/sw/source/uibase/inc/numfmtlb.hxx
index 95f527a6f275..27d281da0c64 100644
--- a/sw/source/uibase/inc/numfmtlb.hxx
+++ b/sw/source/uibase/inc/numfmtlb.hxx
@@ -23,8 +23,6 @@
 #include <svl/zforlist.hxx>
 #include <swdllapi.h>
 
-class SwView;
-
 class SW_DLLPUBLIC SwNumFormatBase
 {
     sal_Int32           m_nStdEntry;
diff --git a/sw/source/uibase/inc/numprevw.hxx 
b/sw/source/uibase/inc/numprevw.hxx
index d07d8141ee40..923cde5f9b74 100644
--- a/sw/source/uibase/inc/numprevw.hxx
+++ b/sw/source/uibase/inc/numprevw.hxx
@@ -23,7 +23,6 @@
 #include <vcl/customweld.hxx>
 
 class SwNumRule;
-namespace rtl { class OUString; }
 
 class NumberingPreview final : public weld::CustomWidgetController
 {
diff --git a/sw/source/uibase/inc/pagenumberdlg.hxx 
b/sw/source/uibase/inc/pagenumberdlg.hxx
index c5371fa01f1a..0f33d29c2a29 100644
--- a/sw/source/uibase/inc/pagenumberdlg.hxx
+++ b/sw/source/uibase/inc/pagenumberdlg.hxx
@@ -22,8 +22,6 @@
 #include <sfx2/basedlgs.hxx>
 #include <svx/pagenumberlistbox.hxx>
 
-class SwWrtShell;
-
 /// Page number wizard for easy header/footer page number insertion
 class SwPageNumberDlg final : public SfxDialogController
 {
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index 39359782746a..7e017e4268cb 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -28,15 +28,11 @@
 #include <swdllapi.h>
 #include <shellid.hxx>
 
-class SwViewOption;
 class SwDocShell;
 class SwScrollbar;
 class SwViewShell;
 class SwPagePreview;
-class ImageButton;
-class Button;
 class SwRect;
-class DataChangedEvent;
 class CommandEvent;
 class SwPagePreviewLayout;
 
diff --git a/sw/source/uibase/inc/redlndlg.hxx 
b/sw/source/uibase/inc/redlndlg.hxx
index 2fa697f5630b..68ee1774af99 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -31,8 +31,6 @@
 #include <memory>
 #include <vector>
 
-class SwChildWinWrapper;
-
 struct SwRedlineDataChild
 {
     const SwRedlineData*        pChild;     // link to original stacked data
diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index 7e717581915a..20f656d31049 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.hxx
@@ -32,10 +32,8 @@ namespace com::sun::star::beans { class XMultiPropertySet; }
 namespace weld { class Scrollbar; }
 class ScrollAdaptor;
 class SwSrcView;
-class SwSrcEditWindow;
 class TextEngine;
 class TextView;
-class DataChangedEvent;
 
 class TextViewOutWin final : public vcl::Window
 {
diff --git a/sw/source/uibase/inc/swdtflvr.hxx 
b/sw/source/uibase/inc/swdtflvr.hxx
index 4fd62f7093f2..8c1e9dfd6e9f 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -35,18 +35,15 @@
 
 #include <swdllapi.h>
 
-class Graphic;
 class ImageMap;
 class INetImage;
 class SfxAbstractPasteDialog;
-class SwDoc;
 class SwDocFac;
 class SwPaM;
 class SwTextBlocks;
 class SwWrtShell;
 class SvxClipboardFormatItem;
 class SwFrameShell;
-class SwView_Impl;
 class SwPasteContext;
 enum class SwPasteSdr;
 
diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx
index 13435972a1f3..c03b1f6b737f 100644
--- a/sw/source/uibase/inc/swruler.hxx
+++ b/sw/source/uibase/inc/swruler.hxx
@@ -17,7 +17,6 @@
 #include <SidebarWindowsTypes.hxx>
 
 class SwViewShell;
-class View;
 namespace vcl { class Window; }
 class SwEditWin;
 
diff --git a/sw/source/uibase/inc/swuiccoll.hxx 
b/sw/source/uibase/inc/swuiccoll.hxx
index 8bdf59a22e40..9d2e74233746 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -23,7 +23,6 @@
 
 #include <ccoll.hxx>
 
-class SwWrtShell;
 class SwFormat;
 
 /// The Condition tab on the paragraph style dialog for conditional styles, 
e.g. Text Body.
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx 
b/sw/source/uibase/inc/swuiidxmrk.hxx
index 7f5460a8be45..9f90ce36f398 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -31,14 +31,11 @@ class SwWrtShell;
 class SwTOXMgr;
 class SwTOXMark;
 
-// insert mark for index entry
-class SwIndexMarkFloatDlg;
-class SwIndexMarkModalDlg;
-
 class SwIndexMarkPane
 {
     std::shared_ptr<weld::Dialog> m_xDialog;
 
+    // insert mark for index entry
     friend class SwIndexMarkFloatDlg;
     friend class SwIndexMarkModalDlg;
 
@@ -157,8 +154,6 @@ public:
     virtual short int run() override;
 };
 
-class SwAuthMarkModalDlg;
-
 class SwAuthorMarkPane
 {
     weld::DialogController& m_rDialog;
diff --git a/sw/source/uibase/inc/tabledlg.hxx 
b/sw/source/uibase/inc/tabledlg.hxx
index 41d9673a7488..807d85350afc 100644
--- a/sw/source/uibase/inc/tabledlg.hxx
+++ b/sw/source/uibase/inc/tabledlg.hxx
@@ -22,7 +22,6 @@
 #include <sfx2/tabdlg.hxx>
 
 class SwWrtShell;
-struct TColumn;
 
 // table dialog
 class SwTableTabDlg final : public SfxTabDialogController
diff --git a/sw/source/uibase/inc/tblnumfm.hxx 
b/sw/source/uibase/inc/tblnumfm.hxx
index 81f065265d1d..088f627e6adc 100644
--- a/sw/source/uibase/inc/tblnumfm.hxx
+++ b/sw/source/uibase/inc/tblnumfm.hxx
@@ -21,11 +21,6 @@
 
 #include <sfx2/basedlgs.hxx>
 
-namespace weld
-{
-class Window;
-class Container;
-}
 class SfxItemSet;
 
 class SwNumFormatDlg final : public SfxSingleTabDialogController
diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx
index 1eb75edb43a0..23eee0c29468 100644
--- a/sw/source/uibase/inc/textsh.hxx
+++ b/sw/source/uibase/inc/textsh.hxx
@@ -25,10 +25,8 @@
 #include <com/sun/star/ui/dialogs/DialogClosedEvent.hpp>
 
 class AbstractSvxPostItDialog;
-class SwFieldMgr;
 class SwFlyFrameAttrMgr;
 class SvxHyperlinkItem;
-class SwInsertChart;
 
 class SW_DLLPUBLIC SwTextShell: public SwBaseShell
 {
diff --git a/sw/source/uibase/inc/titlepage.hxx 
b/sw/source/uibase/inc/titlepage.hxx
index 13f167786339..cecd3af93ebd 100644
--- a/sw/source/uibase/inc/titlepage.hxx
+++ b/sw/source/uibase/inc/titlepage.hxx
@@ -14,11 +14,6 @@
 
 #include <fmtpdsc.hxx>
 
-namespace vcl
-{
-class Window;
-}
-class SwWrtShell;
 class SwPageDesc;
 
 class SwTitlePageDlg final : public SfxDialogController
diff --git a/sw/source/uibase/inc/tmpdlg.hxx b/sw/source/uibase/inc/tmpdlg.hxx
index 8135e5a74669..165e21ad300a 100644
--- a/sw/source/uibase/inc/tmpdlg.hxx
+++ b/sw/source/uibase/inc/tmpdlg.hxx
@@ -22,7 +22,6 @@
 #include <sfx2/styledlg.hxx>
 #include <svl/style.hxx>
 
-class SfxItemSet;
 class SwWrtShell;
 
 // the tab dialog carrier of TabPages
diff --git a/sw/source/uibase/inc/toxmgr.hxx b/sw/source/uibase/inc/toxmgr.hxx
index cebe54737c06..055cdad535e2 100644
--- a/sw/source/uibase/inc/toxmgr.hxx
+++ b/sw/source/uibase/inc/toxmgr.hxx
@@ -27,7 +27,6 @@
 #include <optional>
 
 class SwWrtShell;
-class SwForm;
 
 // manager for directory functionality
 //one single method will be sufficient to insert AND update indexes
diff --git a/sw/source/uibase/inc/translatehelper.hxx 
b/sw/source/uibase/inc/translatehelper.hxx
index 833219054c6e..de8d370b1a4a 100644
--- a/sw/source/uibase/inc/translatehelper.hxx
+++ b/sw/source/uibase/inc/translatehelper.hxx
@@ -27,8 +27,6 @@
 
 class SwWrtShell;
 class SwPaM;
-class SwNode;
-class SwTextNode;
 
 namespace SwTranslateHelper
 {
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index 445cc70c4ee7..0c95dc06e7f2 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.hxx
@@ -25,7 +25,6 @@
 #include <pagedesc.hxx>
 
 class SwNumRule;
-class IntlWrapper;
 class SwPaM;
 
 // container for FootNote
diff --git a/sw/source/uibase/inc/uitool.hxx b/sw/source/uibase/inc/uitool.hxx
index 87eef4e84f16..d2c7c3b051c0 100644
--- a/sw/source/uibase/inc/uitool.hxx
+++ b/sw/source/uibase/inc/uitool.hxx
@@ -35,7 +35,6 @@ class SwFrameFormat;
 class SwTabCols;
 class DateTime;
 class SfxViewFrame;
-class SwEditShell;
 
 // fill BoxInfo attribute
 SW_DLLPUBLIC void PrepareBoxInfo(SfxItemSet& rSet, const SwWrtShell& rSh);
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index 65a0bf4f23e2..3bd6bc915be7 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -31,17 +31,8 @@
 class SwXTextView;
 class SfxRequest;
 class SwTransferable;
-class SfxRequest;
 
 namespace sfx2 { class DocumentInserter; }
-namespace com::sun::star {
-    namespace frame {
-        class XDispatchProviderInterceptor;
-    }
-    namespace lang {
-        class XUnoTunnel;
-    }
-}
 
 class SwScannerEventListener final : public ::cppu::WeakImplHelper<
     css::lang::XEventListener >
diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx
index d9f0d3c0d913..ba572a61058d 100644
--- a/sw/source/uibase/inc/unoatxt.hxx
+++ b/sw/source/uibase/inc/unoatxt.hxx
@@ -34,9 +34,7 @@
 #include <rtl/ref.hxx>
 #include <svtools/unoevent.hxx>
 
-class SwTextBlocks;
 class SwGlossaries;
-class SwDoc;
 class SwDocShell;
 class SwXBodyText;
 
diff --git a/sw/source/uibase/inc/unomailmerge.hxx 
b/sw/source/uibase/inc/unomailmerge.hxx
index 35200f837b79..d0e41149a249 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -44,11 +44,7 @@ namespace com::sun::star {
     namespace frame {
         class XModel;
     }
-    namespace lang {
-        class XMultiServiceFactory;
-    }
     namespace text {
-        class XMailMergeListener;
         struct MailMergeEvent;
     }
     namespace beans{
@@ -61,7 +57,6 @@ typedef 
comphelper::OMultiTypeInterfaceContainerHelperVar3<css::beans::XProperty
     OPropertyListenerContainerHelper;
 
 class SwDBManager;
-class MailMergeExecuteFinalizer;
 
 /**
  * Gives UNO access to the global mail merge functionality, via the 
com.sun.star.text.MailMerge
diff --git a/sw/source/uibase/inc/workctrl.hxx 
b/sw/source/uibase/inc/workctrl.hxx
index 8193617dcda5..4fce449d814d 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -25,8 +25,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 class Menu;
-class PopupMenu;
-class SwView;
 
 using namespace ::com::sun::star;
 
@@ -98,8 +96,6 @@ public:
     virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window *pParent ) 
override;
 };
 
-class NavElementToolBoxControl;
-
 class NavElementBox_Base
 {
 public:
diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx
index d2142deabc6a..f3c1e32a1580 100644
--- a/sw/source/uibase/inc/wrap.hxx
+++ b/sw/source/uibase/inc/wrap.hxx
@@ -23,7 +23,6 @@
 #include <sfx2/basedlgs.hxx>
 #include <svx/swframetypes.hxx>
 
-class SfxItemSet;
 class SwWrtShell;
 
 struct SwWrapDlgBase
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index e7fb0e447817..06c97fddfa96 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -44,7 +44,6 @@ class SwView;
 class SvGlobalName;
 class SwInputFieldList;
 class SwSectionData;
-class Timer;
 class SvxMacro;
 class SwFormatINetFormat;
 class SvxAutoCorrect;
@@ -55,7 +54,6 @@ enum class SvMacroItemId : sal_uInt16;
 class SwFieldMgr;
 class SfxRequest;
 enum class SwLineBreakClear;
-class SwContentControl;
 enum class SwContentControlType;
 
 namespace i18nutil {
diff --git a/sw/source/uibase/sidebar/CommentsPanel.hxx 
b/sw/source/uibase/sidebar/CommentsPanel.hxx
index 456ddb8aa2cc..4dfabd104a1c 100644
--- a/sw/source/uibase/sidebar/CommentsPanel.hxx
+++ b/sw/source/uibase/sidebar/CommentsPanel.hxx
@@ -38,14 +38,9 @@
 #include <tools/datetime.hxx>
 #include <tools/time.hxx>
 
-class SwWrtShell;
-class SwView;
 class SwPostItField;
 class SwFormatField;
-class SwAnnotationWin;
-class SfxBroadcaster;
 class SwPostItMgr;
-class SwAnnotationItem;
 
 namespace sw::sidebar
 {
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx 
b/sw/source/uibase/sidebar/PageStylesPanel.hxx
index 5395b2784eb5..11089cf09f10 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.hxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx
@@ -32,7 +32,6 @@
 #include <svx/pageitem.hxx>
 #include <svx/pagenumberlistbox.hxx>
 
-class List;
 class ColorListBox;
 namespace sw::sidebar {
 
diff --git a/sw/source/uibase/uiview/viewfunc.hxx 
b/sw/source/uibase/uiview/viewfunc.hxx
index 38320f6f39aa..87e017ed2d34 100644
--- a/sw/source/uibase/uiview/viewfunc.hxx
+++ b/sw/source/uibase/uiview/viewfunc.hxx
@@ -23,16 +23,12 @@
 
 #include <IDocumentDeviceAccess.hxx>
 
-class ImageButton;
 class Point;
-class SfxItemSet;
 class SfxPrinter;
-class SfxTabPage;
 class Size;
 class SvxRuler;
 class SwScrollbar;
 class SwViewShell;
-namespace vcl { class Window; }
 
 // The following functions are available in viewprt.cxx
 void SetPrinter( IDocumentDeviceAccess*, SfxPrinter const *, bool bWeb );
diff --git a/sw/source/uibase/uno/unomodule.hxx 
b/sw/source/uibase/uno/unomodule.hxx
index fa85f11d7443..2ceb86b41707 100644
--- a/sw/source/uibase/uno/unomodule.hxx
+++ b/sw/source/uibase/uno/unomodule.hxx
@@ -28,24 +28,6 @@
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-namespace com
-{
-    namespace sun
-    {
-        namespace star
-        {
-            namespace lang
-            {
-                class XMultiServiceFactory;
-            }
-            namespace beans
-            {
-                struct PropertyValue;
-            }
-        }
-    }
-}
-
 class SwUnoModule : public ::cppu::WeakImplHelper< 
css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, 
css::lang::XServiceInfo >
 {
 public:

Reply via email to