[Libreoffice-commits] core.git: cui/source include/svx

Gabor Kelemen (via logerrit) logerrit at kemper.freedesktop.org
Thu Aug 29 07:44:03 UTC 2019


 cui/source/options/certpath.cxx                |    2 -
 cui/source/options/cfgchart.cxx                |    1 
 cui/source/options/connpoolconfig.cxx          |    3 -
 cui/source/options/connpooloptions.cxx         |    3 -
 cui/source/options/cuisrchdlg.cxx              |   14 --------
 cui/source/options/dbregister.cxx              |   11 -------
 cui/source/options/dbregisterednamesconfig.cxx |    7 ----
 cui/source/options/fontsubs.cxx                |    3 -
 cui/source/options/fontsubs.hxx                |    4 --
 cui/source/options/optaboutconfig.cxx          |    3 -
 cui/source/options/optasian.cxx                |    2 -
 cui/source/options/optbasic.cxx                |    1 
 cui/source/options/optbasic.hxx                |    1 
 cui/source/options/optchart.cxx                |    1 
 cui/source/options/optcolor.cxx                |    5 ---
 cui/source/options/optdict.cxx                 |    6 ---
 cui/source/options/optfltr.cxx                 |    4 --
 cui/source/options/optfltr.hxx                 |    2 -
 cui/source/options/optgdlg.cxx                 |   24 ---------------
 cui/source/options/optgdlg.hxx                 |    4 --
 cui/source/options/optgenrl.cxx                |    3 -
 cui/source/options/opthtml.cxx                 |    1 
 cui/source/options/optinet2.cxx                |   39 -------------------------
 cui/source/options/optinet2.hxx                |    3 -
 cui/source/options/optjava.cxx                 |    4 --
 cui/source/options/optjava.hxx                 |    4 --
 cui/source/options/optlingu.cxx                |   16 ----------
 cui/source/options/optopencl.cxx               |   10 ------
 cui/source/options/optpath.cxx                 |    9 -----
 cui/source/options/optsave.cxx                 |    4 --
 cui/source/options/optsave.hxx                 |    4 --
 cui/source/options/optupdt.cxx                 |    2 -
 cui/source/options/optupdt.hxx                 |    2 -
 cui/source/options/personalization.cxx         |   17 ----------
 cui/source/options/sdbcdriverenum.cxx          |    1 
 cui/source/options/securityoptions.cxx         |    1 
 cui/source/options/treeopt.cxx                 |   21 +------------
 cui/source/options/tsaurls.cxx                 |    4 --
 cui/source/options/webconninfo.cxx             |    2 -
 cui/source/tabpages/align.cxx                  |    8 -----
 cui/source/tabpages/autocdlg.cxx               |    9 -----
 cui/source/tabpages/backgrnd.cxx               |    7 ----
 cui/source/tabpages/border.cxx                 |    8 -----
 cui/source/tabpages/chardlg.cxx                |   15 ---------
 cui/source/tabpages/connect.cxx                |    5 ---
 cui/source/tabpages/dstribut.cxx               |    2 -
 cui/source/tabpages/grfpage.cxx                |    4 --
 cui/source/tabpages/labdlg.cxx                 |    4 --
 cui/source/tabpages/macroass.cxx               |    4 --
 cui/source/tabpages/measure.cxx                |   10 ------
 cui/source/tabpages/numfmt.cxx                 |    5 ---
 cui/source/tabpages/numpages.cxx               |   16 +---------
 cui/source/tabpages/page.cxx                   |    6 ---
 cui/source/tabpages/paragrph.cxx               |    5 ---
 cui/source/tabpages/swpossizetabpage.cxx       |    1 
 cui/source/tabpages/tabarea.cxx                |    7 ----
 cui/source/tabpages/tabline.cxx                |    3 -
 cui/source/tabpages/tabstpge.cxx               |    4 --
 cui/source/tabpages/textanim.cxx               |    5 ---
 cui/source/tabpages/textattr.cxx               |    8 -----
 cui/source/tabpages/tparea.cxx                 |   15 ---------
 cui/source/tabpages/tpbitmap.cxx               |    9 -----
 cui/source/tabpages/tpcolor.cxx                |   19 ------------
 cui/source/tabpages/tpgradnt.cxx               |   10 ------
 cui/source/tabpages/tphatch.cxx                |   10 ------
 cui/source/tabpages/tpline.cxx                 |   10 ------
 cui/source/tabpages/tplnedef.cxx               |    6 ---
 cui/source/tabpages/tplneend.cxx               |    8 -----
 cui/source/tabpages/tppattern.cxx              |   15 ---------
 cui/source/tabpages/tpshadow.cxx               |    6 ---
 cui/source/tabpages/tptrans.cxx                |   15 ---------
 cui/source/tabpages/transfrm.cxx               |    7 ----
 include/svx/databaseregistrationui.hxx         |    1 
 73 files changed, 9 insertions(+), 506 deletions(-)

New commits:
commit 00f4595fbec8a6bfc31687ed950525ce20c68fcd
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Sun Aug 25 10:28:19 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Aug 29 09:43:23 2019 +0200

    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 at collabora.com>

diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 9bd43b850e6f..2fa4d3e0e7b9 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -11,9 +11,7 @@
 #include <osl/file.hxx>
 #include <osl/security.hxx>
 #include <osl/thread.h>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
-#include <unotools/securityoptions.hxx>
 #include "certpath.hxx"
 
 #include <com/sun/star/mozilla/MozillaBootstrap.hpp>
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 0427e734ddc7..5641687fa94e 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <com/sun/star/uno/Sequence.hxx>
-#include <tools/stream.hxx>
 #include <tools/debug.hxx>
 #include <sal/log.hxx>
 #include "cfgchart.hxx"
diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx
index 3b42fc1fdd69..8bf95ee0db5d 100644
--- a/cui/source/options/connpoolconfig.cxx
+++ b/cui/source/options/connpoolconfig.cxx
@@ -20,15 +20,14 @@
 #include "connpoolconfig.hxx"
 #include "connpoolsettings.hxx"
 
-#include "connpooloptions.hxx"
 #include <svl/itemset.hxx>
 #include <svx/databaseregistrationui.hxx>
 #include <unotools/confignode.hxx>
 #include <svl/eitem.hxx>
-#include <svl/solar.hrc>
 #include <comphelper/processfactory.hxx>
 #include "sdbcdriverenum.hxx"
 
+#include <com/sun/star/uno/Sequence.hxx>
 
 namespace offapp
 {
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index c26f7a56db85..139bd2b1f8ae 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -20,11 +20,8 @@
 #include <osl/diagnose.h>
 #include "connpooloptions.hxx"
 #include <svtools/editbrowsebox.hxx>
-#include <vcl/field.hxx>
-#include <vcl/builderfactory.hxx>
 #include "connpoolsettings.hxx"
 #include <svl/eitem.hxx>
-#include <svl/solar.hrc>
 #include <svx/databaseregistrationui.hxx>
 #include <strings.hrc>
 #include <dialmgr.hxx>
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index bdbdc150632b..25ada3e09410 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -17,25 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svl/slstitm.hxx>
-#include <svl/itemiter.hxx>
-#include <svl/style.hxx>
-#include <unotools/searchopt.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/module.hxx>
-#include <sfx2/viewsh.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <svl/cjkoptions.hxx>
 
 #include <cuisrchdlg.hxx>
 
-#include <svl/srchitem.hxx>
-#include <svx/pageitem.hxx>
-#include <svx/dlgutil.hxx>
 #include "optjsearch.hxx"
-#include <editeng/brushitem.hxx>
-#include <backgrnd.hxx>
 
 
 // class SvxJSearchOptionsDialog -----------------------------------------
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index f8680e3a53f2..782541622bbd 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -19,28 +19,17 @@
 
 #include <dbregister.hxx>
 #include "dbregistersettings.hxx"
-#include "connpooloptions.hxx"
 #include <svl/filenotation.hxx>
 #include <helpids.h>
 #include <tools/debug.hxx>
-#include <svtools/editbrowsebox.hxx>
 #include <strings.hrc>
 #include <bitmaps.hlst>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <svl/eitem.hxx>
-#include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <svl/itemset.hxx>
 #include "doclinkdialog.hxx"
-#include <unotools/localfilehelper.hxx>
-#include <sfx2/docfilt.hxx>
 #include <dialmgr.hxx>
 #include "dbregisterednamesconfig.hxx"
-#include <svx/dialogs.hrc>
 #include <svx/databaseregistrationui.hxx>
 
 #define TAB_WIDTH1      80
diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx
index 3123a45e0b77..87681866e067 100644
--- a/cui/source/options/dbregisterednamesconfig.cxx
+++ b/cui/source/options/dbregisterednamesconfig.cxx
@@ -17,18 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "connpooloptions.hxx"
 #include "dbregisterednamesconfig.hxx"
 #include "dbregistersettings.hxx"
 #include <svx/databaseregistrationui.hxx>
-#include <svx/svxids.hrc>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdb/DatabaseContext.hpp>
 #include <comphelper/processfactory.hxx>
-#include <svl/eitem.hxx>
 #include <svl/itemset.hxx>
-#include <unotools/pathoptions.hxx>
-#include <unotools/confignode.hxx>
 #include <tools/diagnose_ex.h>
 
 
@@ -36,7 +30,6 @@ namespace svx
 {
 
 
-    using namespace ::utl;
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::sdb;
     using namespace ::com::sun::star::container;
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 3d9c7550a961..8fad18ebdcfa 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -21,10 +21,7 @@
 
 #include <officecfg/Office/Common.hxx>
 #include <svtools/ctrltool.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/svlbitm.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
 #include <svtools/fontsubstconfig.hxx>
 #include "fontsubs.hxx"
 #include <helpids.h>
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index b44b328282df..4f33ab24525e 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -20,10 +20,6 @@
 #define INCLUDED_CUI_SOURCE_OPTIONS_FONTSUBS_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <svtools/ctrlbox.hxx>
-#include <svtools/simptabl.hxx>
-#include <vcl/treelistentry.hxx>
-#include <vcl/layout.hxx>
 
 // class SvxFontSubstTabPage ----------------------------------------------------
 class SvtFontSubstConfig;
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index aa5d960e7552..66f3f1cde343 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -19,12 +19,9 @@
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/beans/Property.hpp>
-#include <com/sun/star/beans/XProperty.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/container/XHierarchicalName.hpp>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/util/SearchAlgorithms2.hpp>
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 883bcbb984a7..ef167d231950 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -22,8 +22,6 @@
 #include <optasian.hxx>
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
-#include <editeng/langitem.hxx>
-#include <editeng/unolingu.hxx>
 #include <o3tl/any.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <svl/asiancfg.hxx>
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 56a52fbcd45c..328d3261e524 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -19,7 +19,6 @@
 
 #include "optbasic.hxx"
 #include <basic/codecompletecache.hxx>
-#include <iostream>
 #include <officecfg/Office/BasicIDE.hxx>
 
 SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index 0cf509ae2745..5114e8c8a631 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTBASIC_HXX
 #define INCLUDED_CUI_SOURCE_OPTIONS_OPTBASIC_HXX
 
-#include <vcl/button.hxx>
 #include <sfx2/tabdlg.hxx>
 
 class SvxBasicIDEOptionsPage: public SfxTabPage
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index e41c12ed0844..116ff56a9473 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <unotools/pathoptions.hxx>
 #include "optchart.hxx"
 #include <svx/SvxColorValueSet.hxx>
 #include <vcl/virdev.hxx>
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 7265d7ba79c5..8e241ce744db 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -27,22 +27,17 @@
 #include <svtools/colorcfg.hxx>
 #include <svtools/extcolorcfg.hxx>
 #include <vcl/headbar.hxx>
-#include <svtools/ctrlbox.hxx>
 #include <vcl/scrbar.hxx>
 #include <svx/colorbox.hxx>
-#include <svx/xtable.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <unotools/pathoptions.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/weld.hxx>
 #include <svx/svxdlg.hxx>
 #include <helpids.h>
 #include <dialmgr.hxx>
 #include "optcolor.hxx"
 #include <strings.hrc>
-#include <svx/dlgutil.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::svtools;
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 40240d6fa550..7c04a4a7d7da 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -18,10 +18,7 @@
  */
 
 #include <editeng/unolingu.hxx>
-#include <svx/dlgutil.hxx>
 #include <svx/dialmgr.hxx>
-#include <sfx2/sfxuno.hxx>
-#include <svl/eitem.hxx>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/linguistic2/XDictionary.hpp>
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
@@ -32,9 +29,6 @@
 #include <unotools/syslocale.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/event.hxx>
-#include <svx/dialogs.hrc>
 
 #include <linguistic/misc.hxx>
 #include <strings.hrc>
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 85abc803b07e..3c4260d38785 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -24,10 +24,6 @@
 #include <strings.hrc>
 #include <dialmgr.hxx>
 
-#include <vcl/event.hxx>
-#include <vcl/svlbitm.hxx>
-#include <vcl/treelistentry.hxx>
-
 enum class MSFltrPg2_CheckBoxEntries {
     Math,
     Writer,
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index db954aa4684b..e619ecc8b3e3 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -19,9 +19,7 @@
 #ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTFLTR_HXX
 #define INCLUDED_CUI_SOURCE_OPTIONS_OPTFLTR_HXX
 
-#include <vcl/button.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <svtools/simptabl.hxx>
 
 class OfaMSFilterTabPage : public SfxTabPage
 {
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 1ac969189bf7..2ef0e6fa8b78 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -20,38 +20,22 @@
 #include <config_features.h>
 #include <svl/zforlist.hxx>
 #include <svl/currencytable.hxx>
-#include <vcl/GraphicObject.hxx>
 #include <svtools/langhelp.hxx>
-#include <svl/flagitem.hxx>
-#include <sfx2/dispatch.hxx>
 #include <unotools/lingucfg.hxx>
-#include <sfx2/viewsh.hxx>
+#include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <vcl/configsettings.hxx>
-#include <vcl/mnemonic.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <unotools/compatibility.hxx>
-#include <unotools/useroptions.hxx>
 #include <unotools/fontoptions.hxx>
 #include <svtools/menuoptions.hxx>
 #include <svl/languageoptions.hxx>
 #include <svtools/miscopt.hxx>
 #include <unotools/printwarningoptions.hxx>
 #include <unotools/syslocaleoptions.hxx>
-#include <unotools/configitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <svtools/langtab.hxx>
-#include <unotools/localfilehelper.hxx>
-#include <unotools/configmgr.hxx>
-#include <cuioptgenrl.hxx>
-#include <optpath.hxx>
-#include "optsave.hxx"
-#include <optlingu.hxx>
-#include <svx/xpool.hxx>
-#include <svx/dlgutil.hxx>
-#include <cuitabarea.hxx>
 #include <editeng/unolingu.hxx>
 #include <editeng/langitem.hxx>
 #include <comphelper/processfactory.hxx>
@@ -60,9 +44,7 @@
 #include <svx/svxids.hrc>
 #include <svl/intitem.hxx>
 #include <svtools/helpopt.hxx>
-#include <unotools/saveopt.hxx>
 #include <unotools/searchopt.hxx>
-#include <sal/macros.h>
 #include <sal/log.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <officecfg/Setup.hxx>
@@ -73,8 +55,6 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -94,12 +74,10 @@
 #include <vcl/opengl/OpenGLWrapper.hxx>
 #endif
 #include "optgdlg.hxx"
-#include <svx/ofaitem.hxx>
 #include <svtools/apearcfg.hxx>
 #include <svtools/optionsdrawinglayer.hxx>
 #include <svtools/restartdialog.hxx>
 #include <svtools/imgdef.hxx>
-#include <comphelper/solarmutex.hxx>
 
 #include <config_vclplug.h>
 
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 36b392c6e062..b1256225a660 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -19,10 +19,6 @@
 #ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX
 #define INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX
 #include <memory>
-#include <vcl/button.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <svx/langbox.hxx>
 
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 57a026d07fd7..39bc71e8cc23 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -31,13 +31,10 @@
 #include <vcl/svapp.hxx>
 #include <unotools/saveopt.hxx>
 #include <svl/intitem.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/settings.hxx>
 
 #include <unotools/useroptions.hxx>
 #include <cuioptgenrl.hxx>
-#include <svx/dlgutil.hxx>
 #include <svx/svxids.hrc>
 #include <svx/optgenrl.hxx>
 
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 0cb16f175367..15edb46806a3 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -20,7 +20,6 @@
 #include <svtools/langtab.hxx>
 #include <svtools/htmlcfg.hxx>
 #include "opthtml.hxx"
-#include <sal/macros.h>
 
 
 OfaHtmlTabPage::OfaHtmlTabPage(TabPageParent pParent, const SfxItemSet& rSet)
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index bbcb56607ed8..10c6fd9b8c7e 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -25,61 +25,25 @@
 #include <officecfg/Office/Common.hxx>
 #include <officecfg/Office/Security.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/config.hxx>
 #include <vcl/weld.hxx>
-#include <svl/intitem.hxx>
-#include <svl/stritem.hxx>
-#include <svl/eitem.hxx>
-#include <svl/slstitm.hxx>
-#include <sfx2/fcontnr.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/docfilt.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/sfxsids.hrc>
 #include <sfx2/filedlghelper.hxx>
-#include <svl/urihelper.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/objsh.hxx>
-#include <unotools/bootstrap.hxx>
-#include <vcl/help.hxx>
-#include <vcl/builderfactory.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <unotools/pathoptions.hxx>
+#include <vcl/svapp.hxx>
 #include <unotools/securityoptions.hxx>
-#include <unotools/extendedsecurityoptions.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <dialmgr.hxx>
 #include "optinet2.hxx"
-#include <svx/svxdlg.hxx>
-#include <svx/ofaitem.hxx>
-#include <sfx2/htmlmode.hxx>
-#include <svx/svxids.hrc>
 #include <strings.hrc>
 
 #include <com/sun/star/security/DocumentDigitalSignatures.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 
-#ifdef UNX
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <pwd.h>
-#include <sys/types.h>
-#include <string.h>
-#include <rtl/textenc.h>
-#include <rtl/locale.h>
-#include <osl/nlsupport.h>
-#endif
 #include <sal/types.h>
-#include <sal/macros.h>
 #include <sal/log.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/file.hxx>
-#include <osl/process.h>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -97,7 +61,6 @@
 #include "tsaurls.hxx"
 
 #include <svtools/restartdialog.hxx>
-#include <comphelper/solarmutex.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 03bf52ad9116..44e9be04332a 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -20,9 +20,6 @@
 #define INCLUDED_CUI_SOURCE_OPTIONS_OPTINET2_HXX
 
 #include <memory>
-#include <vcl/fixed.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
 #include <sfx2/tabdlg.hxx>
 
 namespace svx {
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index ec0eeac4494e..41234bfe0e31 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -36,20 +36,16 @@
 
 #include <strings.hrc>
 #include <vcl/svapp.hxx>
-#include <vcl/help.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/waitobj.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/imagemgr.hxx>
 #include <svtools/restartdialog.hxx>
-#include <vcl/treelistentry.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/inputdlg.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index dd6f9a90e07a..6345c5a53120 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -23,12 +23,8 @@
 
 #include <memory>
 #include <vector>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/layout.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
-#include <vcl/treelistbox.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index d9ab82538186..8b194bd3f4e3 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/weld.hxx>
 #include <i18nlangtag/languagetag.hxx>
@@ -26,36 +24,24 @@
 #include <unotools/lingucfg.hxx>
 #include <unotools/linguprops.hxx>
 #include <editeng/unolingu.hxx>
-#include <svx/dlgutil.hxx>
-#include <linguistic/lngprops.hxx>
 #include <linguistic/misc.hxx>
-#include <sfx2/sfxuno.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/sfxsids.hrc>
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
 #include <com/sun/star/linguistic2/XSpellChecker.hpp>
 #include <com/sun/star/linguistic2/XProofreader.hpp>
 #include <com/sun/star/linguistic2/XHyphenator.hpp>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
-#include <com/sun/star/linguistic2/XAvailableLocales.hpp>
 #include <com/sun/star/linguistic2/XDictionary.hpp>
 #include <com/sun/star/linguistic2/XDictionaryList.hpp>
 #include <com/sun/star/linguistic2/XLinguProperties.hpp>
 #include <com/sun/star/lang/XServiceDisplayName.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <unotools/extendedsecurityoptions.hxx>
-#include <vcl/svlbitm.hxx>
-#include <vcl/treelistbox.hxx>
-#include <vcl/treelistentry.hxx>
-#include <svtools/langhelp.hxx>
 #include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <vcl/svapp.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 062d21be531f..b206d059b5e2 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -18,22 +18,12 @@
  */
 
 #include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/weld.hxx>
-#include <svl/zforlist.hxx>
 #include <opencl/openclconfig.hxx>
 #include <opencl/openclwrapper.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <svtools/restartdialog.hxx>
 
-#include <com/sun/star/configuration/theDefaultProvider.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-
-#include <strings.hrc>
-#include <dialmgr.hxx>
 #include "optopencl.hxx"
 
 SvxOpenCLTabPage::SvxOpenCLTabPage(TabPageParent pParent, const SfxItemSet& rSet)
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 9123d5cb9fe0..f8aeaf58e7f1 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -20,14 +20,8 @@
 #include <svx/svxdlg.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/app.hxx>
-#include <svl/aeitem.hxx>
-#include <vcl/svtabbx.hxx>
-#include <vcl/treelistentry.hxx>
-#include <vcl/fixed.hxx>
 #include <tools/urlobj.hxx>
-#include <vcl/svapp.hxx>
 #include <unotools/defaultoptions.hxx>
-#include <unotools/localfilehelper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/viewoptions.hxx>
@@ -40,9 +34,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
@@ -50,7 +42,6 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/util/thePathSettings.hpp>
 #include <officecfg/Office/Common.hxx>
-#include <vcl/help.hxx>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index e0f58dfacb92..65054a4e81fb 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -29,13 +29,9 @@
 #include <com/sun/star/container/XContainerQuery.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/util/XFlushable.hpp>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/docfilt.hxx>
-#include <vcl/fixed.hxx>
-#include <unotools/configitem.hxx>
 #include <unotools/optionsdlg.hxx>
-#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
 
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 2a5b19cf2ba6..412adaeb0dbf 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -20,10 +20,6 @@
 #define INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HXX
 
 #include <memory>
-#include <vcl/button.hxx>
-#include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
 #include <sfx2/tabdlg.hxx>
 
 #define APP_WRITER              0
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 4621ac787d95..978a6768b8d6 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -19,7 +19,6 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <sfx2/filedlghelper.hxx>
 #include <svl/zforlist.hxx>
 #include "optupdt.hxx"
 #include <comphelper/processfactory.hxx>
@@ -40,7 +39,6 @@
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <osl/file.hxx>
 #include <osl/security.hxx>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
 using namespace ::css;
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index 1f6923715f34..ff126c416d7a 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -21,8 +21,6 @@
 #define INCLUDED_CUI_SOURCE_OPTIONS_OPTUPDT_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/configuration/XReadWriteAccess.hpp>
 
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index cdb6d805f525..ae06e77abf5d 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -13,35 +13,18 @@
 
 #include <comphelper/processfactory.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
-#include <rtl/strbuf.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/stream.hxx>
-#include <vcl/button.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <vcl/mnemonic.hxx>
-#include <vcl/virdev.hxx>
-#include <dialmgr.hxx>
-#include <strings.hrc>
-
-#include <com/sun/star/task/InteractionHandler.hpp>
-#include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <com/sun/star/xml/sax/XParser.hpp>
-#include <com/sun/star/xml/sax/Parser.hpp>
-#include <ucbhelper/content.hxx>
-#include <comphelper/simplefileaccessinteraction.hxx>
 
 #include <vector>
 
 using namespace com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::beans;
 
 // persona
diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx
index 1d2831ffcb42..1370c93c254f 100644
--- a/cui/source/options/sdbcdriverenum.cxx
+++ b/cui/source/options/sdbcdriverenum.cxx
@@ -20,7 +20,6 @@
 #include "sdbcdriverenum.hxx"
 #include <comphelper/processfactory.hxx>
 #include <osl/diagnose.h>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sdbc/DriverManager.hpp>
 
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index c402b25b8816..202128b99860 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -19,7 +19,6 @@
 
 #include <tools/debug.hxx>
 #include <unotools/securityoptions.hxx>
-#include <vcl/svapp.hxx>
 #include "securityoptions.hxx"
 
 namespace
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index cb8c14df1cf3..8b593e86c362 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -24,7 +24,6 @@
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 
-#include <strings.hrc>
 #include <treeopt.hrc>
 #include <helpids.h>
 
@@ -32,12 +31,10 @@
 #include "connpoolconfig.hxx"
 #include "connpooloptions.hxx"
 #include <cuioptgenrl.hxx>
-#include <cuitabarea.hxx>
 #include <dbregister.hxx>
 #include "dbregisterednamesconfig.hxx"
 #include <dialmgr.hxx>
 #include "fontsubs.hxx"
-#include "optaboutconfig.hxx"
 #include "optaccessibility.hxx"
 #include <optasian.hxx>
 #include "optchart.hxx"
@@ -68,7 +65,6 @@
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <com/sun/star/frame/UnknownModuleException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/loader/CannotActivateFactoryException.hpp>
 #include <com/sun/star/linguistic2/LinguProperties.hpp>
 #include <com/sun/star/setup/UpdateCheck.hpp>
 #include <comphelper/getexpandeduri.hxx>
@@ -78,45 +74,32 @@
 #include <editeng/unolingu.hxx>
 #include <linguistic/misc.hxx>
 #include <officecfg/Office/OptionsDialog.hxx>
-#include <osl/module.hxx>
-#include <osl/process.h>
-#include <rtl/bootstrap.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/printopt.hxx>
 #include <sfx2/shell.hxx>
-#include <sfx2/tplpitem.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <svl/flagitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/languageoptions.hxx>
 #include <svtools/helpopt.hxx>
 #include <svtools/miscopt.hxx>
 #include <svx/databaseregistrationui.hxx>
-#include <svx/drawitem.hxx>
-#include <svx/xtable.hxx>
-#include <svx/xpool.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/configmgr.hxx>
-#include <unotools/linguprops.hxx>
 #include <unotools/misccfg.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/optionsdlg.hxx>
 #include <unotools/viewoptions.hxx>
 #include <vcl/help.hxx>
-#include <vcl/weld.hxx>
-#include <vcl/waitobj.hxx>
-#include <vcl/settings.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/treelistentry.hxx>
 #include <sal/log.hxx>
 
-#ifdef LINUX
-#include <sys/stat.h>
-#endif
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index 1cb21dab8eae..46cd5e6e526e 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -10,14 +10,10 @@
 #include <officecfg/Office/Common.hxx>
 #include <svx/svxdlg.hxx>
 #include <comphelper/sequence.hxx>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
-#include <vcl/fixed.hxx>
 
 #include "tsaurls.hxx"
 
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-
 using namespace ::com::sun::star;
 
 TSAURLsDialog::TSAURLsDialog(weld::Window* pParent)
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 641367713225..c06f085ccfa4 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -18,14 +18,12 @@
  */
 
 #include "webconninfo.hxx"
-#include <sal/macros.h>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/task/PasswordContainer.hpp>
 #include <com/sun/star/task/UrlRecord.hpp>
 #include <com/sun/star/task/XPasswordContainer2.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/docpasswordrequest.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 
 using namespace ::com::sun::star;
 
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 ----------------------------------------------------------------
diff --git a/include/svx/databaseregistrationui.hxx b/include/svx/databaseregistrationui.hxx
index e1fb1e3a4700..7cb5f6c559b4 100644
--- a/include/svx/databaseregistrationui.hxx
+++ b/include/svx/databaseregistrationui.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SVX_DATABASEREGISTRATIONUI_HXX
 
 #include <svx/svxdllapi.h>
+#include <svl/solar.hrc>
 
 namespace weld { class Window; }
 


More information about the Libreoffice-commits mailing list