From b88706f98b0859a40b5e50596c9fa75398c90c2f Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemeng@ubuntu.com>
Date: Sat, 19 May 2018 09:52:55 +0200
Subject: tdf#42949 Fix more IWYU warnings in sc/inc/d*

Found with bin/find-unneeded-includes
These were quite a bit entangled with each other
thus a lot of fallout management was necessary.

Also try harder to use fw declarations in files already checked

Change-Id: Ia69c3a0d66ec2763ac03094aaa1b646a290d3cfa
Reviewed-on: https://gerrit.libreoffice.org/56361
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
---
 sc/IwyuFilter_sc.yaml                          | 56 +++++++++++++++++---------
 sc/inc/dapiuno.hxx                             | 20 ++++-----
 sc/inc/datauno.hxx                             |  5 ++-
 sc/inc/dbdocutl.hxx                            |  3 +-
 sc/inc/docoptio.hxx                            |  5 ---
 sc/inc/document.hxx                            | 23 +++--------
 sc/inc/docuno.hxx                              |  7 ++--
 sc/inc/dpcache.hxx                             | 11 +++--
 sc/inc/dpdimsave.hxx                           |  3 +-
 sc/inc/dpfilteredcache.hxx                     |  5 +++
 sc/inc/dpitemdata.hxx                          |  2 +-
 sc/inc/dpobject.hxx                            |  7 +++-
 sc/inc/dpoutput.hxx                            |  8 ++--
 sc/inc/dpresfilter.hxx                         |  5 ++-
 sc/inc/dpsave.hxx                              |  2 +-
 sc/inc/dptabdat.hxx                            |  2 -
 sc/inc/dptabres.hxx                            |  7 ++--
 sc/inc/dptabsrc.hxx                            |  2 +-
 sc/inc/funcuno.hxx                             |  2 +
 sc/qa/extras/anchor.cxx                        |  1 +
 sc/qa/unit/tiledrendering/tiledrendering.cxx   |  1 +
 sc/qa/unit/ucalc.cxx                           |  1 +
 sc/qa/unit/ucalc_sort.cxx                      |  1 +
 sc/source/core/data/column3.cxx                |  1 +
 sc/source/core/data/documen2.cxx               |  1 +
 sc/source/core/data/documen3.cxx               |  1 +
 sc/source/core/data/dpcache.cxx                |  1 +
 sc/source/core/data/dpdimsave.cxx              |  1 +
 sc/source/core/data/dpfilteredcache.cxx        |  1 +
 sc/source/core/data/dpgroup.cxx                |  1 +
 sc/source/core/data/dpobject.cxx               |  1 +
 sc/source/core/data/dpshttab.cxx               |  1 +
 sc/source/core/data/dptabdat.cxx               |  2 +-
 sc/source/core/data/dptabsrc.cxx               |  1 +
 sc/source/core/data/drwlayer.cxx               |  1 +
 sc/source/core/data/poolhelp.cxx               |  1 +
 sc/source/core/tool/charthelper.cxx            |  1 +
 sc/source/core/tool/compare.cxx                |  2 +
 sc/source/core/tool/docoptio.cxx               |  1 +
 sc/source/filter/excel/xepivot.cxx             |  2 +
 sc/source/filter/excel/xepivotxml.cxx          |  1 +
 sc/source/filter/inc/XclExpChangeTrack.hxx     |  1 +
 sc/source/filter/oox/pivotcachebuffer.cxx      |  1 +
 sc/source/filter/xcl97/xcl97rec.cxx            |  1 +
 sc/source/filter/xml/XMLCodeNameProvider.cxx   |  1 +
 sc/source/filter/xml/xmlwrap.cxx               |  1 +
 sc/source/ui/uitest/uiobject.cxx               |  1 +
 sc/source/ui/undo/undobase.cxx                 |  1 +
 sc/source/ui/undo/undoblk2.cxx                 |  1 +
 sc/source/ui/undo/undoblk3.cxx                 |  1 +
 sc/source/ui/undo/undodat.cxx                  |  1 +
 sc/source/ui/unoobj/ChartTools.cxx             |  2 +-
 sc/source/ui/unoobj/PivotTableDataProvider.cxx |  1 +
 sc/source/ui/unoobj/TablePivotChart.cxx        |  1 +
 sc/source/ui/unoobj/dapiuno.cxx                |  1 +
 sc/source/ui/unoobj/datauno.cxx                |  1 +
 sc/source/ui/unoobj/defltuno.cxx               |  1 +
 sc/source/ui/vba/vbaapplication.cxx            |  1 +
 sc/source/ui/view/drawvie4.cxx                 |  1 +
 sc/source/ui/view/gridwin4.cxx                 |  1 +
 sc/source/ui/view/prevwsh.cxx                  |  1 +
 sc/source/ui/view/viewdata.cxx                 |  1 +
 62 files changed, 141 insertions(+), 81 deletions(-)

(limited to 'sc')

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 5011ecdea951..7941a28d7640 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -82,9 +82,34 @@ blacklist:
     sc/inc/conditio.hxx:
     # base class has to be a complete type
     - tools/link.hxx
-    sc/inc/dbdocutl.hxx:
+    sc/inc/dapiuno.hxx:
     # base class has to be a complete type
-    - com/sun/star/uno/Reference.hxx
+    - com/sun/star/container/XEnumerationAccess.hpp
+    - com/sun/star/container/XNameContainer.hpp
+    - com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.hpp
+    - com/sun/star/sheet/XDataPilotFieldGrouping.hpp
+    - com/sun/star/sheet/XDataPilotField.hpp
+    - com/sun/star/sheet/XDataPilotTable2.hpp
+    - com/sun/star/sheet/XDataPilotTables.hpp
+    sc/inc/datauno.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/XIndexAccess.hpp
+    - com/sun/star/container/XNamed.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/lang/XUnoTunnel.hpp
+    - com/sun/star/sheet/XCellRangeReferrer.hpp
+    - com/sun/star/sheet/XConsolidationDescriptor.hpp
+    - com/sun/star/sheet/XDatabaseRange.hpp
+    - com/sun/star/sheet/XDatabaseRanges.hpp
+    - com/sun/star/sheet/XSheetFilterDescriptor2.hpp
+    - com/sun/star/sheet/XSheetFilterDescriptor3.hpp
+    - com/sun/star/sheet/XSheetFilterDescriptor.hpp
+    - com/sun/star/sheet/XSubTotalDescriptor.hpp
+    - com/sun/star/sheet/XSubTotalField.hpp
+    - com/sun/star/sheet/XUnnamedDatabaseRanges.hpp
+    - com/sun/star/util/XRefreshable.hpp
     sc/inc/defltuno.hxx:
     # base class has to be a complete type
     - com/sun/star/beans/XPropertySet.hpp
@@ -94,31 +119,24 @@ blacklist:
     # base class has to be a complete type
     - com/sun/star/frame/XDispatchProviderInterceptor.hpp
     - com/sun/star/view/XSelectionChangeListener.hpp
+    sc/inc/docuno.hxx:
+    # base class has to be a complete type
+    - com/sun/star/container/XEnumerationAccess.hpp
+    - com/sun/star/drawing/XDrawPages.hpp
+    - com/sun/star/sheet/XCellRangesAccess.hpp
+    - com/sun/star/sheet/XScenarios.hpp
+    - com/sun/star/sheet/XSheetAnnotations.hpp
+    - com/sun/star/sheet/XSpreadsheets2.hpp
+    - com/sun/star/table/XTableColumns.hpp
+    - com/sun/star/table/XTableRows.hpp
     sc/inc/dpglobal.hxx:
     # base class has to be a complete type
     - o3tl/typed_flags_set.hxx
-    sc/inc/dpoutput.hxx:
-    # base class has to be a complete type
-    - com/sun/star/sheet/DataResult.hpp
-    - com/sun/star/sheet/MemberResult.hpp
-    - com/sun/star/sheet/XDimensionsSupplier.hpp
-    sc/inc/dpobject.hxx:
-    # base class has to be a complete type
-    - com/sun/star/sheet/XDimensionsSupplier.hpp
-    sc/inc/dpsave.hxx:
-    # base class has to be a complete type
-    - com/sun/star/sheet/XDimensionsSupplier.hpp
-    sc/inc/dptabres.hxx:
-    # base class has to be a complete type
-    - com/sun/star/sheet/DataResult.hpp
-    - com/sun/star/sheet/MemberResult.hpp
-    - com/sun/star/uno/Sequence.hxx
     sc/inc/dptabsrc.hxx:
     # base class has to be a complete type
     - com/sun/star/beans/XPropertySet.hpp
     - com/sun/star/container/XNamed.hpp
     - com/sun/star/lang/XServiceInfo.hpp
-    - com/sun/star/sheet/MemberResult.hpp
     - com/sun/star/sheet/XDataPilotMemberResults.hpp
     - com/sun/star/sheet/XDataPilotResults.hpp
     - com/sun/star/sheet/XDimensionsSupplier.hpp
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 1f183501c9ba..619585224f08 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -20,10 +20,8 @@
 #ifndef INCLUDED_SC_INC_DAPIUNO_HXX
 #define INCLUDED_SC_INC_DAPIUNO_HXX
 
-#include "global.hxx"
-#include "dpobject.hxx"
-#include "rangeutl.hxx"
 #include "cellsuno.hxx"
+#include "dpglobal.hxx"
 
 #include <svl/lstner.hxx>
 #include <svl/itemprop.hxx>
@@ -35,17 +33,12 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 
-#include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp>
 #include <com/sun/star/sheet/DataPilotFieldGroupInfo.hpp>
-#include <com/sun/star/sheet/DataPilotFieldLayoutInfo.hpp>
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
-#include <com/sun/star/sheet/DataPilotFieldReference.hpp>
-#include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp>
 #include <com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.hpp>
 #include <com/sun/star/sheet/XDataPilotDescriptor.hpp>
 #include <com/sun/star/sheet/XDataPilotField.hpp>
 #include <com/sun/star/sheet/XDataPilotFieldGrouping.hpp>
-#include <com/sun/star/sheet/XDataPilotTable.hpp>
 #include <com/sun/star/sheet/XDataPilotTable2.hpp>
 #include <com/sun/star/sheet/XDataPilotTables.hpp>
 
@@ -54,10 +47,12 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace sheet {
-    struct DataPilotFieldFilter;
-    struct DataPilotTablePositionData;
-}}}}
+namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldAutoShowInfo; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { class XMembersAccess; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldLayoutInfo; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldReference; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldSortInfo; } } } }
+
 
 class ScDocShell;
 class ScDPSaveDimension;
@@ -67,6 +62,7 @@ class ScDataPilotTableObj;
 class ScDataPilotFieldObj;
 class ScDataPilotItemObj;
 enum class ScGeneralFunction;
+class ScDPObject;
 
 class ScDataPilotConversion
 {
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 26afe6030065..5e5037d7cdc8 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -24,7 +24,6 @@
 #include "queryparam.hxx"
 #include "subtotalparam.hxx"
 
-#include <com/sun/star/sheet/TableFilterField.hpp>
 #include <com/sun/star/sheet/GeneralFunction.hpp>
 #include <com/sun/star/sheet/XCellRangeReferrer.hpp>
 #include <com/sun/star/sheet/XSheetFilterDescriptor.hpp>
@@ -50,6 +49,10 @@
 
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace sheet { struct TableFilterField2; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { struct TableFilterField3; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { struct TableFilterField; } } } }
+
 class ScDBData;
 class ScDocShell;
 
diff --git a/sc/inc/dbdocutl.hxx b/sc/inc/dbdocutl.hxx
index c6949ab61a2e..d7cacb75d411 100644
--- a/sc/inc/dbdocutl.hxx
+++ b/sc/inc/dbdocutl.hxx
@@ -20,12 +20,13 @@
 #ifndef INCLUDED_SC_INC_DBDOCUTL_HXX
 #define INCLUDED_SC_INC_DBDOCUTL_HXX
 
-#include <com/sun/star/uno/Reference.hxx>
 #include "types.hxx"
 #include <sal/types.h>
 
 class ScDocument;
 
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
 namespace com { namespace sun { namespace star { namespace sdbc {
     class XRow;
 } } } }
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index e8c7a1c63de2..ad6079711853 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -20,16 +20,11 @@
 #ifndef INCLUDED_SC_INC_DOCOPTIO_HXX
 #define INCLUDED_SC_INC_DOCOPTIO_HXX
 
-#include <unotools/configitem.hxx>
 #include <unotools/textsearch.hxx>
 #include <svl/poolitem.hxx>
-#include <svl/itemprop.hxx>
 #include "scdllapi.h"
-#include "scmod.hxx"
 #include "optutil.hxx"
 
-#include <formula/grammar.hxx>
-
 class SC_DLLPUBLIC ScDocOptions
 {
     double     fIterEps;                // epsilon value dazu
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 49cd2a7b80fc..8ac5166c6aa3 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SC_INC_DOCUMENT_HXX
 #define INCLUDED_SC_INC_DOCUMENT_HXX
 
-#include <vcl/prntypes.hxx>
-#include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/errcode.hxx>
 #include <com/sun/star/uno/Reference.hxx>
@@ -34,11 +32,9 @@
 #include "types.hxx"
 #include <formula/grammar.hxx>
 #include <formula/types.hxx>
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include "typedstrdata.hxx"
 #include "calcmacros.hxx"
 #include "calcconfig.hxx"
-#include <o3tl/deleter.hxx>
 #include <svl/hint.hxx>
 #include <tools/gen.hxx>
 #include <svl/zforlist.hxx>
@@ -47,12 +43,16 @@
 #include <cassert>
 #include <memory>
 #include <map>
-#include <mutex>
 #include <set>
 #include <vector>
 
 #include "markdata.hxx"
 
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+namespace o3tl { template <typename T> struct default_delete; }
+
+class Timer;
+
 enum class SvtScriptType;
 enum class ScMF;
 enum class FormulaError : sal_uInt16;
@@ -85,7 +85,6 @@ class TableValues;
 class RowHeightContext;
 struct SetFormulaDirtyContext;
 class RefMovedHint;
-struct SortUndoParam;
 struct ReorderParam;
 class FormulaGroupAreaListener;
 class ColumnSet;
@@ -97,14 +96,11 @@ class ExternalDataMapper;
 }
 
 class Fraction;
-class SvxFontItem;
 
-class KeyEvent;
 class OutputDevice;
 class SdrObject;
 class SfxBroadcaster;
 class SfxListener;
-class SfxHint;
 class SfxItemSet;
 class SfxObjectShell;
 class SfxBindings;
@@ -113,7 +109,6 @@ class SfxItemPool;
 class SfxPrinter;
 class SfxStyleSheetBase;
 class SvMemoryStream;
-class SvNumberFormatter;
 class SvxBoxInfoItem;
 class SvxBoxItem;
 class SvxForbiddenCharactersTable;
@@ -124,7 +119,6 @@ class SvxSearchItem;
 namespace vcl { class Window; }
 class XColorList;
 
-struct ScAttrEntry;
 class ScAutoFormatData;
 class ScBroadcastAreaSlotMachine;
 class ScChangeViewSettings;
@@ -144,12 +138,9 @@ class ScExtDocOptions;
 class ScExternalRefManager;
 class ScFormulaCell;
 class ScMacroManager;
-class ScMarkData;
 class ScOutlineTable;
 class ScPatternAttr;
 class ScPrintRangeSaver;
-class ScRangeData;
-class ScRangeName;
 class ScStyleSheet;
 class ScStyleSheetPool;
 class ScTable;
@@ -162,7 +153,6 @@ class ScChangeTrack;
 class ScEditEngineDefaulter;
 class ScFieldEditEngine;
 class ScNoteEditEngine;
-struct ScConsolidateParam;
 class ScDPObject;
 class ScDPCollection;
 class ScMatrix;
@@ -186,7 +176,6 @@ class ScFormulaParserPool;
 struct ScClipParam;
 class ScRowBreakIterator;
 struct ScSetStringParam;
-class ScDocRowHeightUpdater;
 struct ScColWidthParam;
 class ScSheetEvents;
 class ScProgress;
@@ -194,7 +183,6 @@ class SvtListener;
 class ScEditDataArray;
 class EditTextObject;
 struct ScRefCellValue;
-class ScDocumentImport;
 class ScPostIt;
 struct ScSubTotalParam;
 struct ScQueryParam;
@@ -214,7 +202,6 @@ typedef std::map<OUString, BitmapEx> IconSetBitmapMap;
 
 namespace com { namespace sun { namespace star {
     namespace lang {
-        class XMultiServiceFactory;
         struct EventObject;
     }
     namespace i18n {
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index bb99b2e07f59..c9a450210ef3 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -37,7 +37,6 @@
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/sheet/XSpreadsheets2.hpp>
 #include <com/sun/star/sheet/XDocumentAuditing.hpp>
-#include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/chart2/XDataProviderAccess.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/util/XProtectable.hpp>
@@ -48,14 +47,14 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sheet/XCellRangesAccess.hpp>
 #include <com/sun/star/sheet/opencl/XOpenCLSelection.hpp>
-#include <com/sun/star/sheet/opencl/OpenCLPlatform.hpp>
 #include <com/sun/star/util/XChangesNotifier.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <svl/itemprop.hxx>
-#include <vcl/event.hxx>
 #include <vcl/ITiledRenderable.hxx>
-#include "drwlayer.hxx"
+
+namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataProvider; } } } } }
+namespace com { namespace sun { namespace star { namespace sheet { namespace opencl { struct OpenCLPlatform; } } } } }
 
 class ScDocShell;
 class ScAnnotationObj;
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 8386c1d4b3f3..b016513421c0 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -19,9 +19,12 @@
 #ifndef INCLUDED_SC_INC_DPCACHE_HXX
 #define INCLUDED_SC_INC_DPCACHE_HXX
 
-#include "global.hxx"
-#include "dpnumgroupinfo.hxx"
+#include "address.hxx"
 #include "calcmacros.hxx"
+#include "dpitemdata.hxx"
+#include "dpnumgroupinfo.hxx"
+#include "scdllapi.h"
+#include "types.hxx"
 
 #include <mdds/flat_segment_tree.hpp>
 
@@ -32,7 +35,9 @@
 
 struct ScQueryParam;
 class ScDPObject;
-class ScDPItemData;
+class ScDocument;
+class SvNumberFormatter;
+
 enum class SvNumFormatType : sal_Int16;
 
 /**
diff --git a/sc/inc/dpdimsave.hxx b/sc/inc/dpdimsave.hxx
index b05769398d73..d982daa9c687 100644
--- a/sc/inc/dpdimsave.hxx
+++ b/sc/inc/dpdimsave.hxx
@@ -22,7 +22,8 @@
 
 #include <vector>
 #include <map>
-#include "dpgroup.hxx"
+#include "dpitemdata.hxx"
+#include "dpnumgroupinfo.hxx"
 #include "scdllapi.h"
 #include "dptypes.hxx"
 
diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index 0a77d07a0705..dcb43221f5b9 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -23,12 +23,17 @@
 #include <sal/types.h>
 #include "dpitemdata.hxx"
 #include "calcmacros.hxx"
+#include "scdllapi.h"
+#include "types.hxx"
 
 #include <unordered_set>
 #include <vector>
 
 #include <mdds/flat_segment_tree.hpp>
 
+namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+
 class ScDPCache;
 struct ScDPValue;
 struct ScQueryParam;
diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index 44e3dc1930c1..5e589f01f10e 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -11,9 +11,9 @@
 #define INCLUDED_SC_INC_DPITEMDATA_HXX
 
 #include "scdllapi.h"
-#include "address.hxx"
 
 #include <sal/types.h>
+#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include "calcmacros.hxx"
 #include "dpglobal.hxx"
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index ee2efd74f00c..9ea215f2f9eb 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -23,12 +23,11 @@
 #include "scdllapi.h"
 #include "global.hxx"
 #include "address.hxx"
-#include "dpoutput.hxx"
 #include "dptypes.hxx"
 #include "pivot.hxx"
 #include "calcmacros.hxx"
 
-#include <com/sun/star/sheet/XDimensionsSupplier.hpp>
+#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
 
 #include <memory>
 #include <set>
@@ -39,6 +38,7 @@ namespace com { namespace sun { namespace star {
 
     namespace container {
         class XIndexAccess;
+        class XNameAccess;
     }
 
     namespace sdbc {
@@ -47,6 +47,7 @@ namespace com { namespace sun { namespace star {
 
     namespace sheet {
         class XMembersAccess;
+        class XDimensionsSupplier;
         struct DataPilotTablePositionData;
         struct DataPilotTableHeaderData;
         struct DataPilotFieldFilter;
@@ -61,6 +62,8 @@ class ScSheetSourceDesc;
 class ScDPTableData;
 class ScDPDimensionSaveData;
 class ScRangeList;
+class ScDPCache;
+class ScDocument;
 
 struct ScDPServiceDesc
 {
diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx
index 0a4309ca9dcd..51fb47b0f2d0 100644
--- a/sc/inc/dpoutput.hxx
+++ b/sc/inc/dpoutput.hxx
@@ -20,15 +20,11 @@
 #ifndef INCLUDED_SC_INC_DPOUTPUT_HXX
 #define INCLUDED_SC_INC_DPOUTPUT_HXX
 
-#include <com/sun/star/sheet/XDimensionsSupplier.hpp>
-#include <com/sun/star/sheet/DataResult.hpp>
-#include <com/sun/star/sheet/MemberResult.hpp>
 #include <com/sun/star/sheet/DataPilotOutputRangeType.hpp>
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
 
 #include "address.hxx"
 
-#include "dpfilteredcache.hxx"
 #include "dptypes.hxx"
 
 #include <memory>
@@ -39,6 +35,10 @@ namespace com { namespace sun { namespace star { namespace sheet {
     struct DataPilotTablePositionData;
 }}}}
 
+namespace com { namespace sun { namespace star { namespace sheet { class XDimensionsSupplier; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { struct DataResult; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { struct MemberResult; } } } }
+
 namespace tools { class Rectangle; }
 class ScDocument;
 struct ScDPOutLevelData;
diff --git a/sc/inc/dpresfilter.hxx b/sc/inc/dpresfilter.hxx
index 669710985887..ddc69e647b70 100644
--- a/sc/inc/dpresfilter.hxx
+++ b/sc/inc/dpresfilter.hxx
@@ -10,13 +10,16 @@
 #ifndef INCLUDED_SC_INC_DPRESFILTER_HXX
 #define INCLUDED_SC_INC_DPRESFILTER_HXX
 
-#include "dpitemdata.hxx"
+#include <rtl/ustring.hxx>
+#include "calcmacros.hxx"
 
 #include <memory>
 #include <map>
 #include <vector>
 #include <unordered_map>
 
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+
 namespace com { namespace sun { namespace star { namespace sheet {
     struct DataPilotFieldFilter;
 }}}}
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index cc8d1467fe59..7558a6b2588d 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -23,7 +23,6 @@
 #include <memory>
 #include <vector>
 
-#include <com/sun/star/sheet/XDimensionsSupplier.hpp>
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
@@ -36,6 +35,7 @@
 #include <boost/optional.hpp>
 
 namespace com { namespace sun { namespace star { namespace sheet {
+    class XDimensionsSupplier;
     struct DataPilotFieldReference;
     struct DataPilotFieldSortInfo;
     struct DataPilotFieldAutoShowInfo;
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 7b7acd022860..b0dc99031dfa 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -20,9 +20,7 @@
 #ifndef INCLUDED_SC_INC_DPTABDAT_HXX
 #define INCLUDED_SC_INC_DPTABDAT_HXX
 
-#include "dpoutput.hxx"
 #include "dpfilteredcache.hxx"
-#include "dpcache.hxx"
 #include "calcmacros.hxx"
 
 #include <svl/zforlist.hxx>
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 5b4956787fac..f57816dcb080 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -24,10 +24,7 @@
 #include "dpfilteredcache.hxx"
 #include "calcmacros.hxx"
 
-#include <com/sun/star/sheet/MemberResult.hpp>
-#include <com/sun/star/sheet/DataResult.hpp>
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
 
 #include <map>
 #include <unordered_map>
@@ -39,6 +36,10 @@ namespace com { namespace sun { namespace star { namespace sheet {
     struct DataPilotFieldReference;
 } } } }
 
+namespace com { namespace sun { namespace star { namespace sheet { struct DataResult; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { struct MemberResult; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+
 class ScDPSource;
 class ScDPDimension;
 class ScDPLevel;
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index 84f4513e0c09..8024eaa25738 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/sheet/XMembersSupplier.hpp>
 #include <com/sun/star/sheet/XDataPilotResults.hpp>
 #include <com/sun/star/sheet/XDataPilotMemberResults.hpp>
-#include <com/sun/star/sheet/MemberResult.hpp>
 #include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp>
 #include <com/sun/star/sheet/DataPilotFieldLayoutInfo.hpp>
 #include <com/sun/star/sheet/DataPilotFieldLayoutMode.hpp>
@@ -54,6 +53,7 @@
 namespace com { namespace sun { namespace star {
     namespace sheet {
         struct DataPilotFieldFilter;
+        struct MemberResult;
     }
     namespace table {
         struct CellAddress;
diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx
index 174975c8a1f9..d93cc41c6a2f 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -27,6 +27,8 @@
 #include <cppuhelper/implbase.hxx>
 #include <svl/lstner.hxx>
 #include "document.hxx"
+#include <svl/itemprop.hxx>
+#include <o3tl/deleter.hxx>
 
 class ScDocOptions;
 
diff --git a/sc/qa/extras/anchor.cxx b/sc/qa/extras/anchor.cxx
index 133b1bdae043..35cd9a567d35 100644
--- a/sc/qa/extras/anchor.cxx
+++ b/sc/qa/extras/anchor.cxx
@@ -22,6 +22,7 @@
 #include <docsh.hxx>
 #include <svx/svdocirc.hxx>
 #include <scitems.hxx>
+#include <drwlayer.hxx>
 
 #include <sc.hrc>
 
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 725561df1e16..5313f87eea24 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -44,6 +44,7 @@
 #include <docsh.hxx>
 #include <document.hxx>
 #include <docuno.hxx>
+#include <drwlayer.hxx>
 
 using namespace css;
 
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 088fef9fa036..b836076aab31 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -68,6 +68,7 @@
 #include <bcaslot.hxx>
 #include <sharedformula.hxx>
 #include <tabprotection.hxx>
+#include <scmod.hxx>
 
 #include <formula/IFunctionDescription.hxx>
 
diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx
index 38c3e1aebcdb..648918e67790 100644
--- a/sc/qa/unit/ucalc_sort.cxx
+++ b/sc/qa/unit/ucalc_sort.cxx
@@ -22,6 +22,7 @@
 #include <scitems.hxx>
 #include <editutil.hxx>
 #include <table.hxx>
+#include <drwlayer.hxx>
 
 #include <sal/config.h>
 #include <editeng/wghtitem.hxx>
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index a3b3ca5efc3e..3b5c11fb5c8d 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -61,6 +61,7 @@
 #include <svl/broadcast.hxx>
 #include <svl/sharedstringpool.hxx>
 #include <editeng/editstat.hxx>
+#include <rtl/tencinfo.h>
 
 #include <cstdio>
 #include <refdata.hxx>
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 9682dff38dc0..378d97e7ddbd 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -104,6 +104,7 @@
 #include <clipoptions.hxx>
 #include <listenercontext.hxx>
 #include <datamapper.hxx>
+#include <drwlayer.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 91a67ebd583a..bb68d1c849ef 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -43,6 +43,7 @@
 #include <chartlock.hxx>
 #include <refupdat.hxx>
 #include <docoptio.hxx>
+#include <scmod.hxx>
 #include <clipoptions.hxx>
 #include <viewopti.hxx>
 #include <scextopt.hxx>
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 6d8a1e12df6b..0bb970dac78b 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -39,6 +39,7 @@
 #include <formula/errorcodes.hxx>
 #include <svl/zforlist.hxx>
 #include <o3tl/make_unique.hxx>
+#include <osl/diagnose.h>
 
 #if DUMP_PIVOT_TABLE
 #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index f375e0bcb27c..7b5f315ba18e 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <dpcache.hxx>
 #include <dpdimsave.hxx>
 #include <dpgroup.hxx>
 #include <dpobject.hxx>
diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx
index de5c139b30de..a026a8ca6220 100644
--- a/sc/source/core/data/dpfilteredcache.cxx
+++ b/sc/source/core/data/dpfilteredcache.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <dpcache.hxx>
 #include <dpfilteredcache.hxx>
 #include <document.hxx>
 #include <address.hxx>
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index dd81548777a3..70b326b8c5a7 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -19,6 +19,7 @@
 
 #include <dpgroup.hxx>
 
+#include <dpcache.hxx>
 #include <global.hxx>
 #include <document.hxx>
 #include <dpfilteredcache.hxx>
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index eaa827e837ac..7fa4b2ab1da9 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <dpcache.hxx>
 #include <dpobject.hxx>
 #include <dptabsrc.hxx>
 #include <dpsave.hxx>
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 8074a7abf536..fd50d2dfca9d 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -19,6 +19,7 @@
 
 #include <svl/zforlist.hxx>
 
+#include <dpcache.hxx>
 #include <dpshttab.hxx>
 #include <dptabres.hxx>
 #include <document.hxx>
diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
index aa9ad8926e91..ebe1e490994f 100644
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <dptabdat.hxx>
-
+#include <dpcache.hxx>
 #include <global.hxx>
 #include <dpfilteredcache.hxx>
 #include <dptabres.hxx>
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 65e684ffcb65..6fe17154548c 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -37,6 +37,7 @@
 #include <patattr.hxx>
 #include <formulacell.hxx>
 
+#include <dpcache.hxx>
 #include <dptabres.hxx>
 #include <dptabdat.hxx>
 #include <global.hxx>
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 909438316dd8..c1c8149e2972 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -19,6 +19,7 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/chart/XChartDocument.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XClassifiedObject.hpp>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx
index 9acd3d3e8f02..9fd434b05385 100644
--- a/sc/source/core/data/poolhelp.cxx
+++ b/sc/source/core/data/poolhelp.cxx
@@ -20,6 +20,7 @@
 #include <comphelper/processfactory.hxx>
 #include <svl/zforlist.hxx>
 #include <editeng/editeng.hxx>
+#include <osl/diagnose.h>
 
 #include <poolhelp.hxx>
 #include <document.hxx>
diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx
index 6e71f375415a..b6cd5c3db7ba 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -29,6 +29,7 @@
 #include <svx/svdpage.hxx>
 #include <svtools/embedhlp.hxx>
 
+#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 
diff --git a/sc/source/core/tool/compare.cxx b/sc/source/core/tool/compare.cxx
index 9dc6181f0909..c94684a97c40 100644
--- a/sc/source/core/tool/compare.cxx
+++ b/sc/source/core/tool/compare.cxx
@@ -23,6 +23,8 @@
 #include <docoptio.hxx>
 
 #include <unotools/textsearch.hxx>
+#include <rtl/math.hxx>
+#include <osl/diagnose.h>
 
 namespace sc {
 
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index 271ccd157931..d374fab692da 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/svapp.hxx>
 #include <svl/zforlist.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index a47fd26f50e1..8684fa45ce50 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -32,6 +32,8 @@
 #include <svl/zformat.hxx>
 #include <sot/storage.hxx>
 #include <document.hxx>
+#include <dpcache.hxx>
+#include <dpgroup.hxx>
 #include <dpobject.hxx>
 #include <dpsave.hxx>
 #include <dpdimsave.hxx>
diff --git a/sc/source/filter/excel/xepivotxml.cxx b/sc/source/filter/excel/xepivotxml.cxx
index 004f9938a72a..88688d9bfc7e 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -9,6 +9,7 @@
 
 #include <xepivotxml.hxx>
 #include <dpcache.hxx>
+#include <dpitemdata.hxx>
 #include <dpobject.hxx>
 #include <dpsave.hxx>
 #include <dputil.hxx>
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx
index 00eda16e0ffe..2f5eed82b3da 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -30,6 +30,7 @@
 #include "xelink.hxx"
 #include "ftools.hxx"
 #include "excrecds.hxx"
+#include <o3tl/deleter.hxx>
 
 class ExcXmlRecord : public ExcRecord
 {
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index 663ba0961e80..040bab3dad37 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -46,6 +46,7 @@
 #include <dpobject.hxx>
 #include <dpsave.hxx>
 #include <dpdimsave.hxx>
+#include <tools/datetime.hxx>
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 54b1e358cb44..2eb32f70f558 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -73,6 +73,7 @@
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <oox/token/tokens.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/relationship.hxx>
diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx
index 50a19f603c20..7b8e1a259a99 100644
--- a/sc/source/filter/xml/XMLCodeNameProvider.cxx
+++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx
@@ -19,6 +19,7 @@
 
 #include "XMLCodeNameProvider.hxx"
 #include <document.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <comphelper/sequence.hxx>
 
 using namespace com::sun::star;
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 2217a4a07838..dcaf6daa29da 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -68,6 +68,7 @@
 #include <scerrors.hxx>
 #include "XMLExportSharedData.hxx"
 #include <docuno.hxx>
+#include <drwlayer.hxx>
 #include <sheetdata.hxx>
 #include "XMLCodeNameProvider.hxx"
 #include <docsh.hxx>
diff --git a/sc/source/ui/uitest/uiobject.cxx b/sc/source/ui/uitest/uiobject.cxx
index 1026cdc62df2..c38c250db09c 100644
--- a/sc/source/ui/uitest/uiobject.cxx
+++ b/sc/source/ui/uitest/uiobject.cxx
@@ -16,6 +16,7 @@
 #include <viewdata.hxx>
 #include <dbfunc.hxx>
 #include <tabvwsh.hxx>
+#include <drwlayer.hxx>
 
 #include <svx/svditer.hxx>
 #include <svx/svdobj.hxx>
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index 1c3b2428ea65..af029c845660 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <vcl/virdev.hxx>
+#include <svx/svdundo.hxx>
 
 #include <undobase.hxx>
 #include <refundo.hxx>
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index 888a86b78eba..0bde3c5a7f1d 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -32,6 +32,7 @@
 #include <undoolk.hxx>
 
 #include <sfx2/lokhelper.hxx>
+#include <svx/svdundo.hxx>
 
 /** Change column widths or row heights */
 ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 6d362573220f..89db1e2fa38c 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -31,6 +31,7 @@
 #include <sfx2/bindings.hxx>
 #include <vcl/virdev.hxx>
 #include <sfx2/app.hxx>
+#include <svx/svdundo.hxx>
 
 #include <undoblk.hxx>
 #include <sc.hrc>
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index b929aa58d3d8..a53d2c6fa616 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sfx2/app.hxx>
+#include <svx/svdundo.hxx>
 
 #include <undodat.hxx>
 #include <undoutil.hxx>
diff --git a/sc/source/ui/unoobj/ChartTools.cxx b/sc/source/ui/unoobj/ChartTools.cxx
index 2d2ef3b37eb7..942cbceac822 100644
--- a/sc/source/ui/unoobj/ChartTools.cxx
+++ b/sc/source/ui/unoobj/ChartTools.cxx
@@ -12,7 +12,7 @@
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp>
-
+#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <svx/svditer.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdundo.hxx>
diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
index b0a4fe18431a..9177254d5979 100644
--- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/sheet/XDataPilotResults.hpp>
 #include <com/sun/star/sheet/DataResultFlags.hpp>
 
+#include <com/sun/star/sheet/XDimensionsSupplier.hpp>
 #include <com/sun/star/sheet/XHierarchiesSupplier.hpp>
 #include <com/sun/star/sheet/XLevelsSupplier.hpp>
 #include <com/sun/star/sheet/XDataPilotMemberResults.hpp>
diff --git a/sc/source/ui/unoobj/TablePivotChart.cxx b/sc/source/ui/unoobj/TablePivotChart.cxx
index cf57691584b6..75604ca31e89 100644
--- a/sc/source/ui/unoobj/TablePivotChart.cxx
+++ b/sc/source/ui/unoobj/TablePivotChart.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <svx/charthelper.hxx>
 #include <svtools/embedhlp.hxx>
 
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 1bc766238ce3..fdbb58bc7d5b 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -49,6 +49,7 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/NullPointerException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/sheet/XDimensionsSupplier.hpp>
 #include <com/sun/star/sheet/XHierarchiesSupplier.hpp>
 #include <com/sun/star/sheet/XLevelsSupplier.hpp>
 #include <com/sun/star/sheet/XMembersSupplier.hpp>
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 8bbc68bbdb83..bba8f6212d27 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -52,6 +52,7 @@
 #include <queryentry.hxx>
 #include <dputil.hxx>
 #include <sortparam.hxx>
+#include <dpobject.hxx>
 
 #include <comphelper/extract.hxx>
 #include <comphelper/servicehelper.hxx>
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index a8b70f9e9455..87867b79f929 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -37,6 +37,7 @@
 
 #include <limits>
 
+class SvxFontItem;
 using namespace ::com::sun::star;
 
 static const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap()
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index fde8c942a172..4a397826eaf7 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -95,6 +95,7 @@
 
 #include <viewutil.hxx>
 #include <docoptio.hxx>
+#include <scmod.hxx>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 2a6aec9af9b7..aaeb6f7732b9 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -51,6 +51,7 @@
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
 
 using namespace com::sun::star;
 
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 2c53c2243e2c..32fe801027c5 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -68,6 +68,7 @@
 #include <sc.hrc>
 #include <vcl/virdev.hxx>
 #include <svx/sdrpaintwindow.hxx>
+#include <drwlayer.hxx>
 
 static void lcl_LimitRect( tools::Rectangle& rRect, const tools::Rectangle& rVisible )
 {
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 883a2e224ab3..53c017e4fe2b 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -40,6 +40,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/printer.hxx>
 
+#include <drwlayer.hxx>
 #include <prevwsh.hxx>
 #include <preview.hxx>
 #include <printfun.hxx>
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index eacb5d5dc087..f212f47275fa 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -42,6 +42,7 @@
 #include <scmod.hxx>
 #include <global.hxx>
 #include <document.hxx>
+#include <drwlayer.hxx>
 #include <attrib.hxx>
 #include <tabview.hxx>
 #include <tabvwsh.hxx>
-- 
cgit