tdf#42949 Fix IWYU warnings in sc/source/filter/{excel,lotus,xml}/*hxx

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

Change-Id: I087492531b4fc17a3196ea820dbaa0f742aea16d
Reviewed-on: https://gerrit.libreoffice.org/63148
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

68 files changed, 166 insertions, 166 deletions

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index bc3c041946ff..f7db11f4decc 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -523,3 +523,9 @@ blacklist:
     sc/source/core/data/types.cxx:
     # Complete type is needed for complex data type
     - scmatrix.hxx
+    sc/source/filter/xml/XMLCodeNameProvider.hxx:
+    # base class has to be a complete type
+    - com/sun/star/container/XNameAccess.hpp
+    sc/source/filter/xml/xmldrani.hxx:
+    # Complex type needs complete type
+    - com/sun/star/beans/PropertyValue.hpp
diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx
index cb6e50bb754d..0d71761a1b98 100644
--- a/sc/source/filter/excel/xltoolbar.hxx
+++ b/sc/source/filter/excel/xltoolbar.hxx
@@ -9,9 +9,10 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_EXCEL_XLTOOLBAR_HXX
 #define INCLUDED_SC_SOURCE_FILTER_EXCEL_XLTOOLBAR_HXX
 
-#include <com/sun/star/container/XIndexContainer.hpp>
 #include <filter/msfilter/mstoolbar.hxx>
 
+namespace com { namespace sun { namespace star { namespace container { class XIndexContainer; } } } }
+
 class ScCTBWrapper;
 // hmm I don't normally use these packed structures
 // but.. hey always good to do something different
diff --git a/sc/source/filter/inc/optab.h b/sc/source/filter/inc/optab.h
index 53f1f8e10a68..9dd8fb164f27 100644
--- a/sc/source/filter/inc/optab.h
+++ b/sc/source/filter/inc/optab.h
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_OPTAB_H
 #define INCLUDED_SC_SOURCE_FILTER_INC_OPTAB_H
 
+#include <sal/types.h>
+
+class SvStream;
+
 struct LotusContext;
 
 typedef void ( *OPCODE_FKT )(LotusContext &rContext, SvStream &rStream, sal_uInt16 nLength);
diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx
index a43b4ee6a8ad..b769931e8aa9 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -30,6 +30,7 @@
 #include <root.hxx>
 #include <lotrange.hxx>
 #include <optab.h>
+#include <op.h>
 #include <scmem.h>
 #include <decl.h>
 #include <tool.h>
diff --git a/sc/source/filter/lotus/lotfilter.hxx b/sc/source/filter/lotus/lotfilter.hxx
index f54c9051393f..66700377584d 100644
--- a/sc/source/filter/lotus/lotfilter.hxx
+++ b/sc/source/filter/lotus/lotfilter.hxx
@@ -22,15 +22,12 @@
 
 #include <map>
 #include <decl.h>
-#include <op.h>
 #include <optab.h>
-#include <root.hxx>
 #include <patattr.hxx>
 
 class SvxHorJustifyItem;
-class ScProtectionAttr;
-class SfxUInt32Item;
 class FormCache;
+struct LOTUS_ROOT;
 
 struct LotusContext
 {
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
index 56160860c386..71266d68960a 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLCALCULATIONSETTINGSCONTEXT_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLCALCULATIONSETTINGSCONTEXT_HXX
 
-#include <xmloff/xmlictxt.hxx>
 #include <unotools/textsearch.hxx>
 #include <com/sun/star/util/Date.hpp>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
+namespace sax_fastparser { class FastAttributeList; }
+
 
 class ScXMLCalculationSettingsContext : public ScXMLImportContext
 {
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
index 4d1ed842a140..123e78fda998 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLCELLRANGESOURCECONTEXT_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLCELLRANGESOURCECONTEXT_HXX
 
-#include <xmloff/xmlimp.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
+namespace sax_fastparser { class FastAttributeList; }
+
 
 struct ScMyImpCellRangeSource
 {
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
index 11344abc327d..fb5ccaf6bb24 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
@@ -21,12 +21,11 @@
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLCHANGETRACKINGEXPORTHELPER_HXX
 
 #include <xmloff/xmltoken.hxx>
-#include <list>
 #include <map>
 #include <memory>
 #include <tools/solar.h>
-#include <com/sun/star/text/XText.hpp>
-#include <rtl/ustrbuf.hxx>
+
+namespace com { namespace sun { namespace star { namespace text { class XText; } } } }
 
 class ScChangeAction;
 class ScChangeTrack;
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
index e18b82ebc888..75f1c9d6e56e 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
@@ -22,7 +22,6 @@
 
 #include <memory>
 #include <chgtrack.hxx>
-#include <list>
 #include <com/sun/star/util/DateTime.hpp>
 
 class ScDocument;
diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx
index 499d45d9b005..a265946c4d44 100644
--- a/sc/source/filter/xml/XMLCodeNameProvider.hxx
+++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx
@@ -23,6 +23,8 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <cppuhelper/implbase.hxx>
 
+namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } }
+
 class ScDocument;
 
 class XMLCodeNameProvider : public ::cppu::WeakImplHelper< css::container::XNameAccess >
diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx
index caf8a618dbe3..8496c4075c4c 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.hxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.hxx
@@ -22,11 +22,11 @@
 
 #include <global.hxx>
 #include <address.hxx>
-#include <xmloff/xmlimp.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
 
+namespace sax_fastparser { class FastAttributeList; }
+
 class ScXMLConsolidationContext : public ScXMLImportContext
 {
 private:
diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx
index 6c131421bd13..6d6ffd57ce67 100644
--- a/sc/source/filter/xml/XMLConverter.hxx
+++ b/sc/source/filter/xml/XMLConverter.hxx
@@ -24,12 +24,12 @@
 #include <detfunc.hxx>
 #include <detdata.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/sheet/ConditionOperator.hpp>
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
 #include <com/sun/star/sheet/GeneralFunction.hpp>
 #include <com/sun/star/sheet/ValidationType.hpp>
-#include <com/sun/star/util/DateTime.hpp>
+
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
 
 class ScDocument;
 class DateTime;
diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx
index f369d5b5a34b..5c132353a0c1 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.hxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLDDELINKSCONTEXT_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLDDELINKSCONTEXT_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 #include <list>
 
+namespace sax_fastparser { class FastAttributeList; }
+
 class ScXMLDDELinksContext : public ScXMLImportContext
 {
 public:
diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx
index 3fb0b2a7b6dc..a1c69d10d746 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.hxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.hxx
@@ -20,14 +20,14 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLDETECTIVECONTEXT_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLDETECTIVECONTEXT_HXX
 
-#include <xmloff/xmlimp.hxx>
 #include <detfunc.hxx>
 #include <detdata.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
 #include <list>
 
+namespace sax_fastparser { class FastAttributeList; }
+
 struct ScMyImpDetectiveObj
 {
     ScRange                     aSourceRange;
diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx
index cf0b3778ec5e..9eb6fce74cde 100644
--- a/sc/source/filter/xml/XMLEmptyContext.hxx
+++ b/sc/source/filter/xml/XMLEmptyContext.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLEMPTYCONTEXT_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLEMPTYCONTEXT_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
 
diff --git a/sc/source/filter/xml/XMLExportDDELinks.hxx b/sc/source/filter/xml/XMLExportDDELinks.hxx
index 5ff5719fd41e..7a988d3a5efd 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.hxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.hxx
@@ -20,7 +20,10 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLEXPORTDDELINKS_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLEXPORTDDELINKS_HXX
 
-#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheetDocument; } } } }
 
 class ScXMLExport;
 struct ScMatrixValue;
diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx
index 16cee372d596..a08262eedf54 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.hxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLEXPORTDATAPILOT_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLEXPORTDATAPILOT_HXX
 
-#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <rtl/ustring.hxx>
 #include <global.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <unotools/textsearch.hxx>
-#include <boost/optional.hpp>
+
+namespace boost { template <class T> class optional; }
 
 class ScXMLExport;
 class ScDocument;
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
index 7dda5de96f35..c5cf519f912e 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLEXPORTDATABASERANGES_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLEXPORTDATABASERANGES_HXX
 
-#include <sortparam.hxx>
 #include <address.hxx>
 
+struct ScSortParam;
 class ScXMLExport;
 class ScDocument;
 class ScMyEmptyDatabaseRangesContainer;
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx
index 55f9e7981af6..c08867e8fd75 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <com/sun/star/table/XCellRange.hpp>
+
 #include "XMLExportIterator.hxx"
 #include <xmloff/xmlnmspe.hxx>
 #include <dociter.hxx>
diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx
index 6744b89c2b35..d87f3db12c07 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -22,21 +22,19 @@
 
 #include <vector>
 #include <list>
-#include <set>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/table/CellRangeAddress.hpp>
-#include <com/sun/star/table/XCell.hpp>
-#include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/sheet/XSheetAnnotation.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
-#include <global.hxx>
+#include <com/sun/star/table/CellContentType.hpp>
 #include <detfunc.hxx>
 #include <detdata.hxx>
-#include <postit.hxx>
 #include <cellvalue.hxx>
 
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheet; } } } }
+namespace com { namespace sun { namespace star { namespace table { class XCellRange; } } } }
+namespace com { namespace sun { namespace star { namespace table { struct CellRangeAddress; } } } }
+
+class   ScPostIt;
 class   ScHorizontalCellIterator;
 struct  ScMyCell;
 class   ScXMLExport;
diff --git a/sc/source/filter/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxx
index 3724d55c9ed5..58833dd99422 100644
--- a/sc/source/filter/xml/XMLExportSharedData.hxx
+++ b/sc/source/filter/xml/XMLExportSharedData.hxx
@@ -20,13 +20,16 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLEXPORTSHAREDDATA_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLEXPORTSHAREDDATA_HXX
 
-#include <global.hxx>
-#include <com/sun/star/drawing/XDrawPage.hpp>
+#include <address.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 
 #include <vector>
 #include <list>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+
 struct ScMyDrawPage
 {
     css::uno::Reference<css::drawing::XDrawPage> xDrawPage;
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx
index 3399174fb433..3bcea80b36df 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx
@@ -25,7 +25,6 @@
 #include <list>
 
 #include <address.hxx>
-#include <com/sun/star/uno/Any.h>
 #include <com/sun/star/table/CellRangeAddress.hpp>
 #include <com/sun/star/sheet/ConditionOperator.hpp>
 #include <com/sun/star/sheet/ValidationAlertStyle.hpp>
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx
index b4f944d66ed7..005b23798519 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLSTYLESIMPORTHELPER_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLSTYLESIMPORTHELPER_HXX
 
-#include <rangelst.hxx>
 #include <simplerangelist.hxx>
 #include <rtl/ustring.hxx>
+#include <tools/ref.hxx>
 
 #include <list>
 #include <memory>
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index e8b2f1ae886e..db7b99c4b0a4 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/text/XText.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
+#include <xmloff/xmlimp.hxx>
 #include "XMLTableHeaderFooterContext.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <comphelper/extract.hxx>
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
index 1b8a13f9fc9f..209a6054e295 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
@@ -20,14 +20,14 @@
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLTABLEHEADERFOOTERCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
-#include <com/sun/star/sheet/XHeaderFooterContent.hpp>
 
 namespace com { namespace sun { namespace star {
     namespace text { class XTextCursor; }
     namespace beans { class XPropertySet; }
 } } }
 
+namespace com { namespace sun { namespace star { namespace sheet { class XHeaderFooterContent; } } } }
+
 class XMLTableHeaderFooterContext: public SvXMLImportContext
 {
     css::uno::Reference< css::text::XTextCursor > xTextCursor;
diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxx
index 3a17f719caf9..28cb3899d7b7 100644
--- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx
+++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx
@@ -20,17 +20,17 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLTABLEMASTERPAGEEXPORT_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLTABLEMASTERPAGEEXPORT_HXX
 
-#include <rtl/ustring.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLTextMasterPageExport.hxx>
-#include <com/sun/star/sheet/XHeaderFooterContent.hpp>
-
-#include "xmlexprt.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace text { class XText; }
 } } }
 
+namespace com { namespace sun { namespace star { namespace sheet { class XHeaderFooterContent; } } } }
+
+class ScXMLExport;
+
 class XMLTableMasterPageExport : public XMLTextMasterPageExport
 {
     void exportHeaderFooter(const css::uno::Reference < css::sheet::XHeaderFooterContent >& xHeaderFooter,
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.hxx b/sc/source/filter/xml/XMLTableShapeResizer.hxx
index 43401c1a9e6e..c8bc476df48b 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.hxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.hxx
@@ -20,9 +20,11 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLTABLESHAPERESIZER_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLTABLESHAPERESIZER_HXX
 
-#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+
 class ScXMLImport;
 class ScChartListenerCollection;
 class ScDocument;
diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx
index 32c4c65daf4a..9af805a717a5 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.hxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.hxx
@@ -21,9 +21,10 @@
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLTABLESHAPESCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
+class ScXMLImport;
+
 class ScXMLTableShapesContext : public ScXMLImportContext
 {
 public:
diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx
index 82a7b362a550..23c62ba6da5e 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.hxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLTABLESOURCECONTEXT_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLTABLESOURCECONTEXT_HXX
 
-#include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/sheet/SheetLinkMode.hpp>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
+namespace sax_fastparser { class FastAttributeList; }
+
 class ScXMLTableSourceContext : public ScXMLImportContext
 {
     OUString                           sLink;
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 32e32556a30c..7a017ac740d3 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -19,6 +19,7 @@
 
 #include <memory>
 #include "XMLTrackedChangesContext.hxx"
+#include "XMLChangeTrackingImportHelper.hxx"
 #include "xmlimprt.hxx"
 #include "xmlconti.hxx"
 #include "XMLConverter.hxx"
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx
index 8600b73410bc..334c96e6e8ba 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx
@@ -20,12 +20,9 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLTRACKEDCHANGESCONTEXT_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLTRACKEDCHANGESCONTEXT_HXX
 
-#include "XMLChangeTrackingImportHelper.hxx"
-#include <chgtrack.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
-#include <xmloff/xmlictxt.hxx>
-#include <rtl/ustrbuf.hxx>
+
+namespace sax_fastparser { class FastAttributeList; }
 
 class ScXMLChangeTrackingImportHelper;
 
diff --git a/sc/source/filter/xml/datastreamimport.hxx b/sc/source/filter/xml/datastreamimport.hxx
index 691ed6430ff9..a9df2f197387 100644
--- a/sc/source/filter/xml/datastreamimport.hxx
+++ b/sc/source/filter/xml/datastreamimport.hxx
@@ -15,6 +15,8 @@
 #include <importfilterdata.hxx>
 #include <address.hxx>
 
+namespace sax_fastparser { class FastAttributeList; }
+
 class ScXMLDataStreamContext : public ScXMLImportContext
 {
     OUString maURL;
diff --git a/sc/source/filter/xml/importcontext.hxx b/sc/source/filter/xml/importcontext.hxx
index 8332fa5a5d37..90a7a2d0e053 100644
--- a/sc/source/filter/xml/importcontext.hxx
+++ b/sc/source/filter/xml/importcontext.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_SC_SOURCE_FILTER_XML_IMPORTCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
 
 class ScXMLImport;
 
diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx
index 3a06a828ba4f..22f8576d2b3f 100644
--- a/sc/source/filter/xml/xmlannoi.hxx
+++ b/sc/source/filter/xml/xmlannoi.hxx
@@ -20,15 +20,15 @@
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLANNOI_HXX
 
 #include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <editeng/editdata.hxx>
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
-class ScXMLTableRowCellContext;
+#include <vector>
+
+class ScXMLImport;
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
 
 struct ScXMLAnnotationStyleEntry
 {
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index 21b436b23934..a820514a973c 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -37,6 +37,7 @@
 #include "XMLDDELinksContext.hxx"
 #include "XMLCalculationSettingsContext.hxx"
 #include "XMLTrackedChangesContext.hxx"
+#include "XMLChangeTrackingImportHelper.hxx"
 #include "XMLEmptyContext.hxx"
 #include "XMLDetectiveContext.hxx"
 #include <scerrors.hxx>
diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx
index 092c381abfd0..66b831244d01 100644
--- a/sc/source/filter/xml/xmlbodyi.hxx
+++ b/sc/source/filter/xml/xmlbodyi.hxx
@@ -20,13 +20,12 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLBODYI_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLBODYI_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
 #include <tabprotection.hxx>
 
+namespace sax_fastparser { class FastAttributeList; }
+
 class ScXMLChangeTrackingImportHelper;
 
 class ScXMLBodyContext : public ScXMLImportContext
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 12cc4df5ae1c..87627bbc84c7 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -41,6 +41,7 @@
 #include "XMLTableShapeImportHelper.hxx"
 #include "XMLStylesImportHelper.hxx"
 #include "celltextparacontext.hxx"
+#include "XMLCellRangeSourceContext.hxx"
 
 #include <arealink.hxx>
 #include <sfx2/linkmgr.hxx>
@@ -57,6 +58,8 @@
 #include <datastream.hxx>
 #include <rangeutl.hxx>
 
+#include <xmloff/maptype.hxx>
+#include <xmloff/xmlaustp.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
@@ -73,6 +76,7 @@
 #include <editeng/colritem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/postitem.hxx>
+#include <editeng/flditem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/wrlmitem.hxx>
diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx
index 9b5b82e4ae62..d80cfa759619 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -20,12 +20,10 @@
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLCELLI_HXX
 
 #include "XMLDetectiveContext.hxx"
-#include "XMLCellRangeSourceContext.hxx"
 #include "importcontext.hxx"
 #include <formula/grammar.hxx>
 #include <svl/itemset.hxx>
 #include <editeng/editdata.hxx>
-#include <editeng/flditem.hxx>
 
 #include <boost/optional.hpp>
 #include <memory>
@@ -34,7 +32,9 @@
 class ScXMLImport;
 class ScFormulaCell;
 class ScEditEngineDefaulter;
+class SvxFieldData;
 struct ScXMLAnnotationData;
+struct ScMyImpCellRangeSource;
 
 class ScXMLTableRowCellContext : public ScXMLImportContext
 {
diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx
index c43577f0e871..949fc3a16a36 100644
--- a/sc/source/filter/xml/xmlcoli.hxx
+++ b/sc/source/filter/xml/xmlcoli.hxx
@@ -19,11 +19,10 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLCOLI_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLCOLI_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
+namespace sax_fastparser { class FastAttributeList; }
+
 class ScXMLTableColContext : public ScXMLImportContext
 {
     sal_Int32               nColCount;
diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx
index acf77f54ac42..d50b6206c951 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -9,10 +9,13 @@
 
 #include <memory>
 #include "xmlcondformat.hxx"
+#include "xmlimprt.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
+#include <xmloff/xmlictxt.hxx>
 #include <sal/log.hxx>
 
+#include <compiler.hxx>
 #include <colorscale.hxx>
 #include <conditio.hxx>
 #include <document.hxx>
diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx
index 0adff7657fea..9df9caad5fec 100644
--- a/sc/source/filter/xml/xmlcondformat.hxx
+++ b/sc/source/filter/xml/xmlcondformat.hxx
@@ -13,14 +13,13 @@
 #include <array>
 #include <memory>
 #include <tools/link.hxx>
-#include <xmloff/xmlictxt.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
-#include <rangelst.hxx>
+#include <tokenarray.hxx>
+
+namespace sax_fastparser { class FastAttributeList; }
 
 class ScColorScaleFormat;
 class ScColorScaleEntry;
-class ScDataBarFormat;
 struct ScDataBarFormatData;
 class ScConditionalFormat;
 struct ScIconSetFormatData;
diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx
index afd37d91877a..f7d07d10e2da 100644
--- a/sc/source/filter/xml/xmlconti.hxx
+++ b/sc/source/filter/xml/xmlconti.hxx
@@ -19,9 +19,7 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLCONTI_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLCONTI_HXX
 
-#include <xmloff/xmlimp.hxx>
 #include <rtl/ustrbuf.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
 class ScXMLContentContext : public ScXMLImportContext
diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx
index 0722f019975b..e33b7f1aeb37 100644
--- a/sc/source/filter/xml/xmlcvali.hxx
+++ b/sc/source/filter/xml/xmlcvali.hxx
@@ -19,13 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLCVALI_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLCVALI_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
-#include <com/sun/star/sheet/ValidationAlertStyle.hpp>
-#include <com/sun/star/sheet/ValidationType.hpp>
-#include <com/sun/star/sheet/ConditionOperator.hpp>
-#include <rtl/ustrbuf.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
 class ScXMLContentValidationsContext : public ScXMLImportContext
diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx
index a2c6cbe45b4f..c75abd762f41 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -20,24 +20,23 @@
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLDPIMP_HXX
 
 #include <memory>
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
-#include <com/sun/star/sheet/DataPilotFieldReference.hpp>
-#include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp>
-#include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp>
-#include <com/sun/star/sheet/DataPilotFieldLayoutInfo.hpp>
-
-#include <global.hxx>
-#include <dpobject.hxx>
+#include <xmloff/xmltoken.hxx>
+
 #include <dpsave.hxx>
 #include <queryparam.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
 #include <unordered_map>
 
+namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldAutoShowInfo; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldLayoutInfo; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldReference; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldSortInfo; } } } }
+namespace sax_fastparser { class FastAttributeList; }
+
 class ScDPSaveNumGroupDimension;
 class ScDPSaveGroupDimension;
+class ScDPObject;
 
 enum ScMySourceType
 {
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index 4fbb58b7d3e3..69ffd1638487 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -44,6 +44,7 @@
 #include <sax/tools/converter.hxx>
 
 #include <com/sun/star/sheet/DataImportMode.hpp>
+#include <com/sun/star/table/TableOrientation.hpp>
 
 #include <memory>
 
diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx
index de6f0c6cd7ec..8520fde6415c 100644
--- a/sc/source/filter/xml/xmldrani.hxx
+++ b/sc/source/filter/xml/xmldrani.hxx
@@ -19,20 +19,17 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLDRANI_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLDRANI_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
 #include <com/sun/star/sheet/DataImportMode.hpp>
 #include <com/sun/star/sheet/SubTotalColumn.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/table/TableOrientation.hpp>
 
 #include <dbdata.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
 #include <memory>
 
-class ScDBData;
+namespace sax_fastparser { class FastAttributeList; }
+
 struct ScQueryParam;
 
 class ScXMLDatabaseRangesContext : public ScXMLImportContext
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index f2ce09406dc5..e74be84841f9 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -70,6 +70,7 @@
 #include <tokenstringcontext.hxx>
 #include <cellform.hxx>
 #include <datamapper.hxx>
+#include <datatransformation.hxx>
 
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index 14b13ee69a44..560177ab46f3 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -20,23 +20,24 @@
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLEXPRT_HXX
 
 #include <xmloff/xmlexp.hxx>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/table/CellRangeAddress.hpp>
-#include <com/sun/star/table/XCellRange.hpp>
 
 #include <address.hxx>
 
 #include <memory>
 #include <unordered_map>
 
-#include <datatransformation.hxx>
-
 
 namespace com { namespace sun { namespace star {
     namespace beans { class XPropertySet; }
 } } }
 
+namespace com { namespace sun { namespace star { namespace table { class XCellRange; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheet; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheetDocument; } } } }
+
+namespace sc { class DataTransformation; }
+
 class ScOutlineArray;
 class SvXMLExportPropertyMapper;
 class ScMyMergedRangesContainer;
@@ -55,9 +56,7 @@ class ScDocument;
 class ScMySharedData;
 class ScMyDefaultStyles;
 class XMLNumberFormatAttributesExportHelper;
-class ScChartListener;
 class SfxItemPool;
-class ScAddress;
 class ScXMLCachedRowAttrAccess;
 class ScRangeName;
 class ScXMLEditAttributeMap;
diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx
index 3892f9ead0f2..08e3fb2d2686 100644
--- a/sc/source/filter/xml/xmlexternaltabi.hxx
+++ b/sc/source/filter/xml/xmlexternaltabi.hxx
@@ -20,10 +20,11 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLEXTERNALTABI_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLEXTERNALTABI_HXX
 
-#include <xmloff/xmlictxt.hxx>
 #include <rtl/ustrbuf.hxx>
 #include "importcontext.hxx"
 
+namespace sax_fastparser { class FastAttributeList; }
+
 class ScXMLImport;
 struct ScXMLExternalTabData;
 
diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
index 45027f625ae4..70994e13e283 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -19,6 +19,8 @@
 
 #include "xmlfilti.hxx"
 #include "xmlimprt.hxx"
+#include "xmldrani.hxx"
+#include "xmldpimp.hxx"
 #include <docuno.hxx>
 #include <convuno.hxx>
 #include "XMLConverter.hxx"
diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx
index bc32f81fb2e1..abe95e05fc6a 100644
--- a/sc/source/filter/xml/xmlfilti.hxx
+++ b/sc/source/filter/xml/xmlfilti.hxx
@@ -20,20 +20,17 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLFILTI_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLFILTI_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
-#include <com/sun/star/sheet/FilterOperator.hpp>
-
-#include "xmldrani.hxx"
-#include "xmldpimp.hxx"
 #include "importcontext.hxx"
 #include <queryentry.hxx>
+#include <queryparam.hxx>
 
 #include <stack>
 #include <vector>
 
 class ScXMLImport;
-struct ScQueryParam;
+class ScXMLDatabaseRangeContext;
+class ScXMLDataPilotTableContext;
+namespace sax_fastparser { class FastAttributeList; }
 
 class ScXMLFilterContext : public ScXMLImportContext
 {
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 13e7c203340b..6179192b1641 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -58,6 +58,7 @@
 #include "xmlstyli.hxx"
 #include <ViewSettingsSequenceDefines.hxx>
 
+#include <compiler.hxx>
 #include <patattr.hxx>
 
 #include "XMLConverter.hxx"
@@ -79,6 +80,7 @@
 #include <numformat.hxx>
 #include <sizedev.hxx>
 #include <scdll.hxx>
+#include "xmlstyle.hxx"
 
 #include <comphelper/base64.hxx>
 #include <comphelper/extract.hxx>
@@ -97,6 +99,7 @@
 #include <com/sun/star/sheet/XLabelRanges.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
 
 #include <memory>
 #include <utility>
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index bd3ba747368f..7cd7eabe70dc 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -20,34 +20,30 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLIMPRT_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLIMPRT_HXX
 
-#include <svl/style.hxx>
-#include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
-#include <xmloff/xmltkmap.hxx>
-#include <xmloff/xmlaustp.hxx>
-#include <xmloff/xmlstyle.hxx>
-#include <com/sun/star/util/DateTime.hpp>
 #include "xmlsubti.hxx"
-#include <vcl/errcode.hxx>
 #include <global.hxx>
 #include <formula/grammar.hxx>
-#include <compiler.hxx>
 #include <dociter.hxx>
 
-#include "xmlstyle.hxx"
 #include <com/sun/star/sheet/ValidationAlertStyle.hpp>
 #include <com/sun/star/sheet/ValidationType.hpp>
 #include <com/sun/star/sheet/ConditionOperator.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/util/XNumberFormatTypes.hpp>
-#include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
 
 #include <memory>
-#include <unordered_map>
 #include <map>
 #include <vector>
 #include <list>
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { class XSheetCellRangeContainer; } } } }
+namespace com { namespace sun { namespace star { namespace table { struct CellRangeAddress; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatTypes; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormats; } } } }
+namespace sax_fastparser { class FastAttributeList; }
+
+class ScCompiler;
+class ErrCode;
 class ScMyStyleNumberFormats;
 class XMLNumberFormatAttributesExportHelper;
 class ScEditEngineDefaulter;
diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx
index 99b74172cab3..9eb6773360d8 100644
--- a/sc/source/filter/xml/xmllabri.hxx
+++ b/sc/source/filter/xml/xmllabri.hxx
@@ -19,10 +19,10 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLLABRI_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLLABRI_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
+namespace sax_fastparser { class FastAttributeList; }
+
 class ScXMLLabelRangesContext : public ScXMLImportContext
 {
 public:
diff --git a/sc/source/filter/xml/xmlmappingi.cxx b/sc/source/filter/xml/xmlmappingi.cxx
index 8f8babad1e26..12db626b7940 100644
--- a/sc/source/filter/xml/xmlmappingi.cxx
+++ b/sc/source/filter/xml/xmlmappingi.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "xmlimprt.hxx"
 #include "xmlmappingi.hxx"
 #include "xmltransformationi.hxx"
 
diff --git a/sc/source/filter/xml/xmlmappingi.hxx b/sc/source/filter/xml/xmlmappingi.hxx
index 4080f7dfe230..f84a35311f7c 100644
--- a/sc/source/filter/xml/xmlmappingi.hxx
+++ b/sc/source/filter/xml/xmlmappingi.hxx
@@ -10,12 +10,10 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLMAPPINGI_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLMAPPINGI_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
-
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
+namespace sax_fastparser { class FastAttributeList; }
+
 class ScXMLMappingsContext : public ScXMLImportContext
 {
 public:
diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx
index 6824c7b73041..e47e72048dbc 100644
--- a/sc/source/filter/xml/xmlnexpi.hxx
+++ b/sc/source/filter/xml/xmlnexpi.hxx
@@ -19,16 +19,14 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLNEXPI_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLNEXPI_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
-#include <address.hxx>
-#include "xmlimprt.hxx"
+#include <types.hxx>
 #include "importcontext.hxx"
 
 #include <memory>
 
+namespace sax_fastparser { class FastAttributeList; }
+
 struct ScMyNamedExpression;
-class ScRangeName;
 
 class ScXMLNamedExpressionsContext : public ScXMLImportContext
 {
diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx
index c67cfcfeeb39..582e7158f09c 100644
--- a/sc/source/filter/xml/xmlrowi.hxx
+++ b/sc/source/filter/xml/xmlrowi.hxx
@@ -19,13 +19,12 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLROWI_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLROWI_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
-#include <address.hxx>
-#include "xmlimprt.hxx"
+#include <types.hxx>
 #include "importcontext.hxx"
 
 
+namespace sax_fastparser { class FastAttributeList; }
+
 class ScXMLTableRowContext : public ScXMLImportContext
 {
     OUString sStyleName;
diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx
index 87437f35f00b..983c69eef090 100644
--- a/sc/source/filter/xml/xmlsceni.hxx
+++ b/sc/source/filter/xml/xmlsceni.hxx
@@ -19,12 +19,12 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLSCENI_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLSCENI_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
 #include <tools/color.hxx>
 #include <rangelst.hxx>
 #include "importcontext.hxx"
 
+namespace sax_fastparser { class FastAttributeList; }
+
 class ScXMLImport;
 
 class ScXMLTableScenarioContext : public ScXMLImportContext
diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx
index 6a33903e065b..71a6b8dc59c9 100644
--- a/sc/source/filter/xml/xmlsorti.cxx
+++ b/sc/source/filter/xml/xmlsorti.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "xmldrani.hxx"
 #include "xmlsorti.hxx"
 #include "xmlimprt.hxx"
 #include <docuno.hxx>
@@ -30,6 +31,8 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
 
+#include <com/sun/star/util/SortField.hpp>
+
 using namespace com::sun::star;
 using namespace xmloff::token;
 
diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx
index e53d861caeb1..8006b34841e0 100644
--- a/sc/source/filter/xml/xmlsorti.hxx
+++ b/sc/source/filter/xml/xmlsorti.hxx
@@ -19,16 +19,16 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLSORTI_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLSORTI_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
 #include <xmloff/languagetagodf.hxx>
-#include <com/sun/star/util/SortField.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
 
-#include "xmldrani.hxx"
 #include "importcontext.hxx"
 
+namespace com { namespace sun { namespace star { namespace util { struct SortField; } } } }
+namespace sax_fastparser { class FastAttributeList; }
+
 class ScXMLImport;
+class ScXMLDatabaseRangeContext;
 
 class ScXMLSortContext : public ScXMLImportContext
 {
diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx
index a398e1187feb..36a42737cf24 100644
--- a/sc/source/filter/xml/xmlstyle.hxx
+++ b/sc/source/filter/xml/xmlstyle.hxx
@@ -23,7 +23,6 @@
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmlaustp.hxx>
 #include <xmloff/xmltypes.hxx>
-#include <xmloff/xmlprmap.hxx>
 #include <xmloff/prhdlfac.hxx>
 #include <xmloff/styleexp.hxx>
 #include <xmloff/xmlexppr.hxx>
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 03996c173c32..5ccce36c9853 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -38,6 +38,7 @@
 #include "xmlannoi.hxx"
 #include <textuno.hxx>
 #include <cellsuno.hxx>
+#include "xmlstyle.hxx"
 
 #include <docuno.hxx>
 #include <unonames.hxx>
diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx
index 3e5907d63b63..21e2ae976ed4 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -22,15 +22,11 @@
 
 #include <rtl/ustring.hxx>
 #include <vector>
-#include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlictxt.hxx>
-#include <xmloff/maptype.hxx>
 #include <xmloff/prstylei.hxx>
 #include <xmloff/xmlimppr.hxx>
 #include <xmloff/XMLTextMasterPageContext.hxx>
-#include <xmloff/XMLTextMasterStylesContext.hxx>
 #include <xmloff/txtstyli.hxx>
-#include <com/sun/star/sheet/ConditionOperator.hpp>
 #include "xmlimprt.hxx"
 
 class ScConditionalFormat;
@@ -196,10 +192,6 @@ public:
     virtual void EndElement() override;
 };
 
-namespace com { namespace sun { namespace star {
-    namespace style { class XStyle; }
-} } }
-
 class ScMasterPageContext : public XMLTextMasterPageContext
 {
     css::uno::Reference<css::beans::XPropertySet> xPropSet;
diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx
index 29c2e5bd57bd..7913ce2b0277 100644
--- a/sc/source/filter/xml/xmlsubti.hxx
+++ b/sc/source/filter/xml/xmlsubti.hxx
@@ -19,17 +19,16 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLSUBTI_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLSUBTI_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/table/XCellRange.hpp>
-
 #include "XMLTableShapeResizer.hxx"
 #include <formula/grammar.hxx>
 #include <tabprotection.hxx>
 #include <rangelst.hxx>
 
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheet; } } } }
+namespace com { namespace sun { namespace star { namespace table { class XCellRange; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
+
 class ScXMLImport;
 
 struct ScXMLTabProtectionData
diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx
index 42caa9eab6aa..5ada4b365f50 100644
--- a/sc/source/filter/xml/xmltabi.hxx
+++ b/sc/source/filter/xml/xmltabi.hxx
@@ -20,12 +20,13 @@
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLTABI_HXX
 
 #include <externalrefmgr.hxx>
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
 #include <xmloff/xmlictxt.hxx>
 #include <memory>
 
+namespace sax_fastparser { class FastAttributeList; }
+
 
 struct ScXMLExternalTabData
 {
diff --git a/sc/source/filter/xml/xmltransformationi.cxx b/sc/source/filter/xml/xmltransformationi.cxx
index c23de6f34b24..0d280bc7ab5c 100644
--- a/sc/source/filter/xml/xmltransformationi.cxx
+++ b/sc/source/filter/xml/xmltransformationi.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "xmlimprt.hxx"
 #include "xmltransformationi.hxx"
 
 #include <xmloff/xmltkmap.hxx>
diff --git a/sc/source/filter/xml/xmltransformationi.hxx b/sc/source/filter/xml/xmltransformationi.hxx
index bc6d77e4921f..b927708cadad 100644
--- a/sc/source/filter/xml/xmltransformationi.hxx
+++ b/sc/source/filter/xml/xmltransformationi.hxx
@@ -10,14 +10,15 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLTRANSFORMATIONI_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLTRANSFORMATIONI_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimp.hxx>
-
 #include <datatransformation.hxx>
 
-#include "xmlimprt.hxx"
 #include "importcontext.hxx"
 
+namespace sax_fastparser
+{
+class FastAttributeList;
+}
+
 class ScXMLTransformationsContext : public ScXMLImportContext
 {
 public: