tdf#42949 Fix IWYU warnings in svx/source/[a-e]*/*cxx and svx/qa/

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

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

87 files changed, 31 insertions, 428 deletions

diff --git a/svx/IwyuFilter_svx.yaml b/svx/IwyuFilter_svx.yaml
index d3ec76061b25..d789a1a73dcb 100644
--- a/svx/IwyuFilter_svx.yaml
+++ b/svx/IwyuFilter_svx.yaml
@@ -5,3 +5,15 @@ blacklist:
     # Needed on WIN32
     - prewin.h
     - postwin.h
+    svx/source/accessibility/ChildrenManagerImpl.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySet.hpp
+    svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:
+    # Boost wrapper is needed
+    - boost/spirit/include/classic_core.hpp
+    svx/source/dialog/ClassificationCommon.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertyContainer.hpp
+    svx/source/dialog/srchdlg.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
diff --git a/svx/qa/unit/XTableImportExportTest.cxx b/svx/qa/unit/XTableImportExportTest.cxx
index bbbc67a314b2..9356f2691323 100644
--- a/svx/qa/unit/XTableImportExportTest.cxx
+++ b/svx/qa/unit/XTableImportExportTest.cxx
@@ -7,21 +7,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <config_features.h>
-
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <unotest/bootstrapfixturebase.hxx>
 
 #include <sal/types.h>
 #include <sfx2/app.hxx>
 #include <unotools/tempfile.hxx>
 #include <svx/xtable.hxx>
 #include <vcl/bitmapex.hxx>
-#include <svx/XPropertyTable.hxx>
-
-#include <xmlxtexp.hxx>
 
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
diff --git a/svx/qa/unit/svx-dialogs-test.cxx b/svx/qa/unit/svx-dialogs-test.cxx
index 95a6e2d3ed0f..eaa829569914 100644
--- a/svx/qa/unit/svx-dialogs-test.cxx
+++ b/svx/qa/unit/svx-dialogs-test.cxx
@@ -9,9 +9,6 @@
 
 #include <sal/config.h>
 #include <test/screenshot_test.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <sfx2/app.hxx>
 #include <vcl/abstdlg.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svx/qa/unit/xoutdev.cxx b/svx/qa/unit/xoutdev.cxx
index 308c484a7ba1..1da137bea57e 100644
--- a/svx/qa/unit/xoutdev.cxx
+++ b/svx/qa/unit/xoutdev.cxx
@@ -11,7 +11,7 @@
 
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
-#include <unotest/bootstrapfixturebase.hxx>
+#include <cppunit/extensions/HelperMacros.h>
 
 #include <sal/types.h>
 #include <sfx2/app.hxx>
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 647a75251036..60f7d651a6f5 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -27,15 +27,12 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/reflection/ProxyFactory.hpp>
 #include <com/sun/star/util/XModeChangeBroadcaster.hpp>
 #include <com/sun/star/container/XContainer.hpp>
-#include <com/sun/star/container/XChild.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/property.hxx>
-#include <comphelper/types.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <svx/IAccessibleParent.hxx>
@@ -51,7 +48,6 @@
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <algorithm>
 
 using namespace ::accessibility;
 using namespace ::com::sun::star::accessibility;
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 2f4885297b97..238699a8188d 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -18,24 +18,15 @@
  */
 
 #include <AccessibleFrameSelector.hxx>
-#include <com/sun/star/awt/KeyEvent.hpp>
-#include <com/sun/star/awt/KeyModifier.hpp>
-#include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <com/sun/star/awt/FocusChangeReason.hpp>
-#include <cppuhelper/supportsservice.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <svx/frmsel.hxx>
 #include <svx/dialmgr.hxx>
-#include <editeng/unolingu.hxx>
 
-#include <svx/strings.hrc>
 #include <frmsel.hrc>
 
 namespace svx::a11y {
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index d44c8583fe79..324af67e5ffb 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -22,9 +22,7 @@
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxShapeTypes.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/svdmodel.hxx>
 
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/drawing/XShapeDescriptor.hpp>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index e96f6501069c..1f2315e07c48 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -18,24 +18,17 @@
  */
 
 #include <svx/AccessibleShape.hxx>
-#include <svx/DescriptionGenerator.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
-#include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <com/sun/star/accessibility/AccessibleTextType.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/drawing/XShapeDescriptor.hpp>
 #include <com/sun/star/document/XShapeEventBroadcaster.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/text/XText.hpp>
-#include <editeng/outlobj.hxx>
-#include <rtl/ref.hxx>
 #include <sal/log.hxx>
 #include <editeng/unoedsrc.hxx>
 #include <svx/AccessibleTextHelper.hxx>
@@ -44,10 +37,8 @@
 #include <svx/IAccessibleViewForwarder.hxx>
 #include <svx/unoshtxt.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/svdmodel.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/svdpage.hxx>
-#include <com/sun/star/uno/Exception.hpp>
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxShapeTypes.hxx>
 
@@ -61,7 +52,6 @@
 
 #include <algorithm>
 #include <memory>
-#include <utility>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx
index 177950aac8ce..a39123c45eca 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.cxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx
@@ -19,17 +19,10 @@
 
 #include <memory>
 #include "AccessibleTextEventQueue.hxx"
-#include <svx/unoshape.hxx>
-#include <editeng/unolingu.hxx>
-#include <editeng/unotext.hxx>
 
 #include <editeng/unoedhlp.hxx>
-#include <editeng/unopracc.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpntv.hxx>
-#include <editeng/editdata.hxx>
-#include <editeng/editeng.hxx>
-#include <editeng/editview.hxx>
 
 namespace accessibility
 {
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 46b88a92f702..9a61a38638f4 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -24,15 +24,12 @@
 #include <memory>
 #include <utility>
 #include <algorithm>
-#include <deque>
 #include <osl/mutex.hxx>
 #include <sal/log.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <cppuhelper/weakref.hxx>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
@@ -40,12 +37,9 @@
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <comphelper/accessibleeventnotifier.hxx>
-#include <unotools/accessiblestatesethelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/textdata.hxx>
 #include <vcl/unohelp.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/viewsh.hxx>
 
 
 // Project-local header
@@ -53,12 +47,8 @@
 
 #include "AccessibleTextEventQueue.hxx"
 #include <svx/AccessibleTextHelper.hxx>
-#include <svx/unoshape.hxx>
-#include <editeng/unolingu.hxx>
-#include <editeng/unotext.hxx>
 
 #include <editeng/unoedhlp.hxx>
-#include <editeng/unopracc.hxx>
 #include <editeng/unoedprx.hxx>
 #include <editeng/AccessibleParaManager.hxx>
 #include <editeng/AccessibleEditableTextPara.hxx>
@@ -67,8 +57,6 @@
 #include <cell.hxx>
 #include "../table/accessiblecell.hxx"
 #include <editeng/editdata.hxx>
-#include <editeng/editeng.hxx>
-#include <editeng/editview.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx
index e8376908bf72..88bf9bd8cecf 100644
--- a/svx/source/accessibility/ChildrenManager.cxx
+++ b/svx/source/accessibility/ChildrenManager.cxx
@@ -19,7 +19,6 @@
 
 #include <svx/ChildrenManager.hxx>
 #include "ChildrenManagerImpl.hxx"
-#include <svx/AccessibleShape.hxx>
 #include <sal/log.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index 116925587c1b..4b42d96803a2 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -22,26 +22,13 @@
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/drawing/XShapeDescriptor.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/style/XStyle.hpp>
 #include <vcl/svapp.hxx>
 
-#include <com/sun/star/uno/Exception.hpp>
-
 // Includes for string resources.
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 
-#include <svx/xdef.hxx>
-#include <svx/unoapi.hxx>
 #include "lookupcolorname.hxx"
 
 using namespace ::com::sun::star;
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 1b3f3723f18e..3aff94540e9a 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -23,16 +23,12 @@
 #include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <osl/mutex.hxx>
 #include <tools/gen.hxx>
-#include <toolkit/helper/convert.hxx>
 #include <svtools/colorcfg.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <svx/sdrpaintwindow.hxx>
@@ -43,9 +39,7 @@
 #include <svx/graphctl.hxx>
 #include <svx/strings.hrc>
 #include <svx/svdpage.hxx>
-#include <svx/unomod.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/svdetc.hxx>
 #include <svx/sdrhittesthelper.hxx>
 
 // namespaces
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index ac830cd7b05c..133ce38bea02 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -21,14 +21,12 @@
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxShapeTypes.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
-#include <com/sun/star/drawing/XShapeDescriptor.hpp>
 #include <vcl/svapp.hxx>
 #include <svx/AccessibleShape.hxx>
 #include <svx/dialmgr.hxx>
 
 #include <svx/unoshape.hxx>
 #include <svx/svdoashp.hxx>
-#include <svx/unoapi.hxx>
 
 #include <svx/strings.hrc>
 
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 7499b35619d5..3960b8a723cc 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <toolkit/helper/convert.hxx>
 #include <osl/interlck.h>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx
index 29f517a5edf4..58d88202644c 100644
--- a/svx/source/accessibility/lookupcolorname.cxx
+++ b/svx/source/accessibility/lookupcolorname.cxx
@@ -22,15 +22,12 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/drawing/ColorTable.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <comphelper/processfactory.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <vcl/svapp.hxx>
 
 #include "lookupcolorname.hxx"
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index a9880935360f..e966698a2c05 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -21,27 +21,17 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <osl/mutex.hxx>
-#include <rtl/uuid.h>
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
 
 #include <svx/dlgctrl.hxx>
 
-#include <comphelper/accessibleeventnotifier.hxx>
-
-#include <unotools/accessiblerelationsethelper.hxx>
-
 #include <svxpixelctlaccessiblecontext.hxx>
-#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 
 using namespace ::cppu;
 using namespace ::osl;
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index e1058f05972f..8162a0468b5b 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -22,11 +22,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/supportsservice.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
@@ -37,7 +33,6 @@
 #include <svx/strings.hrc>
 #include <svx/dlgctrl.hxx>
 #include <svx/dialmgr.hxx>
-#include <comphelper/accessibleeventnotifier.hxx>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <unotools/accessiblerelationsethelper.hxx>
 
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index 4135495cabb3..49fdc2552a6f 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -9,7 +9,6 @@
 
 #include <svx/extedit.hxx>
 
-#include <vcl/svapp.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/GraphicObject.hxx>
 #include <vcl/cvtgrf.hxx>
@@ -19,14 +18,9 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/fmview.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/bindings.hxx>
 #include <salhelper/thread.hxx>
 #include <sal/log.hxx>
 #include <osl/file.hxx>
-#include <osl/thread.hxx>
-#include <osl/process.h>
-#include <osl/time.h>
 #include <svtools/filechangedchecker.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index 7302d752d072..ab2b85786be9 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -25,31 +25,25 @@
 #include <svx/dialmgr.hxx>
 #include <svx/graphichelper.hxx>
 #include <svx/strings.hrc>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 
-#include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/document/XExporter.hpp>
-#include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/drawing/GraphicExportFilter.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/task/ErrorCodeIOException.hpp>
-#include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 
 #include <map>
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index fdec9dbdebf3..619b3c0dc9ca 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -24,14 +24,11 @@
 #include <svx/EnhancedCustomShapeTypeNames.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svdtrans.hxx>
-#include <svx/svdocirc.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
-#include <svx/svdocapt.hxx>
+#include <svx/svdorect.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/xflclit.hxx>
-#include <svx/svdmodel.hxx>
-#include <rtl/crc.h>
 #include <rtl/math.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xlineit0.hxx>
@@ -58,7 +55,6 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 
 #include <algorithm>
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 339f99fd3b59..a0b6572e84e4 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -19,7 +19,6 @@
 
 #include "EnhancedCustomShape3d.hxx"
 #include <svx/deflt3d.hxx>
-#include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
 #include <tools/poly.hxx>
 #include <svx/svditer.hxx>
@@ -30,21 +29,16 @@
 #include <svx/xfillit0.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/xsflclit.hxx>
-#include <svx/xit.hxx>
 #include <svx/xbtmpit.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/svdopath.hxx>
-#include <svx/svdogrp.hxx>
-#include <svx/svdpage.hxx>
 #include <svx/svddef.hxx>
 #include <svx/svx3ditems.hxx>
 #include <svx/extrud3d.hxx>
 #include <svx/xflbmtit.hxx>
-#include <vcl/svapp.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/sdasitm.hxx>
 #include <svx/scene3d.hxx>
-#include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/drawing/Position3D.hpp>
 #include <com/sun/star/drawing/Direction3D.hpp>
 #include <com/sun/star/drawing/ShadeMode.hpp>
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 4eafe4712d7a..1f61c6097a0e 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -26,30 +25,23 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/drawing/XCustomShapeEngine.hpp>
-#include <rtl/ref.hxx>
 #include <svx/EnhancedCustomShape2d.hxx>
 #include "EnhancedCustomShape3d.hxx"
 #include "EnhancedCustomShapeFontWork.hxx"
 #include "EnhancedCustomShapeHandle.hxx"
-#include <svx/EnhancedCustomShapeGeometry.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>
-#include <svx/svdorect.hxx>
 #include <editeng/outlobj.hxx>
-#include <editeng/outliner.hxx>
-#include <svx/svdoutl.hxx>
 #include <svl/itemset.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/svdmodel.hxx>
 #include <svx/svditer.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xlineit0.hxx>
-#include <uno/mapping.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <com/sun/star/document/XActionLockable.hpp>
 #include <cppuhelper/implbase.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index cf0be984808f..7cdafddd4929 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -20,10 +20,8 @@
 #include "EnhancedCustomShapeFontWork.hxx"
 #include <svl/itemset.hxx>
 #include <svx/svddef.hxx>
-#include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
 #include <vcl/metric.hxx>
-#include <svx/svdpage.hxx>
 #include <svx/sdasitm.hxx>
 #include <svx/sdtfsitm.hxx>
 #include <vcl/virdev.hxx>
@@ -35,16 +33,11 @@
 #include <editeng/wghtitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/charscaleitem.hxx>
-#include <svx/EnhancedCustomShapeTypeNames.hxx>
-#include <svx/svdorect.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/sdshitm.hxx>
-#include <editeng/outliner.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/editobj.hxx>
-#include <editeng/editeng.hxx>
 #include <o3tl/numeric.hxx>
-#include <svx/svdmodel.hxx>
 #include <vector>
 #include <numeric>
 #include <algorithm>
@@ -53,8 +46,6 @@
 #include <com/sun/star/i18n/BreakIterator.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <sal/log.hxx>
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index a4d2ee39b2c2..4d15cfce2905 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -22,7 +22,6 @@
 #include <svx/EnhancedCustomShape2d.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
-#include <osl/diagnose.h>
 #include <tools/fract.hxx>
 
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx
index c81fa7a2dc29..596fc56cae47 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -20,7 +20,6 @@
 #include <svl/itemset.hxx>
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
-#include <rtl/uri.hxx>
 #include <config_folders.h>
 #include <tools/stream.hxx>
 #include <tools/XmlWriter.hxx>
diff --git a/svx/source/dialog/ClassificationEditView.cxx b/svx/source/dialog/ClassificationEditView.cxx
index 6eba6e6f12d7..1099c4337666 100644
--- a/svx/source/dialog/ClassificationEditView.cxx
+++ b/svx/source/dialog/ClassificationEditView.cxx
@@ -11,17 +11,9 @@
 #include <svx/ClassificationEditView.hxx>
 #include <svx/ClassificationField.hxx>
 
-#include <vcl/builder.hxx>
-#include <vcl/cursor.hxx>
-#include <vcl/event.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/ptrstyle.hxx>
 #include <svl/itemset.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/eeitem.hxx>
-#include <svx/sdr/overlay/overlaymanager.hxx>
-#include <svx/sdr/overlay/overlayselection.hxx>
 
 namespace svx {
 
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx
index 8e3921f11678..b74d2a93dae2 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -9,8 +9,6 @@
 
 #include "SafeModeDialog.hxx"
 
-#include <config_folders.h>
-#include <rtl/bootstrap.hxx>
 #include <osl/file.hxx>
 #include <sfx2/safemode.hxx>
 #include <tools/diagnose_ex.h>
@@ -18,7 +16,6 @@
 #include <vcl/weld.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/ZipPackageHelper.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 #include <unotools/configmgr.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index eb1a27674ed6..dcd4fd91e495 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -20,8 +20,8 @@
 #include <vcl/event.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/field.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/toolbox.hxx>
+#include <vcl/virdev.hxx>
 #include <svtools/valueset.hxx>
 #include <svl/eitem.hxx>
 #include <sfx2/dispatch.hxx>
@@ -29,7 +29,6 @@
 
 #include <svx/colorbox.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dlgctrl.hxx>
 #include <svx/bmpmask.hxx>
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index dcd85e1e75e3..1ca714868c17 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -24,18 +24,13 @@
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/module.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <svtools/miscopt.hxx>
 #include <unotools/localedatawrapper.hxx>
 
-#include <svx/xoutbmp.hxx>
 #include <svx/svxids.hrc>
 #include <svx/contdlg.hxx>
 #include "contimp.hxx"
 #include "contwnd.hxx"
-#include <svx/svdtrans.hxx>
 #include <svx/svdopath.hxx>
-#include <svx/dlgutil.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 403d748a231e..b2e5b4159d56 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -22,9 +22,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
-#include <svtools/colorcfg.hxx>
 
-#include <rtl/textenc.h>
 #include <svx/ucsubset.hxx>
 
 
@@ -32,19 +30,16 @@
 
 #include <svx/charmap.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/svxdlg.hxx>
 
 #include <charmapacc.hxx>
 #include <uiobject.hxx>
 
-#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
 #include <com/sun/star/datatransfer/clipboard/SystemClipboard.hpp>
 #include <officecfg/Office/Common.hxx>
 #include <comphelper/processfactory.hxx>
-#include <svl/itemset.hxx>
 #include <unicode/uchar.h>
 #include <vcl/textview.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 060c9ba9ab38..184934342a0c 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -33,7 +33,6 @@
 #include <sfx2/module.hxx>
 #include <comphelper/fileformat.h>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <tools/stream.hxx>
 #include <unotools/localedatawrapper.hxx>
 
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 899932fff11c..4e1d71c39c3c 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -29,7 +29,6 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>
 #include <svx/sxelditm.hxx>
-#include <sxmkitm.hxx>
 
 #include <vcl/settings.hxx>
 #include <memory>
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 820a18918460..593b459c5e5b 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -17,15 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/xoutbmp.hxx>
-#include <svx/svxids.hrc>
 #include "contwnd.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/xflclit.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svx/sdrpaintwindow.hxx>
 #include <vcl/ptrstyle.hxx>
diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx
index 85801277c27c..0f56078b5d40 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -10,13 +10,9 @@
 #include "crashreportdlg.hxx"
 
 
-#include <config_folders.h>
-
-#include <rtl/bootstrap.hxx>
 #include <desktop/crashreport.hxx>
 #include <sfx2/safemode.hxx>
 #include <comphelper/processfactory.hxx>
-#include <osl/file.hxx>
 
 #include <com/sun/star/task/OfficeRestartManager.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 15155c6c6edc..3374efde51b5 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -19,15 +19,12 @@
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
 #include <svtools/ctrlbox.hxx>
 #include <unotools/textsearch.hxx>
-#include <unotools/charclass.hxx>
 
-#include <editeng/unolingu.hxx>
 #include <svx/ctredlin.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index 11bb05c4a5cb..93efd7cbc89e 100644
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -24,7 +24,6 @@
 
 #include <sfx2/app.hxx>
 #include <svl/itemset.hxx>
-#include <memory>
 
 namespace svx
 {
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 6ebe5e397db2..44bf4cfda288 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -24,7 +24,6 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
-#include <svtools/colorcfg.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
 namespace svx {
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 8d73639261a5..25b1ff7262d7 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -39,7 +39,6 @@
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
 #include <helpids.h>
-#include <algorithm>
 #include <svx/dialmgr.hxx>
 #include <tools/helpers.hxx>
 #include <vcl/settings.hxx>
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index cb79d09cd6d2..d69a3cceb2f4 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -24,23 +24,14 @@
 #include <sfx2/dialoghelper.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/xtable.hxx>
-#include <svx/xpool.hxx>
 #include <svx/strings.hrc>
 #include <bitmaps.hlst>
 #include <svx/dlgctrl.hxx>
 #include <svx/dialmgr.hxx>
 #include <tools/debug.hxx>
-#include <tools/poly.hxx>
-#include <vcl/region.hxx>
-#include <vcl/gradient.hxx>
-#include <vcl/hatch.hxx>
-#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
-#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <svxpixelctlaccessiblecontext.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svxrectctaccessiblecontext.hxx>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <svx/svdorect.hxx>
@@ -48,9 +39,7 @@
 #include <svx/svdopath.hxx>
 #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
-#include <vcl/bitmapaccess.hxx>
 #include <vcl/BitmapTools.hxx>
-#include <svx/xbtmpit.hxx>
 
 #define OUTPUT_DRAWMODE_COLOR       (DrawModeFlags::Default)
 #define OUTPUT_DRAWMODE_CONTRAST    (DrawModeFlags::SettingsLine | DrawModeFlags::SettingsFill | DrawModeFlags::SettingsText | DrawModeFlags::SettingsGradient)
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 456a1fdfef03..b51ddc2ca71a 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -17,42 +17,26 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_folders.h>
-
-#include <sal/macros.h>
-
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 #include <bitmaps.hlst>
 #include <docrecovery.hxx>
 
-#include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/string.hxx>
 #include <svtools/imagemgr.hxx>
-#include <vcl/settings.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/svapp.hxx>
-#include <rtl/ustrbuf.hxx>
-
-#include <toolkit/helper/vclunohelper.hxx>
 
-#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
 #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/awt/XWindow.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <osl/file.hxx>
-#include <osl/security.hxx>
-#include <rtl/bootstrap.hxx>
 #include <unotools/pathoptions.hxx>
-#include <officecfg/Office/Recovery.hxx>
 
 namespace svx::DocRecovery{
 
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 10c84ca95222..27c0fa2ddaf1 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -20,14 +20,12 @@
 #include <sfx2/dialoghelper.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/printer.hxx>
-#include <vcl/event.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <unicode/uchar.h>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/i18n/BreakIterator.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/i18n/ScriptType.hpp>
@@ -39,7 +37,6 @@
 
 #include <svx/fntctrl.hxx>
 #include <svx/svxids.hrc>
-#include <svx/sdasitm.hxx>
 
 // Item set includes
 #include <svl/itemset.hxx>
@@ -64,7 +61,6 @@
 #include <editeng/brushitem.hxx>
 #include <editeng/emphasismarkitem.hxx>
 #include <editeng/charreliefitem.hxx>
-#include <editeng/twolinesitem.hxx>
 #include <editeng/charscaleitem.hxx>
 #include <editeng/langitem.hxx>
 
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 558f5514ce95..e8c65a51f755 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -21,10 +21,6 @@
 #include <sfx2/dispatch.hxx>
 
 #include <svx/colorbox.hxx>
-#include <svx/svdobj.hxx>
-#include <svx/svdopath.hxx>
-#include <svx/svdview.hxx>
-#include <svx/svdocirc.hxx>
 #include <svx/xftadit.hxx>
 #include <svx/xftdiit.hxx>
 #include <svx/xftstit.hxx>
@@ -35,16 +31,10 @@
 #include <svx/xftshxy.hxx>
 #include <svx/xtextit0.hxx>
 
-#include <svx/dlgutil.hxx>
-
 #include <svtools/unitconv.hxx>
 #include <svx/svxids.hrc>
 #include <bitmaps.hlst>
 #include <svx/fontwork.hxx>
-#include <editeng/outlobj.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-#include <vcl/settings.hxx>
 
 SFX_IMPL_DOCKINGWINDOW_WITHID( SvxFontWorkChildWindow, SID_FONTWORK );
 
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 69cb10704817..dd6d410532bf 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -19,16 +19,9 @@
 
 #include <sal/config.h>
 
-#include <cstdlib>
-
 #include <svx/framelink.hxx>
 
-#include <math.h>
-#include <vcl/outdev.hxx>
-#include <tools/gen.hxx>
 #include <editeng/borderline.hxx>
-#include <svtools/borderhelper.hxx>
-#include <drawinglayer/primitive2d/borderlineprimitive2d.hxx>
 
 
 using namespace ::com::sun::star;
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index 40ec9b91968a..c94bd5817233 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -24,9 +24,8 @@
 #include <set>
 #include <algorithm>
 #include <tools/debug.hxx>
+#include <tools/gen.hxx>
 #include <vcl/canvastools.hxx>
-#include <vcl/outdev.hxx>
-#include <drawinglayer/primitive2d/borderlineprimitive2d.hxx>
 #include <svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 871aeb3edf44..d3e0671e5ab3 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -20,16 +20,11 @@
 #include <svl/itempool.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/ptrstyle.hxx>
-#include <unotools/syslocale.hxx>
-#include <rtl/math.hxx>
-#include <unotools/localedatawrapper.hxx>
 #include <vcl/svapp.hxx>
-#include <tools/debug.hxx>
 
 #include <svx/graphctl.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <GraphCtlAccessibleContext.hxx>
-#include <svx/xoutbmp.hxx>
 #include <svx/svxids.hrc>
 #include <svx/svdpage.hxx>
 #include <svx/sdrpaintwindow.hxx>
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index ac59aa746460..81b9289009dd 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -31,7 +31,6 @@
 #include <svx/grfflt.hxx>
 #include <svx/svxids.hrc>
 #include <svx/svxdlg.hxx>
-#include <memory>
 
 
 SvxGraphicFilterResult SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest const & rReq, GraphicObject& rFilterObject )
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index b92dc46e8deb..2d718523bd26 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -18,11 +18,7 @@
  */
 
 #include <svl/itemiter.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/module.hxx>
-#include <vcl/graph.hxx>
-#include <sfx2/sfxsids.hrc>
 #include <svx/svxids.hrc>
 
 #include <svl/intitem.hxx>
@@ -37,7 +33,6 @@
 #include <editeng/brushitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
-#include <editeng/shaditem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <editeng/boxitem.hxx>
 
@@ -45,10 +40,8 @@
 #include <memory>
 
 #include <svx/xdef.hxx>
-#include <svx/xenum.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/unobrushitemhelper.hxx>
-#include <sfx2/request.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index d08a17d6c06f..27976ef1bd20 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/settings.hxx>
-#include <unotools/viewoptions.hxx>
 #include <svx/hyperdlg.hxx>
 #include <svx/svxdlg.hxx>
 #include <sfx2/app.hxx>
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index ab0de72dfd88..d7a5e130cfe1 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <stdlib.h>
 #include <vcl/errinf.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/ucbstreamhelper.hxx>
@@ -28,7 +27,6 @@
 #include <sfx2/filedlghelper.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <svl/urihelper.hxx>
-#include <svtools/miscopt.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/inettbc.hxx>
 #include <svtools/sfxecode.hxx>
@@ -43,8 +41,6 @@
 #include <svx/svxids.hrc>
 #include "imapwnd.hxx"
 #include "imapimp.hxx"
-#include <svx/dlgutil.hxx>
-#include <svx/svdtrans.hxx>
 #include <svx/svdopath.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 2ebd1f8ed2b4..377ea12907dd 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -18,8 +18,6 @@
  */
 
 #include <tools/urlobj.hxx>
-#include <vcl/help.hxx>
-#include <sfx2/sfxsids.hrc>
 #include <vcl/commandevent.hxx>
 #include <vcl/imaprect.hxx>
 #include <vcl/imapcirc.hxx>
@@ -27,7 +25,6 @@
 #include <vcl/svapp.hxx>
 #include <svl/urlbmk.hxx>
 
-#include <svx/xoutbmp.hxx>
 #include <svx/svxids.hrc>
 #include "imapwnd.hxx"
 #include <svx/svdpage.hxx>
@@ -36,7 +33,6 @@
 #include <svx/svdopath.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/svdpagv.hxx>
-#include <svl/urihelper.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
@@ -46,7 +42,6 @@
 #include <sot/formats.hxx>
 
 #include <svx/svxdlg.hxx>
-#include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <memory>
 
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index bf7d4e1096ee..a2aed402ac3d 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -27,13 +27,12 @@
 #include <svtools/langtab.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/lang.h>
-#include <editeng/scripttypeitem.hxx>
 #include <editeng/unolingu.hxx>
+#include <svl/languageoptions.hxx>
 #include <svx/langbox.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 #include <bitmaps.hlst>
-#include <vcl/i18nhelp.hxx>
 
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::linguistic2;
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index 735b3c68e76f..0d8e53f7c14c 100644
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <osl/file.hxx>
-#include <vcl/svapp.hxx>
 #include <svx/linkwarn.hxx>
 #include <svtools/miscopt.hxx>
 
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 635b12267bed..9cf4926bf5b9 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
 #include <svl/intitem.hxx>
 #include <svtools/unitconv.hxx>
 
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 6119973c7ebf..6b9259c19328 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -18,14 +18,13 @@
  */
 
 #include <memory>
+#include <editeng/frmdir.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
 #include <tools/fract.hxx>
-#include <editeng/frmdiritem.hxx>
 #include <svx/pageitem.hxx>
 #include <svx/pagectrl.hxx>
-#include <editeng/boxitem.hxx>
 #include <algorithm>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
diff --git a/svx/source/dialog/pagenumberlistbox.cxx b/svx/source/dialog/pagenumberlistbox.cxx
index 9b9b2b8724af..076da12e123e 100644
--- a/svx/source/dialog/pagenumberlistbox.cxx
+++ b/svx/source/dialog/pagenumberlistbox.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <svx/strings.hrc>
+
 #include <svx/dialmgr.hxx>
 #include <svx/pagenumberlistbox.hxx>
 #include <editeng/numitem.hxx>
diff --git a/svx/source/dialog/papersizelistbox.cxx b/svx/source/dialog/papersizelistbox.cxx
index c9c7a3001339..f746a023c38d 100644
--- a/svx/source/dialog/papersizelistbox.cxx
+++ b/svx/source/dialog/papersizelistbox.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/papersizelistbox.hxx>
 #include "page.hrc"
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 47642e3ec716..a6609d2009a4 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <svx/relfld.hxx>
-#include <vcl/builderfactory.hxx>
+#include <vcl/builder.hxx>
 
 SvxRelativeField::SvxRelativeField(
         vcl::Window *const pParent, WinBits const nBits, FieldUnit const eUnit)
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index ae962efdf4bc..f5309e843f0b 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -25,7 +25,6 @@
 
 #include <svx/ruler.hxx>
 #include <editeng/lrspitem.hxx>
-#include <editeng/ulspitem.hxx>
 #include <editeng/tstpitem.hxx>
 #include <editeng/protitem.hxx>
 #include "rlrcitem.hxx"
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 5bb302707769..2f949891215f 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -21,9 +21,7 @@
 #include <tools/debug.hxx>
 
 #include <osl/diagnose.h>
-#include <o3tl/any.hxx>
 #include <svx/rubydialog.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/viewfrm.hxx>
diff --git a/svx/source/dialog/samecontentlistbox.cxx b/svx/source/dialog/samecontentlistbox.cxx
index 9330c7ed58dc..66c628a1e78d 100644
--- a/svx/source/dialog/samecontentlistbox.cxx
+++ b/svx/source/dialog/samecontentlistbox.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <svx/strings.hrc>
+
 #include <svx/dialmgr.hxx>
 #include <svx/samecontentlistbox.hxx>
 #include <samecontent.hrc>
diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx
index 09517c8fd117..1cdb3cfc082a 100644
--- a/svx/source/dialog/searchcharmap.cxx
+++ b/svx/source/dialog/searchcharmap.cxx
@@ -21,23 +21,14 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
-#include <svtools/colorcfg.hxx>
 
-#include <rtl/textenc.h>
 #include <svx/ucsubset.hxx>
 #include <unordered_map>
 
 #include <svx/searchcharmap.hxx>
-#include <svx/svxdlg.hxx>
 
 #include <charmapacc.hxx>
-#include <uiobject.hxx>
 
-#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
-#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <svl/itemset.hxx>
-#include <unicode/uchar.h>
 #include <rtl/ustrbuf.hxx>
 
 using namespace ::com::sun::star::accessibility;
diff --git a/svx/source/dialog/spacinglistbox.cxx b/svx/source/dialog/spacinglistbox.cxx
index 4412e958c7ac..90cc689ccc6f 100644
--- a/svx/source/dialog/spacinglistbox.cxx
+++ b/svx/source/dialog/spacinglistbox.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <svx/strings.hrc>
+
 #include <svx/dialmgr.hxx>
 #include <svx/spacinglistbox.hxx>
 #include <unotools/localedatawrapper.hxx>
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 64f7681db67f..bba78509188c 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sal/macros.h>
 #include <osl/diagnose.h>
 #include <vcl/timer.hxx>
 #include <svl/slstitm.hxx>
@@ -51,7 +50,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <svl/itempool.hxx>
-#include <svl/intitem.hxx>
 
 #include <sfx2/app.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
@@ -61,13 +59,11 @@
 
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
-#include <svx/svxitems.hrc>
 
 #include <svl/srchitem.hxx>
 #include <svx/pageitem.hxx>
 #include "srchctrl.hxx"
 #include <svx/dialmgr.hxx>
-#include <svx/dlgutil.hxx>
 #include <editeng/brushitem.hxx>
 #include <tools/resary.hxx>
 #include <svx/svxdlg.hxx>
diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx
index e4e46975f394..2742c3f9584e 100644
--- a/svx/source/dialog/strarray.cxx
+++ b/svx/source/dialog/strarray.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/strarray.hxx>
 #include <tools/resary.hxx>
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 4d09a1a78348..f40c70fba991 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -22,38 +22,18 @@
 #include <svx/strings.hrc>
 #include <i18nlangtag/mslangid.hxx>
 #include <svtools/valueset.hxx>
-#include <svl/languageoptions.hxx>
 #include <editeng/numitem.hxx>
-#include <svl/eitem.hxx>
-#include <vcl/svapp.hxx>
 #include <svx/gallery.hxx>
-#include <svl/urihelper.hxx>
-#include <editeng/brushitem.hxx>
-#include <svl/intitem.hxx>
-#include <sfx2/objsh.hxx>
 #include <vcl/event.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
-#include <editeng/flstitem.hxx>
-#include <svx/dlgutil.hxx>
-#include <svx/xtable.hxx>
-#include <svx/drawitem.hxx>
 #include <svx/numvset.hxx>
-#include <sfx2/htmlmode.hxx>
-#include <unotools/pathoptions.hxx>
-#include <svtools/ctrltool.hxx>
-#include <editeng/unolingu.hxx>
 #include <com/sun/star/style/NumberingType.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/text/XDefaultNumberingProvider.hpp>
 #include <com/sun/star/text/XNumberingFormatter.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/text/XNumberingTypeInfo.hpp>
 
 #include <algorithm>
-#include <sfx2/opengrf.hxx>
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 39cb0c14f600..c159a1eca4ef 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -25,7 +25,6 @@
 #include <vcl/event.hxx>
 #include <vcl/field.hxx>
 #include <vcl/image.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
 #include <svl/eitem.hxx>
@@ -43,8 +42,6 @@
 #include <editeng/protitem.hxx>
 #include <osl/diagnose.h>
 
-#include <svx/svdtrans.hxx>
-
 #include "rlrcitem.hxx"
 #include <memory>
 
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index 2d213a32a67d..ab866786be82 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/poly.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx
index 9b194865333a..29b9243f8c4b 100644
--- a/svx/source/dialog/swframeposstrings.cxx
+++ b/svx/source/dialog/swframeposstrings.cxx
@@ -22,9 +22,7 @@
 #include <cassert>
 
 #include <svx/swframeposstrings.hxx>
-#include <tools/resary.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/strings.hrc>
 #include <swframeposstrings.hrc>
 
 OUString SvxSwFramePosString::GetString(StringId eId)
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 87803d7d20b9..052306aa0a9a 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -22,18 +22,12 @@
 #include <svx/txencbox.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/txenctab.hxx>
-#include <svx/strings.hrc>
 #if HAVE_FEATURE_DBCONNECTIVITY
 #include <svx/dbcharsethelper.hxx>
 #endif
 #include <unotools/syslocale.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 #include <rtl/tencinfo.h>
-#include <rtl/locale.h>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
-#include <osl/nlsupport.h>
 #include <txenctab.hrc>
 
 namespace
diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx
index f14180fb29df..b2d5cde4a359 100644
--- a/svx/source/dialog/txenctab.cxx
+++ b/svx/source/dialog/txenctab.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/txenctab.hxx>
 #include <txenctab.hrc>
diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx
index 60887fc46f8c..fe7872ac6eba 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/accessibility/XAccessibleText.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <editeng/eeitem.hxx>
diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx
index 91138d91b33b..abb7b39910f8 100644
--- a/svx/source/engine3d/camera3d.cxx
+++ b/svx/source/engine3d/camera3d.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <svx/camera3d.hxx>
-#include <tools/stream.hxx>
 
 Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt,
                    double fFocalLen) :
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 2a092ef89fec..dddf6c3c930a 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -24,7 +24,6 @@
 #include <svx/cube3d.hxx>
 #include <svx/globl3d.hxx>
 #include <basegfx/point/b3dpoint.hxx>
-#include <basegfx/polygon/b3dpolygon.hxx>
 #include <sdr/contact/viewcontactofe3dcube.hxx>
 
 
diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx
index ba1ab8835ddb..76589032bca6 100644
--- a/svx/source/engine3d/deflt3d.cxx
+++ b/svx/source/engine3d/deflt3d.cxx
@@ -19,10 +19,6 @@
 
 
 #include <svx/deflt3d.hxx>
-#include <svx/cube3d.hxx>
-#include <svx/svxids.hrc>
-#include <editeng/colritem.hxx>
-#include <svx/e3ditem.hxx>
 
 // Class to manage the 3D default attributes
 
diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx
index 47268fcda660..b1d99ddfd2b3 100644
--- a/svx/source/engine3d/e3dundo.cxx
+++ b/svx/source/engine3d/e3dundo.cxx
@@ -18,10 +18,6 @@
  */
 
 #include <svx/e3dundo.hxx>
-#include <svx/svdmodel.hxx>
-#include <editeng/outlobj.hxx>
-#include <svx/view3d.hxx>
-#include <svx/scene3d.hxx>
 #include <svx/e3dsceneupdater.hxx>
 
 
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 13d4488afc83..0b66f8e0b977 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -21,22 +21,18 @@
 #include <svx/strings.hrc>
 #include <svx/deflt3d.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/svdpage.hxx>
 #include <svx/globl3d.hxx>
 #include <svx/extrud3d.hxx>
-#include <svx/scene3d.hxx>
 
-#include <svx/svxids.hrc>
-#include <svx/xpoly.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svx3ditems.hxx>
 #include <svx/xlineit0.hxx>
 #include <sdr/properties/e3dextrudeproperties.hxx>
 #include <sdr/contact/viewcontactofe3dextrude.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/polygon/b3dpolygontools.hxx>
 #include <basegfx/polygon/b3dpolypolygontools.hxx>
 
 
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index c449f1c3505d..37d154ff22dc 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -23,27 +23,18 @@
 #include <sfx2/module.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <svl/itempool.hxx>
 #include <svtools/colrdlg.hxx>
-#include <sfx2/viewsh.hxx>
 #include <svx/colorbox.hxx>
 #include <svx/f3dchild.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xlineit0.hxx>
-#include <svx/svdmodel.hxx>
-#include <svx/globl3d.hxx>
-#include <svx/view3d.hxx>
-#include <svx/obj3d.hxx>
-#include <svx/sphere3d.hxx>
-#include <svx/scene3d.hxx>
-#include <svx/camera3d.hxx>
 #include <svx/fmmodel.hxx>
-#include <svx/fmpage.hxx>
-#include <editeng/eeitem.hxx>
-#include <svl/style.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/sdshitm.hxx>
+#include <svx/svx3ditems.hxx>
 
 #include <svx/dialmgr.hxx>
 #include <svx/viewpt3d.hxx>
@@ -52,8 +43,8 @@
 #include <svx/strings.hrc>
 
 #include <editeng/colritem.hxx>
+#include <osl/diagnose.h>
 #include <svx/e3ditem.hxx>
-#include <svx/gallery.hxx>
 #include <svl/whiter.hxx>
 #include <svtools/unitconv.hxx>
 
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 1b6b16557e9b..47ae21449a1b 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -21,12 +21,8 @@
 #include <svx/deflt3d.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
-#include <tools/poly.hxx>
-#include <svx/svdpage.hxx>
 #include <svx/globl3d.hxx>
 #include <svx/lathe3d.hxx>
-#include <svx/xpoly.hxx>
-#include <svx/svxids.hrc>
 #include <svx/svdopath.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svx3ditems.hxx>
@@ -34,7 +30,6 @@
 #include <sdr/properties/e3dlatheproperties.hxx>
 #include <sdr/contact/viewcontactofe3dlathe.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 
 
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 911a9b7ff70a..0094f7e86c60 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -21,52 +21,18 @@
 
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
-#include <svx/svdview.hxx>
-#include <svx/svdpage.hxx>
+#include <svx/svdhdl.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/svditer.hxx>
 #include <svx/globl3d.hxx>
-#include <svx/camera3d.hxx>
 #include <svx/scene3d.hxx>
-#include <svx/cube3d.hxx>
-#include <svx/lathe3d.hxx>
-#include <svx/sphere3d.hxx>
-#include <svx/extrud3d.hxx>
 #include <svx/obj3d.hxx>
-#include <svx/xtable.hxx>
-#include <svx/xflclit.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
-#include <svx/xlnclit.hxx>
-#include <svl/metitem.hxx>
-#include <svx/xlnwtit.hxx>
-#include <vcl/virdev.hxx>
-#include <tools/poly.hxx>
-#include <tools/b3dtrans.hxx>
-#include <svx/svxids.hrc>
-#include <editeng/colritem.hxx>
-#include <svx/e3ditem.hxx>
-#include <svx/xlntrit.hxx>
-#include <svx/xfltrit.hxx>
-#include <svx/svdpagv.hxx>
-#include <vcl/gradient.hxx>
-#include <vcl/metaact.hxx>
-#include <svx/svx3ditems.hxx>
-#include <svl/whiter.hxx>
-#include <svtools/colorcfg.hxx>
-#include <editeng/eeitem.hxx>
-#include <svx/xgrscit.hxx>
 #include <sdr/properties/e3dproperties.hxx>
 #include <sdr/properties/e3dcompoundproperties.hxx>
 #include <basegfx/polygon/b3dpolypolygontools.hxx>
 #include <basegfx/point/b3dpoint.hxx>
-#include <basegfx/vector/b3dvector.hxx>
-#include <svx/xlndsit.hxx>
 #include <basegfx/matrix/b3dhommatrix.hxx>
-#include <basegfx/polygon/b3dpolygon.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <basegfx/polygon/b3dpolygontools.hxx>
 #include <svx/helperhittest3d.hxx>
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
 #include <drawinglayer/geometry/viewinformation3d.hxx>
diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx
index 58e1479e413b..aed342eab8ee 100644
--- a/svx/source/engine3d/objfac3d.cxx
+++ b/svx/source/engine3d/objfac3d.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/svdpage.hxx>
 #include <svx/globl3d.hxx>
 #include <svx/cube3d.hxx>
 #include <svx/sphere3d.hxx>
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index b69a4ad35231..12cdb312b58a 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <svx/polygn3d.hxx>
-#include <svx/svdpage.hxx>
 #include <svx/globl3d.hxx>
 #include <basegfx/point/b3dpoint.hxx>
 #include <sdr/contact/viewcontactofe3dpolygon.hxx>
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index ad77779c02b1..7ca73dd76b83 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -25,18 +25,8 @@
 #include <stdlib.h>
 #include <svx/globl3d.hxx>
 #include <svx/svdpage.hxx>
-#include <svl/style.hxx>
 #include <svx/scene3d.hxx>
-#include <svx/e3dundo.hxx>
 #include <svx/svdtrans.hxx>
-#include <svx/svxids.hrc>
-#include <editeng/colritem.hxx>
-#include <svx/e3ditem.hxx>
-#include <svx/xlntrit.hxx>
-#include <svx/xfltrit.hxx>
-#include <svx/svx3ditems.hxx>
-#include <svl/whiter.hxx>
-#include <svx/xflftrit.hxx>
 #include <sdr/properties/e3dsceneproperties.hxx>
 #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
 #include <svx/svddrag.hxx>
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 0f5f9b5d88df..95f439db5bc9 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -22,17 +22,13 @@
 #include <svx/deflt3d.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/svdpage.hxx>
 #include <svx/globl3d.hxx>
 #include <svx/sphere3d.hxx>
 
-#include <svx/svxids.hrc>
-#include <svx/svx3ditems.hxx>
 #include <sdr/properties/e3dsphereproperties.hxx>
 #include <basegfx/vector/b3dvector.hxx>
 #include <basegfx/point/b3dpoint.hxx>
 #include <sdr/contact/viewcontactofe3dsphere.hxx>
-#include <basegfx/polygon/b3dpolygon.hxx>
 
 // DrawContact section
 std::unique_ptr<sdr::contact::ViewContact> E3dSphereObj::CreateObjectSpecificViewContact()
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 4fd79ce943fd..07ec90033d43 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -18,49 +18,33 @@
  */
 
 
-#include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svditer.hxx>
-#include <svx/svdpool.hxx>
-#include <svx/svdorect.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/svxids.hrc>
 #include <editeng/colritem.hxx>
 #include <editeng/eeitem.hxx>
-#include <svx/xtable.hxx>
 #include <svx/svdview.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
-#include <svx/globl3d.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/lathe3d.hxx>
-#include <svx/sphere3d.hxx>
 #include <svx/extrud3d.hxx>
-#include <svx/cube3d.hxx>
 #include <dragmt3d.hxx>
+#include <svx/scene3d.hxx>
 #include <svx/view3d.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
-#include <svx/svdograf.hxx>
-#include <svx/xbtmpit.hxx>
-#include <svx/xflbmtit.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xlineit0.hxx>
 #include <basegfx/range/b2drange.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svx/xlnwtit.hxx>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/sdrpaintwindow.hxx>
-#include <svx/sdr/contact/viewcontactofe3dscene.hxx>
-#include <drawinglayer/geometry/viewinformation3d.hxx>
-#include <svx/sdrpagewindow.hxx>
-#include <svx/sdr/contact/displayinfo.hxx>
-#include <svx/sdr/contact/objectcontact.hxx>
-#include <svx/sdr/contact/viewobjectcontact.hxx>
+#include <svx/sdr/contact/viewcontact.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 6f275fb2a919..332cc825aae4 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -18,29 +18,18 @@
  */
 
 
-#include <svx/svditer.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svxids.hrc>
-#include <svx/xtable.hxx>
-#include <svx/fmview.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
-#include <svx/globl3d.hxx>
-#include <svx/obj3d.hxx>
-#include <svx/e3ditem.hxx>
-#include <editeng/colritem.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/sphere3d.hxx>
 #include <svx/extrud3d.hxx>
-#include <svx/e3dundo.hxx>
 #include <svx/view3d.hxx>
 #include <svx/cube3d.hxx>
-#include <svx/xflclit.hxx>
 #include <svx/xlineit0.hxx>
-#include <svx/svdogrp.hxx>
-#include <svx/e3dsceneupdater.hxx>
 #include <com/sun/star/drawing/LineStyle.hpp>
 
 void E3dView::ConvertMarkedToPolyObj()
diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx
index bbf63fd4d6e7..660af6adfbe6 100644
--- a/svx/source/engine3d/viewpt3d2.cxx
+++ b/svx/source/engine3d/viewpt3d2.cxx
@@ -18,8 +18,6 @@
  */
 
 #include <svx/viewpt3d.hxx>
-#include <basegfx/range/b3drange.hxx>
-#include <o3tl/numeric.hxx>
 
 Viewport3D::Viewport3D() :
     aVRP(0, 0, 5),