tdf#42949 Fix IWYU warnings in cui/source/{options,tabpages}/*cxx

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

Change-Id: I9b6fda67ef7de65cc7b468dded862cd47dfd4269
Reviewed-on: https://gerrit.libreoffice.org/78078
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

33 files changed, 2 insertions, 264 deletions

diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 42a271028cf9..2360efde8320 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -20,24 +20,16 @@
 #include <align.hxx>
 
 #include <editeng/svxenum.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <bitmaps.hlst>
 #include <svx/rotmodit.hxx>
 
-#include <svx/algitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/justifyitem.hxx>
-#include <svx/dlgutil.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
 #include <svl/cjkoptions.hxx>
-#include <svl/languageoptions.hxx>
-#include <svx/flagsdef.hxx>
 #include <svl/intitem.hxx>
-#include <sfx2/request.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/event.hxx>
 
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index b2b38f74f852..d2ab9b0013da 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -21,28 +21,20 @@
 #include <vcl/event.hxx>
 #include <vcl/keycodes.hxx>
 #include <vcl/settings.hxx>
-#include <sot/exchange.hxx>
 #include <vcl/transfer.hxx>
-#include <unotools/syslocale.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/collatorwrapper.hxx>
-#include <com/sun/star/i18n/CollatorOptions.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/module.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/sfxsids.hrc>
 #include <svl/eitem.hxx>
 #include <svl/languageoptions.hxx>
 #include <svx/SmartTagMgr.hxx>
-#include <svx/ucsubset.hxx>
 #include <com/sun/star/smarttags/XSmartTagRecognizer.hpp>
-#include <com/sun/star/smarttags/XSmartTagAction.hpp>
 #include <rtl/strbuf.hxx>
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
@@ -52,7 +44,6 @@
 #include <editeng/svxacorr.hxx>
 #include <cui/cuicharmap.hxx>
 #include <strings.hrc>
-#include <editeng/unolingu.hxx>
 #include <dialmgr.hxx>
 #include <svx/svxids.hrc>
 
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index c85bc63b696b..86b9ca5dfd2e 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -19,22 +19,17 @@
 
 #include <memory>
 #include <com/sun/star/drawing/FillStyle.hpp>
-#include <unotools/pathoptions.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
-#include <sfx2/dialoghelper.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/docfile.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <svx/strings.hrc>
 
 #include <strings.hrc>
 #include <svx/dialmgr.hxx>
-#include <editeng/memberids.h>
 
 #include <editeng/brushitem.hxx>
 #include <editeng/colritem.hxx>
@@ -48,10 +43,8 @@
 #include <svx/xflclit.hxx>
 #include <dialmgr.hxx>
 #include <sfx2/htmlmode.hxx>
-#include <svtools/controldims.hxx>
 #include <svx/flagsdef.hxx>
 #include <svl/intitem.hxx>
-#include <sfx2/request.hxx>
 #include <vcl/GraphicObject.hxx>
 
 #include <svx/unobrushitemhelper.hxx>
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 5777a0e3c1cc..d8bed85f67cd 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -17,19 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/module.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
-#include <svx/dialmgr.hxx>
-#include <svx/strings.hrc>
 
 #include <strings.hrc>
 #include <bitmaps.hlst>
 
-#include <svx/xtable.hxx>
-#include <svx/drawitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/lineitem.hxx>
 #include <border.hxx>
@@ -39,7 +32,6 @@
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
 #include <svx/flagsdef.hxx>
-#include <sfx2/request.hxx>
 #include <svl/grabbagitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/ilstitem.hxx>
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 88379720e330..8d1abb55a0ac 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -17,22 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editeng/unolingu.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/idle.hxx>
-#include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
-#include <sfx2/printer.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/bindings.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
-#include <svx/ucsubset.hxx>
 #include <svtools/unitconv.hxx>
 #include <svl/languageoptions.hxx>
-#include <svx/xtable.hxx>
 #include <chardlg.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/postitem.hxx>
@@ -50,10 +41,7 @@
 #include <editeng/blinkitem.hxx>
 #include <editeng/flstitem.hxx>
 #include <editeng/autokernitem.hxx>
-#include <editeng/brushitem.hxx>
 #include <editeng/colritem.hxx>
-#include <svx/drawitem.hxx>
-#include <svx/dlgutil.hxx>
 #include <dialmgr.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <cui/cuicharmap.hxx>
@@ -62,15 +50,12 @@
 #include <editeng/charreliefitem.hxx>
 #include <editeng/twolinesitem.hxx>
 #include <editeng/charhiddenitem.hxx>
-#include <svl/stritem.hxx>
 #include <editeng/charscaleitem.hxx>
 #include <editeng/charrotateitem.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <svx/svxdlg.hxx>
 #include <strings.hrc>
 #include <twolines.hrc>
 #include <svl/intitem.hxx>
-#include <sfx2/request.hxx>
 #include <svx/flagsdef.hxx>
 #include <FontFeaturesDialog.hxx>
 #include <sal/log.hxx>
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index a20a38011869..22283158d5a8 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -19,17 +19,12 @@
 
 #include <strings.hrc>
 #include <dialmgr.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
-#include <sfx2/request.hxx>
 
 #include <svx/connctrl.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <svx/dlgutil.hxx>
 #include <svx/ofaitem.hxx>
 
-#include <svx/svdoedge.hxx>
 #include <svx/svdview.hxx>
 #include <svx/sxekitm.hxx>
 #include <svx/sxelditm.hxx>
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 1033b92a856a..30a42e94f8f1 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -19,8 +19,6 @@
 
 #include <sfx2/basedlgs.hxx>
 #include <dstribut.hxx>
-#include <svx/dialogs.hrc>
-#include <svx/svddef.hxx>
 
 /*************************************************************************
 |*
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 8c6788bc2592..1e19b0d0667f 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -20,9 +20,6 @@
 #include <memory>
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
-#include <sfx2/sfxsids.hrc>
 #include <dialmgr.hxx>
 #include <svx/dlgutil.hxx>
 #include <editeng/sizeitem.hxx>
@@ -32,7 +29,6 @@
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
 #include <tools/fract.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <strings.hrc>
 #include <vcl/field.hxx>
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 72f8fed35cd0..8b60ac8501d8 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -17,16 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
 #include <swpossizetabpage.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
 #include <svtools/unitconv.hxx>
 
-#include <svx/dialogs.hrc>
 #include <svx/svddef.hxx>
-#include <svx/sxcaitm.hxx>
 #include <svx/sxcecitm.hxx>
 #include <svx/sxcgitm.hxx>
 #include <svx/sxcllitm.hxx>
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 364f9479a8ad..cabe3bb31af3 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -20,18 +20,14 @@
 #include <macroass.hxx>
 
 #include <osl/diagnose.h>
-#include <basic/basmgr.hxx>
 #include <comphelper/string.hxx>
 #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>
-#include <sfx2/app.hxx>
 #include <sfx2/evntconf.hxx>
-#include <sfx2/objsh.hxx>
 #include <headertablistbox.hxx>
 
 using ::com::sun::star::uno::Reference;
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 1fba56ea73d9..63eeb1a3ce8d 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -19,24 +19,14 @@
 
 #include <strings.hrc>
 #include <dialmgr.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
-#include <sfx2/request.hxx>
-#include <vcl/settings.hxx>
 
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <svx/dlgutil.hxx>
 #include <svx/measctrl.hxx>
 #include <svx/ofaitem.hxx>
 #include <svx/strarray.hxx>
-#include <svx/svdomeas.hxx>
 #include <svx/svdview.hxx>
-#include <svx/sxekitm.hxx>
-#include <svx/sxelditm.hxx>
-#include <svx/sxenditm.hxx>
 #include <svx/sxmbritm.hxx>
-#include <svx/sxmfsitm.hxx>
 #include <svx/sxmlhitm.hxx>
 #include <svx/sxmtfitm.hxx>
 #include <svx/sxmtpitm.hxx>
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 499910f6d78b..7052e60f0af6 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -22,10 +22,7 @@
 #include <sfx2/objsh.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <unotools/localedatawrapper.hxx>
 #include <i18nlangtag/lang.h>
-#include <i18nlangtag/mslangid.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <svtools/colorcfg.hxx>
 
@@ -37,8 +34,6 @@
 #include <numfmt.hxx>
 #include <svx/numfmtsh.hxx>
 #include <dialmgr.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <svx/flagsdef.hxx>
 #include <vector>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index d366fb1a90bc..d1a86909034b 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -19,7 +19,6 @@
 
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
-#include <com/sun/star/text/RelOrientation.hpp>
 
 #include <numpages.hxx>
 #include <dialmgr.hxx>
@@ -32,8 +31,6 @@
 #include <svx/colorbox.hxx>
 #include <svx/strarray.hxx>
 #include <svx/gallery.hxx>
-#include <svx/ucsubset.hxx>
-#include <svl/urihelper.hxx>
 #include <editeng/brushitem.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/objsh.hxx>
@@ -41,25 +38,18 @@
 #include <vcl/settings.hxx>
 #include <cui/cuicharmap.hxx>
 #include <editeng/flstitem.hxx>
-#include <svx/dlgutil.hxx>
-#include <svx/xtable.hxx>
-#include <svx/drawitem.hxx>
 #include <svx/numvset.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svtools/unitconv.hxx>
-#include <editeng/unolingu.hxx>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/text/DefaultNumberingProvider.hpp>
 #include <com/sun/star/text/XDefaultNumberingProvider.hpp>
 #include <com/sun/star/text/XNumberingFormatter.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/text/XNumberingTypeInfo.hpp>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 
 #include <algorithm>
@@ -68,20 +58,18 @@
 #include <sfx2/opengrf.hxx>
 
 #include <strings.hrc>
-#include <sfx2/request.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/slstitm.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <svx/gallery1.hxx>
-#include <svx/galtheme.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <rtl/ustring.h>
 #include <sal/log.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <svx/SvxNumOptionsTabPageHelper.hxx>
+#include <tools/urlobj.hxx>
+#include <osl/diagnose.h>
 
 using namespace css;
 using namespace css::uno;
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index dd250a1fe532..9a498c44d42e 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -18,17 +18,13 @@
  */
 
 #include <memory>
-#include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/printer.hxx>
-#include <vcl/graph.hxx>
 #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>
 #include <sfx2/htmlmode.hxx>
 #include <sal/macros.h>
 
@@ -46,7 +42,6 @@
 #include <editeng/frmdiritem.hxx>
 #include <svx/dlgutil.hxx>
 #include <editeng/paperinf.hxx>
-#include <sfx2/module.hxx>
 #include <svl/stritem.hxx>
 #include <editeng/eerdll.hxx>
 #include <editeng/editrids.hrc>
@@ -54,7 +49,6 @@
 #include <svtools/optionsdrawinglayer.hxx>
 #include <svl/slstitm.hxx>
 #include <svl/aeitem.hxx>
-#include <sfx2/request.hxx>
 #include <svx/xdef.hxx>
 #include <svx/unobrushitemhelper.hxx>
 #include <svx/SvxNumOptionsTabPageHelper.hxx>
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 0560ab0c0e2d..6c1bb4337500 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -20,13 +20,9 @@
 #include <memory>
 #include <osl/diagnose.h>
 #include <svl/style.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/dialoghelper.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/module.hxx>
 #include <vcl/mnemonic.hxx>
 #include <svx/flagsdef.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 
 #include <svl/languageoptions.hxx>
@@ -52,7 +48,6 @@
 #include <sfx2/htmlmode.hxx>
 #include <editeng/paravertalignitem.hxx>
 #include <svl/eitem.hxx>
-#include <sfx2/request.hxx>
 #include <svl/intitem.hxx>
 
 #include <sfx2/viewfrm.hxx>
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 073a305f4cb0..35e4ae41a86a 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/text/HoriOrientation.hpp>
 #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>
 
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 25748c947c5a..a400c0207839 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -17,21 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <unotools/pathoptions.hxx>
-#include <svx/svdmark.hxx>
-#include <svx/svdobj.hxx>
-#include <svx/svdview.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 
 #include <svx/xtable.hxx>
-#include <svx/globl3d.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/drawitem.hxx>
 #include <cuitabarea.hxx>
-#include <dlgname.hxx>
 
 SvxAreaTabDialog::SvxAreaTabDialog
 (
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index ac02b2ef4e35..f4e0a1268013 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -18,13 +18,10 @@
  */
 
 #include <unotools/pathoptions.hxx>
-#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>
 #include <svx/svdmodel.hxx>
 #include <svx/xtable.hxx>
 #include <svx/drawitem.hxx>
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 12939d618a3d..8ecb2478a0d1 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -17,10 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#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>
@@ -28,10 +26,8 @@
 #include <editeng/lrspitem.hxx>
 #include <tabstpge.hxx>
 #include <svx/dlgutil.hxx>
-#include <sfx2/module.hxx>
 #include <svl/cjkoptions.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <sfx2/request.hxx>
 #include <svl/intitem.hxx>
 
 constexpr FieldUnit eDefUnit = FieldUnit::MM_100TH;
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 56f20d859fb4..7048a030c36e 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -17,11 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
-
-#include <svx/dialogs.hrc>
-
 #include <textanim.hxx>
 #include <textattr.hxx>
 #include <svx/dlgutil.hxx>
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 08c7b044a62f..0b576d49a6e8 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
 #include <svx/svddef.hxx>
 #include <svx/sdasitm.hxx>
 #include <svx/sdtditm.hxx>
@@ -27,16 +25,10 @@
 #include <svx/sdtfsitm.hxx>
 #include <svx/sdtcfitm.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/svdmark.hxx>
-#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>
 
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 0a9d4a13bca6..f3f545c13a40 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -17,31 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <stdlib.h>
-
-#include <tools/urlobj.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
-
-#include <svx/xpool.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflbckit.hxx>
-#include <svx/xtable.hxx>
-#include <svx/xlineit0.hxx>
 #include <svx/drawitem.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xflgrit.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/xbtmpit.hxx>
 #include <cuitabarea.hxx>
-#include <dlgname.hxx>
-#include <svx/dlgutil.hxx>
-#include <svl/intitem.hxx>
-#include <sfx2/request.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <sfx2/opengrf.hxx>
 
 using namespace com::sun::star;
 
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index dfe752419dd7..3357c5ba8a14 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -20,18 +20,11 @@
 #include <memory>
 #include <stdlib.h>
 #include <tools/urlobj.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
 #include <svx/xbtmpit.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
-#include <svx/xpool.hxx>
 #include <strings.hrc>
 #include <svx/xfillit0.hxx>
-#include <svx/xflbckit.hxx>
 #include <svx/xtable.hxx>
-#include <svx/xlineit0.hxx>
-#include <svx/drawitem.hxx>
 #include <svx/xflbmsxy.hxx>
 #include <svx/xflbmtit.hxx>
 #include <svx/xflbstit.hxx>
@@ -40,11 +33,9 @@
 #include <svx/xflboxy.hxx>
 #include <svx/xflbtoxy.hxx>
 #include <cuitabarea.hxx>
-#include <dlgname.hxx>
 #include <dialmgr.hxx>
 #include <svx/dlgutil.hxx>
 #include <svl/intitem.hxx>
-#include <sfx2/request.hxx>
 #include <sfx2/opengrf.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index f8749af9c681..cc910f3d56da 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -19,39 +19,20 @@
 
 #include <memory>
 #include <i18nutil/unicode.hxx>
-#include <tools/urlobj.hxx>
-#include <unotools/pathoptions.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/dispatch.hxx>
 #include <svtools/colrdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <sfx2/filedlghelper.hxx>
-#include <svx/ofaitem.hxx>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
 #include <strings.hrc>
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
-#include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
-#include <svx/drawitem.hxx>
 #include <cuitabarea.hxx>
-#include <defdlgname.hxx>
-#include <dlgname.hxx>
 #include <svx/svxdlg.hxx>
 #include <dialmgr.hxx>
 #include <cuitabline.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
-#include <osl/file.hxx>
-#include <svx/Palette.hxx>
-#include <cppu/unotype.hxx>
 #include <officecfg/Office/Common.hxx>
 
 using namespace com::sun::star;
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index d68cb93dbc1f..3e99b3405dae 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -18,31 +18,21 @@
  */
 
 #include <memory>
-#include <vcl/wrkwin.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <unotools/pathoptions.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/dialoghelper.hxx>
-#include <sfx2/filedlghelper.hxx>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
 #include <strings.hrc>
 #include <svx/xfillit0.hxx>
 #include <svx/xflgrit.hxx>
 #include <svx/colorbox.hxx>
 #include <svx/xtable.hxx>
-#include <svx/xpool.hxx>
-#include <svx/drawitem.hxx>
 #include <svx/xgrscit.hxx>
 #include <cuitabarea.hxx>
-#include <defdlgname.hxx>
-#include <dlgname.hxx>
 #include <svx/svxdlg.hxx>
 #include <dialmgr.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
 #include <sal/log.hxx>
 
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index b2db5a9800dc..4793cb887137 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -22,30 +22,20 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <unotools/pathoptions.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/dialoghelper.hxx>
-#include <sfx2/filedlghelper.hxx>
-#include <sfx2/module.hxx>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
 #include <strings.hrc>
 #include <svx/xfillit0.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/colorbox.hxx>
-#include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
-#include <svx/drawitem.hxx>
 #include <svx/xflbckit.hxx>
 #include <cuitabarea.hxx>
-#include <defdlgname.hxx>
-#include <dlgname.hxx>
 #include <svx/svxdlg.hxx>
 #include <dialmgr.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <sal/log.hxx>
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 691e526d86a3..56b9294cbfb1 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -21,8 +21,6 @@
 #include <editeng/sizeitem.hxx>
 #include <osl/file.hxx>
 #include <tools/urlobj.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
 
 #include <strings.hrc>
 #include <svx/colorbox.hxx>
@@ -42,32 +40,24 @@
 
 
 #include <svx/tabline.hxx>
-#include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
 #include <svx/drawitem.hxx>
 #include <cuitabline.hxx>
-#include <dlgname.hxx>
 #include <dialmgr.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/svxgrahicitem.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/dialoghelper.hxx>
 #include <svx/ofaitem.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/numvset.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xfltrit.hxx>
 #include <editeng/numitem.hxx>
-#include <editeng/svxenum.hxx>
-#include <sfx2/objsh.hxx>
 #include <editeng/brushitem.hxx>
 #include <svx/gallery.hxx>
 #include <sfx2/opengrf.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <svx/strings.hrc>
 #include <vcl/settings.hxx>
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 2325ac2f9a46..e83881292575 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -22,8 +22,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <unotools/pathoptions.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
@@ -33,19 +31,15 @@
 #include <svx/xlnwtit.hxx>
 #include <svx/xlndsit.hxx>
 #include <svx/xlnclit.hxx>
-#include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
 
 #include <svx/dlgctrl.hxx>
-#include <svx/drawitem.hxx>
 #include <cuitabline.hxx>
-#include <dlgname.hxx>
 #include <defdlgname.hxx>
 #include <svx/svxdlg.hxx>
 #include <dialmgr.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <cuitabarea.hxx>
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index ca519df51000..eb73de028838 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -22,7 +22,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <unotools/pathoptions.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
@@ -31,8 +30,6 @@
 #include <svx/dlgctrl.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdopath.hxx>
-#include <svx/drawitem.hxx>
-#include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/xlnwtit.hxx>
@@ -45,14 +42,9 @@
 #include <cuitabarea.hxx>
 #include <svx/svxdlg.hxx>
 #include <dialmgr.hxx>
-#include <svx/dlgutil.hxx>
 #include <basegfx/range/b2drange.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
 
 #define XOUT_WIDTH    150
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 8f456abd61ca..87f54a08c89c 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -18,38 +18,23 @@
  */
 
 #include <memory>
-#include <vcl/wrkwin.hxx>
 #include <tools/urlobj.hxx>
-#include <unotools/pathoptions.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/dialoghelper.hxx>
-#include <sfx2/filedlghelper.hxx>
-#include <unotools/localfilehelper.hxx>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <svx/colorbox.hxx>
 #include <svx/dialmgr.hxx>
-#include <vcl/bitmapaccess.hxx>
 #include <vcl/BitmapTools.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
 
 #include <strings.hrc>
 #include <svx/xfillit0.hxx>
 #include <svx/xbtmpit.hxx>
-#include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
-#include <svx/xoutbmp.hxx>
-#include <svx/drawitem.hxx>
 #include <svx/xflbmtit.hxx>
 #include <cuitabarea.hxx>
-#include <defdlgname.hxx>
-#include <dlgname.hxx>
 #include <svx/svxdlg.hxx>
 #include <dialmgr.hxx>
-#include <sfx2/opengrf.hxx>
 #include <sal/log.hxx>
 
 using namespace com::sun::star;
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 6ea0c2e18ae7..63b1fa8f89dc 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -17,10 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
 #include <svx/colorbox.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <svtools/unitconv.hxx>
 
@@ -29,7 +26,6 @@
 #include <svx/xflgrit.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/xbtmpit.hxx>
-#include <svx/xpool.hxx>
 #include <svx/sdmetitm.hxx>
 #include <svx/sdooitm.hxx>
 #include <svx/sdprcitm.hxx>
@@ -42,8 +38,6 @@
 #include <cuitabarea.hxx>
 #include <svx/dlgutil.hxx>
 #include <cuitabline.hxx>
-#include <svx/xlineit0.hxx>
-#include <sfx2/request.hxx>
 
 using namespace com::sun::star;
 
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index 785cd6f33b55..389263205c9d 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -17,12 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <stdlib.h>
-
-#include <tools/urlobj.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/module.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 
 #include <svx/xfillit0.hxx>
@@ -31,20 +25,11 @@
 #include <svx/xflgrit.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/xbtmpit.hxx>
-#include <svx/xpool.hxx>
 #include <svx/xflbckit.hxx>
 #include <svx/sdshtitm.hxx>
-#include <svx/xtable.hxx>
-#include <svx/xlineit0.hxx>
-#include <svx/drawitem.hxx>
 #include <svx/xfltrit.hxx>
 #include <cuitabarea.hxx>
-#include <dlgname.hxx>
-#include <svx/dlgutil.hxx>
 #include <svl/intitem.hxx>
-#include <sfx2/request.hxx>
-
-#include <sfx2/opengrf.hxx>
 
 using namespace com::sun::star;
 
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 160a636233df..551509d6a8a0 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -21,30 +21,23 @@
 
 #include <algorithm>
 
-#include <sfx2/app.hxx>
 #include <svx/EnhancedCustomShape2d.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/svdotext.hxx>
 #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>
-#include <editeng/svxenum.hxx>
 #include <svx/anchorid.hxx>
-#include <sfx2/module.hxx>
 #include <svl/rectitem.hxx>
 #include <svl/aeitem.hxx>
 #include <swpossizetabpage.hxx>
-#include <comphelper/lok.hxx>
 #include <vcl/canvastools.hxx>
 
 // static ----------------------------------------------------------------