tdf#42949 Fix IWYU warnings in svl/

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

Except source/svdde/* which is WIN-specific

Also recheck include/svl

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

59 files changed, 16 insertions, 140 deletions

diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx
index 27b5b5defc92..af8b6e95b230 100644
--- a/svl/source/config/asiancfg.cxx
+++ b/svl/source/config/asiancfg.cxx
@@ -34,8 +34,6 @@
 #include <comphelper/configuration.hxx>
 #include <comphelper/processfactory.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 #include <sal/types.h>
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index 32cd9d5ce834..71054f564de4 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -23,7 +23,6 @@
 #include <svl/languageoptions.hxx>
 #include <i18nlangtag/lang.h>
 #include <unotools/configitem.hxx>
-#include <tools/solar.h>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/mutex.hxx>
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index 81bb44049a75..0723f47ac1a1 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -20,15 +20,11 @@
 
 #include <svl/ctloptions.hxx>
 
-#include <svl/languageoptions.hxx>
-#include <i18nlangtag/mslangid.hxx>
 #include <unotools/configitem.hxx>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
-#include <unotools/syslocale.hxx>
-#include <svl/hint.hxx>
 #include "itemholder2.hxx"
 
 using namespace ::com::sun::star;
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx
index b19ce9b644ca..d9182c8cc410 100644
--- a/svl/source/config/itemholder2.cxx
+++ b/svl/source/config/itemholder2.cxx
@@ -28,7 +28,6 @@
 
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
-#include <svl/languageoptions.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/options.hxx>
 
diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
index a6cdd6b2c396..2ace6a9fbee0 100644
--- a/svl/source/crypto/cryptosign.cxx
+++ b/svl/source/crypto/cryptosign.cxx
@@ -24,16 +24,10 @@
 #include <com/sun/star/security/XCertificate.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <filter/msfilter/mscodec.hxx>
-#include <sax/tools/converter.hxx>
-#include <unotools/calendarwrapper.hxx>
-#include <unotools/datetime.hxx>
-#include <xmloff/xmluconv.hxx>
-#include <tools/zcodec.hxx>
 #include <o3tl/char16_t2wchar_t.hxx>
 
 #if HAVE_FEATURE_NSS && !defined(_WIN32)
 // NSS headers for PDF signing
-#include <nss.h>
 #include <cert.h>
 #include <hasht.h>
 #include <secerr.h>
@@ -57,7 +51,6 @@
 #if HAVE_FEATURE_NSS
 
 #include <com/sun/star/xml/crypto/XDigestContext.hpp>
-#include <com/sun/star/xml/crypto/XDigestContextSupplier.hpp>
 #include <com/sun/star/xml/crypto/DigestID.hpp>
 #include <com/sun/star/xml/crypto/NSSInitializer.hpp>
 #include <mutex>
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 31fd68bd54a6..980113267806 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -20,10 +20,8 @@
 
 #include <fsfactory.hxx>
 #include <cppuhelper/factory.hxx>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index ebd730d116e9..344553b67c5f 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -17,26 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/InvalidStorageException.hpp>
 #include <com/sun/star/embed/StorageWrappedTargetException.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
+#include <com/sun/star/packages/NoEncryptionException.hpp>
 #include <com/sun/star/packages/WrongPasswordException.hpp>
 #include <com/sun/star/ucb/NameClash.hpp>
-#include <com/sun/star/ucb/XProgressHandler.hpp>
-#include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 
 #include <com/sun/star/ucb/InteractiveIOException.hpp>
 #include <com/sun/star/ucb/IOErrorCode.hpp>
 #include <com/sun/star/container/ElementExistException.hpp>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-#include <com/sun/star/util/XCloneable.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
@@ -47,12 +39,13 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 
 #include <comphelper/fileurl.hxx>
+#include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 
+#include <osl/diagnose.h>
 #include <tools/urlobj.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx
index 4db99c0bda48..2bbdc5525879 100644
--- a/svl/source/fsstor/fsstorage.hxx
+++ b/svl/source/fsstor/fsstorage.hxx
@@ -23,15 +23,11 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/packages/NoEncryptionException.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/interfacecontainer.h>
 
 #include <ucbhelper/content.hxx>
 
diff --git a/svl/source/fsstor/ostreamcontainer.hxx b/svl/source/fsstor/ostreamcontainer.hxx
index 5d255f44aab3..543a2049c306 100644
--- a/svl/source/fsstor/ostreamcontainer.hxx
+++ b/svl/source/fsstor/ostreamcontainer.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SVL_SOURCE_FSSTOR_OSTREAMCONTAINER_HXX
 #define INCLUDED_SVL_SOURCE_FSSTOR_OSTREAMCONTAINER_HXX
 
-#include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/embed/XExtendedStorageStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
@@ -30,7 +29,6 @@
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/io/XAsyncOutputMonitor.hpp>
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <osl/mutex.hxx>
 #include <memory>
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index 971fb86c9b1d..207dffded624 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -20,11 +20,9 @@
 #ifndef INCLUDED_SVL_SOURCE_INC_POOLIO_HXX
 #define INCLUDED_SVL_SOURCE_INC_POOLIO_HXX
 
-#include <sal/log.hxx>
 #include <svl/itempool.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <tools/debug.hxx>
-#include <deque>
 #include <memory>
 #include <o3tl/sorted_vector.hxx>
 
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 6646647d763e..c5e30b81ece3 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <com/sun/star/uno/Any.hxx>
-#include <tools/stream.hxx>
 #include <svl/cenumitm.hxx>
 #include <svl/eitem.hxx>
 
diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index 4545a8ae2cc5..07728df344b2 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <com/sun/star/uno/Any.hxx>
-#include <tools/stream.hxx>
 #include <svl/cintitem.hxx>
 #include <sal/log.hxx>
 
diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx
index 4cba9175d001..36a32d1ff34b 100644
--- a/svl/source/items/custritm.cxx
+++ b/svl/source/items/custritm.cxx
@@ -21,7 +21,6 @@
 
 #include <osl/diagnose.h>
 #include <unotools/intlwrapper.hxx>
-#include <tools/stream.hxx>
 #include <svl/custritm.hxx>
 
 
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index 96db1c338413..fb2732a56a67 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -20,7 +20,6 @@
 
 #include <svl/flagitem.hxx>
 #include <svl/poolitem.hxx>
-#include <tools/stream.hxx>
 #include <sal/log.hxx>
 
 
diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx
index 74b9e1f580cb..529a3398c3b7 100644
--- a/svl/source/items/globalnameitem.cxx
+++ b/svl/source/items/globalnameitem.cxx
@@ -21,8 +21,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/script/Converter.hpp>
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
 #include <osl/diagnose.h>
 
 #include <comphelper/processfactory.hxx>
diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx
index e5d04da41d7d..191d7b35c74b 100644
--- a/svl/source/items/grabbagitem.cxx
+++ b/svl/source/items/grabbagitem.cxx
@@ -11,8 +11,8 @@
 #include <sal/config.h>
 
 #include <sal/log.hxx>
-#include <comphelper/sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx
index 21fca8aa3173..75499d772252 100644
--- a/svl/source/items/ilstitem.cxx
+++ b/svl/source/items/ilstitem.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <com/sun/star/script/Converter.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/svl/source/items/int64item.cxx b/svl/source/items/int64item.cxx
index c32794a359ff..f128bc4d4275 100644
--- a/svl/source/items/int64item.cxx
+++ b/svl/source/items/int64item.cxx
@@ -8,7 +8,6 @@
  */
 
 #include <svl/int64item.hxx>
-#include <tools/stream.hxx>
 
 SfxInt64Item::SfxInt64Item( sal_uInt16 nWhich, sal_Int64 nVal ) :
     SfxPoolItem(nWhich), mnValue(nVal)
diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index 70be1383349e..1345308281fa 100644
--- a/svl/source/items/intitem.cxx
+++ b/svl/source/items/intitem.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <osl/diagnose.h>
 #include <tools/bigint.hxx>
-#include <tools/stream.hxx>
 #include <svl/metitem.hxx>
 #include <libxml/xmlwriter.h>
 
diff --git a/svl/source/items/itemiter.cxx b/svl/source/items/itemiter.cxx
index cbe0f2f8ed03..2285122e0d87 100644
--- a/svl/source/items/itemiter.cxx
+++ b/svl/source/items/itemiter.cxx
@@ -19,7 +19,6 @@
 
 
 #include <svl/itemiter.hxx>
-#include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 
 SfxItemIter::SfxItemIter( const SfxItemSet& rItemSet )
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index c0beaf2614f4..ca9de98910d2 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -24,6 +24,7 @@
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <memory>
 #include <unordered_map>
 /*
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index bed2259d40ea..4841123eed0a 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -32,12 +32,6 @@
 #include <svl/itemiter.hxx>
 #include <svl/whiter.hxx>
 
-#include <tools/stream.hxx>
-#include <tools/solar.h>
-#include <rtl/string.hxx>
-
-#include <poolio.hxx>
-
 static const sal_uInt16 nInitCount = 10; // Single USHORTs => 5 pairs without '0'
 
 namespace
diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx
index 46e266d6204c..25cebefc01d5 100644
--- a/svl/source/items/lckbitem.cxx
+++ b/svl/source/items/lckbitem.cxx
@@ -18,9 +18,7 @@
  */
 
 #include <svl/lckbitem.hxx>
-#include <svl/poolitem.hxx>
 #include <tools/stream.hxx>
-#include <tools/solar.h>
 #include <osl/diagnose.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx
index 05401669216c..1ff06ab402a0 100644
--- a/svl/source/items/poolcach.cxx
+++ b/svl/source/items/poolcach.cxx
@@ -18,8 +18,6 @@
  */
 
 
-#include <limits.h>
-
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include <svl/poolcach.hxx>
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index a909450f4588..313c431e9866 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -20,9 +20,7 @@
 #include <poolio.hxx>
 
 #include <sal/log.hxx>
-#include <tools/solar.h>
 #include <svl/itempool.hxx>
-#include <svl/SfxBroadcaster.hxx>
 
 #include <algorithm>
 #include <memory>
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index a5501dc907d8..1ee28f0352f0 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -19,7 +19,6 @@
 
 
 #include <svl/poolitem.hxx>
-#include <tools/stream.hxx>
 #include <unotools/intlwrapper.hxx>
 #include <unotools/syslocale.hxx>
 #include <osl/diagnose.h>
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index ed228db34e87..af634fcc201c 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/awt/Point.hpp>
 #include <osl/diagnose.h>
-#include <tools/stream.hxx>
 #include <tools/mapunit.hxx>
 
 #include <svl/poolitem.hxx>
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index 170bf76db521..5889140782a6 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <osl/diagnose.h>
-#include <tools/stream.hxx>
 
 #include <svl/poolitem.hxx>
 #include <svl/memberid.h>
diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index 1cabc517eb79..6bc41e6976d0 100644
--- a/svl/source/items/rngitem.cxx
+++ b/svl/source/items/rngitem.cxx
@@ -19,8 +19,6 @@
 
 #include <sal/config.h>
 
-#include <sal/log.hxx>
-#include <tools/stream.hxx>
 #include <svl/rngitem.hxx>
 
 
diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx
index 9d09e1103038..79a6aa93d414 100644
--- a/svl/source/items/sitem.cxx
+++ b/svl/source/items/sitem.cxx
@@ -24,7 +24,6 @@
 #include <rtl/ustring.hxx>
 #include <svl/itemset.hxx>
 #include <svl/poolitem.hxx>
-#include <tools/stream.hxx>
 #include <tools/debug.hxx>
 
 SfxSetItem::SfxSetItem( sal_uInt16 which, const SfxItemSet &rSet) :
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index e366badc8167..db0b781bbac1 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -23,9 +23,8 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/diagnose.h>
-#include <tools/stream.hxx>
-#include <stringio.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <tools/lineend.hxx>
 
 SfxPoolItem* SfxStringListItem::CreateDefault() { return new SfxStringListItem; }
 
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index d8995e6b0a8f..e53df3a77518 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -25,11 +25,7 @@
 #include <osl/diagnose.h>
 
 #include <unotools/searchopt.hxx>
-#include <com/sun/star/util/XReplaceable.hpp>
-#include <com/sun/star/util/XSearchable.hpp>
-#include <com/sun/star/util/XSearchDescriptor.hpp>
-#include <com/sun/star/util/XPropertyReplace.hpp>
-#include <com/sun/star/util/XReplaceDescriptor.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <svl/memberid.h>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx
index 131e468e6b99..503c5d4083ac 100644
--- a/svl/source/items/stritem.cxx
+++ b/svl/source/items/stritem.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <svl/stritem.hxx>
-#include <stringio.hxx>
 #include <libxml/xmlwriter.h>
 
 //  class SfxStringItem
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index a563e5a00cbf..4ce1a225948a 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/lang/XComponent.hpp>
 
 #include <sal/log.hxx>
-#include <tools/tenccvt.hxx>
 #include <osl/diagnose.h>
 #include <unotools/intlwrapper.hxx>
 #include <svl/hint.hxx>
@@ -33,7 +32,6 @@
 #include <svl/IndexedStyleSheets.hxx>
 #include <svl/itemiter.hxx>
 #include <unotools/syslocale.hxx>
-#include <algorithm>
 #include <comphelper/servicehelper.hxx>
 #include <rtl/ustrbuf.hxx>
 
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index d1ad3efc01a2..ae821abcd5b5 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -20,7 +20,6 @@
 #include <svl/visitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <osl/diagnose.h>
-#include <tools/stream.hxx>
 
 
 // virtual
diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index fe567d295f3f..bc3fe86ef819 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
 #include <com/sun/star/ucb/NameClashException.hpp>
@@ -30,24 +29,16 @@
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/io/XTruncate.hpp>
 
-#include <osl/time.h>
-#include <osl/security.hxx>
-#include <osl/socket.hxx>
 #include <o3tl/enumrange.hxx>
 
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
-#include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <comphelper/processfactory.hxx>
 
-#include <unotools/bootstrap.hxx>
-
 #include <ucbhelper/content.hxx>
 
-#include <unotools/useroptions.hxx>
-
 #include <svl/documentlockfile.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svl/source/misc/getstringresource.cxx b/svl/source/misc/getstringresource.cxx
index 9b0f14882b61..aece9a3007e5 100644
--- a/svl/source/misc/getstringresource.cxx
+++ b/svl/source/misc/getstringresource.cxx
@@ -19,10 +19,7 @@
 
 #include <sal/config.h>
 
-#include <memory>
-#include <i18nlangtag/languagetag.hxx>
 #include <rtl/ustring.hxx>
-#include <sal/types.h>
 #include <svl/svlresid.hxx>
 #include <unotools/resmgr.hxx>
 
diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx
index 9ed7f43b41d5..e129457a8215 100644
--- a/svl/source/misc/gridprinter.cxx
+++ b/svl/source/misc/gridprinter.cxx
@@ -11,8 +11,8 @@
 #include <rtl/ustrbuf.hxx>
 
 #include <mdds/multi_type_vector_types.hpp>
-#include <mdds/multi_type_vector_trait.hpp>
 #include <mdds/multi_type_vector_custom_func1.hpp>
+#include <mdds/multi_type_vector_macro.hpp>
 #include <mdds/multi_type_matrix.hpp>
 
 #include <iostream>
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 7c05b6ef423e..5dafe30d2ce2 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -25,7 +25,6 @@
 #include <rtl/instance.hxx>
 #include <rtl/crc.h>
 #include <osl/getglobalmutex.hxx>
-#include <tools/solar.h>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index f2bdd6c8f2f9..f92db768ddcb 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -20,16 +20,11 @@
 #include <sal/config.h>
 
 #include <array>
-#include <utility>
-#include <map>
 
 #include <tools/wldcrd.hxx>
 #include <tools/inetmime.hxx>
-#include <rtl/instance.hxx>
 #include <osl/diagnose.h>
 #include <svl/inettype.hxx>
-#include <svl/svlresid.hxx>
-#include <svl/svl.hrc>
 
 namespace
 {
diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx
index ce0bdd662290..fbcd27215c32 100644
--- a/svl/source/misc/lockfilecommon.cxx
+++ b/svl/source/misc/lockfilecommon.cxx
@@ -21,10 +21,6 @@
 #include <stdio.h>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <com/sun/star/ucb/InsertCommandArgument.hpp>
-#include <com/sun/star/ucb/NameClashException.hpp>
 #include <com/sun/star/io/WrongFormatException.hpp>
 
 #include <osl/time.h>
@@ -33,7 +29,6 @@
 #include <osl/file.hxx>
 #include <o3tl/enumrange.hxx>
 
-#include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -41,8 +36,6 @@
 #include <tools/urlobj.hxx>
 #include <unotools/bootstrap.hxx>
 
-#include <ucbhelper/content.hxx>
-
 #include <unotools/useroptions.hxx>
 
 #include <salhelper/linkhelper.hxx>
diff --git a/svl/source/misc/msodocumentlockfile.cxx b/svl/source/misc/msodocumentlockfile.cxx
index e0fc562e7a27..3b57402b7166 100644
--- a/svl/source/misc/msodocumentlockfile.cxx
+++ b/svl/source/misc/msodocumentlockfile.cxx
@@ -8,7 +8,6 @@
  */
 
 #include <svl/msodocumentlockfile.hxx>
-#include <sal/log.hxx>
 #include <algorithm>
 #include <ucbhelper/content.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx
index 572bd39f7a8d..5fbaef109a53 100644
--- a/svl/source/misc/ownlist.cxx
+++ b/svl/source/misc/ownlist.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/beans/PropertyValues.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/PropertyState.hpp>
 
 #include <svl/ownlist.hxx>
 
diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx
index adfdb59bc1de..94805932741c 100644
--- a/svl/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.cxx
@@ -24,27 +24,19 @@
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
 #include <com/sun/star/ucb/InteractiveIOException.hpp>
 #include <com/sun/star/io/NotConnectedException.hpp>
-#include <com/sun/star/io/WrongFormatException.hpp>
 
-#include <osl/time.h>
-#include <osl/security.hxx>
-#include <osl/socket.hxx>
 #include <o3tl/enumrange.hxx>
 
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
-#include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <ucbhelper/content.hxx>
 
 #include <tools/stream.hxx>
-#include <unotools/bootstrap.hxx>
 #include <unotools/streamwrap.hxx>
 
-#include <unotools/useroptions.hxx>
-
 #include <svl/sharecontrolfile.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index 101984e0e068..0ffa3540c112 100644
--- a/svl/source/misc/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.cxx
@@ -18,8 +18,6 @@
  */
 
 
-#include <functional>
-
 #include <algorithm>
 #include <limits>
 #include <set>
@@ -31,8 +29,6 @@
 #include <com/sun/star/io/XSeekable.hpp>
 
 #include <osl/diagnose.h>
-#include <rtl/alloc.h>
-#include <cppuhelper/queryinterface.hxx>
 #include <svl/instrm.hxx>
 #include <svl/outstrm.hxx>
 
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index dc60dee5f73f..7f137fb5a908 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -46,7 +46,6 @@
 #include <rtl/character.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <sal/log.hxx>
diff --git a/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx
index 38856a835d4f..51564ce9b4b7 100644
--- a/svl/source/notify/listener.cxx
+++ b/svl/source/notify/listener.cxx
@@ -19,7 +19,6 @@
 
 #include <svl/listener.hxx>
 #include <svl/broadcast.hxx>
-#include <cassert>
 
 SvtListener::QueryBase::QueryBase( sal_uInt16 nId ) : mnId(nId) {}
 SvtListener::QueryBase::~QueryBase() {}
diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx
index dcd380c86dec..fe6f2b8af4e2 100644
--- a/svl/source/notify/lstner.cxx
+++ b/svl/source/notify/lstner.cxx
@@ -19,7 +19,6 @@
 
 #include <svl/lstner.hxx>
 
-#include <svl/hint.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <sal/backtrace.hxx>
 #include <sal/log.hxx>
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 29024c7cc6f9..688d4e419a81 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <tools/color.hxx>
-#include <i18nlangtag/mslangid.hxx>
 #include <o3tl/any.hxx>
 #include <osl/mutex.hxx>
 #include <osl/diagnose.h>
diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx
index 7be9b1aa2493..fbd7889ce8cd 100644
--- a/svl/source/numbers/numfmuno.hxx
+++ b/svl/source/numbers/numfmuno.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVL_SOURCE_NUMBERS_NUMFMUNO_HXX
 
 #include <com/sun/star/util/XNumberFormatter2.hpp>
-#include <com/sun/star/util/XNumberFormatPreviewer.hpp>
 #include <com/sun/star/util/XNumberFormats.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index 4ac35a90f94b..db633f40554e 100644
--- a/svl/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.cxx
@@ -20,7 +20,6 @@
 
 #include <svl/numuno.hxx>
 #include "numfmuno.hxx"
-#include <svl/zforlist.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 1188f6b0b784..629f2991b4f9 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -23,16 +23,13 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
-#include <i18nlangtag/mslangid.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <tools/debug.hxx>
 #include <osl/mutex.hxx>
 #include <osl/diagnose.h>
-#include <tools/stream.hxx>
-#include <svl/instrm.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 using namespace ::utl;
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 0635739de77e..57fcbc6d8a47 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -19,7 +19,6 @@
 
 #include <cstdlib>
 #include <float.h>
-#include <errno.h>
 #include <comphelper/string.hxx>
 #include <sal/log.hxx>
 #include <tools/date.hxx>
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 705e0624c785..85d9a90c9435 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -29,7 +29,6 @@
 #include <unotools/configmgr.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <unotools/calendarwrapper.hxx>
 #include <com/sun/star/i18n/KNumberFormatUsage.hpp>
 #include <com/sun/star/i18n/KNumberFormatType.hpp>
 #include <com/sun/star/i18n/FormatElement.hpp>
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index daa9791dba3c..4248e03256f2 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -18,9 +18,6 @@
  */
 
 #include <stdio.h>
-#include <float.h>
-#include <errno.h>
-#include <stdlib.h>
 #include <string_view>
 
 #include <comphelper/string.hxx>
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 5c59f976d8ec..ba86b8887e3d 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -20,17 +20,16 @@
 
 #include "passwordcontainer.hxx"
 
-#include <unotools/pathoptions.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
-#include <com/sun/star/registry/XSimpleRegistry.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/task/MasterPasswordRequest.hpp>
 #include <com/sun/star/task/NoMasterException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 #include <osl/diagnose.h>
 #include <rtl/character.hxx>
diff --git a/svl/source/passwordcontainer/passwordcontainer.hxx b/svl/source/passwordcontainer/passwordcontainer.hxx
index 878eeb8fadaf..09fb7e03629d 100644
--- a/svl/source/passwordcontainer/passwordcontainer.hxx
+++ b/svl/source/passwordcontainer/passwordcontainer.hxx
@@ -25,14 +25,11 @@
 #include <com/sun/star/task/PasswordRequestMode.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/factory.hxx>
 
-#include <tools/stream.hxx>
 #include <unotools/configitem.hxx>
 #include <ucbhelper/interactionrequest.hxx>
 
diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx
index f438b3db7338..44e125d62861 100644
--- a/svl/source/passwordcontainer/syscreds.cxx
+++ b/svl/source/passwordcontainer/syscreds.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "syscreds.hxx"
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <osl/diagnose.h>
 #include <comphelper/sequence.hxx>
 
diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index 90aeeddfc3ed..8017379c9c97 100644
--- a/svl/source/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.cxx
@@ -24,7 +24,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/frame/XConfigManager.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 namespace com { namespace sun { namespace star { namespace uno {