From 96e3a64125354b61ecd43f7a76e6189e69968912 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemeng@ubuntu.com>
Date: Wed, 23 Feb 2022 01:08:14 +0100
Subject: Recheck modules sv* with IWYU

See tdf#42949 for motivation

Change-Id: I25779cbfb1aa93c31d6e12ac95e136b3bdbbc058
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130403
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 svx/IwyuFilter_svx.yaml                                   |  9 +++++++++
 svx/inc/fieldunit.hrc                                     |  1 +
 svx/inc/fmstring.hrc                                      |  2 ++
 svx/inc/formnavi.hrc                                      |  2 ++
 svx/inc/frmsel.hrc                                        |  1 +
 svx/inc/numberingtype.hrc                                 |  2 ++
 svx/inc/rotationstrings.hrc                               |  2 ++
 svx/inc/samecontent.hrc                                   |  2 ++
 svx/inc/sdr/primitive2d/primitivefactory2d.hxx            |  7 +------
 svx/inc/spacing.hrc                                       |  2 ++
 svx/inc/swframeposstrings.hrc                             |  2 ++
 svx/inc/tabwin.hrc                                        |  2 ++
 svx/inc/tbxcolorupdate.hxx                                |  1 +
 svx/inc/textchaincursor.hxx                               |  2 ++
 svx/inc/txenctab.hrc                                      |  1 +
 svx/qa/unit/customshapes.cxx                              |  1 -
 svx/qa/unit/removewhichrange.cxx                          |  1 -
 svx/source/accessibility/AccessibleControlShape.cxx       |  1 -
 svx/source/accessibility/GraphCtlAccessibleContext.cxx    |  1 -
 svx/source/accessibility/ShapeTypeHandler.cxx             |  1 -
 svx/source/accessibility/lookupcolorname.hxx              |  1 +
 svx/source/core/graphichelper.cxx                         |  2 --
 svx/source/customshapes/EnhancedCustomShape3d.cxx         |  2 ++
 svx/source/customshapes/EnhancedCustomShape3d.hxx         |  6 ------
 svx/source/customshapes/EnhancedCustomShapeEngine.cxx     |  1 -
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx   |  1 -
 svx/source/customshapes/EnhancedCustomShapeHandle.cxx     |  1 -
 svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx  |  2 --
 svx/source/dialog/SafeModeDialog.cxx                      |  4 ----
 svx/source/dialog/SafeModeUI.cxx                          |  1 -
 svx/source/dialog/ctredlin.cxx                            |  2 --
 svx/source/dialog/dlgctl3d.cxx                            |  1 -
 svx/source/dialog/docrecovery.cxx                         |  2 +-
 svx/source/dialog/fntctrl.cxx                             |  1 -
 svx/source/dialog/frmsel.cxx                              |  2 --
 svx/source/dialog/imapdlg.cxx                             |  1 -
 svx/source/dialog/page.hrc                                |  1 +
 svx/source/dialog/svxruler.cxx                            |  1 -
 svx/source/engine3d/cube3d.cxx                            |  1 -
 svx/source/engine3d/extrud3d.cxx                          |  1 -
 svx/source/engine3d/lathe3d.cxx                           |  1 -
 svx/source/engine3d/obj3d.cxx                             |  1 -
 svx/source/engine3d/scene3d.cxx                           |  2 --
 svx/source/engine3d/sphere3d.cxx                          |  1 -
 svx/source/fmcomp/fmgridcl.cxx                            |  1 -
 svx/source/fmcomp/gridcell.cxx                            |  2 +-
 svx/source/form/datanavi.cxx                              |  1 -
 svx/source/form/filtnav.cxx                               |  1 -
 svx/source/form/fmdmod.cxx                                |  2 --
 svx/source/form/fmtextcontrolshell.cxx                    |  1 -
 svx/source/form/fmtools.cxx                               |  3 ---
 svx/source/form/fmundo.cxx                                |  1 -
 svx/source/gallery2/galobj.cxx                            |  1 -
 svx/source/inc/StylesPreviewWindow.hxx                    |  1 -
 svx/source/inc/fmurl.hxx                                  |  2 ++
 svx/source/inc/formcontrolfactory.hxx                     |  1 -
 svx/source/inc/gridcell.hxx                               |  1 -
 svx/source/sdr/contact/viewcontactofe3dcube.cxx           |  1 -
 svx/source/sdr/contact/viewcontactofe3dextrude.cxx        |  1 -
 svx/source/sdr/contact/viewcontactofe3dlathe.cxx          |  1 -
 svx/source/sdr/contact/viewcontactofe3dpolygon.cxx        |  1 -
 svx/source/sdr/contact/viewcontactofe3dsphere.cxx         |  1 -
 svx/source/sdr/primitive2d/primitivefactory2d.cxx         |  5 +++++
 svx/source/sdr/properties/groupproperties.cxx             |  3 ---
 svx/source/sdr/properties/pageproperties.cxx              |  1 -
 svx/source/sdr/properties/properties.cxx                  |  1 -
 svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx |  1 -
 svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx     | 15 +++------------
 svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx     |  1 -
 svx/source/sidebar/inspector/InspectorTextPanel.cxx       |  2 --
 svx/source/sidebar/line/LinePropertyPanelBase.cxx         |  1 -
 .../sidebar/textcolumns/TextColumnsPropertyPanel.cxx      |  2 --
 svx/source/styles/ColorSets.cxx                           |  2 --
 svx/source/svdraw/MediaShellHelpers.cxx                   |  2 --
 svx/source/svdraw/charthelper.cxx                         |  3 ---
 svx/source/svdraw/svdetc.cxx                              |  1 -
 svx/source/svdraw/svdmodel.cxx                            |  1 -
 svx/source/svdraw/svdmrkv.cxx                             |  2 --
 svx/source/svdraw/svdoashp.cxx                            |  1 -
 svx/source/svdraw/svdobj.cxx                              |  1 -
 svx/source/svdraw/svdocapt.cxx                            |  1 -
 svx/source/svdraw/svdoedge.cxx                            |  1 -
 svx/source/svdraw/svdogrp.cxx                             |  1 -
 svx/source/svdraw/svdomeas.cxx                            |  1 -
 svx/source/svdraw/svdomedia.cxx                           |  1 -
 svx/source/svdraw/svdopage.cxx                            |  1 -
 svx/source/svdraw/svdopath.cxx                            |  1 -
 svx/source/svdraw/svdorect.cxx                            |  1 -
 svx/source/svdraw/svdotextpathdecomposition.cxx           |  3 +--
 svx/source/svdraw/svdouno.cxx                             |  1 -
 svx/source/svdraw/svdovirt.cxx                            |  1 -
 svx/source/svdraw/svdpage.cxx                             |  2 --
 svx/source/table/svdotable.cxx                            |  2 --
 svx/source/table/tablecontroller.cxx                      |  1 -
 svx/source/table/tabledesign.cxx                          |  1 -
 svx/source/table/tablertfexporter.cxx                     |  1 -
 svx/source/tbxctrls/StylesPreviewWindow.cxx               |  3 ---
 svx/source/tbxctrls/extrusioncontrols.cxx                 |  2 --
 svx/source/tbxctrls/fillctrl.cxx                          |  1 -
 svx/source/tbxctrls/fontworkgallery.cxx                   |  1 -
 svx/source/tbxctrls/tbunocontroller.cxx                   |  1 -
 svx/source/tbxctrls/verttexttbxctrl.cxx                   |  1 -
 svx/source/unodraw/UnoGraphicExporter.cxx                 |  1 -
 svx/source/unodraw/shapepropertynotifier.cxx              |  3 ---
 svx/source/unodraw/unomod.cxx                             |  1 -
 svx/source/unodraw/unoprov.cxx                            |  1 -
 svx/source/unodraw/unoshape.cxx                           |  1 -
 svx/source/xml/xmleohlp.cxx                               |  1 -
 svx/source/xoutdev/xattrbmp.cxx                           |  1 -
 svx/source/xoutdev/xtabdash.cxx                           |  2 +-
 110 files changed, 50 insertions(+), 140 deletions(-)

(limited to 'svx')

diff --git a/svx/IwyuFilter_svx.yaml b/svx/IwyuFilter_svx.yaml
index 6263acd7308d..4929d9a2ce7d 100644
--- a/svx/IwyuFilter_svx.yaml
+++ b/svx/IwyuFilter_svx.yaml
@@ -26,6 +26,9 @@ excludelist:
     # Actually used
     - com/sun/star/sdbc/XConnection.hpp
     - com/sun/star/beans/XPropertySet.hpp
+    svx/source/fmcomp/gridcell.cxx:
+    # Needed to avoid mysterious linking error on WIN32 no-pch
+    - toolkit/helper/listenermultiplexer.hxx
     svx/source/gallery2/gallerybinaryengine.cxx:
     # Don't propose hxx -> h change in URE libs
     - osl/thread.hxx
@@ -121,6 +124,12 @@ excludelist:
     svx/source/table/accessibletableshape.cxx:
     # Actually used
     - com/sun/star/drawing/XShape.hpp
+    svx/source/table/tablecolumns.cxx:
+    # Complete type is needed for template class
+    - tablecolumn.hxx
+    svx/source/tbxctrls/tbunocontroller.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
     svx/source/unodraw/recoveryui.cxx:
     # Needed for LIBO_ETC_FOLDER on WIN32
     - config_folders.h
diff --git a/svx/inc/fieldunit.hrc b/svx/inc/fieldunit.hrc
index 28c160c7fcf0..7de4c1cd7420 100644
--- a/svx/inc/fieldunit.hrc
+++ b/svx/inc/fieldunit.hrc
@@ -22,6 +22,7 @@
 
 #include <tools/fldunit.hxx>
 #include <utility>
+#include <unotools/resmgr.hxx>
 
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
 
diff --git a/svx/inc/fmstring.hrc b/svx/inc/fmstring.hrc
index 08f78b7f2cc3..01919405bb91 100644
--- a/svx/inc/fmstring.hrc
+++ b/svx/inc/fmstring.hrc
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SVX_INC_FMSTRING_HRC
 #define INCLUDED_SVX_INC_FMSTRING_HRC
 
+#include <unotools/resmgr.hxx>
+
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
 
 const TranslateId RID_RSC_SQL_INTERNATIONAL[] =
diff --git a/svx/inc/formnavi.hrc b/svx/inc/formnavi.hrc
index 3326bc69517c..8af02811768c 100644
--- a/svx/inc/formnavi.hrc
+++ b/svx/inc/formnavi.hrc
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SVX_INC_FRMSEL_HRC
 #define INCLUDED_SVX_INC_FRMSEL_HRC
 
+#include <unotools/resmgr.hxx>
+
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
 
 const TranslateId RID_SVXSW_CONVERTMENU[] =
diff --git a/svx/inc/frmsel.hrc b/svx/inc/frmsel.hrc
index 147d4fa9cb08..84fe78a23af2 100644
--- a/svx/inc/frmsel.hrc
+++ b/svx/inc/frmsel.hrc
@@ -22,6 +22,7 @@
 
 #include <utility>
 #include <sal/types.h>
+#include <unotools/resmgr.hxx>
 
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
 
diff --git a/svx/inc/numberingtype.hrc b/svx/inc/numberingtype.hrc
index b66c86d35459..4e2ab1f6d886 100644
--- a/svx/inc/numberingtype.hrc
+++ b/svx/inc/numberingtype.hrc
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SVX_INC_NUMBERINGTYPE_HRC
 #define INCLUDED_SVX_INC_NUMBERINGTYPE_HRC
 
+#include <unotools/resmgr.hxx>
+
 #include <utility>
 
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
diff --git a/svx/inc/rotationstrings.hrc b/svx/inc/rotationstrings.hrc
index bb9a81c6b68b..c4e8d28795eb 100644
--- a/svx/inc/rotationstrings.hrc
+++ b/svx/inc/rotationstrings.hrc
@@ -10,6 +10,8 @@
 #ifndef INCLUDED_SVX_INC_ROTATIONSTRINGS_HRC
 #define INCLUDED_SVX_INC_ROTATIONSTRINGS_HRC
 
+#include <unotools/resmgr.hxx>
+
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
 
 const TranslateId RID_SVXITEMS_ROTATE_MODE[] =
diff --git a/svx/inc/samecontent.hrc b/svx/inc/samecontent.hrc
index 99ff7a37c040..bb3afa49906c 100644
--- a/svx/inc/samecontent.hrc
+++ b/svx/inc/samecontent.hrc
@@ -9,6 +9,8 @@
 #ifndef INCLUDED_SVX_INC_SPACING_HRC
 #define INCLUDED_SVX_INC_SPACING_HRC
 
+#include <unotools/resmgr.hxx>
+
 #include <utility>
 
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
diff --git a/svx/inc/sdr/primitive2d/primitivefactory2d.hxx b/svx/inc/sdr/primitive2d/primitivefactory2d.hxx
index 1fa65d52e01a..ffe099e609ef 100644
--- a/svx/inc/sdr/primitive2d/primitivefactory2d.hxx
+++ b/svx/inc/sdr/primitive2d/primitivefactory2d.hxx
@@ -18,16 +18,11 @@
  */
 #pragma once
 
+#include <drawinglayer/primitive2d/Primitive2DVisitor.hxx>
 #include <com/sun/star/graphic/XPrimitiveFactory2D.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <comphelper/compbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <svx/svdobj.hxx>
-#include <svx/svdpage.hxx>
-#include <svx/unoapi.hxx>
-#include <svx/sdr/contact/viewcontact.hxx>
-#include <comphelper/sequence.hxx>
 
 typedef comphelper::WeakComponentImplHelper<css::graphic::XPrimitiveFactory2D,
                                             css::lang::XServiceInfo>
diff --git a/svx/inc/spacing.hrc b/svx/inc/spacing.hrc
index 280e534b4896..1719d215dfff 100644
--- a/svx/inc/spacing.hrc
+++ b/svx/inc/spacing.hrc
@@ -9,6 +9,8 @@
 #ifndef INCLUDED_SVX_INC_SPACING_HRC
 #define INCLUDED_SVX_INC_SPACING_HRC
 
+#include <unotools/resmgr.hxx>
+
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
 
 struct measurement
diff --git a/svx/inc/swframeposstrings.hrc b/svx/inc/swframeposstrings.hrc
index b89608350e32..57e149f6b908 100644
--- a/svx/inc/swframeposstrings.hrc
+++ b/svx/inc/swframeposstrings.hrc
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SVX_INC_SWFRAMEPOSSTRINGS_HRC
 #define INCLUDED_SVX_INC_SWFRAMEPOSSTRINGS_HRC
 
+#include <unotools/resmgr.hxx>
+
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
 
 //the following string have to match the (enum values) positions in svx/swframeposstrings.hxx!
diff --git a/svx/inc/tabwin.hrc b/svx/inc/tabwin.hrc
index dd609a5bcb58..fbfda4ff9f8c 100644
--- a/svx/inc/tabwin.hrc
+++ b/svx/inc/tabwin.hrc
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SVX_INC_TABWIN_HRC
 #define INCLUDED_SVX_INC_TABWIN_HRC
 
+#include <unotools/resmgr.hxx>
+
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
 
 const TranslateId RID_RSC_TABWIN_PREFIX[] =
diff --git a/svx/inc/tbxcolorupdate.hxx b/svx/inc/tbxcolorupdate.hxx
index 9a7377557744..5c6c7ddc1fba 100644
--- a/svx/inc/tbxcolorupdate.hxx
+++ b/svx/inc/tbxcolorupdate.hxx
@@ -23,6 +23,7 @@
 #include <tools/color.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/vclptr.hxx>
+#include <vcl/toolbox.hxx>
 #include <vcl/toolboxid.hxx>
 #include <svx/Palette.hxx>
 #include <com/sun/star/drawing/LineStyle.hpp>
diff --git a/svx/inc/textchaincursor.hxx b/svx/inc/textchaincursor.hxx
index 84171ab56167..30399207a77e 100644
--- a/svx/inc/textchaincursor.hxx
+++ b/svx/inc/textchaincursor.hxx
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <sal/types.h>
+
 class SdrObjEditView;
 class SdrTextObj;
 class KeyEvent;
diff --git a/svx/inc/txenctab.hrc b/svx/inc/txenctab.hrc
index e140015a7eb3..dc3e7ef6c4c5 100644
--- a/svx/inc/txenctab.hrc
+++ b/svx/inc/txenctab.hrc
@@ -21,6 +21,7 @@
 #define INCLUDED_SVX_INC_TXENCTAB_HRC
 
 #include <rtl/textenc.h>
+#include <unotools/resmgr.hxx>
 #include <utility>
 
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx
index bfec1f0141cf..d4ddca038f1f 100644
--- a/svx/qa/unit/customshapes.cxx
+++ b/svx/qa/unit/customshapes.cxx
@@ -30,7 +30,6 @@
 #include <svx/svdopath.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svxids.hrc>
-#include <svx/unoapi.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/tempfile.hxx>
 #include <vcl/filter/PngImageReader.hxx>
diff --git a/svx/qa/unit/removewhichrange.cxx b/svx/qa/unit/removewhichrange.cxx
index 7ea534aab96a..d5856f6c70e9 100644
--- a/svx/qa/unit/removewhichrange.cxx
+++ b/svx/qa/unit/removewhichrange.cxx
@@ -16,7 +16,6 @@
 
 #include <sal/types.h>
 #include <svx/svdetc.hxx>
-#include <svl/itemset.hxx>
 
 namespace
 {
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 79abed1a0d1a..fb759ee57434 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -37,7 +37,6 @@
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <svx/IAccessibleParent.hxx>
 #include <svx/svdouno.hxx>
-#include <svx/unoapi.hxx>
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxShapeTypes.hxx>
 #include <comphelper/accessiblewrapper.hxx>
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 989be9e6d189..60aebc19158a 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -27,7 +27,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/window.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/mutex.hxx>
 #include <tools/gen.hxx>
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 1a485b503772..1b169c761a3e 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -25,7 +25,6 @@
 #include <svx/AccessibleShape.hxx>
 #include <svx/dialmgr.hxx>
 
-#include <svx/unoshape.hxx>
 #include <svx/svdoashp.hxx>
 
 #include <svx/strings.hrc>
diff --git a/svx/source/accessibility/lookupcolorname.hxx b/svx/source/accessibility/lookupcolorname.hxx
index 2dc31ff92b2e..0d752c0fab43 100644
--- a/svx/source/accessibility/lookupcolorname.hxx
+++ b/svx/source/accessibility/lookupcolorname.hxx
@@ -23,6 +23,7 @@
 #include <sal/config.h>
 
 #include <rtl/ustring.hxx>
+#include <tools/long.hxx>
 
 namespace accessibility
 {
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index f62b5db08eaa..d297e101fa20 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <unotools/pathoptions.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -51,7 +50,6 @@
 
 #include <map>
 
-#include <sfx2/objsh.hxx>
 #include <unotools/streamwrap.hxx>
 
 using namespace css::uno;
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 92ce3437228f..00a59ebf5a66 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -46,7 +46,9 @@
 #include <svx/sdr/properties/properties.hxx>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeMetalType.hpp>
+#include <com/sun/star/drawing/ProjectionMode.hpp>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/polygon/b3dpolygon.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <sdr/primitive2d/sdrattributecreator.hxx>
 #include <drawinglayer/attribute/sdrlineattribute.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx
index 106edff9becd..77e7d350f470 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx
@@ -20,12 +20,6 @@
 #ifndef INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPE3D_HXX
 #define INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPE3D_HXX
 
-#include <com/sun/star/drawing/ProjectionMode.hpp>
-#include <basegfx/point/b3dpoint.hxx>
-#include <basegfx/polygon/b3dpolygon.hxx>
-
-#include <tools/gen.hxx>
-
 class SdrObject;
 class SdrObjCustomShape;
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 83f6c512ce85..ae919904a818 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -31,7 +31,6 @@
 #include "EnhancedCustomShapeHandle.hxx"
 #include <svx/unoshape.hxx>
 #include <svx/unopage.hxx>
-#include <svx/unoapi.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svdogrp.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 3dbfc06be1a4..f1cb1f7290b1 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -41,7 +41,6 @@
 #include <vector>
 #include <numeric>
 #include <algorithm>
-#include <memory>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/i18n/BreakIterator.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
index d2d5c8df6b5b..8dce09c1ca1b 100644
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
@@ -19,7 +19,6 @@
 
 #include "EnhancedCustomShapeHandle.hxx"
 #include <svx/EnhancedCustomShape2d.hxx>
-#include <svx/unoapi.hxx>
 #include <svx/svdoashp.hxx>
 
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index 0a1ae13c61e9..70c15ca66f6d 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -18,9 +18,7 @@
  */
 
 #include <svx/EnhancedCustomShapeTypeNames.hxx>
-#include <osl/mutex.hxx>
 #include <unordered_map>
-#include <memory>
 
 namespace {
 
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx
index ba39fa14ed7d..beb530030f03 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -11,7 +11,6 @@
 
 #include <osl/file.hxx>
 #include <sfx2/safemode.hxx>
-#include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <comphelper/processfactory.hxx>
@@ -23,9 +22,6 @@
 
 #include <com/sun/star/task/OfficeRestartManager.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
-#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-#include <com/sun/star/system/SystemShellExecute.hpp>
 
 using namespace css;
 
diff --git a/svx/source/dialog/SafeModeUI.cxx b/svx/source/dialog/SafeModeUI.cxx
index d6ab6e5c86a3..4e32669f0278 100644
--- a/svx/source/dialog/SafeModeUI.cxx
+++ b/svx/source/dialog/SafeModeUI.cxx
@@ -14,7 +14,6 @@
 #include <cppuhelper/supportsservice.hxx>
 
 #include <vcl/svapp.hxx>
-#include <vcl/window.hxx>
 
 #include "SafeModeDialog.hxx"
 
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 8daf9fefaab4..7e080fa4a054 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -30,8 +30,6 @@
 #include <helpids.h>
 
 #include <svx/ctredlin.hxx>
-#include <svx/dialmgr.hxx>
-#include <svx/strings.hrc>
 
 #define WRITER_DATE     2
 #define CALC_DATE       3
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 3f55e04425f4..1231e1d4eedf 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <svx/def3d.hxx>
 #include <svx/dlgctl3d.hxx>
 #include <svx/strings.hrc>
 #include <svx/view3d.hxx>
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index e950a060bd61..181d27b4f006 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/theAutoRecovery.hpp>
-#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
+#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <osl/file.hxx>
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index af3231432864..58b412f1e822 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -43,7 +43,6 @@
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
 #include <svl/stritem.hxx>
-#include <svl/languageoptions.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
 
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index f7d470896cc5..d2c67d75f970 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -30,7 +30,6 @@
 
 #include <algorithm>
 #include <math.h>
-#include <string_view>
 
 #include <frmselimpl.hxx>
 #include <AccessibleFrameSelector.hxx>
@@ -40,7 +39,6 @@
 #include <vcl/svapp.hxx>
 #include <drawinglayer/processor2d/processor2dtools.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
-#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 
 #include <bitmaps.hlst>
 
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 7a462449a4a2..2eda3129b1c7 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -21,7 +21,6 @@
 #include <tools/urlobj.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <svl/eitem.hxx>
-#include <unotools/pathoptions.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/filedlghelper.hxx>
diff --git a/svx/source/dialog/page.hrc b/svx/source/dialog/page.hrc
index c5e9a75b1cc6..52e8a0dab3c2 100644
--- a/svx/source/dialog/page.hrc
+++ b/svx/source/dialog/page.hrc
@@ -21,6 +21,7 @@
 #define INCLUDED_SVX_SOURCE_DIALOG_PAGE_HRC
 
 #include <i18nutil/paper.hxx>
+#include <unotools/resmgr.hxx>
 #include <utility>
 
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index d676c3c1208f..ddbf54445a76 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -23,7 +23,6 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/fieldvalues.hxx>
-#include <vcl/image.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index adc9a86fbbe6..020d4c85eefc 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -25,7 +25,6 @@
 #include <svx/svdobjkind.hxx>
 #include <basegfx/point/b3dpoint.hxx>
 #include <sdr/contact/viewcontactofe3dcube.hxx>
-#include <rtl/ustrbuf.hxx>
 
 
 // DrawContact section
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 166d426c43f4..a74479b60d8a 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -34,7 +34,6 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b3dpolypolygontools.hxx>
-#include <rtl/ustrbuf.hxx>
 
 
 // DrawContact section
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 4880193f8159..70a6b7ab007a 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -31,7 +31,6 @@
 #include <sdr/contact/viewcontactofe3dlathe.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <rtl/ustrbuf.hxx>
 
 
 // DrawContact section
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 2863504b3607..692e3d757f53 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -39,7 +39,6 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
 #include <svx/e3dsceneupdater.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <unotools/configmgr.hxx>
 
 using namespace com::sun::star;
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 79cb56665918..07aa9c718f81 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -25,7 +25,6 @@
 #include <svx/dialmgr.hxx>
 #include <svx/svditer.hxx>
 
-#include <stdlib.h>
 #include <svx/svdobjkind.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/scene3d.hxx>
@@ -39,7 +38,6 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svx/e3dsceneupdater.hxx>
 #include <svx/svdmodel.hxx>
-#include <rtl/ustrbuf.hxx>
 
 namespace {
 
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 6b56d2d44dbe..cac250907902 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -29,7 +29,6 @@
 #include <basegfx/vector/b3dvector.hxx>
 #include <basegfx/point/b3dpoint.hxx>
 #include <sdr/contact/viewcontactofe3dsphere.hxx>
-#include <rtl/ustrbuf.hxx>
 
 // DrawContact section
 std::unique_ptr<sdr::contact::ViewContact> E3dSphereObj::CreateObjectSpecificViewContact()
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index dc9fa4100814..3906a6047258 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -66,7 +66,6 @@
 #include <tools/multisel.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/help.hxx>
-#include <vcl/image.hxx>
 #include <vcl/settings.hxx>
 #include <sal/log.hxx>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index dfe43faf5963..cf907bbaed2e 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -56,8 +56,8 @@
 #include <o3tl/safeint.hxx>
 #include <svl/numformat.hxx>
 #include <svl/numuno.hxx>
-#include <svl/zforlist.hxx>
 #include <svx/dialmgr.hxx>
+#include <toolkit/helper/listenermultiplexer.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/debug.hxx>
 #include <tools/fract.hxx>
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index e72b0e035c78..7e21635d0a5a 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -33,7 +33,6 @@
 #include <tools/diagnose_ex.h>
 #include <unotools/resmgr.hxx>
 #include <svx/xmlexchg.hxx>
-#include <unotools/pathoptions.hxx>
 #include <unotools/viewoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 5f73b825f331..7c626f2b6b7f 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -38,7 +38,6 @@
 #include <fmshimp.hxx>
 #include <o3tl/safeint.hxx>
 #include <sfx2/objitem.hxx>
-#include <sfx2/request.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/fmshell.hxx>
 #include <svx/fmtools.hxx>
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index c715d0e42da4..e475cf8f8462 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -19,8 +19,6 @@
 
 #include <sal/config.h>
 
-#include <string_view>
-
 #include <sal/macros.h>
 #include <svx/fmdmod.hxx>
 #include <fmservs.hxx>
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index ea676a807cf0..d97dfeb85d8e 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -50,7 +50,6 @@
 #include <sfx2/viewfrm.hxx>
 #include <svl/eitem.hxx>
 #include <svl/itempool.hxx>
-#include <svl/languageoptions.hxx>
 #include <svl/ctloptions.hxx>
 #include <svtools/stringtransfer.hxx>
 #include <svl/whiter.hxx>
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index b6d2de838b1b..8239472f24a5 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -23,7 +23,6 @@
 #include <svx/fmtools.hxx>
 #include <svx/svdobjkind.hxx>
 
-#include <com/sun/star/awt/LineEndFormat.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/io/XPersistObject.hpp>
@@ -41,10 +40,8 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/types.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index fe3b235ab46d..f5217122c93e 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <map>
-#include <string_view>
 
 #include <sal/macros.h>
 #include <fmundo.hxx>
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index a0268f5599cd..44362b9a78ec 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <sfx2/objsh.hxx>
 #include <comphelper/fileformat.h>
 #include <comphelper/servicehelper.hxx>
diff --git a/svx/source/inc/StylesPreviewWindow.hxx b/svx/source/inc/StylesPreviewWindow.hxx
index 21f46a5e81b9..3b652dcfb0d0 100644
--- a/svx/source/inc/StylesPreviewWindow.hxx
+++ b/svx/source/inc/StylesPreviewWindow.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_SOURCE_INC_STYLES_PREVIEW_WINDOW_HXX
 
 #include <vcl/InterimItemWindow.hxx>
-#include <vcl/customweld.hxx>
 #include <svl/style.hxx>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <sfx2/sfxstatuslistener.hxx>
diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx
index efe883d597cc..5386270ae8eb 100644
--- a/svx/source/inc/fmurl.hxx
+++ b/svx/source/inc/fmurl.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FMURL_HXX
 #define INCLUDED_SVX_SOURCE_INC_FMURL_HXX
 
+#include <rtl/ustring.hxx>
+
 inline constexpr OUStringLiteral FMURL_FORM_POSITION = u".uno:FormController/positionForm";
 inline constexpr OUStringLiteral FMURL_FORM_RECORDCOUNT = u".uno:FormController/RecordCount";
 inline constexpr OUStringLiteral FMURL_RECORD_MOVEFIRST = u".uno:FormController/moveToFirst";
diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx
index 27320cac54d5..a95c5109584d 100644
--- a/svx/source/inc/formcontrolfactory.hxx
+++ b/svx/source/inc/formcontrolfactory.hxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 
-#include <memory>
 #include <string_view>
 
 class SdrUnoObj;
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index ed9e5eb2722e..17cf26707712 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -48,7 +48,6 @@
 #include <cppuhelper/component.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
-#include <toolkit/helper/listenermultiplexer.hxx>
 #include <tools/diagnose_ex.h>
 
 class DbCellControl;
diff --git a/svx/source/sdr/contact/viewcontactofe3dcube.cxx b/svx/source/sdr/contact/viewcontactofe3dcube.cxx
index ee79ef9339ca..2687aab32ff0 100644
--- a/svx/source/sdr/contact/viewcontactofe3dcube.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dcube.cxx
@@ -24,7 +24,6 @@
 #include <sdr/primitive2d/sdrattributecreator.hxx>
 #include <sdr/primitive3d/sdrattributecreator3d.hxx>
 #include <basegfx/range/b3drange.hxx>
-#include <memory>
 
 
 namespace sdr::contact
diff --git a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
index 3f1a72ab4388..71100ae34d0b 100644
--- a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
@@ -24,7 +24,6 @@
 #include <sdr/primitive2d/sdrattributecreator.hxx>
 #include <sdr/primitive3d/sdrattributecreator3d.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <memory>
 
 
 namespace sdr::contact
diff --git a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
index bcaa1c367f97..a3e7086b83d4 100644
--- a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
@@ -24,7 +24,6 @@
 #include <sdr/primitive2d/sdrattributecreator.hxx>
 #include <sdr/primitive3d/sdrattributecreator3d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <memory>
 
 
 namespace sdr::contact
diff --git a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
index 995bb70cdc58..2951ead56064 100644
--- a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
@@ -25,7 +25,6 @@
 #include <sdr/primitive3d/sdrattributecreator3d.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 #include <basegfx/polygon/b3dpolypolygontools.hxx>
-#include <memory>
 
 
 namespace sdr::contact
diff --git a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
index e77d7a43e15f..7a99719b81ba 100644
--- a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
@@ -23,7 +23,6 @@
 #include <drawinglayer/primitive3d/sdrsphereprimitive3d.hxx>
 #include <sdr/primitive2d/sdrattributecreator.hxx>
 #include <sdr/primitive3d/sdrattributecreator3d.hxx>
-#include <memory>
 
 
 namespace sdr::contact
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index 620bc0e4f5a9..c6530fd132f4 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -17,7 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <sdr/primitive2d/primitivefactory2d.hxx>
+#include <svx/sdr/contact/viewcontact.hxx>
+#include <svx/svdobj.hxx>
+#include <svx/svdpage.hxx>
+#include <svx/unoapi.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index d0662d37f4e8..00f689515c4c 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -20,13 +20,10 @@
 #include <sal/config.h>
 
 #include <sdr/properties/groupproperties.hxx>
-#include <sdr/properties/itemsettools.hxx>
 #include <svl/itemset.hxx>
 #include <svl/whiter.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/svdtrans.hxx>
-#include <svx/svdmodel.hxx>
 #include <osl/diagnose.h>
 
 
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index af43229a1a63..011ab2192d70 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -22,7 +22,6 @@
 #include <sdr/properties/pageproperties.hxx>
 #include <svl/itemset.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/xdef.hxx>
 #include <tools/debug.hxx>
 
 
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index 4189edd0c5ac..97a264712b54 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -26,7 +26,6 @@
 #include <svx/svditer.hxx>
 #include <svx/xdef.hxx>
 #include <svx/xfillit0.hxx>
-#include <svx/svdmodel.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
index c6c3fa4e4bbd..2d92b6b4b3b8 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
@@ -21,7 +21,6 @@
 #include <svx/sidebar/AreaPropertyPanelBase.hxx>
 #include <svx/xflftrit.hxx>
 #include <svx/xgrad.hxx>
-#include <vcl/svapp.hxx>
 
 namespace svx::sidebar {
 
diff --git a/svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx b/svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx
index d71cc7da7daa..972141b7b0fb 100644
--- a/svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx
+++ b/svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx
@@ -18,18 +18,9 @@
  */
 
 #include "FontworkPropertyPanel.hxx"
-#include <svx/svxids.hrc>
-#include <sfx2/objsh.hxx>
-#include <svx/xfltrit.hxx>
-#include <svx/xflftrit.hxx>
-#include <svx/xtable.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/bindings.hxx>
-#include <svtools/valueset.hxx>
-#include <unotools/pathoptions.hxx>
-#include <svx/svxitems.hrc>
-#include <vcl/toolbox.hxx>
-#include <svtools/toolbarmenu.hxx>
+
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+
 #include <comphelper/lok.hxx>
 
 using namespace css;
diff --git a/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx b/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx
index 9f35ab5c4504..cded09b95193 100644
--- a/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx
+++ b/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_AREA_FONTWORKPROPERTYPANEL_HXX
 #define INCLUDED_SVX_SOURCE_SIDEBAR_AREA_FONTWORKPROPERTYPANEL_HXX
 
-#include <com/sun/star/ui/XUIElement.hpp>
 #include <sfx2/sidebar/PanelLayout.hxx>
 #include <sfx2/weldutils.hxx>
 
diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
index 69ed0f071015..22f1aa90e759 100644
--- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx
+++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
@@ -20,12 +20,10 @@
 #include <o3tl/safeint.hxx>
 #include <sal/config.h>
 
-#include <string_view>
 #include <svx/dialmgr.hxx>
 
 #include <svx/sidebar/InspectorTextPanel.hxx>
 
-#include <svl/languageoptions.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
 #include <com/sun/star/awt/FontSlant.hpp>
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index a15762c3586f..454e16a335f8 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -19,7 +19,6 @@
 
 #include <memory>
 #include <svx/sidebar/LinePropertyPanelBase.hxx>
-#include <com/sun/star/drawing/LineStyle.hpp>
 #include <sfx2/weldutils.hxx>
 #include <svx/linectrl.hxx>
 #include <svx/xlnwtit.hxx>
diff --git a/svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.cxx b/svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.cxx
index 79b9ab7ee081..2a06c57059ea 100644
--- a/svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.cxx
+++ b/svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.cxx
@@ -13,14 +13,12 @@
 
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/module.hxx>
 #include <sfx2/objsh.hxx>
 #include <svl/itempool.hxx>
 #include <svtools/unitconv.hxx>
 #include <svx/sdmetitm.hxx>
 #include <svx/svddef.hxx>
 #include <svx/svxids.hrc>
-#include <svx/unoshprp.hxx>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
diff --git a/svx/source/styles/ColorSets.cxx b/svx/source/styles/ColorSets.cxx
index 5dcd089fd4ba..4cd958d05f23 100644
--- a/svx/source/styles/ColorSets.cxx
+++ b/svx/source/styles/ColorSets.cxx
@@ -14,14 +14,12 @@
 
 #include <libxml/xmlwriter.h>
 
-#include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/util/Color.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#include <comphelper/propertyvalue.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/sequence.hxx>
 #include <sal/log.hxx>
diff --git a/svx/source/svdraw/MediaShellHelpers.cxx b/svx/source/svdraw/MediaShellHelpers.cxx
index e55a3d384ecc..8cf760a7b093 100644
--- a/svx/source/svdraw/MediaShellHelpers.cxx
+++ b/svx/source/svdraw/MediaShellHelpers.cxx
@@ -26,8 +26,6 @@
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 #include <svx/svdmrkv.hxx>
 
-#include <memory>
-
 namespace svx::MediaShellHelpers
 {
 void GetState(const SdrMarkView* pSdrView, SfxItemSet& rSet)
diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx
index c1eaebccb09f..f73d3b0dab25 100644
--- a/svx/source/svdraw/charthelper.cxx
+++ b/svx/source/svdraw/charthelper.cxx
@@ -24,13 +24,10 @@
 #include <com/sun/star/util/XUpdatable2.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/graphic/PrimitiveFactory2D.hpp>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
-#include <rtl/ref.hxx>
 #include <sdr/primitive2d/primitivefactory2d.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 2ad70c9dee90..8ca86d593287 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -39,7 +39,6 @@
 #include <svx/xflgrit.hxx>
 #include <svx/svdoole2.hxx>
 #include <svl/itempool.hxx>
-#include <tools/debug.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/syslocale.hxx>
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index e8d69ab8412a..ad5279e4917d 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -38,7 +38,6 @@
 #include <svx/xlnstit.hxx>
 #include <editeng/editeng.hxx>
 #include <svx/xtable.hxx>
-#include <svx/svdtrans.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdlayer.hxx>
 #include <svx/svdundo.hxx>
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 38c4bce2ed56..cac8dfc2db51 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -65,8 +65,6 @@
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 
 #include <boost/property_tree/json_parser.hpp>
-#include <boost/optional/optional.hpp>
-#include <tools/UnitConversion.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 312d866dae90..a75ce4760d43 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -83,7 +83,6 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <svdobjplusdata.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include "presetooxhandleadjustmentrelations.hxx"
 
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 8259fc8e5f3a..9a4964dcbaf2 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -22,7 +22,6 @@
 
 #include <sal/config.h>
 #include <sal/log.hxx>
-#include <rtl/ustrbuf.hxx>
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index e94e2833570b..4734ea22283d 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -28,7 +28,6 @@
 #include <basegfx/tuple/b2dtuple.hxx>
 #include <tools/bigint.hxx>
 #include <tools/helpers.hxx>
-#include <rtl/ustrbuf.hxx>
 
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index a76cc1831603..13e10c876338 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -24,7 +24,6 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <svl/hint.hxx>
-#include <rtl/ustrbuf.hxx>
 
 #include <sdr/contact/viewcontactofsdredgeobj.hxx>
 #include <sdr/properties/connectorproperties.hxx>
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index d4b7d08c3328..91e8174eea70 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -32,7 +32,6 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <libxml/xmlwriter.h>
-#include <rtl/ustrbuf.hxx>
 #include <vcl/canvastools.hxx>
 
 IDiagramHelper::IDiagramHelper() {}
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 9d6e0627b546..da9959c846cc 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -62,7 +62,6 @@
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnwtit.hxx>
 #include <svx/xpoly.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/ptrstyle.hxx>
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 62b2f9e8213f..0d14b35ae369 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -22,7 +22,6 @@
 #include <svx/svdomedia.hxx>
 
 #include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
 #include <ucbhelper/content.hxx>
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index a74b02192e81..67c7a104e2f5 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -25,7 +25,6 @@
 #include <svx/svdpage.hxx>
 #include <sdr/properties/pageproperties.hxx>
 #include <sdr/contact/viewcontactofpageobj.hxx>
-#include <rtl/ustrbuf.hxx>
 
 
 // BaseProperties section
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index ccb0bf601335..9f338301e6ef 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -20,7 +20,6 @@
 #include <o3tl/unit_conversion.hxx>
 #include <tools/bigint.hxx>
 #include <tools/helpers.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <svx/svdopath.hxx>
 #include <math.h>
 #include <svx/xpoly.hxx>
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index b3b1ad7335a1..2674464d2168 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -28,7 +28,6 @@
 #include <svx/strings.hrc>
 #include <sdr/properties/rectangleproperties.hxx>
 #include <sdr/contact/viewcontactofsdrrectobj.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <osl/diagnose.h>
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 2599bebf3056..78c8d8f377ea 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -27,7 +27,6 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <algorithm>
-#include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/BreakIterator.hpp>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
@@ -39,7 +38,7 @@
 // primitive decomposition helpers
 
 #include <drawinglayer/attribute/strokeattribute.hxx>
-#include <drawinglayer/primitive2d/PolygonStrokeArrowPrimitive2D.hxx>
+#include <drawinglayer/primitive2d/PolygonStrokePrimitive2D.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <svx/unoapi.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index eeb302fae0e9..07763e9d945c 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -32,7 +32,6 @@
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdviter.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <rtl/ref.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 9dcbb6754ddf..7d68e4840ff9 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -24,7 +24,6 @@
 #include <svx/svdograf.hxx>
 #include <svx/svddrgv.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <rtl/ustrbuf.hxx>
 
 sdr::properties::BaseProperties& SdrVirtObj::GetProperties() const
 {
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index b66ed3433d18..b7aa8777e39c 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -41,8 +41,6 @@
 #include <svx/svdlayer.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdundo.hxx>
-#include <svx/strings.hrc>
-#include <svx/dialmgr.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/fmdpage.hxx>
 
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index bef65e9825ac..1b1d643d26d9 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -52,9 +52,7 @@
 #include <editeng/frmdiritem.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <libxml/xmlwriter.h>
-#include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/UnitConversion.hxx>
 
 #include <boost/property_tree/ptree.hpp>
 
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 6daf74eb8812..1fb980055a51 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -45,7 +45,6 @@
 #include <sdr/overlay/overlayobjectcell.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/svxids.hrc>
-#include <editeng/outlobj.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdetc.hxx>
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index 935cebefe4bd..03b16250f03e 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <comphelper/compbase.hxx>
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index a67e623611e3..c298d5d1af61 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -25,7 +25,6 @@
 
 #include <tools/diagnose_ex.h>
 #include <tools/stream.hxx>
-#include <tools/UnitConversion.hxx>
 #include <svtools/rtfkeywd.hxx>
 #include <svtools/rtfout.hxx>
 
diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx b/svx/source/tbxctrls/StylesPreviewWindow.cxx
index 2c27c2fb834f..ba338ffb22bc 100644
--- a/svx/source/tbxctrls/StylesPreviewWindow.cxx
+++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx
@@ -20,7 +20,6 @@
 #include <StylesPreviewWindow.hxx>
 
 #include <comphelper/propertyvalue.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/objsh.hxx>
 #include <svl/itemset.hxx>
@@ -52,9 +51,7 @@
 
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <cppuhelper/weak.hxx>
 
-#include <vcl/event.hxx>
 #include <vcl/commandevent.hxx>
 
 StyleStatusListener::StyleStatusListener(
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index b0d8a1238610..b06dc0bd423f 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -19,8 +19,6 @@
 
 #include <sal/config.h>
 
-#include <string_view>
-
 #include <comphelper/propertyvalue.hxx>
 #include <svtools/toolbarmenu.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 65676e18d833..980c0f819e71 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -19,7 +19,6 @@
 
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
 #include <rtl/ustring.hxx>
 #include <vcl/event.hxx>
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 39c3b0af240e..34436c5a77b2 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -34,7 +34,6 @@
 #include <svtools/popupwindowcontroller.hxx>
 
 #include <svx/fmmodel.hxx>
-#include <svx/strings.hrc>
 #include <svx/svdpage.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 413b12741ac7..a8073a1a74d9 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/status/FontHeight.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 9e1eeffca214..3e65a8956c6d 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -19,7 +19,6 @@
 
 #include <cppuhelper/supportsservice.hxx>
 #include <verttexttbxctrl.hxx>
-#include <svl/languageoptions.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 832699357257..bc84a56de4cb 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -54,7 +54,6 @@
 #include <svx/svdograf.hxx>
 #include <svx/xoutbmp.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <svx/unoapi.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/fmview.hxx>
diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx
index ef68a767c9c0..a19a5fd9685c 100644
--- a/svx/source/unodraw/shapepropertynotifier.cxx
+++ b/svx/source/unodraw/shapepropertynotifier.cxx
@@ -22,12 +22,9 @@
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/weak.hxx>
 #include <tools/diagnose_ex.h>
 
-#include <unordered_map>
-
 namespace
 {
 
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 07f231ef181a..707c52b112da 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -28,7 +28,6 @@
 #include <svtools/unoevent.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <tools/debug.hxx>
 
 #include <cppuhelper/implbase.hxx>
 #include <svx/unofill.hxx>
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index be3d98108fc8..4d6e56db37c0 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include <tools/debug.hxx>
 #include <tools/fldunit.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/propertysetinfo.hxx>
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 4166fb03350a..1dc0ce4331a9 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -87,7 +87,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/wmf.hxx>
 #include <svx/sdtfsitm.hxx>
-#include <svx/svdoutl.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/SvxXTextColumns.hxx>
 
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index fdb43fdd6fd2..e3fcf6100940 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -47,7 +47,6 @@
 #include <map>
 #include <memory>
 #include <mutex>
-#include <string_view>
 
 using namespace ::osl;
 using namespace ::cppu;
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index d9856259ffc4..2401bb361a9b 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -37,7 +37,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <vcl/BitmapTools.hxx>
 #include <vcl/GraphicLoader.hxx>
-#include <unotools/resmgr.hxx>
 
 #include <libxml/xmlwriter.h>
 
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index ef13d0c1d019..b0dcced37322 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -32,7 +32,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <drawinglayer/attribute/lineattribute.hxx>
 #include <drawinglayer/attribute/strokeattribute.hxx>
-#include <drawinglayer/primitive2d/PolygonStrokeArrowPrimitive2D.hxx>
+#include <drawinglayer/primitive2d/PolygonStrokePrimitive2D.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <drawinglayer/processor2d/processor2dtools.hxx>
 #include <memory>
-- 
cgit