tdf#42949 Fix IWYU warnings in include/svx/[a-D]*

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

Change-Id: I9770343f31f882427c9ae13e363b59cd1fb47e98
Reviewed-on: https://gerrit.libreoffice.org/71295
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

131 files changed, 177 insertions, 98 deletions

diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 36b7a21b6b4b..49bdc304610a 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -21,6 +21,7 @@
 
 #include <svl/itemset.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/sfxdlg.hxx>
 
diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
index d91385be94ce..f5fc702a2a76 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
@@ -22,6 +22,7 @@
 
 #include <svl/intitem.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/flagsdef.hxx>
 #include <editeng/flstitem.hxx>
 
diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
index ccef966d0385..c990161cf6c8 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
@@ -22,6 +22,7 @@
 #include <svl/cjkoptions.hxx>
 #include <svl/intitem.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/flagsdef.hxx>
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 4b5265d2239e..78b203321c80 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -31,6 +31,8 @@
 #include <vcl/builderfactory.hxx>
 #include <tools/diagnose_ex.h>
 
+#include <com/sun/star/beans/XPropertySet.hpp>
+
 namespace chart
 {
 
diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
index 3aebb6b427c0..32763beb02e7 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -12,6 +12,7 @@
 #include <ObjectIdentifier.hxx>
 #include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <com/sun/star/frame/XController.hpp>
 
 #include <svx/tbcontrl.hxx>
 
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index cccb04e19547..00af4cd2252d 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -35,6 +35,7 @@
 #include <headertablistbox.hxx>
 #include "macropg_impl.hxx"
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <strings.hrc>
 #include <comphelper/namedvaluecollection.hxx>
 
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 6a052b287961..89474b59222f 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <memory>
+#include <vcl/event.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/menu.hxx>
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 41a8e4adc96b..dd8d638dedaa 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -24,6 +24,7 @@
 
 #include <tools/debug.hxx>
 #include <svl/lngmisc.hxx>
+#include <vcl/event.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svlbitm.hxx>
 #include <vcl/treelistbox.hxx>
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 11df8ce96030..66de3a634901 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -26,6 +26,7 @@
 #include <sfx2/request.hxx>
 #include <sal/log.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <numfmt.hxx>
 #include <splitcelldlg.hxx>
 #include <dstribut.hxx>
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 0078c029a212..7265d7ba79c5 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -21,6 +21,7 @@
 
 #include <bitset>
 
+#include <osl/diagnose.h>
 #include <tools/debug.hxx>
 #include <editeng/editids.hrc>
 #include <svtools/colorcfg.hxx>
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 0fcaf17c3dfc..79ebf3644b14 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -22,6 +22,7 @@
 #include <config_gpgme.h>
 
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 
 #include <strings.hrc>
 #include <treeopt.hrc>
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 5b7ca72221bd..e9cf3930b3fb 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -21,6 +21,7 @@
 
 #include <editeng/svxenum.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <bitmaps.hlst>
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index bcfa66d42132..c2166e87c275 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -29,6 +29,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/strings.hrc>
 
 #include <strings.hrc>
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index f024fa707deb..208d50f0cf55 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -21,6 +21,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/module.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 
@@ -46,6 +47,7 @@
 #include <sal/macros.h>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/lok.hxx>
+#include <svtools/unitconv.hxx>
 
 using namespace ::editeng;
 using ::com::sun::star::uno::Reference;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 6a0db1844a97..d58992ddb283 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -28,6 +28,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svtools/unitconv.hxx>
 #include <svl/languageoptions.hxx>
 #include <svx/xtable.hxx>
@@ -72,6 +73,7 @@
 #include <svx/flagsdef.hxx>
 #include <FontFeaturesDialog.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star;
 
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 49684e249a83..a55224f908cf 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -25,6 +25,7 @@
 
 #include <svx/connctrl.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dlgutil.hxx>
 #include <svx/ofaitem.hxx>
 #include <svx/svdattr.hxx>
@@ -33,6 +34,7 @@
 #include <svx/sxekitm.hxx>
 #include <svx/sxelditm.hxx>
 #include <svx/sxenditm.hxx>
+#include <svtools/unitconv.hxx>
 
 #include <connect.hxx>
 
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index b9e04205f6af..46d3966a91ec 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -32,9 +32,11 @@
 #include <rtl/ustring.hxx>
 #include <tools/fract.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <strings.hrc>
 #include <vcl/field.hxx>
 #include <vcl/settings.hxx>
+#include <svtools/unitconv.hxx>
 
 #define CM_1_TO_TWIP        567
 #define TWIP_TO_INCH        1440
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 352a5a537e79..72f8fed35cd0 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -22,6 +22,7 @@
 #include <swpossizetabpage.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
+#include <svtools/unitconv.hxx>
 
 #include <svx/dialogs.hrc>
 #include <svx/svddef.hxx>
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index a79244850e8f..1fc054c15dc7 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -25,6 +25,7 @@
 #include <comphelper/processfactory.hxx>
 #include <svl/macitem.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <tools/debug.hxx>
 #include <vcl/idle.hxx>
 #include <cfgutil.hxx>
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index f710d4176fcc..bbc1513882fe 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -25,6 +25,7 @@
 #include <vcl/settings.hxx>
 
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dlgutil.hxx>
 #include <svx/measctrl.hxx>
 #include <svx/ofaitem.hxx>
@@ -42,6 +43,7 @@
 #include <svx/sxmtpitm.hxx>
 #include <svx/sxmtritm.hxx>
 #include <svx/sxmuitm.hxx>
+#include <svtools/unitconv.hxx>
 
 #include <measure.hxx>
 
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 993b4c31baca..6f2b605d8be8 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -26,6 +26,7 @@
 #include <i18nlangtag/lang.h>
 #include <i18nlangtag/mslangid.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svtools/colorcfg.hxx>
 
 #include <numcategories.hrc>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 5fa0f5cbe047..80d871be981e 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -47,6 +47,7 @@
 #include <sfx2/htmlmode.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
+#include <svtools/unitconv.hxx>
 #include <editeng/unolingu.hxx>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -58,6 +59,7 @@
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/text/XNumberingTypeInfo.hpp>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 
 #include <algorithm>
 #include <memory>
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 7b82830dc866..e3c3b704efd9 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -25,6 +25,7 @@
 #include <sfx2/viewsh.hxx>
 #include <svl/itemiter.hxx>
 #include <svl/languageoptions.hxx>
+#include <svtools/unitconv.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <unotools/configitem.hxx>
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 5fd30baa24a0..12372d0127bf 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -26,6 +26,7 @@
 #include <sfx2/module.hxx>
 #include <vcl/mnemonic.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 
 #include <svl/languageoptions.hxx>
 #include <svl/cjkoptions.hxx>
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index b2c159dda940..ab8644c3399d 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -33,6 +33,8 @@
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
+#include <svtools/unitconv.hxx>
 
 using namespace ::com::sun::star::text;
 
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index ea4dac6518c6..25748c947c5a 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -24,6 +24,7 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 
 #include <svx/xtable.hxx>
 #include <svx/globl3d.hxx>
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 24d0af9d36de..ac02b2ef4e35 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -21,6 +21,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <cuitabarea.hxx>
 #include <cuitabline.hxx>
 #include <dlgname.hxx>
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 3ff07765f8af..a942287b1070 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -19,7 +19,9 @@
 
 #include <sfx2/app.hxx>
 #include <svtools/ruler.hxx>
+#include <svtools/unitconv.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 7a73a7d91ead..e802f1fede65 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -27,6 +27,7 @@
 #include <svx/dlgutil.hxx>
 #include <svx/svdmark.hxx>
 #include <svx/svdview.hxx>
+#include <svtools/unitconv.hxx>
 
 const sal_uInt16 SvxTextAnimationPage::pRanges[] =
 {
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 364ff951d9ac..ec2590fdc705 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -30,12 +30,14 @@
 #include <svx/svdview.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 
 #include <textattr.hxx>
 #include <svx/dlgutil.hxx>
 #include <sfx2/request.hxx>
 #include <svx/ofaitem.hxx>
 #include <editeng/writingmodeitem.hxx>
+#include <svtools/unitconv.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 9154b7d3b7cf..7204e5f72b0a 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -23,6 +23,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 
 #include <svx/xattr.hxx>
 #include <svx/xpool.hxx>
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 43563e6762ec..4aad7f105476 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -23,6 +23,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/xattr.hxx>
 #include <svx/xpool.hxx>
 #include <strings.hrc>
@@ -52,6 +53,7 @@
 #include <sfx2/dialoghelper.hxx>
 #include <sal/log.hxx>
 #include <comphelper/lok.hxx>
+#include <svtools/unitconv.hxx>
 
 using namespace com::sun::star;
 
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 2d9279d6ee55..09c35101ff2e 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -45,7 +45,9 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <sal/log.hxx>
+#include <svtools/unitconv.hxx>
 
 using namespace com::sun::star;
 
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 9024670b64d6..e2aad7f8f8a9 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -52,9 +52,11 @@
 #include <sfx2/opengrf.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/strings.hrc>
 #include <vcl/settings.hxx>
 #include <cuitabarea.hxx>
+#include <svtools/unitconv.hxx>
 
 #define MAX_BMP_WIDTH   16
 #define MAX_BMP_HEIGHT  16
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 8786fb71c6b0..1888b4b46b31 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -43,7 +43,9 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <cuitabarea.hxx>
+#include <svtools/unitconv.hxx>
 
 #define XOUT_WIDTH    150
 
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 9d99c6e18542..f73f6b221149 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -21,6 +21,8 @@
 #include <sfx2/module.hxx>
 #include <svx/colorbox.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
+#include <svtools/unitconv.hxx>
 
 #include <svx/xattr.hxx>
 #include <svx/xpool.hxx>
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index c7dbbd86439b..4fba49788ccc 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -23,6 +23,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 
 #include <svx/xattr.hxx>
 #include <svx/xpool.hxx>
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 9e3360953a9c..76d10ee63c5c 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -31,8 +31,10 @@
 #include <svx/svdoashp.hxx>
 #include <svx/sderitm.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/transfrmhelper.hxx>
 #include <editeng/sizeitem.hxx>
+#include <svtools/unitconv.hxx>
 
 #include <transfrm.hxx>
 #include <svx/dlgutil.hxx>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 24243b9ef476..5ec1ba2b23de 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -920,3 +920,11 @@ blacklist:
     - com/sun/star/awt/FontDescriptor.hpp
     - com/sun/star/style/LineSpacing.hpp
     - com/sun/star/style/TabStop.hpp
+    include/svx/AccessibleControlShape.hxx:
+    # base class has to be a complete type
+    - com/sun/star/beans/XPropertyChangeListener.hpp
+    - com/sun/star/container/XContainerListener.hpp
+    - com/sun/star/util/XModeChangeListener.hpp
+    include/svx/dbaexchange.hxx:
+    # Needed for implicit dtor
+    - com/sun/star/beans/PropertyValue.hpp
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index cfac0bebfe03..5b0e49941741 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -20,15 +20,10 @@
 #ifndef INCLUDED_SVX_ACCESSIBLECONTROLSHAPE_HXX
 #define INCLUDED_SVX_ACCESSIBLECONTROLSHAPE_HXX
 
-#include <exception>
-
-#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/util/XModeChangeListener.hpp>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase4.hxx>
@@ -59,7 +54,6 @@ namespace comphelper
     class OWrappedAccessibleChildrenManager;
 }
 
-class SdrObject;
 namespace accessibility {
 
     class AccessibleShapeInfo;
diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx
index 1d4e7a5e5339..7be88770c30c 100644
--- a/include/svx/AccessibleGraphicShape.hxx
+++ b/include/svx/AccessibleGraphicShape.hxx
@@ -20,11 +20,8 @@
 #ifndef INCLUDED_SVX_ACCESSIBLEGRAPHICSHAPE_HXX
 #define INCLUDED_SVX_ACCESSIBLEGRAPHICSHAPE_HXX
 
-#include <exception>
-
 #include <com/sun/star/accessibility/XAccessibleImage.hpp>
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Type.hxx>
 #include <rtl/ustring.hxx>
diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx
index 997d3dd98b8b..c25eb75fae54 100644
--- a/include/svx/AccessibleOLEShape.hxx
+++ b/include/svx/AccessibleOLEShape.hxx
@@ -20,13 +20,9 @@
 #ifndef INCLUDED_SVX_ACCESSIBLEOLESHAPE_HXX
 #define INCLUDED_SVX_ACCESSIBLEOLESHAPE_HXX
 
-#include <exception>
-
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.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 <com/sun/star/uno/Type.hxx>
 #include <rtl/ustring.hxx>
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index e1af1501bf7f..895825675216 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -21,8 +21,6 @@
 #ifndef INCLUDED_SVX_ACCESSIBLESHAPE_HXX
 #define INCLUDED_SVX_ACCESSIBLESHAPE_HXX
 
-#include <exception>
-
 #include <com/sun/star/accessibility/TextSegment.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
@@ -33,11 +31,8 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/document/XEventListener.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.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 <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -70,7 +65,6 @@ class AccessibleShapeInfo;
 class AccessibleTextHelper;
 class ChildrenManager;
 class IAccessibleParent;
-class IAccessibleViewForwarder;
 
 /** This base class provides a base implementation for all shapes.  For more
     detailed documentation about the methods refer to the descriptions of
diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx
index dad733a33b50..59d4442b7a61 100644
--- a/include/svx/AffineMatrixItem.hxx
+++ b/include/svx/AffineMatrixItem.hxx
@@ -20,13 +20,11 @@
 #define INCLUDED_SVX_AFFINEMATRIXITEM_HXX
 
 #include <com/sun/star/geometry/AffineMatrix2D.hpp>
-#include <com/sun/star/uno/Any.hxx>
 #include <sal/types.h>
 #include <svl/poolitem.hxx>
 #include <svx/svxdllapi.h>
 
 class SfxItemPool;
-class SvStream;
 
 class SVX_DLLPUBLIC AffineMatrixItem : public SfxPoolItem
 {
diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx
index 7023fd6467f3..901d4c891cf3 100644
--- a/include/svx/ChildrenManager.hxx
+++ b/include/svx/ChildrenManager.hxx
@@ -22,11 +22,8 @@
 
 #include <sal/config.h>
 
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <rtl/ref.hxx>
-#include <svx/IAccessibleViewForwarderListener.hxx>
 #include <svx/svxdllapi.h>
 
 namespace com { namespace sun { namespace star {
@@ -40,7 +37,6 @@ namespace accessibility {
 class AccessibleContextBase;
 class AccessibleShapeTreeInfo;
 class ChildrenManagerImpl;
-class IAccessibleViewForwarder;
 
 /** The AccessibleChildrenManager class acts as a cache of the
     accessible objects of the currently visible shapes of a draw page and as
diff --git a/include/svx/ClassificationCommon.hxx b/include/svx/ClassificationCommon.hxx
index 75ab8682d34f..52fc3db393e8 100644
--- a/include/svx/ClassificationCommon.hxx
+++ b/include/svx/ClassificationCommon.hxx
@@ -13,11 +13,21 @@
 
 #include <sal/config.h>
 #include <svx/svxdllapi.h>
-#include <svx/ClassificationField.hxx>
 #include <vector>
 #include <sfx2/classificationhelper.hxx>
-#include <com/sun/star/beans/XPropertyContainer.hpp>
-#include <com/sun/star/beans/Property.hpp>
+
+namespace com::sun::star::beans
+{
+class XPropertyContainer;
+}
+namespace com::sun::star::beans
+{
+struct Property;
+}
+namespace svx
+{
+class ClassificationResult;
+}
 
 namespace svx
 {
diff --git a/include/svx/ClassificationDialog.hxx b/include/svx/ClassificationDialog.hxx
index 0c083d794d41..edc21e14e50d 100644
--- a/include/svx/ClassificationDialog.hxx
+++ b/include/svx/ClassificationDialog.hxx
@@ -12,13 +12,14 @@
 #define INCLUDED_SVX_CLASSIFICATIONDIALOG_HXX
 
 #include <sal/config.h>
-#include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>
 #include <svx/svxdllapi.h>
-#include <svx/ClassificationEditView.hxx>
 #include <sfx2/classificationhelper.hxx>
 #include <svx/ClassificationField.hxx>
 
+namespace svx { class ClassificationEditView; }
+namespace weld { class CustomWeld; }
+
 namespace svx {
 
 class SVX_DLLPUBLIC ClassificationDialog : public weld::GenericDialogController
diff --git a/include/svx/ClassificationEditView.hxx b/include/svx/ClassificationEditView.hxx
index 656219c141f2..7c7070e8a2fd 100644
--- a/include/svx/ClassificationEditView.hxx
+++ b/include/svx/ClassificationEditView.hxx
@@ -13,11 +13,9 @@
 
 #include <sal/config.h>
 #include <svx/svxdllapi.h>
-#include <vcl/ctrl.hxx>
-#include <editeng/flditem.hxx>
-#include <editeng/numitem.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
+#include <editeng/svxenum.hxx>
 #include <vcl/customweld.hxx>
 
 namespace svx {
diff --git a/include/svx/CommonStyleManager.hxx b/include/svx/CommonStyleManager.hxx
index 261472124596..6d87dd8f45de 100644
--- a/include/svx/CommonStyleManager.hxx
+++ b/include/svx/CommonStyleManager.hxx
@@ -11,9 +11,10 @@
 #define INCLUDED_SVX_COMMONSTYLEMANAGER_HXX
 
 #include <sfx2/StyleManager.hxx>
-#include <sfx2/StylePreviewRenderer.hxx>
 #include <svx/svxdllapi.h>
 
+namespace sfx2 { class StylePreviewRenderer; }
+
 class OutputDevice;
 class SfxObjectShell;
 class SfxStyleSheetBase;
diff --git a/include/svx/DescriptionGenerator.hxx b/include/svx/DescriptionGenerator.hxx
index 6a7b57fc6bde..600b5fc0c744 100644
--- a/include/svx/DescriptionGenerator.hxx
+++ b/include/svx/DescriptionGenerator.hxx
@@ -21,11 +21,13 @@
 #ifndef INCLUDED_SVX_DESCRIPTIONGENERATOR_HXX
 #define INCLUDED_SVX_DESCRIPTIONGENERATOR_HXX
 
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <svx/svxdllapi.h>
 
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::drawing { class XShape; }
+
 
 namespace accessibility {
 
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index ee6eee0bec89..5ba94bcea2a1 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SVX_ALGITEM_HXX
 #define INCLUDED_SVX_ALGITEM_HXX
 
-#include <com/sun/star/uno/Any.hxx>
 #include <editeng/svxenum.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 26f8791f49f2..3c7387276835 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -25,7 +25,6 @@
 #include <sfx2/dockwin.hxx>
 #include <svl/poolitem.hxx>
 #include <svx/svxdllapi.h>
-#include <svx/xtable.hxx>
 #include <tools/color.hxx>
 #include <vcl/animate.hxx>
 #include <vcl/bitmap.hxx>
@@ -38,7 +37,6 @@
 namespace vcl { class Window; }
 
 class CheckBox;
-class ColorLB;
 class MetricField;
 class PushButton;
 class SfxBindings;
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index df6b29e1ef21..e4db794c1d57 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -30,23 +30,16 @@
 #include <svx/svxdllapi.h>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
-#include <vcl/ctrl.hxx>
-#include <vcl/event.hxx>
-#include <vcl/fontcharmap.hxx>
-#include <vcl/outdev.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/window.hxx>
-#include <vcl/textview.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 namespace com { namespace sun { namespace star {
     namespace accessibility { class XAccessible; }
 } } }
 
-namespace vcl { class Font; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 using namespace ::com::sun::star;
 
diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx
index 7b6b0cf2e27c..e5435562cdca 100644
--- a/include/svx/charthelper.hxx
+++ b/include/svx/charthelper.hxx
@@ -20,15 +20,14 @@
 #ifndef INCLUDED_SVX_CHARTHELPER_HXX
 #define INCLUDED_SVX_CHARTHELPER_HXX
 
-#include <com/sun/star/uno/Reference.hxx>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <sal/types.h>
 #include <svx/svxdllapi.h>
 
 namespace com { namespace sun { namespace star {
-    namespace chart2 { class XDiagram; }
     namespace embed { class XEmbeddedObject; }
     namespace frame { class XModel; }
+    namespace uno { template <typename > class Reference; }
 } } }
 
 namespace basegfx { class B2DRange; }
diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx
index a10e5b999b10..44eeb3631143 100644
--- a/include/svx/checklbx.hxx
+++ b/include/svx/checklbx.hxx
@@ -21,17 +21,13 @@
 #define INCLUDED_SVX_CHECKLBX_HXX
 
 #include <rtl/ustring.hxx>
-#include <sal/types.h>
 #include <vcl/treelistbox.hxx>
 #include <svx/svxdllapi.h>
-#include <tools/contnr.hxx>
 #include <tools/solar.h>
 #include <tools/wintypes.hxx>
-#include <vcl/event.hxx>
 #include <vcl/window.hxx>
 #include <memory>
 
-class Image;
 class SvLBoxButtonData;
 class SvTreeListEntry;
 
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index 5accfe78e0f9..344508e37581 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SVX_CHRTITEM_HXX
 #define INCLUDED_SVX_CHRTITEM_HXX
 
-#include <com/sun/star/uno/Any.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <svl/eitem.hxx>
@@ -28,7 +27,6 @@
 
 class IntlWrapper;
 class SfxItemPool;
-class SvStream;
 
 enum class SvxChartTextOrder
 {
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index c5c4d8960e79..795c1fbf8cfa 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -22,7 +22,6 @@
 #include <climits>
 #include <memory>
 
-#include <com/sun/star/uno/Any.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <sot/formats.hxx>
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index 668da9b6036d..183a29d231ba 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -20,19 +20,19 @@
 #ifndef INCLUDED_SVX_SOURCE_TBXCTRLS_COLORWINDOW_HXX
 #define INCLUDED_SVX_SOURCE_TBXCTRLS_COLORWINDOW_HXX
 
-#include <sfx2/tbxctrl.hxx>
 #include <svtools/toolbarmenu.hxx>
-#include <svtools/valueset.hxx>
-#include <svl/lstner.hxx>
 #include <rtl/ustring.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <svx/SvxColorValueSet.hxx>
-#include <svx/PaletteManager.hxx>
+#include <svx/Palette.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/fixed.hxx>
 
 #include <functional>
 
+namespace com::sun::star::frame { class XFrame; }
+
+class PaletteManager;
+
 class SVX_DLLPUBLIC ColorStatus
 {
     Color maColor;
diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx
index 66addcee31c5..e7ff30f3bb4f 100644
--- a/include/svx/colrctrl.hxx
+++ b/include/svx/colrctrl.hxx
@@ -23,18 +23,14 @@
 #include <sfx2/dockwin.hxx>
 #include <svl/lstner.hxx>
 #include <vcl/transfer.hxx>
-#include <svtools/valueset.hxx>
 #include <svx/SvxColorValueSet.hxx>
 #include <svx/xtable.hxx>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
-#include <tools/wintypes.hxx>
-#include <vcl/event.hxx>
 #include <vcl/vclptr.hxx>
 
 namespace vcl { class Window; }
 
-class CommandEvent;
 class SfxBindings;
 class SfxBroadcaster;
 class SfxChildWindow;
diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx
index bafcc6c892e8..ac1880bd56de 100644
--- a/include/svx/connctrl.hxx
+++ b/include/svx/connctrl.hxx
@@ -21,15 +21,10 @@
 
 #include <sal/types.h>
 #include <svx/svxdllapi.h>
-#include <tools/gen.hxx>
-#include <tools/wintypes.hxx>
 #include <vcl/customweld.hxx>
-#include <vcl/event.hxx>
 #include <vcl/outdev.hxx>
 #include <memory>
 
-namespace vcl { class Window; }
-
 class SfxItemSet;
 class SdrEdgeObj;
 class SdrView;
diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx
index cf9946c921d3..2153ececae5e 100644
--- a/include/svx/contdlg.hxx
+++ b/include/svx/contdlg.hxx
@@ -29,7 +29,6 @@
 #include <vcl/vclptr.hxx>
 #include <vcl/window.hxx>
 
-class Rectangle;
 class SfxBindings;
 class SfxModule;
 
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 3e2e88367156..946ffb414dfa 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -39,7 +39,6 @@
 #include <tools/wintypes.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/image.hxx>
-#include <vcl/outdev.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
@@ -52,14 +51,11 @@ namespace utl {
 
 namespace vcl { class Window; }
 
-class Button;
-class CheckBox;
 class DateField;
 class Edit;
 class FixedText;
 class ListBox;
 class Point;
-class PushButton;
 class SvViewDataEntry;
 class TimeField;
 struct SvSortData;
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index b67d6995a5de..4f8a3f23c25d 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -25,7 +25,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <svx/obj3d.hxx>
-#include <svx/svdobj.hxx>
 #include <svx/svxdllapi.h>
 
 namespace sdr { namespace contact { class ViewContact; } }
diff --git a/include/svx/dataaccessdescriptor.hxx b/include/svx/dataaccessdescriptor.hxx
index e66e96513356..92e992c2ce74 100644
--- a/include/svx/dataaccessdescriptor.hxx
+++ b/include/svx/dataaccessdescriptor.hxx
@@ -20,11 +20,16 @@
 #ifndef INCLUDED_SVX_DATAACCESSDESCRIPTOR_HXX
 #define INCLUDED_SVX_DATAACCESSDESCRIPTOR_HXX
 
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <rtl/ustring.hxx>
 #include <svx/svxdllapi.h>
 #include <memory>
 
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+
 namespace svx
 {
     class ODADescriptorImpl;
diff --git a/include/svx/databaselocationinput.hxx b/include/svx/databaselocationinput.hxx
index b20846c80ce7..723bc7fc9e20 100644
--- a/include/svx/databaselocationinput.hxx
+++ b/include/svx/databaselocationinput.hxx
@@ -21,12 +21,14 @@
 #define INCLUDED_SVX_DATABASELOCATIONINPUT_HXX
 
 #include <svx/svxdllapi.h>
-#include <com/sun/star/uno/XComponentContext.hpp>
+#include <rtl/ustring.hxx>
 
 #include <memory>
 
 class PushButton;
 namespace svt { class OFileURLControl; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 namespace svx
 {
diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index 1a5927f84dfc..bd084661b2d7 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -24,12 +24,13 @@
 
 #include <o3tl/typed_flags_set.hxx>
 #include <vcl/transfer.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <svx/dataaccessdescriptor.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <svx/svxdllapi.h>
 
+namespace com::sun::star::sdbc { class XConnection; }
+namespace com::sun::star::beans { class XPropertySet; }
 
 // column transfer formats
 enum class ColumnTransferFormatFlags
diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx
index e9410ea65632..4fe92b407d3a 100644
--- a/include/svx/dbaobjectex.hxx
+++ b/include/svx/dbaobjectex.hxx
@@ -21,12 +21,11 @@
 #define INCLUDED_SVX_DBAOBJECTEX_HXX
 
 #include <vcl/transfer.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/ucb/XContent.hpp>
 #include <svx/dataaccessdescriptor.hxx>
 #include <svx/svxdllapi.h>
 
+namespace com::sun::star::ucb { class XContent; }
+
 
 namespace svx
 {
diff --git a/include/svx/def3d.hxx b/include/svx/def3d.hxx
index e7eeec93690c..5f4351d350ec 100644
--- a/include/svx/def3d.hxx
+++ b/include/svx/def3d.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_DEF3D_HXX
 
 #include <o3tl/typed_flags_set.hxx>
-#include <math.h>
 
 const double fPiDiv180 = 0.01745329251994;
 const double EPSILON = 1e-06;
diff --git a/include/svx/deflt3d.hxx b/include/svx/deflt3d.hxx
index e08e9945fa96..8a482e37ab2c 100644
--- a/include/svx/deflt3d.hxx
+++ b/include/svx/deflt3d.hxx
@@ -23,7 +23,6 @@
 #include <basegfx/point/b3dpoint.hxx>
 #include <basegfx/vector/b3dvector.hxx>
 #include <svx/svxdllapi.h>
-#include <tools/color.hxx>
 
 /*************************************************************************
 |*
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index 7a15736372cf..c15e0ae92e3c 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -23,11 +23,10 @@
 #include <memory>
 #include <vcl/ctrl.hxx>
 #include <vcl/customweld.hxx>
-#include <vcl/weld.hxx>
+#include <vcl/field.hxx>
 #include <vcl/virdev.hxx>
 #include <svx/svxdllapi.h>
 
-class NumericField;
 class Edit;
 
 namespace svx {
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 78d00f86a2da..f5da4ede3e12 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -20,8 +20,7 @@
 #ifndef INCLUDED_SVX_DIALOGS_HRC
 #define INCLUDED_SVX_DIALOGS_HRC
 
-#include <svx/svxids.hrc>
-#include <sfx2/sfxsids.hrc>
+#include <svl/solar.hrc>
 
 // factory IDs of tabpages implemented in CUI
 #define RID_SVXPAGE_CHAR_TWOLINES           (RID_SVX_START + 242)
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index de0d65259c50..e682659367f0 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -19,12 +19,11 @@
 #ifndef INCLUDED_SVX_DLGCTRL_HXX
 #define INCLUDED_SVX_DLGCTRL_HXX
 
-#include <svtools/ctrlbox.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/rectenum.hxx>
-#include <vcl/graph.hxx>
 #include <vcl/customweld.hxx>
+#include <vcl/lstbox.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/virdev.hxx>
 #include <svx/xtable.hxx>
@@ -33,9 +32,6 @@
 #include <memory>
 #include <array>
 
-class XOBitmap;
-class XOutdevItemPool;
-
 namespace com { namespace sun { namespace star { namespace awt {
     struct Point;
 } } } }
diff --git a/include/svx/dlgutil.hxx b/include/svx/dlgutil.hxx
index 55c914bfd864..cc31297f5bb5 100644
--- a/include/svx/dlgutil.hxx
+++ b/include/svx/dlgutil.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_DLGUTIL_HXX
 #define INCLUDED_SVX_DLGUTIL_HXX
 
-#include <svtools/unitconv.hxx>
+#include <tools/fldunit.hxx>
 #include <svx/svxdllapi.h>
 #include <vcl/outdev.hxx>
 
diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx
index f9e68d5bdb39..b65b07366e62 100644
--- a/include/svx/drawitem.hxx
+++ b/include/svx/drawitem.hxx
@@ -21,7 +21,6 @@
 
 #include <svl/poolitem.hxx>
 #include <svx/xtable.hxx>
-#include <com/sun/star/drawing/LineDash.hpp>
 #include <svx/svxdllapi.h>
 
 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxColorListItem: public SfxPoolItem
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index 405edcce644f..824b7104ed37 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -21,6 +21,7 @@
 
 #include <vcl/toolbox.hxx>
 #include <vcl/fixed.hxx>
+#include <vcl/field.hxx>
 #include <vcl/idle.hxx>
 #include <svtools/valueset.hxx>
 #include <sfx2/dockwin.hxx>
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index ac910a8f6fc5..efeebed13f79 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SVX_ITEMWIN_HXX
 
 #include <vcl/bitmap.hxx>
+#include <vcl/field.hxx>
 
 #include <svx/dlgctrl.hxx>
 #include <svx/svxdllapi.h>
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 796f891d21f9..878c31748cf0 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/ui/ImageType.hpp>
 
+#include <svx/PaletteManager.hxx>
 #include <svx/tbcontrl.hxx>
 #include <svx/svxids.hrc>
 #include <svx/xtable.hxx>
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index ac91552c351d..a1597d63502f 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -26,6 +26,7 @@
 #include <formula/tokenarray.hxx>
 #include <formula/FormulaCompiler.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <memory>
 
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index 9ddcccc0d27c..dd2c5f32b2e1 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -19,6 +19,7 @@
 
 
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/flagsdef.hxx>
 #include <svx/svxdlg.hxx>
 #include <editeng/svxenum.hxx>
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 496b8870f1ab..1652af5f5c86 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -28,6 +28,7 @@
 #include <vcl/outdev.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/strings.hrc>
 #include <editeng/borderline.hxx>
 #include <editeng/langitem.hxx>
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 11f4a27d9e61..5fc7ccb01585 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -39,6 +39,7 @@
 
 #include <svx/dataaccessdescriptor.hxx>
 
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sheet/DataImportMode.hpp>
 #include <com/sun/star/sheet/XDatabaseRanges.hpp>
 #include <com/sun/star/sheet/XDatabaseRange.hpp>
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 3d32532eaf2e..9b20bfc1bb5a 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/drawing/ShapeCollection.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 #include <unotools/accessiblestatesethelper.hxx>
 #include <tools/gen.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 8f21926bec50..cffe595b2043 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -35,6 +35,7 @@
 
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 #include <unotools/accessiblestatesethelper.hxx>
 #include <tools/gen.hxx>
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index 3ebc3019aec8..6c3f1fa8f16c 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -27,6 +27,7 @@
 #include <tabpages.hxx>
 #include <attrdlg.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <editeng/flstitem.hxx>
 #include <osl/diagnose.h>
 
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index 673dc46bb704..1cfa805b985c 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -47,6 +47,7 @@
 
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <memory>
 
 void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSet,
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index cb16a3d6685d..ae7ae8d9d45e 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index 7eacc2c63256..effc2e4501df 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -19,6 +19,7 @@
 
 #include <svl/intitem.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/drawitem.hxx>
 #include <i18nutil/paper.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 7afe097a1336..3f874bbe8aaf 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -24,6 +24,7 @@
 #include <svl/intitem.hxx>
 
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/flagsdef.hxx>
 
 #include <paragr.hxx>
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 84de9a186423..8dc8ca9edd05 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/log.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <editeng/flstitem.hxx>
 #include <svx/drawitem.hxx>
 #include <svl/style.hxx>
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 1f0498f4aca3..0ce566462a5b 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -40,6 +40,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <svl/eitem.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
 #include <tools/link.hxx>
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index bd812d4f4a5a..7eaf561e3eb9 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -63,6 +63,7 @@
 #include <svx/compressgraphicdialog.hxx>
 #include <svx/ClassificationDialog.hxx>
 #include <svx/ClassificationCommon.hxx>
+#include <svx/ClassificationEditView.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/bmpmask.hxx>
 #include <svx/colrctrl.hxx>
@@ -109,6 +110,7 @@
 #include <editeng/crossedoutitem.hxx>
 #include <editeng/contouritem.hxx>
 #include <editeng/shdditem.hxx>
+#include <editeng/numitem.hxx>
 #include <svx/xtable.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/SvxColorChildWindow.hxx>
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index fd7d7f4061cb..a5c68d223ae9 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -27,6 +27,7 @@
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
 #include <vcl/combobox.hxx>
+#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld.hxx>
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 91fc5b2ded68..2a18c84d3d1e 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -21,12 +21,14 @@
 #include <svx/AccessibleShapeInfo.hxx>
 #include <svx/DescriptionGenerator.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XControlShape.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/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>
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx
index e3412599a3df..108a06754fd6 100644
--- a/svx/source/accessibility/AccessibleOLEShape.cxx
+++ b/svx/source/accessibility/AccessibleOLEShape.cxx
@@ -26,6 +26,8 @@
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/queryinterface.hxx>
 
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+
 using namespace ::accessibility;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index f48771522017..6641c3f78d0d 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -33,6 +33,7 @@
 #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>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 0b17df99d495..88b03e5ee599 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <comphelper/types.hxx>
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 32f8bf8db96b..1f89a39fb0b6 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -19,6 +19,7 @@
 
 #include <unotools/accessiblestatesethelper.hxx>
 #include <vcl/scrbar.hxx>
+#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <stdio.h>
 #include <svx/charmap.hxx>
diff --git a/svx/source/dialog/ClassificationCommon.cxx b/svx/source/dialog/ClassificationCommon.cxx
index 52ebd8ed32a2..c8e37076f531 100644
--- a/svx/source/dialog/ClassificationCommon.cxx
+++ b/svx/source/dialog/ClassificationCommon.cxx
@@ -9,9 +9,11 @@
  */
 
 #include <svx/ClassificationCommon.hxx>
+#include <svx/ClassificationField.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertyContainer.hpp>
 
 using namespace css;
 
diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx
index 9cde1e8c7249..3c61c5399c47 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -10,6 +10,7 @@
 
 #include <svx/ClassificationDialog.hxx>
 #include <svx/ClassificationCommon.hxx>
+#include <svx/ClassificationEditView.hxx>
 
 #include <editeng/flditem.hxx>
 #include <editeng/eeitem.hxx>
@@ -23,6 +24,7 @@
 #include <config_folders.h>
 #include <tools/XmlWriter.hxx>
 #include <tools/XmlWalker.hxx>
+#include <vcl/customweld.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 25f4b25e9ec9..52401b486bc8 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <vcl/event.hxx>
+#include <vcl/fontcharmap.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index bec5b7fb2583..3f3c5581280e 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <vcl/event.hxx>
 #include <vcl/svlbitm.hxx>
 #include <vcl/treelistentry.hxx>
 #include <svx/checklbx.hxx>
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index b2f37301857d..6f38f8871e60 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -36,6 +36,7 @@
 
 #include <svx/dlgutil.hxx>
 
+#include <svtools/unitconv.hxx>
 #include <svx/svxids.hrc>
 #include <bitmaps.hlst>
 #include <svx/fontwork.hxx>
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 147987127d16..099db34674bc 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -26,6 +26,7 @@
 #include <svx/svxids.hrc>
 
 #include <svl/intitem.hxx>
+#include <svtools/unitconv.hxx>
 
 #include <svx/hdft.hxx>
 #include <svx/pageitem.hxx>
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index aa774b1dc777..e5a8ea69eb02 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -20,6 +20,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <svl/intitem.hxx>
+#include <svtools/unitconv.hxx>
 
 #include <svx/svxids.hrc>
 #include <svx/optgrid.hxx>
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 816ac2919375..ccc7e2533e41 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -50,6 +50,7 @@
 #include <svx/e3ditem.hxx>
 #include <svx/gallery.hxx>
 #include <svl/whiter.hxx>
+#include <svtools/unitconv.hxx>
 
 #include <svx/float3d.hxx>
 #include <bitmaps.hlst>
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 3f15265b9a79..0de9e674169a 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -20,6 +20,7 @@
 #include <svx/dbaexchange.hxx>
 #include <osl/diagnose.h>
 #include <com/sun/star/sdb/CommandType.hpp>
+#include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
 #include <fmprop.hxx>
diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx
index 7d02064faa61..40d9f8be95e0 100644
--- a/svx/source/fmcomp/dbaobjectex.cxx
+++ b/svx/source/fmcomp/dbaobjectex.cxx
@@ -21,6 +21,7 @@
 #include <osl/diagnose.h>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
+#include <com/sun/star/ucb/XContent.hpp>
 #include <fmprop.hxx>
 #include <sot/formats.hxx>
 #include <sot/exchange.hxx>
@@ -33,7 +34,6 @@ namespace svx
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::sdb;
-    using namespace ::com::sun::star::sdbc;
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::ucb;
     using namespace ::com::sun::star::sdbcx;
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index 09cf6eee3c8b..33c4fee2902d 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -22,6 +22,8 @@
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <tools/urlobj.hxx>
 #include <map>
 
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index f14d59f1a295..40332f8b6053 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -25,6 +25,7 @@
 
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <comphelper/namedvaluecollection.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index 53b854120c9f..c6d3b0d3e5a1 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -19,6 +19,7 @@
 
 #include <fmtextcontroldialogs.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 
 #include <editeng/eeitem.hxx>
 
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 1f3b439289e8..4c7a15c9f9a9 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -34,6 +34,7 @@
 #include <svtools/toolbarmenu.hxx>
 #include <svx/tbcontrl.hxx>
 #include <sfx2/opengrf.hxx>
+#include <tools/urlobj.hxx>
 #include <bitmaps.hlst>
 
 using namespace css;
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index cb7dbadc942d..cd3e75d57632 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -44,6 +44,7 @@
 #include <svx/svdview.hxx>
 #include <svx/transfrmhelper.hxx>
 #include <comphelper/lok.hxx>
+#include <svtools/unitconv.hxx>
 
 using namespace css;
 using namespace css::uno;
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 205d65890225..dd88dd45cf9d 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/table/XMergeableCell.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 #include <comphelper/accessiblewrapper.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index fff5aff167e3..4d8b89b36a15 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -46,6 +46,7 @@
 #include <svx/itemwin.hxx>
 #include <svx/linectrl.hxx>
 #include <svtools/colorcfg.hxx>
+#include <svtools/unitconv.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 0208ae8e335a..42a82abf4472 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -62,6 +62,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #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>
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 4f18aa6ed6b5..fd80eedc99f8 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <osl/mutex.hxx>
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 933806e084e0..bd180490d608 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index fc3859ff02d7..4877ffbe7970 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/document/XLinkTargetSupplier.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <swurl.hxx>
 #include <vcl/keycodes.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 48abb68cacfb..1eb5faf01be0 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/svapp.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <frmfmt.hxx>
diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx
index b2c8d0e7cf96..9f7ebd5d7470 100644
--- a/sw/source/core/access/accnotexthyperlink.cxx
+++ b/sw/source/core/access/accnotexthyperlink.cxx
@@ -16,6 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+
 #include <comphelper/accessiblekeybindinghelper.hxx>
 #include <swurl.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index 562433441eb6..d37e7c1ba9be 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <fmtanchr.hxx>
 
 using namespace ::com::sun::star::accessibility;
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index ef0bff3133b1..b9c80cbe5aa7 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
 #include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <vcl/svapp.hxx>
 #include <frmfmt.hxx>
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index 22f7c6b917dd..024a8861c114 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <frmfmt.hxx>
 #include <flyfrm.hxx>
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index b908b4d31a6f..ab31bef2be55 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -59,6 +59,7 @@
 #include <editeng/unoprnms.hxx>
 #include <sfx2/classificationhelper.hxx>
 #include <svx/ClassificationCommon.hxx>
+#include <svx/ClassificationField.hxx>
 #include <svl/cryptosign.hxx>
 #include <svl/sigstruct.hxx>
 #include <utility>
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index e219d1d6b665..83c8fb523c69 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -43,6 +43,7 @@
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
 
 #include <svtools/insdlg.hxx>
+#include <svtools/unitconv.hxx>
 #include <vcl/treelistentry.hxx>
 #include <tools/resary.hxx>
 #include <vcl/builderfactory.hxx>
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 9f6767fda732..948cd77e4974 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -66,6 +66,7 @@
 #include <svl/eitem.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svtools/ctrltool.hxx>
+#include <svtools/unitconv.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <svx/xtable.hxx>
 #include <svx/dlgutil.hxx>
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index c1296bf97f7a..cf2fcd450ae1 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -33,6 +33,7 @@
 #include <sfx2/dispatch.hxx>
 #include <svl/stritem.hxx>
 #include <sfx2/docfilt.hxx>
+#include <svtools/unitconv.hxx>
 #include <com/sun/star/text/XParagraphCursor.hpp>
 #include <com/sun/star/view/XViewSettingsSupplier.hpp>
 #include <com/sun/star/view/DocumentZoomType.hpp>
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index f4cdf538c717..0a93846d03d3 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -22,6 +22,7 @@
 #include <hintids.hxx>
 #include <svtools/unitconv.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <svx/drawitem.hxx>
 #include <svx/xtable.hxx>
 #include <sal/macros.h>
diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx
index 35dd9f225b0d..ee24ec5c454a 100644
--- a/sw/source/ui/table/colwd.cxx
+++ b/sw/source/ui/table/colwd.cxx
@@ -19,6 +19,7 @@
 
 #include <sfx2/dispatch.hxx>
 #include <svx/dlgutil.hxx>
+#include <svtools/unitconv.hxx>
 #include <colwd.hxx>
 #include <tablemgr.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx
index 066209e6389a..6e0b4809969d 100644
--- a/sw/source/ui/table/rowht.cxx
+++ b/sw/source/ui/table/rowht.cxx
@@ -21,6 +21,7 @@
 #include <svl/eitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/dlgutil.hxx>
+#include <svtools/unitconv.hxx>
 
 #include <fmtfsize.hxx>
 #include <swtypes.hxx>
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index 1d9c83a45ea5..fa849f7319ec 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -30,6 +30,7 @@
 #include <unotools/useroptions.hxx>
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <svx/colorwindow.hxx>
 #include <svx/dataaccessdescriptor.hxx>