8 files changed, 7 insertions, 49 deletions
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index a5b2a9f225c1..43533c4df530 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -9,25 +9,8 @@
 
 #include <sal/config.h>
 
-#include <algorithm>
-#include <cmath>
-
 #include <calcconfig.hxx>
 #include "calcoptionsdlg.hxx"
-#include <docfunc.hxx>
-#include <docsh.hxx>
-#include <interpre.hxx>
-#include <sc.hrc>
-#include <scopetools.hxx>
-#include <viewdata.hxx>
-
-#include <vcl/svlbitm.hxx>
-#include <vcl/treelistentry.hxx>
-
-#if HAVE_FEATURE_OPENCL
-#include <formulagroup.hxx>
-#include <globalnames.hxx>
-#endif
 
 namespace {
 
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index 2baae9d8c6b2..1f26e6489619 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_OPTDLG_CALCOPTIONSDLG_HXX
 #define INCLUDED_SC_SOURCE_UI_OPTDLG_CALCOPTIONSDLG_HXX
 
-#include <config_features.h>
 #include <vcl/weld.hxx>
 #include <calcconfig.hxx>
 
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index b64670dce78e..49e952dc18e9 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -20,20 +20,11 @@
 #undef SC_DLLIMPLEMENTATION
 
 #include <svx/colorbox.hxx>
-#include <svx/dlgutil.hxx>
-#include <svx/drawitem.hxx>
-#include <svx/xtable.hxx>
 
 #include <appoptio.hxx>
 #include <scmod.hxx>
-#include <scitems.hxx>
-#include <tpview.hxx>
-#include <global.hxx>
-#include <viewopti.hxx>
-#include <tabvwsh.hxx>
-#include <uiitems.hxx>
 #include <docsh.hxx>
-#include <sc.hrc>
+#include <svx/svxids.hrc>
 
 #include <opredlin.hxx>
 
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 3f7f11da2d60..cc29f7ce7789 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -19,23 +19,17 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-#include <scitems.hxx>
 #include <vcl/weld.hxx>
+#include <svl/zforlist.hxx>
 
-#include <global.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
-#include <uiitems.hxx>
-#include <docsh.hxx>
-#include <document.hxx>
 #include <docoptio.hxx>
 #include <sc.hrc>
 #include <officecfg/Office/Calc.hxx>
 
 #include <tpcalc.hxx>
 
-#include <math.h>
-
 ScTpCalcOptions::ScTpCalcOptions(vcl::Window* pParent, const SfxItemSet& rCoreAttrs)
     : SfxTabPage(pParent, "OptCalculatePage",
         "modules/scalc/ui/optcalculatepage.ui", &rCoreAttrs)
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx
index 593ac69610be..efd464e4750d 100644
--- a/sc/source/ui/optdlg/tpcompatibility.cxx
+++ b/sc/source/ui/optdlg/tpcompatibility.cxx
@@ -9,10 +9,11 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-#include <scmod.hxx>
+#include <svl/intitem.hxx>
+
 #include <tpcompatibility.hxx>
 #include <sc.hrc>
-#include <appoptio.hxx>
+#include <optutil.hxx>
 
 ScTpCompatOptions::ScTpCompatOptions(vcl::Window *pParent, const SfxItemSet &rCoreAttrs) :
     SfxTabPage(pParent, "OptCompatibilityPage","modules/scalc/ui/optcompatibilitypage.ui", &rCoreAttrs)
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx
index c252b96edf9d..cc4642d61bd9 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -11,7 +11,6 @@
 
 #include <tpdefaults.hxx>
 #include <sc.hrc>
-#include <scmod.hxx>
 #include <defaultsoptions.hxx>
 #include <document.hxx>
 
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 95553d13bf8a..fff31c327635 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -19,9 +19,7 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-#include <scmod.hxx>
-#include <svl/eitem.hxx>
-#include <svl/stritem.hxx>
+#include <global.hxx>
 #include <tpformula.hxx>
 #include <formulaopt.hxx>
 #include <sc.hrc>
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 77e89cda1c72..d16b9b2e3e6a 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -19,24 +19,17 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-#include <scitems.hxx>
 #include <tpview.hxx>
 #include <global.hxx>
 #include <viewopti.hxx>
-#include <tabvwsh.hxx>
-#include <uiitems.hxx>
 #include <scresid.hxx>
 #include <docsh.hxx>
 #include <sc.hrc>
-#include <strings.hrc>
-#include <globstr.hrc>
 #include <units.hrc>
 #include <appoptio.hxx>
 #include <scmod.hxx>
 #include <svx/colorbox.hxx>
-#include <svx/dlgutil.hxx>
-#include <svx/drawitem.hxx>
-#include <svx/xtable.hxx>
+#include <svtools/unitconv.hxx>
 
 ScTpContentOptions::ScTpContentOptions( vcl::Window*         pParent,
                              const SfxItemSet&  rArgSet ) :