tdf#42949 Fix IWYU warnings in sc/inc/[a,c]*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Quite a bit of fallout management was necessary.
Several files were not checked earlier because of IWYU problems.
Also a few mistaken entries from the yaml file are corrected.

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

39 files changed, 96 insertions, 58 deletions

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 3e934749e154..a72dfb5d1d58 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -19,20 +19,18 @@ blacklist:
     - com/sun/star/lang/XServiceInfo.hpp
     sc/inc/afmtuno.hxx:
     # base class has to be a complete type
-    - com/sun/star/beans/XPropertySet.hpp
+    - com/sun/star/container/XNameContainer.hpp
     - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/beans/XPropertySet.hpp
     - com/sun/star/lang/XUnoTunnel.hpp
-    - com/sun/star/container/XIndexReplace.hpp
-    - com/sun/star/container/XNameContainer.hpp
-    - com/sun/star/container/XNameReplace.hpp
     - com/sun/star/container/XNamed.hpp
-    - com/sun/star/container/XSet.hpp
+    - com/sun/star/container/XEnumerationAccess.hpp
+    - com/sun/star/container/XIndexAccess.hpp
     sc/inc/appluno.hxx:
     # base class has to be a complete type
     - com/sun/star/beans/XPropertySet.hpp
     - com/sun/star/container/XEnumerationAccess.hpp
     - com/sun/star/container/XNameAccess.hpp
-    - com/sun/star/lang/XMultiServiceFactory.hpp
     - com/sun/star/lang/XServiceInfo.hpp
     - com/sun/star/sheet/XFunctionDescriptions.hpp
     - com/sun/star/sheet/XGlobalSheetSettings.hpp
@@ -52,6 +50,20 @@ blacklist:
     - com/sun/star/lang/XServiceInfo.hpp
     - com/sun/star/table/XTableChart.hpp
     - com/sun/star/table/XTableCharts.hpp
+    sc/inc/chart2uno.hxx:
+    # base class has to be a complete type
+    - com/sun/star/chart2/data/XDataProvider.hpp
+    - com/sun/star/chart2/data/XSheetDataProvider.hpp
+    - com/sun/star/chart2/data/XRangeXMLConversion.hpp
+    - com/sun/star/chart2/data/XDataSource.hpp
+    - com/sun/star/chart2/data/XDataSequence.hpp
+    - com/sun/star/chart2/data/XTextualDataSequence.hpp
+    - com/sun/star/chart2/data/XNumericalDataSequence.hpp
+    - com/sun/star/chart2/XTimeBased.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/beans/XPropertySet.hpp
+    - com/sun/star/util/XCloneable.hpp
+    - com/sun/star/util/XModifyBroadcaster.hpp
     sc/inc/chgviset.hxx:
     # base class has to be a complete type
     - unotools/textsearch.hxx
@@ -59,14 +71,10 @@ blacklist:
     # base class has to be a complete type
     - mdds/flat_segment_tree.hpp
     - svx/svdobj.hxx
-    sc/inc/columnset.hxx:
-    # contains macro definitions
-    - address.hxx
     sc/inc/compiler.hxx:
     # base class has to be a complete type
     - com/sun/star/sheet/ExternalLinkInfo.hpp
-    - o3tl/typed_flags_set.hxx
-    - unotools/charclass.hxx
+    - com/sun/star/i18n/ParseResult.hpp
     sc/inc/confuno.hxx:
     # base class has to be a complete type
     - com/sun/star/beans/XPropertySet.hpp
@@ -74,9 +82,6 @@ blacklist:
     sc/inc/conditio.hxx:
     # base class has to be a complete type
     - tools/link.hxx
-    sc/inc/convuno.hxx:
-    # base class has to be a complete type
-    - com/sun/star/lang/Locale.hpp
     sc/inc/dbdocutl.hxx:
     # base class has to be a complete type
     - com/sun/star/uno/Reference.hxx
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index 6b2f1b29f535..e22a6c056f9d 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -21,23 +21,23 @@
 #define INCLUDED_SC_INC_ADDINCOL_HXX
 
 #include <memory>
-#include "global.hxx"
-#include <com/sun/star/sheet/XVolatileResult.hpp>
-#include <com/sun/star/sheet/XAddIn.hpp>
-#include <com/sun/star/sheet/XResultListener.hpp>
-#include <com/sun/star/sheet/ResultEvent.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/reflection/XIdlMethod.hpp>
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Sequence.h>
+#include <formula/errorcodes.hxx>
 #include <i18nlangtag/lang.h>
-#include <rtl/ustring.h>
 #include "scdllapi.h"
 #include <rtl/ustring.hxx>
-#include "scmatrix.hxx"
 
 #include "types.hxx"
 
+#include <vector>
 #include <unordered_map>
 
+namespace com { namespace sun { namespace star { namespace reflection { class XIdlMethod; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { class XVolatileResult; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+
 class SfxObjectShell;
 class ScUnoAddInFuncData;
 class ScFuncDesc;
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index 09172e84fa63..cb0ed438b70b 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -22,9 +22,8 @@
 
 #include <svl/itemprop.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/container/XSet.hpp>
-#include <com/sun/star/container/XIndexReplace.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 36b6e9ac92d3..15bb4d987920 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -22,7 +22,6 @@
 
 #include <svl/itemprop.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sheet/XRecentFunctions.hpp>
 #include <com/sun/star/sheet/XFunctionDescriptions.hpp>
@@ -33,6 +32,8 @@
 #include <rtl/ustring.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
 
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+
 css::uno::Reference<css::uno::XInterface>
     ScSpreadsheetSettings_CreateInstance(
         const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMgr );
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index 43a75832be4b..ebadb6e329fd 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -20,14 +20,13 @@
 #ifndef INCLUDED_SC_INC_APPOPTIO_HXX
 #define INCLUDED_SC_INC_APPOPTIO_HXX
 
-#include <memory>
-#include <vcl/field.hxx>
 #include <sfx2/zoomitem.hxx>
-#include <unotools/configitem.hxx>
 #include "scdllapi.h"
-#include "scmod.hxx"
 #include "global.hxx"
 #include "optutil.hxx"
+#include <tools/fldunit.hxx>
+#include <tools/color.hxx>
+#include <tools/link.hxx>
 
 class SC_DLLPUBLIC ScAppOptions
 {
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index b59a84218f88..236000218bcb 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -20,16 +20,14 @@
 #ifndef INCLUDED_SC_INC_CELLSUNO_HXX
 #define INCLUDED_SC_INC_CELLSUNO_HXX
 
-#include "global.hxx"
+#include "address.hxx"
 #include "rangelst.hxx"
 
-#include <editeng/unotext.hxx>
 #include <formula/grammar.hxx>
 #include <rtl/ref.hxx>
 #include <tools/link.hxx>
 #include <svl/lstner.hxx>
 #include <svl/listener.hxx>
-#include <svl/itemprop.hxx>
 #include <com/sun/star/table/XTableChartsSupplier.hpp>
 #include <com/sun/star/table/XTablePivotChartsSupplier.hpp>
 #include <com/sun/star/chart/XChartDataArray.hpp>
@@ -69,9 +67,6 @@
 #include <com/sun/star/util/XImportable.hpp>
 #include <com/sun/star/table/XColumnRowRange.hpp>
 #include <com/sun/star/table/XCell2.hpp>
-#include <com/sun/star/table/BorderLine2.hpp>
-#include <com/sun/star/table/TableBorder.hpp>
-#include <com/sun/star/table/TableBorder2.hpp>
 #include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp>
 #include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp>
 #include <com/sun/star/sheet/XScenariosSupplier.hpp>
@@ -94,17 +89,29 @@
 #include <memory>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace table { struct BorderLine2; } } } }
+namespace com { namespace sun { namespace star { namespace table { struct BorderLine; } } } }
+namespace com { namespace sun { namespace star { namespace table { struct TableBorder2; } } } }
+namespace com { namespace sun { namespace star { namespace table { struct TableBorder; } } } }
+
 class ScDocShell;
 class ScMarkData;
 class ScMemChart;
 class ScPrintRangeSaver;
 class ScAttrRectIterator;
 class ScCellRangeObj;
-class ScLinkListener;
 class ScPatternAttr;
 class SvxBoxItem;
 class SvxBoxInfoItem;
 class SvxItemPropertySet;
+class SvxUnoText;
+class ScDocument;
+class SfxBroadcaster;
+class SfxHint;
+class SfxItemPropertyMap;
+class SfxItemPropertySet;
+class SfxItemSet;
+struct SfxItemPropertySimpleEntry;
 
 namespace editeng { class SvxBorderLine; }
 
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index fb19a502a4c9..1083c084d2dd 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -27,7 +27,6 @@
 #include "chartlis.hxx"
 
 #include <svl/lstner.hxx>
-#include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/chart2/data/XSheetDataProvider.hpp>
 #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp>
@@ -35,7 +34,6 @@
 #include <com/sun/star/chart2/data/XDataSequence.hpp>
 #include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
 #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp>
-#include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
 #include <com/sun/star/chart2/data/DataSequenceRole.hpp>
 #include <com/sun/star/chart2/XTimeBased.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -50,6 +48,8 @@
 #include <unordered_set>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XLabeledDataSequence; } } } } }
+
 class ScDocument;
 
 // DataProvider
diff --git a/sc/inc/charthelper.hxx b/sc/inc/charthelper.hxx
index 7aad9522045a..a12b64835dd3 100644
--- a/sc/inc/charthelper.hxx
+++ b/sc/inc/charthelper.hxx
@@ -20,11 +20,10 @@
 #ifndef INCLUDED_SC_INC_CHARTHELPER_HXX
 #define INCLUDED_SC_INC_CHARTHELPER_HXX
 
-#include "address.hxx"
-#include "global.hxx"
 #include "rangelst.hxx"
 
-#include <com/sun/star/chart2/XChartDocument.hpp>
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
 
 class SdrObject;
 class SdrPage;
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index e4562cd56ee1..2a49c368fa3b 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -20,11 +20,9 @@
 #ifndef INCLUDED_SC_INC_CHARTLIS_HXX
 #define INCLUDED_SC_INC_CHARTLIS_HXX
 
-#include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include <svl/listener.hxx>
 #include "rangelst.hxx"
-#include "token.hxx"
 #include "externalrefmgr.hxx"
 
 #include <memory>
@@ -33,10 +31,12 @@
 #include <unordered_set>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace chart { class XChartData; } } } }
+namespace com { namespace sun { namespace star { namespace chart { class XChartDataChangeEventListener; } } } }
+
+class Timer;
 class ScDocument;
 class ScChartUnoData;
-#include <com/sun/star/chart/XChartData.hpp>
-#include <com/sun/star/chart/XChartDataChangeEventListener.hpp>
 
 class SC_DLLPUBLIC ScChartListener : public SvtListener
 {
diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx
index d950f816d543..eae744a2b7dd 100644
--- a/sc/inc/chartlock.hxx
+++ b/sc/inc/chartlock.hxx
@@ -23,9 +23,11 @@
 #include <vcl/timer.hxx>
 
 #include <cppuhelper/weakref.hxx>
-#include <com/sun/star/frame/XModel.hpp>
 
 #include <memory>
+#include <vector>
+
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
 
 class ScDocument;
 
diff --git a/sc/inc/clipoptions.hxx b/sc/inc/clipoptions.hxx
index d4ccb59b4dee..984acc5eb17b 100644
--- a/sc/inc/clipoptions.hxx
+++ b/sc/inc/clipoptions.hxx
@@ -10,7 +10,10 @@
 #ifndef INCLUDED_SC_INC_CLIPOPTIONS_HXX
 #define INCLUDED_SC_INC_CLIPOPTIONS_HXX
 
-#include <com/sun/star/document/XDocumentProperties.hpp>
+#include "scdllapi.h"
+#include <com/sun/star/uno/Reference.h>
+
+namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; } } } }
 
 /// Stores options which are only relevant for clipboard documents.
 class SC_DLLPUBLIC ScClipOptions
diff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxx
index 2e5dece711e8..ee9422bc27db 100644
--- a/sc/inc/clipparam.hxx
+++ b/sc/inc/clipparam.hxx
@@ -21,11 +21,8 @@
 #define INCLUDED_SC_INC_CLIPPARAM_HXX
 
 #include "rangelst.hxx"
-#include "rangenam.hxx"
 #include "charthelper.hxx"
 
-#include <vector>
-
 /**
  * This struct stores general clipboard parameters associated with a
  * ScDocument instance created in clipboard mode.
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 0ed8a82d14e3..deab394229ea 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -12,7 +12,6 @@
 
 #include <formula/grammar.hxx>
 #include <tools/color.hxx>
-#include "rangelst.hxx"
 #include "conditio.hxx"
 #include "document.hxx"
 
@@ -21,7 +20,6 @@
 
 //TODO: merge this with conditio.hxx
 
-class ScDocument;
 class ScFormulaCell;
 class ScTokenArray;
 struct ScDataBarInfo;
diff --git a/sc/inc/columnset.hxx b/sc/inc/columnset.hxx
index ddf08ba8f860..879c9098b9d6 100644
--- a/sc/inc/columnset.hxx
+++ b/sc/inc/columnset.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SC_INC_COLUMNSET_HXX
 #define INCLUDED_SC_INC_COLUMNSET_HXX
 
-#include "address.hxx"
+#include "types.hxx"
 
 #include <unordered_set>
 #include <unordered_map>
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index c569c84b9c6c..ffd783a32506 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -29,14 +29,16 @@
 #include "token.hxx"
 #include <formula/token.hxx>
 #include <formula/grammar.hxx>
-#include <unotools/charclass.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/sheet/ExternalLinkInfo.hpp>
+#include <com/sun/star/i18n/ParseResult.hpp>
 #include <vector>
 #include <memory>
+#include <com/sun/star/uno/Sequence.hxx>
 
 #include <formula/FormulaCompiler.hxx>
-#include <o3tl/typed_flags_set.hxx>
+
+namespace o3tl { template <typename T> struct typed_flags; }
 
 // constants and data types also for external modules (ScInterpreter et al)
 
@@ -83,6 +85,7 @@ class ScMatrix;
 class ScRangeData;
 class ScTokenArray;
 struct ScInterpreterContext;
+class CharClass;
 
 namespace sc {
 
diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx
index 14cf2728c411..389badf0eb84 100644
--- a/sc/inc/convuno.hxx
+++ b/sc/inc/convuno.hxx
@@ -24,9 +24,10 @@
 #include <i18nlangtag/lang.h>
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/table/CellRangeAddress.hpp>
-#include <com/sun/star/lang/Locale.hpp>
 #include "address.hxx"
 
+namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+
 class ScUnoConversion
 {
 public:
diff --git a/sc/qa/unit/chart2dataprovider.cxx b/sc/qa/unit/chart2dataprovider.cxx
index e5536d391997..b25f8aaea7e5 100644
--- a/sc/qa/unit/chart2dataprovider.cxx
+++ b/sc/qa/unit/chart2dataprovider.cxx
@@ -15,6 +15,7 @@
 #include <charthelper.hxx>
 
 #include <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/chart2/data/XLabeledDataSequence2.hpp>
 #include <com/sun/star/chart2/data/XDataSource.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 616d11f7d845..144a5babac9e 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -38,6 +38,7 @@
 #include <dbdata.hxx>
 #include <sortparam.hxx>
 #include <scopetools.hxx>
+#include <scmod.hxx>
 
 #include <svx/svdpage.hxx>
 
diff --git a/sc/qa/unit/helper/sorthelper.hxx b/sc/qa/unit/helper/sorthelper.hxx
index 5ace22779a72..e71045097f73 100644
--- a/sc/qa/unit/helper/sorthelper.hxx
+++ b/sc/qa/unit/helper/sorthelper.hxx
@@ -13,6 +13,7 @@
 // Unfortunately requires linkage to sc/ internals so
 // can't live in qahelper itself.
 #include <inputopt.hxx>
+#include <scmod.hxx>
 
 /**
  * Temporarily set the sorting type.
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index 5a970f0a53fa..bf1813ee7edd 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -43,6 +43,7 @@
 #include <validat.hxx>
 #include <attrib.hxx>
 #include <global.hxx>
+#include <scmod.hxx>
 
 #include <svx/svdoole2.hxx>
 #include <svx/svdpage.hxx>
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 0f4e91090ffa..1260370602c4 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -55,6 +55,7 @@
 #include <rowheightcontext.hxx>
 #include <refhint.hxx>
 #include <listenercontext.hxx>
+#include <token.hxx>
 
 #include <scitems.hxx>
 #include <editeng/boxitem.hxx>
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index e2fd421f919c..e72c9ccc2f68 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -37,6 +37,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/sheet/XCompatibilityNames.hpp>
 #include <com/sun/star/sheet/NoConvergenceException.hpp>
+#include <com/sun/star/sheet/XAddIn.hpp>
 
 #include <addincol.hxx>
 #include <addinhelpid.hxx>
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 8ff2eff2c937..ca5b9c210b86 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -29,6 +29,7 @@
 #include <formula/compiler.hxx>
 #include <miscuno.hxx>
 #include <memory>
+#include <osl/diagnose.h>
 
 using namespace utl;
 using namespace com::sun::star::uno;
diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx
index c58d07d7fb35..165c9a54e07c 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -22,6 +22,7 @@
 #include <docsh.hxx>
 
 #include <comphelper/configurationlistener.hxx>
+#include <com/sun/star/datatransfer/XTransferable2.hpp>
 
 using comphelper::ConfigurationListener;
 
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 3b2383a30d86..6c853fcb2166 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -24,6 +24,7 @@
 #include <brdcst.hxx>
 #include <document.hxx>
 #include <reftokenhelper.hxx>
+#include <com/sun/star/chart/XChartDataChangeEventListener.hpp>
 
 using namespace com::sun::star;
 using ::std::vector;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 575ebd64cad4..9b921db2b3e4 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -51,6 +51,7 @@
 #include <dbdata.hxx>
 #include <reordermap.hxx>
 #include <svl/sharedstring.hxx>
+#include <scmatrix.hxx>
 
 using ::std::vector;
 
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx
index 91a0f63915b6..a8f9b8d01d38 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -38,6 +38,7 @@
 #include <com/sun/star/sheet/XDataPilotField.hpp>
 #include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp>
 #include <com/sun/star/sheet/XSheetOperation.hpp>
+#include <osl/diagnose.hxx>
 #include <oox/helper/binaryinputstream.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/helper/containerhelper.hxx>
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 0899b3c557b8..9514a5b3d692 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -55,6 +55,7 @@
 #include <calcconfig.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
+#include <scmod.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index fa9257c1fe88..3a726d31ec27 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -50,6 +50,7 @@
 #include <progress.hxx>
 #include <undosort.hxx>
 #include <inputopt.hxx>
+#include <scmod.hxx>
 
 #include <chartlis.hxx>
 #include <ChartTools.hxx>
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 48ae556cf485..8c39abc9cad4 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -34,6 +34,7 @@
 #include <scresid.hxx>
 #include <cellvalue.hxx>
 #include <defaultsoptions.hxx>
+#include <scmod.hxx>
 
 #include <osl/file.hxx>
 #include <sfx2/app.hxx>
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index f8f5c3391a74..d65b09772a75 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -25,6 +25,7 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
 #include <sfx2/viewsh.hxx>
+#include <com/sun/star/datatransfer/XTransferable2.hpp>
 
 #include <scdllapi.h>
 #include <scdll.hxx>
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index f10fc2bb7d55..d2f03486c794 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/util/SortFieldType.hpp>
 #include <com/sun/star/table/CellOrientation.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
+#include <com/sun/star/table/TableBorder2.hpp>
 #include <com/sun/star/awt/SimpleFontMetric.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 1ac3eac1a7ea..e0993bdede86 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -51,6 +51,7 @@
 #include <com/sun/star/table/CellVertJustify2.hpp>
 #include <com/sun/star/table/ShadowFormat.hpp>
 #include <com/sun/star/table/TableBorder.hpp>
+#include <com/sun/star/table/TableBorder2.hpp>
 #include <com/sun/star/table/BorderLineStyle.hpp>
 #include <com/sun/star/sheet/CellFlags.hpp>
 #include <com/sun/star/sheet/FormulaResult.hpp>
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index fd1976a75b44..83bb6ac39b2d 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -52,6 +52,7 @@
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
+#include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/chart2/data/LabeledDataSequence.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 042c548eae74..9e3ae551e22c 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -32,6 +32,7 @@
 #include <viewopti.hxx>
 #include <docpool.hxx>
 #include <sc.hrc>
+#include <scmod.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/document/LinkUpdateModes.hpp>
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 5a75b348a5be..6e5ff6f8a154 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -21,6 +21,7 @@
 #include <editeng/memberids.h>
 #include <svx/algitem.hxx>
 #include <editeng/boxitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/justifyitem.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/lineitem.hxx>
@@ -45,6 +46,7 @@
 #include <com/sun/star/table/BorderLine.hpp>
 #include <com/sun/star/table/CellVertJustify2.hpp>
 #include <com/sun/star/table/TableBorder.hpp>
+#include <com/sun/star/table/TableBorder2.hpp>
 #include <com/sun/star/table/ShadowFormat.hpp>
 #include <com/sun/star/table/CellHoriJustify.hpp>
 #include <com/sun/star/table/CellOrientation.hpp>
diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx
index 38efe31db616..1d82ded74aad 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/table/XColumnRowRange.hpp>
 #include <ooo/vba/excel/XlColorIndex.hpp>
 #include <ooo/vba/excel/XlUnderlineStyle.hpp>
+#include <editeng/eeitem.hxx>
 #include <svl/itemset.hxx>
 #include "excelvbahelper.hxx"
 #include "vbafont.hxx"
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 7c6f710a7859..bc44c67a900f 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -61,6 +61,7 @@
 #include <scextopt.hxx>
 #include <tabvwsh.hxx>
 #include <compiler.hxx>
+#include <scmod.hxx>
 
 #include <asciiopt.hxx>
 #include <scabstdlg.hxx>
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 973240b3ea64..f37d0d1241fc 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -44,6 +44,7 @@
 #include <globalnames.hxx>
 #include <inputhdl.hxx>
 #include <tabvwsh.hxx>
+#include <scmod.hxx>
 
 #include <vector>