From 0aff4d06e706fde2543fc0926f2e48e0c2139700 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemeng@ubuntu.com>
Date: Sun, 9 Dec 2018 03:35:37 +0100
Subject: tdf#42949 Fix IWYU warnings in sc/source/filter/excel/*cxx

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

Change-Id: Ia155032426e02eb9ee64db3fb10946f5c9d445b7
Reviewed-on: https://gerrit.libreoffice.org/64832
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 sc/IwyuFilter_sc.yaml                 | 33 +++++++++++++++++++++++++
 sc/inc/scitems.hxx                    | 23 ++++++++++++++++++
 sc/source/filter/excel/colrowst.cxx   |  5 ----
 sc/source/filter/excel/excdoc.cxx     | 31 +----------------------
 sc/source/filter/excel/excel.cxx      | 11 +--------
 sc/source/filter/excel/excform.cxx    |  3 ---
 sc/source/filter/excel/excform8.cxx   |  3 ---
 sc/source/filter/excel/excimp8.cxx    | 46 -----------------------------------
 sc/source/filter/excel/excrecds.cxx   | 40 ------------------------------
 sc/source/filter/excel/exctools.cxx   | 17 +------------
 sc/source/filter/excel/expop2.cxx     | 11 ++-------
 sc/source/filter/excel/fontbuff.cxx   | 12 +--------
 sc/source/filter/excel/impop.cxx      | 27 +-------------------
 sc/source/filter/excel/namebuff.cxx   |  5 +---
 sc/source/filter/excel/read.cxx       |  2 --
 sc/source/filter/excel/tokstack.cxx   |  2 --
 sc/source/filter/excel/xechart.cxx    |  3 ---
 sc/source/filter/excel/xecontent.cxx  |  2 --
 sc/source/filter/excel/xedbdata.cxx   |  1 -
 sc/source/filter/excel/xeescher.cxx   | 16 ------------
 sc/source/filter/excel/xeextlst.cxx   |  5 ----
 sc/source/filter/excel/xeformula.cxx  |  3 ---
 sc/source/filter/excel/xehelper.cxx   |  1 -
 sc/source/filter/excel/xelink.cxx     |  1 -
 sc/source/filter/excel/xename.cxx     |  5 ----
 sc/source/filter/excel/xepage.cxx     |  1 -
 sc/source/filter/excel/xepivot.cxx    |  5 +---
 sc/source/filter/excel/xepivotxml.cxx |  1 -
 sc/source/filter/excel/xeroot.cxx     |  5 ----
 sc/source/filter/excel/xestream.cxx   |  8 ++----
 sc/source/filter/excel/xestyle.cxx    | 10 --------
 sc/source/filter/excel/xetable.cxx    |  1 -
 sc/source/filter/excel/xichart.cxx    |  3 ---
 sc/source/filter/excel/xicontent.cxx  | 11 +--------
 sc/source/filter/excel/xiescher.cxx   | 18 +++++++-------
 sc/source/filter/excel/xihelper.cxx   |  2 --
 sc/source/filter/excel/xilink.cxx     |  2 --
 sc/source/filter/excel/xipivot.cxx    |  2 --
 sc/source/filter/excel/xiroot.cxx     |  1 -
 sc/source/filter/excel/xistyle.cxx    |  3 ---
 sc/source/filter/excel/xlchart.cxx    |  4 ---
 sc/source/filter/excel/xlescher.cxx   |  2 --
 sc/source/filter/excel/xlformula.cxx  |  5 +---
 sc/source/filter/excel/xlpage.cxx     |  5 ----
 sc/source/filter/excel/xlpivot.cxx    |  1 -
 sc/source/filter/excel/xlroot.cxx     |  2 --
 sc/source/filter/excel/xltoolbar.cxx  |  8 ------
 sc/source/filter/excel/xltools.cxx    | 10 +++-----
 sc/source/filter/excel/xlview.cxx     |  1 -
 49 files changed, 81 insertions(+), 338 deletions(-)

(limited to 'sc')

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 44f20377fe97..59f5f1677751 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -392,9 +392,19 @@ blacklist:
     sc/source/filter/inc/xerecord.hxx:
     # Needed for member access
     - xestream.hxx
+    sc/source/filter/inc/xetable.hxx:
+    # Needed for typedef
+    - class XclExpNote
+    sc/source/filter/inc/xilink.hxx:
+    # Needed for typedef
+    - class XclImpCachedMatrix
+    - class ScTokenArray
     sc/source/filter/inc/xistream.hxx:
     # Needed for implicit dtor
     - com/sun/star/beans/NamedValue.hpp
+    sc/source/filter/inc/xlpage.hxx:
+    # Needed for typedef
+    - class SvxBrushItem
     sc/source/ui/inc/AccessibleContextBase.hxx:
     # base class has to be a complete type
     - com/sun/star/accessibility/XAccessibleComponent.hpp
@@ -649,3 +659,26 @@ blacklist:
     sc/source/filter/xml/xmldrani.hxx:
     # Complex type needs complete type
     - com/sun/star/beans/PropertyValue.hpp
+    sc/source/filter/excel/excimp8.cxx:
+    # base class has to be a complete type
+    - com/sun/star/container/XIndexContainer.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/xeescher.cxx:
+    # base class has to be a complete type
+    - com/sun/star/chart/XChartDocument.hpp
+    sc/source/filter/excel/xeroot.cxx:
+    # Complex type needs complete type
+    - com/sun/star/sheet/FormulaOpCodeMapEntry.hpp
+    sc/source/filter/excel/xicontent.cxx:
+    # Needed for implicit dtor
+    - editeng/editobj.hxx
+    sc/source/filter/excel/xiescher.cxx:
+    # Needed for implicit dtor
+    - editeng/editobj.hxx
+    - com/sun/star/form/XForm.hpp
+    sc/source/filter/excel/xistyle.cxx:
+    # Needed for direct member access
+    - xladdress.hxx
diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx
index d5871af119fe..bd78bda629d0 100644
--- a/sc/inc/scitems.hxx
+++ b/sc/inc/scitems.hxx
@@ -22,6 +22,29 @@
 
 #include <svl/typedwhich.hxx>
 
+class SfxBoolItem;
+class SvxCharReliefItem;
+class SvxColorItem;
+class SvxContourItem;
+class SvxCrossedOutItem;
+class SvxEmphasisMarkItem;
+class SvxFontHeightItem;
+class SvxFontItem;
+class SvxForbiddenRuleItem;
+class SvxFrameDirectionItem;
+class SvxHangingPunctuationItem;
+class SvxLanguageItem;
+class SvxLRSpaceItem;
+class SvxOverlineItem;
+class SvxPostureItem;
+class SvXMLAttrContainerItem;
+class SvxScriptSpaceItem;
+class SvxShadowedItem;
+class SvxULSpaceItem;
+class SvxUnderlineItem;
+class SvxWeightItem;
+class SvxWordLineModeItem;
+
 //  EditEngine is not allowed to define its own ITEMID's
 #define INCLUDED_EDITENG_EEITEMID_HXX
 
diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx
index ef967d1fd422..32a67bc4f0be 100644
--- a/sc/source/filter/excel/colrowst.cxx
+++ b/sc/source/filter/excel/colrowst.cxx
@@ -19,15 +19,10 @@
 
 #include <colrowst.hxx>
 
-#include <string.h>
-
 #include <document.hxx>
-#include <root.hxx>
 #include <ftools.hxx>
 #include <xltable.hxx>
-#include <xistream.hxx>
 #include <xistyle.hxx>
-#include <queryparam.hxx>
 #include <excimp8.hxx>
 #include <table.hxx>
 
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index ebe83426995e..5c0f4971eaab 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -17,49 +17,23 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <scitems.hxx>
-
-#include <svx/svdobj.hxx>
-#include <svx/svditer.hxx>
-#include <svx/svdpage.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/ulspitem.hxx>
-#include <svl/intitem.hxx>
-#include <svl/zformat.hxx>
-#include <sot/storage.hxx>
 #include <sfx2/objsh.hxx>
 #include <rtl/ustring.hxx>
 
-#include <formulacell.hxx>
-#include <dociter.hxx>
 #include <document.hxx>
-#include <dbdata.hxx>
-#include <global.hxx>
-#include <progress.hxx>
-#include <conditio.hxx>
-#include <dpobject.hxx>
-#include <attrib.hxx>
 #include <scextopt.hxx>
-#include <stlsheet.hxx>
-#include <stlpool.hxx>
-#include <olinetab.hxx>
-#include <unonames.hxx>
-#include <convuno.hxx>
-#include <patattr.hxx>
 #include <docoptio.hxx>
 #include <tabprotection.hxx>
 #include <postit.hxx>
+#include <root.hxx>
 
 #include <excdoc.hxx>
-#include <namebuff.hxx>
 #include <xeextlst.hxx>
 #include <biffhelper.hxx>
 
 #include <xcl97rec.hxx>
-#include <xcl97esc.hxx>
 #include <xetable.hxx>
 #include <xelink.hxx>
-#include <xename.hxx>
 #include <xepage.hxx>
 #include <xeview.hxx>
 #include <xecontent.hxx>
@@ -73,9 +47,6 @@
 #include <xllink.hxx>
 #include <xltools.hxx>
 
-#include <math.h>
-
-#include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <oox/token/tokens.hxx>
 #include <oox/token/namespaces.hxx>
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index c45bca6e26a8..8e63b8f4b3d0 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -18,31 +18,22 @@
  */
 
 #include <sfx2/docfile.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/frame.hxx>
-#include <sfx2/request.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sot/storage.hxx>
 #include <sot/exchange.hxx>
 #include <filter/msfilter/classids.hxx>
 #include <tools/globname.hxx>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/document/XFilter.hpp>
-#include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
-#include <scitems.hxx>
-#include <svl/stritem.hxx>
 #include <unotools/streamwrap.hxx>
 #include <filter.hxx>
 #include <document.hxx>
-#include <optuno.hxx>
 #include <xistream.hxx>
 #include <xltools.hxx>
+#include <docoptio.hxx>
 
 #include <docsh.hxx>
 #include <scerrors.hxx>
-#include <root.hxx>
 #include <imp_op.hxx>
 #include <excimp8.hxx>
 #include <exp_op.hxx>
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 9c20a8a7257b..3162e5efb3d0 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -21,8 +21,6 @@
 
 #include <formulacell.hxx>
 #include <document.hxx>
-#include <rangenam.hxx>
-#include <global.hxx>
 #include <scmatrix.hxx>
 
 #include <formula/errorcodes.hxx>
@@ -34,7 +32,6 @@
 #include <root.hxx>
 #include <xltracer.hxx>
 #include <xihelper.hxx>
-#include <xilink.hxx>
 #include <xiname.hxx>
 #include <xistyle.hxx>
 #include <documentimport.hxx>
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx
index e3eda3cfd5de..6c12e98cc618 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -19,9 +19,7 @@
 
 #include <excform.hxx>
 
-#include <formulacell.hxx>
 #include <document.hxx>
-#include <rangenam.hxx>
 #include <xltracer.hxx>
 #include <xistream.hxx>
 #include <xihelper.hxx>
@@ -30,7 +28,6 @@
 
 #include <externalrefmgr.hxx>
 
-#include <vector>
 #include <cstring>
 
 using ::std::vector;
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 89250fa68ed2..015a06a1eb39 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -26,84 +26,38 @@
 #include <comphelper/sequence.hxx>
 #include <unotools/fltrcfg.hxx>
 
-#include <vcl/wmf.hxx>
-
-#include <editeng/eeitem.hxx>
-
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/docinf.hxx>
-#include <sfx2/frame.hxx>
-
-#include <editeng/brushitem.hxx>
-#include <editeng/editdata.hxx>
-#include <editeng/editeng.hxx>
-#include <editeng/editobj.hxx>
-#include <editeng/editstat.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/udlnitem.hxx>
-#include <editeng/wghtitem.hxx>
-#include <editeng/postitem.hxx>
-#include <editeng/crossedoutitem.hxx>
-#include <editeng/flditem.hxx>
-#include <svx/xflclit.hxx>
-
-#include <vcl/graph.hxx>
-#include <vcl/bitmapaccess.hxx>
-#include <sot/exchange.hxx>
 #include <sot/storage.hxx>
-
-#include <svl/stritem.hxx>
 #include <svl/sharedstringpool.hxx>
 
 #include <rtl/math.hxx>
 #include <rtl/ustring.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <unotools/charclass.hxx>
-#include <drwlayer.hxx>
 
-#include <formulacell.hxx>
 #include <document.hxx>
-#include <patattr.hxx>
-#include <docpool.hxx>
 #include <attrib.hxx>
-#include <conditio.hxx>
 #include <dbdata.hxx>
 #include <globalnames.hxx>
-#include <editutil.hxx>
-#include <markdata.hxx>
-#include <rangenam.hxx>
 #include <docoptio.hxx>
-#include <fprogressbar.hxx>
-#include <xltracer.hxx>
 #include <xihelper.hxx>
-#include <xipage.hxx>
 #include <xicontent.hxx>
 #include <xilink.hxx>
 #include <xiescher.hxx>
-#include <xipivot.hxx>
 #include <xistyle.hxx>
 #include <excdefs.hxx>
 
 #include <excform.hxx>
-#include <scextopt.hxx>
-#include <stlpool.hxx>
-#include <stlsheet.hxx>
-#include <detfunc.hxx>
-#include <macromgr.hxx>
 #include <queryentry.hxx>
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
-#include <cppuhelper/component_context.hxx>
 #include <cppuhelper/implbase.hxx>
 #include "xltoolbar.hxx"
 #include <oox/ole/vbaproject.hxx>
 #include <oox/ole/olestorage.hxx>
-#include <unotools/streamwrap.hxx>
 #include <o3tl/make_unique.hxx>
 
 using namespace com::sun::star;
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index d8dd91cbb78c..093cfeb254e3 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -22,63 +22,23 @@
 #include <map>
 #include <filter/msfilter/countryid.hxx>
 
-#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
-
-#include <sfx2/objsh.hxx>
-
-#include <editeng/editdata.hxx>
-#include <editeng/editeng.hxx>
-#include <editeng/editobj.hxx>
-#include <editeng/editstat.hxx>
-
-#include <editeng/flditem.hxx>
-#include <editeng/flstitem.hxx>
-
-#include <svx/algitem.hxx>
-#include <editeng/boxitem.hxx>
-#include <editeng/brushitem.hxx>
-#include <svx/pageitem.hxx>
-#include <editeng/paperinf.hxx>
-#include <editeng/sizeitem.hxx>
-#include <editeng/ulspitem.hxx>
-#include <editeng/fhgtitem.hxx>
-#include <editeng/escapementitem.hxx>
-#include <svl/intitem.hxx>
 #include <svl/zforlist.hxx>
-#include <svl/zformat.hxx>
-#include <svtools/ctrltool.hxx>
 #include <sal/log.hxx>
 
 #include <string.h>
 
 #include <global.hxx>
-#include <docpool.hxx>
-#include <patattr.hxx>
-#include <formulacell.hxx>
 #include <document.hxx>
-#include <scextopt.hxx>
-#include <attrib.hxx>
-#include <progress.hxx>
-#include <dociter.hxx>
-#include <rangenam.hxx>
 #include <dbdata.hxx>
-#include <stlsheet.hxx>
-#include <stlpool.hxx>
-#include <editutil.hxx>
-#include <formula/errorcodes.hxx>
 #include <oox/export/utils.hxx>
 #include <oox/token/tokens.hxx>
 #include <queryentry.hxx>
 #include <queryparam.hxx>
 #include <root.hxx>
 
-#include <excdoc.hxx>
 #include <xeescher.hxx>
-#include <xeformula.hxx>
 #include <xelink.hxx>
 #include <xename.hxx>
-#include <xecontent.hxx>
 #include <xlname.hxx>
 
 #include <xcl97rec.hxx>
diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx
index f35d32b710a1..445a1ff7578c 100644
--- a/sc/source/filter/excel/exctools.cxx
+++ b/sc/source/filter/excel/exctools.cxx
@@ -17,33 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
-
-#include <editeng/editdata.hxx>
-#include <editeng/editeng.hxx>
-#include <editeng/editobj.hxx>
-#include <editeng/editstat.hxx>
-
+#include <osl/diagnose.h>
 #include <document.hxx>
-#include <patattr.hxx>
 #include <attrib.hxx>
 #include <scextopt.hxx>
-#include <progress.hxx>
-#include <rangenam.hxx>
-#include <editutil.hxx>
 #include <olinetab.hxx>
 
-#include <excrecds.hxx>
 #include <root.hxx>
-#include <imp_op.hxx>
 #include <excimp8.hxx>
 #include <namebuff.hxx>
 #include <otlnbuff.hxx>
-#include <xcl97rec.hxx>
 #include <formel.hxx>
 #include <xilink.hxx>
-#include <xecontent.hxx>
 
 #include <memory>
 #include <vector>
diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx
index cb677d18c7fb..f5271cefa7e3 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -27,26 +27,19 @@
 #include <oox/ole/vbaexport.hxx>
 
 #include <scerrors.hxx>
-#include <scextopt.hxx>
 
 #include <root.hxx>
 #include <excdoc.hxx>
 #include <exp_op.hxx>
 
-#include <xcl97esc.hxx>
-
-#include <document.hxx>
-#include <rangenam.hxx>
-#include <filtopt.hxx>
-#include <xltools.hxx>
-#include <xelink.hxx>
 #include <xehelper.hxx>
 
 #include <officecfg/Office/Calc.hxx>
 
-#include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 
+namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; } } } }
+
 namespace {
 
 enum class VBAExportMode
diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx
index 180bab493d90..05acfdcfdad0 100644
--- a/sc/source/filter/excel/fontbuff.cxx
+++ b/sc/source/filter/excel/fontbuff.cxx
@@ -20,24 +20,14 @@
 #include <lotfntbf.hxx>
 
 #include <scitems.hxx>
-#include <editeng/contouritem.hxx>
-#include <editeng/crossedoutitem.hxx>
-#include <editeng/eeitem.hxx>
 #include <editeng/postitem.hxx>
-#include <editeng/shdditem.hxx>
-#include <editeng/escapementitem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <osl/diagnose.h>
-#include <sfx2/printer.hxx>
 #include <o3tl/make_unique.hxx>
+#include <svl/itemset.hxx>
 
-#include <attrib.hxx>
-#include <document.hxx>
 #include <global.hxx>
-#include <docpool.hxx>
-#include <patattr.hxx>
-#include <ftools.hxx>
 
 void LotusFontBuffer::Fill( const sal_uInt8 nIndex, SfxItemSet& rItemSet )
 {
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index c1def39c146d..854b503cee64 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -23,17 +23,8 @@
 #include <filter/msfilter/countryid.hxx>
 
 #include <scitems.hxx>
-#include <editeng/eeitem.hxx>
-
-#include <editeng/editdata.hxx>
-#include <editeng/editeng.hxx>
-#include <editeng/editobj.hxx>
-#include <editeng/editstat.hxx>
-#include <editeng/flditem.hxx>
-#include <editeng/colritem.hxx>
-#include <sfx2/printer.hxx>
+
 #include <sfx2/docfile.hxx>
-#include <svx/pageitem.hxx>
 #include <svx/svxids.hrc>
 #include <svl/zforlist.hxx>
 #include <unotools/configmgr.hxx>
@@ -45,52 +36,36 @@
 
 #include <formulacell.hxx>
 #include <document.hxx>
-#include <rangenam.hxx>
-#include <compiler.hxx>
-#include <patattr.hxx>
-#include <attrib.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
 #include <global.hxx>
-#include <markdata.hxx>
 #include <olinetab.hxx>
-#include <stlsheet.hxx>
 #include <stlpool.hxx>
 #include <viewopti.hxx>
 #include <docoptio.hxx>
 #include <scextopt.hxx>
-#include <editutil.hxx>
-#include <filtopt.hxx>
-#include <scerrors.hxx>
 #include <unonames.hxx>
 #include <paramisc.hxx>
-#include <postit.hxx>
 #include <colrowst.hxx>
 #include <otlnbuff.hxx>
 #include <xistyle.hxx>
 
-#include <fapihelper.hxx>
 #include <namebuff.hxx>
 #include <xltools.hxx>
 #include <xltable.hxx>
-#include <xlview.hxx>
 #include <xltracer.hxx>
 #include <xihelper.hxx>
 #include <xipage.hxx>
 #include <xiview.hxx>
-#include <xilink.hxx>
 #include <xiescher.hxx>
 #include <xicontent.hxx>
 
-#include <excimp8.hxx>
 #include <excform.hxx>
 #include <documentimport.hxx>
 #include <o3tl/make_unique.hxx>
 
 #if defined(_WIN32)
 #include <math.h>
-#else
-#include <stdlib.h>
 #endif
 
 using namespace ::com::sun::star;
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index b28b806a89b1..5b3157a6dffe 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -20,15 +20,12 @@
 #include <namebuff.hxx>
 
 #include <document.hxx>
-#include <compiler.hxx>
 #include <scextopt.hxx>
+#include <tokenarray.hxx>
 
 #include <root.hxx>
-#include <tokstack.hxx>
-#include <xltools.hxx>
 #include <xiroot.hxx>
 
-#include <string.h>
 #include <osl/diagnose.h>
 
 sal_uInt32 StringHashEntry::MakeHashCode( const OUString& r )
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index eaadc90acec2..c718b211af7a 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <stdlib.h>
-
 #include <document.hxx>
 #include <scerrors.hxx>
 #include <fprogressbar.hxx>
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index 730c26a77569..a2991daf4692 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -18,8 +18,6 @@
  */
 
 #include <tokstack.hxx>
-#include <compiler.hxx>
-#include <global.hxx>
 #include <scmatrix.hxx>
 
 #include <svl/sharedstringpool.hxx>
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 7a1bf06e0ac4..83e5279e7a80 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -60,11 +60,8 @@
 #include <filter/msfilter/escherex.hxx>
 
 #include <document.hxx>
-#include <rangelst.hxx>
-#include <rangeutl.hxx>
 #include <compiler.hxx>
 #include <tokenarray.hxx>
-#include <token.hxx>
 #include <xeescher.hxx>
 #include <xeformula.hxx>
 #include <xehelper.hxx>
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 7d8341f5b3f8..266461d4426d 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -27,10 +27,8 @@
 #include <com/sun/star/sheet/TableValidationVisibility.hpp>
 #include <sfx2/objsh.hxx>
 #include <tools/urlobj.hxx>
-#include <svl/itemset.hxx>
 #include <formula/grammar.hxx>
 #include <scitems.hxx>
-#include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 #include <document.hxx>
 #include <validat.hxx>
diff --git a/sc/source/filter/excel/xedbdata.cxx b/sc/source/filter/excel/xedbdata.cxx
index 30b8bfaaa75d..576476e89e80 100644
--- a/sc/source/filter/excel/xedbdata.cxx
+++ b/sc/source/filter/excel/xedbdata.cxx
@@ -9,7 +9,6 @@
 
 #include <xedbdata.hxx>
 #include <excrecds.hxx>
-#include <xltools.hxx>
 #include <dbdata.hxx>
 #include <document.hxx>
 #include <oox/export/utils.hxx>
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 111820021319..22bb03c83c0b 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -27,25 +27,19 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/form/binding/XBindableValue.hpp>
 #include <com/sun/star/form/binding/XListEntrySink.hpp>
-#include <com/sun/star/script/ScriptEventDescriptor.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/chart/XChartDocument.hpp>
 
 #include <set>
-#include <rtl/ustrbuf.h>
 #include <vcl/bitmapaccess.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdocapt.hxx>
 #include <editeng/outlobj.hxx>
-#include <editeng/editobj.hxx>
 #include <o3tl/make_unique.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <svtools/embedhlp.hxx>
 
-#include <editutil.hxx>
 #include <unonames.hxx>
 #include <convuno.hxx>
 #include <postit.hxx>
@@ -64,18 +58,9 @@
 #include <drwlayer.hxx>
 #include <svl/itemset.hxx>
 #include <svx/unoapi.hxx>
-#include <svx/algitem.hxx>
-#include <scitems.hxx>
-#include <editeng/justifyitem.hxx>
 #include <svx/sdtaitm.hxx>
-#include <attrib.hxx>
 #include <document.hxx>
-#include <svx/svdattr.hxx>
-#include <svx/sdr/properties/properties.hxx>
-#include <detfunc.hxx>
 #include <svx/xflclit.hxx>
-#include <svx/xlnstwit.hxx>
-#include <svx/xlnstit.hxx>
 
 #include <oox/token/tokens.hxx>
 #include <oox/token/relationship.hxx>
@@ -100,7 +85,6 @@ using ::com::sun::star::form::binding::XListEntrySink;
 using ::com::sun::star::script::ScriptEventDescriptor;
 using ::com::sun::star::table::CellAddress;
 using ::com::sun::star::table::CellRangeAddress;
-using ::com::sun::star::chart2::XChartDocument;
 using ::oox::drawingml::DrawingML;
 using ::oox::drawingml::ChartExport;
 using namespace oox;
diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx
index f2c61bd158da..840aa99d5a85 100644
--- a/sc/source/filter/excel/xeextlst.cxx
+++ b/sc/source/filter/excel/xeextlst.cxx
@@ -9,11 +9,6 @@
 
 #include <xeextlst.hxx>
 #include <xeroot.hxx>
-#include <xehelper.hxx>
-#include <xestyle.hxx>
-#include <xename.hxx>
-#include <xecontent.hxx>
-#include <tokenarray.hxx>
 
 #include <oox/export/utils.hxx>
 #include <oox/token/namespaces.hxx>
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index a94d23f370d7..3477419f5b59 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -17,21 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <list>
 #include <map>
 #include <addincol.hxx>
 #include <compiler.hxx>
 #include <document.hxx>
 #include <externalrefmgr.hxx>
 #include <rangelst.hxx>
-#include <token.hxx>
 #include <tokenarray.hxx>
 #include <scmatrix.hxx>
 #include <xeformula.hxx>
 #include <xehelper.hxx>
 #include <xelink.hxx>
 #include <xename.hxx>
-#include <xestream.hxx>
 #include <xestring.hxx>
 #include <xllink.hxx>
 #include <xltools.hxx>
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 5f5a96caf601..c6475572f477 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -38,7 +38,6 @@
 
 #include <document.hxx>
 #include <docpool.hxx>
-#include <formulacell.hxx>
 #include <editutil.hxx>
 #include <patattr.hxx>
 #include <scmatrix.hxx>
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index c530980aa2df..5084288d7980 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -27,7 +27,6 @@
 #include <svl/zforlist.hxx>
 #include <sal/log.hxx>
 #include <document.hxx>
-#include <formulacell.hxx>
 #include <scextopt.hxx>
 #include <externalrefmgr.hxx>
 #include <tokenarray.hxx>
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index 68675bb77896..167ffd227856 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -24,10 +24,8 @@
 #include <document.hxx>
 #include <rangenam.hxx>
 #include <tokenarray.hxx>
-#include <dbdata.hxx>
 #include <xehelper.hxx>
 #include <xelink.hxx>
-#include <globalnames.hxx>
 #include <excrecds.hxx>
 #include <xlname.hxx>
 #include <xeformula.hxx>
@@ -107,9 +105,6 @@ private:
     sal_uInt16          mnXclTab;       /// The 1-based Excel sheet index for local names.
 };
 
-class ScRangeData;
-class ScDBData;
-
 /** Implementation class of the name manager. */
 class XclExpNameManagerImpl : protected XclExpRoot
 {
diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx
index 23593040291d..7b2d0ded5d86 100644
--- a/sc/source/filter/excel/xepage.cxx
+++ b/sc/source/filter/excel/xepage.cxx
@@ -32,7 +32,6 @@
 #include <sax/fastattribs.hxx>
 #include <document.hxx>
 #include <stlpool.hxx>
-#include <stlsheet.hxx>
 #include <attrib.hxx>
 #include <xehelper.hxx>
 #include <xeescher.hxx>
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index 8d90a7840d67..7fd6d2034b2d 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -30,9 +30,7 @@
 #include <algorithm>
 #include <math.h>
 
-#include <rtl/math.hxx>
-#include <tools/date.hxx>
-#include <svl/zformat.hxx>
+#include <osl/diagnose.h>
 #include <sot/storage.hxx>
 #include <document.hxx>
 #include <dpcache.hxx>
@@ -43,7 +41,6 @@
 #include <dpshttab.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
-#include <fapihelper.hxx>
 #include <xestring.hxx>
 #include <xelink.hxx>
 #include <dputil.hxx>
diff --git a/sc/source/filter/excel/xepivotxml.cxx b/sc/source/filter/excel/xepivotxml.cxx
index 271b4cb8fdf4..b15e71c36f77 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
 #include <com/sun/star/sheet/DataPilotFieldLayoutMode.hpp>
 #include <com/sun/star/sheet/DataPilotOutputRangeType.hpp>
-#include <com/sun/star/sheet/GeneralFunction.hpp>
 
 #include <o3tl/make_unique.hxx>
 
diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx
index 086ee95c5bdb..5b0e65d27dee 100644
--- a/sc/source/filter/excel/xeroot.cxx
+++ b/sc/source/filter/excel/xeroot.cxx
@@ -20,16 +20,12 @@
 #include <rtl/random.h>
 #include <sal/log.hxx>
 #include <sfx2/docfile.hxx>
-#include <sfx2/request.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <unotools/saveopt.hxx>
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
-#include <svl/intitem.hxx>
-#include <svl/eitem.hxx>
 #include <xecontent.hxx>
-#include <xltracer.hxx>
 #include <xeescher.hxx>
 #include <xeformula.hxx>
 #include <xehelper.hxx>
@@ -47,7 +43,6 @@
 #include <excrecds.hxx>
 #include <tabprotection.hxx>
 #include <document.hxx>
-#include <scextopt.hxx>
 
 #include <formulabase.hxx>
 #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp>
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 3a3cc34c2bcb..45178df49279 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -29,6 +29,7 @@
 #include <sax/fshelper.hxx>
 #include <unotools/streamwrap.hxx>
 #include <sot/storage.hxx>
+#include <tools/urlobj.hxx>
 
 #include <docuno.hxx>
 #include <xestream.hxx>
@@ -36,7 +37,6 @@
 #include <xlstring.hxx>
 #include <xltools.hxx>
 #include <xeroot.hxx>
-#include <xestyle.hxx>
 #include <xcl97rec.hxx>
 #include <rangelst.hxx>
 #include <compiler.hxx>
@@ -54,15 +54,11 @@
 
 #include <oox/token/tokens.hxx>
 #include <oox/token/relationship.hxx>
+#include <oox/export/utils.hxx>
 #include <formula/grammar.hxx>
-#include <oox/export/drawingml.hxx>
 #include <oox/ole/vbaexport.hxx>
 #include <excelvbaproject.hxx>
 
-#include <sfx2/docfile.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/app.hxx>
-
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <memory>
 #include <comphelper/storagehelper.hxx>
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 0f8916e23394..68a26c5dca4a 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -20,29 +20,19 @@
 #include <memory>
 #include <xestyle.hxx>
 
-#include <iostream>
 #include <algorithm>
 #include <iterator>
-#include <set>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <comphelper/processfactory.hxx>
 #include <rtl/tencinfo.h>
 #include <vcl/font.hxx>
-#include <svl/zformat.hxx>
-#include <svl/itempool.hxx>
 #include <svl/languageoptions.hxx>
-#include <sfx2/printer.hxx>
 #include <scitems.hxx>
-#include <svx/algitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/lineitem.hxx>
-#include <svx/rotmodit.hxx>
-#include <editeng/colritem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/fontitem.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/escapementitem.hxx>
 #include <editeng/justifyitem.hxx>
 #include <editeng/langitem.hxx>
 #include <document.hxx>
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index f3f34a141641..033544d6ff10 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -38,7 +38,6 @@
 #include <xltools.hxx>
 #include <tokenarray.hxx>
 #include <formula/errorcodes.hxx>
-#include <thread>
 #include <comphelper/threadpool.hxx>
 #include <oox/token/tokens.hxx>
 #include <oox/export/utils.hxx>
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index b8d32f81a4d7..513e78064a18 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -85,13 +85,10 @@
 
 #include <document.hxx>
 #include <drwlayer.hxx>
-#include <rangeutl.hxx>
 #include <tokenarray.hxx>
-#include <token.hxx>
 #include <compiler.hxx>
 #include <reftokenhelper.hxx>
 #include <chartlis.hxx>
-#include <fprogressbar.hxx>
 #include <xltracer.hxx>
 #include <xltools.hxx>
 #include <xistream.hxx>
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 4f3f45fafc22..02b1dd17867f 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -22,8 +22,6 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <tools/urlobj.hxx>
-#include <editeng/editeng.hxx>
-#include <editeng/editobj.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <svl/itemset.hxx>
 #include <scitems.hxx>
@@ -31,26 +29,19 @@
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
 #include <editeng/flditem.hxx>
-#include <editeng/fhgtitem.hxx>
-#include <editeng/wghtitem.hxx>
-#include <editeng/udlnitem.hxx>
-#include <editeng/postitem.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/crossedoutitem.hxx>
+#include <editeng/editobj.hxx>
 #include <unotools/charclass.hxx>
 #include <stringutil.hxx>
 #include <cellform.hxx>
 #include <cellvalue.hxx>
 #include <document.hxx>
 #include <editutil.hxx>
-#include <formulacell.hxx>
 #include <validat.hxx>
 #include <patattr.hxx>
 #include <docpool.hxx>
 #include <rangenam.hxx>
 #include <arealink.hxx>
 #include <stlsheet.hxx>
-#include <scextopt.hxx>
 #include <xlcontent.hxx>
 #include <xlformula.hxx>
 #include <xltracer.hxx>
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 179af25f84b1..247f074b3c0f 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/awt/PushButtonType.hpp>
 #include <com/sun/star/awt/ScrollBarOrientation.hpp>
 #include <com/sun/star/awt/VisualEffect.hpp>
-#include <com/sun/star/style/HorizontalAlignment.hpp>
 #include <com/sun/star/style/VerticalAlignment.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/form/XForm.hpp>
@@ -59,24 +58,27 @@
 #include <svx/svdoashp.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
-#include <svx/svdocapt.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/svdpage.hxx>
 #include <editeng/editobj.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/outlobj.hxx>
-#include <svx/unoapi.hxx>
 #include <svx/svditer.hxx>
 #include <editeng/writingmodeitem.hxx>
-#include <svx/charthelper.hxx>
+#include <svx/xlnclit.hxx>
+#include <svx/xlndsit.hxx>
+#include <svx/xlnedcit.hxx>
+#include <svx/xlnedit.hxx>
+#include <svx/xlnedwit.hxx>
+#include <svx/xlnstcit.hxx>
+#include <svx/xlnstit.hxx>
+#include <svx/xlnstwit.hxx>
+#include <svx/xlnwtit.hxx>
 
-#include <scitems.hxx>
 #include <editeng/eeitem.hxx>
-#include <editeng/colritem.hxx>
 #include <svx/xflclit.hxx>
 #include <sal/macros.h>
 #include <editeng/adjustitem.hxx>
-#include <svx/xlineit.hxx>
 #include <svx/xlinjoit.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xbtmpit.hxx>
@@ -87,8 +89,6 @@
 #include <document.hxx>
 #include <drwlayer.hxx>
 #include <userdat.hxx>
-#include <chartarr.hxx>
-#include <detfunc.hxx>
 #include <unonames.hxx>
 #include <convuno.hxx>
 #include <postit.hxx>
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index 2382dc5cfec8..45894e26a7f4 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -23,7 +23,6 @@
 #include <svl/sharedstringpool.hxx>
 #include <editeng/editobj.hxx>
 #include <tools/urlobj.hxx>
-#include <scitems.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 #include <document.hxx>
@@ -35,7 +34,6 @@
 #include <xistring.hxx>
 #include <xistyle.hxx>
 #include <excform.hxx>
-#include <stringutil.hxx>
 #include <scmatrix.hxx>
 #include <documentimport.hxx>
 #include <o3tl/make_unique.hxx>
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index 23757998a0f9..d1b353f39795 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -19,9 +19,7 @@
 
 #include <xilink.hxx>
 #include <document.hxx>
-#include <formulacell.hxx>
 #include <scextopt.hxx>
-#include <tablink.hxx>
 #include <xistream.hxx>
 #include <xihelper.hxx>
 #include <xiname.hxx>
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index 2d84290e4288..1df8ca751fdf 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/sheet/DataPilotFieldReferenceItemType.hpp>
 
 #include <tools/datetime.hxx>
-#include <svl/zformat.hxx>
 #include <svl/intitem.hxx>
 #include <sal/log.hxx>
 #include <sot/storage.hxx>
@@ -49,7 +48,6 @@
 
 //TODO ExcelToSc usage
 #include <excform.hxx>
-#include <xltable.hxx>
 #include <documentimport.hxx>
 
 #include <vector>
diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx
index 8ba4a1d0f1f2..7b761d1f3b50 100644
--- a/sc/source/filter/excel/xiroot.cxx
+++ b/sc/source/filter/excel/xiroot.cxx
@@ -22,7 +22,6 @@
 #include <colrowst.hxx>
 #include <document.hxx>
 #include <scextopt.hxx>
-#include <xltracer.hxx>
 #include <xihelper.hxx>
 #include <xiformula.hxx>
 #include <xilink.hxx>
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 174ed4bf298b..eec13096fe51 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -19,7 +19,6 @@
 
 #include <memory>
 #include <xistyle.hxx>
-#include <sfx2/printer.hxx>
 #include <sfx2/objsh.hxx>
 #include <svtools/ctrltool.hxx>
 #include <editeng/editobj.hxx>
@@ -54,7 +53,6 @@
 #include <patattr.hxx>
 #include <stlpool.hxx>
 #include <stlsheet.hxx>
-#include <formulacell.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
 #include <attarray.hxx>
@@ -67,7 +65,6 @@
 
 #include <root.hxx>
 #include <colrowst.hxx>
-#include <svl/poolcach.hxx>
 #include <o3tl/make_unique.hxx>
 
 #include <vector>
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index d960d54f42a9..3d88d505f764 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -34,11 +34,9 @@
 #include <com/sun/star/chart/XChartDocument.hpp>
 #include <com/sun/star/chart/XSecondAxisTitleSupplier.hpp>
 #include <com/sun/star/chart2/Symbol.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <sal/macros.h>
-#include <rtl/math.hxx>
 #include <svl/itemset.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
@@ -47,8 +45,6 @@
 #include <svx/xbtmpit.hxx>
 #include <svx/unomid.hxx>
 #include <filter/msfilter/escherex.hxx>
-#include <editeng/memberids.h>
-#include <global.hxx>
 #include <xlroot.hxx>
 #include <xlstyle.hxx>
 #include <xltools.hxx>
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index 13de797854b4..09d831d914b8 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -21,9 +21,7 @@
 
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
-#include <svx/unoapi.hxx>
 #include <document.hxx>
-#include <xestream.hxx>
 #include <xistream.hxx>
 #include <xlroot.hxx>
 #include <xltools.hxx>
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 459c913a400c..3df57661f009 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -19,10 +19,7 @@
 
 #include <xlformula.hxx>
 
-#include <algorithm>
-#include <compiler.hxx>
-#include <rangenam.hxx>
-#include <token.hxx>
+#include <refdata.hxx>
 #include <tokenarray.hxx>
 #include <xestream.hxx>
 #include <xistream.hxx>
diff --git a/sc/source/filter/excel/xlpage.cxx b/sc/source/filter/excel/xlpage.cxx
index 4a27ff173f9d..d7da927baddb 100644
--- a/sc/source/filter/excel/xlpage.cxx
+++ b/sc/source/filter/excel/xlpage.cxx
@@ -19,16 +19,11 @@
 
 #include <xlpage.hxx>
 #include <xltools.hxx>
-#include <sfx2/printer.hxx>
-#include <editeng/svxenum.hxx>
 #include <editeng/paperinf.hxx>
-#include <vcl/svapp.hxx>
 #include <sal/macros.h>
-#include <scitems.hxx>
 #include <editeng/brushitem.hxx>
 #include <global.hxx>
 #include <xlconst.hxx>
-#include <oox/core/xmlfilterbase.hxx>
 
 namespace{
 
diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx
index 25a0a9c4cf9c..ccc657537433 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <dpgroup.hxx>
 #include <dpsave.hxx>
 #include <xestream.hxx>
 #include <xistream.hxx>
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 358e89b89333..c1044e216115 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -19,7 +19,6 @@
 
 #include <memory>
 #include <xlroot.hxx>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
@@ -31,7 +30,6 @@
 #include <svl/stritem.hxx>
 #include <svl/languageoptions.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/printer.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <vcl/font.hxx>
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx
index cc19634a376d..335beb5ae3e0 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -7,22 +7,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 #include "xltoolbar.hxx"
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
-#include <stdarg.h>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/IndexedPropertyValues.hpp>
 #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
 #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/ui/XImageManager.hpp>
 #include <com/sun/star/ui/ItemType.hpp>
-#include <fstream>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
-#include <vcl/graph.hxx>
 #include <map>
 
 using namespace com::sun::star;
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index de285b34fb75..93c6d0ec31b6 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -20,23 +20,19 @@
 #include <algorithm>
 #include <math.h>
 #include <sal/mathconf.h>
-#include <unotools/fontcvt.hxx>
-#include <sfx2/objsh.hxx>
 #include <sal/macros.h>
 #include <sal/log.hxx>
-#include <editeng/editstat.hxx>
+#include <tools/solar.h>
+#include <unotools/fontdefs.hxx>
 #include <filter/msfilter/msvbahelper.hxx>
 #include <xestream.hxx>
-#include <document.hxx>
-#include <docuno.hxx>
-#include <editutil.hxx>
+#include <global.hxx>
 #include <formula/errorcodes.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
 #include <xlstyle.hxx>
 #include <xlname.hxx>
 #include <xistream.hxx>
-#include <xiroot.hxx>
 #include <xltools.hxx>
 
 // GUID import/export
diff --git a/sc/source/filter/excel/xlview.cxx b/sc/source/filter/excel/xlview.cxx
index 5d56e2153ac6..1c0ea7125660 100644
--- a/sc/source/filter/excel/xlview.cxx
+++ b/sc/source/filter/excel/xlview.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <xlview.hxx>
-#include <ftools.hxx>
 #include <osl/diagnose.h>
 
 // Structs ====================================================================
-- 
cgit