[Libreoffice-commits] core.git: sc/inc sc/IwyuFilter_sc.yaml sc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Sep 4 07:29:48 UTC 2018 

 sc/IwyuFilter_sc.yaml                         |    8 ++++++++
 sc/inc/progress.hxx                           |    1 +
 sc/source/filter/dif/difexp.cxx               |    1 +
 sc/source/filter/excel/excform.cxx            |    1 +
 sc/source/filter/excel/excimp8.cxx            |    1 +
 sc/source/filter/excel/excrecds.cxx           |    1 +
 sc/source/filter/excel/exctools.cxx           |    1 +
 sc/source/filter/excel/impop.cxx              |    3 +++
 sc/source/filter/excel/read.cxx               |    1 +
 sc/source/filter/excel/xestream.cxx           |    1 +
 sc/source/filter/excel/xiroot.cxx             |    1 +
 sc/source/filter/ftools/fapihelper.cxx        |    1 +
 sc/source/filter/ftools/fprogressbar.cxx      |    1 +
 sc/source/filter/inc/addressconverter.hxx     |    4 +++-
 sc/source/filter/inc/biffhelper.hxx           |    3 ++-
 sc/source/filter/inc/colrowst.hxx             |    3 ++-
 sc/source/filter/inc/condformatbuffer.hxx     |    3 ---
 sc/source/filter/inc/condformatcontext.hxx    |    2 --
 sc/source/filter/inc/defnamesbuffer.hxx       |    5 +++--
 sc/source/filter/inc/dif.hxx                  |    6 +-----
 sc/source/filter/inc/drawingfragment.hxx      |    2 --
 sc/source/filter/inc/eeimport.hxx             |    2 --
 sc/source/filter/inc/eeparser.hxx             |    2 ++
 sc/source/filter/inc/excdoc.hxx               |    9 +++++----
 sc/source/filter/inc/excelhandlers.hxx        |    3 ++-
 sc/source/filter/inc/excimp8.hxx              |    4 ----
 sc/source/filter/inc/excrecds.hxx             |   11 -----------
 sc/source/filter/inc/exp_op.hxx               |    5 -----
 sc/source/filter/inc/expbase.hxx              |    2 +-
 sc/source/filter/inc/externallinkbuffer.hxx   |    1 +
 sc/source/filter/inc/extlstcontext.hxx        |   10 +++++-----
 sc/source/filter/inc/fapihelper.hxx           |    8 ++++----
 sc/source/filter/inc/formel.hxx               |    5 -----
 sc/source/filter/inc/formulabase.hxx          |   10 ++++++----
 sc/source/filter/inc/formulabuffer.hxx        |    7 -------
 sc/source/filter/inc/fprogressbar.hxx         |    4 ++--
 sc/source/filter/inc/ftools.hxx               |    8 +++-----
 sc/source/filter/inc/htmlexp.hxx              |    4 +++-
 sc/source/filter/inc/htmlimp.hxx              |    1 -
 sc/source/filter/inc/imp_op.hxx               |    9 ++-------
 sc/source/filter/inc/lotattr.hxx              |    2 --
 sc/source/filter/inc/lotfntbf.hxx             |    2 --
 sc/source/filter/inc/lotform.hxx              |    1 -
 sc/source/filter/inc/lotimpop.hxx             |    3 ---
 sc/source/filter/inc/lotrange.hxx             |    5 +++--
 sc/source/filter/inc/xeescher.hxx             |    1 +
 sc/source/filter/inc/xestream.hxx             |    1 +
 sc/source/filter/inc/xistream.hxx             |    1 +
 sc/source/filter/lotus/lotattr.cxx            |    1 +
 sc/source/filter/oox/autofilterbuffer.cxx     |    1 +
 sc/source/filter/oox/condformatbuffer.cxx     |    1 +
 sc/source/filter/oox/defnamesbuffer.cxx       |    1 +
 sc/source/filter/oox/externallinkbuffer.cxx   |    1 +
 sc/source/filter/oox/externallinkfragment.cxx |    1 +
 sc/source/filter/oox/extlstcontext.cxx        |    2 ++
 sc/source/filter/oox/formulabase.cxx          |    2 ++
 sc/source/filter/oox/formulabuffer.cxx        |    1 +
 sc/source/filter/oox/formulaparser.cxx        |    1 +
 sc/source/filter/oox/pagesettings.cxx         |    1 +
 sc/source/filter/oox/pivotcachebuffer.cxx     |    1 +
 sc/source/filter/oox/sheetdatacontext.cxx     |    1 +
 sc/source/filter/oox/stylesbuffer.cxx         |    1 +
 sc/source/filter/oox/workbookfragment.cxx     |    1 +
 sc/source/filter/oox/worksheetbuffer.cxx      |    1 +
 sc/source/filter/oox/worksheetfragment.cxx    |    1 +
 sc/source/filter/xcl97/XclExpChangeTrack.cxx  |    1 +
 sc/source/filter/xcl97/XclImpChangeTrack.cxx  |    1 +
 sc/source/filter/xcl97/xcl97rec.cxx           |    1 +
 68 files changed, 97 insertions(+), 96 deletions(-)

New commits:
commit 9aee9781212328e78b6a34ac2b965b16fd0d9e3a
Author:     Gabor Kelemen <kelemeng at ubuntu.com>
AuthorDate: Mon Aug 27 22:14:27 2018 +0200
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Tue Sep 4 09:29:23 2018 +0200

    tdf#42949 Fix IWYU warnings in sc/source/filter/inc/[a-l]*
    
    Found with bin/find-unneeded-includes
    Only removal proposals are dealt with here.
    
    Change-Id: I92cfd8d09ca8229764db4200568b96a62e2ab21e
    Reviewed-on: https://gerrit.libreoffice.org/59742
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 100e263949dd..62a5354aee56 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -375,3 +375,11 @@ blacklist:
     sc/source/core/opencl/opbase.hxx:
     # Needed for FormulaTreeNode()
     - formula/token.hxx
+    sc/source/filter/inc/drawingfragment.hxx:
+    # Needed for implicit dtor
+    - drawingbase.hxx
+    sc/source/filter/inc/excdoc.hxx:
+    # Needed for unique_ptr type
+    - class XclExpChangeTrack
+    # Needed for typedef
+    - excrecds.hxx
diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx
index 68cda2341bfb..7ad445a0913c 100644
--- a/sc/inc/progress.hxx
+++ b/sc/inc/progress.hxx
@@ -22,6 +22,7 @@
 
 #include <rtl/ustring.hxx>
 #include <sfx2/progress.hxx>
+#include <tools/solar.h>
 #include "scdllapi.h"
 
 class ScDocument;
diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index 8d13faa38480..d7c348590d57 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -33,6 +33,7 @@
 #include <rtl/strbuf.hxx>
 #include <osl/diagnose.h>
 #include <formula/errorcodes.hxx>
+#include <tools/stream.hxx>
 
 void ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* pDoc,
     const ScAddress& rOutPos, const rtl_TextEncoding eNach )
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 933547da7dc6..16bbe6a83585 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -36,6 +36,7 @@
 #include <xihelper.hxx>
 #include <xilink.hxx>
 #include <xiname.hxx>
+#include <xistyle.hxx>
 #include <documentimport.hxx>
 
 using ::std::vector;
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 739a636c36a1..e21dab52634c 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -83,6 +83,7 @@
 #include <xilink.hxx>
 #include <xiescher.hxx>
 #include <xipivot.hxx>
+#include <xistyle.hxx>
 
 #include <excform.hxx>
 #include <scextopt.hxx>
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index 804f815c59d1..d5c1bfd8970b 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -70,6 +70,7 @@
 #include <oox/export/utils.hxx>
 #include <queryentry.hxx>
 #include <queryparam.hxx>
+#include <root.hxx>
 
 #include <excdoc.hxx>
 #include <xeescher.hxx>
diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx
index 1475f9b8e8b0..f35d32b710a1 100644
--- a/sc/source/filter/excel/exctools.cxx
+++ b/sc/source/filter/excel/exctools.cxx
@@ -32,6 +32,7 @@
 #include <progress.hxx>
 #include <rangenam.hxx>
 #include <editutil.hxx>
+#include <olinetab.hxx>
 
 #include <excrecds.hxx>
 #include <root.hxx>
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 6bcf3d690caf..ceb03131f015 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -65,6 +65,9 @@
 #include <unonames.hxx>
 #include <paramisc.hxx>
 #include <postit.hxx>
+#include <colrowst.hxx>
+#include <otlnbuff.hxx>
+#include <xistyle.hxx>
 
 #include <fapihelper.hxx>
 #include <namebuff.hxx>
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 2da672b01fde..f4a9e04bb87e 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -33,6 +33,7 @@
 #include <xicontent.hxx>
 #include <xiescher.hxx>
 #include <xipivot.hxx>
+#include <xistyle.hxx>
 #include <XclImpChangeTrack.hxx>
 #include <documentimport.hxx>
 
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 1bda7dc820ca..3986becf4556 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -44,6 +44,7 @@
 #include <refreshtimerprotector.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
+#include <root.hxx>
 
 #include <docsh.hxx>
 #include <viewdata.hxx>
diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx
index 98e9a3a47c1e..8ba4a1d0f1f2 100644
--- a/sc/source/filter/excel/xiroot.cxx
+++ b/sc/source/filter/excel/xiroot.cxx
@@ -19,6 +19,7 @@
 
 #include <xiroot.hxx>
 #include <addincol.hxx>
+#include <colrowst.hxx>
 #include <document.hxx>
 #include <scextopt.hxx>
 #include <xltracer.hxx>
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx
index 146af75aaca5..91b8678f4ebc 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XPropertySetOption.hpp>
+#include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <comphelper/docpasswordhelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx
index 97195e2cbc11..6278fbdbb979 100644
--- a/sc/source/filter/ftools/fprogressbar.cxx
+++ b/sc/source/filter/ftools/fprogressbar.cxx
@@ -24,6 +24,7 @@
 #include <progress.hxx>
 #include <osl/diagnose.h>
 #include <o3tl/make_unique.hxx>
+#include <tools/stream.hxx>
 
 #include <climits>
 
diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx
index d1d53531e0f1..531ba42a5e33 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -21,9 +21,11 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_ADDRESSCONVERTER_HXX
 
 #include <vector>
-#include <com/sun/star/table/CellRangeAddress.hpp>
 #include <rangelst.hxx>
 #include "workbookhelper.hxx"
+#include <com/sun/star/uno/Sequence.h>
+
+namespace com { namespace sun { namespace star { namespace table { struct CellRangeAddress; } } } }
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/inc/biffhelper.hxx b/sc/source/filter/inc/biffhelper.hxx
index aaf03e58d8bd..9da559a23995 100644
--- a/sc/source/filter/inc/biffhelper.hxx
+++ b/sc/source/filter/inc/biffhelper.hxx
@@ -20,7 +20,8 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_BIFFHELPER_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_BIFFHELPER_HXX
 
-#include <oox/helper/binarystreambase.hxx>
+#include <sal/types.h>
+#include <rtl/ustring.hxx>
 
 namespace oox { class SequenceInputStream; }
 
diff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxx
index d9838fb141c3..a51b9a895244 100644
--- a/sc/source/filter/inc/colrowst.hxx
+++ b/sc/source/filter/inc/colrowst.hxx
@@ -22,7 +22,8 @@
 
 #include "xiroot.hxx"
 #include <mdds/flat_segment_tree.hpp>
-#include <o3tl/typed_flags_set.hxx>
+
+namespace o3tl { template <typename T> struct typed_flags; }
 
 enum class ExcColRowFlags : sal_uInt8 {
     NONE         = 0x00,
diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx
index 90212c8653fa..c4166b6eed60 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_CONDFORMATBUFFER_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_CONDFORMATBUFFER_HXX
 
-#include "formulaparser.hxx"
 #include "worksheethelper.hxx"
 #include <tools/color.hxx>
 #include <conditio.hxx>
@@ -32,9 +31,7 @@
 class ScColorScaleFormat;
 class ScDataBarFormat;
 struct ScDataBarFormatData;
-class ScConditionalFormat;
 class ScIconSetFormat;
-class ScFormatEntry;
 struct ScIconSetFormatData;
 
 namespace oox {
diff --git a/sc/source/filter/inc/condformatcontext.hxx b/sc/source/filter/inc/condformatcontext.hxx
index ca42898cc8ff..71924e5ca968 100644
--- a/sc/source/filter/inc/condformatcontext.hxx
+++ b/sc/source/filter/inc/condformatcontext.hxx
@@ -23,8 +23,6 @@
 #include "condformatbuffer.hxx"
 #include "excelhandlers.hxx"
 
-class IconSetRule;
-
 namespace oox {
 namespace xls {
 
diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx
index a95df8a2ba95..4f5d9ffd205f 100644
--- a/sc/source/filter/inc/defnamesbuffer.hxx
+++ b/sc/source/filter/inc/defnamesbuffer.hxx
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_DEFNAMESBUFFER_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_DEFNAMESBUFFER_HXX
 
-#include "formulabase.hxx"
-#include <rangenam.hxx>
+#include "workbookhelper.hxx"
+#include <oox/helper/binarystreambase.hxx>
+#include <oox/helper/refvector.hxx>
 
 #include <memory>
 
diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx
index ac1ebc8cb024..5d29bbd8aef1 100644
--- a/sc/source/filter/inc/dif.hxx
+++ b/sc/source/filter/inc/dif.hxx
@@ -20,20 +20,17 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_DIF_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_DIF_HXX
 
-#include <array>
 #include <map>
 #include <memory>
 #include <vector>
 
 #include <rtl/ustring.hxx>
 
-#include <address.hxx>
-#include <global.hxx>
+#include <types.hxx>
 
 class SvStream;
 class SvNumberFormatter;
 class ScDocument;
-class ScPatternAttr;
 
 extern const sal_Unicode pKeyTABLE[];
 extern const sal_Unicode pKeyVECTORS[];
@@ -126,7 +123,6 @@ inline bool DifParser::IsNumber( const sal_Unicode cChar )
     return ( cChar >= '0' && cChar <= '9' );
 }
 
-class DifAttrCache;
 class DifColumn
 {
     friend class DifAttrCache;
diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx
index 277c3fba9f41..bcb68d9ba0b7 100644
--- a/sc/source/filter/inc/drawingfragment.hxx
+++ b/sc/source/filter/inc/drawingfragment.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_DRAWINGFRAGMENT_HXX
 
 #include <memory>
-#include <com/sun/star/awt/Rectangle.hpp>
 #include <oox/drawingml/shapegroupcontext.hxx>
 #include <oox/ole/axcontrol.hxx>
 #include <oox/drawingml/shape.hxx>
@@ -34,7 +33,6 @@
 
 namespace oox { namespace ole {
     struct AxFontData;
-    class AxMorphDataModelBase;
 } }
 
 namespace oox {
diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx
index 099bab138faa..3f2453a6b75a 100644
--- a/sc/source/filter/inc/eeimport.hxx
+++ b/sc/source/filter/inc/eeimport.hxx
@@ -20,10 +20,8 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_EEIMPORT_HXX
 
 #include <memory>
-#include <global.hxx>
 #include <address.hxx>
 #include <filter.hxx>
-#include <scdllapi.h>
 #include <map>
 
 class ScDocument;
diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx
index 7b174044690f..3a1a44dac6f3 100644
--- a/sc/source/filter/inc/eeparser.hxx
+++ b/sc/source/filter/inc/eeparser.hxx
@@ -24,9 +24,11 @@
 #include <vcl/graph.hxx>
 #include <svl/itemset.hxx>
 #include <editeng/editdata.hxx>
+#include <boost/optional.hpp>
 #include <address.hxx>
 #include <memory>
 #include <vector>
+#include <map>
 
 const sal_Char nHorizontal = 1;
 const sal_Char nVertical = 2;
diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx
index f987b6c5390f..0e7cbb798963 100644
--- a/sc/source/filter/inc/excdoc.hxx
+++ b/sc/source/filter/inc/excdoc.hxx
@@ -20,16 +20,17 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_EXCDOC_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_EXCDOC_HXX
 
-#include "excrecds.hxx"
 #include "xeroot.hxx"
-#include "root.hxx"
-#include "xeescher.hxx"
+#include "xerecord.hxx"
+#include "excrecds.hxx"
 #include <memory>
 
 // Forwards -
 
 class SvStream;
-
+class XclExpNote;
+class XclExpStream;
+class XclExpXmlStream;
 class XclExpChangeTrack;
 
 // class ExcTable -
diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx
index fa02e013b9eb..cd9f42076d80 100644
--- a/sc/source/filter/inc/excelhandlers.hxx
+++ b/sc/source/filter/inc/excelhandlers.hxx
@@ -21,7 +21,8 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_EXCELHANDLERS_HXX
 
 #include <oox/core/fragmenthandler2.hxx>
-#include <oox/helper/binaryinputstream.hxx>
+#include <oox/core/contexthandler2.hxx>
+#include "workbookhelper.hxx"
 #include "worksheethelper.hxx"
 
 namespace oox {
diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx
index 04309c692f5d..da1eecdf196f 100644
--- a/sc/source/filter/inc/excimp8.hxx
+++ b/sc/source/filter/inc/excimp8.hxx
@@ -20,13 +20,9 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_EXCIMP8_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_EXCIMP8_HXX
 
-#include <string.h>
-
 #include "imp_op.hxx"
 #include "root.hxx"
 #include "excscen.hxx"
-#include "excdefs.hxx"
-#include "ftools.hxx"
 #include <queryparam.hxx>
 
 class ScDBData;
diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx
index 1364c678f609..dadeef2ae165 100644
--- a/sc/source/filter/inc/excrecds.hxx
+++ b/sc/source/filter/inc/excrecds.hxx
@@ -22,22 +22,11 @@
 
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
-#include <svl/zforlist.hxx>
-#include <tools/solar.h>
 #include <tools/color.hxx>
-#include <vcl/vclenum.hxx>
 
-#include <olinetab.hxx>
-#include <filter.hxx>
-#include <rangelst.hxx>
 #include "xerecord.hxx"
 #include "xeroot.hxx"
-#include "xeformula.hxx"
-#include "xestring.hxx"
-#include "root.hxx"
 #include "excdefs.hxx"
-#include <memory>
-#include <vector>
 
 //------------------------------------------------------------------ Forwards -
 
diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx
index c370e7b2a936..9273e749264c 100644
--- a/sc/source/filter/inc/exp_op.hxx
+++ b/sc/source/filter/inc/exp_op.hxx
@@ -21,13 +21,8 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_EXP_OP_HXX
 
 #include <memory>
-#include <filter.hxx>
-#include "root.hxx"
 #include "xeroot.hxx"
 
-class ScDocument;
-class ScPatternAttr;
-class ScFormulaCell;
 class ExcDocument;
 
 class ExportTyp
diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx
index 6ad349b31f40..554a01674c68 100644
--- a/sc/source/filter/inc/expbase.hxx
+++ b/sc/source/filter/inc/expbase.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_EXPBASE_HXX
 
 #include <memory>
-#include <global.hxx>
 #include <address.hxx>
 
+class SvNumberFormatter;
 class SvStream;
 class ScFieldEditEngine;
 
diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx
index be8b5f0300dd..8ceba935a77e 100644
--- a/sc/source/filter/inc/externallinkbuffer.hxx
+++ b/sc/source/filter/inc/externallinkbuffer.hxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/sheet/ExternalLinkInfo.hpp>
 #include <oox/helper/containerhelper.hxx>
 #include "defnamesbuffer.hxx"
+#include "formulabase.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace sheet { struct DDEItemInfo; }
diff --git a/sc/source/filter/inc/extlstcontext.hxx b/sc/source/filter/inc/extlstcontext.hxx
index f30fad890199..84b08bd54a02 100644
--- a/sc/source/filter/inc/extlstcontext.hxx
+++ b/sc/source/filter/inc/extlstcontext.hxx
@@ -11,20 +11,20 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_EXTLSTCONTEXT_HXX
 
 #include "excelhandlers.hxx"
-#include "worksheetfragment.hxx"
-#include "workbookfragment.hxx"
+#include <oox/core/contexthandler.hxx>
+#include "condformatbuffer.hxx"
 
 #include <vector>
 #include <memory>
 
 struct ScDataBarFormatData;
-class ScFormatEntry;
+namespace oox { class AttributeList; }
+namespace oox { namespace xls { class WorkbookFragment; } }
+namespace oox { namespace xls { class WorksheetFragment; } }
 
 namespace oox {
 namespace xls {
 
-class IconSetRule;
-
 class ExtCfRuleContext : public WorksheetContextBase
 {
 public:
diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx
index f94fe6d525cc..6dadd7a7fb43 100644
--- a/sc/source/filter/inc/fapihelper.hxx
+++ b/sc/source/filter/inc/fapihelper.hxx
@@ -23,18 +23,18 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
 #include <osl/diagnose.h>
 #include <tools/color.hxx>
 #include "ftools.hxx"
-#include <scdllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace lang { class XMultiServiceFactory; }
 } } }
 
+namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XMultiPropertySet; } } } }
+
 namespace comphelper { class IDocPasswordVerifier; }
 
 // Static helper functions ====================================================
diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx
index a884a70ffc25..2f82381b6ee3 100644
--- a/sc/source/filter/inc/formel.hxx
+++ b/sc/source/filter/inc/formel.hxx
@@ -20,11 +20,8 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_FORMEL_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_FORMEL_HXX
 
-#include <compiler.hxx>
-#include <global.hxx>
 #include <tools/stream.hxx>
 
-#include "root.hxx"
 #include "tokstack.hxx"
 
 #include <memory>
@@ -39,8 +36,6 @@ class SharedStringPool;
 
 class XclImpStream;
 class ScTokenArray;
-struct ScSingleRefData;
-struct ScComplexRefData;
 
 enum class ConvErr
 {
diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
index 74e3d8508502..fcc02dcd0c00 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -21,13 +21,10 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_FORMULABASE_HXX
 
 #include <com/sun/star/beans/Pair.hpp>
-#include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp>
 #include <com/sun/star/sheet/FormulaToken.hpp>
-#include <com/sun/star/table/CellAddress.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
 #include <oox/helper/propertyset.hxx>
 #include <oox/helper/refvector.hxx>
-#include "addressconverter.hxx"
+#include "workbookhelper.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace lang { class XMultiServiceFactory; }
@@ -35,6 +32,11 @@ namespace com { namespace sun { namespace star {
 } } }
 
 namespace oox { template< typename Type > class Matrix; }
+namespace com { namespace sun { namespace star { namespace sheet { struct FormulaOpCodeMapEntry; } } } }
+namespace com { namespace sun { namespace star { namespace table { struct CellAddress; } } } }
+namespace oox { class SequenceInputStream; }
+namespace oox { namespace xls { struct BinAddress; } }
+class ScRangeList;
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx
index a2d3154898d7..3d6a9f8d9b94 100644
--- a/sc/source/filter/inc/formulabuffer.hxx
+++ b/sc/source/filter/inc/formulabuffer.hxx
@@ -10,16 +10,9 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_FORMULABUFFER_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_FORMULABUFFER_HXX
 
-#include <utility>
-#include <oox/helper/refmap.hxx>
-#include <oox/helper/refvector.hxx>
-#include <salhelper/thread.hxx>
 #include <osl/mutex.hxx>
 #include "workbookhelper.hxx"
-#include <map>
 #include <vector>
-#include "worksheethelper.hxx"
-#include "sheetdatabuffer.hxx"
 
 namespace oox { namespace xls {
 
diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx
index 6e8946985e58..ec2d1d8ac14f 100644
--- a/sc/source/filter/inc/fprogressbar.hxx
+++ b/sc/source/filter/inc/fprogressbar.hxx
@@ -22,11 +22,11 @@
 
 #include <vector>
 #include <memory>
-#include "ftools.hxx"
-#include <scdllapi.h>
+#include <rtl/ustring.hxx>
 
 class SfxObjectShell;
 class ScProgress;
+class SvStream;
 
 const sal_Int32 SCF_INV_SEGMENT = -1;
 
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index cae5241fe1e3..d24bc99ae841 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -21,13 +21,9 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_FTOOLS_HXX
 
 #include <vector>
-#include <map>
 #include <limits>
-#include <sal/macros.h>
-#include <sot/storage.hxx>
-#include <oox/helper/helper.hxx>
+#include <tools/ref.hxx>
 #include <filter.hxx>
-#include <scdllapi.h>
 
 // Common macros ==============================================================
 
@@ -114,6 +110,8 @@ class SfxItemSet;
 class ScStyleSheet;
 class ScStyleSheetPool;
 class SvStream;
+class SotStorage;
+class SotStorageStream;
 
 /** Contains static methods used anywhere in the filters. */
 class ScfTools
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index 1bef27296027..93d77baf2ecf 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -20,12 +20,14 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_HTMLEXP_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_HTMLEXP_HXX
 
-#include <global.hxx>
 #include <rtl/textenc.h>
 #include <tools/gen.hxx>
 #include <tools/color.hxx>
+#include <vcl/vclptr.hxx>
 #include <vector>
 #include <memory>
+#include <map>
+#include <svx/xoutbmp.hxx>
 
 #include "expbase.hxx"
 
diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx
index 475e31745c82..da50cb33c4de 100644
--- a/sc/source/filter/inc/htmlimp.hxx
+++ b/sc/source/filter/inc/htmlimp.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_HTMLIMP_HXX
 
 #include "eeimport.hxx"
-#include "htmlpars.hxx"
 
 class ScHTMLImport : public ScEEImport
 {
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index 9ac4abd7992a..709be5419bfa 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -23,13 +23,6 @@
 #include <sal/types.h>
 #include "xiroot.hxx"
 #include "xistream.hxx"
-#include "xistyle.hxx"
-#include "flttypes.hxx"
-#include "root.hxx"
-#include "otlnbuff.hxx"
-#include "colrowst.hxx"
-#include "excdefs.hxx"
-#include <rtl/ref.hxx>
 
 #include <vector>
 #include <memory>
@@ -41,6 +34,8 @@ class ScFormulaCell;
 class ScDocument;
 
 class ExcelToSc;
+class XclImpOutlineBuffer;
+class XclImpColRowSettings;
 
 class ImportTyp
 {
diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx
index 78d80e8dd174..82ead05d242e 100644
--- a/sc/source/filter/inc/lotattr.hxx
+++ b/sc/source/filter/inc/lotattr.hxx
@@ -24,13 +24,11 @@
 #include <memory>
 
 #include <address.hxx>
-#include <scitems.hxx>
 
 class ScDocumentPool;
 class ScPatternAttr;
 class SvxColorItem;
 class Color;
-class LotAttrTable;
 struct LOTUS_ROOT;
 
 namespace editeng { class SvxBorderLine; }
diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx
index f388d8e51375..d560da581c6b 100644
--- a/sc/source/filter/inc/lotfntbf.hxx
+++ b/sc/source/filter/inc/lotfntbf.hxx
@@ -20,10 +20,8 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_LOTFNTBF_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_LOTFNTBF_HXX
 
-#include <scitems.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/fhgtitem.hxx>
-#include <editeng/colritem.hxx>
 #include <boost/optional.hpp>
 
 // Code in fontbuff.cxx (excel)
diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx
index 87bbe97890fb..f902fd67a893 100644
--- a/sc/source/filter/inc/lotform.hxx
+++ b/sc/source/filter/inc/lotform.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_LOTFORM_HXX
 
 #include "formel.hxx"
-#include <rtl/ustring.hxx>
 
 enum FUNC_TYPE
 {
diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx
index 90d834bf10ff..7429cb4efb25 100644
--- a/sc/source/filter/inc/lotimpop.hxx
+++ b/sc/source/filter/inc/lotimpop.hxx
@@ -23,13 +23,10 @@
 #include <rtl/ustring.hxx>
 
 #include "imp_op.hxx"
-#include "flttypes.hxx"
 #include "ftools.hxx"
 #include "lotform.hxx"
 #include "lotattr.hxx"
 
-class ScFormulaCell;
-class LotusFontBuffer;
 struct LotusContext;
 
 class ImportLotus : public ImportTyp
diff --git a/sc/source/filter/inc/lotrange.hxx b/sc/source/filter/inc/lotrange.hxx
index b09416186938..1a6d4986d827 100644
--- a/sc/source/filter/inc/lotrange.hxx
+++ b/sc/source/filter/inc/lotrange.hxx
@@ -20,9 +20,10 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_LOTRANGE_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_LOTRANGE_HXX
 
-#include <compiler.hxx>
+#include <refdata.hxx>
+#include <types.hxx>
 
-class LotusRangeList;
+struct LOTUS_ROOT;
 
 typedef sal_uInt16  LR_ID;
 
diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index 3f5fa308e261..04d773b44dd6 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -24,6 +24,7 @@
 #include <filter/msfilter/escherex.hxx>
 #include "xcl97rec.hxx"
 #include "xlescher.hxx"
+#include "xlformula.hxx"
 #include <com/sun/star/chart/XChartDocument.hpp>
 #include <svx/sdtaitm.hxx>
 #include <rtl/ustring.hxx>
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index bb5192e22351..8d3ce390b93a 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -31,6 +31,7 @@
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/token/tokens.hxx>
 #include <sax/fshelper.hxx>
+#include <tools/stream.hxx>
 
 #include "xlstream.hxx"
 #include "xestring.hxx"
diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx
index dabbbcfba759..ad8cd462cb1d 100644
--- a/sc/source/filter/inc/xistream.hxx
+++ b/sc/source/filter/inc/xistream.hxx
@@ -22,6 +22,7 @@
 
 #include <comphelper/docpasswordhelper.hxx>
 #include <filter/msfilter/mscodec.hxx>
+#include <tools/stream.hxx>
 #include <memory>
 #include "xlstream.hxx"
 #include "xlconst.hxx"
diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx
index a26faf9edbe7..e07fe8a72292 100644
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@@ -22,6 +22,7 @@
 
 #include <editeng/boxitem.hxx>
 #include <editeng/brushitem.hxx>
+#include <editeng/colritem.hxx>
 #include <editeng/justifyitem.hxx>
 #include <svx/algitem.hxx>
 #include <sal/log.hxx>
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx
index 690a46a4c2a8..cca13dd87100 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/sheet/XDatabaseRange.hpp>
 #include <com/sun/star/sheet/XSheetFilterDescriptor3.hpp>
 #include <com/sun/star/table/TableOrientation.hpp>
+#include <com/sun/star/table/CellAddress.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
 #include <oox/helper/attributelist.hxx>
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index c136e32be2eb..dce8eb816fac 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -19,6 +19,7 @@
 
 #include <memory>
 #include <condformatbuffer.hxx>
+#include <formulaparser.hxx>
 
 #include <com/sun/star/sheet/ConditionOperator2.hpp>
 #include <rtl/ustrbuf.hxx>
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index d424e2f662cf..3f3bf3970cfc 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -34,6 +34,7 @@
 #include <oox/token/tokens.hxx>
 #include <addressconverter.hxx>
 #include <externallinkbuffer.hxx>
+#include <formulabase.hxx>
 #include <formulaparser.hxx>
 #include <worksheetbuffer.hxx>
 #include <tokenarray.hxx>
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index 96be62a84684..464eeb781f90 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -30,6 +30,7 @@
 #include <sal/log.hxx>
 #include <oox/core/filterbase.hxx>
 #include <oox/helper/attributelist.hxx>
+#include <oox/helper/binaryinputstream.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx
index 65f638e53941..f665d327b36e 100644
--- a/sc/source/filter/oox/externallinkfragment.cxx
+++ b/sc/source/filter/oox/externallinkfragment.cxx
@@ -21,6 +21,7 @@
 
 #include <com/sun/star/sheet/XExternalSheetCache.hpp>
 #include <oox/helper/attributelist.hxx>
+#include <oox/helper/binaryinputstream.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 #include <osl/diagnose.h>
diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx
index 56163f520c17..1a890d915d41 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -18,6 +18,8 @@
 #include <condformatbuffer.hxx>
 #include <condformatcontext.hxx>
 #include <document.hxx>
+#include <worksheetfragment.hxx>
+#include <workbookfragment.hxx>
 
 #include <rangeutl.hxx>
 #include <o3tl/make_unique.hxx>
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index edc5615934ce..4ae2c43601b3 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -18,6 +18,8 @@
  */
 
 #include <formulabase.hxx>
+#include <rangelst.hxx>
+#include <addressconverter.hxx>
 
 #include <map>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index fa3325298062..babfb61395b8 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -22,6 +22,7 @@
 #include <externalrefmgr.hxx>
 #include <tokenstringcontext.hxx>
 #include <oox/token/tokens.hxx>
+#include <oox/helper/progressbar.hxx>
 #include <svl/sharedstringpool.hxx>
 #include <o3tl/make_unique.hxx>
 #include <sal/log.hxx>
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 083c1b594aa8..bc9ab89775cb 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/sheet/ExternalReference.hpp>
 #include <com/sun/star/sheet/ReferenceFlags.hpp>
 #include <com/sun/star/sheet/SingleReference.hpp>
+#include <com/sun/star/table/CellAddress.hpp>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 #include <oox/core/filterbase.hxx>
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index 6ed7d463c1b1..cb23e8b70396 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -35,6 +35,7 @@
 #include <sax/tools/converter.hxx>
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/helper/attributelist.hxx>
+#include <oox/helper/binaryinputstream.hxx>
 #include <oox/helper/graphichelper.hxx>
 #include <oox/helper/propertymap.hxx>
 #include <oox/helper/propertyset.hxx>
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index 95f4addfa10c..d9dcfca9328c 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -32,6 +32,7 @@
 #include <sal/log.hxx>
 #include <oox/core/filterbase.hxx>
 #include <oox/helper/attributelist.hxx>
+#include <oox/helper/binaryinputstream.hxx>
 #include <oox/helper/containerhelper.hxx>
 #include <oox/helper/propertyset.hxx>
 #include <oox/token/namespaces.hxx>
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx
index c64bd9e56b42..2333e0b8479d 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -20,6 +20,7 @@
 #include <sheetdatacontext.hxx>
 
 #include <oox/helper/attributelist.hxx>
+#include <oox/helper/binaryinputstream.hxx>
 #include <oox/helper/propertyset.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index 2ff803dd596f..c3a97aba7347 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -59,6 +59,7 @@
 #include <sal/log.hxx>
 #include <oox/core/filterbase.hxx>
 #include <oox/helper/attributelist.hxx>
+#include <oox/helper/binaryinputstream.hxx>
 #include <oox/helper/containerhelper.hxx>
 #include <oox/helper/propertymap.hxx>
 #include <oox/helper/propertyset.hxx>
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 9e351d19ed20..cd50c3d96e2c 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -23,6 +23,7 @@
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/drawingml/themefragmenthandler.hxx>
 #include <oox/helper/attributelist.hxx>
+#include <oox/helper/binaryinputstream.hxx>
 #include <oox/helper/progressbar.hxx>
 #include <oox/helper/propertyset.hxx>
 #include <oox/ole/olestorage.hxx>
diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx
index 3a3278704f9b..9cf72c855024 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -26,6 +26,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <oox/core/filterbase.hxx>
 #include <oox/helper/attributelist.hxx>
+#include <oox/helper/binaryinputstream.hxx>
 #include <oox/helper/containerhelper.hxx>
 #include <oox/helper/propertyset.hxx>
 #include <oox/token/namespaces.hxx>
diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index d0a71ef90134..37baf7839427 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <worksheetfragment.hxx>
+#include <formulaparser.hxx>
 
 #include <osl/diagnose.h>
 #include <oox/core/filterbase.hxx>
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 43492b6fb5c1..e98f645a9ed5 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -26,6 +26,7 @@
 #include <xcl97rec.hxx>
 #include <document.hxx>
 #include <editutil.hxx>
+#include <root.hxx>
 
 #include <oox/export/utils.hxx>
 #include <oox/token/namespaces.hxx>
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index f4876dff3e77..668359d0e355 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -29,6 +29,7 @@
 #include <xilink.hxx>
 #include <externalrefmgr.hxx>
 #include <document.hxx>
+#include <excdefs.hxx>
 
 // class XclImpChangeTrack
 
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index c6ee84081580..a23ad826ed7c 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -39,6 +39,7 @@
 #include <formulacell.hxx>
 #include <drwlayer.hxx>
 
+#include <root.hxx>
 #include <xcl97rec.hxx>
 #include <xcl97esc.hxx>
 #include <editutil.hxx>

More information about the Libreoffice-commits mailing list