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

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

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

41 files changed, 127 insertions, 123 deletions

diff --git a/include/unotools/ZipPackageHelper.hxx b/include/unotools/ZipPackageHelper.hxx
index c3a7f963ba38..6f1b1700d049 100644
--- a/include/unotools/ZipPackageHelper.hxx
+++ b/include/unotools/ZipPackageHelper.hxx
@@ -21,12 +21,11 @@
 
 #include <unotools/unotoolsdllapi.h>
 
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
+
+namespace com { namespace sun { namespace star { namespace container { class XHierarchicalNameAccess; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XSingleServiceFactory; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
 namespace utl {
 
diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx
index 28a43f912bea..ea2fc9e8bef6 100644
--- a/include/unotools/accessiblerelationsethelper.hxx
+++ b/include/unotools/accessiblerelationsethelper.hxx
@@ -23,10 +23,6 @@
 #include <unotools/unotoolsdllapi.h>
 
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
-#include <cppuhelper/weak.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XServiceName.hpp>
 #include <osl/mutex.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <memory>
diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx
index 38e9a3a69837..1e6ae7bc0c56 100644
--- a/include/unotools/accessiblestatesethelper.hxx
+++ b/include/unotools/accessiblestatesethelper.hxx
@@ -22,10 +22,6 @@
 #include <unotools/unotoolsdllapi.h>
 
 #include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
-#include <cppuhelper/weak.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XServiceName.hpp>
 #include <osl/mutex.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <memory>
diff --git a/include/unotools/calendarwrapper.hxx b/include/unotools/calendarwrapper.hxx
index edd52d8be96a..149393bb7e84 100644
--- a/include/unotools/calendarwrapper.hxx
+++ b/include/unotools/calendarwrapper.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/i18n/Calendar2.hpp>
-#include <com/sun/star/lang/Locale.hpp>
 #include <unotools/unotoolsdllapi.h>
 
 namespace com { namespace sun { namespace star {
@@ -39,6 +38,8 @@ namespace com { namespace sun { namespace star {
     }
 }}}
 
+namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+
 class UNOTOOLS_DLLPUBLIC CalendarWrapper
 {
     css::uno::Reference< css::i18n::XCalendar4 >   xC;
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index bfcf05514fd7..a916f93eb92b 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -24,13 +24,10 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <com/sun/star/i18n/DirectionProperty.hpp>
 #include <com/sun/star/i18n/KCharacterType.hpp>
-#include <com/sun/star/i18n/KParseTokens.hpp>
-#include <com/sun/star/i18n/KParseType.hpp>
 #include <com/sun/star/i18n/ParseResult.hpp>
-#include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <com/sun/star/i18n/UnicodeScript.hpp>
 #include <osl/mutex.hxx>
-#include <rtl/character.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace uno {
@@ -38,6 +35,8 @@ namespace com { namespace sun { namespace star {
     }
 }}}
 
+namespace com { namespace sun { namespace star { namespace i18n { class XCharacterClassification; } } } }
+
 const sal_Int32 nCharClassAlphaType =
     css::i18n::KCharacterType::UPPER |
     css::i18n::KCharacterType::LOWER |
diff --git a/include/unotools/closeveto.hxx b/include/unotools/closeveto.hxx
index 5c5adc5ac3e3..b8f6ad00d699 100644
--- a/include/unotools/closeveto.hxx
+++ b/include/unotools/closeveto.hxx
@@ -21,9 +21,11 @@
 #define INCLUDED_UNOTOOLS_CLOSEVETO_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+
 namespace utl
 {
 
diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx
index 6456f74b6066..b2134a60c5de 100644
--- a/include/unotools/cmdoptions.hxx
+++ b/include/unotools/cmdoptions.hxx
@@ -21,12 +21,15 @@
 
 #include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
-#include <osl/mutex.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <rtl/ustring.hxx>
 #include <unotools/options.hxx>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
+namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+namespace osl { class Mutex; }
+
 /*-************************************************************************************************************
     @descr          The method GetList() returns a list of property values.
                     Use follow defines to separate values by names.
diff --git a/include/unotools/collatorwrapper.hxx b/include/unotools/collatorwrapper.hxx
index 77a22d63682a..12be0f6e94d2 100644
--- a/include/unotools/collatorwrapper.hxx
+++ b/include/unotools/collatorwrapper.hxx
@@ -21,12 +21,16 @@
 #define INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <com/sun/star/i18n/XCollator.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
 
 namespace com { namespace sun { namespace star { namespace uno {
         class XComponentContext;
 }}}}
 
+namespace com { namespace sun { namespace star { namespace i18n { class XCollator; } } } }
+namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+
 class UNOTOOLS_DLLPUBLIC CollatorWrapper
 {
     private:
diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx
index cc79b28da922..de5585313b92 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -19,15 +19,16 @@
 #ifndef INCLUDED_UNOTOOLS_COMPATIBILITY_HXX
 #define INCLUDED_UNOTOOLS_COMPATIBILITY_HXX
 
-#include <sal/types.h>
-#include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/uno/Any.hxx>
 #include <unotools/options.hxx>
 #include <unotools/unotoolsdllapi.h>
 #include <rtl/ustring.hxx>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace osl { class Mutex; }
+
 /*-************************************************************************************************************
     @descr  Struct to hold information about one compatibility entry
 *//*-*************************************************************************************************************/
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index 3d445dc20386..14bf94dc8177 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/uno/Reference.h>
 #include <unotools/unotoolsdllapi.h>
 #include <unotools/options.hxx>
-#include <o3tl/typed_flags_set.hxx>
 
 namespace com{ namespace sun{ namespace star{
     namespace uno{
@@ -50,6 +49,9 @@ enum class ConfigItemMode
     AllLocales         = 0x02,
     ReleaseTree        = 0x04,
 };
+
+namespace o3tl { template <typename T> struct typed_flags; }
+
 namespace o3tl
 {
     template<> struct typed_flags<ConfigItemMode> : is_typed_flags<ConfigItemMode, 0x07> {};
@@ -64,9 +66,6 @@ namespace utl
         LocalPath,     // one-level relative path, for use when building paths etc.  ("Item", "Typ['Q &amp; A']")
     };
 
-    class ConfigChangeListener_Impl;
-    class ConfigManager;
-
     class UNOTOOLS_DLLPUBLIC ConfigItem : public ConfigurationBroadcaster
     {
             friend class ConfigChangeListener_Impl;
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index 5bf4a1473da3..bc4937e181a7 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -20,25 +20,19 @@
 #define INCLUDED_UNOTOOLS_CONFIGNODE_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <unotools/eventlisteneradapter.hxx>
 
-namespace comphelper
-{
-    class ComponentContext;
-}
+namespace com { namespace sun { namespace star { namespace container { class XHierarchicalNameAccess; } } } }
+namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } }
+namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } }
+namespace com { namespace sun { namespace star { namespace container { class XNameReplace; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XChangesBatch; } } } }
 
 namespace utl
 {
 
-    //= OConfigurationNode
-
-    class OConfigurationTreeRoot;
     /** a small wrapper around a configuration node.<p/>
         Nodes in the terminology used herein are <em>inner</em> nodes of a configuration
         tree, which means <em>no leafs</em>.
diff --git a/include/unotools/configpaths.hxx b/include/unotools/configpaths.hxx
index 7bb90a5c7d76..d24e8537eb75 100644
--- a/include/unotools/configpaths.hxx
+++ b/include/unotools/configpaths.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_UNOTOOLS_CONFIGPATHS_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <sal/types.h>
 #include <rtl/ustring.hxx>
 
 namespace utl
diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx
index 267474fce863..5d51b1e7dcaa 100644
--- a/include/unotools/configvaluecontainer.hxx
+++ b/include/unotools/configvaluecontainer.hxx
@@ -20,12 +20,14 @@
 #define INCLUDED_UNOTOOLS_CONFIGVALUECONTAINER_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <osl/mutex.hxx>
-#include <o3tl/typed_flags_set.hxx>
+#include <com/sun/star/uno/Type.hxx>
 #include <memory>
 
 
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace osl { class Mutex; }
+
 namespace utl
 {
 
diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx
index 088ae6baf40c..dcae945188be 100644
--- a/include/unotools/datetime.hxx
+++ b/include/unotools/datetime.hxx
@@ -23,12 +23,13 @@
 
 //= conversions UNO3.TimeClass <-> Tools.TimeClass (Date/Time/DateTime)
 #include <unotools/unotoolsdllapi.h>
-#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/util/Time.hpp>
-#include <com/sun/star/util/DateTime.hpp>
+#include <rtl/ustring.hxx>
+
+namespace com { namespace sun { namespace star { namespace util { struct Date; } } } }
+namespace com { namespace sun { namespace star { namespace util { struct DateTime; } } } }
+namespace com { namespace sun { namespace star { namespace util { struct Time; } } } }
 
 class Date;
-namespace tools { class Time; }
 class DateTime;
 
 namespace utl
diff --git a/include/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx
index 732278572631..4e02604add1c 100644
--- a/include/unotools/dynamicmenuoptions.hxx
+++ b/include/unotools/dynamicmenuoptions.hxx
@@ -21,12 +21,13 @@
 
 #include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
-#include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <unotools/options.hxx>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace osl { class Mutex; }
+
 /*-************************************************************************************************************
     @descr          The method GetList() returns a list of property values.
                     Use follow defines to separate values by names.
diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx
index 5023f56d10ac..2353797d148f 100644
--- a/include/unotools/eventcfg.hxx
+++ b/include/unotools/eventcfg.hxx
@@ -20,13 +20,9 @@
 #define INCLUDED_UNOTOOLS_EVENTCFG_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <unotools/configitem.hxx>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
-#include <cppuhelper/weakref.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <unordered_map>
-#include <vector>
 
 enum class GlobalEventId
 {
diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx
index 74f608922ba4..b3eeb4d5a052 100644
--- a/include/unotools/eventlisteneradapter.hxx
+++ b/include/unotools/eventlisteneradapter.hxx
@@ -21,9 +21,12 @@
 #define INCLUDED_UNOTOOLS_EVENTLISTENERADAPTER_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/EventObject.hpp>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XComponent; } } } }
+
 namespace utl
 {
 
diff --git a/include/unotools/extendedsecurityoptions.hxx b/include/unotools/extendedsecurityoptions.hxx
index c6ca9b0d669c..1b5183d3f551 100644
--- a/include/unotools/extendedsecurityoptions.hxx
+++ b/include/unotools/extendedsecurityoptions.hxx
@@ -21,11 +21,11 @@
 
 #include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
-#include <osl/mutex.hxx>
-#include <rtl/ustring.hxx>
 #include <unotools/options.hxx>
 #include <memory>
 
+namespace osl { class Mutex; }
+
 /*-************************************************************************************************************
     @short          forward declaration to our private date container implementation
     @descr          We use these class as internal member to support small memory requirements.
diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx
index 477187e98529..47418afdb0ab 100644
--- a/include/unotools/fontcfg.hxx
+++ b/include/unotools/fontcfg.hxx
@@ -19,19 +19,21 @@
 #ifndef INCLUDED_UNOTOOLS_FONTCFG_HXX
 #define INCLUDED_UNOTOOLS_FONTCFG_HXX
 
-#include <i18nlangtag/languagetag.hxx>
 #include <unotools/unotoolsdllapi.h>
 #include <tools/solar.h>
 #include <tools/fontenum.hxx>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <o3tl/typed_flags_set.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
+namespace o3tl { template <typename T> struct typed_flags; }
+namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+
+class LanguageTag;
+
 enum class DefaultFontType;
 
 // If you think the below concept of classifying a font (typeface) as possibly being one or several
diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx
index 4b7ef6e35b95..f24a5e3e48ae 100644
--- a/include/unotools/fontcvt.hxx
+++ b/include/unotools/fontcvt.hxx
@@ -22,7 +22,6 @@
 
 #include <unotools/unotoolsdllapi.h>
 #include <rtl/ustring.hxx>
-#include <tools/solar.h>
 #include <o3tl/typed_flags_set.hxx>
 
 
diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx
index 3f86b37a16e6..12dfc44ba985 100644
--- a/include/unotools/fontdefs.hxx
+++ b/include/unotools/fontdefs.hxx
@@ -21,16 +21,9 @@
 
 #include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
-#include <tools/solar.h>
 #include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-namespace utl {
-  class FontSubstConfiguration;
-  struct FontNameAttr;
-}
-
 enum class SubsFontFlags
 {
     ONLYONE    = 0x01,
diff --git a/include/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx
index 4f5a8eb7cb63..1779b2199bfa 100644
--- a/include/unotools/fontoptions.hxx
+++ b/include/unotools/fontoptions.hxx
@@ -21,11 +21,11 @@
 
 #include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
-#include <osl/mutex.hxx>
-#include <rtl/ustring.hxx>
 #include <unotools/options.hxx>
 #include <memory>
 
+namespace osl { class Mutex; }
+
 /*-************************************************************************************************************
     @short          forward declaration to our private date container implementation
     @descr          We use these class as internal member to support small memory requirements.
diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index 57b7d50da92c..8d628a67254b 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -23,11 +23,11 @@
 #include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
 #include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <rtl/ustring.hxx>
 #include <unotools/options.hxx>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
 namespace boost { template <class T> class optional; }
 
 // The method GetList() returns a list of property values.
diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx
index cf1ea94682f4..47ded1a273a9 100644
--- a/include/unotools/intlwrapper.hxx
+++ b/include/unotools/intlwrapper.hxx
@@ -21,14 +21,16 @@
 #define INCLUDED_UNOTOOLS_INTLWRAPPER_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <unotools/charclass.hxx>
-#include <unotools/localedatawrapper.hxx>
-#include <unotools/calendarwrapper.hxx>
-#include <unotools/collatorwrapper.hxx>
-#include <i18nlangtag/lang.h>
+#include <com/sun/star/uno/Reference.h>
+
 #include <i18nlangtag/languagetag.hxx>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
+class CollatorWrapper;
+class LocaleDataWrapper;
+
 /**
     A wrapper of I18N wrappers. Using this is more expensive than using some
     single wrapper classes so use it only if you must pass a single pointer
diff --git a/include/unotools/itemholderbase.hxx b/include/unotools/itemholderbase.hxx
index 94c20059abf9..865d45e8b4d8 100644
--- a/include/unotools/itemholderbase.hxx
+++ b/include/unotools/itemholderbase.hxx
@@ -21,10 +21,8 @@
 #define INCLUDED_UNOTOOLS_ITEMHOLDERBASE_HXX
 
 #include <memory>
-#include <vector>
 #include <osl/mutex.hxx>
-
-namespace utl { namespace detail { class Options; } }
+#include <unotools/options.hxx>
 
 struct ItemHolderMutexBase
 {
diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx
index 922e00ea5cd0..3e5c7ee6b2b5 100644
--- a/include/unotools/lingucfg.hxx
+++ b/include/unotools/lingucfg.hxx
@@ -21,17 +21,16 @@
 #define INCLUDED_UNOTOOLS_LINGUCFG_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.h>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
 #include <rtl/ustring.hxx>
-#include <unotools/configitem.hxx>
 #include <unotools/options.hxx>
 #include <i18nlangtag/lang.h>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XChangesBatch; } } } }
+
 class SvtLinguConfigItem;
 
 struct UNOTOOLS_DLLPUBLIC SvtLinguOptions
diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx
index 56ee9d88e0a4..3e97eeb2b7f9 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -20,8 +20,12 @@
 #ifndef INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX
 #define INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX
 
-#include <com/sun/star/i18n/XLocaleData5.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/i18n/LocaleItem.hpp>
+#include <com/sun/star/i18n/LocaleDataItem2.hpp>
+#include <com/sun/star/i18n/LanguageCountryInfo.hpp>
+#include <com/sun/star/i18n/ForbiddenCharacters.hpp>
 #include <com/sun/star/i18n/reservedWords.hpp>
 #include <rtl/ustring.hxx>
 #include <rtl/math.h>
@@ -36,6 +40,13 @@ namespace com { namespace sun { namespace star {
         class XComponentContext;
     }
 }}}
+
+namespace com { namespace sun { namespace star { namespace i18n { class XLocaleData5; } } } }
+namespace com { namespace sun { namespace star { namespace i18n { struct Calendar2; } } } }
+namespace com { namespace sun { namespace star { namespace i18n { struct Currency2; } } } }
+namespace com { namespace sun { namespace star { namespace i18n { struct FormatElement; } } } }
+namespace com { namespace sun { namespace star { namespace i18n { struct CalendarItem2; } } } }
+
 class Date;
 namespace tools { class Time; }
 class CalendarWrapper;
diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx
index fce65d40f814..4366c0c69d4e 100644
--- a/include/unotools/moduleoptions.hxx
+++ b/include/unotools/moduleoptions.hxx
@@ -21,15 +21,16 @@
 #define INCLUDED_UNOTOOLS_MODULEOPTIONS_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <salhelper/singletonref.hxx>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include <osl/mutex.hxx>
 #include <unotools/options.hxx>
 #include <memory>
 
+namespace osl { class Mutex; }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+
 /*-************************************************************************************************************
     @short          forward declaration to our private date container implementation
     @descr          We use these class as internal member to support small memory requirements.
diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx
index be699f216d8b..bc0ff705635e 100644
--- a/include/unotools/nativenumberwrapper.hxx
+++ b/include/unotools/nativenumberwrapper.hxx
@@ -21,7 +21,8 @@
 #define INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <com/sun/star/i18n/XNativeNumberSupplier2.hpp>
+#include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace uno {
@@ -29,6 +30,8 @@ namespace com { namespace sun { namespace star {
     }
 }}}
 
+namespace com { namespace sun { namespace star { namespace i18n { class XNativeNumberSupplier2; } } } }
+
 class UNOTOOLS_DLLPUBLIC NativeNumberWrapper
 {
     css::uno::Reference< css::i18n::XNativeNumberSupplier2 >   xNNS;
diff --git a/include/unotools/printwarningoptions.hxx b/include/unotools/printwarningoptions.hxx
index f6876dfab053..f86b0731199f 100644
--- a/include/unotools/printwarningoptions.hxx
+++ b/include/unotools/printwarningoptions.hxx
@@ -22,11 +22,11 @@
 
 #include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
-#include <osl/mutex.hxx>
-#include <rtl/ustring.hxx>
 #include <unotools/options.hxx>
 #include <memory>
 
+namespace osl { class Mutex; }
+
 /*-************************************************************************************************************
     @short          forward declaration to our private date container implementation
     @descr          We use these class as internal member to support small memory requirements.
diff --git a/include/unotools/readwritemutexguard.hxx b/include/unotools/readwritemutexguard.hxx
index b11ea8a1e405..a7c6d5799ae4 100644
--- a/include/unotools/readwritemutexguard.hxx
+++ b/include/unotools/readwritemutexguard.hxx
@@ -35,7 +35,6 @@ namespace o3tl {
 
 namespace utl {
 
-class ReadWriteGuard;
 class ReadWriteMutex
 {
     friend class ReadWriteGuard;
diff --git a/include/unotools/resmgr.hxx b/include/unotools/resmgr.hxx
index 8da6aefac60c..400f3a74f389 100644
--- a/include/unotools/resmgr.hxx
+++ b/include/unotools/resmgr.hxx
@@ -21,7 +21,9 @@
 
 #include <unotools/unotoolsdllapi.h>
 #include <unotools/syslocale.hxx>
-#include <i18nlangtag/languagetag.hxx>
+#include <rtl/ustring.hxx>
+
+class LanguageTag;
 
 typedef OUString (*ResHookProc)(const OUString& rStr);
 
diff --git a/include/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx
index 21382cc9505e..36f43ed0c505 100644
--- a/include/unotools/securityoptions.hxx
+++ b/include/unotools/securityoptions.hxx
@@ -21,12 +21,13 @@
 
 #include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
-#include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <rtl/ustring.hxx>
 #include <unotools/options.hxx>
 #include <memory>
 
+namespace osl { class Mutex; }
+
 /*-************************************************************************************************************
     @short          forward declaration to our private date container implementation
     @descr          We use these class as internal member to support small memory requirements.
diff --git a/include/unotools/syslocale.hxx b/include/unotools/syslocale.hxx
index 58615770f8f0..31ca65281dd6 100644
--- a/include/unotools/syslocale.hxx
+++ b/include/unotools/syslocale.hxx
@@ -21,12 +21,13 @@
 #define INCLUDED_UNOTOOLS_SYSLOCALE_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <unotools/localedatawrapper.hxx>
-#include <unotools/charclass.hxx>
-#include <i18nlangtag/languagetag.hxx>
-#include <sal/types.h>
 #include <rtl/textenc.h>
 
+#include <memory>
+
+class CharClass;
+class LanguageTag;
+class LocaleDataWrapper;
 class SvtSysLocale_Impl;
 class SvtSysLocaleOptions;
 
diff --git a/include/unotools/syslocaleoptions.hxx b/include/unotools/syslocaleoptions.hxx
index 69a093d9bdb3..666f4d995f31 100644
--- a/include/unotools/syslocaleoptions.hxx
+++ b/include/unotools/syslocaleoptions.hxx
@@ -23,14 +23,13 @@
 #include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-#include <tools/solar.h>
-#include <tools/link.hxx>
 #include <i18nlangtag/lang.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <unotools/options.hxx>
 
 class SvtSysLocaleOptions_Impl;
-class SvtListener;
+class LinkParamNone;
+template <typename Arg, typename Ret> class Link;
 
 class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtSysLocaleOptions : public utl::detail::Options
 {
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 32ec831784ea..2d609fe99ec0 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -24,13 +24,14 @@
 #include <i18nlangtag/lang.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/util/XTextSearch2.hpp>
 
 #include <ostream>
 
 class CharClass;
 
+namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XTextSearch2; } } } }
+
 namespace com {
     namespace sun {
         namespace star {
diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx
index 7afdbf44411e..882975bac2a5 100644
--- a/include/unotools/transliterationwrapper.hxx
+++ b/include/unotools/transliterationwrapper.hxx
@@ -23,7 +23,11 @@
 #include <unotools/unotoolsdllapi.h>
 #include <rtl/ustring.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <com/sun/star/i18n/XExtendedTransliteration.hpp>
+#include <i18nlangtag/lang.h>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com { namespace sun { namespace star { namespace i18n { class XExtendedTransliteration; } } } }
 
 namespace com { namespace sun { namespace star {
     namespace uno {
diff --git a/include/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx
index 201f1b15722e..82f5ed5d4db1 100644
--- a/include/unotools/ucbhelper.hxx
+++ b/include/unotools/ucbhelper.hxx
@@ -22,8 +22,9 @@
 
 #include <sal/config.h>
 
-#include <sal/types.h>
 #include <unotools/unotoolsdllapi.h>
+#include <rtl/ustring.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace uno {
diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx
index f037571fe212..fd0a8cd13bad 100644
--- a/include/unotools/ucbstreamhelper.hxx
+++ b/include/unotools/ucbstreamhelper.hxx
@@ -19,9 +19,6 @@
 #ifndef INCLUDED_UNOTOOLS_UCBSTREAMHELPER_HXX
 #define INCLUDED_UNOTOOLS_UCBSTREAMHELPER_HXX
 
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XStream.hpp>
 #include <unotools/unotoolsdllapi.h>
 
 #include <tools/stream.hxx>
@@ -33,10 +30,6 @@ namespace com
     {
         namespace star
         {
-            namespace task
-            {
-                class XInteractionHandler;
-            }
             namespace io
             {
                 class XStream;
@@ -45,11 +38,10 @@ namespace com
         }
     }
 }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
 
 namespace utl
 {
-    class UcbLockBytesHandler;
-
     class UNOTOOLS_DLLPUBLIC UcbStreamHelper
     {
     public:
diff --git a/include/unotools/useroptions.hxx b/include/unotools/useroptions.hxx
index 60c18df65ae2..8589f4fdea9f 100644
--- a/include/unotools/useroptions.hxx
+++ b/include/unotools/useroptions.hxx
@@ -20,11 +20,12 @@
 #define INCLUDED_UNOTOOLS_USEROPTIONS_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <unotools/configitem.hxx>
-#include <osl/mutex.hxx>
+#include <rtl/ustring.hxx>
 #include <unotools/options.hxx>
 #include <memory>
 
+namespace osl { class Mutex; }
+
 // define ----------------------------------------------------------------
 enum class UserOptToken
 {
diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx
index 0948925756d2..f7c1a9cd064d 100644
--- a/include/unotools/viewoptions.hxx
+++ b/include/unotools/viewoptions.hxx
@@ -21,14 +21,13 @@
 
 #include <unotools/unotoolsdllapi.h>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <unotools/configmgr.hxx>
-#include <unotools/configitem.hxx>
 #include <sal/types.h>
-#include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 #include <unotools/options.hxx>
 
+namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
+namespace osl { class Mutex; }
+
 class SvtViewOptionsBase_Impl;
 
 /*-************************************************************************************************************