tdf#42949 Fix IWYU warnings in sw/source/uibase/[u-w]*/*cxx

Also backtrack a bit and introduce several fw declarations in
sw/inc/hintids.hxx to get rid of TypedWhichId -based blacklist entries

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I8487737f5c3327c24b105328e84661d409f381c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86873
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

79 files changed, 141 insertions, 544 deletions

diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index a6c19e9d05c8..6b1ad0421478 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -420,8 +420,6 @@ blacklist:
     sw/qa/extras/uiwriter/uiwriter.cxx:
     # Needed for for-loop range
     - PostItMgr.hxx
-    # Needed for TypedWhichId macro
-    - editeng/rsiditem.hxx
     sw/qa/extras/unowriter/unowriter.cxx:
     # Needed for direct member access
     - com/sun/star/awt/XDevice.hpp
@@ -477,29 +475,9 @@ blacklist:
     sw/source/core/swg/SwXMLSectionList.cxx:
     # Actually used
     - vector
-    sw/source/core/SwNumberTree/SwNodeNum.cxx:
-    # Needed for TypedWhichId macro to work
-    - svl/intitem.hxx
-    sw/source/core/text/itratr.cxx:
-    # Needed for TypedWhichId macro to work
-    - editeng/rsiditem.hxx
-    sw/source/core/text/txtfrm.cxx:
-    # Needed for TypedWhichId macro to work
-    - editeng/rsiditem.hxx
-    sw/source/core/undo/unins.cxx:
-    # Needed for TypedWhichId macro to work
-    - fchrfmt.hxx
-    - fmtautofmt.hxx
     sw/source/core/undo/unsect.cxx:
     # Actually used
     - comphelper/scopeguard.hxx
-    sw/source/core/unocore/unoframe.cxx:
-    # Needed for TypedWhichId macro to work
-    - fmtflcnt.hxx
-    sw/source/core/unocore/unomap.cxx:
-    # Needed for TypedWhichId macro to work
-    - fmtruby.hxx
-    - fmtanchr.hxx
     sw/source/core/unocore/unomap1.cxx:
     # Needed for UnoType macro
     - com/sun/star/container/XIndexReplace.hpp
@@ -513,12 +491,6 @@ blacklist:
     - com/sun/star/text/XFootnote.hpp
     - com/sun/star/text/XTextField.hpp
     - com/sun/star/util/DateTime.hpp
-    # Needed for TypedWhichId macro to work
-    - fchrfmt.hxx
-    - fmtruby.hxx
-    - fmtinfmt.hxx
-    - fmtautofmt.hxx
-    - editeng/rsiditem.hxx
     sw/source/core/unocore/unoport.cxx:
     # Actually used
     - com/sun/star/text/XFootnote.hpp
@@ -532,16 +504,6 @@ blacklist:
     sw/source/core/unocore/unoobj.cxx:
     # OSL_BIGENDIAN is being checked
     - osl/endian.h
-    sw/source/core/unocore/unoobj2.cxx:
-    # Needed for TypedWhichId macro to work
-    - svl/intitem.hxx
-    sw/source/core/unocore/unosrch.cxx:
-    # Needed for TypedWhichId macro to work
-    - fmtinfmt.hxx
-    - fchrfmt.hxx
-    sw/source/core/unocore/unostyle.cxx:
-    # Needed for TypedWhichId macro to work
-    - fmtautofmt.hxx
     sw/source/core/unocore/unotextmarkup.cxx:
     # Actually used
     - com/sun/star/text/TextMarkupDescriptor.hpp
@@ -552,9 +514,6 @@ blacklist:
     sw/source/filter/html/SwAppletImpl.cxx:
     # Needed for direct member access
     - com/sun/star/embed/XEmbeddedObject.hpp
-    sw/source/filter/html/htmlgrin.cxx:
-    # Needed for TypedWhichId macro to work
-    - fmtflcnt.hxx
     sw/source/filter/html/wrthtml.cxx:
     # Actually used
     - comphelper/scopeguard.hxx
@@ -583,13 +542,6 @@ blacklist:
     sw/source/filter/ww8/wrtww8.cxx:
     # OSL_BIGENDIAN is being checked
     - osl/endian.h
-    sw/source/filter/xml/xmlitemm.cxx:
-    # Needed for TypedWhichId macro to work
-    - fmtfsize.hxx
-    sw/source/filter/xml/xmlitemi.cxx:
-    # Needed for TypedWhichId macro to work
-    - editeng/ulspitem.hxx
-    - fmtfsize.hxx
     sw/source/filter/xml/wrtxml.cxx:
     # Actually used
     - com/sun/star/task/XStatusIndicator.hpp
@@ -715,4 +667,34 @@ blacklist:
     sw/source/uibase/shells/textsh.cxx:
     # Needed for defines in swslots.hxx
     - globals.hrc
-
+    sw/source/uibase/uiview/view0.cxx:
+    # Needed for defines in swslots.hxx
+    - globals.hrc
+    sw/source/uibase/utlui/content.cxx:
+    # Needed for implicit dtor
+    - AnnotationWin.hxx
+    sw/source/uibase/web/wformsh.cxx:
+    # Needed for defines in swslots.hxx
+    - sfx2/sfxsids.hrc
+    sw/source/uibase/web/wfrmsh.cxx:
+    # Needed for defines in swslots.hxx
+    - cmdid.h
+    sw/source/uibase/web/wtextsh.cxx:
+    # Needed for defines in swslots.hxx
+    - globals.hrc
+    sw/source/uibase/web/wdocsh.cxx:
+    # Needed for defines in swslots.hxx
+    - svx/svxids.hrc
+    sw/source/uibase/web/wlistsh.cxx:
+    # Needed for defines in swslots.hxx
+    - cmdid.h
+    sw/source/uibase/web/wtabsh.cxx:
+    # Needed for defines in swslots.hxx
+    - cmdid.h
+    sw/source/uibase/web/wgrfsh.cxx:
+    # Needed for defines in swslots.hxx
+    - cmdid.h
+    sw/source/uibase/web/wview.cxx:
+    # Needed for defines in swslots.hxx
+    - cmdid.h
+    - globals.hrc
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index dcbc5f4247ff..8128e234d628 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -37,6 +37,99 @@ class SwPtrMsgPoolItem;
 class SfxBoolItem;
 class SvxColorItem;
 class SvxLRSpaceItem;
+class SdrTextVertAdjustItem;
+class SfxGrabBagItem;
+class SfxInt16Item;
+class SfxUInt16Item;
+class SvxAdjustItem;
+class SvxAutoKernItem;
+class SvxBlinkItem;
+class SvxBoxItem;
+class SvxBrushItem;
+class SvxCaseMapItem;
+class SvxCharHiddenItem;
+class SvxCharReliefItem;
+class SvxCharRotateItem;
+class SvxCharScaleWidthItem;
+class SvxContourItem;
+class SvxCrossedOutItem;
+class SvxEmphasisMarkItem;
+class SvxEscapementItem;
+class SvxFontHeightItem;
+class SvxFontItem;
+class SvxForbiddenRuleItem;
+class SvxFormatBreakItem;
+class SvxFormatKeepItem;
+class SvxFormatSplitItem;
+class SvxFrameDirectionItem;
+class SvxHangingPunctuationItem;
+class SvxHyphenZoneItem;
+class SvxKerningItem;
+class SvxLanguageItem;
+class SvxLineSpacingItem;
+class SvxNoHyphenItem;
+class SvxOpaqueItem;
+class SvxOrphansItem;
+class SvxOverlineItem;
+class SvxPaperBinItem;
+class SvxParaGridItem;
+class SvxParaVertAlignItem;
+class SvxPostureItem;
+class SvxPrintItem;
+class SvxProtectItem;
+class SvxRsidItem;
+class SvxScriptSpaceItem;
+class SvxShadowedItem;
+class SvxShadowItem;
+class SvxTabStopItem;
+class SvxTwoLinesItem;
+class SvxULSpaceItem;
+class SvxUnderlineItem;
+class SvxWeightItem;
+class SvxWidowsItem;
+class SvxWordLineModeItem;
+class SwChannelBGrf;
+class SwChannelGGrf;
+class SwChannelRGrf;
+class SwContrastGrf;
+class SwCropGrf;
+class SwDrawModeGrf;
+class SwFormatAnchor;
+class SwFormatAutoFormat;
+class SwFormatChain;
+class SwFormatCharFormat;
+class SwFormatCol;
+class SwFormatDrop;
+class SwFormatEditInReadonly;
+class SwFormatEndAtTextEnd;
+class SwFormatFlyCnt;
+class SwFormatFollowTextFlow;
+class SwFormatFootnoteAtTextEnd;
+class SwFormatFrameSize;
+class SwFormatHoriOrient;
+class SwFormatINetFormat;
+class SwFormatLayoutSplit;
+class SwFormatLineNumber;
+class SwFormatNoBalancedColumns;
+class SwFormatPageDesc;
+class SwFormatRowSplit;
+class SwFormatSurround;
+class SwFormatURL;
+class SwFormatVertOrient;
+class SwFormatWrapInfluenceOnObjPos;
+class SwGammaGrf;
+class SwHeaderAndFooterEatSpacingItem;
+class SwInvertGrf;
+class SwLuminanceGrf;
+class SwMirrorGrf;
+class SwNumRuleItem;
+class SwParaConnectBorderItem;
+class SwRegisterItem;
+class SwRotationGrf;
+class SwTableBoxNumFormat;
+class SwTextGridItem;
+class SwTransparencyGrf;
+class SwFormatRuby;
 
 // For SwTextHints without end index the following char is added:
 
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 76a1054c441a..a0d5f66549a0 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -62,7 +62,6 @@
 #include <editeng/protitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/wghtitem.hxx>
-#include <editeng/rsiditem.hxx>
 #include <i18nutil/transliteration.hxx>
 #include <i18nutil/searchopt.hxx>
 #include <reffld.hxx>
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index e4ea44292af4..f77b002a67ff 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -19,7 +19,6 @@
 
 #include <osl/diagnose.h>
 #include <svl/stritem.hxx>
-#include <svl/intitem.hxx>
 #include <numrule.hxx>
 #include <SwNodeNum.hxx>
 #include <ndtxt.hxx>
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 586e6c613627..73a907474ac2 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -55,7 +55,6 @@
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <editeng/lrspitem.hxx>
-#include <editeng/rsiditem.hxx>
 #include <calbck.hxx>
 
 using namespace ::com::sun::star::i18n;
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index cc32f19ac508..973b7a86c4a7 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -24,7 +24,6 @@
 #include <editeng/lrspitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/pgrditem.hxx>
-#include <editeng/rsiditem.hxx>
 #include <unotools/configmgr.hxx>
 #include <swmodule.hxx>
 #include <SwSmartTagMgr.hxx>
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index fa6971713755..1bbd14bbe9d5 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -49,8 +49,6 @@
 #include <redline.hxx>
 #include <docary.hxx>
 #include <acorrect.hxx>
-#include <fmtautofmt.hxx>
-#include <fchrfmt.hxx>
 
 #include <strings.hrc>
 
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index f37db815f23f..5ffb98a44c61 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -131,7 +131,6 @@
 #include <svx/xfltrit.hxx>
 #include <swunohelper.hxx>
 #include <fefly.hxx>
-#include <fmtflcnt.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 2df2f1a7e6b8..c2bdc1b34dbe 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -49,13 +49,11 @@
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
 #include <osl/diagnose.h>
-#include <fmtanchr.hxx>
 #include <unomap.hxx>
 #include <unoprnms.hxx>
 #include <unomid.h>
 #include <cmdid.h>
 #include <unofldmid.h>
-#include <fmtruby.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/memberids.h>
 #include <editeng/unoprnms.hxx>
diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx
index f506bf5827e6..909f183bb288 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -74,13 +74,8 @@
 #include <unoprnms.hxx>
 #include <unomid.h>
 #include <cmdid.h>
-#include <fchrfmt.hxx>
-#include <fmtruby.hxx>
-#include <fmtinfmt.hxx>
-#include <fmtautofmt.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/memberids.h>
-#include <editeng/rsiditem.hxx>
 #include <editeng/unoprnms.hxx>
 #include <svl/itemprop.hxx>
 #include <svx/xdef.hxx>
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 0fa485c1a552..66588a58919d 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -21,7 +21,6 @@
 
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <svl/intitem.hxx>
 #include <svl/listener.hxx>
 #include <svx/svdobj.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index f6994690a03f..a4656104af17 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -18,10 +18,8 @@
  */
 
 #include <hintids.hxx>
-#include <fmtinfmt.hxx>
 #include <unosrch.hxx>
 #include <unomap.hxx>
-#include <fchrfmt.hxx>
 #include <swtypes.hxx>
 
 #include <osl/diagnose.h>
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 0b0e1536f34a..3e3838c270ec 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -86,7 +86,6 @@
 #include <fmtfsize.hxx>
 #include <numrule.hxx>
 #include <tblafmt.hxx>
-#include <fmtautofmt.hxx>
 
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index c3fc76700917..6a1a92a98e65 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -64,7 +64,6 @@
 #include "swcss1.hxx"
 #include "swhtml.hxx"
 #include <numrule.hxx>
-#include <fmtflcnt.hxx>
 #include <IDocumentMarkAccess.hxx>
 
 #include <vcl/graphicfilter.hxx>
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index f2314a13b9bf..097786f3b576 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -29,11 +29,9 @@
 
 #include <editeng/brushitem.hxx>
 #include <editeng/memberids.h>
-#include <editeng/ulspitem.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
 
-#include <fmtfsize.hxx>
 #include <hintids.hxx>
 #include <unomid.h>
 #include "xmlbrshi.hxx"
diff --git a/sw/source/filter/xml/xmlitemm.cxx b/sw/source/filter/xml/xmlitemm.cxx
index 0757bdd57604..e7c093190250 100644
--- a/sw/source/filter/xml/xmlitemm.cxx
+++ b/sw/source/filter/xml/xmlitemm.cxx
@@ -26,7 +26,6 @@
 #include <xmloff/xmltoken.hxx>
 
 #include <unomid.h>
-#include <fmtfsize.hxx>
 
 using namespace ::xmloff::token;
 
diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx
index 9fab132e6c1d..2e692698f2e0 100644
--- a/sw/source/uibase/uiview/formatclipboard.cxx
+++ b/sw/source/uibase/uiview/formatclipboard.cxx
@@ -22,7 +22,6 @@
 
 #include <formatclipboard.hxx>
 
-#include <svx/svxids.hrc>
 #include <cmdid.h>
 #include <charfmt.hxx>
 #include <frmfmt.hxx>
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 2ab2568d1f76..c78c40892201 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -23,32 +23,24 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
-#include <vcl/timer.hxx>
 #include <vcl/weld.hxx>
 
 #include <svl/whiter.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <sfx2/printer.hxx>
-#include <sfx2/progress.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 #include <editeng/paperinf.hxx>
-#include <svl/srchitem.hxx>
 #include <svx/svdview.hxx>
-#include <svx/dlgutil.hxx>
 #include <svx/zoomslideritem.hxx>
-#include <svx/svxids.hrc>
 #include <tools/svborder.hxx>
 
-#include <swwait.hxx>
 #include <globdoc.hxx>
 #include <wdocsh.hxx>
 #include <pvprtdat.hxx>
 #include <swmodule.hxx>
-#include <modcfg.hxx>
 #include <wrtsh.hxx>
 #include <docsh.hxx>
 #include <viewopt.hxx>
@@ -56,16 +48,13 @@
 #include <IDocumentDeviceAccess.hxx>
 #include <pview.hxx>
 #include <view.hxx>
-#include <textsh.hxx>
 #include <scroll.hxx>
 #include <prtopt.hxx>
-#include <docstat.hxx>
 #include <usrpref.hxx>
 #include "viewfunc.hxx"
 
 #include <helpids.h>
 #include <cmdid.h>
-#include <globals.hrc>
 #include <strings.hrc>
 
 #define ShellClass_SwPagePreview
@@ -74,12 +63,10 @@
 #include <pagepreviewlayout.hxx>
 
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
 
 #include <memory>
 #include <vcl/EnumContext.hxx>
 #include <vcl/notebookbar.hxx>
-#include <prevwpage.hxx>
 
 using namespace ::com::sun::star;
 SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreview, "PrintPreview")
diff --git a/sw/source/uibase/uiview/scroll.cxx b/sw/source/uibase/uiview/scroll.cxx
index 59e57d9f5888..e44154b34222 100644
--- a/sw/source/uibase/uiview/scroll.cxx
+++ b/sw/source/uibase/uiview/scroll.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <swtypes.hxx>
-#include <swrect.hxx>
 #include <scroll.hxx>
 
 #define SCROLL_LINE_SIZE 250
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 68a0c3ebf144..2a3716f00017 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -19,29 +19,23 @@
 
 #include <rtl/tencinfo.h>
 #include <osl/diagnose.h>
-#include <hintids.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <unotools/tempfile.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/errinf.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/print.hxx>
-#include <vcl/metric.hxx>
 #include <vcl/textview.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/ctrltool.hxx>
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/undo.hxx>
-#include <unotools/textsearch.hxx>
 #include <svl/eitem.hxx>
 #include <svl/whiter.hxx>
 #include <unotools/saveopt.hxx>
 #include <vcl/transfer.hxx>
 #include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
-#include <svx/svxids.hrc>
 #include <svtools/htmlcfg.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
@@ -50,17 +44,11 @@
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/prnmon.hxx>
 #include <sfx2/docfile.hxx>
-#include <editeng/fhgtitem.hxx>
 #include <svx/srchdlg.hxx>
 #include <svl/srchitem.hxx>
-#include <editeng/fontitem.hxx>
-#include <editeng/flstitem.hxx>
-#include <editeng/unolingu.hxx>
 #include <sfx2/sfxhtml.hxx>
 #include <swtypes.hxx>
-#include <swmodule.hxx>
 #include <docsh.hxx>
 #include <wdocsh.hxx>
 #include <srcview.hxx>
@@ -72,16 +60,12 @@
 #include <shellio.hxx>
 
 #include <cmdid.h>
-#include <globals.hrc>
 #include <strings.hrc>
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <sfx2/filedlghelper.hxx>
 #define ShellClass_SwSrcView
 #include <swslots.hxx>
 
-#include <unomid.h>
-
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 
diff --git a/sw/source/uibase/uiview/swcli.cxx b/sw/source/uibase/uiview/swcli.cxx
index bd0692cb10ad..05f5f6ccc95a 100644
--- a/sw/source/uibase/uiview/swcli.cxx
+++ b/sw/source/uibase/uiview/swcli.cxx
@@ -22,12 +22,9 @@
 #include <wrtsh.hxx>
 #include <doc.hxx>
 #include <IDocumentSettingAccess.hxx>
-#include <swtypes.hxx>
 #include <view.hxx>
 #include <edtwin.hxx>
 #include <swcli.hxx>
-#include <cmdid.h>
-#include <cfgitems.hxx>
 #include <svtools/embedhlp.hxx>
 
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index 9dc6d467f941..6a45751ad1d9 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -20,7 +20,6 @@
 #include <config_features.h>
 
 #include <cmdid.h>
-#include <globals.hrc>
 
 #include <com/sun/star/scanner/XScannerManager2.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
@@ -34,15 +33,11 @@
 
 #include <sfx2/docinsert.hxx>
 #include <sfx2/request.hxx>
-#include <svx/svxids.hrc>
 #include <uivwimp.hxx>
-#include <wview.hxx>
 #include <unotxvw.hxx>
 #include <unodispatch.hxx>
 #include <swmodule.hxx>
 #include <swdtflvr.hxx>
-#include <edtwin.hxx>
-#include <mmconfigitem.hxx>
 
 #include <strings.hrc>
 
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 3a207d010ff2..5f34e355bb17 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -19,7 +19,6 @@
 
 #include <config_features.h>
 
-#include <string>
 #include <stdlib.h>
 #include <hintids.hxx>
 #include <comphelper/string.hxx>
@@ -27,33 +26,26 @@
 #include <officecfg/Office/Common.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/inputctx.hxx>
-#include <basic/sbxobj.hxx>
 #include <svl/eitem.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/useroptions.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/objface.hxx>
-#include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
 #include <svx/ruler.hxx>
 #include <svx/srchdlg.hxx>
-#include <editeng/protitem.hxx>
 #include <svx/fmshell.hxx>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
 #include <svx/fmview.hxx>
-#include <svx/svxids.hrc>
 #include <unotxvw.hxx>
 #include <cmdid.h>
 #include <svl/hint.hxx>
 #include <swmodule.hxx>
 #include <inputwin.hxx>
-#include <chartins.hxx>
 #include <uivwimp.hxx>
-#include <uitool.hxx>
 #include <edtwin.hxx>
 #include <textsh.hxx>
 #include <listsh.hxx>
@@ -71,7 +63,6 @@
 #include <navsh.hxx>
 #include <globdoc.hxx>
 #include <scroll.hxx>
-#include <navipi.hxx>
 #include <gloshdl.hxx>
 #include <usrpref.hxx>
 #include <srcview.hxx>
@@ -84,38 +75,26 @@
 #include <IDocumentLayoutAccess.hxx>
 #include <drawdoc.hxx>
 #include <wdocsh.hxx>
-#include <wview.hxx>
-#include <workctrl.hxx>
 #include <wrtsh.hxx>
 #include <barcfg.hxx>
 #include <pview.hxx>
 #include <swdtflvr.hxx>
-#include <cfgitems.hxx>
 #include <prtopt.hxx>
-#include <linguistic/lngprops.hxx>
-#include <editeng/unolingu.hxx>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/scanner/ScannerContext.hpp>
 #include <com/sun/star/scanner/XScannerManager2.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
-#include <sax/tools/converter.hxx>
 
 #include <formatclipboard.hxx>
 #include <PostItMgr.hxx>
 #include <annotsh.hxx>
 #include <swruler.hxx>
 
-#include <fldbas.hxx>
-
-#include <unomid.h>
-
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 
-#include <svl/cjkoptions.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <sfx2/lokhelper.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 56f363cc0285..adb084dff5ad 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -19,9 +19,6 @@
 
 #include <config_features.h>
 
-#include <hintids.hxx>
-#include <vcl/graph.hxx>
-#include <svl/srchitem.hxx>
 #include <SwSpellDialogChildWindow.hxx>
 #include <svl/eitem.hxx>
 #include <unotools/configmgr.hxx>
@@ -29,13 +26,10 @@
 #include <unotools/lingucfg.hxx>
 #include <viewopt.hxx>
 #include <globals.h>
-#include <sfx2/app.hxx>
 #include <sfx2/infobar.hxx>
 #include <sfx2/request.hxx>
 #include <svl/whiter.hxx>
 #include <svx/srchdlg.hxx>
-#include <svx/svxids.hrc>
-#include <sfx2/templdlg.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/sidebar/SidebarChildWindow.hxx>
@@ -45,11 +39,9 @@
 #include <com/sun/star/linguistic2/XLinguProperties.hpp>
 
 #include <sfx2/objface.hxx>
-#include <navipi.hxx>
 #include <wrtsh.hxx>
 #include <edtwin.hxx>
 #include <view.hxx>
-#include <basesh.hxx>
 #include <docsh.hxx>
 #include <doc.hxx>
 #include <globals.hrc>
@@ -70,9 +62,6 @@ using namespace ::com::sun::star;
 #include <unotools/moduleoptions.hxx>
 #include <sfx2/viewfac.hxx>
 
-#include <IDocumentSettingAccess.hxx>
-
-#include <unomid.h>
 #include <memory>
 #include <swabstdlg.hxx>
 
diff --git a/sw/source/uibase/uiview/view1.cxx b/sw/source/uibase/uiview/view1.cxx
index 0e959855ccf5..1484b30054fd 100644
--- a/sw/source/uibase/uiview/view1.cxx
+++ b/sw/source/uibase/uiview/view1.cxx
@@ -17,21 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/svdpagv.hxx>
-#include <svx/svdview.hxx>
+#include <svl/eitem.hxx>
 #include <svx/ruler.hxx>
 #include <idxmrk.hxx>
 #include <view.hxx>
 #include <basesh.hxx>
 #include <wrtsh.hxx>
 #include <swmodule.hxx>
-#include <viewopt.hxx>
 #include <docsh.hxx>
-#include <globdoc.hxx>
-#include <navipi.hxx>
 #include <fldwrap.hxx>
 #include <redlndlg.hxx>
-#include <dpage.hxx>
 #include <edtwin.hxx>
 #include <formatclipboard.hxx>
 #include <cmdid.h>
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 54b96e4b5e36..8c394e3faa6f 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -29,22 +29,19 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
 #include <com/sun/star/linguistic2/XDictionary.hpp>
-#include <officecfg/Office/Common.hxx>
-#include <svl/aeitem.hxx>
+#include <SwCapObjType.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <docary.hxx>
 #include <hintids.hxx>
 #include <SwRewriter.hxx>
 #include <numrule.hxx>
 #include <swundo.hxx>
-#include <caption.hxx>
 #include <svl/PasswordHelper.hxx>
 #include <svl/urihelper.hxx>
 #include <svtools/miscopt.hxx>
 #include <sfx2/passwd.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <sfx2/sfxhelp.hxx>
 #include <editeng/langitem.hxx>
 #include <svx/viewlayoutitem.hxx>
 #include <svx/zoomslideritem.hxx>
@@ -55,7 +52,6 @@
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
 #include <editeng/lrspitem.hxx>
-#include <unotools/textsearch.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <editeng/unolingu.hxx>
 #include <vcl/weld.hxx>
@@ -68,7 +64,6 @@
 #include <sfx2/dispatch.hxx>
 #include <svl/whiter.hxx>
 #include <svl/ptitem.hxx>
-#include <sfx2/linkmgr.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/errinf.hxx>
 #include <tools/urlobj.hxx>
@@ -100,24 +95,15 @@
 #include <frmmgr.hxx>
 #include <pagedesc.hxx>
 #include <section.hxx>
-#include <usrpref.hxx>
-#include <IMark.hxx>
-#include <navipi.hxx>
 #include <tox.hxx>
-#include <workctrl.hxx>
-#include <scroll.hxx>
 #include <edtwin.hxx>
 #include <wview.hxx>
-#include <textsh.hxx>
-#include <tabsh.hxx>
-#include <listsh.hxx>
 #include <cmdid.h>
 #include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
 #include <strings.hrc>
 #include <swerror.h>
 #include <globals.hrc>
-#include <app.hrc>
 #include <fmtclds.hxx>
 #include <sfx2/templatedlg.hxx>
 #include <dbconfig.hxx>
@@ -127,17 +113,12 @@
 
 #include <PostItMgr.hxx>
 
-#include <ndtxt.hxx>
-
 #include <comphelper/processfactory.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
 #include <swabstdlg.hxx>
 #include <fmthdft.hxx>
-#include <svx/ofaitem.hxx>
-#include <unomid.h>
 #include <unotextrange.hxx>
 #include <docstat.hxx>
 #include <wordcountdialog.hxx>
diff --git a/sw/source/uibase/uiview/viewcoll.cxx b/sw/source/uibase/uiview/viewcoll.cxx
index 3cc68306ab06..94ad59d1d3ca 100644
--- a/sw/source/uibase/uiview/viewcoll.cxx
+++ b/sw/source/uibase/uiview/viewcoll.cxx
@@ -21,13 +21,11 @@
 #include <uiitems.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <svl/stritem.hxx>
 #include <svl/style.hxx>
 
 #include <view.hxx>
 #include <wrtsh.hxx>
-#include <basesh.hxx>
 
 void SwView::ExecColl(SfxRequest const &rReq)
 {
diff --git a/sw/source/uibase/uiview/viewdlg.cxx b/sw/source/uibase/uiview/viewdlg.cxx
index e98a914e29b1..c6f81808e4e3 100644
--- a/sw/source/uibase/uiview/viewdlg.cxx
+++ b/sw/source/uibase/uiview/viewdlg.cxx
@@ -17,21 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <editeng/tstpitem.hxx>
-#include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
 
 #include <view.hxx>
 #include <wrtsh.hxx>
-#include <basesh.hxx>
-#include <viewopt.hxx>
-#include <uitool.hxx>
 #include <cmdid.h>
-#include <sfx2/tabdlg.hxx>
-
-#include <pagedesc.hxx>
 
 void SwView::ExecDlg(SfxRequest const &rReq)
 {
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx
index 5644c2fd731f..0283752c9551 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -18,15 +18,12 @@
  */
 
 #include <sfx2/request.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <sfx2/objface.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdview.hxx>
-#include <svx/svxids.hrc>
 #include <fldmgr.hxx>
 #include <expfld.hxx>
 #include <modcfg.hxx>
-#include <com/sun/star/drawing/QRCode.hpp>
 
 #include <swmodule.hxx>
 #include <view.hxx>
@@ -38,7 +35,6 @@
 #include <edtwin.hxx>
 #include <SwStyleNameMapper.hxx>
 
-#include <initui.hxx>
 #include <swabstdlg.hxx>
 
 #include <strings.hrc>
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index 6866b31cd3b1..548d7eb86ce0 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -18,25 +18,19 @@
  */
 
 #include <hintids.hxx>
-#include <svl/aeitem.hxx>
 #include <svl/itempool.hxx>
 #include <svl/stritem.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpage.hxx>
-#include <editeng/editview.hxx>
-#include <editeng/editeng.hxx>
 #include <editeng/outliner.hxx>
 #include <svx/fmview.hxx>
 #include <svx/dataaccessdescriptor.hxx>
-#include <svx/svxids.hrc>
 #include <sfx2/viewfrm.hxx>
 #include <doc.hxx>
 #include <IDocumentDeviceAccess.hxx>
 #include <textboxhelper.hxx>
 #include <editeng/langitem.hxx>
-#include <linguistic/lngprops.hxx>
-#include <editeng/unolingu.hxx>
 #include <svx/fontworkbar.hxx>
 #include <svx/fontworkgallery.hxx>
 #include <editeng/eeitem.hxx>
@@ -45,8 +39,6 @@
 #include <editeng/editstat.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
-#include <sfx2/printer.hxx>
-#include <svx/fmglob.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svdoutl.hxx>
 #include <vcl/ptrstyle.hxx>
@@ -55,7 +47,6 @@
 #include <wrtsh.hxx>
 #include <viewopt.hxx>
 #include <cmdid.h>
-#include <drawsh.hxx>
 #include <drwbassh.hxx>
 #include <beziersh.hxx>
 #include <conrect.hxx>
@@ -70,7 +61,6 @@
 
 #include <svx/svdpagv.hxx>
 #include <svx/extrusionbar.hxx>
-#include <vcl/svapp.hxx>
 #include <comphelper/lok.hxx>
 #include <sfx2/lokhelper.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 6e4b6b034517..a84474176ce1 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/linguistic2/ProofreadingResult.hpp>
 #include <com/sun/star/linguistic2/XLinguProperties.hpp>
 #include <com/sun/star/i18n/TextConversionOption.hpp>
-#include <linguistic/lngprops.hxx>
 #include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
@@ -33,26 +32,16 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/weld.hxx>
 #include <svtools/ehdl.hxx>
-#include <svl/stritem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
-#include <svx/dlgutil.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/svxids.hrc>
-#include <editeng/langitem.hxx>
 #include <svx/svxerr.hxx>
-#include <editeng/unolingu.hxx>
 #include <svx/svxdlg.hxx>
-#include <editeng/SpellPortions.hxx>
-#include <swmodule.hxx>
 #include <swwait.hxx>
-#include <initui.hxx>
 #include <uitool.hxx>
 #include <view.hxx>
 #include <wrtsh.hxx>
-#include <basesh.hxx>
-#include <docsh.hxx>
 #include <viewopt.hxx>
 #include <swundo.hxx>
 #include <hyp.hxx>
@@ -62,7 +51,6 @@
 #include <ndtxt.hxx>
 #include <txtfrm.hxx>
 #include <cmdid.h>
-#include <globals.hrc>
 #include <strings.hrc>
 #include <hhcwrp.hxx>
 
@@ -86,11 +74,7 @@
 #include <rtl/ustring.hxx>
 
 #include <cppuhelper/bootstrap.hxx>
-#include <svx/dialogs.hrc>
 #include <svtools/langtab.hxx>
-#include <unomid.h>
-#include <IMark.hxx>
-#include <xmloff/odffields.hxx>
 
 #include <editeng/editerr.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index adea583c4289..dbbfc6112146 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -17,10 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <string>
-
-#include <hintids.hxx>
-#include <vcl/svapp.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/ruler.hxx>
@@ -31,11 +27,8 @@
 #include <swmodule.hxx>
 #include <view.hxx>
 #include <wrtsh.hxx>
-#include <docsh.hxx>
 #include <viewopt.hxx>
 #include <frmatr.hxx>
-#include <wdocsh.hxx>
-#include <uitool.hxx>
 #include <edtwin.hxx>
 #include <pagedesc.hxx>
 #include <IMark.hxx>
@@ -46,15 +39,12 @@
 #include <wview.hxx>
 
 #include <cmdid.h>
-#include <globals.hrc>
 
-#include <IDocumentSettingAccess.hxx>
 #include <PostItMgr.hxx>
 #include <AnnotationWin.hxx>
 
 #include <svx/srchdlg.hxx>
 #include <svx/svdview.hxx>
-#include <svx/svxids.hrc>
 
 #include <vcl/uitest/logger.hxx>
 #include <vcl/uitest/eventdescription.hxx>
diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx
index 2fa7e12f5afe..7f51a28b6c3c 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -17,38 +17,24 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_features.h>
-
-#include <hintids.hxx>
-
 #include <vcl/commandevent.hxx>
 #include <vcl/help.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/syswin.hxx>
 
 #include <svx/ruler.hxx>
-#include <editeng/paperinf.hxx>
-#include <editeng/lrspitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svx/svxids.hrc>
 #include <view.hxx>
 #include <wrtsh.hxx>
-#include <swmodule.hxx>
 #include <viewopt.hxx>
-#include <frmatr.hxx>
 #include <docsh.hxx>
 #include <cmdid.h>
 #include <edtwin.hxx>
 #include <scroll.hxx>
-#include <wview.hxx>
-#include <usrpref.hxx>
-#include <pagedesc.hxx>
-#include <workctrl.hxx>
 
 #include <PostItMgr.hxx>
 
-#include <IDocumentSettingAccess.hxx>
-
 #include <basegfx/utils/zoomtools.hxx>
 #include <comphelper/lok.hxx>
 #include <vcl/weld.hxx>
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index 940b59fc95c3..5232c6b6a8cf 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -17,26 +17,19 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cstdarg>
 #include <libxml/xmlwriter.h>
 #include <cmdid.h>
 #include <sfx2/request.hxx>
-#include <sfx2/progress.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/oldprintadaptor.hxx>
 #include <sfx2/printer.hxx>
-#include <sfx2/prnmon.hxx>
 #include <editeng/paperinf.hxx>
 #include <sfx2/dispatch.hxx>
 #include <unotools/misccfg.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
-#include <svx/svdview.hxx>
-#include <svx/svxids.hrc>
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
@@ -47,28 +40,18 @@
 #include <edtwin.hxx>
 #include <view.hxx>
 #include <wrtsh.hxx>
-#include <docsh.hxx>
 #include <viewopt.hxx>
 #include <prtopt.hxx>
-#include <fontcfg.hxx>
 #include <cfgitems.hxx>
-#include <dbmgr.hxx>
-#include <docstat.hxx>
 #include "viewfunc.hxx"
 #include <swmodule.hxx>
 #include <wview.hxx>
-#include <doc.hxx>
-#include <fldbas.hxx>
 #include <IDocumentDeviceAccess.hxx>
 
 #include <globals.hrc>
 #include <strings.hrc>
-#include <app.hrc>
-#include <swwrtshitem.hxx>
 #include <swabstdlg.hxx>
-#include <svl/slstitm.hxx>
 
-#include <unomid.h>
 #include <uivwimp.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index c20e8f3cd00f..152954534ea0 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_features.h>
-
 #include <string>
 
 #include <memory>
@@ -31,19 +29,12 @@
 #include <svl/ctloptions.hxx>
 #include <svx/pageitem.hxx>
 #include <svl/whiter.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svl/stritem.hxx>
-#include <unotools/textsearch.hxx>
-#include <svl/itempool.hxx>
 #include <svl/eitem.hxx>
 #include <svl/srchitem.hxx>
-#include <sal/macros.h>
+#include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
 #include <svx/srchdlg.hxx>
-#include <svx/dialogs.hrc>
-#include <svx/svxids.hrc>
-#include <editeng/unolingu.hxx>
 #include <edtwin.hxx>
 #include <swmodule.hxx>
 #include <swwait.hxx>
@@ -54,16 +45,12 @@
 #include <uitool.hxx>
 #include <cmdid.h>
 #include <docsh.hxx>
-#include <doc.hxx>
-#include <unocrsr.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
 #include <comphelper/string.hxx>
 
 #include <strings.hrc>
 #include <SwRewriter.hxx>
-#include <IDocumentDrawModelAccess.hxx>
-#include <drawdoc.hxx>
 
 #include <PostItMgr.hxx>
 
diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx
index a5bd1d13b527..76742a9ad35c 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -18,42 +18,32 @@
  */
 
 #include <memory>
-#include <config_features.h>
 
 #include <hintids.hxx>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
-#include <officecfg/Office/Common.hxx>
-#include <svl/aeitem.hxx>
 #include <svl/whiter.hxx>
 #include <svl/cjkoptions.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <sfx2/objitem.hxx>
 #include <svl/imageitm.hxx>
 #include <svl/languageoptions.hxx>
-#include <svx/svxids.hrc>
-#include <editeng/protitem.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/tstpitem.hxx>
 #include <sfx2/htmlmode.hxx>
-#include <editeng/unolingu.hxx>
-#include <sfx2/msgpool.hxx>
 #include <swmodule.hxx>
 #include <tox.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/app.hxx>
 #include <view.hxx>
 #include <wrtsh.hxx>
-#include <basesh.hxx>
 #include <uitool.hxx>
 #include <viewopt.hxx>
-#include <tablemgr.hxx>
 #include <pagedesc.hxx>
 #include <wview.hxx>
 #include <globdoc.hxx>
 #include <svl/stritem.hxx>
 #include <unotools/moduleoptions.hxx>
+#include <comphelper/processfactory.hxx>
 #include <comphelper/lok.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <svl/visitem.hxx>
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index 2e4efe96d682..0ddf545a3d1a 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -19,14 +19,12 @@
 
 #include <hintids.hxx>
 #include <uitool.hxx>
-#include <sfx2/app.hxx>
 #include <svx/rulritem.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xflgrit.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/xbtmpit.hxx>
 #include <svx/xfillit0.hxx>
-#include <svx/svxids.hrc>
 #include <editeng/tstpitem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -45,10 +43,8 @@
 #include <fmtclds.hxx>
 #include <fmtornt.hxx>
 #include <frmatr.hxx>
-#include <edtwin.hxx>
 #include <view.hxx>
 #include <wrtsh.hxx>
-#include <basesh.hxx>
 #include <cmdid.h>
 #include <viewopt.hxx>
 #include <tabcol.hxx>
@@ -57,16 +53,11 @@
 #include <wview.hxx>
 #include <fmtcol.hxx>
 #include <section.hxx>
-#include <swruler.hxx>
-#include <cntfrm.hxx>
 #include <ndtxt.hxx>
 #include <pam.hxx>
-#include <comphelper/lok.hxx>
 
 #include <IDocumentSettingAccess.hxx>
 
-#include <svx/xtable.hxx>
-
 using namespace ::com::sun::star;
 
 // Pack columns
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index ebe65c360b2b..5327dae31000 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -25,7 +25,6 @@
 #include <utility>
 
 #include <o3tl/any.hxx>
-#include <sfx2/sfxbasecontroller.hxx>
 #include "SwXDocumentSettings.hxx"
 #include <comphelper/MasterPropertySetInfo.hxx>
 #include <cppuhelper/queryinterface.hxx>
@@ -42,19 +41,14 @@
 #include <linkenum.hxx>
 #include <sfx2/printer.hxx>
 #include <editsh.hxx>
-#include <drawdoc.hxx>
-#include <svl/zforlist.hxx>
 #include <unotxdoc.hxx>
 #include <cmdid.h>
-#include <sfx2/zoomitem.hxx>
 #include <unomod.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/asiancfg.hxx>
 #include <tools/stream.hxx>
 
-#include <swmodule.hxx>
 #include <cfgitems.hxx>
-#include <prtopt.hxx>
 #include <dbmgr.hxx>
 
 using namespace comphelper;
diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx
index 2e53ca270d03..b36472bf54e1 100644
--- a/sw/source/uibase/uno/SwXFilterOptions.cxx
+++ b/sw/source/uibase/uno/SwXFilterOptions.cxx
@@ -20,9 +20,7 @@
 #include <SwXFilterOptions.hxx>
 #include <shellio.hxx>
 #include <swdll.hxx>
-#include <unoprnms.hxx>
 #include <vcl/svapp.hxx>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/propertysequence.hxx>
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index fccaef19acba..3d7901bcfcef 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -27,32 +27,25 @@
 #include <rtl/character.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/unoevent.hxx>
-#include <svl/urihelper.hxx>
 #include <sfx2/event.hxx>
-#include <swtypes.hxx>
 #include <glosdoc.hxx>
 #include <shellio.hxx>
 #include <initui.hxx>
 #include <gloslst.hxx>
 #include <unoatxt.hxx>
 #include <unomap.hxx>
-#include <unomid.h>
 #include <unotextbodyhf.hxx>
 #include <unotextrange.hxx>
 #include <TextCursorHelper.hxx>
-#include <swevent.hxx>
 #include <doc.hxx>
-#include <unocrsr.hxx>
-#include <IMark.hxx>
 #include <IDocumentContentOperations.hxx>
 #include <IDocumentRedlineAccess.hxx>
 #include <IDocumentFieldsAccess.hxx>
 #include <IDocumentState.hxx>
-#include <unoprnms.hxx>
 #include <docsh.hxx>
-#include <swmodule.hxx>
 #include <swdll.hxx>
 #include <svl/hint.hxx>
+#include <tools/urlobj.hxx>
 #include <svl/macitem.hxx>
 #include <editeng/acorrcfg.hxx>
 #include <comphelper/servicehelper.hxx>
diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx
index 6b4716843503..c23eda0113c2 100644
--- a/sw/source/uibase/uno/unodispatch.cxx
+++ b/sw/source/uibase/uno/unodispatch.cxx
@@ -21,13 +21,11 @@
 
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 
-#include <vcl/svapp.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <unodispatch.hxx>
-#include <unobaseclass.hxx>
 #include <view.hxx>
 #include <cmdid.h>
 #include <wrtsh.hxx>
diff --git a/sw/source/uibase/uno/unodoc.cxx b/sw/source/uibase/uno/unodoc.cxx
index efe46d868ecb..dfa3a3baecdd 100644
--- a/sw/source/uibase/uno/unodoc.cxx
+++ b/sw/source/uibase/uno/unodoc.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/docfac.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
 #include <swdll.hxx>
 #include <unofreg.hxx>
diff --git a/sw/source/uibase/uno/unofreg.cxx b/sw/source/uibase/uno/unofreg.cxx
index e81858bc62b0..a170bb0854bb 100644
--- a/sw/source/uibase/uno/unofreg.cxx
+++ b/sw/source/uibase/uno/unofreg.cxx
@@ -19,7 +19,6 @@
 
 #include <config_features.h>
 
-#include <SwXFilterOptions.hxx>
 #include <swdll.hxx>
 #include <unofreg.hxx>
 #include <unomailmerge.hxx>
@@ -35,10 +34,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 
-// #i73788#
-#include <cppuhelper/implementationentry.hxx>
-#include <finalthreadmanager.hxx>
-
 extern "C"
 {
 
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 83682dbb9b95..c393736f94c7 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -20,12 +20,11 @@
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 #include <svl/itemprop.hxx>
-#include <svl/urihelper.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <unotools/tempfile.hxx>
 #include <sfx2/app.hxx>
-#include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
+#include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -35,7 +34,6 @@
 #include <com/sun/star/text/MailMergeEvent.hpp>
 #include <com/sun/star/text/XMailMergeListener.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
@@ -48,10 +46,9 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/event.hxx>
 #include <cppuhelper/implbase.hxx>
+#include <printdata.hxx>
 #include <swevent.hxx>
 #include <unomailmerge.hxx>
-#include <swdll.hxx>
-#include <swmodule.hxx>
 #include <unoprnms.hxx>
 #include <unomap.hxx>
 #include <swunohelper.hxx>
@@ -60,13 +57,10 @@
 #include <view.hxx>
 #include <dbmgr.hxx>
 #include <unotxdoc.hxx>
-#include <prtopt.hxx>
 #include <wrtsh.hxx>
-#include <shellio.hxx>
 #include <mmconfigitem.hxx>
 #include <mailmergehelper.hxx>
 
-#include <unomid.h>
 #include <iodetect.hxx>
 
 #include <memory>
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 07ce19ea7bcc..23e9db501423 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -28,11 +28,7 @@
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 
-#include <swtypes.hxx>
 #include <unomod.hxx>
-#include <unomid.h>
-#include <unoprnms.hxx>
-#include <unomap.hxx>
 #include <usrpref.hxx>
 #include <prtopt.hxx>
 #include <swmodule.hxx>
diff --git a/sw/source/uibase/uno/unomodule.cxx b/sw/source/uibase/uno/unomodule.cxx
index 867960520fca..0d595e773333 100644
--- a/sw/source/uibase/uno/unomodule.cxx
+++ b/sw/source/uibase/uno/unomodule.cxx
@@ -17,13 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 
 #include <swmodule.hxx>
 #include <swdll.hxx>
-#include <unofreg.hxx>
 #include "unomodule.hxx"
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 7e4d32c2ff59..9656120f89a7 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -25,19 +25,14 @@
 #include <AnnotationWin.hxx>
 #include <o3tl/any.hxx>
 #include <osl/mutex.hxx>
-#include <vcl/commandevent.hxx>
-#include <vcl/image.hxx>
-#include <vcl/vclevent.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/print.hxx>
+#include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/lokhelper.hxx>
-#include <sfx2/sfxbasecontroller.hxx>
 #include <sfx2/docfile.hxx>
-#include <sfx2/msg.hxx>
-#include <sfx2/msgpool.hxx>
 #include <sfx2/printer.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
@@ -68,29 +63,22 @@
 #include <unocoll.hxx>
 #include <unoredlines.hxx>
 #include <unosrch.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/objsh.hxx>
 #include <unoprnms.hxx>
 #include <unostyle.hxx>
 #include <unodraw.hxx>
 #include <svl/eitem.hxx>
-#include <pagedesc.hxx>
 #include <unotools/datetime.hxx>
-#include <unotools/textsearch.hxx>
 #include <unocrsr.hxx>
 #include <unofieldcoll.hxx>
 #include <unoidxcoll.hxx>
 #include <unocrsrhelper.hxx>
-#include <unotxvw.hxx>
-#include <poolfmt.hxx>
 #include <globdoc.hxx>
 #include <viewopt.hxx>
 #include <unochart.hxx>
 #include <charatr.hxx>
 #include <svx/xmleohlp.hxx>
-#include <globals.hrc>
-#include <unomid.h>
 #include <unotools/printwarningoptions.hxx>
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
@@ -104,17 +92,15 @@
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/script/XInvocation.hpp>
+#include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <sfx2/linkmgr.hxx>
 #include <svx/unofill.hxx>
-#include <editeng/unolingu.hxx>
-#include <sfx2/progress.hxx>
 #include <swmodule.hxx>
 #include <docstat.hxx>
 #include <modcfg.hxx>
 #include <ndtxt.hxx>
 #include <strings.hrc>
 #include <bitmaps.hlst>
-#include <swcont.hxx>
 #include "unodefaults.hxx"
 #include "SwXDocumentSettings.hxx"
 #include <doc.hxx>
@@ -127,9 +113,7 @@
 #include <IDocumentFieldsAccess.hxx>
 #include <IDocumentStatistics.hxx>
 #include <IDocumentStylePoolAccess.hxx>
-#include <IDocumentLayoutAccess.hxx>
 #include <IDocumentState.hxx>
-#include <editeng/forbiddencharacterstable.hxx>
 #include <svl/zforlist.hxx>
 #include <drawdoc.hxx>
 #include <SwStyleNameMapper.hxx>
@@ -150,12 +134,10 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nutil/searchopt.hxx>
 
-#include <format.hxx>
 #include <charfmt.hxx>
 #include <fmtcol.hxx>
 #include <istyleaccess.hxx>
 
-#include <svl/stylepool.hxx>
 #include <swatrset.hxx>
 #include <view.hxx>
 #include <viscrs.hxx>
@@ -173,12 +155,9 @@
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
 #include <svx/svdoutl.hxx>
-#include <svl/languageoptions.hxx>
 #include <svx/svdview.hxx>
 #include <comphelper/servicehelper.hxx>
-#include <SwSpellDialogChildWindow.hxx>
 #include <memory>
-#include <fchrfmt.hxx>
 #include <redline.hxx>
 #include <DocumentRedlineManager.hxx>
 
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 7dbdb7574bc9..b83a52500e4d 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -24,7 +24,6 @@
 #include <sfx2/printer.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <cmdid.h>
-#include <hintids.hxx>
 #include <docsh.hxx>
 #include <rubylist.hxx>
 #include <doc.hxx>
@@ -32,7 +31,6 @@
 #include <unotxvw.hxx>
 #include <unodispatch.hxx>
 #include <unomap.hxx>
-#include <unostyle.hxx>
 #include <unoprnms.hxx>
 #include <view.hxx>
 #include <viewopt.hxx>
@@ -45,7 +43,6 @@
 #include <svx/svdview.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdouno.hxx>
-#include <svx/svdogrp.hxx>
 #include <editeng/pbinitem.hxx>
 #include <pagedesc.hxx>
 #include <editeng/lrspitem.hxx>
@@ -54,12 +51,8 @@
 #include <sfx2/request.hxx>
 #include <frmatr.hxx>
 #include <IMark.hxx>
-#include <unotxdoc.hxx>
 #include <unodraw.hxx>
-#include <svx/unoshape.hxx>
 #include <svx/svdpagv.hxx>
-#include <swerror.h>
-#include <shellio.hxx>
 #include <ndtxt.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx
index ff182d415cbe..a839c436f725 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -51,8 +51,6 @@
 #include <grfatr.hxx>
 #include <pagedesc.hxx>
 #include <charfmt.hxx>
-#include <fmtcol.hxx>
-#include <tox.hxx>
 #include <strings.hrc>
 #include <fmtftntx.hxx>
 #include <fmtfollowtextflow.hxx>
diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx
index 2659f4a7e9c1..ea9c1d7429f5 100644
--- a/sw/source/uibase/utlui/bookctrl.cxx
+++ b/sw/source/uibase/utlui/bookctrl.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
 #include <swtypes.hxx>
 #include <strings.hrc>
 
diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx
index c807104922f9..df50c63ace7d 100644
--- a/sw/source/uibase/utlui/condedit.cxx
+++ b/sw/source/uibase/utlui/condedit.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sot/formats.hxx>
-
 #include <condedit.hxx>
 #include <svx/dbaexchange.hxx>
 
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 5b69e66a50fa..e6184a9d9311 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -43,7 +43,6 @@
 #include <content.hxx>
 #include <frmfmt.hxx>
 #include <fldbas.hxx>
-#include <txtatr.hxx>
 #include <IMark.hxx>
 #include <section.hxx>
 #include <tox.hxx>
@@ -54,7 +53,6 @@
 #include <doc.hxx>
 #include <IDocumentDrawModelAccess.hxx>
 #include <IDocumentOutlineNodes.hxx>
-#include <unotools.hxx>
 #include <unotxvw.hxx>
 #include <cmdid.h>
 #include <helpids.h>
@@ -68,28 +66,20 @@
 #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp>
 #include <com/sun/star/text/XTextFramesSupplier.hpp>
 #include <dcontact.hxx>
-#include <svx/svdogrp.hxx>
-#include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>
-#include <svx/svxids.hrc>
 #include <vcl/scrbar.hxx>
 #include <SwRewriter.hxx>
 #include <hints.hxx>
 #include <numrule.hxx>
 #include <swundo.hxx>
 #include <ndtxt.hxx>
-#include <fmtcntnt.hxx>
 #include <PostItMgr.hxx>
 #include <postithelper.hxx>
-#include <redline.hxx>
-#include <docary.hxx>
 #include <vcl/treelistentry.hxx>
 
 #include <swabstdlg.hxx>
-#include <globals.hrc>
 #include <bitmaps.hlst>
-#include <unomid.h>
 
 #include <navmgr.hxx>
 #include <AnnotationWin.hxx>
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 507725e2b24e..82f3ea738e90 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -22,14 +22,11 @@
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svl/urihelper.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <vcl/help.hxx>
 #include <sot/filelist.hxx>
 #include <svl/eitem.hxx>
-#include <svl/urlbmk.hxx>
-#include <svx/svxids.hrc>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/settings.hxx>
 
@@ -37,26 +34,19 @@
 #include <sfx2/docinsert.hxx>
 #include <sfx2/filedlghelper.hxx>
 
-#include <sfx2/app.hxx>
-#include <swmodule.hxx>
 #include <wrtsh.hxx>
 #include <view.hxx>
 #include <docsh.hxx>
-#include <content.hxx>
 #include <edglbldc.hxx>
 #include <section.hxx>
 #include <tox.hxx>
-#include <cnttab.hxx>
 #include <navipi.hxx>
-#include <navicont.hxx>
 #include <edtwin.hxx>
-#include <uitool.hxx>
 #include <toxmgr.hxx>
 
 #include <cmdid.h>
 #include <helpids.h>
 #include <strings.hrc>
-#include <globals.hrc>
 #include <bitmaps.hlst>
 #include <swabstdlg.hxx>
 #include <memory>
diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx
index 444babfcbc36..b58335850ad9 100644
--- a/sw/source/uibase/utlui/gloslst.cxx
+++ b/sw/source/uibase/utlui/gloslst.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/urlobj.hxx>
 #include <vcl/weld.hxx>
 #include <svl/fstathelper.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/sw/source/uibase/utlui/gotodlg.cxx b/sw/source/uibase/utlui/gotodlg.cxx
index 574991795498..63e7c424ca39 100644
--- a/sw/source/uibase/utlui/gotodlg.cxx
+++ b/sw/source/uibase/utlui/gotodlg.cxx
@@ -22,9 +22,7 @@
 #include <wrtsh.hxx>
 #include <gotodlg.hxx>
 #include <sfx2/bindings.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <cmdid.h>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx
index 7a1d9dacea8a..be6c92e29a93 100644
--- a/sw/source/uibase/utlui/initui.cxx
+++ b/sw/source/uibase/utlui/initui.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_features.h>
-
 #include <unotools/localedatawrapper.hxx>
 #include <viewsh.hxx>
 #include <initui.hxx>
@@ -31,11 +29,8 @@
 #include <strings.hrc>
 #include <utlui.hrc>
 #include <authfld.hxx>
-#include <dbmgr.hxx>
 #include <unotools/syslocale.hxx>
 
-#include <unomid.h>
-
 // Global Pointer
 
 static std::unique_ptr<SwGlossaries> pGlossaries;
diff --git a/sw/source/uibase/utlui/navicfg.cxx b/sw/source/uibase/utlui/navicfg.cxx
index c585cf7631f9..40c1c30a861f 100644
--- a/sw/source/uibase/utlui/navicfg.cxx
+++ b/sw/source/uibase/utlui/navicfg.cxx
@@ -25,8 +25,6 @@
 #include <sal/log.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include <unomid.h>
-
 using namespace ::utl;
 using namespace ::com::sun::star::uno;
 
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 7b8832e58249..88acee99df44 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -17,22 +17,19 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <string>
 #include <comphelper/string.hxx>
 #include <svl/urlbmk.hxx>
 #include <svl/stritem.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <svl/urihelper.hxx>
 #include <sot/formats.hxx>
 #include <sot/filelist.hxx>
 #include <sfx2/event.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/dockwin.hxx>
 #include <sfx2/navigat.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <tools/urlobj.hxx>
 #include <vcl/toolbox.hxx>
-#include <vcl/settings.hxx>
 #include <swtypes.hxx>
 #include <swmodule.hxx>
 #include <view.hxx>
@@ -40,21 +37,16 @@
 #include <wrtsh.hxx>
 #include <docsh.hxx>
 #include <actctrl.hxx>
-#include <IMark.hxx>
 #include <navipi.hxx>
-#include <content.hxx>
 #include <workctrl.hxx>
-#include <section.hxx>
 #include <edtwin.hxx>
 #include <sfx2/app.hxx>
 #include <cmdid.h>
 #include <helpids.h>
 
 #include <strings.hrc>
-#include <globals.hrc>
 #include <bitmaps.hlst>
 
-#include <unomid.h>
 #include <memory>
 
 #include <uiobject.hxx>
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index 3fe4c0ef8fa2..4b4b6acb799a 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
-#include <editeng/unolingu.hxx>
-#include <unotools/localedatawrapper.hxx>
 #include <i18nlangtag/lang.h>
 #include <svl/zformat.hxx>
 #include <svl/eitem.hxx>
@@ -35,8 +32,6 @@
 #include <numfmtlb.hxx>
 #include <strings.hrc>
 #include <swabstdlg.hxx>
-#include <unomid.h>
-#include <sfx2/viewfrm.hxx>
 #include <memory>
 
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/uibase/utlui/shdwcrsr.cxx b/sw/source/uibase/utlui/shdwcrsr.cxx
index dcc2bbac6eee..dbdf78b49ccb 100644
--- a/sw/source/uibase/utlui/shdwcrsr.cxx
+++ b/sw/source/uibase/utlui/shdwcrsr.cxx
@@ -19,7 +19,6 @@
 
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <vcl/window.hxx>
-#include <swtypes.hxx>
 #include <shdwcrsr.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx
index dd520f91d77e..e6673587c470 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -19,7 +19,6 @@
 
 #include <editeng/itemtype.hxx>
 #include <unosett.hxx>
-#include <osl/diagnose.h>
 
 #include <swtypes.hxx>
 #include <cmdid.h>
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index dc8639b12dd2..a8eedaa52e16 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -21,25 +21,18 @@
 
 #include <osl/diagnose.h>
 #include <tools/datetime.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <unotools/collatorwrapper.hxx>
-#include <svl/urihelper.hxx>
 #include <svl/stritem.hxx>
 #include <svl/grabbagitem.hxx>
 #include <unotools/syslocale.hxx>
-#include <sfx2/app.hxx>
 #include <IDocumentStylePoolAccess.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/docfilt.hxx>
 #include <editeng/pmdlitem.hxx>
 #include <editeng/tstpitem.hxx>
 #include <editeng/boxitem.hxx>
-#include <editeng/shaditem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <svx/pageitem.hxx>
-#include <svx/svxids.hrc>
 #include <editeng/lrspitem.hxx>
 #include <svl/style.hxx>
 #include <unotools/localedatawrapper.hxx>
@@ -51,11 +44,9 @@
 #include <sfx2/viewfrm.hxx>
 #include <fmtornt.hxx>
 #include <tabcol.hxx>
-#include <edtwin.hxx>
 #include <fmtfsize.hxx>
 #include <fmthdft.hxx>
 #include <fmtpdsc.hxx>
-#include <wview.hxx>
 #include <uiitems.hxx>
 #include <docsh.hxx>
 #include <wrtsh.hxx>
@@ -69,12 +60,10 @@
 #include <usrpref.hxx>
 
 #include <cmdid.h>
-#include <globals.hrc>
 #include <doc.hxx>
 #include <docary.hxx>
 #include <charfmt.hxx>
 #include <SwStyleNameMapper.hxx>
-#include <editsh.hxx>
 // 50 cm 28350
 
 #define MAXHEIGHT 28350
diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index bf7aa52569a6..dd4470b0667f 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <swtypes.hxx>
-#include <globals.hrc>
 
 #include <strings.hrc>
 #include <unotools.hxx>
@@ -38,28 +37,19 @@
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
-#include <com/sun/star/awt/Toolkit.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/view/XViewSettingsSupplier.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/servicehelper.hxx>
-#include <sfx2/dispatch.hxx>
-#include <svl/stritem.hxx>
-#include <shellio.hxx>
 #include <docsh.hxx>
-#include <view.hxx>
-#include <wrtsh.hxx>
+#include <editsh.hxx>
 #include <swmodule.hxx>
 #include <TextCursorHelper.hxx>
-#include <unocrsr.hxx>
 #include <doc.hxx>
 
-#include <unomid.h>
-
 using namespace ::com::sun::star;
 
 const char cFactory[] = "private:factory/swriter";
diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx
index 25683d43781d..43b302e3a6d1 100644
--- a/sw/source/uibase/utlui/viewlayoutctrl.cxx
+++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx
@@ -23,7 +23,6 @@
 #include <vcl/event.hxx>
 #include <vcl/status.hxx>
 #include <vcl/image.hxx>
-#include <svl/eitem.hxx>
 #include <svx/viewlayoutitem.hxx>
 #include <strings.hrc>
 #include <bitmaps.hlst>
diff --git a/sw/source/uibase/utlui/zoomctrl.cxx b/sw/source/uibase/utlui/zoomctrl.cxx
index c1e9e95c5140..493b2f9b7828 100644
--- a/sw/source/uibase/utlui/zoomctrl.cxx
+++ b/sw/source/uibase/utlui/zoomctrl.cxx
@@ -17,14 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
-
 #include <vcl/status.hxx>
-#include <sfx2/app.hxx>
 #include <svl/stritem.hxx>
 #include <sfx2/zoomitem.hxx>
 
-#include <swtypes.hxx>
 #include <zoomctrl.hxx>
 
 SFX_IMPL_STATUSBAR_CONTROL( SwZoomControl, SvxZoomItem );
diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx
index 1adc3a21ba90..05242544f43a 100644
--- a/sw/source/uibase/web/wdocsh.cxx
+++ b/sw/source/uibase/web/wdocsh.cxx
@@ -17,31 +17,25 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svl/srchitem.hxx>
-#include <sfx2/app.hxx>
 #include <svx/svxids.hrc>
 
 #include <comphelper/fileformat.h>
 #include <comphelper/classids.hxx>
 #include <sfx2/objface.hxx>
+#include <tools/globname.hxx>
 #include <osl/diagnose.h>
 
 #include <sfx2/msg.hxx>
-#include <cmdid.h>
 #include <swtypes.hxx>
 
-#include <shellio.hxx>
 #include <wdocsh.hxx>
 #include <strings.hrc>
 
-#include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
 #define ShellClass_SwWebDocShell
 #include <swslots.hxx>
 
-#include <unomid.h>
-
 SFX_IMPL_SUPERCLASS_INTERFACE(SwWebDocShell, SfxObjectShell)
 
 void SwWebDocShell::InitInterface_Impl()
diff --git a/sw/source/uibase/web/wformsh.cxx b/sw/source/uibase/web/wformsh.cxx
index 219972becf43..1d65b62b3607 100644
--- a/sw/source/uibase/web/wformsh.cxx
+++ b/sw/source/uibase/web/wformsh.cxx
@@ -18,19 +18,11 @@
  */
 
 #include <sfx2/msg.hxx>
-
-#include <svx/svxids.hrc>
-#include <svl/srchitem.hxx>
 #include <sfx2/objface.hxx>
-#include <tools/globname.hxx>
-#include <sfx2/app.hxx>
+#include <sfx2/sfxsids.hrc>
 
-#include <swtypes.hxx>
-#include <cmdid.h>
 #include <wformsh.hxx>
-#include <globals.hrc>
 
-#include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
 #define ShellClass_SwWebDrawFormShell
diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx
index 25fd36701838..a9bac1962b78 100644
--- a/sw/source/uibase/web/wfrmsh.cxx
+++ b/sw/source/uibase/web/wfrmsh.cxx
@@ -17,18 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
-#include <svl/srchitem.hxx>
-#include <svx/svxids.hrc>
-#include <swtypes.hxx>
 #include <cmdid.h>
 #include <view.hxx>
 #include <wfrmsh.hxx>
-#include <globals.hrc>
 
-#include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
 #define ShellClass_SwWebFrameShell
diff --git a/sw/source/uibase/web/wgrfsh.cxx b/sw/source/uibase/web/wgrfsh.cxx
index b112d7a1c4cf..66fc2235d657 100644
--- a/sw/source/uibase/web/wgrfsh.cxx
+++ b/sw/source/uibase/web/wgrfsh.cxx
@@ -18,22 +18,13 @@
  */
 
 #include <sfx2/msg.hxx>
-#include <svl/srchitem.hxx>
-#include <sfx2/app.hxx>
-#include <svx/svxids.hrc>
 
 #include <sfx2/objface.hxx>
 
 #include <cmdid.h>
 #include <view.hxx>
-#include <wrtsh.hxx>
-#include <swmodule.hxx>
-#include <uitool.hxx>
-#include <docsh.hxx>
-#include <globals.hrc>
 #include <wgrfsh.hxx>
 
-#include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
 #define ShellClass_SwWebGrfShell
diff --git a/sw/source/uibase/web/wlistsh.cxx b/sw/source/uibase/web/wlistsh.cxx
index 553b5c46fcf7..c7789c1e419d 100644
--- a/sw/source/uibase/web/wlistsh.cxx
+++ b/sw/source/uibase/web/wlistsh.cxx
@@ -18,19 +18,11 @@
  */
 
 #include <sfx2/msg.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
-#include <svl/srchitem.hxx>
-#include <svx/imapdlg.hxx>
 
 #include <cmdid.h>
-#include <wrtsh.hxx>
-#include <swmodule.hxx>
-#include <globals.hrc>
-#include <uinums.hxx>
 #include <wlistsh.hxx>
 
-#include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
 #define ShellClass_SwWebListShell
diff --git a/sw/source/uibase/web/wolesh.cxx b/sw/source/uibase/web/wolesh.cxx
index ca6a6d6f8cdc..15bab538b3d9 100644
--- a/sw/source/uibase/web/wolesh.cxx
+++ b/sw/source/uibase/web/wolesh.cxx
@@ -18,15 +18,10 @@
  */
 
 #include <sfx2/msg.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
-#include <svl/srchitem.hxx>
 
-#include <wrtsh.hxx>
 #include <view.hxx>
-#include <globals.hrc>
 #include <wolesh.hxx>
-#include <cmdid.h>
 
 #define ShellClass_SwWebOleShell
 #include <swslots.hxx>
diff --git a/sw/source/uibase/web/wtabsh.cxx b/sw/source/uibase/web/wtabsh.cxx
index 01171fd71fad..88008034c6bc 100644
--- a/sw/source/uibase/web/wtabsh.cxx
+++ b/sw/source/uibase/web/wtabsh.cxx
@@ -17,24 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
-#include <sfx2/app.hxx>
-#include <tools/globname.hxx>
 #include <sfx2/objface.hxx>
-#include <svl/srchitem.hxx>
 
 #include <cmdid.h>
-#include <globals.hrc>
-#include <uitool.hxx>
 #include <wrtsh.hxx>
 #include <wtabsh.hxx>
 
-#include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
 #define ShellClass_SwWebTableShell
 #include <sfx2/msg.hxx>
-#include <svx/svxids.hrc>
 #include <swslots.hxx>
 
 SFX_IMPL_INTERFACE(SwWebTableShell, SwTableShell)
diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx
index b7847c8392b0..c655bdf2cb22 100644
--- a/sw/source/uibase/web/wtextsh.cxx
+++ b/sw/source/uibase/web/wtextsh.cxx
@@ -17,23 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
 #include <sfx2/objface.hxx>
-#include <sfx2/app.hxx>
-#include <svl/srchitem.hxx>
-#include <basic/sbxvar.hxx>
-#include <svx/svxids.hrc>
 
-#include <swtypes.hxx>
 #include <cmdid.h>
 #include <view.hxx>
 #include <wtextsh.hxx>
 #include <basesh.hxx>
 #include <globals.hrc>
 
-#include <unomid.h>
-
-#include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
 #define ShellClass_SwWebTextShell
diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index 782f152cde2b..2fa09630e65a 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -17,28 +17,23 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_features.h>
+#include <config_feature_desktop.h>
 
 #include <sfx2/msg.hxx>
-#include <svl/srchitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/infobar.hxx>
-#include <sfx2/templdlg.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/srchdlg.hxx>
-#include <basic/sbxobj.hxx>
 #include <uivwimp.hxx>
 #include <svx/fmshell.hxx>
 #include <svx/fmview.hxx>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
-#include <svx/svxids.hrc>
 #include <vcl/inputctx.hxx>
 
 #include <sfx2/objface.hxx>
 #include <swmodule.hxx>
 #include <unotxvw.hxx>
-#include <swtypes.hxx>
 #include <cmdid.h>
 #include <globals.hrc>
 #include <wrtsh.hxx>
@@ -62,7 +57,6 @@
 #include <wview.hxx>
 #include <wdocsh.hxx>
 
-#include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
 #include <sfx2/viewfac.hxx>
diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index 898ea895c387..a5c1ecbb7299 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -23,21 +23,16 @@
 #include <sfx2/viewfrm.hxx>
 #include <svl/eitem.hxx>
 #include <svl/macitem.hxx>
-#include <svx/svxids.hrc>
 #include <unotools/charclass.hxx>
-#include <editeng/scripttypeitem.hxx>
 #include <sfx2/event.hxx>
 #include <cmdid.h>
 #include <view.hxx>
 #include <basesh.hxx>
 #include <wrtsh.hxx>
 #include <frmatr.hxx>
-#include <initui.hxx>
 #include <mdiexp.hxx>
 #include <fmtcol.hxx>
 #include <frmfmt.hxx>
-#include <swundo.hxx>
-#include <swevent.hxx>
 #include <swdtflvr.hxx>
 #include <doc.hxx>
 #include <wordcountdialog.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index ff196a84aa40..fdb4c56938d7 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -26,10 +26,6 @@
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 
-#include <svx/dialogs.hrc>
-#include <svx/svxids.hrc>
-
-#include <math.h>
 #include <hintids.hxx>
 #include <sot/exchange.hxx>
 #include <svx/hdft.hxx>
@@ -37,18 +33,11 @@
 #include <svl/itemiter.hxx>
 #include <tools/bigint.hxx>
 #include <svtools/insdlg.hxx>
-#include <sfx2/frmdescr.hxx>
 #include <sfx2/ipclient.hxx>
-#include <svtools/ehdl.hxx>
-#include <svtools/soerr.hxx>
-#include <unotools/moduleoptions.hxx>
-#include <editeng/rsiditem.hxx>
-#include <editeng/sizeitem.hxx>
 #include <editeng/formatbreakitem.hxx>
 #include <editeng/svxacorr.hxx>
 #include <editeng/ulspitem.hxx>
 #include <vcl/graph.hxx>
-#include <sfx2/printer.hxx>
 #include <unotools/charclass.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <svx/svxdlg.hxx>
@@ -61,29 +50,23 @@
 #include <fmtpdsc.hxx>
 #include <txtfrm.hxx>
 #include <wdocsh.hxx>
-#include <basesh.hxx>
 #include <swmodule.hxx>
 #include <wrtsh.hxx>
 #include <view.hxx>
-#include <uitool.hxx>
 #include <cmdid.h>
-#include <cfgitems.hxx>
 #include <pagedesc.hxx>
 #include <frmmgr.hxx>
-#include <shellio.hxx>
-#include <uinums.hxx>
 #include <swundo.hxx>
 #include <swcli.hxx>
 #include <poolfmt.hxx>
-#include <wview.hxx>
 #include <edtwin.hxx>
 #include <fmtcol.hxx>
 #include <swtable.hxx>
-#include <caption.hxx>
 #include <viscrs.hxx>
 #include <swdtflvr.hxx>
 #include <doc.hxx>
 #include <IDocumentSettingAccess.hxx>
+#include <SwCapObjType.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <sfx2/request.hxx>
 #include <paratr.hxx>
@@ -91,7 +74,6 @@
 #include <editeng/acorrcfg.hxx>
 #include <IMark.hxx>
 #include <sfx2/bindings.hxx>
-#include <fchrfmt.hxx>
 #include <flyfrm.hxx>
 
 // -> #111827#
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 92169d03d0eb..f36a668dc83a 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -20,39 +20,28 @@
 #include <hintids.hxx>
 #include <svl/macitem.hxx>
 #include <sfx2/frame.hxx>
-#include <svl/urihelper.hxx>
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
-#include <svx/svxids.hrc>
 #include <sfx2/docfile.hxx>
-#include <sfx2/fcontnr.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <sot/exchange.hxx>
 #include <fmtinfmt.hxx>
-#include <frmatr.hxx>
-#include <swtypes.hxx>
 #include <wrtsh.hxx>
 #include <docsh.hxx>
 #include <fldbas.hxx>
 #include <expfld.hxx>
-#include <ddefld.hxx>
 #include <docufld.hxx>
 #include <reffld.hxx>
 #include <swundo.hxx>
 #include <doc.hxx>
-#include <IDocumentUndoRedo.hxx>
-#include <viewopt.hxx>
 #include <frmfmt.hxx>
 #include <fmtfld.hxx>
-#include <swtable.hxx>
-#include <mdiexp.hxx>
 #include <view.hxx>
 #include <swevent.hxx>
-#include <poolfmt.hxx>
 #include <section.hxx>
 #include <navicont.hxx>
-#include <navipi.hxx>
 #include <txtinet.hxx>
 #include <cmdid.h>
 #include <swabstdlg.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtsh3.cxx b/sw/source/uibase/wrtsh/wrtsh3.cxx
index 0a71baae0909..1fd1ce2cddeb 100644
--- a/sw/source/uibase/wrtsh/wrtsh3.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh3.cxx
@@ -19,25 +19,20 @@
 
 #include <svx/svxids.hrc>
 #include <sfx2/app.hxx>
-#include <sfx2/childwin.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/svdmark.hxx>
 #include <svx/svdview.hxx>
-#include <svx/fmglob.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/srchdlg.hxx>
 #include <com/sun/star/form/FormButtonType.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <sfx2/htmlmode.hxx>
 #include <swmodule.hxx>
 #include <wrtsh.hxx>
 #include <view.hxx>
 #include <IMark.hxx>
 #include <doc.hxx>
 
-#include <unomid.h>
-
 using namespace ::com::sun::star;
 
 bool SwWrtShell::MoveBookMark( BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark)
diff --git a/sw/source/uibase/wrtsh/wrtundo.cxx b/sw/source/uibase/wrtsh/wrtundo.cxx
index 2cc9e54ba232..081704835501 100644
--- a/sw/source/uibase/wrtsh/wrtundo.cxx
+++ b/sw/source/uibase/wrtsh/wrtundo.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/app.hxx>
 #include <svl/slstitm.hxx>
 #include <wrtsh.hxx>
 #include <swundo.hxx>