tdf#42949 Fix new IWYU warnings in directory sw

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

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

62 files changed, 27 insertions, 67 deletions

diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index bb135b823c92..fcab21afe6d2 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -81,6 +81,7 @@
 #include <IDocumentFieldsAccess.hxx>
 #include <IDocumentStatistics.hxx>
 #include <IDocumentLayoutAccess.hxx>
+#include <IDocumentRedlineAccess.hxx>
 #include <IDocumentState.hxx>
 #include <shellio.hxx>
 #include <pview.hxx>
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index 53cbe772da6d..55bb11277726 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <memory>
-#include <boost/property_tree/json_parser.hpp>
 
 #include <hintids.hxx>
 #include <sfx2/request.hxx>
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index 2ed9abc97bba..9fc5f70f1d95 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -26,7 +26,6 @@
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 
-#include <tools/mapunit.hxx>
 #include <tools/globname.hxx>
 #include <tools/UnitConversion.hxx>
 #include <itabenum.hxx>
diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx
index 8b4acb3a1824..6a913b8c7b4f 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <cstring>
 #include <osl/diagnose.h>
 #include <o3tl/any.hxx>
 #include <tools/UnitConversion.hxx>
diff --git a/sw/source/uibase/dialog/watermarkdialog.cxx b/sw/source/uibase/dialog/watermarkdialog.cxx
index 88b187e24ab6..71ab0a74046c 100644
--- a/sw/source/uibase/dialog/watermarkdialog.cxx
+++ b/sw/source/uibase/dialog/watermarkdialog.cxx
@@ -20,7 +20,7 @@
 #include <sfx2/watermarkitem.hxx>
 #include <svtools/ctrltool.hxx>
 #include <comphelper/lok.hxx>
-#include <sfx2/lokhelper.hxx>
+#include <sfx2/viewsh.hxx>
 
 #define IS_MOBILE (comphelper::LibreOfficeKit::isActive() && SfxViewShell::Current() && SfxViewShell::Current()->isLOKMobilePhone())
 
diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx b/sw/source/uibase/docvw/FrameControlsManager.cxx
index 9362095e670f..576033398827 100644
--- a/sw/source/uibase/docvw/FrameControlsManager.cxx
+++ b/sw/source/uibase/docvw/FrameControlsManager.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <edtwin.hxx>
+#include <cntfrm.hxx>
 #include <FrameControlsManager.hxx>
 #include <HeaderFooterWin.hxx>
 #include <PageBreakWin.hxx>
@@ -17,7 +18,6 @@
 #include <viewopt.hxx>
 #include <view.hxx>
 #include <wrtsh.hxx>
-#include <txtfrm.hxx>
 #include <OutlineContentVisibilityWin.hxx>
 #include <ndtxt.hxx>
 #include <IDocumentOutlineNodes.hxx>
diff --git a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
index e45a750cc22e..2ebb863b45e0 100644
--- a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
+++ b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
@@ -12,8 +12,6 @@
 #include <view.hxx>
 #include <wrtsh.hxx>
 
-#include <memory>
-
 #include <IDocumentOutlineNodes.hxx>
 #include <txtfrm.hxx>
 #include <ndtxt.hxx>
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index c78a8710af4b..651ae3283df4 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -37,7 +37,6 @@
 #include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx>
-#include <drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
 #include <editeng/formatbreakitem.hxx>
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 67e0c6782943..32ca8139fdc5 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
 
 #include <com/sun/star/i18n/UnicodeScript.hpp>
-#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
 #include <com/sun/star/ui/ContextMenuExecuteEvent.hpp>
 
 #include <vcl/inputctx.hxx>
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index 18003f48bb99..fb7f965838e2 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -47,6 +47,7 @@
 #include <strings.hrc>
 
 #include <IDocumentMarkAccess.hxx>
+#include <IDocumentRedlineAccess.hxx>
 #include <txtfrm.hxx>
 #include <ndtxt.hxx>
 #include <FrameControlsManager.hxx>
diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx
index b874e870e702..0d3d0f1409cc 100644
--- a/sw/source/uibase/inc/HeaderFooterWin.hxx
+++ b/sw/source/uibase/inc/HeaderFooterWin.hxx
@@ -13,7 +13,7 @@
 #include "FrameControl.hxx"
 #include <vcl/builder.hxx>
 #include <vcl/timer.hxx>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 
 /**
  *  Button painter helper class used to paint a runtime button positioned to a writer frame.
diff --git a/sw/source/uibase/inc/chartins.hxx b/sw/source/uibase/inc/chartins.hxx
index d258053ae985..dcac7be0b067 100644
--- a/sw/source/uibase/inc/chartins.hxx
+++ b/sw/source/uibase/inc/chartins.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX
 
 #include <tools/gen.hxx>
+#include <tools/link.hxx>
 #include <com/sun/star/ui/dialogs/DialogClosedEvent.hpp>
 
 namespace vcl { class Window; }
diff --git a/sw/source/uibase/inc/conform.hxx b/sw/source/uibase/inc/conform.hxx
index ec6860d4fee2..1bb113061c29 100644
--- a/sw/source/uibase/inc/conform.hxx
+++ b/sw/source/uibase/inc/conform.hxx
@@ -19,6 +19,7 @@
 #pragma once
 
 #include "drawbase.hxx"
+#include <svx/svdobjkind.hxx>
 
 class ConstFormControl : public SwDrawBase
 {
diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index 05a02a095b90..e6dad0ad57f0 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -22,6 +22,7 @@
 #include "swcont.hxx"
 
 #include <ndarr.hxx>
+#include <tools/long.hxx>
 
 class SwWrtShell;
 class SwContentArr;
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index bf07a8de5232..16db8910a0ad 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -20,6 +20,9 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_CONTTREE_HXX
 
 #include <svl/lstner.hxx>
+#include <vcl/timer.hxx>
+#include <vcl/transfer.hxx>
+#include <vcl/weld.hxx>
 #include <ndarr.hxx>
 #include "swcont.hxx"
 
diff --git a/sw/source/uibase/inc/labrec.hxx b/sw/source/uibase/inc/labrec.hxx
index 3a32734e4a5e..feb7fdf65afc 100644
--- a/sw/source/uibase/inc/labrec.hxx
+++ b/sw/source/uibase/inc/labrec.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_LABREC_HXX
 
 #include <rtl/ustring.hxx>
+#include <tools/long.hxx>
 
 #include <memory>
 #include <vector>
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index b058d65d3e43..66441d322565 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
-#include <tools/long.hxx>
 #include <memory>
 #include <set>
 #include <vector>
diff --git a/sw/source/uibase/inc/navicont.hxx b/sw/source/uibase/inc/navicont.hxx
index b5e02ce75f77..df831f872915 100644
--- a/sw/source/uibase/inc/navicont.hxx
+++ b/sw/source/uibase/inc/navicont.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_NAVICONT_HXX
 
 #include <rtl/ustring.hxx>
+#include <tools/long.hxx>
 
 class SwDocShell;
 class TransferDataContainer;
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 498a8d3da7c5..37eaac2bb9af 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -23,8 +23,6 @@
 #include <svl/lstner.hxx>
 #include <vcl/transfer.hxx>
 #include <sfx2/childwin.hxx>
-#include <sfx2/ctrlitem.hxx>
-#include <sfx2/tbxctrl.hxx>
 #include <sfx2/sidebar/ControllerItem.hxx>
 #include <sfx2/weldutils.hxx>
 #include <sfx2/sidebar/PanelLayout.hxx>
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index d35ce818709f..faf6d65d34b8 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_REDLNDLG_HXX
 #include <swdllapi.h>
 #include "chldwrap.hxx"
+#include <docary.hxx>
 #include <redline.hxx>
 #include <sfx2/sidebar/PanelLayout.hxx>
 #include <sfx2/basedlgs.hxx>
diff --git a/sw/source/uibase/inc/swcont.hxx b/sw/source/uibase/inc/swcont.hxx
index 3d9aa56e53c9..9b8d95d1d637 100644
--- a/sw/source/uibase/inc/swcont.hxx
+++ b/sw/source/uibase/inc/swcont.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_SWCONT_HXX
 
 #include <rtl/ustring.hxx>
+#include <tools/long.hxx>
 #include <vcl/naturalsort.hxx>
 
 class SwContentType;
diff --git a/sw/source/uibase/inc/swtablerep.hxx b/sw/source/uibase/inc/swtablerep.hxx
index 8e86093fae8e..7b04e3dcfffd 100644
--- a/sw/source/uibase/inc/swtablerep.hxx
+++ b/sw/source/uibase/inc/swtablerep.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWTABLEREP_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_SWTABLEREP_HXX
 
-#include <memory>
 #include <swdllapi.h>
 #include <swtypes.hxx>
 
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index 5b9212d9720d..ca3c19239011 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -26,7 +26,6 @@
 #include <strings.hrc>
 #include <comphelper/lok.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
-#include <boost/property_tree/json_parser.hpp>
 
 #define CONTROL_BORDER_WIDTH 1
 
diff --git a/sw/source/uibase/ribbar/conarc.cxx b/sw/source/uibase/ribbar/conarc.cxx
index 03af3b70c05f..8be117f13c99 100644
--- a/sw/source/uibase/ribbar/conarc.cxx
+++ b/sw/source/uibase/ribbar/conarc.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/svdobj.hxx>
 #include <svx/svxids.hrc>
 #include <vcl/event.hxx>
 
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 44dd2f6c1040..41436ab30587 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -25,7 +25,6 @@
 #include <vcl/InterimItemWindow.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <swmodule.hxx>
 #include <view.hxx>
 #include <initui.hxx>
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index f4f7fc9488d1..cce25927afbc 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -44,16 +44,12 @@
 #include <editeng/escapementitem.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/adjustitem.hxx>
-#include <editeng/crossedoutitem.hxx>
-#include <editeng/shdditem.hxx>
 #include <editeng/hyphenzoneitem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <svx/clipfmtitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/slstitm.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/contouritem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <svl/whiter.hxx>
 #include <svl/cjkoptions.hxx>
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 080f3221dd4e..09b6bdbb3a0d 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -21,7 +21,6 @@
 #include <svx/svdotext.hxx>
 #include <svl/whiter.hxx>
 #include <svx/fontwork.hxx>
-#include <sfx2/docfile.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/objface.hxx>
@@ -33,8 +32,6 @@
 #include <textboxhelper.hxx>
 #include <wview.hxx>
 #include <swmodule.hxx>
-#include <doc.hxx>
-#include <docsh.hxx>
 
 #include <svx/svdoashp.hxx>
 #include <svx/xfillit0.hxx>
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 9f754443d68d..6350f2548b2d 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -36,12 +36,9 @@
 #include <editeng/lspcitem.hxx>
 #include <editeng/flstitem.hxx>
 #include <editeng/adjustitem.hxx>
-#include <editeng/crossedoutitem.hxx>
-#include <editeng/shdditem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/colritem.hxx>
-#include <editeng/contouritem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/urlfieldhelper.hxx>
 #include <svx/svdoutl.hxx>
diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx
index 5cd0e1cc58a0..c3aa1c980505 100644
--- a/sw/source/uibase/shells/grfshex.cxx
+++ b/sw/source/uibase/shells/grfshex.cxx
@@ -25,7 +25,6 @@
 #include <IDocumentDrawModelAccess.hxx>
 #include <docsh.hxx>
 #include <svx/svdomedia.hxx>
-#include <sfx2/filedlghelper.hxx>
 
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx
index 1be26660c34c..ac328ded6f7c 100644
--- a/sw/source/uibase/shells/langhelper.cxx
+++ b/sw/source/uibase/shells/langhelper.cxx
@@ -49,7 +49,6 @@
 #include <viewopt.hxx>
 
 #include <langhelper.hxx>
-#include <memory>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/uibase/shells/slotadd.cxx b/sw/source/uibase/shells/slotadd.cxx
index 76de1a6dc986..06a134b22424 100644
--- a/sw/source/uibase/shells/slotadd.cxx
+++ b/sw/source/uibase/shells/slotadd.cxx
@@ -77,7 +77,6 @@
 #include <editeng/sizeitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <svx/sdmetitm.hxx>
-#include <svx/sdooitm.hxx>
 #include <svx/sdprcitm.hxx>
 #include <svx/xlnstit.hxx>
 #include <svx/xlnedit.hxx>
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 9eaa2241e339..a25de40e60ec 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -23,7 +23,6 @@
 #include <IDocumentFieldsAccess.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/lnkbase.hxx>
-#include <fmtfld.hxx>
 #include <txtfld.hxx>
 #include <svl/itempool.hxx>
 #include <tools/lineend.hxx>
@@ -55,6 +54,7 @@
 #include <swmodule.hxx>
 #include <xmloff/odffields.hxx>
 #include <IDocumentContentOperations.hxx>
+#include <IDocumentRedlineAccess.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index b7d3d60f2d97..b7741c6fac44 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -99,8 +99,6 @@
 #include <xmloff/odffields.hxx>
 #include <bookmrk.hxx>
 #include <linguistic/misc.hxx>
-#include <editeng/splwrap.hxx>
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
 using namespace ::com::sun::star;
 using namespace com::sun::star::beans;
diff --git a/sw/source/uibase/sidebar/PageColumnPopup.cxx b/sw/source/uibase/sidebar/PageColumnPopup.cxx
index e0fcd0d055c5..d44a896a3909 100644
--- a/sw/source/uibase/sidebar/PageColumnPopup.cxx
+++ b/sw/source/uibase/sidebar/PageColumnPopup.cxx
@@ -18,7 +18,6 @@
  */
 #include <PageColumnPopup.hxx>
 #include "PageColumnControl.hxx"
-#include <svl/intitem.hxx>
 #include <vcl/toolbox.hxx>
 
 PageColumnPopup::PageColumnPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext)
diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx
index f7efb76a0d09..4ecd03f65883 100644
--- a/sw/source/uibase/sidebar/PageFooterPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx
@@ -22,6 +22,8 @@
 #include <svx/dlgutil.hxx>
 #include <svx/rulritem.hxx>
 #include <svx/svdtrans.hxx>
+#include <svx/spacinglistbox.hxx>
+#include <svx/samecontentlistbox.hxx>
 #include "PageFooterPanel.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sw/source/uibase/sidebar/PageFooterPanel.hxx b/sw/source/uibase/sidebar/PageFooterPanel.hxx
index 849a3165d474..507431b9f3b7 100644
--- a/sw/source/uibase/sidebar/PageFooterPanel.hxx
+++ b/sw/source/uibase/sidebar/PageFooterPanel.hxx
@@ -31,8 +31,6 @@
 #include <svl/intitem.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/eitem.hxx>
-#include <svx/spacinglistbox.hxx>
-#include <svx/samecontentlistbox.hxx>
 
 namespace sw::sidebar {
 
diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
index a81d07a29225..70e3f03c97c3 100644
--- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx
+++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
@@ -22,6 +22,8 @@
 #include <svx/dlgutil.hxx>
 #include <svx/rulritem.hxx>
 #include <svx/svdtrans.hxx>
+#include <svx/spacinglistbox.hxx>
+#include <svx/samecontentlistbox.hxx>
 #include "PageHeaderPanel.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.hxx b/sw/source/uibase/sidebar/PageHeaderPanel.hxx
index 251ff3a474dc..53ccfba67d06 100644
--- a/sw/source/uibase/sidebar/PageHeaderPanel.hxx
+++ b/sw/source/uibase/sidebar/PageHeaderPanel.hxx
@@ -31,8 +31,6 @@
 #include <svl/intitem.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/eitem.hxx>
-#include <svx/spacinglistbox.hxx>
-#include <svx/samecontentlistbox.hxx>
 
 namespace sw::sidebar {
 
diff --git a/sw/source/uibase/sidebar/PageMarginUtils.hxx b/sw/source/uibase/sidebar/PageMarginUtils.hxx
index cdef6eb7e687..ce7d5f65ee70 100644
--- a/sw/source/uibase/sidebar/PageMarginUtils.hxx
+++ b/sw/source/uibase/sidebar/PageMarginUtils.hxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <cmath>
+#include <tools/long.hxx>
+
 #define SWPAGE_NO_MARGIN       0
 #define SWPAGE_NARROW_VALUE    720
 #define SWPAGE_MODERATE_LR     1080
diff --git a/sw/source/uibase/sidebar/PageOrientationPopup.cxx b/sw/source/uibase/sidebar/PageOrientationPopup.cxx
index e25090a7a9fb..d792ca10bb5a 100644
--- a/sw/source/uibase/sidebar/PageOrientationPopup.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationPopup.cxx
@@ -18,7 +18,6 @@
  */
 #include <PageOrientationPopup.hxx>
 #include "PageOrientationControl.hxx"
-#include <svx/pageitem.hxx>
 #include <vcl/toolbox.hxx>
 
 PageOrientationPopup::PageOrientationPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext)
diff --git a/sw/source/uibase/sidebar/PageSizePopup.cxx b/sw/source/uibase/sidebar/PageSizePopup.cxx
index 1d1f26c8aa11..3fbc3dd80ee4 100644
--- a/sw/source/uibase/sidebar/PageSizePopup.cxx
+++ b/sw/source/uibase/sidebar/PageSizePopup.cxx
@@ -18,7 +18,6 @@
  */
 #include <PageSizePopup.hxx>
 #include "PageSizeControl.hxx"
-#include <editeng/sizeitem.hxx>
 #include <vcl/toolbox.hxx>
 
 PageSizePopup::PageSizePopup(const css::uno::Reference<css::uno::XComponentContext>& rContext)
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx
index 1815466c1df9..9744cf6553db 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.cxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx
@@ -25,6 +25,7 @@
 #include <svx/xflgrit.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/xbtmpit.hxx>
+#include <svx/itemwin.hxx>
 #include <svx/SvxNumOptionsTabPageHelper.hxx>
 #include "PageStylesPanel.hxx"
 #include <sfx2/dispatch.hxx>
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx b/sw/source/uibase/sidebar/PageStylesPanel.hxx
index 7e3c09d2eebb..d2912b8e61f3 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.hxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx
@@ -34,7 +34,6 @@
 #include <svx/xflclit.hxx>
 #include <svx/xflgrit.hxx>
 #include <svx/xflhtit.hxx>
-#include <svx/itemwin.hxx>
 #include <svx/pagenumberlistbox.hxx>
 
 class List;
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index 68e5c0684d6a..db9e6f29458a 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -35,6 +35,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <comphelper/namedvaluecollection.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx b/sw/source/uibase/sidebar/TableEditPanel.cxx
index de053ddaa837..3fef04c92e30 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -15,7 +15,6 @@
 #include <svl/intitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/unitconv.hxx>
 #include <svx/dlgctrl.hxx>
 #include <swmodule.hxx>
 #include <usrpref.hxx>
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index bc64fd8b7724..567a5daaf699 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -19,21 +19,17 @@
 
 #include "WrapPropertyPanel.hxx"
 
-#include <cmdid.h>
+#include <editeng/editids.hrc>
 #include <svx/spacinglistbox.hxx>
 #include <svx/svdtrans.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svl/eitem.hxx>
-#include <vcl/commandinfoprovider.hxx>
-#include <vcl/settings.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <hintids.hxx>
 #include <strings.hrc>
 #include <uitool.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <comphelper/lok.hxx>
 
 namespace sw::sidebar {
 
diff --git a/sw/source/uibase/sidebar/WriterInspectorTextPanel.hxx b/sw/source/uibase/sidebar/WriterInspectorTextPanel.hxx
index 5fd3402af222..ac42fe3bf762 100644
--- a/sw/source/uibase/sidebar/WriterInspectorTextPanel.hxx
+++ b/sw/source/uibase/sidebar/WriterInspectorTextPanel.hxx
@@ -18,7 +18,6 @@
  */
 #pragma once
 
-#include <sfx2/weldutils.hxx>
 #include <svx/sidebar/InspectorTextPanel.hxx>
 
 class SwWrtShell;
diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx
index dba654611592..f2d78c2bf1fb 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -19,7 +19,6 @@
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
-#include <IDocumentUndoRedo.hxx>
 #include <IDocumentChartDataProviderAccess.hxx>
 
 #include <swmodule.hxx>
@@ -47,7 +46,6 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/uibase/table/swtablerep.cxx b/sw/source/uibase/table/swtablerep.cxx
index 4eac6343b58d..44a87df90bc1 100644
--- a/sw/source/uibase/table/swtablerep.cxx
+++ b/sw/source/uibase/table/swtablerep.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <tabcol.hxx>
-#include "tablepg.hxx"
 
 #include <swtablerep.hxx>
 #include <memory>
diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx
index 7fc050f83803..25f561e87687 100644
--- a/sw/source/uibase/table/tablemgr.cxx
+++ b/sw/source/uibase/table/tablemgr.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/embed/EmbedVerbs.hpp>
-#include <com/sun/star/embed/XComponentSupplier.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 
 #include <comphelper/classids.hxx>
diff --git a/sw/source/uibase/uitest/uiobject.cxx b/sw/source/uibase/uitest/uiobject.cxx
index 867083edb6e2..9c63c568a490 100644
--- a/sw/source/uibase/uitest/uiobject.cxx
+++ b/sw/source/uibase/uitest/uiobject.cxx
@@ -18,7 +18,6 @@
 #include <sfx2/viewfrm.hxx>
 
 #include <AnnotationWin.hxx>
-#include <comphelper/string.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
 
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 6709689e556b..587e4f5edcd7 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -33,7 +33,6 @@
 #include <svl/undo.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>
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index bf6804075822..1071ed43501f 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -80,6 +80,7 @@
 #include <doc.hxx>
 #include <printdata.hxx>
 #include <IDocumentDeviceAccess.hxx>
+#include <IDocumentRedlineAccess.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentDrawModelAccess.hxx>
@@ -125,7 +126,6 @@
 #include <docstat.hxx>
 #include <wordcountdialog.hxx>
 #include <sfx2/sidebar/Sidebar.hxx>
-#include <sfx2/sidebar/SidebarController.hxx>
 
 #include <vcl/GraphicNativeTransform.hxx>
 #include <vcl/GraphicNativeMetadata.hxx>
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 578d02f296d4..66d8dfd60a3f 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -35,7 +35,6 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
 #include <svx/srchdlg.hxx>
-#include <edtwin.hxx>
 #include <swmodule.hxx>
 #include <swwait.hxx>
 #include <workctrl.hxx>
diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx
index 1e501d3d02b7..961053559eba 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -52,7 +52,6 @@
 
 #include <cmdid.h>
 #include <IDocumentRedlineAccess.hxx>
-#include <IDocumentState.hxx>
 
 #include <doc.hxx>
 
diff --git a/sw/source/uibase/uno/unodoc.cxx b/sw/source/uibase/uno/unodoc.cxx
index d9a6928e2e46..2f0c95ee7c4b 100644
--- a/sw/source/uibase/uno/unodoc.cxx
+++ b/sw/source/uibase/uno/unodoc.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 #include <config_features.h>
 
-#include <com/sun/star/frame/XModel.hpp>
 #include <sfx2/sfxmodelfactory.hxx>
 #include <swdll.hxx>
 #include <docsh.hxx>
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index bd56d0c7dcb4..d3f70fb77a0b 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <boost/property_tree/json_parser.hpp>
-
 #include <sal/config.h>
 #include <officecfg/Office/Common.hxx>
 #include <comphelper/string.hxx>
diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx
index 334417377106..53239a1d6a3a 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -21,7 +21,7 @@
 #include <svl/itemiter.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/GraphicObject.hxx>
+#include <vcl/GraphicAttributes.hxx>
 
 #include <editeng/itemtype.hxx>
 #include <editeng/eerdll.hxx>
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index dfaa0b123096..df5e5270fc63 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -29,8 +29,6 @@
 #include <o3tl/enumrange.hxx>
 #include <o3tl/sorted_vector.hxx>
 #include <vcl/commandevent.hxx>
-#include <vcl/help.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/weldutils.hxx>
 #include <sot/formats.hxx>
 #include <uiitems.hxx>
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 925753c35345..b550b0058000 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -27,11 +27,9 @@
 #include <sfx2/docfilt.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
-#include <vcl/help.hxx>
 #include <sot/filelist.hxx>
 #include <svl/eitem.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <vcl/settings.hxx>
 
 #include <sfx2/docinsert.hxx>
 #include <sfx2/filedlghelper.hxx>
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index e5e139cba20f..3ce2de5d4937 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -35,7 +35,6 @@
 #include <wrtsh.hxx>
 #include <docsh.hxx>
 #include <navipi.hxx>
-#include <workctrl.hxx>
 #include <edtwin.hxx>
 #include <sfx2/app.hxx>
 #include <cmdid.h>
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 93cd532781ff..c179383bd28a 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
 #include <svl/macitem.hxx>
 #include <sfx2/frame.hxx>
 #include <svl/eitem.hxx>