tdf#42949 Fix IWYU warnings in include/svl/*

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

Change-Id: Ide75232858599c275e023c2300201090acd22307
Reviewed-on: https://gerrit.libreoffice.org/63237
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

basctl/source/basicide/baside2.cxx

@@ -37,6 +37,7 @@
 #include <com/sun/star/ui/dialogs/FilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <comphelper/string.hxx>
+#include <svl/srchdefs.hxx>
 #include <sfx2/dinfdlg.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/docfile.hxx>

basctl/source/basicide/basides1.cxx

@@ -34,6 +34,7 @@
 #include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
+#include <svl/srchdefs.hxx>
 #include <sal/log.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/docfac.hxx>

editeng/inc/editattr.hxx

@@ -24,6 +24,7 @@
 #include <svl/poolitem.hxx>
 #include <boost/optional.hpp>
 #include <tools/color.hxx>
+#include <tools/debug.hxx>
 
 class SvxFont;
 class SvxFontItem;

editeng/source/accessibility/AccessibleParaManager.cxx

@@ -25,6 +25,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 

editeng/source/items/justifyitem.cxx

@@ -23,6 +23,7 @@
 #include <editeng/eerdll.hxx>
 
 #include <tools/stream.hxx>
+#include <tools/debug.hxx>
 
 #include <com/sun/star/table/CellHoriJustify.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>

editeng/source/items/writingmodeitem.cxx

@@ -23,6 +23,8 @@
 #include <editeng/editrids.hrc>
 #include <osl/diagnose.h>
 
+#include <climits>
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::text;
 

editeng/source/items/xmlcnitm.cxx

@@ -18,6 +18,7 @@
  */
 
 #include <memory>
+#include <climits>
 #include <com/sun/star/xml/AttributeData.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <o3tl/any.hxx>
@@ -25,6 +26,8 @@
 #include <xmloff/xmlcnimp.hxx>
 #include <xmloff/unoatrcn.hxx>
 #include <editeng/xmlcnitm.hxx>
+#include <tools/debug.hxx>
+#include <tools/solar.h>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;

editeng/source/uno/unoipset.cxx

@@ -21,6 +21,7 @@
 #include <svl/eitem.hxx>
 #include <svl/itemprop.hxx>
 #include <tools/helpers.hxx>
+#include <tools/debug.hxx>
 #include <editeng/unoipset.hxx>
 #include <editeng/editids.hrc>
 #include <editeng/editeng.hxx>

include/IwyuFilter_include.yaml

@@ -284,3 +284,13 @@ blacklist:
     include/i18nutil/transliteration.hxx:
     # Needed for template
     - o3tl/typed_flags_set.hxx
+    include/svl/numuno.hxx:
+    # base class has to be a complete type
+    - com/sun/star/lang/XUnoTunnel.hpp
+    - com/sun/star/util/XNumberFormatsSupplier.hpp
+    include/svl/srchdefs.hxx:
+    # Needed for template
+    - o3tl/typed_flags_set.hxx
+    include/svl/urihelper.hxx:
+    # base class has to be a complete type
+    - tools/link.hxx

include/editeng/fhgtitem.hxx

@@ -20,6 +20,8 @@
 #define INCLUDED_EDITENG_FHGTITEM_HXX
 
 #include <svl/poolitem.hxx>
+#include <tools/debug.hxx>
+#include <tools/solar.h>
 #include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;

include/editeng/numitem.hxx

@@ -21,6 +21,7 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/link.hxx>
+#include <tools/solar.h>
 #include <svl/poolitem.hxx>
 #include <editeng/svxenum.hxx>
 #include <tools/gen.hxx>

include/sfx2/ctrlitem.hxx

@@ -23,6 +23,7 @@
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
 #include <svl/poolitem.hxx>
+#include <tools/debug.hxx>
 #if defined( DBG_UTIL )
 #include <sfx2/msg.hxx>
 #endif

include/svl/IndexedStyleSheets.hxx

@@ -10,8 +10,6 @@
 #ifndef INCLUDED_SVL_INDEXEDSTYLESHEETS_HXX
 #define INCLUDED_SVL_INDEXEDSTYLESHEETS_HXX
 
-#include <sal/types.h>
-
 #include <svl/style.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ref.hxx>
@@ -21,8 +19,6 @@
 #include <unordered_map>
 #include <vector>
 
-class SfxStyleSheetBase;
-
 namespace svl {
 
 /** Function object to check whether a style sheet a fulfills specific criteria.

include/svl/aeitem.hxx

@@ -20,12 +20,10 @@
 #define INCLUDED_SVL_AEITEM_HXX
 
 #include <svl/svldllapi.h>
-#include <svl/poolitem.hxx>
 #include <svl/eitem.hxx>
 
 #include <cstddef>
 #include <memory>
-#include <vector>
 
 class SfxAllEnumValueArr;
 

include/svl/asiancfg.hxx

@@ -24,7 +24,6 @@
 
 #include <memory>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <sal/types.h>
 #include <svl/svldllapi.h>
 
 namespace com { namespace sun { namespace star { namespace lang {

include/svl/cjkoptions.hxx

@@ -20,7 +20,6 @@
 #define INCLUDED_SVL_CJKOPTIONS_HXX
 
 #include <svl/svldllapi.h>
-#include <sal/types.h>
 #include <unotools/options.hxx>
 #include <memory>
 

include/svl/cryptosign.hxx

@@ -7,10 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <config_features.h>
 #include <sal/types.h>
 
-#include <memory>
 #include <vector>
 
 #include <rtl/strbuf.hxx>
@@ -19,7 +17,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 
 #include <svl/svldllapi.h>
-#include <svl/sigstruct.hxx>
 
 namespace com {
 namespace sun {
@@ -29,6 +26,7 @@ namespace security {
 }}}
 
 class SvStream;
+struct SignatureInformation;
 
 namespace svl {
 

include/svl/ctloptions.hxx

@@ -20,7 +20,6 @@
 #define INCLUDED_SVL_CTLOPTIONS_HXX
 
 #include <svl/svldllapi.h>
-#include <sal/types.h>
 #include <unotools/options.hxx>
 #include <memory>
 

include/svl/documentlockfile.hxx

@@ -22,14 +22,11 @@
 
 #include <svl/svldllapi.h>
 
-#include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
-#include <com/sun/star/io/XTruncate.hpp>
-
 #include <svl/lockfilecommon.hxx>
 
+namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
+namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } }
+
 namespace svt {
 
 class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon

include/svl/flagitem.hxx

@@ -21,6 +21,7 @@
 
 #include <svl/poolitem.hxx>
 #include <svl/svldllapi.h>
+#include <tools/debug.hxx>
 
 class SvStream;
 

include/svl/ilstitem.hxx

@@ -22,9 +22,10 @@
 
 #include <svl/svldllapi.h>
 #include <svl/poolitem.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+
 class SVL_DLLPUBLIC SfxIntegerListItem : public SfxPoolItem
 {
     std::vector < sal_Int32 > m_aList;

include/svl/inettype.hxx

@@ -22,7 +22,6 @@
 
 #include <svl/svldllapi.h>
 #include <tools/inetmime.hxx>
-#include <i18nlangtag/languagetag.hxx>
 
 
 /** Definitions for frequently used media type names.

include/svl/itemiter.hxx

@@ -23,8 +23,6 @@
 #include <svl/itemset.hxx>
 
 class SfxPoolItem;
-class SfxItemSet;
-class SfxItemPool;
 
 class SVL_DLLPUBLIC SfxItemIter
 {

include/svl/itempool.hxx

@@ -20,15 +20,12 @@
 #ifndef INCLUDED_SVL_ITEMPOOL_HXX
 #define INCLUDED_SVL_ITEMPOOL_HXX
 
-#include <rtl/string.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/svldllapi.h>
 #include <svl/typedwhich.hxx>
-#include <tools/solar.h>
 #include <memory>
 #include <vector>
 
-class SvStream;
 class SfxBroadcaster;
 struct SfxItemPool_Impl;
 
@@ -38,8 +35,6 @@ struct SfxItemInfo
     bool            _bPoolable;
 };
 
-class SfxStyleSheetIterator;
-struct SfxPoolItemArray_Impl;
 class SfxItemPool;
 
 class SVL_DLLPUBLIC SfxItemPoolUser

include/svl/itemset.hxx

@@ -33,8 +33,6 @@
 #include <svl/typedwhich.hxx>
 
 class SfxItemPool;
-class SfxPoolItem;
-class SvStream;
 
 namespace svl {
 

include/svl/languageoptions.hxx

@@ -24,8 +24,8 @@
 #include <unotools/configitem.hxx>
 #include <unotools/options.hxx>
 #include <i18nlangtag/lang.h>
-#include <o3tl/typed_flags_set.hxx>
 #include <memory>
+namespace o3tl { template <typename T> struct typed_flags; }
 
 // class SvtLanguageOptions ----------------------------------------------------
 

include/svl/lockfilecommon.hxx

@@ -22,11 +22,7 @@
 
 #include <svl/svldllapi.h>
 
-#include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
-#include <com/sun/star/io/XTruncate.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
 
 #include <osl/mutex.hxx>
 #include <tools/urlobj.hxx>

include/svl/numuno.hxx

@@ -22,7 +22,6 @@
 #include <svl/svldllapi.h>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include <memory>
 

include/svl/ondemand.hxx

@@ -25,12 +25,9 @@
 #include <i18nlangtag/lang.h>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/calendarwrapper.hxx>
-#include <unotools/collatorwrapper.hxx>
-#include <com/sun/star/i18n/CollatorOptions.hpp>
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/nativenumberwrapper.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <i18nutil/transliteration.hxx>
 
 /*

include/svl/ownlist.hxx

@@ -21,7 +21,7 @@
 #define INCLUDED_SVL_OWNLIST_HXX
 
 #include <svl/svldllapi.h>
-#include <com/sun/star/uno/Sequence.hxx>
+#include <rtl/ustring.hxx>
 #include <vector>
 
 namespace com { namespace sun { namespace star {
@@ -30,6 +30,7 @@ namespace com { namespace sun { namespace star {
     }
 }}}
 
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
 
 class SvCommand
 /*

include/svl/poolitem.hxx

@@ -22,16 +22,13 @@
 
 #include <sal/config.h>
 
-#include <climits>
 #include <memory>
 
 #include <com/sun/star/uno/Any.hxx>
 #include <svl/hint.hxx>
 #include <svl/svldllapi.h>
 #include <svl/typedwhich.hxx>
-#include <tools/debug.hxx>
 #include <tools/mapunit.hxx>
-#include <tools/solar.h>
 
 class IntlWrapper;
 class SvStream;
@@ -112,7 +109,6 @@ enum class SfxItemState {
 
 #define INVALID_POOL_ITEM reinterpret_cast<SfxPoolItem*>(-1)
 
-class SvXMLUnitConverter;
 class SfxItemPool;
 class SfxItemSet;
 

include/svl/ptitem.hxx

@@ -22,6 +22,7 @@
 #include <svl/svldllapi.h>
 #include <svl/poolitem.hxx>
 #include <tools/gen.hxx>
+#include <tools/debug.hxx>
 
 class SvStream;
 

include/svl/rectitem.hxx

@@ -20,7 +20,6 @@
 #define INCLUDED_SVL_RECTITEM_HXX
 
 #include <svl/svldllapi.h>
-#include <tools/debug.hxx>
 #include <tools/gen.hxx>
 #include <svl/poolitem.hxx>
 

include/svl/sharecontrolfile.hxx

@@ -22,16 +22,15 @@
 
 #include <svl/svldllapi.h>
 
-#include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
-#include <com/sun/star/io/XTruncate.hpp>
-
 #include <svl/lockfilecommon.hxx>
-#include <o3tl/enumarray.hxx>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
+namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } }
+namespace com { namespace sun { namespace star { namespace io { class XSeekable; } } } }
+namespace com { namespace sun { namespace star { namespace io { class XStream; } } } }
+namespace com { namespace sun { namespace star { namespace io { class XTruncate; } } } }
+
 namespace svt {
 
 class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon

include/svl/sigstruct.hxx

@@ -22,7 +22,6 @@
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/util/DateTime.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/xml/crypto/SecurityOperationStatus.hpp>
 #include <com/sun/star/xml/crypto/DigestID.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -30,6 +29,8 @@
 #include <set>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
+
 /*
  * type of reference
  */

include/svl/slstitm.hxx

@@ -23,9 +23,10 @@
 
 #include <svl/svldllapi.h>
 #include <svl/poolitem.hxx>
-#include <com/sun/star/uno/Sequence.h>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+
 class SVL_DLLPUBLIC SfxStringListItem : public SfxPoolItem
 {
     std::shared_ptr<std::vector<OUString>> mpList;

include/svl/srchitem.hxx

@@ -21,7 +21,6 @@
 
 #include <sal/config.h>
 #include <svl/svldllapi.h>
-#include <com/sun/star/util/XSearchDescriptor.hpp>
 #include <com/sun/star/util/SearchAlgorithms2.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <i18nutil/transliteration.hxx>
@@ -29,7 +28,6 @@
 #include <unotools/configitem.hxx>
 #include <svl/style.hxx>
 #include <svl/poolitem.hxx>
-#include <svl/srchdefs.hxx>
 
 // defines ---------------------------------------------------------------
 

include/svl/style.hxx

@@ -33,6 +33,7 @@
 #include <svl/SfxBroadcaster.hxx>
 #include <svl/stylesheetuser.hxx>
 #include <o3tl/typed_flags_set.hxx>
+#include <tools/solar.h>
 
 #include <memory>
 

include/svl/svdde.hxx

@@ -23,22 +23,15 @@
 #include <sal/config.h>
 
 #include <svl/svldllapi.h>
-#include <sot/exchange.hxx>
+#include <sot/formats.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
 #include <tools/link.hxx>
 #include <memory>
 #include <vector>
 
 class DdeString;
-class DdeData;
 class DdeConnection;
-class DdeTransaction;
-class DdeLink;
-class DdeRequest;
-class DdeHotLink;
-class DdePoke;
-class DdeExecute;
-class DdeItem;
 class DdeTopic;
 class DdeService;
 struct DdeDataImp;

include/svl/svlresid.hxx

@@ -12,7 +12,6 @@
 
 #include <svl/svldllapi.h>
 #include <rtl/ustring.hxx>
-#include <locale>
 
 SVL_DLLPUBLIC OUString SvlResId(const char* pId);
 

include/svl/undo.hxx

@@ -24,12 +24,9 @@
 #include <tools/datetime.hxx>
 #include <o3tl/strong_int.hxx>
 
-#include <limits>
 #include <memory>
 #include <vector>
 
-struct MarkedUndoAction;
-
 typedef o3tl::strong_int<sal_Int32, struct ViewShellIdTag> ViewShellId;
 
 class SVL_DLLPUBLIC SfxRepeatTarget

include/svl/urihelper.hxx

@@ -21,7 +21,6 @@
 #define INCLUDED_SVL_URIHELPER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <rtl/textenc.h>
 #include <svl/svldllapi.h>
 #include <tools/link.hxx>

include/svl/whiter.hxx

@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SVL_WHITER_HXX
 #define INCLUDED_SVL_WHITER_HXX
 
-#include <limits.h>
 #include <svl/svldllapi.h>
 
 class SfxItemSet;

include/svl/zforlist.hxx

@@ -23,22 +23,21 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <i18nlangtag/lang.h>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/i18n/NumberFormatCode.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
-#include <com/sun/star/i18n/NumberFormatMapper.hpp>
-#include <com/sun/star/i18n/Currency.hpp>
 #include <unotools/localedatawrapper.hxx>
 #include <tools/link.hxx>
 #include <svl/ondemand.hxx>
 #include <svl/nfkeytab.hxx>
-#include <o3tl/typed_flags_set.hxx>
 
 #include <map>
 #include <memory>
 #include <set>
 
+namespace com { namespace sun { namespace star { namespace i18n { class XNumberFormatCode; } } } }
+namespace com { namespace sun { namespace star { namespace i18n { struct Currency; } } } }
+namespace com { namespace sun { namespace star { namespace i18n { struct NumberFormatCode; } } } }
+namespace o3tl { template <typename T> struct typed_flags; }
+
 class Date;
 class Color;
 class CharClass;

include/svl/zformat.hxx

@@ -20,21 +20,20 @@
 #define INCLUDED_SVL_ZFORMAT_HXX
 
 #include <svl/svldllapi.h>
-#include <i18nlangtag/mslangid.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/nfkeytab.hxx>
 #include <vector>
-#include <com/sun/star/i18n/NativeNumberXmlAttributes2.hpp>
 
 namespace utl {
     class DigitGroupingIterator;
 }
 
+namespace com { namespace sun { namespace star { namespace i18n { struct NativeNumberXmlAttributes2; } } } }
+
 class Color;
 
 class ImpSvNumberformatScan;            // format code string scanner
 class ImpSvNumberInputScan;             // input string scanner
-class SvNumberFormatter;
 
 enum SvNumberformatLimitOps
 {

linguistic/source/convdiclist.cxx

@@ -37,6 +37,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <sal/log.hxx>
 #include <rtl/instance.hxx>
+#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <ucbhelper/content.hxx>

linguistic/source/dlistimp.cxx

@@ -21,6 +21,7 @@
 #include <cppuhelper/factory.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <osl/file.hxx>
+#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>

linguistic/source/gciterator.cxx

@@ -57,6 +57,7 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
+#include <tools/debug.hxx>
 
 #include <deque>
 #include <map>

sc/IwyuFilter_sc.yaml

@@ -219,6 +219,8 @@ blacklist:
     sc/inc/global.hxx:
     # base class has to be a complete type
     - tools/ref.hxx
+    # Needed for macro #define
+    - com/sun/star/i18n/CollatorOptions.hpp
     sc/inc/linkuno.hxx:
     # base class has to be a complete type
     - com/sun/star/beans/XPropertySet.hpp

sc/inc/global.hxx

@@ -25,6 +25,7 @@
 #include <svx/svdtypes.hxx>
 #include <tools/ref.hxx>
 #include <sal/types.h>
+#include <com/sun/star/i18n/CollatorOptions.hpp>
 #include "scdllapi.h"
 #include <rtl/ustring.hxx>
 

sc/qa/unit/ucalc.cxx

@@ -87,6 +87,7 @@
 #include <svx/svdocapt.hxx>
 #include <svl/srchitem.hxx>
 #include <svl/sharedstringpool.hxx>
+#include <unotools/collatorwrapper.hxx>
 
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxsids.hrc>

sc/source/core/data/dociter.cxx

@@ -42,6 +42,7 @@
 #include <tools/fract.hxx>
 #include <editeng/editobj.hxx>
 #include <svl/sharedstring.hxx>
+#include <unotools/collatorwrapper.hxx>
 
 #include <vector>
 

sc/source/core/data/dpcache.cxx

@@ -35,6 +35,7 @@
 #include <rtl/math.hxx>
 #include <unotools/textsearch.hxx>
 #include <unotools/localedatawrapper.hxx>
+#include <unotools/collatorwrapper.hxx>
 #include <svl/zforlist.hxx>
 #include <o3tl/make_unique.hxx>
 #include <osl/diagnose.h>

sc/source/core/data/dpitemdata.cxx

@@ -23,6 +23,7 @@
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <rtl/math.hxx>
+#include <unotools/collatorwrapper.hxx>
 
 const sal_Int32 ScDPItemData::DateFirst = -1;
 const sal_Int32 ScDPItemData::DateLast  = 10000;

sc/source/core/tool/autoform.cxx

@@ -32,6 +32,7 @@
 #include <editeng/langitem.hxx>
 #include <tools/urlobj.hxx>
 #include <comphelper/fileformat.h>
+#include <unotools/collatorwrapper.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <tools/tenccvt.hxx>
 #include <o3tl/make_unique.hxx>

sc/source/core/tool/compare.cxx

@@ -22,6 +22,7 @@
 #include <document.hxx>
 #include <docoptio.hxx>
 
+#include <unotools/collatorwrapper.hxx>
 #include <unotools/textsearch.hxx>
 #include <rtl/math.hxx>
 #include <osl/diagnose.h>

sc/source/core/tool/interpr1.cxx

@@ -38,6 +38,7 @@
 #include <sal/log.hxx>
 #include <unicode/uchar.h>
 #include <unicode/regex.h>
+#include <i18nlangtag/mslangid.hxx>
 
 #include <patattr.hxx>
 #include <global.hxx>

sc/source/filter/excel/xlchart.cxx

@@ -35,6 +35,7 @@
 #include <com/sun/star/chart/XSecondAxisTitleSupplier.hpp>
 #include <com/sun/star/chart2/Symbol.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <sal/macros.h>
 #include <rtl/math.hxx>