tdf#42949 Fix new IWYU warnings in directory sc/

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

Change-Id: I217817e2e4a42b096f5a7fb6344568c10d69aab2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106078
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

sc/IwyuFilter_sc.yaml

@@ -1,6 +1,15 @@
 ---
 assumeFilename: sc/source/core/data/document.cxx
 excludelist:
+    sc/sdi/scslots.hrc:
+    # Needed for sdi files to compile
+    - sfx2/sfxsids.hrc
+    - svx/svxids.hrc
+    - svx/unomid.hxx
+    - editeng/editids.hrc
+    - editeng/memberids.h
+    - sc.hrc
+    - mid.h
     sc/inc/addruno.hxx:
     # base class has to be a complete type
     - com/sun/star/beans/XPropertySet.hpp
@@ -64,8 +73,6 @@ excludelist:
     sc/inc/conditio.hxx:
     # base class has to be a complete type
     - tools/link.hxx
-    # Used as type for a boost::optional variable
-    - tools/color.hxx
     sc/inc/dapiuno.hxx:
     # base class has to be a complete type
     - com/sun/star/container/XEnumerationAccess.hpp
@@ -351,10 +358,24 @@ excludelist:
     sc/qa/unit/functions_test.hxx:
     # Needed for css shortcut
     - sal/types.h
+    sc/qa/unit/screenshots/screenshots.cxx:
+    # Needed for template
+    - sfx2/sfxdlg.hxx
+    sc/qa/unit/subsequent_filters-test.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
+    sc/qa/unit/subsequent_export-test.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
+    # Needed for namespace shortcuts
+    - helper/debughelper.hxx
     sc/source/core/inc/addinlis.hxx:
     # base class has to be a complete type
     - com/sun/star/lang/XServiceInfo.hpp
     - com/sun/star/sheet/XResultListener.hpp
+    sc/source/core/inc/arraysumfunctor.hxx:
+    # Needed for uintptr_t
+    - cstdint
     sc/source/core/opencl/formulagroupcl.cxx:
     # Needed for implicit dtor in inverseMatrix()
     - scmatrix.hxx
@@ -555,8 +576,6 @@ excludelist:
     sc/source/ui/vba/vbafiledialog.hxx:
     # base class has to be a complete type
     - ooo/vba/excel/XFileDialog.hpp
-    # FIXME IWYU segfaults after removing this
-    - vbahelper/vbacollectionimpl.hxx
     sc/source/ui/vba/vbafiledialogitems.hxx:
     # base class has to be a complete type
     - ooo/vba/excel/XFileDialogSelectedItems.hpp
@@ -667,9 +686,18 @@ excludelist:
     sc/source/core/data/documentimport.cxx:
     # Needed for member access in assert()
     - stringutil.hxx
+    sc/source/core/data/dpresfilter.cxx:
+    # Actually used
+    - com/sun/star/uno/Sequence.hxx
+    sc/source/core/data/dpoutputgeometry.cxx:
+    # Actually used
+    - vector
     sc/source/core/data/dptabres.cxx:
     # Used in #if DUMP_PIVOT_TABLE
     - document.hxx
+    sc/source/core/data/dptabsrc.cxx:
+    # Actually used
+    - com/sun/star/sheet/DataPilotFieldFilter.hpp
     sc/source/core/data/formulacell.cxx:
     # Used in #if DBG_UTIL
     - com/sun/star/sheet/FormulaLanguage.hpp
@@ -682,6 +710,27 @@ excludelist:
     sc/source/core/data/types.cxx:
     # Complete type is needed for complex data type
     - scmatrix.hxx
+    sc/source/core/data/tabprotection.cxx:
+    # Actually used
+    - vector
+    sc/source/core/tool/addincol.cxx:
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
+    sc/source/core/tool/autoform.cxx:
+    # Don't propose hxx -> h in URE headers
+    - osl/thread.hxx
+    sc/source/core/tool/cellkeytranslator.cxx:
+    # Needed for localized keywords
+    - cellkeywords.inl
+    sc/source/core/tool/formularesult.cxx:
+    # Complete type needed for boost::intrusive_ptr
+    - scmatrix.hxx
+    sc/source/core/tool/formulaparserpool.cxx:
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
+    sc/source/core/tool/interpr4.cxx:
+    # Needed for template
+    - com/sun/star/script/XInvocation.hpp
     sc/source/filter/xml/XMLCodeNameProvider.hxx:
     # base class has to be a complete type
     - com/sun/star/container/XNameAccess.hpp
@@ -691,13 +740,24 @@ excludelist:
     sc/source/filter/ftools/sharedformulagroups.cxx:
     # Needed for implicit dtor
     - tokenarray.hxx
+    sc/source/filter/excel/excdoc.cxx:
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
     sc/source/filter/excel/excimp8.cxx:
     # base class has to be a complete type
     - com/sun/star/container/XIndexContainer.hpp
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
+    sc/source/filter/excel/expop2.cxx:
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
     sc/source/filter/excel/xechart.cxx:
     # Complex type needs complete type
     - com/sun/star/chart2/RelativePosition.hpp
     - com/sun/star/chart2/RelativeSize.hpp
+    sc/source/filter/excel/xecontent.cxx:
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
     sc/source/filter/excel/xeescher.cxx:
     # base class has to be a complete type
     - com/sun/star/chart/XChartDocument.hpp
@@ -714,6 +774,17 @@ excludelist:
     sc/source/filter/excel/xistyle.cxx:
     # Needed for direct member access
     - xladdress.hxx
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
+    sc/source/filter/excel/xlpage.cxx:
+    # Needed for template
+    - editeng/brushitem.hxx
+    sc/source/filter/excel/xlstyle.cxx:
+    # Needed for template
+    - com/sun/star/awt/FontSlant.hpp
+    sc/source/filter/ftools/fapihelper.cxx:
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
     sc/source/filter/lotus/filter.cxx:
     # Needed to avoid loplugin:unreffun error
     - filter.hxx
@@ -723,15 +794,62 @@ excludelist:
     sc/source/filter/lotus/op.cxx:
     # Needed to avoid loplugin:unreffun error
     - op.h
+    # Needed for rtl::math::round
+    - rtl/math.hxx
+    sc/source/filter/html/htmlpars.cxx:
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
+    sc/source/filter/html/htmlexp.cxx:
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
+    sc/source/filter/oox/defnamesbuffer.cxx:
+    # Needed for template
+    - com/sun/star/sheet/XSpreadsheet.hpp
+    sc/source/filter/oox/externallinkbuffer.cxx:
+    # Needed for template
+    - com/sun/star/sheet/XSpreadsheetDocument.hpp
+    sc/source/filter/oox/numberformatsbuffer.cxx:
+    # Needed for template
+    - com/sun/star/sheet/XSpreadsheetDocument.hpp
     sc/source/filter/oox/ooxformulaparser.cxx:
     # Needed for direct member access
     - com/sun/star/lang/XComponent.hpp
+    sc/source/filter/oox/pagesettings.cxx:
+    # Needed for template
+    - com/sun/star/sheet/XSpreadsheet.hpp
+    sc/source/filter/oox/querytablebuffer.cxx:
+    # Needed for template
+    - com/sun/star/sheet/XSpreadsheetDocument.hpp
     sc/source/filter/oox/richstring.cxx:
     # Complete type needed for unique_ptr
     - editeng/editobj.hxx
+    sc/source/filter/oox/sheetdatabuffer.cxx:
+    # Needed for template
+    - com/sun/star/sheet/XSpreadsheetDocument.hpp
+    - com/sun/star/table/XCell.hpp
+    - com/sun/star/table/XCellRange.hpp
+    sc/source/filter/oox/stylesbuffer.cxx:
+    # Needed for template
+    - com/sun/star/sheet/XSpreadsheetDocument.hpp
+    sc/source/filter/oox/tablebuffer.cxx:
+    # Needed for template
+    - com/sun/star/sheet/XSpreadsheetDocument.hpp
+    sc/source/filter/oox/unitconverter.cxx:
+    # Needed for template
+    - com/sun/star/sheet/XSpreadsheetDocument.hpp
+    sc/source/filter/oox/viewsettings.cxx:
+    # Needed for template
+    - com/sun/star/sheet/XSpreadsheetDocument.hpp
+    - com/sun/star/sheet/XSpreadsheet.hpp
+    sc/source/filter/oox/workbooksettings.cxx:
+    # Needed for template
+    - com/sun/star/sheet/XSpreadsheetDocument.hpp
     sc/source/filter/oox/worksheethelper.cxx:
     # Needed for implicit dtor
     - editeng/editobj.hxx
+    sc/source/filter/oox/worksheetsettings.cxx:
+    # Needed for template
+    - com/sun/star/sheet/XSpreadsheet.hpp
     sc/source/filter/orcus/orcusfiltersimpl.cxx:
     # Needed for implicit dtor
     - tokenarray.hxx
@@ -740,15 +858,51 @@ excludelist:
     sc/source/filter/orcus/xmlcontext.cxx:
     # Needed for implicit dtor
     - tokenarray.hxx
+    sc/source/filter/xcl97/xcl97rec.cxx:
+    # Needed for template
+    - com/sun/star/chart/XChartDocument.hpp
+    - sax/fastattribs.hxx
+    sc/source/filter/xml/XMLCalculationSettingsContext.cxx:
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
     sc/source/filter/xml/XMLExportIterator.cxx:
     # Needed for direct member access
     - com/sun/star/table/XCellRange.hpp
+    - com/sun/star/sheet/XSpreadsheet.hpp
+    sc/source/filter/xml/XMLExportDatabaseRanges.cxx:
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
+    sc/source/filter/xml/XMLTableHeaderFooterContext.cxx:
+    # Needed for template
+    - com/sun/star/beans/XPropertySet.hpp
+    - com/sun/star/sheet/XHeaderFooterContent.hpp
+    # Needed for macro XMLOFF_WARN_UNKNOWN
+    - sal/log.hxx
+    sc/source/filter/xml/XMLTableMasterPageExport.cxx:
+     # Needed for template
+     - com/sun/star/text/XText.hpp
+     - com/sun/star/beans/XPropertySet.hpp
+    sc/source/filter/xml/XMLTableShapeResizer.cxx:
+    # Actually used
+    - vector
+    sc/source/filter/xml/XMLTableSourceContext.cxx:
+    # Needed for template
+    - com/sun/star/sheet/XSpreadsheet.hpp
+    sc/source/filter/xml/xmldpimp.cxx:
+    # Actually used
+    - com/sun/star/sheet/DataPilotFieldOrientation.hpp
+    sc/source/filter/xml/xmldrani.cxx:
+    # Actually used
+    - com/sun/star/sheet/DataImportMode.hpp
     sc/source/filter/xml/xmlimprt.cxx:
     # Needed to avoid loplugin:unreffun error
     - appluno.hxx
     sc/source/filter/xml/xmlsubti.cxx:
     # Needed for direct member access
     - com/sun/star/sheet/XSpreadsheet.hpp
+    sc/source/filter/xml/xmltabi.cxx:
+    # Needed for template
+    - com/sun/star/sheet/XSpreadsheet.hpp
     sc/source/ui/attrdlg/scdlgfact.cxx:
     # Complete type needed for unique_ptr & ScConditionalFormatList
     - conditio.hxx
@@ -768,6 +922,7 @@ excludelist:
     # Needed for MID* macros
     - mid.h
     - editeng/memberids.h
+    - svx/unomid.hxx
     # Needed by scslots.hxx
     - sfx2/msg.hxx
     - svl/slstitm.hxx
@@ -846,6 +1001,8 @@ excludelist:
     sc/source/ui/docshell/docsh.cxx:
     # Needed for method parameter
     - ooo/vba/excel/XWorkbook.hpp
+    # Needed for SID* macros in workdir/SdiTarget/sc/sdi/scslots.hxx
+    - sc.hrc
     sc/source/ui/docshell/docsh4.cxx:
     # Needed on WIN32
     - impex.hxx
@@ -864,6 +1021,12 @@ excludelist:
     # Complete type is needed
     - com/sun/star/sheet/XFormulaParser.hpp
     - com/sun/star/sheet/XFormulaOpCodeMapper.hpp
+    sc/source/ui/miscdlgs/solveroptions.cxx:
+    # Needed for template
+    - com/sun/star/sheet/XSolver.hpp
+    sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
     sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx:
     # Needed for implicit dtor
     - editeng/editobj.hxx
@@ -879,12 +1042,48 @@ excludelist:
     sc/source/ui/unoobj/notesuno.cxx:
     # Needed for macro defines
     - editeng/unoprnms.hxx
+    sc/source/ui/unoobj/scdetect.cxx:
+    # Actually used
+    - com/sun/star/beans/PropertyValue.hpp
     sc/source/ui/unoobj/textuno.cxx:
     # Needed for macro defines
     - editeng/unoprnms.hxx
     sc/source/ui/view/tabview.cxx:
     # Needed for direct member access
     - pagedata.hxx
+    sc/source/ui/vba/vbaformatconditions.cxx:
+    # Needed for template
+    - ooo/vba/excel/XRange.hpp
+    sc/source/ui/vba/vbahyperlink.cxx:
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
+    sc/source/ui/vba/vbaformat.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
+    sc/source/ui/vba/vbainterior.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySet.hpp
+    sc/source/ui/vba/vbanames.cxx:
+    # Actually used
+    - com/sun/star/sheet/XNamedRanges.hpp
+    sc/source/ui/vba/vbapagebreaks.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    sc/source/ui/vba/vbaworkbooks.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    sc/source/ui/vba/vbawsfunction.cxx:
+    # Actually used
+    - com/sun/star/beans/XIntrospectionAccess.hpp
+    sc/source/ui/vba/vbarange.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    sc/source/ui/vba/vbaworksheet.cxx:
+    # Actually used
+    - com/sun/star/beans/XIntrospectionAccess.hpp
     sc/source/ui/view/viewfun4.cxx:
     # Needed for direct member access
     - refundo.hxx
+    sc/source/ui/view/tabvwshc.cxx:
+    # Needed for ScFormulaDlg instantiation for some weird reason
+    - funcdesc.hxx

sc/inc/NumberFormatControl.hxx

@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include "scdllapi.h"
 #include <sfx2/tbxctrl.hxx>
 
 

sc/inc/dpdimsave.hxx

@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SC_INC_DPDIMSAVE_HXX
 #define INCLUDED_SC_INC_DPDIMSAVE_HXX
 
+#include <tools/long.hxx>
+
 #include <vector>
 #include <map>
 #include "dpitemdata.hxx"

sc/inc/dpfilteredcache.hxx

@@ -23,7 +23,6 @@
 #include <sal/types.h>
 #include "dpitemdata.hxx"
 #include "calcmacros.hxx"
-#include "scdllapi.h"
 #include "types.hxx"
 
 #include <unordered_set>

sc/inc/dpoutput.hxx

@@ -24,6 +24,8 @@
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 
+#include <tools/long.hxx>
+
 #include "address.hxx"
 
 #include "dptypes.hxx"

sc/inc/dpresfilter.hxx

@@ -11,7 +11,6 @@
 #define INCLUDED_SC_INC_DPRESFILTER_HXX
 
 #include <rtl/ustring.hxx>
-#include <tools/long.hxx>
 #include "calcmacros.hxx"
 
 #include <memory>

sc/inc/formularesult.hxx

@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_INC_FORMULARESULT_HXX
 #define INCLUDED_SC_INC_FORMULARESULT_HXX
 
-#include "scdllapi.h"
 #include "global.hxx"
 #include "calcmacros.hxx"
 #include <svl/sharedstring.hxx>

sc/inc/global.hxx

@@ -34,7 +34,7 @@
 // HACK: <atomic> includes <stdbool.h>, which in some Clang versions does '#define bool bool',
 // which confuses clang plugins.
 #undef bool
-#include <map>
+
 #include <memory>
 
 namespace com::sun::star::uno { template <typename > class Reference; }

sc/inc/inputopt.hxx

@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_INC_INPUTOPT_HXX
 #define INCLUDED_SC_INC_INPUTOPT_HXX
 
-#include "scdllapi.h"
 #include <unotools/configitem.hxx>
 
 class ScInputOptions

sc/inc/rechead.hxx

@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_INC_RECHEAD_HXX
 #define INCLUDED_SC_INC_RECHEAD_HXX
 
-#include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <memory>
 

sc/inc/sc.hrc

@@ -20,7 +20,6 @@
 #ifndef SC_SC_HRC
 #define SC_SC_HRC
 
-#include <sfx2/sfxsids.hrc>
 #include <svx/svxids.hrc>
 
 // areas

sc/inc/scmod.hxx

@@ -23,7 +23,6 @@
 #include "scdllapi.h"
 #include <o3tl/deleter.hxx>
 #include <vcl/timer.hxx>
-#include <vcl/idle.hxx>
 #include <svl/lstner.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>

sc/inc/sheetlimits.hxx

@@ -21,6 +21,7 @@
 #define INCLUDED_SC_INC_SHEETLIMITS_HXX
 
 #include <salhelper/simplereferenceobject.hxx>
+#include "address.hxx"
 
 // Because some stuff needs this info, and those objects lifetimes sometimes exceeds the lifetime
 // of the ScDocument.

sc/inc/userdat.hxx

@@ -21,7 +21,6 @@
 #define INCLUDED_SC_INC_USERDAT_HXX
 
 #include <svx/svdobj.hxx>
-#include <vcl/imap.hxx>
 #include "address.hxx"
 #include "drwlayer.hxx"
 

sc/qa/extras/anchor.cxx

@@ -19,7 +19,6 @@
 #include <attrib.hxx>
 #include <docsh.hxx>
 #include <drwlayer.hxx>
-#include <scitems.hxx>
 #include <svx/svdocirc.hxx>
 #include <vcl/scheduler.hxx>
 #include <tabvwsh.hxx>

sc/qa/unit/copy_paste_test.cxx

@@ -16,7 +16,6 @@
 #include <cellmergeoption.hxx>
 #include <tabvwsh.hxx>
 #include <impex.hxx>
-#include <viewfunc.hxx>
 #include <scitems.hxx>
 #include <attrib.hxx>
 #include <userlist.hxx>

sc/qa/unit/filters-test.cxx

@@ -31,6 +31,7 @@
 
 #include <svx/svdocapt.hxx>
 #include <svx/svdpage.hxx>
+#include <tools/stream.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;

sc/qa/unit/helper/debughelper.hxx

@@ -26,6 +26,8 @@
 #define CALC_DEBUG_OUTPUT 0
 #define CALC_TEST_PERF 0
 
+#include <sal/types.h>
+
 using namespace ::com::sun::star;
 using ::std::cout;
 using ::std::cerr;

sc/qa/unit/jumbosheets-test.cxx

@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <memory>
 #include <sal/config.h>
 #include <unotest/filters-test.hxx>
 #include <test/bootstrapfixture.hxx>
@@ -23,7 +22,6 @@
 #include <com/sun/star/frame/Desktop.hpp>
 
 #include "helper/qahelper.hxx"
-#include "helper/shared_test_impl.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;

sc/qa/unit/scshapetest.cxx

@@ -9,11 +9,8 @@
 
 #include <sal/config.h>
 
-#include <cstdlib>
-
 #include <test/calc_unoapi_test.hxx>
 
-#include <comphelper/dispatchcommand.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svdoashp.hxx>

sc/qa/unit/subsequent_export-test.cxx

@@ -11,10 +11,7 @@
 #include <sal/config.h>
 #include <config_features.h>
 
-#include <sfx2/docfile.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
-#include <sfx2/sfxsids.hrc>
-#include <sfx2/docfilt.hxx>
 
 #include "helper/debughelper.hxx"
 #include "helper/qahelper.hxx"

sc/qa/unit/subsequent_filters-test.cxx

@@ -11,7 +11,6 @@
 #include <sal/config.h>
 #include <unotest/filters-test.hxx>
 #include <test/bootstrapfixture.hxx>
-#include <rtl/strbuf.hxx>
 #include <osl/file.hxx>
 #include <config_features.h>
 
@@ -80,7 +79,6 @@
 #include <unotools/syslocaleoptions.hxx>
 #include "helper/qahelper.hxx"
 #include "helper/shared_test_impl.hxx"
-#include <cellsuno.hxx>
 
 namespace com::sun::star::frame { class XModel; }
 

sc/qa/unit/tiledrendering/tiledrendering.cxx

@@ -15,9 +15,7 @@
 
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/DispatchHelper.hpp>
 #include <com/sun/star/datatransfer/clipboard/SystemClipboard.hpp>
-#include <com/sun/star/datatransfer/UnsupportedFlavorException.hpp>
 #include <comphelper/dispatchcommand.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
@@ -31,11 +29,9 @@
 #include <sfx2/childwin.hxx>
 #include <sfx2/lokhelper.hxx>
 #include <svx/svdpage.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/scheduler.hxx>
 #include <vcl/vclevent.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/unohelp2.hxx>
 #include <sc.hrc>
 #include <comphelper/string.hxx>
 #include <tools/json_writer.hxx>

sc/qa/unit/ucalc_sort.cxx

@@ -29,7 +29,6 @@
 #include <sal/config.h>
 #include <editeng/wghtitem.hxx>
 #include <editeng/postitem.hxx>
-#include <editeng/editobj.hxx>
 #include <svx/svdocirc.hxx>
 #include <svx/svdpage.hxx>
 #include <rtl/math.hxx>

sc/qa/unit/uicalc/uicalc.cxx

@@ -10,14 +10,17 @@
 #include <test/bootstrapfixture.hxx>
 #include <unotest/macros_test.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#include <vcl/keycodes.hxx>
 #include <vcl/scheduler.hxx>
 
 #include <comphelper/propertysequence.hxx>
-#include <comphelper/processfactory.hxx>
+#include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
+#include <dbfunc.hxx>
 #include <document.hxx>
 #include <docuno.hxx>
-#include <tabvwsh.hxx>
+#include <docsh.hxx>
+#include <viewdata.hxx>
 
 using namespace ::com::sun::star;
 

sc/source/core/data/column2.cxx

@@ -41,7 +41,6 @@
 #include <scmatrix.hxx>
 #include <rowheightcontext.hxx>
 #include <tokenstringcontext.hxx>
-#include <recursionhelper.hxx>
 
 #include <editeng/eeitem.hxx>
 #include <o3tl/safeint.hxx>

sc/source/core/data/docpool.cxx

@@ -31,7 +31,6 @@
 #include <svl/itemiter.hxx>
 #include <svl/stritem.hxx>
 #include <svx/algitem.hxx>
-#include <svx/sdangitm.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/lineitem.hxx>
 #include <editeng/brushitem.hxx>

sc/source/core/data/documen2.cxx

@@ -53,7 +53,6 @@
 #include <validat.hxx>
 #include <detdata.hxx>
 #include <defaultsoptions.hxx>
-#include <sc.hrc>
 #include <ddelink.hxx>
 #include <chgtrack.hxx>
 #include <chgviset.hxx>

sc/source/core/data/documen3.cxx

@@ -66,7 +66,6 @@
 #include <refupdatecontext.hxx>
 #include <scopetools.hxx>
 #include <filterentries.hxx>
-#include <docsh.hxx>
 #include <queryparam.hxx>
 
 #include <globalnames.hxx>

sc/source/core/data/documen7.cxx

@@ -30,7 +30,6 @@
 #include <sheetevents.hxx>
 #include <tokenarray.hxx>
 #include <listenercontext.hxx>
-#include <refhint.hxx>
 
 void ScDocument::StartListeningArea(
     const ScRange& rRange, bool bGroupListening, SvtListener* pListener )

sc/source/core/data/documen8.cxx

@@ -23,7 +23,6 @@
 #include <comphelper/servicehelper.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <tools/urlobj.hxx>
-#include <editeng/editobj.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/langitem.hxx>
 #include <sfx2/linkmgr.hxx>
@@ -80,7 +79,6 @@
 #include <globalnames.hxx>
 #include <stringutil.hxx>
 #include <documentlinkmgr.hxx>
-#include <scopetools.hxx>
 #include <tokenarray.hxx>
 
 #include <memory>

sc/source/core/data/document.cxx

@@ -25,7 +25,6 @@
 #include <svx/sdrundomanager.hxx>
 #include <svx/svditer.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/viewsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <svl/poolcach.hxx>
 #include <svl/zforlist.hxx>
@@ -40,6 +39,7 @@
 #include <com/sun/star/lang/NotInitializedException.hpp>
 
 #include <document.hxx>
+#include <docuno.hxx>
 #include <table.hxx>
 #include <column.hxx>
 #include <attrib.hxx>
@@ -83,8 +83,6 @@
 #include <formulagroup.hxx>
 #include <tokenstringcontext.hxx>
 #include <compressedarray.hxx>
-#include <docsh.hxx>
-#include <brdcst.hxx>
 #include <recursionhelper.hxx>
 
 #include <formula/vectortoken.hxx>
@@ -94,7 +92,7 @@
 #include <utility>
 
 #include <comphelper/lok.hxx>
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#include <comphelper/servicehelper.hxx>
 
 #include <vcl/uitest/logger.hxx>
 #include <vcl/uitest/eventdescription.hxx>

sc/source/core/data/document10.cxx

@@ -16,7 +16,6 @@
 #include <listenercontext.hxx>
 #include <tokenstringcontext.hxx>
 #include <poolhelp.hxx>
-#include <bcaslot.hxx>
 #include <cellvalues.hxx>
 #include <docpool.hxx>
 #include <columniterator.hxx>

sc/source/core/data/dptabsrc.cxx

@@ -20,8 +20,6 @@
 #include <dptabsrc.hxx>
 
 #include <algorithm>
-#include <set>
-#include <unordered_set>
 #include <vector>
 
 #include <comphelper/sequence.hxx>

sc/source/core/data/drwlayer.cxx

@@ -35,10 +35,8 @@
 #include <svx/svdoashp.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdocapt.hxx>
-#include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdopath.hxx>
-#include <svx/svdtrans.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/sdsxyitm.hxx>
 #include <svx/svxids.hrc>

sc/source/core/data/formulacell.cxx

@@ -74,7 +74,6 @@
 #include <memory>
 #include <map>
 #include <vector>
-#include <unordered_set>
 
 using namespace formula;
 

sc/source/core/data/markarr.cxx

@@ -19,12 +19,9 @@
 
 #include <markarr.hxx>
 #include <address.hxx>
-#include <rangelst.hxx>
 #include <sheetlimits.hxx>
 #include <vector>
 
-#include <osl/diagnose.h>
-
 ScMarkArray::ScMarkArray(const ScSheetLimits& rLimits) :
     mrSheetLimits(rLimits)
 {

sc/source/core/data/markmulti.cxx

@@ -22,8 +22,6 @@
 #include <rangelst.hxx>
 #include <segmenttree.hxx>
 #include <sheetlimits.hxx>
-#include <sal/log.hxx>
-#include <o3tl/sorted_vector.hxx>
 
 #include <algorithm>
 

sc/source/core/data/poolhelp.cxx

@@ -20,7 +20,6 @@
 #include <comphelper/processfactory.hxx>
 #include <svl/zforlist.hxx>
 #include <editeng/editeng.hxx>
-#include <osl/diagnose.h>
 
 #include <poolhelp.hxx>
 #include <document.hxx>

sc/source/core/data/segmenttree.cxx

@@ -23,7 +23,6 @@
 #include <sal/log.hxx>
 #include <algorithm>
 #include <limits>
-#include <address.hxx>
 
 using ::std::numeric_limits;
 

sc/source/core/data/table4.cxx

@@ -20,7 +20,6 @@
 #include <scitems.hxx>
 #include <comphelper/string.hxx>
 #include <editeng/boxitem.hxx>
-#include <editeng/editobj.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/escapementitem.hxx>

sc/source/core/data/validat.cxx

@@ -24,6 +24,7 @@
 
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
+#include <sfx2/viewsh.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbmod.hxx>
 #include <basic/sbstar.hxx>
@@ -50,7 +51,6 @@
 #include <scmatrix.hxx>
 #include <cellvalue.hxx>
 #include <comphelper/lok.hxx>
-#include <sfx2/lokhelper.hxx>
 
 #include <math.h>
 #include <memory>

sc/source/core/inc/arraysumfunctor.hxx

@@ -12,8 +12,10 @@
 #define INCLUDED_SC_SOURCE_CORE_INC_ARRAYSUMFUNCTOR_HXX
 
 #include <cstdint>
-#include <rtl/math.hxx>
+#include <cmath>
 
+#include <sal/mathconf.h>
+#include <sal/types.h>
 #include <tools/simd.hxx>
 #include <tools/cpuid.hxx>
 

sc/source/core/inc/grouptokenconverter.hxx

@@ -10,7 +10,6 @@
 #ifndef INCLUDED_SC_SOURCE_CORE_INC_GROUPTOKENCONVERTER_HXX
 #define INCLUDED_SC_SOURCE_CORE_INC_GROUPTOKENCONVERTER_HXX
 
-#include <scdllapi.h>
 #include <types.hxx>
 #include <formulalogger.hxx>
 

sc/source/core/inc/interpre.hxx

@@ -25,7 +25,6 @@
 #include <unotools/textsearch.hxx>
 #include <formula/errorcodes.hxx>
 #include <formula/tokenarray.hxx>
-#include <scdllapi.h>
 #include <types.hxx>
 #include <externalrefmgr.hxx>
 #include <calcconfig.hxx>

sc/source/core/opencl/opinlinefun_math.hxx

@@ -10,6 +10,8 @@
 #ifndef INCLUDED_SC_SOURCE_CORE_OPENCL_OPINLINEFUN_MATH_HXX
 #define INCLUDED_SC_SOURCE_CORE_OPENCL_OPINLINEFUN_MATH_HXX
 
+#include <string>
+
 std::string Math_Intg_Str=
 "\ndouble Intg(double n)\n\
 {\n\

sc/source/core/tool/addincol.cxx

@@ -29,6 +29,7 @@
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
@@ -47,12 +48,9 @@
 
 #include <addincol.hxx>
 #include <addinhelpid.hxx>
-#include <compiler.hxx>
 #include <scmatrix.hxx>
-#include <addinlis.hxx>
 #include <formula/errorcodes.hxx>
 #include <formula/funcvarargs.h>
-#include <sc.hrc>
 #include <optutil.hxx>
 #include <addincfg.hxx>
 #include <scmod.hxx>

sc/source/core/tool/addinhelpid.cxx

@@ -18,7 +18,6 @@
  */
 
 #include <addinhelpid.hxx>
-#include <sc.hrc>
 #include <helpids.h>
 
 // A struct containing the built-in function name and the built-in help ID.

sc/source/core/tool/addinlis.cxx

@@ -24,7 +24,6 @@
 #include <miscuno.hxx>
 #include <document.hxx>
 #include <brdcst.hxx>
-#include <sc.hrc>
 
 #include <com/sun/star/sheet/XVolatileResult.hpp>
 

sc/source/core/tool/adiasync.cxx

@@ -25,9 +25,7 @@
 
 #include <adiasync.hxx>
 #include <brdcst.hxx>
-#include <global.hxx>
 #include <document.hxx>
-#include <sc.hrc>
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 

sc/source/core/tool/appoptio.cxx

@@ -17,15 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/svapp.hxx>
-
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <appoptio.hxx>
-#include <rechead.hxx>
 #include <global.hxx>
 #include <userlist.hxx>
-#include <sc.hrc>
 #include <formula/compiler.hxx>
 #include <miscuno.hxx>
 #include <memory>

sc/source/core/tool/autoform.cxx

@@ -20,18 +20,14 @@
 #include <memory>
 #include <autoform.hxx>
 
-#include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/intitem.hxx>
 #include <svl/itemset.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
 #include <svx/algitem.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/rotmodit.hxx>
-#include <svx/svxids.hrc>
 #include <svx/strings.hrc>
 #include <editeng/adjustitem.hxx>
 #include <editeng/borderline.hxx>
@@ -55,6 +51,7 @@
 #include <unotools/transliterationwrapper.hxx>
 #include <tools/tenccvt.hxx>
 #include <osl/diagnose.h>
+#include <osl/thread.hxx>
 
 #include <attrib.hxx>
 #include <globstr.hrc>
@@ -62,10 +59,6 @@
 #include <scresid.hxx>
 #include <document.hxx>
 
-#include <svl/legacyitem.hxx>
-#include <editeng/legacyitem.hxx>
-#include <svx/legacyitem.hxx>
-
 /*
  * XXX: BIG RED NOTICE! Changes MUST be binary file format compatible and MUST
  * be synchronized with Writer's SwTableAutoFmtTbl sw/source/core/doc/tblafmt.cxx

sc/source/core/tool/calcconfig.cxx

@@ -8,22 +8,17 @@
  */
 
 #include <ostream>
-#include <set>
 
 #include <formula/FormulaCompiler.hxx>
 #include <formula/grammar.hxx>
 #include <formula/opcode.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
-#include <sfx2/objsh.hxx>
 #include <unotools/configmgr.hxx>
 
 #include <calcconfig.hxx>
-#include <compiler.hxx>
-#include <docsh.hxx>
 
 #include <comphelper/configurationlistener.hxx>
-#include <com/sun/star/datatransfer/XTransferable2.hpp>
 
 using comphelper::ConfigurationListener;
 

sc/source/core/tool/callform.cxx

@@ -22,8 +22,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <osl/module.hxx>
-#include <osl/file.hxx>
-#include <unotools/transliterationwrapper.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <memory>
 
 #include <callform.hxx>

sc/source/core/tool/cellform.cxx

@@ -19,7 +19,6 @@
 
 #include <cellform.hxx>
 
-#include <sfx2/objsh.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/sharedstring.hxx>
 
@@ -27,7 +26,6 @@
 #include <document.hxx>
 #include <cellvalue.hxx>
 #include <formula/errorcodes.hxx>
-#include <sc.hrc>
 #include <editutil.hxx>
 
 void ScCellFormat::GetString( const ScRefCellValue& rCell, sal_uInt32 nFormat, OUString& rString,

sc/source/core/tool/cellkeytranslator.cxx

@@ -21,7 +21,6 @@
 #include <global.hxx>
 #include <cellkeytranslator.hxx>
 #include <comphelper/processfactory.hxx>
-#include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/lang.h>
 #include <i18nutil/transliteration.hxx>
 #include <rtl/ustring.hxx>

sc/source/core/tool/chartarr.cxx

@@ -17,15 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <scitems.hxx>
-#include <svl/intitem.hxx>
-#include <svl/zforlist.hxx>
 #include <float.h>
 
 #include <chartarr.hxx>
 #include <cellvalue.hxx>
 #include <document.hxx>
-#include <rechead.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
 #include <formulacell.hxx>

sc/source/core/tool/chartlock.cxx

@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/svapp.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdpage.hxx>

sc/source/core/tool/chartpos.cxx

@@ -19,7 +19,6 @@
 
 #include <chartpos.hxx>
 #include <document.hxx>
-#include <rechead.hxx>
 #include <osl/diagnose.h>
 
 #include <memory>

sc/source/core/tool/chgtrack.cxx

@@ -23,8 +23,6 @@
 #include <document.hxx>
 #include <dociter.hxx>
 #include <global.hxx>
-#include <rechead.hxx>
-#include <scerrors.hxx>
 #include <scmod.hxx>
 #include <inputopt.hxx>
 #include <patattr.hxx>
@@ -39,18 +37,12 @@
 
 #include <osl/diagnose.h>
 #include <svl/zforlist.hxx>
-#include <svl/itemset.hxx>
-#include <svl/isethint.hxx>
-#include <svl/itempool.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <unotools/useroptions.hxx>
 #include <unotools/datetime.hxx>
-#include <sfx2/sfxsids.hrc>
 #include <tools/json_writer.hxx>
 #include <algorithm>
 #include <memory>
-#include <boost/property_tree/json_parser.hpp>
 
 ScChangeAction::ScChangeAction( ScChangeActionType eTypeP, const ScRange& rRange )
         :

sc/source/core/tool/chgviset.cxx

@@ -20,7 +20,6 @@
 #include <unotools/textsearch.hxx>
 
 #include <chgviset.hxx>
-#include <rechead.hxx>
 #include <chgtrack.hxx>
 #include <document.hxx>
 

sc/source/core/tool/compiler.cxx

@@ -29,12 +29,10 @@
 #include <basic/sbstar.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/sharedstringpool.hxx>
-#include <sal/macros.h>
 #include <sal/log.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
 #include <rtl/character.hxx>
-#include <tools/solar.h>
 #include <unotools/charclass.hxx>
 #include <unotools/configmgr.hxx>
 #include <com/sun/star/lang/Locale.hpp>
@@ -49,7 +47,6 @@
 #include <rtl/math.hxx>
 #include <rtl/ustring.hxx>
 #include <stdlib.h>
-#include <string.h>
 #include <math.h>
 #include <rangenam.hxx>
 #include <dbdata.hxx>
@@ -57,7 +54,6 @@
 #include <callform.hxx>
 #include <addincol.hxx>
 #include <refupdat.hxx>
-#include <sc.hrc>
 #include <globstr.hrc>
 #include <scresid.hxx>
 #include <formulacell.hxx>

sc/source/core/tool/consoli.cxx

@@ -27,7 +27,6 @@
 #include <osl/diagnose.h>
 #include <refdata.hxx>
 
-#include <math.h>
 #include <string.h>
 #include <memory>
 

sc/source/core/tool/dbdata.cxx

@@ -27,7 +27,6 @@
 #include <dbdata.hxx>
 #include <globalnames.hxx>
 #include <refupdat.hxx>
-#include <rechead.hxx>
 #include <document.hxx>
 #include <queryparam.hxx>
 #include <queryentry.hxx>

sc/source/core/tool/defaultsoptions.cxx

@@ -11,10 +11,6 @@
 #include <osl/diagnose.h>
 
 #include <defaultsoptions.hxx>
-#include <miscuno.hxx>
-#include <global.hxx>
-#include <attrib.hxx>
-#include <scitems.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
 #include <sc.hrc>

sc/source/core/tool/detdata.cxx

@@ -21,7 +21,6 @@
 #include <memory>
 #include <detdata.hxx>
 #include <refupdat.hxx>
-#include <rechead.hxx>
 
 ScDetOpList::ScDetOpList(const ScDetOpList& rList) :
     bHasAddError( false )

sc/source/core/tool/detfunc.cxx

@@ -20,7 +20,6 @@
 #include <scitems.hxx>
 #include <svtools/colorcfg.hxx>
 #include <editeng/eeitem.hxx>
-#include <editeng/outlobj.hxx>
 #include <formula/errorcodes.hxx>
 #include <svx/sdshitm.hxx>
 #include <svx/sdsxyitm.hxx>
@@ -42,13 +41,9 @@
 #include <svx/xlnstit.hxx>
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnwtit.hxx>
-#include <svx/xtable.hxx>
 #include <svx/sdtagitm.hxx>
-#include <editeng/outliner.hxx>
-#include <editeng/editobj.hxx>
 #include <svx/sxcecitm.hxx>
 #include <svl/whiter.hxx>
-#include <editeng/writingmodeitem.hxx>
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
@@ -63,10 +58,8 @@
 #include <formulacell.hxx>
 #include <docpool.hxx>
 #include <patattr.hxx>
-#include <attrib.hxx>
 #include <scmod.hxx>
 #include <postit.hxx>
-#include <rangelst.hxx>
 #include <reftokenhelper.hxx>
 #include <formulaiter.hxx>
 #include <cellvalue.hxx>

sc/source/core/tool/docoptio.cxx

@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/svapp.hxx>
 #include <svl/zforlist.hxx>
 #include <osl/diagnose.h>
 
@@ -25,8 +24,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <docoptio.hxx>
-#include <rechead.hxx>
-#include <sc.hrc>
 #include <miscuno.hxx>
 #include <global.hxx>
 

sc/source/core/tool/doubleref.cxx

@@ -18,7 +18,6 @@
  */
 
 #include <doubleref.hxx>
-#include <formulacell.hxx>
 #include <global.hxx>
 #include <document.hxx>
 #include <queryparam.hxx>

sc/source/core/tool/editutil.cxx

@@ -23,17 +23,13 @@
 
 #include <svx/algitem.hxx>
 #include <svtools/colorcfg.hxx>
-#include <editeng/editview.hxx>
 #include <editeng/editstat.hxx>
-#include <editeng/escapementitem.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/numitem.hxx>
 #include <editeng/justifyitem.hxx>
 #include <editeng/editobj.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
 #include <svl/inethist.hxx>
-#include <unotools/syslocale.hxx>
 #include <sfx2/objsh.hxx>
 #include <osl/diagnose.h>
 

sc/source/core/tool/formulagroup.cxx

@@ -13,21 +13,13 @@
 #include <formulagroupcl.hxx>
 #include <document.hxx>
 #include <formulacell.hxx>
-#include <tokenarray.hxx>
-#include <compiler.hxx>
 #include <interpre.hxx>
-#include <scmatrix.hxx>
 #include <globalnames.hxx>
-#include <comphelper/threadpool.hxx>
-#include <tools/cpuid.hxx>
 
-#include <formula/vectortoken.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <officecfg/Office/Calc.hxx>
 #if HAVE_FEATURE_OPENCL
 #include <opencl/platforminfo.hxx>
 #endif
-#include <rtl/bootstrap.hxx>
 #include <sal/log.hxx>
 
 #include <cstdio>

sc/source/core/tool/formulaopt.cxx

@@ -13,7 +13,6 @@
 #include <sal/log.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <formulaopt.hxx>
-#include <miscuno.hxx>
 #include <global.hxx>
 #include <formulagroup.hxx>
 #include <sc.hrc>

sc/source/core/tool/inputopt.cxx

@@ -22,9 +22,7 @@
 #include <osl/diagnose.h>
 
 #include <inputopt.hxx>
-#include <rechead.hxx>
 #include <global.hxx>
-#include <sc.hrc>
 #include <miscuno.hxx>
 
 using namespace utl;

sc/source/core/tool/interpr1.cxx

@@ -24,7 +24,6 @@
 #include <editeng/justifyitem.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/thread.h>
-#include <svx/algitem.hxx>
 #include <unotools/textsearch.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
@@ -57,22 +56,18 @@
 #include <rangeutl.hxx>
 #include <compiler.hxx>
 #include <externalrefmgr.hxx>
-#include <basic/sbstar.hxx>
 #include <doubleref.hxx>
 #include <queryparam.hxx>
 #include <queryentry.hxx>
 #include <tokenarray.hxx>
 #include <compare.hxx>
 
-#include <com/sun/star/util/SearchResult.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/random.hxx>
 #include <comphelper/string.hxx>
 #include <svl/sharedstringpool.hxx>
 
 #include <stdlib.h>
-#include <string.h>
-#include <math.h>
 #include <vector>
 #include <memory>
 #include <limits>

sc/source/core/tool/interpr2.cxx

@@ -22,28 +22,22 @@
 
 #include <comphelper/string.hxx>
 #include <o3tl/float_int_conversion.hxx>
+#include <sfx2/bindings.hxx>
 #include <sfx2/linkmgr.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
-#include <svl/stritem.hxx>
 #include <svl/zforlist.hxx>
-#include <svl/sharedstringpool.hxx>
 #include <sal/macros.h>
 #include <osl/diagnose.h>
 
-#include <attrib.hxx>
 #include <sc.hrc>
 #include <ddelink.hxx>
 #include <scmatrix.hxx>
-#include <compiler.hxx>
 #include <formulacell.hxx>
 #include <document.hxx>
 #include <dociter.hxx>
-#include <docoptio.hxx>
 #include <unitconv.hxx>
 #include <hints.hxx>
 #include <dpobject.hxx>
-#include <postit.hxx>
 #include <tokenarray.hxx>
 #include <globalnames.hxx>
 #include <stlsheet.hxx>
@@ -51,9 +45,7 @@
 
 #include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
 
-#include <limits>
 #include <string.h>
-#include <math.h>
 
 using ::std::vector;
 using namespace com::sun::star;

sc/source/core/tool/interpr3.cxx

@@ -19,12 +19,9 @@
 
 #include <tools/solar.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include <interpre.hxx>
 #include <global.hxx>
-#include <compiler.hxx>
-#include <formulacell.hxx>
 #include <document.hxx>
 #include <dociter.hxx>
 #include <matrixoperators.hxx>

sc/source/core/tool/interpr4.cxx

@@ -21,13 +21,10 @@
 
 #include <interpre.hxx>
 
-#include <rangelst.hxx>
 #include <o3tl/safeint.hxx>
 #include <rtl/math.hxx>
 #include <sfx2/app.hxx>
-#include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/docfilt.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbmod.hxx>
 #include <basic/sbstar.hxx>
@@ -39,7 +36,6 @@
 #include <unotools/charclass.hxx>
 #include <stdlib.h>
 #include <string.h>
-#include <signal.h>
 
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/script/XInvocation.hpp>
@@ -55,7 +51,6 @@
 #include <docoptio.hxx>
 #include <scmatrix.hxx>
 #include <adiasync.hxx>
-#include <sc.hrc>
 #include <cellsuno.hxx>
 #include <optuno.hxx>
 #include <rangeseq.hxx>
@@ -70,14 +65,11 @@
 #include <tokenarray.hxx>
 #include <compiler.hxx>
 
-#include <math.h>
-#include <float.h>
 #include <map>
 #include <algorithm>
 #include <basic/basmgr.hxx>
 #include <vbahelper/vbaaccesshelper.hxx>
 #include <memory>
-#include <stack>
 
 using namespace com::sun::star;
 using namespace formula;

sc/source/core/tool/interpr5.cxx

@@ -30,7 +30,6 @@
 
 #include <interpre.hxx>
 #include <global.hxx>
-#include <compiler.hxx>
 #include <formulacell.hxx>
 #include <document.hxx>
 #include <dociter.hxx>

sc/source/core/tool/interpr6.cxx

@@ -23,7 +23,7 @@
 #include <document.hxx>
 #include <cellvalue.hxx>
 #include <dociter.hxx>
-#include <mtvcellfunc.hxx>
+#include <mtvfunctions.hxx>
 #include <scmatrix.hxx>
 
 #include <arraysumfunctor.hxx>

sc/source/core/tool/interpr7.cxx

@@ -18,10 +18,6 @@
 #include <sfx2/linkmgr.hxx>
 #include <tools/urlobj.hxx>
 
-#include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
-#include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-
 #include <officecfg/Office/Common.hxx>
 #include <libxml/xpath.h>
 #include <datastreamgettime.hxx>

sc/source/core/tool/interpr8.cxx

@@ -9,14 +9,12 @@
  */
 
 #include <interpre.hxx>
-#include <global.hxx>
-#include <dociter.hxx>
+#include <cellvalue.hxx>
 #include <scmatrix.hxx>
 #include <comphelper/random.hxx>
 #include <formula/token.hxx>
 #include <sal/log.hxx>
 
-#include <stack>
 #include <cmath>
 #include <memory>
 #include <vector>

sc/source/core/tool/jumpmatrix.cxx

@@ -19,7 +19,6 @@
 
 #include <jumpmatrix.hxx>
 #include <scmatrix.hxx>
-#include <tools/solar.h>
 #include <osl/diagnose.h>
 
 namespace {

sc/source/core/tool/matrixoperators.cxx

@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <functional>
 #include <matrixoperators.hxx>
 
 

sc/source/core/tool/numformat.cxx

@@ -19,13 +19,11 @@
 
 #include <numformat.hxx>
 #include <patattr.hxx>
-#include <scitems.hxx>
 #include <document.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
-#include <svl/intitem.hxx>
 #include <svl/languageoptions.hxx>
 
 namespace sc {

sc/source/core/tool/optutil.cxx

@@ -17,11 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/svapp.hxx>
 #include <optutil.hxx>
 #include <global.hxx>
 #include <unotools/configmgr.hxx>
-#include <unotools/syslocale.hxx>
 #include <unotools/localedatawrapper.hxx>
 
 bool ScOptionsUtil::IsMetricSystem()

sc/source/core/tool/parclass.cxx

@@ -18,14 +18,12 @@
  */
 
 #include <parclass.hxx>
-#include <token.hxx>
 #include <global.hxx>
 #include <callform.hxx>
 #include <addincol.hxx>
-#include <funcdesc.hxx>
+#include <formula/token.hxx>
 #include <unotools/charclass.hxx>
 #include <osl/diagnose.h>
-#include <sal/macros.h>
 #include <sal/log.hxx>
 #include <string.h>
 

sc/source/core/tool/prnsave.cxx

@@ -18,7 +18,6 @@
  */
 
 #include <prnsave.hxx>
-#include <global.hxx>
 #include <address.hxx>
 
 #include <osl/diagnose.h>

sc/source/core/tool/progress.cxx

@@ -31,7 +31,6 @@
 #define SC_PROGRESS_CXX
 #include <progress.hxx>
 #include <document.hxx>
-#include <global.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
 

sc/source/core/tool/rangelst.cxx

@@ -19,13 +19,11 @@
 
 #include <stdlib.h>
 #include <unotools/collatorwrapper.hxx>
-#include <osl/diagnose.h>
 #include <sal/log.hxx>
 
 #include <rangelst.hxx>
 #include <document.hxx>
 #include <refupdat.hxx>
-#include <rechead.hxx>
 #include <compiler.hxx>
 #include <algorithm>
 #include <memory>

sc/source/core/tool/rangenam.cxx

@@ -20,7 +20,6 @@
 #include <string.h>
 #include <memory>
 #include <unotools/collatorwrapper.hxx>
-#include <unotools/transliterationwrapper.hxx>
 #include <unotools/charclass.hxx>
 #include <com/sun/star/sheet/NamedRangeFlag.hpp>
 #include <osl/diagnose.h>
@@ -30,8 +29,6 @@
 #include <rangenam.hxx>
 #include <global.hxx>
 #include <compiler.hxx>
-#include <rangeutl.hxx>
-#include <rechead.hxx>
 #include <refupdat.hxx>
 #include <document.hxx>
 #include <refupdatecontext.hxx>

sc/source/core/tool/refupdat.cxx

@@ -19,9 +19,8 @@
 
 #include <refupdat.hxx>
 #include <document.hxx>
-#include <compiler.hxx>
 #include <bigrange.hxx>
-#include <chgtrack.hxx>
+#include <refdata.hxx>
 
 #include <osl/diagnose.h>
 

sc/source/core/tool/scmatrix.cxx

@@ -17,12 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <arraysumfunctor.hxx>
 #include <scmatrix.hxx>
 #include <global.hxx>
 #include <address.hxx>
 #include <formula/errorcodes.hxx>
-#include <formula/vectortoken.hxx>
 #include <interpre.hxx>
 #include <mtvelements.hxx>
 #include <compare.hxx>
@@ -31,20 +29,16 @@
 
 #include <svl/zforlist.hxx>
 #include <svl/sharedstring.hxx>
-#include <tools/stream.hxx>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 
-#include <math.h>
-
 #include <memory>
 #include <vector>
 #include <limits>
 
 #include <mdds/multi_type_matrix.hpp>
 #include <mdds/multi_type_vector_types.hpp>
-#include <mdds/multi_type_vector_trait.hpp>
 
 #if DEBUG_MATRIX
 #include <iostream>

sc/source/core/tool/scopetools.cxx

@@ -10,7 +10,6 @@
 #include <scopetools.hxx>
 #include <document.hxx>
 #include <column.hxx>
-#include <vcl/window.hxx>
 
 namespace sc {
 

sc/source/core/tool/stringutil.cxx

@@ -18,7 +18,6 @@
  */
 
 #include <stringutil.hxx>
-#include <global.hxx>
 #include <svl/zforlist.hxx>
 
 #include <rtl/ustrbuf.hxx>

sc/source/core/tool/stylehelper.cxx

@@ -21,7 +21,6 @@
 #include <osl/diagnose.h>
 
 #include <stylehelper.hxx>
-#include <global.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
 

sc/source/core/tool/subtotal.cxx

@@ -18,7 +18,7 @@
  */
 
 #include <subtotal.hxx>
-#include <interpre.hxx>
+#include <sal/mathconf.h>
 #include <cfloat>
 
 bool SubTotal::SafePlus(double& fVal1, double fVal2)

sc/source/core/tool/token.cxx

@@ -17,15 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cstddef>
-#include <cstdio>
 #include <functional>
 
 #include <string.h>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
-#include <sfx2/docfile.hxx>
-#include <officecfg/Office/Calc.hxx>
 
 #include <token.hxx>
 #include <tokenarray.hxx>
@@ -35,11 +31,7 @@
 #include <interpre.hxx>
 #include <formula/FormulaCompiler.hxx>
 #include <formula/compiler.hxx>
-#include <formula/grammar.hxx>
 #include <formula/opcode.hxx>
-#include <formulagroup.hxx>
-#include <rechead.hxx>
-#include <parclass.hxx>
 #include <jumpmatrix.hxx>
 #include <rangeseq.hxx>
 #include <externalrefmgr.hxx>

sc/source/core/tool/unitconv.cxx

@@ -21,7 +21,7 @@
 
 #include <unitconv.hxx>
 #include <global.hxx>
-#include <viewopti.hxx>
+#include <optutil.hxx>
 
 using namespace utl;
 using namespace com::sun::star::uno;

sc/source/core/tool/userlist.cxx

@@ -23,8 +23,8 @@
 #include <global.hxx>
 #include <userlist.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <unotools/calendarwrapper.hxx>
 #include <unotools/transliterationwrapper.hxx>
+#include <com/sun/star/i18n/Calendar2.hpp>
 
 #include <algorithm>
 

sc/source/core/tool/viewopti.cxx

@@ -17,17 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/svapp.hxx>
 #include <osl/diagnose.h>
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <global.hxx>
-#include <globstr.hrc>
-#include <scresid.hxx>
 #include <viewopti.hxx>
-#include <rechead.hxx>
 #include <sc.hrc>
 #include <miscuno.hxx>