tdf#146619 Remove unused #includes from C/C++ files

'sc' module was cleaned.

Change-Id: Ia491d741a4c1c5314f35ebb4baa82dd516948ae7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165699
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>

112 files changed, 17 insertions, 200 deletions

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 35a1ad9828d7..821621dd0a9a 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -1113,3 +1113,6 @@ excludelist:
     sc/source/ui/view/tabvwshc.cxx:
     # Needed for ScFormulaDlg instantiation for some weird reason
     - funcdesc.hxx
+    sc/source/core/data/stlpool.cxx:
+    # access into incomplete type 'SfxItemPool'
+    - docpool.hxx
diff --git a/sc/inc/ChartTools.hxx b/sc/inc/ChartTools.hxx
index 4f1accb1bbf8..aaae1646c1bd 100644
--- a/sc/inc/ChartTools.hxx
+++ b/sc/inc/ChartTools.hxx
@@ -11,7 +11,6 @@
 #pragma once
 
 #include <string_view>
-#include <memory>
 #include <vector>
 
 #include <svx/svditer.hxx>
diff --git a/sc/inc/SolverSettings.hxx b/sc/inc/SolverSettings.hxx
index 0f01f1020356..9d9b96ef975f 100644
--- a/sc/inc/SolverSettings.hxx
+++ b/sc/inc/SolverSettings.hxx
@@ -10,14 +10,13 @@
 
 #pragma once
 
-#include <memory>
 #include <utility>
 #include <variant>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-class ScTable;
-class ScDocShell;
+#include "document.hxx"
+#include <docsh.hxx>
 
 namespace sc
 {
diff --git a/sc/inc/SparklineAttributes.hxx b/sc/inc/SparklineAttributes.hxx
index 04a6c0abb696..5fcc9ddeef02 100644
--- a/sc/inc/SparklineAttributes.hxx
+++ b/sc/inc/SparklineAttributes.hxx
@@ -11,8 +11,6 @@
 #pragma once
 
 #include "scdllapi.h"
-#include <sal/types.h>
-#include <tools/color.hxx>
 #include <docmodel/color/ComplexColor.hxx>
 #include <optional>
 #include <o3tl/cow_wrapper.hxx>
diff --git a/sc/inc/SparklineGroup.hxx b/sc/inc/SparklineGroup.hxx
index c79067c1250c..217701733c80 100644
--- a/sc/inc/SparklineGroup.hxx
+++ b/sc/inc/SparklineGroup.hxx
@@ -12,9 +12,7 @@
 
 #include "scdllapi.h"
 #include "SparklineAttributes.hxx"
-#include <tools/color.hxx>
 #include <tools/Guid.hxx>
-#include <optional>
 
 namespace sc
 {
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index 6434a5073c0e..f880d753438d 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <comphelper/servicehelper.hxx>
 #include <cppuhelper/implbase.hxx>
 
 #include <climits>
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index c1f9195e6445..6de20af590a2 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -25,7 +25,6 @@
 #include "patattr.hxx"
 
 #include <algorithm>
-#include <memory>
 #include <optional>
 
 #include <svl/itemset.hxx>
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 9764f3947f56..9f7709631778 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -85,7 +85,6 @@
 #include <com/sun/star/beans/XTolerantMultiPropertySet.hpp>
 #include <com/sun/star/sheet/XExternalSheetName.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
-#include <comphelper/servicehelper.hxx>
 #include <cppuhelper/implbase.hxx>
 
 #include <memory>
diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx
index 685a2d350cd6..9ab8ec500ece 100644
--- a/sc/inc/chartpos.hxx
+++ b/sc/inc/chartpos.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include "rangelst.hxx"
-#include <tools/solar.h>
 #include <memory>
 #include <map>
 
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index f2ee6b674129..9159e0af1718 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -40,7 +40,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
-#include <comphelper/servicehelper.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 #include <svl/itemprop.hxx>
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index 82c9a04ebb87..23b313b96e7c 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -32,10 +32,8 @@
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <comphelper/interfacecontainer4.hxx>
-#include <comphelper/servicehelper.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/compbase.hxx>
-#include <osl/mutex.hxx>
 
 #include <memory>
 
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index 548ca3ec93bc..3796e820c075 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -34,7 +34,6 @@
 
 #include <com/sun/star/sheet/XMultiFormulaTokens.hpp>
 #include <com/sun/star/sheet/FormulaToken.hpp>
-#include <comphelper/servicehelper.hxx>
 #include <cppuhelper/implbase.hxx>
 
 #include "address.hxx"
diff --git a/sc/inc/matrixoperators.hxx b/sc/inc/matrixoperators.hxx
index cd0295bb20df..92b7fa3caea3 100644
--- a/sc/inc/matrixoperators.hxx
+++ b/sc/inc/matrixoperators.hxx
@@ -11,7 +11,6 @@
 
 
 #include <functional>
-#include <utility>
 #include <vector>
 #include "kahan.hxx"
 
diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx
index c7e58d0cbbd2..6ac2a925090b 100644
--- a/sc/inc/miscuno.hxx
+++ b/sc/inc/miscuno.hxx
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <vector>
-
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/sc/inc/poolcach.hxx b/sc/inc/poolcach.hxx
index 5b9057b7faf3..f53d0e6532fb 100644
--- a/sc/inc/poolcach.hxx
+++ b/sc/inc/poolcach.hxx
@@ -18,7 +18,6 @@
  */
 #pragma once
 
-#include "scdllapi.h"
 #include "patattr.hxx"
 #include <vector>
 
diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx
index 80d01df3c894..cef9dafe9080 100644
--- a/sc/inc/progress.hxx
+++ b/sc/inc/progress.hxx
@@ -21,7 +21,6 @@
 
 #include <rtl/ustring.hxx>
 #include <sfx2/progress.hxx>
-#include <tools/solar.h>
 #include "scdllapi.h"
 
 class ScDocument;
diff --git a/sc/inc/queryiter.hxx b/sc/inc/queryiter.hxx
index f494b83d74a5..2d54b40c469c 100644
--- a/sc/inc/queryiter.hxx
+++ b/sc/inc/queryiter.hxx
@@ -19,9 +19,6 @@
 
 #pragma once
 
-#include "address.hxx"
-#include "global.hxx"
-#include "scdllapi.h"
 #include "queryparam.hxx"
 #include "mtvelements.hxx"
 #include "types.hxx"
diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx
index 5d27c55f902d..42f68ae0ba61 100644
--- a/sc/inc/sheetdata.hxx
+++ b/sc/inc/sheetdata.hxx
@@ -19,11 +19,11 @@
 
 #pragma once
 
-#include <editeng/editdata.hxx>
 #include <map>
 #include <unordered_set>
 #include <utility>
 #include <vector>
+#include <editeng/ESelection.hxx>
 
 #include "address.hxx"
 
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index 58e633d0bcda..1dd105b6d9be 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -24,12 +24,12 @@
 #include <vector>
 
 #include "address.hxx"
-#include <editeng/colritem.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include "scdllapi.h"
 #include "celltextattr.hxx"
 #include "cellvalue.hxx"
 #include "patattr.hxx"
+#include <tools/color.hxx>
 
 struct ScSubTotalParam;
 struct ScQueryParam;
diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx
index 90381fa48579..e25fb30c120f 100644
--- a/sc/inc/srchuno.hxx
+++ b/sc/inc/srchuno.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/util/XReplaceDescriptor.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <svl/itemprop.hxx>
-#include <comphelper/servicehelper.hxx>
 #include <cppuhelper/implbase.hxx>
 
 class SvxSearchItem;
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index 07bf2cb7b12d..f524cf8bc615 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
-#include <comphelper/servicehelper.hxx>
 #include <cppuhelper/implbase.hxx>
 
 namespace com::sun::star::container { class XIndexReplace; }
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index f04b1fa0df7a..b630c5c6896a 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -154,6 +154,8 @@ private:
     const Iterator maEnd;
 };
 
+#include "SolverSettings.hxx"
+
 class ScTable
 {
 private:
diff --git a/sc/qa/unit/helper/debughelper.hxx b/sc/qa/unit/helper/debughelper.hxx
index 47d0e25e0842..56e9f075f933 100644
--- a/sc/qa/unit/helper/debughelper.hxx
+++ b/sc/qa/unit/helper/debughelper.hxx
@@ -19,9 +19,6 @@
 #undef RGB
 #endif
 
-#include <iostream>
-#include <vector>
-
 #define CALC_DEBUG_OUTPUT 0
 #define CALC_TEST_PERF 0
 
diff --git a/sc/qa/unit/ucalc_range.cxx b/sc/qa/unit/ucalc_range.cxx
index 387cf4b7bb87..54f7d1c89b7f 100644
--- a/sc/qa/unit/ucalc_range.cxx
+++ b/sc/qa/unit/ucalc_range.cxx
@@ -11,7 +11,6 @@
 #include "helper/qahelper.hxx"
 #include <comphelper/configuration.hxx>
 #include <document.hxx>
-#include <docsh.hxx>
 #include <global.hxx>
 #include <scdll.hxx>
 
diff --git a/sc/qa/unit/ucalc_rangelst.cxx b/sc/qa/unit/ucalc_rangelst.cxx
index 9146227cabc1..364bd40d69d3 100644
--- a/sc/qa/unit/ucalc_rangelst.cxx
+++ b/sc/qa/unit/ucalc_rangelst.cxx
@@ -9,7 +9,6 @@
 
 #include <sal/config.h>
 #include "helper/qahelper.hxx"
-#include <docsh.hxx>
 
 #include <rangelst.hxx>
 
diff --git a/sc/qa/unit/ucalc_sparkline.cxx b/sc/qa/unit/ucalc_sparkline.cxx
index d058d16f0248..a06308813dc5 100644
--- a/sc/qa/unit/ucalc_sparkline.cxx
+++ b/sc/qa/unit/ucalc_sparkline.cxx
@@ -9,8 +9,6 @@
 
 #include "helper/qahelper.hxx"
 #include <docsh.hxx>
-#include <tabvwsh.hxx>
-#include <cliputil.hxx>
 #include <docfunc.hxx>
 #include <undomanager.hxx>
 
@@ -20,7 +18,6 @@
 #include <SparklineAttributes.hxx>
 #include <ThemeColorChanger.hxx>
 #include <docmodel/theme/Theme.hxx>
-#include <svx/svdpage.hxx>
 
 using namespace css;
 
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 091dd4ba180b..9f1e37913514 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -27,7 +27,6 @@
 #include <editeng/justifyitem.hxx>
 #include <osl/diagnose.h>
 #include <poolcach.hxx>
-#include <sfx2/objsh.hxx>
 
 #include <global.hxx>
 #include <document.hxx>
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index c8f182e11f38..209eb9f2a9ba 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/objsh.hxx>
 #include <svl/listener.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
diff --git a/sc/source/core/data/clipcontext.cxx b/sc/source/core/data/clipcontext.cxx
index fc6f136d0372..bccbdf0a086e 100644
--- a/sc/source/core/data/clipcontext.cxx
+++ b/sc/source/core/data/clipcontext.cxx
@@ -14,7 +14,6 @@
 #include <column.hxx>
 #include <scitems.hxx>
 #include <tokenarray.hxx>
-#include <editutil.hxx>
 #include <clipparam.hxx>
 
 #include <svl/intitem.hxx>
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index dea1adde51f3..f744f741f1b5 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -23,7 +23,6 @@
 #include <docsh.hxx>
 #include <document.hxx>
 #include <table.hxx>
-#include <docpool.hxx>
 #include <attarray.hxx>
 #include <patattr.hxx>
 #include <compiler.hxx>
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index c1805ecf5f09..047ebddd81b0 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -33,7 +33,6 @@
 #include <subtotal.hxx>
 #include <markdata.hxx>
 #include <stringutil.hxx>
-#include <docpool.hxx>
 #include <cellvalue.hxx>
 #include <tokenarray.hxx>
 #include <clipcontext.hxx>
@@ -48,7 +47,6 @@
 #include <colorscale.hxx>
 #include <table.hxx>
 #include <editeng/brushitem.hxx>
-#include <editeng/colritem.hxx>
 
 #include <com/sun/star/i18n/LocaleDataItem2.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -63,7 +61,6 @@
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
 #include <svl/sharedstringpool.hxx>
-#include <osl/diagnose.h>
 
 #include <cstdio>
 #include <refdata.hxx>
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 2f90021131f4..c122a142ad5d 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -19,7 +19,6 @@
 #include <clipcontext.hxx>
 #include <attrib.hxx>
 #include <patattr.hxx>
-#include <docpool.hxx>
 #include <conditio.hxx>
 #include <formulagroup.hxx>
 #include <tokenarray.hxx>
@@ -30,7 +29,6 @@
 #include <compiler.hxx>
 #include <recursionhelper.hxx>
 #include <docsh.hxx>
-#include <editutil.hxx>
 #include <broadcast.hxx>
 
 #include <SparklineGroup.hxx>
diff --git a/sc/source/core/data/columnspanset.cxx b/sc/source/core/data/columnspanset.cxx
index bec9c8a7e270..69377bdba76c 100644
--- a/sc/source/core/data/columnspanset.cxx
+++ b/sc/source/core/data/columnspanset.cxx
@@ -17,7 +17,6 @@
 #include <fstalgorithm.hxx>
 
 #include <algorithm>
-#include <memory>
 
 #include <o3tl/safeint.hxx>
 
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index edecaa1b9fab..aa37dc8a8199 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -30,7 +30,6 @@
 #include <attarray.hxx>
 #include <patattr.hxx>
 #include <docoptio.hxx>
-#include <cellform.hxx>
 #include <segmenttree.hxx>
 #include <progress.hxx>
 #include <queryparam.hxx>
@@ -47,7 +46,6 @@
 #include <editeng/editobj.hxx>
 #include <svl/sharedstring.hxx>
 #include <unotools/collatorwrapper.hxx>
-#include <osl/diagnose.h>
 #include <sal/log.hxx>
 
 #include <algorithm>
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 88053bad6dc3..5ef4c4a4091f 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -28,7 +28,6 @@
 #include <vcl/settings.hxx>
 #include <svl/itemiter.hxx>
 #include <svl/stritem.hxx>
-#include <svl/voiditem.hxx>
 #include <svx/algitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/lineitem.hxx>
@@ -66,7 +65,6 @@
 #include <docpool.hxx>
 #include <global.hxx>
 #include <attrib.hxx>
-#include <patattr.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
 #include <scmod.hxx>
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index f59fe2ab117b..3fa9ab662c70 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -20,7 +20,6 @@
 #include <scextopt.hxx>
 #include <autonamecache.hxx>
 
-#include <o3tl/safeint.hxx>
 #include <osl/thread.h>
 #include <svx/xtable.hxx>
 #include <sfx2/bindings.hxx>
@@ -89,7 +88,6 @@
 #include <datamapper.hxx>
 #include <drwlayer.hxx>
 #include <sharedstringpoolpurge.hxx>
-#include <dociter.hxx>
 #include <docpool.hxx>
 #include <config_features.h>
 
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index b30e79e8dc1f..7c847fe12254 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -24,7 +24,6 @@
 #include <svl/srchitem.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/bindings.hxx>
-#include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/thread.hxx>
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 0a9a4179f0bc..8a592b63a1c0 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 
-#include <sfx2/objsh.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdoole2.hxx>
 #include <svtools/embedhlp.hxx>
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index b5758065b9b6..e584a9016626 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -20,14 +20,12 @@
 #include <scitems.hxx>
 #include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/servicehelper.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <tools/urlobj.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/langitem.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/bindings.hxx>
-#include <sfx2/objsh.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 59e4984db7fa..0a3c8f30c2c3 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -33,7 +33,6 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/xtable.hxx>
-#include <sfx2/objsh.hxx>
 #include <sfx2/printer.hxx>
 
 #include <document.hxx>
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index e87d100b36da..6aef04f9bf1c 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -21,10 +21,7 @@
 
 #include <editeng/boxitem.hxx>
 #include <editeng/editobj.hxx>
-#include <o3tl/safeint.hxx>
-#include <svx/sdrundomanager.hxx>
 #include <svx/svditer.hxx>
-#include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <svl/numformat.hxx>
 #include <poolcach.hxx>
@@ -98,7 +95,6 @@
 #include <unordered_map>
 
 #include <comphelper/lok.hxx>
-#include <comphelper/servicehelper.hxx>
 
 #include <vcl/uitest/logger.hxx>
 #include <vcl/uitest/eventdescription.hxx>
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index c896fc022b15..a4bf4c990d7c 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -29,7 +29,6 @@
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
 #include <svl/itemprop.hxx>
-#include <vcl/svapp.hxx>
 
 #include <dpcache.hxx>
 #include <dptabres.hxx>
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 4fac946caf1d..8c186bc6cdd0 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -85,7 +85,6 @@
 #include <charthelper.hxx>
 #include <table.hxx>
 #include <stlpool.hxx>
-#include <docpool.hxx>
 #include <detfunc.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <clipcontext.hxx>
@@ -1785,7 +1784,7 @@ void ScDrawLayer::CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const tools::Rec
             bObjectInArea = aClipRange.Contains(pObjData->maStart);
         if (!bObjectInArea)
             continue;
-        
+
         if (!pDestModel)
         {
             pDestModel = pClipDoc->GetDrawLayer();      // does the document already have a drawing layer?
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index 79d848f91e3c..486806e7ccc9 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -56,7 +56,6 @@
 
 #include <attrib.hxx>
 #include <patattr.hxx>
-#include <docpool.hxx>
 #include <stlsheet.hxx>
 #include <stlpool.hxx>
 #include <document.hxx>
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index fa84f0212b81..67f172a4f945 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -25,35 +25,21 @@
 #include <unotools/useroptions.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/unoshape.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/editobj.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
 #include <osl/diagnose.h>
 #include <comphelper/lok.hxx>
 
-#include <scitems.hxx>
-#include <svx/xfillit0.hxx>
-#include <svx/xlnstit.hxx>
-#include <svx/xlnstwit.hxx>
-#include <svx/xlnstcit.hxx>
-#include <svx/sxcecitm.hxx>
-#include <svx/xflclit.hxx>
-#include <svx/sdshitm.hxx>
 #include <svx/sdsxyitm.hxx>
-#include <svx/sdtditm.hxx>
 #include <svx/sdtagitm.hxx>
 #include <svx/sdtmfitm.hxx>
 #include <tools/gen.hxx>
 
 #include <document.hxx>
-#include <docpool.hxx>
 #include <stlpool.hxx>
 #include <stylehelper.hxx>
-#include <patattr.hxx>
 #include <drwlayer.hxx>
 #include <userdat.hxx>
-#include <detfunc.hxx>
 #include <editutil.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
@@ -62,7 +48,6 @@
 
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextAppend.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <comphelper/propertyvalue.hxx>
 
diff --git a/sc/source/core/data/queryevaluator.cxx b/sc/source/core/data/queryevaluator.cxx
index 03d9d19a8dd1..b21c75801a6f 100644
--- a/sc/source/core/data/queryevaluator.cxx
+++ b/sc/source/core/data/queryevaluator.cxx
@@ -17,19 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <rtl/math.hxx>
 #include <queryevaluator.hxx>
 
 #include <cellform.hxx>
 #include <cellvalue.hxx>
-#include <colorscale.hxx>
 #include <document.hxx>
 #include <docoptio.hxx>
 #include <queryparam.hxx>
-#include <scitems.hxx>
 #include <table.hxx>
 
-#include <editeng/brushitem.hxx>
-#include <editeng/colritem.hxx>
 #include <svl/numformat.hxx>
 #include <svl/sharedstringpool.hxx>
 #include <svl/zformat.hxx>
diff --git a/sc/source/core/data/queryiter.cxx b/sc/source/core/data/queryiter.cxx
index e3db0aefa39e..7e2ba3851f08 100644
--- a/sc/source/core/data/queryiter.cxx
+++ b/sc/source/core/data/queryiter.cxx
@@ -18,43 +18,28 @@
  */
 
 #include <queryiter.hxx>
+#include <rtl/math.hxx>
 
 #include <comphelper/flagguard.hxx>
 #include <o3tl/safeint.hxx>
 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>
 
 #include <global.hxx>
-#include <dociter.hxx>
 #include <document.hxx>
 #include <table.hxx>
 #include <column.hxx>
 #include <formulacell.hxx>
-#include <attarray.hxx>
-#include <patattr.hxx>
-#include <docoptio.hxx>
 #include <cellform.hxx>
-#include <segmenttree.hxx>
-#include <progress.hxx>
 #include <queryparam.hxx>
 #include <queryentry.hxx>
-#include <globstr.hrc>
-#include <scresid.hxx>
 #include <cellvalue.hxx>
-#include <scmatrix.hxx>
-#include <rowheightcontext.hxx>
 #include <queryevaluator.hxx>
 #include <rangecache.hxx>
 #include <refdata.hxx>
 
-#include <tools/fract.hxx>
-#include <editeng/editobj.hxx>
 #include <svl/sharedstring.hxx>
 #include <unotools/collatorwrapper.hxx>
-#include <osl/diagnose.h>
-#include <sal/log.hxx>
 
-#include <algorithm>
 #include <limits>
 #include <vector>
 
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index b7fd7ac70eba..2f9ee31d5d14 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -24,7 +24,6 @@
 #include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/brushitem.hxx>
-#include <editeng/editdata.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editobj.hxx>
 #include <editeng/flditem.hxx>
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 084d4a8dc868..4e06aca8231a 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -47,7 +47,7 @@
 #include <queryparam.hxx>
 #include <queryentry.hxx>
 #include <subtotalparam.hxx>
-#include <docpool.hxx>
+#include <cellvalue.hxx>
 #include <tokenarray.hxx>
 #include <mtvcellfunc.hxx>
 #include <columnspanset.hxx>
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 408ca950b6aa..62f02ca66b1b 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -47,7 +47,6 @@
 #include <editeng/colritem.hxx>
 #include <osl/diagnose.h>
 #include <svl/numformat.hxx>
-#include <svl/zformat.hxx>
 
 #include <algorithm>
 #include <limits>
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 30980b11d2fa..f627509096fe 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/sheet/TableValidationVisibility.hpp>
 
 #include <sfx2/app.hxx>
-#include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbmod.hxx>
@@ -51,7 +50,6 @@
 #include <tokenarray.hxx>
 #include <scmatrix.hxx>
 #include <cellvalue.hxx>
-#include <comphelper/lok.hxx>
 #include <simpleformulacalc.hxx>
 
 #include <math.h>
diff --git a/sc/source/core/opencl/op_addin.cxx b/sc/source/core/opencl/op_addin.cxx
index 602ed2dfb36d..7785863b6a60 100644
--- a/sc/source/core/opencl/op_addin.cxx
+++ b/sc/source/core/opencl/op_addin.cxx
@@ -9,7 +9,6 @@
 
 #include "op_addin.hxx"
 
-#include <formula/vectortoken.hxx>
 #include <sstream>
 
 using namespace formula;
diff --git a/sc/source/core/opencl/op_array.cxx b/sc/source/core/opencl/op_array.cxx
index 47ae15218588..7c2f3776d228 100644
--- a/sc/source/core/opencl/op_array.cxx
+++ b/sc/source/core/opencl/op_array.cxx
@@ -9,7 +9,6 @@
 
 #include "op_array.hxx"
 
-#include <formula/vectortoken.hxx>
 #include <sstream>
 
 using namespace formula;
diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx
index 6ab2874dc78b..a9edb1cef310 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -9,7 +9,6 @@
 
 #include "op_financial.hxx"
 
-#include <formula/vectortoken.hxx>
 #include <sstream>
 
 using namespace formula;
diff --git a/sc/source/core/opencl/op_logical.cxx b/sc/source/core/opencl/op_logical.cxx
index 3a3869d59175..7238fd1a248d 100644
--- a/sc/source/core/opencl/op_logical.cxx
+++ b/sc/source/core/opencl/op_logical.cxx
@@ -9,7 +9,6 @@
 
 #include "op_logical.hxx"
 
-#include <formula/vectortoken.hxx>
 #include <sstream>
 
 using namespace formula;
diff --git a/sc/source/core/opencl/op_statistical.cxx b/sc/source/core/opencl/op_statistical.cxx
index 4c79d162e62c..d7bdfaf558b1 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -9,7 +9,6 @@
 
 #include "op_statistical.hxx"
 
-#include <formula/vectortoken.hxx>
 #include <sstream>
 #include "op_statistical_helpers.hxx"
 
diff --git a/sc/source/core/opencl/utils.cxx b/sc/source/core/opencl/utils.cxx
index 0d43d8c3edb2..c6a215af1425 100644
--- a/sc/source/core/opencl/utils.cxx
+++ b/sc/source/core/opencl/utils.cxx
@@ -10,7 +10,6 @@
 #include "utils.hxx"
 
 #include <cassert>
-#include <cmath>
 #include <cfloat>
 #include <limits>
 #include <sstream>
diff --git a/sc/source/core/tool/arraysumSSE2.cxx b/sc/source/core/tool/arraysumSSE2.cxx
index f7b87070b70d..5b3924d98bc6 100644
--- a/sc/source/core/tool/arraysumSSE2.cxx
+++ b/sc/source/core/tool/arraysumSSE2.cxx
@@ -9,7 +9,6 @@
  */
 
 #include <arraysumfunctor.hxx>
-
 #include <tools/simdsupport.hxx>
 
 #include <stdlib.h>
diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx
index 2ce5ab403562..c434154ea4a0 100644
--- a/sc/source/filter/ftools/fprogressbar.cxx
+++ b/sc/source/filter/ftools/fprogressbar.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/solar.h>
 #include <fprogressbar.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index ff2fc7c89ab6..ee276c782ca4 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -21,7 +21,6 @@
 #include <svx/dialogs.hrc>
 #include <sc.hrc>
 
-#include <editeng/eeitem.hxx>
 #include <svx/fontwork.hxx>
 #include <svx/svdpage.hxx>
 #include <sfx2/app.hxx>
@@ -55,8 +54,6 @@
 #include <memory>
 #include <svx/xlnwtit.hxx>
 #include <svx/chrtitem.hxx>
-#include <svx/xlnclit.hxx>
-#include <svx/xflclit.hxx>
 #include <svx/xflgrit.hxx>
 #include <tools/UnitConversion.hxx>
 #include <comphelper/lok.hxx>
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 8556c18e6b94..20367338b9f6 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -28,7 +28,6 @@
 #include <sfx2/viewfrm.hxx>
 #include <svl/ptitem.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/svdogrp.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index 14055f069946..f6b8af4aab7f 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -22,7 +22,6 @@
 #include <svx/gallery.hxx>
 #include <sfx2/request.hxx>
 #include <svx/fmmodel.hxx>
-#include <svl/itempool.hxx>
 #include <svl/stritem.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdoashp.hxx>
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index 0f06de3d82db..2244003db843 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -27,16 +27,8 @@
 #include <svx/svdopath.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svxids.hrc>
-#include <svx/strings.hrc>
-#include <svx/xlnwtit.hxx>
-#include <svx/xlnstwit.hxx>
-#include <svx/xlnedwit.hxx>
-#include <svx/xlnedit.hxx>
-#include <svx/xlnstit.hxx>
-#include <svx/dialmgr.hxx>
 #include <svx/svdomeas.hxx>
 #include <osl/diagnose.h>
-#include <basegfx/polygon/b2dpolygontools.hxx>
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index 0ffb6e832d3f..5babb078d928 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <editeng/outlobj.hxx>
-#include <svx/svdotext.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/svxids.hrc>
 #include <sfx2/dispatch.hxx>
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index d95f810308fa..10601676f75d 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -21,7 +21,6 @@
 #include <editeng/flditem.hxx>
 #include <svx/svddrgmt.hxx>
 #include <svx/svdoole2.hxx>
-#include <svx/svdotext.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/imapobj.hxx>
 #include <svx/svdouno.hxx>
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index d158a4aada69..344b13b395c9 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -30,8 +30,6 @@
 #include <funcdesc.hxx>
 
 #include <dwfunctr.hxx>
-#include <scresid.hxx>
-#include <strings.hrc>
 
 /*************************************************************************
 #*  Member:     ScFunctionWin
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 5ebe52a8e677..30e55c9293b5 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -28,7 +28,6 @@
 
 #include <docsh.hxx>
 
-#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
 #include <scresid.hxx>
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 588476d97ed9..7b76a2a5e5c6 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -24,7 +24,6 @@
 #include <svx/svditer.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
-#include <svx/svdocapt.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -43,7 +42,6 @@
 #include <scmod.hxx>
 #include <rangenam.hxx>
 #include <dbdata.hxx>
-#include <tablink.hxx>
 #include <drwlayer.hxx>
 #include <transobj.hxx>
 #include <drwtrans.hxx>
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 73f305dd7ff7..779dcdd3a96c 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -32,7 +32,6 @@
 #include <scmod.hxx>
 #include <svl/eitem.hxx>
 #include <svtools/unitconv.hxx>
-#include <unotools/configmgr.hxx>
 #include <unotools/localedatawrapper.hxx>
 
 ScTpContentOptions::ScTpContentOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&  rArgSet)
diff --git a/sc/source/ui/theme/ThemeColorChanger.cxx b/sc/source/ui/theme/ThemeColorChanger.cxx
index 2ba881544372..a8a6583ddd6e 100644
--- a/sc/source/ui/theme/ThemeColorChanger.cxx
+++ b/sc/source/ui/theme/ThemeColorChanger.cxx
@@ -12,14 +12,12 @@
 
 #include <sal/config.h>
 
-#include <docmodel/uno/UnoComplexColor.hxx>
 #include <docmodel/theme/Theme.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/borderline.hxx>
 #include <svx/svditer.hxx>
-#include <svx/theme/IThemeColorChanger.hxx>
 
 #include <undodraw.hxx>
 #include <stlpool.hxx>
diff --git a/sc/source/ui/undo/UndoDeleteSparkline.cxx b/sc/source/ui/undo/UndoDeleteSparkline.cxx
index 6c9df18090d1..4e01ac8934cd 100644
--- a/sc/source/ui/undo/UndoDeleteSparkline.cxx
+++ b/sc/source/ui/undo/UndoDeleteSparkline.cxx
@@ -13,7 +13,6 @@
 #include <scresid.hxx>
 
 #include <Sparkline.hxx>
-#include <SparklineGroup.hxx>
 
 namespace sc
 {
diff --git a/sc/source/ui/undo/UndoEditSparkline.cxx b/sc/source/ui/undo/UndoEditSparkline.cxx
index f33b7fa7aabe..50b71fe630b7 100644
--- a/sc/source/ui/undo/UndoEditSparkline.cxx
+++ b/sc/source/ui/undo/UndoEditSparkline.cxx
@@ -13,7 +13,6 @@
 #include <scresid.hxx>
 
 #include <Sparkline.hxx>
-#include <SparklineGroup.hxx>
 #include <utility>
 
 namespace sc
diff --git a/sc/source/ui/undo/UndoEditSparklineGroup.cxx b/sc/source/ui/undo/UndoEditSparklineGroup.cxx
index dbe7a7b59987..e7e3320d5d34 100644
--- a/sc/source/ui/undo/UndoEditSparklineGroup.cxx
+++ b/sc/source/ui/undo/UndoEditSparklineGroup.cxx
@@ -13,7 +13,6 @@
 #include <globstr.hrc>
 #include <scresid.hxx>
 
-#include <Sparkline.hxx>
 #include <SparklineGroup.hxx>
 #include <SparklineAttributes.hxx>
 #include <utility>
diff --git a/sc/source/ui/undo/UndoGroupSparklines.cxx b/sc/source/ui/undo/UndoGroupSparklines.cxx
index c8570995b655..8883ea53fe75 100644
--- a/sc/source/ui/undo/UndoGroupSparklines.cxx
+++ b/sc/source/ui/undo/UndoGroupSparklines.cxx
@@ -15,7 +15,6 @@
 
 #include <Sparkline.hxx>
 #include <SparklineGroup.hxx>
-#include <SparklineAttributes.hxx>
 #include <utility>
 
 namespace sc
diff --git a/sc/source/ui/undo/UndoThemeChange.cxx b/sc/source/ui/undo/UndoThemeChange.cxx
index a977055070c5..c83c97947148 100644
--- a/sc/source/ui/undo/UndoThemeChange.cxx
+++ b/sc/source/ui/undo/UndoThemeChange.cxx
@@ -9,7 +9,6 @@
 
 #include <undo/UndoThemeChange.hxx>
 #include <docmodel/theme/Theme.hxx>
-#include <svx/svdpage.hxx>
 #include <scresid.hxx>
 #include <globstr.hrc>
 
diff --git a/sc/source/ui/undo/UndoUngroupSparklines.cxx b/sc/source/ui/undo/UndoUngroupSparklines.cxx
index fe0201eb63d3..8a0f629ab621 100644
--- a/sc/source/ui/undo/UndoUngroupSparklines.cxx
+++ b/sc/source/ui/undo/UndoUngroupSparklines.cxx
@@ -15,7 +15,6 @@
 
 #include <Sparkline.hxx>
 #include <SparklineGroup.hxx>
-#include <SparklineAttributes.hxx>
 
 namespace sc
 {
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index c9a233604281..8ce66d95d0c4 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -22,7 +22,6 @@
 #include <svx/svdundo.hxx>
 
 #include <undobase.hxx>
-#include <undocell.hxx>
 #include <refundo.hxx>
 #include <docsh.hxx>
 #include <tabvwsh.hxx>
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index c83acc3afcbc..ffda24d286e3 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -22,12 +22,11 @@
 #include <scitems.hxx>
 #include <editeng/editobj.hxx>
 #include <sfx2/app.hxx>
-#include <svx/svdocapt.hxx>
+#include <svx/svdocapt.hxx> //
 #include <comphelper/lok.hxx>
 #include <osl/diagnose.h>
 
 #include <document.hxx>
-#include <docpool.hxx>
 #include <patattr.hxx>
 #include <docsh.hxx>
 #include <tabvwsh.hxx>
diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx
index 696855188830..2dfa827f8c10 100644
--- a/sc/source/ui/undo/undostyl.cxx
+++ b/sc/source/ui/undo/undostyl.cxx
@@ -24,7 +24,6 @@
 
 #include <undostyl.hxx>
 #include <docsh.hxx>
-#include <docpool.hxx>
 #include <stlpool.hxx>
 #include <printfun.hxx>
 #include <scmod.hxx>
diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
index 71be4e4d43ce..84178fba6d56 100644
--- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
@@ -27,7 +27,6 @@
 
 #include <o3tl/safeint.hxx>
 #include <vcl/svapp.hxx>
-#include <sfx2/objsh.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sc/source/ui/unoobj/PivotTableDataSequence.cxx b/sc/source/ui/unoobj/PivotTableDataSequence.cxx
index dc81d03978e0..733a57ec63b5 100644
--- a/sc/source/ui/unoobj/PivotTableDataSequence.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataSequence.cxx
@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <memory>
 #include <PivotTableDataSequence.hxx>
 
 #include <sal/config.h>
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 2e152b4b9f0b..4f354f361e5b 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -66,7 +66,6 @@
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/text/textfield/Type.hpp>
 #include <com/sun/star/sheet/XConditionalFormats.hpp>
-#include <com/sun/star/util/XComplexColor.hpp>
 
 #include <autoform.hxx>
 #include <cellvalue.hxx>
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index c2dddbd74fad..76c3f294b08d 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -50,7 +50,6 @@
 #include <svl/numformat.hxx>
 #include <svl/sharedstring.hxx>
 
-#include <sfx2/objsh.hxx>
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index f2b9142f37cc..06936ed2038d 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -25,7 +25,6 @@
 #include <cellsuno.hxx>
 #include <docsh.hxx>
 #include <markdata.hxx>
-#include <miscuno.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 1758bd36f2da..f481a55e3aa6 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -66,7 +66,6 @@
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/sequence.hxx>
-#include <comphelper/servicehelper.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 
 using namespace com::sun::star;
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 0958b38288e1..026c0ec5f260 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -19,7 +19,6 @@
 
 #include "vbarange.hxx"
 
-#include <comphelper/servicehelper.hxx>
 #include <comphelper/types.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <o3tl/any.hxx>
@@ -35,7 +34,6 @@
 #include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
 #include <com/sun/star/sheet/XDatabaseRange.hpp>
 #include <com/sun/star/sheet/XUnnamedDatabaseRanges.hpp>
-#include <com/sun/star/sheet/XGoalSeek.hpp>
 #include <com/sun/star/sheet/XSheetOperation.hpp>
 #include <com/sun/star/sheet/CellFlags.hpp>
 #include <com/sun/star/table/XColumnRowRange.hpp>
diff --git a/sc/source/ui/view/SparklineShell.cxx b/sc/source/ui/view/SparklineShell.cxx
index 3b3c4f8399ed..9de6c6af1e02 100644
--- a/sc/source/ui/view/SparklineShell.cxx
+++ b/sc/source/ui/view/SparklineShell.cxx
@@ -8,17 +8,12 @@
  *
  */
 
-#include <scitems.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/request.hxx>
-#include <svl/whiter.hxx>
 #include <vcl/EnumContext.hxx>
 
-#include <sc.hrc>
 #include <SparklineShell.hxx>
 #include <tabvwsh.hxx>
-#include <docsh.hxx>
 #include <document.hxx>
 
 #define ShellClass_SparklineShell
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 1a866df3c881..f1a1f97ef4d6 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -53,8 +53,6 @@
 #include <clipparam.hxx>
 #include <markdata.hxx>
 #include <gridwin.hxx>
-#include <Sparkline.hxx>
-#include <SparklineGroup.hxx>
 
 #define ShellClass_ScCellShell
 #define ShellClass_CellMovement
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 7032a1094dad..703fe8d153e7 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -45,7 +45,6 @@
 #include <funcdesc.hxx>
 #include <markdata.hxx>
 #include <scabstdlg.hxx>
-#include <condformateasydlg.hxx>
 #include <columnspanset.hxx>
 #include <comphelper/lok.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 1f4f91307c44..58e02baca533 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -52,7 +52,6 @@
 #include <dbdocfun.hxx>
 #include <dpoutput.hxx>
 #include <editable.hxx>
-#include <docpool.hxx>
 #include <patattr.hxx>
 #include <unonames.hxx>
 #include <userlist.hxx>
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index ec1d431eeae9..5ff00f515f7b 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -26,7 +26,6 @@
 #include <svx/ImageMapInfo.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <comphelper/lok.hxx>
-#include <unotools/configmgr.hxx>
 #include <officecfg/Office/Common.hxx>
 
 #include <strings.hrc>
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index dd5740023bd5..59291977cddd 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -26,7 +26,6 @@
 #include <tools/urlobj.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <sal/log.hxx>
-#include <osl/diagnose.h>
 
 #include <drawview.hxx>
 #include <global.hxx>
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index b1924178c0bf..72f84edd8158 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -18,8 +18,6 @@
  */
 
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 
 #include <scitems.hxx>
 #include <editeng/borderline.hxx>
@@ -28,7 +26,6 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/sfxdlg.hxx>
 #include <svl/whiter.hxx>
 
 #include <svl/stritem.hxx>
@@ -39,7 +36,6 @@
 #include <svl/ctloptions.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/langitem.hxx>
-#include <svx/numinf.hxx>
 #include <editeng/svxenum.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/postitem.hxx>
@@ -59,14 +55,11 @@
 
 #include <formatsh.hxx>
 #include <sc.hrc>
-#include <globstr.hrc>
-#include <scresid.hxx>
 #include <docsh.hxx>
 #include <patattr.hxx>
 #include <scmod.hxx>
 #include <stlpool.hxx>
 #include <stlsheet.hxx>
-#include <printfun.hxx>
 #include <docpool.hxx>
 #include <tabvwsh.hxx>
 #include <attrib.hxx>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index ae95da62ef02..35e36339edc1 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -64,11 +64,12 @@
 #include <com/sun/star/sheet/TableValidationVisibility.hpp>
 #include <com/sun/star/awt/KeyModifier.hpp>
 #include <com/sun/star/awt/MouseButton.hpp>
-#include <com/sun/star/awt/XVclWindowPeer.hpp>
 #include <com/sun/star/script/vba/VBAEventId.hpp>
 #include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
 #include <com/sun/star/text/textfield/Type.hpp>
 
+#include <com/sun/star/awt/XVclWindowPeer.hdl>
+
 #include <gridwin.hxx>
 #include <tabvwsh.hxx>
 #include <docsh.hxx>
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 8ff73d07a05d..5c4ea63e268a 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -36,7 +36,6 @@
 
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
-#include <comphelper/scopeguard.hxx>
 #include <sfx2/lokhelper.hxx>
 #include <sfx2/lokcomponenthelpers.hxx>
 
@@ -57,7 +56,6 @@
 #include <attrib.hxx>
 #include <patattr.hxx>
 #include <dbdata.hxx>
-#include <docoptio.hxx>
 #include <notemark.hxx>
 #include <dbfunc.hxx>
 #include <scmod.hxx>
@@ -65,7 +63,6 @@
 #include <rfindlst.hxx>
 #include <hiranges.hxx>
 #include <pagedata.hxx>
-#include <docpool.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
 #include <docsh.hxx>
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index e650c6faf774..bf02db1fd32f 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -39,10 +39,7 @@
 #include <sal/log.hxx>
 #include <comphelper/lok.hxx>
 #include <o3tl/unit_conversion.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/range/b2drectangle.hxx>
 
 #include <output.hxx>
 #include <document.hxx>
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 1d68bb872665..d286c9ce5959 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -54,12 +54,10 @@
 #include <vcl/pdfextoutdevdata.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/glyphitem.hxx>
-#include <vcl/vcllayout.hxx>
 #include <vcl/glyphitemcache.hxx>
 #include <sal/log.hxx>
 #include <unotools/charclass.hxx>
 #include <osl/diagnose.h>
-#include <tools/stream.hxx>
 
 #include <output.hxx>
 #include <document.hxx>
@@ -81,8 +79,6 @@
 
 #include <memory>
 #include <vector>
-#include <o3tl/lru_map.hxx>
-#include <o3tl/hash_combine.hxx>
 
 #include <math.h>
 
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 908a766c68f5..c438425cfc4b 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -60,7 +60,6 @@
 #include <AccessibilityHints.hxx>
 #include <vcl/svapp.hxx>
 #include <viewutil.hxx>
-#include <docpool.hxx>
 #include <patattr.hxx>
 #include <columnspanset.hxx>
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index c526331d58bf..9d33bdaf626a 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -68,7 +68,6 @@
 
 #include <scabstdlg.hxx>
 #include <vcl/EnumContext.hxx>
-#include <vcl/notebookbar/notebookbar.hxx>
 
 //  for mouse wheel
 #define MINZOOM_SLIDER 10
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 91069c4456c5..2653b3d0766b 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -53,7 +53,6 @@
 #include <pagepar.hxx>
 #include <attrib.hxx>
 #include <patattr.hxx>
-#include <docpool.hxx>
 #include <dociter.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index b7a35059afeb..2782ca363d40 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -25,7 +25,6 @@
 #include <editeng/langitem.hxx>
 #include <editeng/editobj.hxx>
 #include <editeng/editview.hxx>
-#include <editeng/eeitem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <utility>
 #include <vcl/settings.hxx>
@@ -42,7 +41,6 @@
 #include <globstr.hrc>
 #include <scresid.hxx>
 #include <markdata.hxx>
-#include <docpool.hxx>
 
 #include <memory>
 
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 23e3eacfa901..5da074866770 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -60,8 +60,6 @@
 
 #include <basegfx/utils/zoomtools.hxx>
 
-#include <svx/svdpagv.hxx>
-#include <svx/svdpage.hxx>
 #include <svx/dialog/ThemeDialog.hxx>
 #include <ThemeColorChanger.hxx>
 
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 6004c31a0016..55bb2f889845 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -75,7 +75,6 @@
 #include <defaultsoptions.hxx>
 #include <markdata.hxx>
 #include <preview.hxx>
-#include <docoptio.hxx>
 #include <documentlinkmgr.hxx>
 #include <gridwin.hxx>
 
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 32fb01f1e10f..70bd9c897f1e 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -74,7 +74,6 @@
 #include <tabvwsh.hxx>
 #include <tokenarray.hxx>
 #include <viewdata.hxx>
-#include <docpool.hxx>
 #include <printfun.hxx>
 #include <undostyl.hxx>
 #include <futext.hxx>
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index 0c809b31b370..0a8b80fe2b68 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <comphelper/string.hxx>
-#include <comphelper/lok.hxx>
 #include <editeng/eeitem.hxx>
 #include <osl/diagnose.h>
 
diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx
index 6b6820b9a395..027dff150ef6 100644
--- a/sc/source/ui/view/tabvwshg.cxx
+++ b/sc/source/ui/view/tabvwshg.cxx
@@ -22,7 +22,6 @@
 #include <tools/urlobj.hxx>
 #include <svx/svdobjkind.hxx>
 #include <svx/svdouno.hxx>
-#include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <osl/diagnose.h>
 
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index aa691ddfebde..07a16aaa590a 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -38,7 +38,6 @@
 #include <sal/log.hxx>
 
 #include <viewdata.hxx>
-#include <docoptio.hxx>
 #include <scmod.hxx>
 #include <global.hxx>
 #include <document.hxx>
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 50e95cc87065..d842742ec214 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -58,7 +58,6 @@
 #include <docfunc.hxx>
 #include <docpool.hxx>
 #include <docsh.hxx>
-#include <docoptio.hxx>
 #include <global.hxx>
 #include <patattr.hxx>
 #include <printfun.hxx>
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index fe8492c9f065..9f82c96df810 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -24,7 +24,6 @@
 #include <svx/unomodel.hxx>
 #include <unotools/streamwrap.hxx>
 
-#include <svx/fmmodel.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdogrp.hxx>
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 95d7cc2c2038..fccd840ecf3d 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -41,7 +41,6 @@
 #include <futext.hxx>
 #include <docfunc.hxx>
 #include <sc.hrc>
-#include <fusel.hxx>
 #include <reftokenhelper.hxx>
 #include <externalrefmgr.hxx>
 #include <markdata.hxx>
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 35d7ac557b92..b25bc9f91312 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -39,14 +39,12 @@
 #include <vcl/uitest/logger.hxx>
 #include <vcl/uitest/eventdescription.hxx>
 #include <osl/diagnose.h>
-#include <formula/paramclass.hxx>
 
 #include <viewfunc.hxx>
 #include <tabvwsh.hxx>
 #include <docsh.hxx>
 #include <attrib.hxx>
 #include <patattr.hxx>
-#include <docpool.hxx>
 #include <sc.hrc>
 #include <undocell.hxx>
 #include <undoblk.hxx>
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 40d52d9a4d78..80a67380e5ca 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -17,7 +17,6 @@
 
 #include <tools/urlobj.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <sfx2/objsh.hxx>
 
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>