tdf#42949 Fix IWYU warnings in sc/source/filter/inc/[n-w]*

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

Change-Id: I32e9e2fb636d80ce351d1ef7beb888afac0e8ee7
Reviewed-on: https://gerrit.libreoffice.org/60205
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

84 files changed, 132 insertions, 50 deletions

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 62a5354aee56..7c480e254f5a 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -383,3 +383,8 @@ blacklist:
     - class XclExpChangeTrack
     # Needed for typedef
     - excrecds.hxx
+    sc/source/filter/inc/ooxformulaparser.hxx:
+    # base class has to be a complete type
+    - com/sun/star/lang/XInitialization.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/sheet/XFilterFormulaParser.hpp
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index e21dab52634c..d6c47724fb11 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -84,6 +84,7 @@
 #include <xiescher.hxx>
 #include <xipivot.hxx>
 #include <xistyle.hxx>
+#include <excdefs.hxx>
 
 #include <excform.hxx>
 #include <scextopt.hxx>
diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx
index 17ae00050d3b..a3c01350fced 100644
--- a/sc/source/filter/excel/frmbase.cxx
+++ b/sc/source/filter/excel/frmbase.cxx
@@ -20,6 +20,7 @@
 #include <formel.hxx>
 
 #include <o3tl/make_unique.hxx>
+#include <osl/diagnose.h>
 
 ScRangeListTabs::ScRangeListTabs()
 {
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index b25edaa010dd..b28b806a89b1 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -29,6 +29,7 @@
 #include <xiroot.hxx>
 
 #include <string.h>
+#include <osl/diagnose.h>
 
 sal_uInt32 StringHashEntry::MakeHashCode( const OUString& r )
 {
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index 5d0595b18119..df9de77baeee 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -24,6 +24,7 @@
 
 #include <svl/sharedstringpool.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <algorithm>
 #include <string.h>
diff --git a/sc/source/filter/ftools/sharedformulagroups.cxx b/sc/source/filter/ftools/sharedformulagroups.cxx
index 1da53771d16f..73d74e9d66a3 100644
--- a/sc/source/filter/ftools/sharedformulagroups.cxx
+++ b/sc/source/filter/ftools/sharedformulagroups.cxx
@@ -9,6 +9,7 @@
 
 #include <memory>
 #include <sharedformulagroups.hxx>
+#include <tokenarray.hxx>
 
 namespace sc {
 
diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx
index 531ba42a5e33..0d5b3dac1b70 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/uno/Sequence.h>
 
 namespace com { namespace sun { namespace star { namespace table { struct CellRangeAddress; } } } }
+namespace oox { class SequenceInputStream; }
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx
index 0f1cd52992a4..785dc559858d 100644
--- a/sc/source/filter/inc/autofilterbuffer.hxx
+++ b/sc/source/filter/inc/autofilterbuffer.hxx
@@ -30,6 +30,9 @@ namespace com { namespace sun { namespace star {
     namespace sheet { class XSheetFilterDescriptor3; }
 } } }
 
+namespace oox { class AttributeList; }
+namespace oox { class SequenceInputStream; }
+
 namespace oox {
 namespace xls {
 
diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx
index c4166b6eed60..26e246e75f8d 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -34,6 +34,8 @@ struct ScDataBarFormatData;
 class ScIconSetFormat;
 struct ScIconSetFormatData;
 
+namespace oox { class AttributeList; }
+
 namespace oox {
 namespace xls {
 
diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx
index 3aa4209bc8f8..95eec918911e 100644
--- a/sc/source/filter/inc/connectionsbuffer.hxx
+++ b/sc/source/filter/inc/connectionsbuffer.hxx
@@ -24,6 +24,9 @@
 #include <oox/helper/refvector.hxx>
 #include "workbookhelper.hxx"
 
+namespace oox { class AttributeList; }
+namespace oox { class SequenceInputStream; }
+
 namespace oox {
 namespace xls {
 
diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx
index 4f5d9ffd205f..d4ff3b4a3e7c 100644
--- a/sc/source/filter/inc/defnamesbuffer.hxx
+++ b/sc/source/filter/inc/defnamesbuffer.hxx
@@ -28,6 +28,9 @@
 
 class ScTokenArray;
 
+namespace oox { class AttributeList; }
+namespace oox { class SequenceInputStream; }
+
 namespace oox {
 namespace xls {
 
diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx
index bfb474bbd75b..244779eeb5ce 100644
--- a/sc/source/filter/inc/drawingbase.hxx
+++ b/sc/source/filter/inc/drawingbase.hxx
@@ -23,6 +23,7 @@
 #include <oox/drawingml/drawingmltypes.hxx>
 #include "worksheethelper.hxx"
 
+namespace oox { class AttributeList; }
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index a37b1fc7090f..4e76ef0cb414 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -21,16 +21,11 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_NAMEBUFF_HXX
 
 #include <memory>
+#include <map>
 #include <rtl/ustring.hxx>
-#include <osl/diagnose.h>
-#include <compiler.hxx>
 #include "root.hxx"
 #include "xiroot.hxx"
 
-#include <rangenam.hxx>
-#include <formulacell.hxx>
-
-#include <list>
 #include <unordered_map>
 
 class ScTokenArray;
diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx
index b311191c742a..29181b4848d0 100644
--- a/sc/source/filter/inc/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -21,13 +21,17 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_NUMBERFORMATSBUFFER_HXX
 
 #include <com/sun/star/lang/Locale.hpp>
-#include <svl/itemset.hxx>
 #include "workbookhelper.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace util { class XNumberFormats; }
 } } }
 
+class SfxItemSet;
+
+namespace oox { class AttributeList; }
+namespace oox { class SequenceInputStream; }
+
 namespace oox {
 namespace xls {
 
diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx
index fb4821ca2d20..133ed1013897 100644
--- a/sc/source/filter/inc/ooxformulaparser.hxx
+++ b/sc/source/filter/inc/ooxformulaparser.hxx
@@ -21,12 +21,13 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_OOXFORMULAPARSER_HXX
 
 #include <memory>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sheet/XFilterFormulaParser.hpp>
 #include <cppuhelper/implbase.hxx>
 
+namespace com { namespace sun { namespace star { namespace lang { class XComponent; } } } }
+
 namespace oox {
 namespace xls {
 
diff --git a/sc/source/filter/inc/op.h b/sc/source/filter/inc/op.h
index 5ed8a664d3f0..0064ce2992ad 100644
--- a/sc/source/filter/inc/op.h
+++ b/sc/source/filter/inc/op.h
@@ -20,7 +20,8 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_OP_H
 #define INCLUDED_SC_SOURCE_FILTER_INC_OP_H
 
-#include <patattr.hxx>
+#include <sal/types.h>
+class SfxItemSet;
 
 // OP code functions
 class SvStream;
diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
index 4db5e1c9cd4c..5afce3d33ae5 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -31,11 +31,9 @@
 #include <unordered_map>
 #include <vector>
 
-class ScDocumentImport;
 class ScOrcusSheet;
 class ScOrcusStyles;
 class ScOrcusFactory;
-class ScRangeData;
 class SfxItemSet;
 
 namespace com { namespace sun { namespace star { namespace task {
@@ -222,8 +220,6 @@ public:
     virtual void set_merge_cell_range(const orcus::spreadsheet::range_t& range) override;
 };
 
-class ScOrcusSheet;
-
 class ScOrcusFormula : public orcus::spreadsheet::iface::import_formula
 {
     enum class ResultType { NotSet, String, Value, Empty };
diff --git a/sc/source/filter/inc/otlnbuff.hxx b/sc/source/filter/inc/otlnbuff.hxx
index 9ca36170ad25..3b5f4291a079 100644
--- a/sc/source/filter/inc/otlnbuff.hxx
+++ b/sc/source/filter/inc/otlnbuff.hxx
@@ -22,6 +22,7 @@
 
 #include <mdds/flat_segment_tree.hpp>
 #include <set>
+#include <address.hxx>
 
 class ScOutlineArray;
 
diff --git a/sc/source/filter/inc/pagesettings.hxx b/sc/source/filter/inc/pagesettings.hxx
index 2868d8eac4ad..71d09f373e8b 100644
--- a/sc/source/filter/inc/pagesettings.hxx
+++ b/sc/source/filter/inc/pagesettings.hxx
@@ -23,6 +23,7 @@
 #include <memory>
 #include "worksheethelper.hxx"
 
+namespace oox { class AttributeList; }
 namespace oox { class PropertySet; }
 namespace oox { namespace core { class Relations; } }
 
diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx
index e0c8f65d441a..3758ad4afdc5 100644
--- a/sc/source/filter/inc/pivotcachebuffer.hxx
+++ b/sc/source/filter/inc/pivotcachebuffer.hxx
@@ -25,6 +25,9 @@
 #include <oox/helper/refvector.hxx>
 #include "workbookhelper.hxx"
 
+namespace oox { class AttributeList; }
+namespace oox { class SequenceInputStream; }
+
 namespace com { namespace sun { namespace star {
     namespace sheet { class XDataPilotField; }
 } } }
diff --git a/sc/source/filter/inc/qpro.hxx b/sc/source/filter/inc/qpro.hxx
index 8bc67f04e901..eab0aea155ed 100644
--- a/sc/source/filter/inc/qpro.hxx
+++ b/sc/source/filter/inc/qpro.hxx
@@ -22,13 +22,12 @@
 
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
-#include <filter.hxx>
-
-#include "flttypes.hxx"
-#include "ftools.hxx"
-#include "qprostyle.hxx"
+#include <vcl/errcode.hxx>
+#include <types.hxx>
 
 class ScDocument;
+class SvStream;
+class ScQProStyle;
 
 // Stream wrapper class
 class ScQProReader
diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx
index 730416bf2f80..35622618e260 100644
--- a/sc/source/filter/inc/qproform.hxx
+++ b/sc/source/filter/inc/qproform.hxx
@@ -22,9 +22,7 @@
 
 #include <sal/config.h>
 #include "formel.hxx"
-#include "qpro.hxx"
 
-#include <compiler.hxx>
 typedef OpCode DefTokenId;
 
 enum FUNC_TYPE
diff --git a/sc/source/filter/inc/qprostyle.hxx b/sc/source/filter/inc/qprostyle.hxx
index 06a9851a3d10..ea62390b0669 100644
--- a/sc/source/filter/inc/qprostyle.hxx
+++ b/sc/source/filter/inc/qprostyle.hxx
@@ -22,11 +22,7 @@
 
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
-#include <filter.hxx>
-
-#include "flttypes.hxx"
-#include "ftools.hxx"
-#include <address.hxx>
+#include <types.hxx>
 
 class ScDocument;
 
diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx
index 69598b62d362..79847f437b79 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -31,6 +31,8 @@ namespace com { namespace sun { namespace star {
     namespace text { class XText; }
 } } }
 
+namespace oox { class SequenceInputStream; }
+
 namespace oox {
 namespace xls {
 
diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx
index d9998f3e4cc2..e59893fba469 100644
--- a/sc/source/filter/inc/root.hxx
+++ b/sc/source/filter/inc/root.hxx
@@ -20,11 +20,8 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_ROOT_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_ROOT_HXX
 
-#include <global.hxx>
 #include <address.hxx>
 #include "flttypes.hxx"
-#include <filter.hxx>
-#include "excdefs.hxx"
 #include "lotattr.hxx"
 #include "lotfntbf.hxx"
 #include "lotrange.hxx"
diff --git a/sc/source/filter/inc/rtfexp.hxx b/sc/source/filter/inc/rtfexp.hxx
index 8309e1eb6948..1f89559ba2be 100644
--- a/sc/source/filter/inc/rtfexp.hxx
+++ b/sc/source/filter/inc/rtfexp.hxx
@@ -22,6 +22,7 @@
 
 #include <memory>
 #include "expbase.hxx"
+#include <tools/solar.h>
 
 class ScRTFExport : public ScExportBase
 {
diff --git a/sc/source/filter/inc/scenariobuffer.hxx b/sc/source/filter/inc/scenariobuffer.hxx
index ddfbee5e86a8..a9c802bf0124 100644
--- a/sc/source/filter/inc/scenariobuffer.hxx
+++ b/sc/source/filter/inc/scenariobuffer.hxx
@@ -24,6 +24,9 @@
 #include <oox/helper/refvector.hxx>
 #include "workbookhelper.hxx"
 
+namespace oox { class AttributeList; }
+namespace oox { class SequenceInputStream; }
+
 namespace oox {
 namespace xls {
 
diff --git a/sc/source/filter/inc/scmem.h b/sc/source/filter/inc/scmem.h
index 2c105ca127f0..cfe5dd1f8e77 100644
--- a/sc/source/filter/inc/scmem.h
+++ b/sc/source/filter/inc/scmem.h
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_SCMEM_H
 
 #include <sal/config.h>
-#include <sal/types.h>
 
 struct LotusContext;
 
diff --git a/sc/source/filter/inc/sharedformulagroups.hxx b/sc/source/filter/inc/sharedformulagroups.hxx
index f59cae1b52ff..547a9610f471 100644
--- a/sc/source/filter/inc/sharedformulagroups.hxx
+++ b/sc/source/filter/inc/sharedformulagroups.hxx
@@ -10,10 +10,9 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_SHAREDFORMULAGROUPS_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_SHAREDFORMULAGROUPS_HXX
 
-#include <tokenarray.hxx>
-
 #include <memory>
 #include <map>
+class ScTokenArray;
 
 namespace sc {
 
diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx
index 55285693420f..83717637b6d6 100644
--- a/sc/source/filter/inc/sheetdatacontext.hxx
+++ b/sc/source/filter/inc/sheetdatacontext.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_SHEETDATACONTEXT_HXX
 
 #include <memory>
+#include "addressconverter.hxx"
 #include "excelhandlers.hxx"
 #include "richstring.hxx"
 #include "sheetdatabuffer.hxx"
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index 3588512193c4..ee2a42a5b4a3 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -31,15 +31,16 @@
 #include <oox/helper/refmap.hxx>
 #include <oox/helper/refvector.hxx>
 #include "numberformatsbuffer.hxx"
-#include <patattr.hxx>
-#include <stlsheet.hxx>
 #include <editeng/svxenum.hxx>
 #include <editeng/frmdir.hxx>
 #include <attarray.hxx>
 #include <vector>
 
+namespace oox { class SequenceInputStream; }
+
 namespace oox { class PropertySet;
-                class PropertyMap; }
+                class PropertyMap;
+                class AttributeList; }
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/inc/tablecolumnsbuffer.hxx b/sc/source/filter/inc/tablecolumnsbuffer.hxx
index 199165e24493..24d5557747f8 100644
--- a/sc/source/filter/inc/tablecolumnsbuffer.hxx
+++ b/sc/source/filter/inc/tablecolumnsbuffer.hxx
@@ -23,6 +23,8 @@
 #include <oox/helper/refvector.hxx>
 #include "workbookhelper.hxx"
 
+namespace oox { class AttributeList; }
+namespace oox { class SequenceInputStream; }
 class ScDBData;
 
 namespace oox {
diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx
index 268df421a8ee..a0dd2f80fba0 100644
--- a/sc/source/filter/inc/tokstack.hxx
+++ b/sc/source/filter/inc/tokstack.hxx
@@ -20,10 +20,8 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_TOKSTACK_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_TOKSTACK_HXX
 
-#include <string.h>
-#include <compiler.hxx>
 #include <tokenarray.hxx>
-#include <osl/diagnose.h>
+#include <refdata.hxx>
 #include <sal/log.hxx>
 
 #include <memory>
@@ -51,7 +49,6 @@ struct TokenId
     operator const sal_uInt16&() const { return nId; }
 };
 
-struct ScComplexRefData;
 class TokenStack;
 
 enum E_TYPE
diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h
index 1f9ff7295858..c2eb72f867c1 100644
--- a/sc/source/filter/inc/tool.h
+++ b/sc/source/filter/inc/tool.h
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_TOOL_H
 #define INCLUDED_SC_SOURCE_FILTER_INC_TOOL_H
 
-#include <attrib.hxx>
-#include <document.hxx>
+#include <i18nlangtag/lang.h>
+#include <svl/intitem.hxx>
+#include <types.hxx>
 #include <osl/diagnose.h>
 
 // Default values
diff --git a/sc/source/filter/inc/viewsettings.hxx b/sc/source/filter/inc/viewsettings.hxx
index 33e4163376ae..3fdbf663ad49 100644
--- a/sc/source/filter/inc/viewsettings.hxx
+++ b/sc/source/filter/inc/viewsettings.hxx
@@ -20,9 +20,10 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_VIEWSETTINGS_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_VIEWSETTINGS_HXX
 
-#include "addressconverter.hxx"
+#include <rangelst.hxx>
 #include "stylesbuffer.hxx"
 #include "worksheethelper.hxx"
+#include "workbookhelper.hxx"
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index 7a9047ae55d5..0d03de6389d5 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_WORKBOOKHELPER_HXX
 
 #include <memory>
-#include <rtl/ref.hxx>
 #include <oox/helper/storagebase.hxx>
-#include <oox/drawingml/chart/chartconverter.hxx>
-#include "biffhelper.hxx"
-#include <rangenam.hxx>
+#include <address.hxx>
+
+namespace oox { namespace drawingml { namespace chart { class ChartConverter; } } }
+namespace rtl { template <class reference_type> class Reference; }
 
 namespace com { namespace sun { namespace star {
     namespace container { class XNameContainer; }
@@ -38,7 +38,6 @@ namespace com { namespace sun { namespace star {
 } } }
 
 namespace oox {
-    class AttributeList;
     class SegmentProgressBar;
 }
 
@@ -53,6 +52,7 @@ class ScDocument;
 class ScDocumentImport;
 class ScEditEngineDefaulter;
 class ScDBData;
+class ScRangeData;
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/inc/workbooksettings.hxx b/sc/source/filter/inc/workbooksettings.hxx
index dda6cc366f15..2477ab8d6c8d 100644
--- a/sc/source/filter/inc/workbooksettings.hxx
+++ b/sc/source/filter/inc/workbooksettings.hxx
@@ -22,6 +22,9 @@
 
 #include "workbookhelper.hxx"
 
+namespace oox { class AttributeList; }
+namespace oox { class SequenceInputStream; }
+
 namespace com { namespace sun { namespace star { namespace util { struct Date; } } } }
 
 namespace oox {
diff --git a/sc/source/filter/inc/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx
index 3c6759c1390c..88addba088e7 100644
--- a/sc/source/filter/inc/worksheetbuffer.hxx
+++ b/sc/source/filter/inc/worksheetbuffer.hxx
@@ -24,8 +24,9 @@
 #include <oox/helper/refmap.hxx>
 #include <oox/helper/refvector.hxx>
 #include "workbookhelper.hxx"
-#include <documentimport.hxx>
 
+namespace oox { class SequenceInputStream; }
+namespace oox { class AttributeList; }
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx
index bd859ea67051..af88892c02bb 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -23,7 +23,7 @@
 #include <oox/helper/containerhelper.hxx>
 #include <oox/helper/progressbar.hxx>
 #include <oox/ole/olehelper.hxx>
-#include "addressconverter.hxx"
+#include <rangelst.hxx>
 #include "formulabase.hxx"
 
 struct ScDataBarFormatData;
@@ -42,8 +42,6 @@ namespace oox {
 namespace xls {
 
 class AutoFilterBuffer;
-struct BinAddress;
-struct BinRange;
 class CommentsBuffer;
 class CondFormatBuffer;
 class Font;
diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx
index 30a36d053421..ca3a33c4b13b 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -34,7 +34,9 @@
 #include <decl.h>
 #include <tool.h>
 #include <fprogressbar.hxx>
+#include <patattr.hxx>
 #include "lotfilter.hxx"
+#include <tools/stream.hxx>
 
 static ErrCode
 generate_Opcodes(LotusContext &rContext, SvStream& aStream,
diff --git a/sc/source/filter/lotus/lotfilter.hxx b/sc/source/filter/lotus/lotfilter.hxx
index 579f50de27a2..f54c9051393f 100644
--- a/sc/source/filter/lotus/lotfilter.hxx
+++ b/sc/source/filter/lotus/lotfilter.hxx
@@ -25,6 +25,7 @@
 #include <op.h>
 #include <optab.h>
 #include <root.hxx>
+#include <patattr.hxx>
 
 class SvxHorJustifyItem;
 class ScProtectionAttr;
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index 5b7260434343..ccaf439abcf7 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -27,6 +27,7 @@
 #include <root.hxx>
 #include <filtopt.hxx>
 #include <ftools.hxx>
+#include <patattr.hxx>
 
 ErrCode ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocument* pDocument, rtl_TextEncoding eSrc )
 {
diff --git a/sc/source/filter/lotus/memory.cxx b/sc/source/filter/lotus/memory.cxx
index 3b9831a6ff4e..b9fee11d8349 100644
--- a/sc/source/filter/lotus/memory.cxx
+++ b/sc/source/filter/lotus/memory.cxx
@@ -27,6 +27,7 @@
 #include <attrib.hxx>
 #include "lotfilter.hxx"
 #include <tool.h>
+#include <editeng/svxenum.hxx>
 
 bool MemNew(LotusContext &rContext)
 {
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 616f96808c56..062411b2f531 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -23,8 +23,10 @@
 #include <svl/zforlist.hxx>
 #include <sal/log.hxx>
 
+#include <attrib.hxx>
 #include <rangenam.hxx>
 #include <compiler.hxx>
+#include <document.hxx>
 
 #include <tool.h>
 #include <decl.h>
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx
index cca13dd87100..3f9a3088bb08 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -38,6 +38,7 @@
 #include <oox/token/tokens.hxx>
 #include <addressconverter.hxx>
 #include <defnamesbuffer.hxx>
+#include <biffhelper.hxx>
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/oox/autofiltercontext.cxx b/sc/source/filter/oox/autofiltercontext.cxx
index a720125ba4c1..48add9c6ecfc 100644
--- a/sc/source/filter/oox/autofiltercontext.cxx
+++ b/sc/source/filter/oox/autofiltercontext.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <autofiltercontext.hxx>
+#include <biffhelper.hxx>
 
 #include <autofilterbuffer.hxx>
 #include <oox/token/namespaces.hxx>
diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx
index 70541ed4e620..313024eefe6a 100644
--- a/sc/source/filter/oox/chartsheetfragment.cxx
+++ b/sc/source/filter/oox/chartsheetfragment.cxx
@@ -26,6 +26,7 @@
 #include <viewsettings.hxx>
 #include <workbooksettings.hxx>
 #include <worksheetsettings.hxx>
+#include <biffhelper.hxx>
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/oox/commentsfragment.cxx b/sc/source/filter/oox/commentsfragment.cxx
index 7df7e348b7e9..8aba5828dcab 100644
--- a/sc/source/filter/oox/commentsfragment.cxx
+++ b/sc/source/filter/oox/commentsfragment.cxx
@@ -19,6 +19,7 @@
 
 #include <commentsfragment.hxx>
 
+#include <biffhelper.hxx>
 #include <richstringcontext.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index dce8eb816fac..1655dbfd9af9 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -35,6 +35,7 @@
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
 #include <addressconverter.hxx>
+#include <biffhelper.hxx>
 #include <stylesbuffer.hxx>
 #include <themebuffer.hxx>
 
@@ -45,6 +46,8 @@
 #include <tokenarray.hxx>
 #include <tokenuno.hxx>
 
+namespace oox { class AttributeList; }
+
 namespace oox {
 namespace xls {
 
diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx
index 094d0ddae644..a76ee190fa73 100644
--- a/sc/source/filter/oox/condformatcontext.cxx
+++ b/sc/source/filter/oox/condformatcontext.cxx
@@ -20,6 +20,7 @@
 #include <condformatcontext.hxx>
 #include <extlstcontext.hxx>
 
+#include <biffhelper.hxx>
 #include <condformatbuffer.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx
index ba469329571d..4aef1f8e45de 100644
--- a/sc/source/filter/oox/connectionsbuffer.cxx
+++ b/sc/source/filter/oox/connectionsbuffer.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <connectionsbuffer.hxx>
+#include <biffhelper.hxx>
 
 #include <osl/diagnose.h>
 #include <oox/helper/attributelist.hxx>
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index 3f3bf3970cfc..5bd2e56759b3 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -33,6 +33,7 @@
 #include <oox/helper/propertyset.hxx>
 #include <oox/token/tokens.hxx>
 #include <addressconverter.hxx>
+#include <biffhelper.hxx>
 #include <externallinkbuffer.hxx>
 #include <formulabase.hxx>
 #include <formulaparser.hxx>
diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx
index 15b6da334777..4babd3468b89 100644
--- a/sc/source/filter/oox/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <drawingbase.hxx>
+#include <addressconverter.hxx>
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <osl/diagnose.h>
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index 464eeb781f90..204b62e9400f 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -35,6 +35,7 @@
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
 #include <addressconverter.hxx>
+#include <biffhelper.hxx>
 #include <excelhandlers.hxx>
 #include <formulaparser.hxx>
 #include <worksheetbuffer.hxx>
diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx
index f665d327b36e..a280add971e0 100644
--- a/sc/source/filter/oox/externallinkfragment.cxx
+++ b/sc/source/filter/oox/externallinkfragment.cxx
@@ -28,6 +28,7 @@
 #include <defnamesbuffer.hxx>
 #include <sheetdatacontext.hxx>
 #include <unitconverter.hxx>
+#include <biffhelper.hxx>
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index bc9ab89775cb..85ae9fa786cc 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -30,6 +30,7 @@
 #include <oox/token/properties.hxx>
 #include <oox/helper/binaryinputstream.hxx>
 #include <addressconverter.hxx>
+#include <biffhelper.hxx>
 #include <defnamesbuffer.hxx>
 #include <externallinkbuffer.hxx>
 #include <tablebuffer.hxx>
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 75a6d8b44205..3fc0e6dbe4ac 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <numberformatsbuffer.hxx>
+#include <biffhelper.hxx>
 
 #include <com/sun/star/i18n/NumberFormatIndex.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
@@ -31,6 +32,7 @@
 #include <osl/thread.h>
 #include <rtl/ustrbuf.hxx>
 #include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
 #include <oox/core/filterbase.hxx>
 #include <oox/helper/binaryinputstream.hxx>
 #include <oox/helper/attributelist.hxx>
diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx
index 639a9bf63900..c563321a03c5 100644
--- a/sc/source/filter/oox/ooxformulaparser.cxx
+++ b/sc/source/filter/oox/ooxformulaparser.cxx
@@ -20,6 +20,7 @@
 #include <ooxformulaparser.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <osl/diagnose.h>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index cb23e8b70396..7f08053b7500 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -46,8 +46,11 @@
 #include <stylesbuffer.hxx>
 #include <unitconverter.hxx>
 #include <document.hxx>
+#include <biffhelper.hxx>
 #include <filter/msfilter/util.hxx>
 
+namespace oox { class AttributeList; }
+
 namespace oox {
 namespace xls {
 
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index d9dcfca9328c..bb4adfb8aadd 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -49,6 +49,8 @@
 #include <dpsave.hxx>
 #include <dpdimsave.hxx>
 #include <tools/datetime.hxx>
+#include <addressconverter.hxx>
+#include <biffhelper.hxx>
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx
index 817d2e205635..60df4fd05dcc 100644
--- a/sc/source/filter/oox/pivotcachefragment.cxx
+++ b/sc/source/filter/oox/pivotcachefragment.cxx
@@ -24,6 +24,7 @@
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 #include <addressconverter.hxx>
+#include <biffhelper.hxx>
 #include <formulabuffer.hxx>
 #include <pivotcachebuffer.hxx>
 #include <worksheetbuffer.hxx>
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx
index ab9aeaeeba07..3363068464ca 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -47,6 +47,7 @@
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
 #include <addressconverter.hxx>
+#include <biffhelper.hxx>
 
 #include <dapiuno.hxx>
 #include <dpobject.hxx>
diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx
index 03441459a337..5bac8f3c68be 100644
--- a/sc/source/filter/oox/pivottablefragment.cxx
+++ b/sc/source/filter/oox/pivottablefragment.cxx
@@ -19,6 +19,7 @@
 
 #include <pivottablefragment.hxx>
 #include <pivottablebuffer.hxx>
+#include <biffhelper.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 
diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx
index 52f79bb83b07..2c50931e35d1 100644
--- a/sc/source/filter/oox/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -30,6 +30,7 @@
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
 #include <addressconverter.hxx>
+#include <biffhelper.hxx>
 #include <connectionsbuffer.hxx>
 #include <defnamesbuffer.hxx>
 
diff --git a/sc/source/filter/oox/querytablefragment.cxx b/sc/source/filter/oox/querytablefragment.cxx
index 39f4d7fefb64..67f9f7fb2c4c 100644
--- a/sc/source/filter/oox/querytablefragment.cxx
+++ b/sc/source/filter/oox/querytablefragment.cxx
@@ -19,6 +19,7 @@
 
 #include <querytablefragment.hxx>
 #include <querytablebuffer.hxx>
+#include <biffhelper.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 
diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index 6d55e71da8c6..9a1a012bffba 100644
--- a/sc/source/filter/oox/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <richstring.hxx>
+#include <biffhelper.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/text/XText.hpp>
diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx
index aaa00d9720d4..3ad1cf1371f6 100644
--- a/sc/source/filter/oox/scenariobuffer.cxx
+++ b/sc/source/filter/oox/scenariobuffer.cxx
@@ -32,6 +32,7 @@
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
 #include <addressconverter.hxx>
+#include <biffhelper.hxx>
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/oox/scenariocontext.cxx b/sc/source/filter/oox/scenariocontext.cxx
index 28567d2eeb0b..ddb61d97ea7c 100644
--- a/sc/source/filter/oox/scenariocontext.cxx
+++ b/sc/source/filter/oox/scenariocontext.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <scenariocontext.hxx>
+#include <biffhelper.hxx>
 
 #include <scenariobuffer.hxx>
 #include <oox/token/namespaces.hxx>
diff --git a/sc/source/filter/oox/sharedstringsfragment.cxx b/sc/source/filter/oox/sharedstringsfragment.cxx
index 3b41268c8799..a24b2870fe1d 100644
--- a/sc/source/filter/oox/sharedstringsfragment.cxx
+++ b/sc/source/filter/oox/sharedstringsfragment.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sharedstringsfragment.hxx>
+#include <biffhelper.hxx>
 
 #include <richstringcontext.hxx>
 #include <sharedstringsbuffer.hxx>
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index 215bfaf8d64e..a4e764bbe538 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -46,6 +46,7 @@
 #include <formulacell.hxx>
 #include <docpool.hxx>
 #include <paramisc.hxx>
+#include <patattr.hxx>
 #include <documentimport.hxx>
 #include <formulabuffer.hxx>
 #include <numformat.hxx>
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx
index 2333e0b8479d..e3a3aea9fade 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -25,6 +25,7 @@
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 #include <addressconverter.hxx>
+#include <biffhelper.hxx>
 #include <formulaparser.hxx>
 #include <richstringcontext.hxx>
 #include <unitconverter.hxx>
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index c3a97aba7347..b923e3b5d01e 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -81,6 +81,9 @@
 #include <xlconst.hxx>
 #include <documentimport.hxx>
 #include <numformat.hxx>
+#include <patattr.hxx>
+#include <stlsheet.hxx>
+#include <biffhelper.hxx>
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/oox/stylesfragment.cxx b/sc/source/filter/oox/stylesfragment.cxx
index a9423ac8d792..9efcbc45e703 100644
--- a/sc/source/filter/oox/stylesfragment.cxx
+++ b/sc/source/filter/oox/stylesfragment.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <stylesfragment.hxx>
+#include <biffhelper.hxx>
 
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx
index 8798ca69fbf5..0d50a5502332 100644
--- a/sc/source/filter/oox/tablebuffer.cxx
+++ b/sc/source/filter/oox/tablebuffer.cxx
@@ -30,6 +30,7 @@
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
 #include <addressconverter.hxx>
+#include <biffhelper.hxx>
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/oox/tablefragment.cxx b/sc/source/filter/oox/tablefragment.cxx
index b8e47b88f2bd..5aa35b13a5e3 100644
--- a/sc/source/filter/oox/tablefragment.cxx
+++ b/sc/source/filter/oox/tablefragment.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <tablefragment.hxx>
+#include <biffhelper.hxx>
 
 #include <autofilterbuffer.hxx>
 #include <autofiltercontext.hxx>
diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx
index f805ae52c2ac..31670efb2ed7 100644
--- a/sc/source/filter/oox/unitconverter.cxx
+++ b/sc/source/filter/oox/unitconverter.cxx
@@ -32,6 +32,7 @@
 #include <oox/helper/propertyset.hxx>
 #include <oox/token/properties.hxx>
 #include <stylesbuffer.hxx>
+#include <biffhelper.hxx>
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index cd50c3d96e2c..fc8873e5ebce 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -50,6 +50,8 @@
 #include <sheetdatacontext.hxx>
 #include <extlstcontext.hxx>
 #include <officecfg/Office/Common.hxx>
+#include <documentimport.hxx>
+#include <biffhelper.hxx>
 
 #include <document.hxx>
 #include <docsh.hxx>
diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx
index 34be4e5608fa..b328b6516ff0 100644
--- a/sc/source/filter/oox/workbooksettings.cxx
+++ b/sc/source/filter/oox/workbooksettings.cxx
@@ -33,6 +33,7 @@
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
 #include <unitconverter.hxx>
+#include <biffhelper.hxx>
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx
index 9cf72c855024..23630400dfda 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -34,6 +34,8 @@
 #include <oox/token/tokens.hxx>
 #include <excelhandlers.hxx>
 #include <document.hxx>
+#include <documentimport.hxx>
+#include <biffhelper.hxx>
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index 37baf7839427..e910f6bda5c1 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -27,6 +27,7 @@
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 #include <addressconverter.hxx>
+#include <biffhelper.hxx>
 #include <autofilterbuffer.hxx>
 #include <autofiltercontext.hxx>
 #include <commentsfragment.hxx>
diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx
index f322f41c52e3..1110eb55f415 100644
--- a/sc/source/filter/oox/worksheetsettings.cxx
+++ b/sc/source/filter/oox/worksheetsettings.cxx
@@ -29,6 +29,8 @@
 #include <pagesettings.hxx>
 #include <tabprotection.hxx>
 #include <document.hxx>
+#include <addressconverter.hxx>
+#include <biffhelper.hxx>
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index c55fd7535d3d..b3451b1352e4 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -9,6 +9,7 @@
 
 #include <orcusfiltersimpl.hxx>
 #include <orcusinterface.hxx>
+#include <tokenarray.hxx>
 
 #include <document.hxx>
 
diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx
index 5494ddefc434..2b98a1285455 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -11,6 +11,7 @@
 #include <orcusinterface.hxx>
 #include <orcusxml.hxx>
 #include <document.hxx>
+#include <tokenarray.hxx>
 
 #include <svtools/treelistbox.hxx>
 #include <svtools/treelistentry.hxx>
diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index 5f6d04c4a753..28cbf788c5be 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -30,6 +30,7 @@
 #include <docpool.hxx>
 #include <patattr.hxx>
 #include <filter.hxx>
+#include <ftools.hxx>
 #include <document.hxx>
 #include <formulacell.hxx>
 #include <tools/stream.hxx>