tdf#42949 Fix remaining IWYU warnings in sc/inc

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

With this patch, find-unneeded-includes gives no more problems

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

37 files changed, 117 insertions, 53 deletions

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 951f833a310a..b67bf7f9be83 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -116,6 +116,9 @@ blacklist:
     # base class has to be a complete type
     - com/sun/star/frame/XDispatchProviderInterceptor.hpp
     - com/sun/star/view/XSelectionChangeListener.hpp
+    sc/inc/document.hxx:
+    # std::unique_ptr deleter type has to be complete
+    - o3tl/deleter.hxx
     sc/inc/docuno.hxx:
     # base class has to be a complete type
     - com/sun/star/container/XEnumerationAccess.hpp
@@ -153,6 +156,16 @@ blacklist:
     # base class has to be a complete type
     - com/sun/star/container/XNameReplace.hpp
     - com/sun/star/lang/XServiceInfo.hpp
+    sc/inc/fielduno.hxx:
+    # base class has to be a complete type
+    - com/sun/star/container/XEnumerationAccess.hpp
+    - com/sun/star/container/XIndexAccess.hpp
+    - com/sun/star/container/XContainer.hpp
+    - com/sun/star/util/XRefreshable.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/text/XTextField.hpp
+    - com/sun/star/beans/XPropertySet.hpp
+    - com/sun/star/lang/XUnoTunnel.hpp
     sc/inc/fillinfo.hxx:
     # base class has to be a complete type
     - o3tl/typed_flags_set.hxx
@@ -193,14 +206,34 @@ blacklist:
     # base class has to be a complete type
     - com/sun/star/sheet/XFormulaParser.hpp
     sc/inc/formularesult.hxx:
-    # Needed for enum
-    - global.hxx
     # Needed for macros
     - calcmacros.hxx
+    sc/inc/funcuno.hxx:
+    # base class has to be a complete type
+    - com/sun/star/beans/XPropertySet.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/sheet/XFunctionAccess.hpp
     sc/inc/global.hxx:
     # base class has to be a complete type
     - com/sun/star/uno/Reference.hxx
     - tools/ref.hxx
+    sc/inc/linkuno.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/XNameAccess.hpp
+    - com/sun/star/container/XNamed.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/sheet/XAreaLink.hpp
+    - com/sun/star/sheet/XAreaLinks.hpp
+    - com/sun/star/sheet/XDDELink.hpp
+    - com/sun/star/sheet/XDDELinkResults.hpp
+    - com/sun/star/sheet/XDDELinks.hpp
+    - com/sun/star/sheet/XExternalDocLink.hpp
+    - com/sun/star/sheet/XExternalDocLinks.hpp
+    - com/sun/star/sheet/XExternalSheetCache.hpp
+    - com/sun/star/util/XRefreshable.hpp
     sc/inc/macromgr.hxx:
     # base class has to be a complete type
     - com/sun/star/container/XContainerListener.hpp
@@ -212,6 +245,26 @@ blacklist:
     - com/sun/star/container/XNameAccess.hpp
     - com/sun/star/lang/XServiceInfo.hpp
     - cppuhelper/supportsservice.hxx
+    sc/inc/nameuno.hxx:
+    # base class has to be a complete type
+    - com/sun/star/beans/XPropertySet.hpp
+    - com/sun/star/container/XEnumerationAccess.hpp
+    - com/sun/star/document/XActionLockable.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/lang/XUnoTunnel.hpp
+    - com/sun/star/sheet/XCellRangeReferrer.hpp
+    - com/sun/star/sheet/XFormulaTokens.hpp
+    - com/sun/star/sheet/XLabelRange.hpp
+    - com/sun/star/sheet/XLabelRanges.hpp
+    - com/sun/star/sheet/XNamedRange.hpp
+    - com/sun/star/sheet/XNamedRanges.hpp
+    sc/inc/notesuno.hxx:
+    # base class has to be a complete type
+    - com/sun/star/container/XChild.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/sheet/XSheetAnnotation.hpp
+    - com/sun/star/sheet/XSheetAnnotationShapeSupplier.hpp
+    - com/sun/star/text/XSimpleText.hpp
     sc/inc/PivotTableDataSequence.hxx:
     # base class has to be a complete type
     - com/sun/star/beans/XPropertySet.hpp
@@ -250,6 +303,15 @@ blacklist:
     sc/inc/scmatrix.hxx:
     # base class has to be a complete type
     - svl/sharedstringpool.hxx
+    sc/inc/shapeuno.hxx:
+    # base class has to be a complete type
+    - com/sun/star/beans/XPropertySet.hpp
+    - com/sun/star/beans/XPropertyState.hpp
+    - com/sun/star/container/XChild.hpp
+    - com/sun/star/document/XEventsSupplier.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/text/XTextContent.hpp
+    - com/sun/star/text/XText.hpp
     sc/inc/spellcheckcontext.hxx:
     # base class has to be a complete type
     - editeng/misspellrange.hxx
diff --git a/sc/inc/ChartTools.hxx b/sc/inc/ChartTools.hxx
index ffac3aeb036d..736142a056c6 100644
--- a/sc/inc/ChartTools.hxx
+++ b/sc/inc/ChartTools.hxx
@@ -12,11 +12,15 @@
 #define INCLUDED_SC_INC_CHARTTOOLS_HXX
 
 #include <memory>
-#include <svx/svdoole2.hxx>
+#include <vector>
+
 #include <svx/svditer.hxx>
+#include <rtl/ustring.hxx>
+
+#include "types.hxx"
 
-#include <docsh.hxx>
-#include "drwlayer.hxx"
+class ScDocShell;
+class SdrOle2Obj;
 
 namespace sc {
 namespace tools {
diff --git a/sc/inc/datamapper.hxx b/sc/inc/datamapper.hxx
index 1ea5e4111c6a..2c20897b7356 100644
--- a/sc/inc/datamapper.hxx
+++ b/sc/inc/datamapper.hxx
@@ -19,7 +19,6 @@
 #include "orcusxml.hxx"
 
 class ScDocument;
-class ScDBData;
 
 namespace sc {
 
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 5ceacf4a9b26..ad90b360a120 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -37,7 +37,6 @@ class ScPatternAttr;
 class ScAttrArray;
 class ScAttrIterator;
 class ScFlatBoolRowSegments;
-struct ScInterpreterContext;
 class ScMatrix;
 struct ScDBQueryParamBase;
 struct ScQueryParam;
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 028dcdf67cb6..f889c1406d59 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -20,40 +20,30 @@
 #ifndef INCLUDED_SC_INC_EXTERNALREFMGR_HXX
 #define INCLUDED_SC_INC_EXTERNALREFMGR_HXX
 
-#include "global.hxx"
 #include "address.hxx"
 #include <sfx2/objsh.hxx>
 #include <sfx2/lnkbase.hxx>
-#include <sfx2/event.hxx>
 #include <tools/time.hxx>
 #include <vcl/timer.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/lstner.hxx>
 #include "types.hxx"
 #include "rangelst.hxx"
-#include <formula/token.hxx>
 #include <osl/mutex.hxx>
+#include <formula/types.hxx>
 
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
-#include <list>
 #include <set>
 #include <formula/ExternalReferenceHelper.hxx>
 
 class ScDocument;
 class ScTokenArray;
-namespace vcl { class Window; }
-class ScFormulaCell;
-
-class ScExternalRefCache;
-
-namespace svl {
+namespace weld { class Window; }
 
-class SharedStringPool;
-
-}
+class ScFormulaCell;
 
 namespace sc {
 
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index c600f29d79e9..7bc542aacfb3 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -24,7 +24,6 @@
 #include "mutexhlp.hxx"
 
 #include <svl/lstner.hxx>
-#include <svl/itemprop.hxx>
 #include <editeng/editdata.hxx>
 #include <com/sun/star/text/XTextField.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -37,17 +36,18 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <cppuhelper/component.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <comphelper/interfacecontainer2.hxx>
 #include <osl/mutex.hxx>
 
 #include <memory>
 
+namespace comphelper { class OInterfaceContainerHelper2; }
+
 class ScEditSource;
 class SvxFieldItem;
 class SvxFieldData;
-class ScEditFieldObj;
 class ScDocShell;
 class ScHeaderFooterTextData;
+class SfxItemPropertySet;
 
 class ScCellFieldsObj : public cppu::WeakImplHelper<
                             css::container::XEnumerationAccess,
diff --git a/sc/inc/formulaiter.hxx b/sc/inc/formulaiter.hxx
index 6e471d7574b1..5a0775a8b056 100644
--- a/sc/inc/formulaiter.hxx
+++ b/sc/inc/formulaiter.hxx
@@ -24,7 +24,6 @@
 
 #include "address.hxx"
 
-class ScTokenArray;
 class ScFormulaCell;
 
 /**
diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx
index df65d249c212..08a60c42467a 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -28,7 +28,6 @@
 #include <svl/lstner.hxx>
 #include "document.hxx"
 #include <svl/itemprop.hxx>
-#include <o3tl/deleter.hxx>
 
 class ScDocOptions;
 
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index 62375e598007..448db7c8af7f 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -30,9 +30,7 @@
 #include <com/sun/star/sheet/XNamedRange.hpp>
 #include <com/sun/star/sheet/XFormulaTokens.hpp>
 #include <com/sun/star/sheet/XNamedRanges.hpp>
-#include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -40,6 +38,8 @@
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
+namespace com { namespace sun { namespace star { namespace container { class XNamed; } } } }
+
 class ScDocShell;
 class ScNamedRangesObj;
 
diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx
index b2d21daa378b..03ed1db176ed 100644
--- a/sc/inc/recursionhelper.hxx
+++ b/sc/inc/recursionhelper.hxx
@@ -27,7 +27,6 @@
 #include <stack>
 
 class ScFormulaCell;
-struct ScFormulaCellGroup;
 
 struct ScFormulaRecursionEntry
 {
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index d6c7e0deda94..170d739da8db 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -21,18 +21,15 @@
 #define INCLUDED_SC_INC_SCABSTDLG_HXX
 
 #include <tools/solar.h>
-#include <sfx2/sfxdlg.hxx>
-#include <vcl/syswin.hxx>
-#include <vcl/field.hxx>
-#include "sc.hrc"
+#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+#include <sfx2/tabdlg.hxx>
+#include <tools/fldunit.hxx>
+#include <vcl/abstdlg.hxx>
 #include "global.hxx"
 #include "pivot.hxx"
 #include <i18nlangtag/lang.h>
 #include <asciiopt.hxx>
 
-#include <tabvwsh.hxx>
-
-class ScAsciiOptions;
 class ScAutoFormat;
 class ScAutoFormatData;
 class ScDocument;
@@ -41,10 +38,9 @@ class ScViewData;
 class ScQueryItem;
 class ScImportOptions;
 class SfxStyleSheetBase;
+class SfxAbstractTabDialog;
 class ScDPObject;
-struct ScPivotFuncData;
 struct ScDPNumGroupInfo;
-class ScSortWarningDlg;
 class ScTabViewShell;
 class ScConditionalFormat;
 class ScConditionalFormatList;
diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx
index a0e0d9ce0362..59fa75a47a0b 100644
--- a/sc/inc/scdll.hxx
+++ b/sc/inc/scdll.hxx
@@ -20,12 +20,6 @@
 #ifndef INCLUDED_SC_INC_SCDLL_HXX
 #define INCLUDED_SC_INC_SCDLL_HXX
 
-class SfxMedium;
-class SfxFilter;
-
-#include <sfx2/module.hxx>
-#include <sfx2/docfac.hxx>
-
 #include "scdllapi.h"
 
 /**
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index fb9d0ab5c973..7ba92a747aec 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -21,22 +21,18 @@
 #define INCLUDED_SC_INC_SCMOD_HXX
 
 #include "scdllapi.h"
-#include "scdll.hxx"
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include <svl/lstner.hxx>
+#include <sfx2/module.hxx>
 #include "global.hxx"
 #include "shellids.hxx"
 #include <unotools/options.hxx>
-#include <ooo/vba/XSinkCaller.hpp>
+#include <com/sun/star/uno/Reference.h>
 
-#include <com/sun/star/datatransfer/XTransferable2.hpp>
-
-#include <algorithm>
 #include <vector>
 #include <map>
 #include <memory>
-#include <stack>
 
 class KeyEvent;
 class EditView;
@@ -46,6 +42,9 @@ class SvtCTLOptions;
 class SvtUserOptions;
 
 namespace svtools { class ColorConfig; }
+namespace ooo { namespace vba { class XSinkCaller; } }
+namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
 
 class ScRange;
 class ScDocument;
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx
index 270399377b65..e3ce7f2855d8 100644
--- a/sc/inc/shapeuno.hxx
+++ b/sc/inc/shapeuno.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/container/XChild.hpp>
@@ -43,7 +42,6 @@ namespace com { namespace sun { namespace star {
 
 class SdrObject;
 struct SvEventDescription;
-class ShapeUnoEventAccessImpl;
 class  ScMacroInfo;
 
 //  object which aggregates all svx shape objects,
diff --git a/sc/inc/sheetevents.hxx b/sc/inc/sheetevents.hxx
index 8434cc209e4c..64dd3e498592 100644
--- a/sc/inc/sheetevents.hxx
+++ b/sc/inc/sheetevents.hxx
@@ -22,7 +22,8 @@
 
 #include <rtl/ustring.hxx>
 #include <memory>
-#include <boost/optional.hpp>
+
+namespace boost { template <class T> class optional; }
 
 enum class ScSheetEventId {
     FOCUS, UNFOCUS, SELECT, DOUBLECLICK, RIGHTCLICK, CHANGE, CALCULATE, COUNT,
diff --git a/sc/inc/testlotus.hxx b/sc/inc/testlotus.hxx
index aeaf359124f3..f160dc7327bd 100644
--- a/sc/inc/testlotus.hxx
+++ b/sc/inc/testlotus.hxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "scdll.hxx"
+#include <sal/types.h>
 
 class SvStream;
 
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 1c49c947cb01..ca1f47f96756 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -48,6 +48,7 @@
 #include <svx/shapepropertynotifier.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/docfile.hxx>
+#include <sfx2/objsh.hxx>
 #include <sot/storage.hxx>
 #include <svl/itempool.hxx>
 #include <vcl/virdev.hxx>
diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx
index 507bca6d1c64..5531473bb9bb 100644
--- a/sc/source/core/data/sheetevents.cxx
+++ b/sc/source/core/data/sheetevents.cxx
@@ -19,6 +19,7 @@
 
 #include <sheetevents.hxx>
 #include <com/sun/star/script/vba/VBAEventId.hpp>
+#include <boost/optional.hpp>
 
 OUString ScSheetEvents::GetEventName(ScSheetEventId nEvent)
 {
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 8b73880e718e..77f09a9105a5 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -42,6 +42,7 @@
 #include <svl/isethint.hxx>
 #include <svl/itempool.hxx>
 #include <sfx2/app.hxx>
+#include <sfx2/objsh.hxx>
 #include <unotools/useroptions.hxx>
 #include <unotools/datetime.hxx>
 #include <sfx2/sfxsids.hrc>
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index bdadc8f64693..579434fdc8db 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -34,6 +34,7 @@
 #include <vcl/outdev.hxx>
 #include <svl/inethist.hxx>
 #include <unotools/syslocale.hxx>
+#include <sfx2/objsh.hxx>
 
 #include <com/sun/star/text/textfield/Type.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 62cea990b760..707ebb1e8f82 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -71,6 +71,7 @@
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/datatransfer/XTransferable2.hpp>
+#include <ooo/vba/XSinkCaller.hpp>
 
 #include <scmod.hxx>
 #include <global.hxx>
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index a511594f2126..9f40c38f2b7e 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -74,6 +74,7 @@
 #include <editutil.hxx>
 #include <scres.hrc>
 #include <svx/dialogs.hrc>
+#include <sfx2/sfxdlg.hxx>
 
 IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl);
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index ec1f62d35f9f..c1d6aac33a58 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SC_SOURCE_UI_ATTRDLG_SCDLGFACT_HXX
 
 #include <scabstdlg.hxx>
+#include <sfx2/sfxdlg.hxx>
 class Dialog;
 class ScImportAsciiDlg;
 class ScAutoFormatDlg;
diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx
index f034589cf2f2..e93b23995c10 100644
--- a/sc/source/ui/attrdlg/scuiexp.cxx
+++ b/sc/source/ui/attrdlg/scuiexp.cxx
@@ -51,6 +51,7 @@
 #include <tabbgcolordlg.hxx>
 #include <textimportoptions.hxx>
 #include <sal/types.h>
+#include <sfx2/sfxdlg.hxx>
 
 namespace scui
 {
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 53a902288c3f..83eb6215ac77 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -23,6 +23,7 @@
 #include <vcl/waitobj.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <svx/svdpage.hxx>
+#include <svx/svdoole2.hxx>
 #include <com/sun/star/sdb/CommandType.hpp>
 
 #include <dbdocfun.hxx>
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 390fb9ab9bee..fba755a6e823 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -20,6 +20,7 @@
 #include <docsh.hxx>
 
 #include <scitems.hxx>
+#include <sc.hrc>
 #include <vcl/errinf.hxx>
 #include <editeng/justifyitem.hxx>
 #include <comphelper/fileformat.h>
@@ -36,6 +37,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dinfdlg.hxx>
 #include <sfx2/docfile.hxx>
+#include <sfx2/event.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 56e47acad5ec..c1139561817e 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -52,6 +52,7 @@ using namespace ::com::sun::star;
 #include <sfx2/passwd.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/dispatch.hxx>
+#include <sfx2/sfxdlg.hxx>
 #include <svl/PasswordHelper.hxx>
 #include <svl/documentlockfile.hxx>
 #include <svl/sharecontrolfile.hxx>
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index ed03347ebbf9..a70d2019a69d 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -40,6 +40,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
+#include <sfx2/event.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/objsh.hxx>
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx
index 49fa4b1b69b3..223ca7288c9d 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -22,6 +22,7 @@
 
 #include <vcl/dialog.hxx>
 #include <svx/langbox.hxx>
+#include <tools/stream.hxx>
 
 #include "asciiopt.hxx"
 
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 571a650a679a..c3268772696e 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -21,6 +21,7 @@
 
 #include <scitems.hxx>
 #include <sfx2/basedlgs.hxx>
+#include <sfx2/sfxdlg.hxx>
 #include <svl/style.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index ba8582e5db87..54c72df18fb8 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -28,6 +28,7 @@
 #include <editeng/fhgtitem.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/objsh.hxx>
+#include <sfx2/sfxdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
diff --git a/sc/source/ui/unoobj/ChartTools.cxx b/sc/source/ui/unoobj/ChartTools.cxx
index 942cbceac822..c74263697442 100644
--- a/sc/source/ui/unoobj/ChartTools.cxx
+++ b/sc/source/ui/unoobj/ChartTools.cxx
@@ -9,11 +9,15 @@
  */
 
 #include <ChartTools.hxx>
+#include <docsh.hxx>
+#include <drwlayer.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <svx/svditer.hxx>
+#include <svx/svdoole2.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdundo.hxx>
 #include <sfx2/app.hxx>
diff --git a/sc/source/ui/unoobj/TablePivotChart.cxx b/sc/source/ui/unoobj/TablePivotChart.cxx
index 75604ca31e89..5f0448cdb5fd 100644
--- a/sc/source/ui/unoobj/TablePivotChart.cxx
+++ b/sc/source/ui/unoobj/TablePivotChart.cxx
@@ -10,6 +10,7 @@
 #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <svx/charthelper.hxx>
+#include <svx/svdoole2.hxx>
 #include <svtools/embedhlp.hxx>
 
 #include <miscuno.hxx>
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index b62ddd6db66a..febd4f2fcadd 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -35,6 +35,7 @@
 #include <printopt.hxx>
 #include <userlist.hxx>
 #include <sc.hrc>
+#include <scdll.hxx>
 #include <unonames.hxx>
 #include <funcdesc.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index b9cead695b7a..390e396b43c4 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -25,6 +25,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/sfxdlg.hxx>
 #include <svl/aeitem.hxx>
 #include <basic/sbxcore.hxx>
 #include <svl/whiter.hxx>
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 5b11b8b046de..7622c978683c 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -31,6 +31,7 @@
 #include <sfx2/newstyle.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/sfxdlg.hxx>
 #include <svl/whiter.hxx>
 
 #include <svl/stritem.hxx>
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index a5c51b7fc5f5..985c229a4a78 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -32,6 +32,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/sfxdlg.hxx>
 
 #include <global.hxx>
 #include <attrib.hxx>