tdf#42949 Fix IWYU warnings in svx/source/[t-x]*/*cxx

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

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

82 files changed, 47 insertions, 373 deletions

diff --git a/svx/IwyuFilter_svx.yaml b/svx/IwyuFilter_svx.yaml
index f0ceb56b01b6..243e78dd7f28 100644
--- a/svx/IwyuFilter_svx.yaml
+++ b/svx/IwyuFilter_svx.yaml
@@ -101,3 +101,18 @@ blacklist:
     svx/source/svdraw/svdorect.cxx:
     # Actually used
     - svx/svdopath.hxx
+    svx/source/table/accessiblecell.cxx:
+    # Needed for SvxTextEditSource object instantiation
+    - svx/svdotext.hxx
+    svx/source/unodraw/recoveryui.cxx:
+    # Needed for LIBO_ETC_FOLDER on WIN32
+    - config_folders.h
+    svx/source/unodraw/unoshcol.cxx:
+    # Don't propose hxx -> h change in URE libs
+    - cppuhelper/interfacecontainer.hxx
+    svx/source/unodraw/unoshape.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
+    svx/source/unodraw/unoprov.cxx:
+    # Needed for UnoType instantiation
+    - com/sun/star/lang/Locale.hpp
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 67b4e44d17b7..9c4b689490c0 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -21,22 +21,19 @@
 #include <sal/log.hxx>
 
 #include <memory>
-#include <utility>
 
 #include "accessiblecell.hxx"
 #include <cell.hxx>
 
-#include <DescriptionGenerator.hxx>
-
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 
+#include <editeng/unoedsrc.hxx>
 #include <vcl/svapp.hxx>
 
 #include <unotools/accessiblestatesethelper.hxx>
 #include <comphelper/string.hxx>
-#include <editeng/outlobj.hxx>
 #include <svx/IAccessibleViewForwarder.hxx>
 #include <svx/unoshtxt.hxx>
 #include <svx/svdotext.hxx>
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 38b8ff5b03b0..c9b2c666aa1d 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
-#include <comphelper/accessiblewrapper.hxx>
 #include <vcl/svapp.hxx>
 
 #include <AccessibleTableShape.hxx>
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index a58957841d53..070e47952776 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -26,8 +26,6 @@
 #include <com/sun/star/lang/Locale.hpp>
 
 #include <comphelper/sequence.hxx>
-#include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <o3tl/any.hxx>
 #include <svl/style.hxx>
 #include <svl/itemset.hxx>
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 45f89f38268f..545d9759d9af 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -33,35 +33,27 @@
 #include <svl/style.hxx>
 #include <editeng/editstat.hxx>
 #include <editeng/outlobj.hxx>
-#include <svx/svdview.hxx>
 #include <sdr/properties/textproperties.hxx>
+#include <svx/svdmodel.hxx>
 #include <svx/svdotable.hxx>
 #include <svx/svdhdl.hxx>
 #include "viewcontactoftableobj.hxx"
 #include <svx/svdoutl.hxx>
 #include <svx/svddrag.hxx>
-#include <svx/svdpagv.hxx>
 #include <tablemodel.hxx>
 #include <cell.hxx>
-#include <svx/xflclit.hxx>
 #include "tablelayouter.hxx"
-#include <svx/svdetc.hxx>
 #include "tablehandles.hxx"
-#include <editeng/boxitem.hxx>
-#include <svx/framelink.hxx>
 #include <svx/sdr/table/tabledesign.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <editeng/writingmodeitem.hxx>
 #include <editeng/frmdiritem.hxx>
-#include <svx/xflhtit.hxx>
-#include <svx/xflftrit.hxx>
-#include <svx/xfltrit.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <libxml/xmlwriter.h>
 
-#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
 
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 8067aec8a759..5a397d8d7aa0 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -48,10 +48,6 @@
 #include <svx/svdoutl.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdetc.hxx>
-#include <editeng/editobj.hxx>
-#include <editeng/editstat.hxx>
-#include <editeng/unolingu.hxx>
-#include <svx/sdrpagewindow.hxx>
 #include <svx/selectioncontroller.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/sdrpaintwindow.hxx>
@@ -75,7 +71,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/lok.hxx>
 #include <sfx2/viewsh.hxx>
-#include <sfx2/lokhelper.hxx>
 #include <editeng/editview.hxx>
 
 using ::editeng::SvxBorderLine;
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index 153cfc3f72c4..b5c697eb6235 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -39,7 +39,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/sequence.hxx>
 
-#include <svx/unoprov.hxx>
 #include <svx/sdr/table/tabledesign.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index 2760755421c1..796aa5ead4cd 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -20,15 +20,10 @@
 
 #include "tablehandles.hxx"
 
-#include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/canvastools.hxx>
-#include <vcl/hatch.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <basegfx/range/b2drectangle.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/sdrpagewindow.hxx>
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 492208a99586..b5dddef4ddd1 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -25,18 +25,12 @@
 #include <libxml/xmlwriter.h>
 
 #include <cell.hxx>
-#include "cellrange.hxx"
 #include <o3tl/safeint.hxx>
 #include <tablemodel.hxx>
-#include "tablerow.hxx"
-#include "tablerows.hxx"
-#include "tablecolumn.hxx"
-#include "tablecolumns.hxx"
 #include "tablelayouter.hxx"
 #include <svx/svdotable.hxx>
 #include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
-#include <svx/svdmodel.hxx>
 
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx
index 479098ae817d..8698f72f427c 100644
--- a/svx/source/table/tablerows.cxx
+++ b/svx/source/table/tablerows.cxx
@@ -20,7 +20,7 @@
 
 #include <com/sun/star/lang/DisposedException.hpp>
 
-#include <cell.hxx>
+#include <tablemodel.hxx>
 #include "tablerow.hxx"
 #include "tablerows.hxx"
 
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index 0b22906274dd..b759c5dba460 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -34,7 +34,6 @@
 #include <editeng/udlnitem.hxx>
 
 #include <cell.hxx>
-#include <celltypes.hxx>
 #include <svx/svdotable.hxx>
 #include <svx/svdoutl.hxx>
 #include <editeng/editeng.hxx>
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 9f8ed6c0aa97..b82dd6ff3bcd 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -27,13 +27,10 @@
 #include <tools/stream.hxx>
 #include <svtools/rtftoken.h>
 
-#include <editeng/eeitem.hxx>
 #include <svx/svdetc.hxx>
-#include <editeng/fhgtitem.hxx>
 #include <editeng/outlobj.hxx>
 
 #include <cell.hxx>
-#include <celltypes.hxx>
 #include <svx/svdotable.hxx>
 #include <svx/svdoutl.hxx>
 #include <editeng/editeng.hxx>
@@ -41,6 +38,7 @@
 #include <svx/svdmodel.hxx>
 #include <editeng/svxrtf.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::table;
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index 1666a4dd5a4c..8f57f94d96d5 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -22,16 +22,12 @@
 #include <svx/svdotable.hxx>
 #include <com/sun/star/table/XTable.hpp>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <sdr/primitive2d/sdrattributecreator.hxx>
-#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
 #include <sdr/primitive2d/sdrdecompositiontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <sdr/attribute/sdrtextattribute.hxx>
 #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx>
 #include <editeng/borderline.hxx>
-#include <drawinglayer/primitive2d/borderlineprimitive2d.hxx>
 #include <sdr/attribute/sdrfilltextattribute.hxx>
 #include <drawinglayer/attribute/sdrlineattribute.hxx>
 #include <drawinglayer/attribute/sdrshadowattribute.hxx>
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index f8bfd20bf561..322c1e3b1647 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -28,13 +28,11 @@
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/tbxcolorupdate.hxx>
-#include <vcl/toolbox.hxx>
 #include <svtools/colrdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <stack>
 #include <set>
-#include <cppu/unotype.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
diff --git a/svx/source/tbxctrls/SvxColorChildWindow.cxx b/svx/source/tbxctrls/SvxColorChildWindow.cxx
index 849cfc1344e9..c7fb9a683b50 100644
--- a/svx/source/tbxctrls/SvxColorChildWindow.cxx
+++ b/svx/source/tbxctrls/SvxColorChildWindow.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <svx/SvxColorChildWindow.hxx>
-#include <sfx2/dockwin.hxx>
 #include <svx/svxids.hrc>
 #include <colrctrl.hxx>
 
diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx
index e19a9421e2de..92b0e4233a6c 100644
--- a/svx/source/tbxctrls/SvxPresetListBox.cxx
+++ b/svx/source/tbxctrls/SvxPresetListBox.cxx
@@ -22,7 +22,6 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/image.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 
 SvxPresetListBox::SvxPresetListBox(std::unique_ptr<weld::ScrolledWindow> pWindow)
     : SvtValueSet(std::move(pWindow))
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index fc3244e193ef..eefda3a79edd 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -12,17 +12,15 @@
 
 #include <comphelper/propertysequence.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <i18nlangtag/mslangid.hxx>
 #include <svtools/popupwindowcontroller.hxx>
 #include <svtools/toolbarmenu.hxx>
-#include <sfx2/weldutils.hxx>
-#include <sfx2/tbxctrl.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/numvset.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 
 namespace {
 
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 1f6208698790..7cf6c7a18cc3 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <sot/exchange.hxx>
-#include <sot/storage.hxx>
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index b58df356877f..cdd5e1e34ae7 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -18,23 +18,11 @@
  */
 
 
-#include <string>
-
 #include <svtools/toolbarmenu.hxx>
-#include <svx/colorwindow.hxx>
 #include <vcl/toolbox.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/objsh.hxx>
-#include <svl/eitem.hxx>
-#include <vcl/event.hxx>
-#include <vcl/settings.hxx>
-#include <svl/intitem.hxx>
-#include <editeng/colritem.hxx>
 
 #include <svx/strings.hrc>
 #include <svx/svdtrans.hxx>
-#include <svx/sdasitm.hxx>
 #include <svx/dialmgr.hxx>
 
 #include <helpids.h>
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index ec688a42d01a..17f15cba42bb 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -21,6 +21,8 @@
 
 #include <svtools/toolbarmenu.hxx>
 #include <svtools/popupwindowcontroller.hxx>
+#include <svtools/valueset.hxx>
+#include <vcl/customweld.hxx>
 
 class ValueSet;
 
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 441c22864295..7f258c34043a 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -17,13 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <string>
-#include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
-#include <sfx2/sidebar/SidebarToolBox.hxx>
 #include <rtl/ustring.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index fb191fec46c2..d7dea7f070e1 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -21,39 +21,26 @@
 #include <com/sun/star/text/WritingMode.hpp>
 
 #include <vcl/toolbox.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
 
 #include <svl/itempool.hxx>
 
 #include <svtools/toolbarmenu.hxx>
 #include <svtools/popupwindowcontroller.hxx>
-#include <svtools/popupmenucontrollerbase.hxx>
-
-#include <sfx2/app.hxx>
-#include <sfx2/dispatch.hxx>
-
-#include <editeng/eeitem.hxx>
-#include <editeng/frmdiritem.hxx>
 
 #include <svx/fmmodel.hxx>
-#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 #include <svx/svdpage.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
-#include <svx/svdoutl.hxx>
 
 #include <svx/gallery.hxx>
-#include <svx/dlgutil.hxx>
 #include <svx/fontworkgallery.hxx>
 
 #include <algorithm>
 #include <memory>
 
-#include <bitmaps.hlst>
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index 43352b79098b..9126437107bc 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -21,7 +21,6 @@
 #include <svx/formatpaintbrushctrl.hxx>
 
 #include <svl/eitem.hxx>
-#include <sfx2/app.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 2013f544cd16..7e55776c2998 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -17,21 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <string>
-
-#include <i18nutil/unicode.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/idle.hxx>
-#include <vcl/svapp.hxx>
 #include <svl/intitem.hxx>
+#include <svl/itempool.hxx>
 #include <svl/eitem.hxx>
 #include <svl/whiter.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/basedlgs.hxx>
+#include <sfx2/InterimItemWindow.hxx>
+#include <sfx2/sfxdlg.hxx>
 #include <tools/urlobj.hxx>
 
 #include <svx/dialogs.hrc>
@@ -41,7 +37,6 @@
 #include <editeng/sizeitem.hxx>
 #include <svx/sdgcpitm.hxx>
 
-#include <svx/itemwin.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdmodel.hxx>
@@ -59,17 +54,12 @@
 
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 
-#include <comphelper/lok.hxx>
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 
-#include <svx/svxdlg.hxx>
-
 #define TOOLBOX_NAME                "colorbar"
 #define RID_SVXSTR_UNDO_GRAFCROP    RID_SVXSTR_GRAFCROP
 
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index f51110a55cd5..a294e115307e 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -21,11 +21,9 @@
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 
-#include <sfx2/dispatch.hxx>
-#include <sfx2/objsh.hxx>
+#include <sfx2/tbxctrl.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/module.hxx>
-#include <tools/urlobj.hxx>
 
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
@@ -33,22 +31,11 @@
 
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
-#include <svx/svxids.hrc>
 
-#include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
-#include <svx/xlineit0.hxx>
-#include <svx/xlndsit.hxx>
 #include <svx/xtable.hxx>
-#include <svx/drawitem.hxx>
-#include <svx/dlgutil.hxx>
 #include <svx/itemwin.hxx>
-#include <svx/linectrl.hxx>
-#include <svtools/colorcfg.hxx>
 #include <svtools/unitconv.hxx>
-#include <svtools/valueset.hxx>
-
-#include <boost/property_tree/json_parser.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 0e7691017ad3..6683500ec4a0 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -17,19 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <string>
 #include <vcl/customweld.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
-#include <svl/intitem.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/app.hxx>
 
 #include <svx/strings.hrc>
-#include <svx/svxids.hrc>
 #include <svx/layctrl.hxx>
 #include <svx/dialmgr.hxx>
 #include <comphelper/processfactory.hxx>
@@ -37,7 +31,6 @@
 #include <svtools/toolbarmenu.hxx>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 
 // namespaces
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 5497381f02dc..1c9a902035ea 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -19,33 +19,21 @@
 
 #include <sal/config.h>
 
-#include <tools/debug.hxx>
 #include <sal/types.h>
 #include <vcl/lstbox.hxx>
 #include <vcl/toolbox.hxx>
-#include <vcl/event.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/viewsh.hxx>
-#include <svl/intitem.hxx>
-#include <svl/eitem.hxx>
-#include <svl/slstitm.hxx>
-#include <svl/stritem.hxx>
 #include <svtools/toolbarmenu.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/lboxctrl.hxx>
-#include <vcl/mnemonic.hxx>
 #include <vcl/settings.hxx>
 #include <tools/urlobj.hxx>
 
-#include <svx/svxids.hrc>
 #include <svx/strings.hrc>
 
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 
 
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 7b2ccc2bb242..fbd2eab615df 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -17,13 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <string>
-
+#include <tools/debug.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
 
 #include <svtools/toolbarmenu.hxx>
@@ -36,7 +33,6 @@
 
 #include <svx/drawitem.hxx>
 #include <svx/xlineit0.hxx>
-#include <svx/xlnwtit.hxx>
 #include <svx/xlndsit.hxx>
 #include <svx/xlnstit.hxx>
 #include <svx/xlnedit.hxx>
@@ -45,7 +41,7 @@
 #include <svx/itemwin.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/tbxcolorupdate.hxx>
-#include <svx/unoapi.hxx>
+
 #include <memory>
 
 #include <comphelper/lok.hxx>
diff --git a/svx/source/tbxctrls/linewidthctrl.cxx b/svx/source/tbxctrls/linewidthctrl.cxx
index 61f48a0293e5..fb20d71ce2f7 100644
--- a/svx/source/tbxctrls/linewidthctrl.cxx
+++ b/svx/source/tbxctrls/linewidthctrl.cxx
@@ -17,34 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <string>
-
 #include <vcl/toolbox.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/objsh.hxx>
-
-#include <svtools/toolbarmenu.hxx>
-#include <svtools/popupwindowcontroller.hxx>
-#include <svtools/valueset.hxx>
 
-#include <svx/strings.hrc>
 #include <svx/svxids.hrc>
-#include <helpids.h>
-
-#include <svx/drawitem.hxx>
-#include <svx/xlineit0.hxx>
 #include <svx/xlnwtit.hxx>
-#include <svx/xlndsit.hxx>
-#include <svx/xlnstit.hxx>
-#include <svx/xlnedit.hxx>
-#include <svx/xtable.hxx>
 #include <svx/linectrl.hxx>
 #include <svx/itemwin.hxx>
-#include <svx/dialmgr.hxx>
-#include <svx/tbxcolorupdate.hxx>
-#include <svx/unoapi.hxx>
-#include <memory>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index e49b73b5a1f6..90bb6f1aa3fd 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -17,19 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <string>
 #include <typeinfo>
 #include <utility>
 
 #include <comphelper/propertysequence.hxx>
 #include <tools/color.hxx>
 #include <svl/poolitem.hxx>
-#include <svl/eitem.hxx>
 #include <svl/itemset.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/event.hxx>
 #include <vcl/toolbox.hxx>
-#include <vcl/bitmapaccess.hxx>
 #include <vcl/menubtn.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/vclptr.hxx>
@@ -38,25 +35,14 @@
 #include <svl/style.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svtools/borderhelper.hxx>
-#include <svl/stritem.hxx>
 #include <sfx2/tplpitem.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/docfac.hxx>
-#include <sfx2/templdlg.hxx>
-#include <svl/isethint.hxx>
 #include <sfx2/sfxstatuslistener.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/urlobj.hxx>
-#include <sfx2/childwin.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <sfx2/weldutils.hxx>
 #include <unotools/fontoptions.hxx>
-#include <vcl/mnemonic.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
-#include <svtools/colorcfg.hxx>
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
@@ -66,10 +52,8 @@
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <svx/strings.hrc>
-#include <svx/svxitems.hrc>
 #include <svx/svxids.hrc>
 #include <helpids.h>
-#include <sfx2/htmlmode.hxx>
 #include <sfx2/sidebar/Sidebar.hxx>
 #include <sfx2/sidebar/SidebarToolBox.hxx>
 #include <svx/xtable.hxx>
@@ -92,19 +76,15 @@
 #include <editeng/cmapitem.hxx>
 #include <svx/colorwindow.hxx>
 #include <svx/colorbox.hxx>
-#include <svx/drawitem.hxx>
 #include <svx/tbcontrl.hxx>
-#include <svx/dlgutil.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/PaletteManager.hxx>
 #include <memory>
 
-#include <svx/framelink.hxx>
 #include <svx/tbxcolorupdate.hxx>
 #include <editeng/eerdll.hxx>
 #include <editeng/editrids.hrc>
 #include <svx/xdef.hxx>
-#include <svx/xlnclit.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
 #include <svl/currencytable.hxx>
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 717bb13fab6d..6cf14a541f1c 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 
-#include <rtl/ref.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 43c1d7ec456c..ccda505616b0 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -55,7 +55,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/svapp.hxx>
-#include <rtl/ref.hxx>
 #include <rtl/instance.hxx>
 #include <svx/srchdlg.hxx>
 #include <vcl/event.hxx>
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index f434c4334a9e..4aa985bb70a9 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -21,7 +21,6 @@
 #include <svx/tbxcolor.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
 
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 554bf0205c7b..31948678b7a7 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -21,7 +21,6 @@
 #include <svx/drawitem.hxx>
 #include <svx/tbxcolorupdate.hxx>
 #include <svx/svxids.hrc>
-#include <svx/unomid.hxx>
 #include <svx/xdef.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/xlndsit.hxx>
@@ -32,7 +31,6 @@
 #include <vcl/virdev.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/settings.hxx>
-#include <tools/debug.hxx>
 
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 06b9498ebc5f..782c6a8f0ee0 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -18,16 +18,11 @@
  */
 
 
-#include <string>
-
-#include <svl/aeitem.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/viewfrm.hxx>
+#include <svl/eitem.hxx>
 #include <vcl/toolbox.hxx>
 
 #include <svx/tbxctl.hxx>
-#include <svx/tbxcolor.hxx>
+
 #include <com/sun/star/frame/XLayoutManager.hpp>
 
 SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlDraw, SfxBoolItem);
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 2176ae8b6362..02e245d3fa85 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -18,11 +18,8 @@
  */
 
 #include <cppuhelper/supportsservice.hxx>
-#include <svx/svxids.hrc>
 #include <svx/verttexttbxctrl.hxx>
 #include <svl/languageoptions.hxx>
-#include <sfx2/app.hxx>
-#include <svl/eitem.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/weld.hxx>
 #include <rtl/ustring.hxx>
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 28ad299ad3e3..f19637c85976 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/drawing/ProjectionMode.hpp>
 #include <svx/svxids.hrc>
 #include <svx/svdundo.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index ef2fef09e452..ae46b755b76e 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <svx/svdundo.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/viewsh.hxx>
@@ -29,20 +28,18 @@
 #include <svx/dialmgr.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/strings.hrc>
+#include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>
 #include <svx/sdasitm.hxx>
 #include <svx/gallery.hxx>
 #include <svx/fmmodel.hxx>
-#include <svx/fmpage.hxx>
 #include <svx/sdtfsitm.hxx>
 #include <svl/itempool.hxx>
 #include <svl/stritem.hxx>
-#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <sfx2/bindings.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/charscaleitem.hxx>
 #include <editeng/kernitem.hxx>
-#include <svx/sdrpaintwindow.hxx>
 
 #include <svx/svxids.hrc>
 #include <svx/fontworkbar.hxx>
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 30a6148e675d..54961330c503 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -29,9 +29,6 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <unotools/lingucfg.hxx>
 #include <unotools/linguprops.hxx>
-#include <unotools/intlwrapper.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
 #include <osl/diagnose.h>
 
 namespace textconversiondlgs
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 3ea8a2cfff26..ec3d64ed3218 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -21,9 +21,7 @@
 #include "chinese_translation_unodialog.hxx"
 #include "chinese_translationdialog.hxx"
 #include <vcl/svapp.hxx>
-#include <toolkit/awt/vclxwindow.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 66b1974ffeb9..d178a8477e88 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -45,15 +45,12 @@
 #include <vcl/metaact.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/FilterConfigItem.hxx>
 #include <svl/outstrm.hxx>
 #include <sdr/contact/objectcontactofobjlistpainter.hxx>
 #include <svx/sdr/contact/viewobjectcontact.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
-#include <svx/sdr/contact/viewcontactofsdrobj.hxx>
 #include <editeng/numitem.hxx>
-#include <svx/svdpagv.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/xoutbmp.hxx>
 #include <vcl/graphicfilter.hxx>
@@ -63,8 +60,6 @@
 #include <svx/fmview.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/unopage.hxx>
-#include <svx/pageitem.hxx>
-#include <editeng/eeitem.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/xlineit0.hxx>
 #include <editeng/flditem.hxx>
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 56fe86d489ca..612877880ada 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -22,7 +22,6 @@
 
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
-#include <svl/style.hxx>
 #include <comphelper/profilezone.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index d9c196a2dda3..d04006478cda 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -29,14 +29,12 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <svl/itempool.hxx>
-#include <svx/unoapi.hxx>
 #include <editeng/xmlcnitm.hxx>
 
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::lang;
 
 namespace svx
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 884eaa92a8cf..7ebed700dac7 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -36,8 +36,6 @@
 #include <svx/xdef.hxx>
 
 #include <svx/unoapi.hxx>
-#include <editeng/unoprnms.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 
 using namespace com::sun::star;
diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx
index 575c9ecc189a..37b661ac60c5 100644
--- a/svx/source/unodraw/gluepts.cxx
+++ b/svx/source/unodraw/gluepts.cxx
@@ -17,18 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/container/XIdentifierContainer.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/drawing/GluePoint2.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 #include <cppuhelper/implbase.hxx>
 #include <tools/weakbase.hxx>
 
-#include <svx/svdmodel.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdglue.hxx>
-#include <svx/svdpage.hxx>
 
 #include "gluepts.hxx"
 
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 883cfa77cf1d..56550fd7f433 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -20,11 +20,9 @@
 #include <config_folders.h>
 
 #include <docrecovery.hxx>
-#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XSynchronousDispatch.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
@@ -32,9 +30,6 @@
 #include <cppuhelper/supportsservice.hxx>
 
 #include <vcl/svapp.hxx>
-#include <vcl/window.hxx>
-
-#include <officecfg/Office/Recovery.hxx>
 
 namespace svxdr = svx::DocRecovery;
 using namespace ::osl;
diff --git a/svx/source/unodraw/unobrushitemhelper.cxx b/svx/source/unodraw/unobrushitemhelper.cxx
index b8856fdd53b1..f62356026efa 100644
--- a/svx/source/unodraw/unobrushitemhelper.cxx
+++ b/svx/source/unodraw/unobrushitemhelper.cxx
@@ -21,24 +21,19 @@
 
 #include <algorithm>
 
+#include <osl/diagnose.h>
+#include <svl/itemset.hxx>
 #include <svx/unobrushitemhelper.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xbtmpit.hxx>
-#include <svx/xgrscit.hxx>
 #include <svx/xflbmtit.hxx>
 #include <svx/xflbmpit.hxx>
-#include <svx/xflbmsxy.hxx>
 #include <svx/xflftrit.hxx>
-#include <svx/xsflclit.hxx>
-#include <svx/xflbmsli.hxx>
-#include <svx/xflbtoxy.hxx>
 #include <svx/xflbstit.hxx>
-#include <svx/xflboxy.hxx>
 #include <svx/xflbckit.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xfltrit.hxx>
-#include <svx/unoshape.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index 4d9c5ded9bfd..0b3dae21f2d4 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -17,20 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svl/itempool.hxx>
-#include <vcl/cvtgrf.hxx>
-#include <svl/itemset.hxx>
 #include <svx/xit.hxx>
 #include "UnoNameItemTable.hxx"
 
 #include <svx/xbtmpit.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/xflhtit.hxx>
-#include <svx/unoapi.hxx>
 #include <svx/unomid.hxx>
-#include <editeng/unoprnms.hxx>
 #include <svx/unofill.hxx>
-#include <editeng/memberids.h>
 #include <com/sun/star/awt/XBitmap.hpp>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index 9cf86c223894..ae2465900d51 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -18,15 +18,11 @@
  */
 
 #include <com/sun/star/drawing/LineDash.hpp>
-#include <svl/itempool.hxx>
-#include <svl/itemset.hxx>
 
-#include <vector>
 #include "UnoNameItemTable.hxx"
 #include <svx/xlndsit.hxx>
 #include <svx/unomid.hxx>
 
-#include <svx/xdash.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/unofill.hxx>
 
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index d7b66ef76513..fa46aee4e28a 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -18,11 +18,8 @@
  */
 
 #include <com/sun/star/awt/Gradient.hpp>
-#include <svl/itempool.hxx>
-#include <svl/itemset.hxx>
 #include "UnoNameItemTable.hxx"
 
-#include <svx/xgrad.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/xdef.hxx>
 #include <svx/xflgrit.hxx>
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index 9adb450007e2..47cf857d08ec 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -18,11 +18,8 @@
  */
 
 #include <com/sun/star/drawing/Hatch.hpp>
-#include <svl/itempool.hxx>
-#include <svl/itemset.hxx>
 #include "UnoNameItemTable.hxx"
 
-#include <svx/xhatch.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/xdef.hxx>
 #include <svx/xflhtit.hxx>
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 62ce2f181d8d..6cc9a35f90dc 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <vcl/svapp.hxx>
 #include <svl/itempool.hxx>
-#include <svl/itemprop.hxx>
 #include <svtools/unoevent.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -42,8 +41,6 @@
 #include <svx/unoapi.hxx>
 
 #include <svx/svdmodel.hxx>
-#include <svx/globl3d.hxx>
-#include <svx/svdtypes.hxx>
 #include <svx/unoprov.hxx>
 #include <svx/unopage.hxx>
 #include <editeng/unofield.hxx>
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index ec1d0d4cbfe1..b930fed67205 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
-#include <svl/style.hxx>
 
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/implbase.hxx>
@@ -36,7 +35,6 @@
 #include <svx/xlnstit.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/xdef.hxx>
-#include <svx/xflhtit.hxx>
 
 #include <vector>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index f43a575c5350..e59afceef7cf 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -26,12 +26,11 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <o3tl/safeint.hxx>
 #include <osl/mutex.hxx>
-#include <sfx2/dispatch.hxx>
 #include <comphelper/classids.hxx>
+#include <comphelper/embeddedobjectcontainer.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <sfx2/objsh.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoole2.hxx>
@@ -46,9 +45,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/globl3d.hxx>
 #include <svx/unoprov.hxx>
-#include <svx/svdopath.hxx>
 #include <svx/unoapi.hxx>
-#include <svx/svdomeas.hxx>
 #include <extrud3d.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/scene3d.hxx>
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 865f9fc080b6..ec293ac1bf55 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -27,16 +27,13 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/unoprov.hxx>
-#include <svx/svdobj.hxx>
 #include <svx/unoshprp.hxx>
 #include <svx/xflbstit.hxx>
 #include <svx/xflbmtit.hxx>
-#include <svx/unopage.hxx>
 #include <svx/svdetc.hxx>
 #include <editeng/editeng.hxx>
 #include <tools/debug.hxx>
 
-#include <svx/unoapi.hxx>
 #include <memory>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 67406c63ba40..50be008cd5a2 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -35,20 +35,13 @@
 #include <comphelper/sequence.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/unoapi.hxx>
-#include <editeng/unotext.hxx>
 #include <svx/unoshprp.hxx>
 #include <svx/svx3ditems.hxx>
 #include <svx/svxids.hrc>
-#include <editeng/editeng.hxx>
 #include <svx/globl3d.hxx>
 #include <svx/strings.hrc>
 #include <strings.hxx>
-#include <svx/svdpool.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/sdtaaitm.hxx>
-#include <svx/sdtacitm.hxx>
-#include <svx/sdtaiitm.hxx>
-#include <svx/sdtayitm.hxx>
 
 #include "shapeimpl.hxx"
 #include <unordered_map>
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 48961d3172ef..215e4a4a6f18 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
-#include <com/sun/star/drawing/FlagSequence.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
@@ -34,11 +33,7 @@
 #include <com/sun/star/drawing/QRCode.hpp>
 #include <o3tl/any.hxx>
 #include <o3tl/safeint.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/file.hxx>
-#include <vcl/fltcall.hxx>
-#include <vcl/graphicfilter.hxx>
 #include <vcl/wmf.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/GraphicLoader.hxx>
@@ -65,11 +60,9 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <svx/svdograf.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/fcontnr.hxx>
 #include <sal/log.hxx>
 #include <cppuhelper/queryinterface.hxx>
+#include <tools/stream.hxx>
 
 
 #include <memory>
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 6c07d975fcf6..a163da88a2fe 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -36,8 +36,6 @@
 #include <svx/svditer.hxx>
 #include <svx/unoshape.hxx>
 #include <svx/unopage.hxx>
-#include <editeng/unoprnms.hxx>
-#include <svx/globl3d.hxx>
 #include <svx/cube3d.hxx>
 #include <svx/sphere3d.hxx>
 #include <svx/lathe3d.hxx>
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 7610f076ff8a..eab0cd5bb111 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -26,36 +26,30 @@
 #include <com/sun/star/ucb/CommandFailedException.hpp>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 
-#include <vcl/virdev.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdomedia.hxx>
 #include <svx/svdpool.hxx>
 #include <comphelper/classids.hxx>
+#include <comphelper/embeddedobjectcontainer.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <sfx2/frmdescr.hxx>
-#include <vcl/svapp.hxx>
 
 #include <toolkit/helper/vclunohelper.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/docfile.hxx>
 
-#include <sot/storage.hxx>
 #include <sot/exchange.hxx>
-#include <vcl/FilterConfigItem.hxx>
 
 #include <svx/svdmodel.hxx>
 #include "shapeimpl.hxx"
 
 #include <svx/unoshprp.hxx>
 
-#include <svx/unoapi.hxx>
-#include <svx/svdpagv.hxx>
-#include <svx/svdview.hxx>
+#include <vcl/gdimtf.hxx>
 #include <vcl/wmf.hxx>
 #include <svtools/embedhlp.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
+#include <tools/globname.hxx>
+#include <tools/stream.hxx>
 
 #include <config_features.h>
 
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 5f395f19b105..080f455c4005 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -17,16 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/drawing/CircleKind.hpp>
-#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <vcl/svapp.hxx>
 #include <svl/itemprop.hxx>
-#include <vcl/fltcall.hxx>
 #include <o3tl/any.hxx>
 #include <osl/mutex.hxx>
 #include <editeng/unotext.hxx>
@@ -38,36 +35,29 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/virdev.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/viewsh.hxx>
+#include <svx/sdangitm.hxx>
+#include <svx/svdlayer.hxx>
 #include <svx/svdopage.hxx>
 #include <svx/xflbstit.hxx>
 #include <svx/xflbmtit.hxx>
 #include <svx/xlnstit.hxx>
 #include <svx/xlnedit.hxx>
-#include <svx/svdogrp.hxx>
-#include <svx/scene3d.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/globl3d.hxx>
-#include <svx/fmglob.hxx>
 #include <svx/unopage.hxx>
-#include <svx/view3d.hxx>
 #include <svx/unoshape.hxx>
-#include <svx/svxids.hrc>
 #include <svx/unoshtxt.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/unoshprp.hxx>
-#include <svx/sxciaitm.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/svdomeas.hxx>
-#include <svx/svdpagv.hxx>
 #include <svx/svdpool.hxx>
 #include <tools/stream.hxx>
 #include <tools/gen.hxx>
+#include <svx/svdoedge.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/obj3d.hxx>
-#include <tools/diagnose_ex.h>
 #include <svx/xflftrit.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xbtmpit.hxx>
@@ -77,7 +67,6 @@
 #include <svx/xlineit0.hxx>
 #include <svx/xlndsit.hxx>
 #include <svx/unomaster.hxx>
-#include <editeng/outlobj.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
@@ -91,6 +80,7 @@
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 
+#include <vcl/gdimtf.hxx>
 #include <vcl/wmf.hxx>
 
 #include <memory>
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 75f733028746..b1f3a4f4a10e 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -20,7 +20,6 @@
 #include <com/sun/star/document/EventObject.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -31,8 +30,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/mutex.hxx>
 #include <sal/log.hxx>
-#include <rtl/ref.hxx>
-#include <svx/unoprov.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index e1f80f149bad..61fdc3636b74 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -34,7 +34,6 @@
 #include <svx/svdoutl.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
-#include <svx/svdetc.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/unoforou.hxx>
 #include <editeng/unoviwou.hxx>
@@ -42,14 +41,12 @@
 #include <svx/svdotext.hxx>
 #include <svx/svdpage.hxx>
 #include <editeng/editeng.hxx>
-#include <editeng/editobj.hxx>
 
 #include <editeng/unotext.hxx>
 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <svx/svdotable.hxx>
 #include <cell.hxx>
-#include <svx/sdrpaintwindow.hxx>
 #include <unotools/configmgr.hxx>
 
 
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index 8a9e48437c5c..63ffa7ebe851 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -18,13 +18,9 @@
  */
 
 #include <com/sun/star/awt/Gradient.hpp>
-#include <svl/itempool.hxx>
-#include <svl/itemset.hxx>
-#include <svx/xgrad.hxx>
 #include <svx/xflftrit.hxx>
 
 #include <svx/svdmodel.hxx>
-#include <svx/xflhtit.hxx>
 #include <svx/unofill.hxx>
 #include <svx/unomid.hxx>
 #include "UnoNameItemTable.hxx"
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 74023011d380..5ddf5611ebe4 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -25,13 +25,11 @@
 #include <svx/fmmodel.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/graph.hxx>
-#include <svl/itemprop.hxx>
 #include <svl/itempool.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <galobj.hxx>
 
-#include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/gallery/GalleryItemType.hpp>
 #include <memory>
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index ef6d7c83c409..d5b084f13cfa 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -27,9 +27,7 @@
 #include <svx/fmmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/unopage.hxx>
-#include <svl/itempool.hxx>
 #include <vcl/svapp.hxx>
-#include <unotools/pathoptions.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index 58c4234ef899..c4cdcd701075 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -21,9 +21,7 @@
 
 #include "unogaltheme.hxx"
 #include <svx/gallery1.hxx>
-#include <rtl/ref.hxx>
 #include <vcl/svapp.hxx>
-#include <unotools/pathoptions.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/container/ElementExistException.hpp>
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 96827d4e418c..03acdedb8924 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -21,12 +21,9 @@
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
-#include <com/sun/star/embed/XEmbedObjectCreator.hpp>
-#include <com/sun/star/embed/XEmbedObjectFactory.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XEmbedPersist.hpp>
-#include <com/sun/star/embed/EntryInitModes.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
@@ -42,7 +39,6 @@
 #include <comphelper/embeddedobjectcontainer.hxx>
 
 #include <comphelper/fileformat.h>
-#include <comphelper/classids.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <svx/xmleohlp.hxx>
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index 351765e34cb3..6e63ef08700a 100644
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -21,20 +21,15 @@
 #include <tools/diagnose_ex.h>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
 #include <comphelper/processfactory.hxx>
-#include <unotools/streamwrap.hxx>
-#include <sot/storage.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/xmleohlp.hxx>
 #include <svx/xmlgrhlp.hxx>
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 5ad3d6c14f73..719353e0d6f8 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 #include <sal/log.hxx>
 
-#include <sal/macros.h>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -38,7 +37,6 @@
 #include <unotools/streamwrap.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/saveopt.hxx>
-#include <vcl/cvtgrf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/metaact.hxx>
 #include <tools/zcodec.hxx>
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 4ec6f5aeb8db..68b5ea9bd326 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/drawing/Hatch.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 
 #include <sax/tools/converter.hxx>
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index e3056b593b9e..1b348cc26262 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -20,8 +20,6 @@
 #include <tools/urlobj.hxx>
 #include <com/sun/star/document/XGraphicStorageHandler.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/io/XActiveDataControl.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
@@ -29,19 +27,15 @@
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/drawing/Hatch.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>
-#include <unotools/streamwrap.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <sax/tools/converter.hxx>
 #include <sfx2/docfile.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 
 #include <xmloff/xmltoken.hxx>
-#include <xmloff/xmlmetae.hxx>
 #include <xmloff/DashStyle.hxx>
 #include <xmloff/GradientStyle.hxx>
 #include <xmloff/HatchStyle.hxx>
@@ -54,8 +48,6 @@
 #include <xmlxtimp.hxx>
 #include <tools/diagnose_ex.h>
 
-#include <cstdio>
-
 using namespace com::sun::star;
 using namespace com::sun::star::container;
 using namespace com::sun::star::document;
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index dc69da0ee4ec..3b6852467a72 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -23,18 +23,11 @@
 #include <comphelper/base64.hxx>
 #include <comphelper/graphicmimetype.hxx>
 #include <tools/debug.hxx>
-#include <tools/poly.hxx>
-#include <vcl/bitmapaccess.hxx>
 #include <vcl/virdev.hxx>
-#include <svl/solar.hrc>
 #include <sfx2/docfile.hxx>
-#include <sfx2/app.hxx>
 #include <svx/xoutbmp.hxx>
-#include <vcl/dibtools.hxx>
-#include <vcl/FilterConfigItem.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/cvtgrf.hxx>
-#include <sax/tools/converter.hxx>
 #include <memory>
 
 #define FORMAT_BMP  "bmp"
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index d937a54e8710..abb536aedc82 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -21,8 +21,6 @@
 
 #include <algorithm>
 
-#include <osl/endian.h>
-#include <tools/stream.hxx>
 #include <tools/debug.hxx>
 #include <tools/poly.hxx>
 #include <tools/helpers.hxx>
@@ -31,11 +29,8 @@
 #include <svx/xpoly.hxx>
 #include <xpolyimp.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/range/b2drange.hxx>
-#include <basegfx/numeric/ftools.hxx>
 
 
 ImpXPolygon::ImpXPolygon(sal_uInt16 nInitSize, sal_uInt16 _nResize)
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index b546910f85b2..4b11483e8e3a 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -26,8 +26,6 @@
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
 #include <com/sun/star/drawing/DashStyle.hpp>
-#include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/drawing/PointSequence.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -35,7 +33,6 @@
 #include <o3tl/any.hxx>
 #include <svl/itempool.hxx>
 #include <editeng/memberids.h>
-#include <tools/stream.hxx>
 #include <tools/mapunit.hxx>
 #include <osl/diagnose.h>
 
@@ -68,7 +65,6 @@
 #include <svx/xlnstcit.hxx>
 #include <svx/xlnedcit.hxx>
 #include <editeng/itemtype.hxx>
-#include <editeng/editrids.hrc>
 #include <editeng/eerdll.hxx>
 #include <svx/xdef.hxx>
 #include <svx/unomid.hxx>
@@ -81,14 +77,9 @@
 #include <svx/xftshcit.hxx>
 #include <svx/xftshxy.hxx>
 #include <svx/xftadit.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <unotools/intlwrapper.hxx>
 #include <unotools/syslocale.hxx>
-#include <vcl/gradient.hxx>
-#include <svx/svxids.hrc>
 #include <string>
 
 #include <boost/property_tree/json_parser.hpp>
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index cd18bd4b8818..f3d57a06d407 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -39,9 +39,7 @@
 #include <svx/xflbstit.hxx>
 #include <svx/xflboxy.hxx>
 #include <svx/xflbckit.hxx>
-#include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
-#include <editeng/itemtype.hxx>
 #include <svx/xdef.hxx>
 #include <AffineMatrixItem.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 7007e651fe29..4288c9607e5e 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -20,8 +20,6 @@
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <tools/debug.hxx>
-#include <tools/stream.hxx>
-#include <vcl/window.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/bitmapex.hxx>
 #include <svl/style.hxx>
@@ -30,16 +28,13 @@
 #include <svx/xtable.hxx>
 #include <svx/xdef.hxx>
 #include <svx/unomid.hxx>
-#include <editeng/unoprnms.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/xbitmap.hxx>
 #include <svx/xbtmpit.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <vcl/bitmapaccess.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <vcl/GraphicLoader.hxx>
-#include <vcl/dibtools.hxx>
 
 #include <libxml/xmlwriter.h>
 
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 4663780c35d4..997c6b576f36 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -29,7 +29,6 @@
 #include <svx/xbtmpit.hxx>
 #include <svx/xflftrit.hxx>
 #include <svx/xsflclit.hxx>
-#include <svx/xtable.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/xgrscit.hxx>
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 988532c4d7f0..ec12ab073351 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -21,11 +21,7 @@
 
 #include <osl/diagnose.h>
 #include <vcl/virdev.hxx>
-#include <svl/itemset.hxx>
-#include <sfx2/docfile.hxx>
 #include <svx/xtable.hxx>
-#include <svx/xpool.hxx>
-#include <svx/xbtmpit.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 3787cc654338..4fbd331e493b 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -25,7 +25,6 @@
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
-#include <svx/xpool.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 4d0b89b857ae..14c28a4ea27b 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -24,7 +24,6 @@
 #include <vcl/settings.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
-#include <svx/xpool.hxx>
 
 #include <drawinglayer/attribute/fillhatchattribute.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 349dea134f73..f1f008f3190d 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -18,16 +18,12 @@
  */
 
 #include <memory>
-#include <XPropertyTable.hxx>
 #include <xmlxtexp.hxx>
 #include <xmlxtimp.hxx>
 #include <o3tl/safeint.hxx>
+#include <osl/diagnose.h>
 #include <tools/urlobj.hxx>
 #include <svx/xtable.hxx>
-#include <svx/xpool.hxx>
-#include <svx/svdobj.hxx>
-#include <svx/svdpool.hxx>
-#include <vcl/outdev.hxx>
 #include <tools/debug.hxx>
 #include <stack>
 
diff --git a/svx/source/xoutdev/xtabptrn.cxx b/svx/source/xoutdev/xtabptrn.cxx
index de7ca007c59f..b7ee2b94a5a8 100644
--- a/svx/source/xoutdev/xtabptrn.cxx
+++ b/svx/source/xoutdev/xtabptrn.cxx
@@ -20,13 +20,9 @@
 #include <XPropertyTable.hxx>
 
 #include <vcl/virdev.hxx>
-#include <svl/itemset.hxx>
-#include <sfx2/docfile.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
-#include <svx/xpool.hxx>
-#include <svx/xbtmpit.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/BitmapTools.hxx>