23 files changed, 26 insertions, 11 deletions

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 84b23623a578..853e06214546 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -177,3 +177,7 @@ blacklist:
     - global.hxx
     # Needed for macros
     - calcmacros.hxx
+    sc/inc/global.hxx:
+    # base class has to be a complete type
+    - com/sun/star/uno/Reference.hxx
+    - tools/ref.hxx
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index d44a7cce4d77..fadbad0639ac 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_INC_ATTRIB_HXX
 
 #include <memory>
+#include <vector>
 #include <svl/poolitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx
index cde8b9ff5285..275c4da1dafd 100644
--- a/sc/inc/chartpos.hxx
+++ b/sc/inc/chartpos.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_INC_CHARTPOS_HXX
 
 #include "rangelst.hxx"
+#include <tools/solar.h>
 #include <memory>
 #include <map>
 
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 6fd387a0e100..21a670053c11 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_INC_CONDITIO_HXX
 
 #include "global.hxx"
+#include <tools/solar.h>
 #include "address.hxx"
 #include <formula/grammar.hxx>
 #include "scdllapi.h"
@@ -42,6 +43,7 @@
 class ScFormulaCell;
 class ScTokenArray;
 struct ScRefCellValue;
+class Color;
 
 namespace sc {
 
diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx
index 015245cd1895..d16a082ce578 100644
--- a/sc/inc/consoli.hxx
+++ b/sc/inc/consoli.hxx
@@ -22,6 +22,7 @@
 
 #include "global.hxx"
 #include "address.hxx"
+#include <vector>
 
 class ScDocument;
 
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index ac76f7412a9a..920759abc8c4 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -43,6 +43,7 @@ struct ScQueryParam;
 struct ScDBQueryParamInternal;
 struct ScDBQueryParamMatrix;
 class ScFormulaCell;
+class OutputDevice;
 struct ScInterpreterContext;
 enum class SvNumFormatType : sal_Int16;
 
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 77dfca451d2a..ccade9f02c6f 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -23,6 +23,7 @@
 #include <vcl/prntypes.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
+#include <vcl/errcode.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <vcl/vclptr.hxx>
 #include "scdllapi.h"
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index bbdd26d9d38a..050e38250508 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -23,18 +23,16 @@
 #include "address.hxx"
 #include <i18nlangtag/lang.h>
 #include <svx/svdtypes.hxx>
-#include <tools/stream.hxx>
+#include <tools/ref.hxx>
+#include <sal/types.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include "scdllapi.h"
 #include <rtl/ustring.hxx>
 
 #include <map>
-#include <vector>
 
-class Bitmap;
 class SfxItemSet;
 class SfxViewShell;
-class Color;
 struct ScCalcConfig;
 enum class SvtScriptType;
 enum class FormulaError : sal_uInt16;
@@ -460,7 +458,6 @@ struct ScImportParam
     bool            operator==  ( const ScImportParam& r ) const;
 };
 
-class ScDocument;
 class ScDocShell;
 class SvxSearchItem;
 class ScAutoFormat;
@@ -471,7 +468,6 @@ class SvxBrushItem;
 class ScFunctionList;
 class ScFunctionMgr;
 class SfxItemPool;
-class SdrModel;
 class EditTextObject;
 class SfxObjectShell;
 class SvNumberFormatter;
@@ -482,7 +478,6 @@ class SvtSysLocale;
 class CalendarWrapper;
 class CollatorWrapper;
 class IntlWrapper;
-class OutputDevice;
 class ScFieldEditEngine;
 
 namespace com { namespace sun { namespace star {
diff --git a/sc/inc/grouparealistener.hxx b/sc/inc/grouparealistener.hxx
index 3e298ab9dc06..04aa7c7582a2 100644
--- a/sc/inc/grouparealistener.hxx
+++ b/sc/inc/grouparealistener.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_SC_GROUPAREALISTENER_HXX
 
 #include "address.hxx"
-#include "calcmacros.hxx"
 
 #include <svl/listener.hxx>
 
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 41822494134b..b0770e69e8f5 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SC_INC_HELPIDS_H
 #define INCLUDED_SC_INC_HELPIDS_H
 
-#include <svx/svxcommands.h>
-
 #define HID_INSWIN_POS                                          "SC_HID_INSWIN_POS"
 #define HID_INSWIN_CALC                                         "SC_HID_INSWIN_CALC"
 #define HID_INSWIN_CANCEL                                       "SC_HID_INSWIN_CANCEL"
diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index cd3817120530..f2b45cecdce3 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -22,6 +22,7 @@
 
 #include "global.hxx"
 #include "address.hxx"
+#include <tools/solar.h>
 #include <svl/hint.hxx>
 
 class SC_DLLPUBLIC ScPaintHint : public SfxHint
diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
index 8c35ff877f43..df858f08f339 100644
--- a/sc/inc/queryentry.hxx
+++ b/sc/inc/queryentry.hxx
@@ -24,6 +24,7 @@
 #include <svl/sharedstring.hxx>
 #include <unotools/textsearch.hxx>
 
+#include <memory>
 #include <vector>
 
 /**
diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx
index d296ad05b7cb..a1d6d92e3480 100644
--- a/sc/source/core/data/markarr.cxx
+++ b/sc/source/core/data/markarr.cxx
@@ -20,6 +20,7 @@
 #include <markarr.hxx>
 #include <global.hxx>
 #include <address.hxx>
+#include <vector>
 
 #include <osl/diagnose.h>
 
diff --git a/sc/source/core/tool/jumpmatrix.cxx b/sc/source/core/tool/jumpmatrix.cxx
index c3153fd5ac3e..244a77f6d83a 100644
--- a/sc/source/core/tool/jumpmatrix.cxx
+++ b/sc/source/core/tool/jumpmatrix.cxx
@@ -19,7 +19,7 @@
 
 #include <jumpmatrix.hxx>
 #include <scmatrix.hxx>
-
+#include <tools/solar.h>
 #include <osl/diagnose.h>
 
 namespace {
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index 5d796bf8f11f..89092cd59d19 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -24,6 +24,7 @@
 
 #include <zforauto.hxx>
 #include <global.hxx>
+#include <tools/stream.hxx>
 
 ScNumFormatAbbrev::ScNumFormatAbbrev() :
     sFormatstring   ( "Standard" ),
diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx
index da1ba8ae1a3d..a884a70ffc25 100644
--- a/sc/source/filter/inc/formel.hxx
+++ b/sc/source/filter/inc/formel.hxx
@@ -22,6 +22,7 @@
 
 #include <compiler.hxx>
 #include <global.hxx>
+#include <tools/stream.hxx>
 
 #include "root.hxx"
 #include "tokstack.hxx"
diff --git a/sc/source/filter/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxx
index 3db698c3182c..a328310f10be 100644
--- a/sc/source/filter/xml/XMLExportSharedData.hxx
+++ b/sc/source/filter/xml/XMLExportSharedData.hxx
@@ -25,6 +25,7 @@
 
 #include <vector>
 #include <list>
+#include <memory>
 
 struct ScMyDrawPage
 {
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index ed299f896ce8..e2c87e4c7073 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -19,6 +19,7 @@
 
 #include "XMLStylesExportHelper.hxx"
 #include <global.hxx>
+#include <tools/lineend.hxx>
 #include <unonames.hxx>
 #include "XMLConverter.hxx"
 #include "xmlexprt.hxx"
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 59b4fb1fce18..36dc316787ad 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -28,6 +28,7 @@
 #include <xmloff/xmlstyle.hxx>
 #include <com/sun/star/util/DateTime.hpp>
 #include "xmlsubti.hxx"
+#include <vcl/errcode.hxx>
 #include <global.hxx>
 #include <formula/grammar.hxx>
 #include <compiler.hxx>
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index cf3310ffb2c2..152ae2da98ca 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -24,6 +24,7 @@
 #include <sot/exchange.hxx>
 #include <global.hxx>
 #include <address.hxx>
+#include <tools/stream.hxx>
 
 class ScDocShell;
 class ScDocument;
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 96450a842bc9..d2f0c64f4367 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -22,6 +22,7 @@
 
 #include <global.hxx>
 #include <address.hxx>
+#include <tools/solar.h>
 #include <typedstrdata.hxx>
 
 #include <tools/fract.hxx>
diff --git a/sc/source/ui/inc/pfuncache.hxx b/sc/source/ui/inc/pfuncache.hxx
index 083d86a1b3a7..762e3464aea5 100644
--- a/sc/source/ui/inc/pfuncache.hxx
+++ b/sc/source/ui/inc/pfuncache.hxx
@@ -27,6 +27,7 @@
 
 class ScDocShell;
 class ScMarkData;
+class OutputDevice;
 
 /** Possible types of selection for print functions */
 
diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx
index 4d8922b86bbe..2dda7f545ff3 100644
--- a/sc/source/ui/inc/rfindlst.hxx
+++ b/sc/source/ui/inc/rfindlst.hxx
@@ -23,6 +23,7 @@
 #include <tools/color.hxx>
 #include <global.hxx>
 #include <address.hxx>
+#include <tools/solar.h>
 
 struct ScRangeFindData
 {