tdf#42949 Fix IWYU warnings in include/comphelper/[a-l]*

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

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

accessibility/source/extended/textwindowaccessibility.cxx

@@ -22,6 +22,7 @@
 
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/i18n/Boundary.hpp>
 #include <cppuhelper/exc_hlp.hxx>
 #include <extended/textwindowaccessibility.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>

chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx

@@ -47,6 +47,7 @@
 #include <map>
 #include <algorithm>
 #include <rtl/math.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;

chart2/source/model/filter/XMLFilter.cxx

@@ -32,6 +32,7 @@
 #include <osl/diagnose.h>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>

comphelper/source/container/embeddedobjectcontainer.cxx

@@ -22,6 +22,7 @@
 #include <com/sun/star/embed/EmbeddedObjectCreator.hpp>
 #include <com/sun/star/embed/WrongStateException.hpp>
 #include <com/sun/star/embed/XLinkCreator.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XEmbedPersist.hpp>
 #include <com/sun/star/embed/XLinkageSupport.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>

comphelper/source/misc/accessibleeventnotifier.cxx

@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/accessibleeventnotifier.hxx>
+#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <rtl/instance.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 

comphelper/source/misc/backupfilehelper.cxx

@@ -11,6 +11,7 @@
 #include <rtl/ustring.hxx>
 #include <rtl/bootstrap.hxx>
 #include <sal/log.hxx>
+#include <osl/file.hxx>
 #include <comphelper/backupfilehelper.hxx>
 #include <rtl/crc.h>
 #include <algorithm>

comphelper/source/misc/configurationhelper.cxx

@@ -20,10 +20,13 @@
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/util/XChangesBatch.hpp>
 
 
 namespace comphelper{

comphelper/source/misc/docpasswordhelper.cxx

@@ -26,6 +26,7 @@
 #include <comphelper/hash.hxx>
 #include <comphelper/base64.hxx>
 #include <comphelper/sequence.hxx>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>

comphelper/source/misc/documentinfo.cxx

@@ -23,6 +23,7 @@
 
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/frame/XTitle.hpp>
 

comphelper/source/misc/listenernotification.cxx

@@ -19,7 +19,9 @@
 
 #include <comphelper/listenernotification.hxx>
 
+#include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
+#include <osl/diagnose.h>
 
 
 namespace comphelper

comphelper/source/misc/lok.cxx

@@ -8,6 +8,7 @@
  */
 
 #include <comphelper/lok.hxx>
+#include <i18nlangtag/languagetag.hxx>
 
 #include <iostream>
 #include <sstream>

comphelper/source/streaming/basicio.cxx

@@ -18,7 +18,7 @@
  */
 
 #include <comphelper/basicio.hxx>
-
+#include <com/sun/star/awt/FontDescriptor.hpp>
 
 namespace comphelper
 {

connectivity/source/drivers/jdbc/Object.cxx

@@ -21,6 +21,7 @@
 #include <connectivity/CommonTools.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/logging/LogLevel.hpp>
 #include <java/tools.hxx>
 #include <java/sql/SQLException.hxx>
 #include <osl/thread.h>

connectivity/source/manager/mdrivermanager.cxx

@@ -24,6 +24,7 @@
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/container/ElementExistException.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/logging/LogLevel.hpp>
 
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>

dbaccess/qa/extras/dialog-save.cxx

@@ -19,6 +19,7 @@
 #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
+#include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>

dbaccess/qa/extras/empty-stdlib-save.cxx

@@ -19,6 +19,7 @@
 #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
+#include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>

dbaccess/qa/extras/nolib-save.cxx

@@ -19,6 +19,7 @@
 #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
+#include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>

dbaccess/source/core/dataaccess/databasedocument.cxx

@@ -68,6 +68,7 @@
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/numberedcollection.hxx>
 #include <comphelper/storagehelper.hxx>
+#include <comphelper/propertysetinfo.hxx>
 
 #include <connectivity/dbtools.hxx>
 

dbaccess/source/core/dataaccess/databaseregistrations.cxx

@@ -26,6 +26,7 @@
 #include <comphelper/interfacecontainer2.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <osl/diagnose.h>
 #include <unotools/pathoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/confignode.hxx>

desktop/source/lib/init.cxx

@@ -55,6 +55,7 @@
 #include <com/sun/star/frame/DispatchResultEvent.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XDispatchResultListener.hpp>
 #include <com/sun/star/frame/XSynchronousDispatch.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/lang/Locale.hpp>

editeng/source/accessibility/AccessibleEditableTextPara.cxx

@@ -35,6 +35,7 @@
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/i18n/Boundary.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleTextType.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>

filter/source/msfilter/msdffimp.cxx

@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/embed/Aspects.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 
 #include <math.h>
 #include <limits.h>

filter/source/msfilter/msoleexp.cxx

@@ -23,6 +23,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XEmbedPersist.hpp>
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>

filter/source/msfilter/svdfppt.cxx

@@ -31,6 +31,7 @@
 #include <sot/storinfo.hxx>
 #include <sot/stg.hxx>
 #include <com/sun/star/embed/Aspects.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/office/XAnnotation.hpp>
 #include <com/sun/star/office/XAnnotationAccess.hpp>
 #include <com/sun/star/text/XText.hpp>

filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx

@@ -44,6 +44,7 @@
 #include <comphelper/sequenceashashmap.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <comphelper/scopeguard.hxx>

forms/source/misc/listenercontainers.cxx

@@ -18,6 +18,7 @@
  */
 
 #include <listenercontainers.hxx>
+#include <osl/diagnose.h>
 
 
 namespace frm

forms/source/richtext/attributedispatcher.cxx

@@ -21,6 +21,7 @@
 
 #include <editeng/editview.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 
 namespace frm

forms/source/richtext/clipboarddispatcher.cxx

@@ -23,6 +23,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <svtools/cliplistener.hxx>
 #include <svtools/transfer.hxx>
+#include <osl/diagnose.h>
 
 
 namespace frm

forms/source/richtext/featuredispatcher.cxx

@@ -18,6 +18,7 @@
  */
 
 #include "featuredispatcher.hxx"
+#include <osl/diagnose.h>
 
 
 namespace frm

forms/source/richtext/parametrizedattributedispatcher.cxx

@@ -21,6 +21,7 @@
 #include <editeng/editview.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
+#include <osl/diagnose.h>
 
 #include <svx/svxids.hrc>
 #include <sfx2/sfxuno.hxx>

forms/source/richtext/specialdispatchers.cxx

@@ -22,6 +22,7 @@
 #include <editeng/editview.hxx>
 #include <svx/svxids.hrc>
 #include <editeng/scriptspaceitem.hxx>
+#include <osl/diagnose.h>
 
 
 namespace frm

framework/source/accelerators/acceleratorconfiguration.cxx

@@ -41,6 +41,7 @@
 #include <vcl/svapp.hxx>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/awt/KeyEvent.hpp>
 #include <com/sun/star/awt/KeyModifier.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>

include/IwyuFilter_include.yaml

@@ -106,3 +106,52 @@ blacklist:
     include/ucbhelper/simpleinteractionrequest.hxx:
     # Needed for template
     - o3tl/typed_flags_set.hxx
+    include/comphelper/accessiblekeybindinghelper.hxx:
+    # base class has to be a complete type
+    - com/sun/star/accessibility/XAccessibleKeyBinding.hpp
+    include/comphelper/accessiblecomponenthelper.hxx:
+    # base class has to be a complete type
+    - com/sun/star/accessibility/XAccessibleExtendedComponent.hpp
+    include/comphelper/accessiblecontexthelper.hxx:
+    # base class has to be a complete type
+    - com/sun/star/accessibility/XAccessibleContext.hpp
+    - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp
+    include/comphelper/accessibleselectionhelper.hxx:
+    # base class has to be a complete type
+    - com/sun/star/accessibility/XAccessibleSelection.hpp
+    include/comphelper/accessibletexthelper.hxx:
+    # base class has to be a complete type
+    - com/sun/star/accessibility/XAccessibleText.hpp
+    include/comphelper/accessiblewrapper.hxx:
+    # base class has to be a complete type
+    - com/sun/star/accessibility/XAccessibleContext.hpp
+    - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp
+    - com/sun/star/accessibility/XAccessibleEventListener.hpp
+    include/comphelper/accimplaccess.hxx:
+    # base class has to be a complete type
+    - com/sun/star/lang/XUnoTunnel.hpp
+    include/comphelper/attributelist.hxx:
+    # base class has to be a complete type
+    - com/sun/star/util/XCloneable.hpp
+    - com/sun/star/xml/sax/XAttributeList.hpp
+    include/comphelper/componentmodule.hxx:
+    # base class has to be a complete type
+    - com/sun/star/lang/XSingleServiceFactory.hpp
+    include/comphelper/configurationhelper.hxx:
+    # Needed for template
+    - o3tl/typed_flags_set.hxx
+    # Needed for implicit destructor
+    - com/sun/star/uno/Any.hxx
+    include/comphelper/documentconstants.hxx:
+   # Needed for template
+    - o3tl/typed_flags_set.hxx
+    include/comphelper/docpasswordrequest.hxx:
+    # base class has to be a complete type
+    - com/sun/star/task/XInteractionRequest.hpp
+    include/comphelper/interaction.hxx:
+    # base class has to be a complete type
+    - com/sun/star/task/XInteractionAbort.hpp
+    - com/sun/star/task/XInteractionApprove.hpp
+    - com/sun/star/task/XInteractionDisapprove.hpp
+    - com/sun/star/task/XInteractionRequest.hpp
+    - com/sun/star/task/XInteractionRetry.hpp

include/comphelper/ChainablePropertySet.hxx

@@ -24,12 +24,13 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <comphelper/PropertyInfoHash.hxx>
 #include <comphelper/comphelperdllapi.h>
-#include <comphelper/solarmutex.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
+namespace comphelper { class SolarMutex; }
+namespace comphelper { struct PropertyInfo; }
+
 namespace comphelper
 {
     class ChainablePropertySetInfo;

include/comphelper/IdPropArrayHelper.hxx

@@ -23,9 +23,7 @@
 
 #include <map>
 
-#include <cppuhelper/component.hxx>
 #include <osl/mutex.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 #include <osl/diagnose.h>
 #include <rtl/instance.hxx>
 #include <cppuhelper/propshlp.hxx>

include/comphelper/accessiblecontexthelper.hxx

@@ -24,7 +24,6 @@
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <comphelper/comphelperdllapi.h>
 #include <comphelper/solarmutex.hxx>
 #include <memory>

include/comphelper/accessibleeventnotifier.hxx

@@ -20,11 +20,13 @@
 #ifndef INCLUDED_COMPHELPER_ACCESSIBLEEVENTNOTIFIER_HXX
 #define INCLUDED_COMPHELPER_ACCESSIBLEEVENTNOTIFIER_HXX
 
-#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
-#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
-
 #include <comphelper/comphelperdllapi.h>
 
+namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleEventListener; } } } }
+namespace com { namespace sun { namespace star { namespace accessibility { struct AccessibleEventObject; } } } }
+
 namespace comphelper {
 
 class COMPHELPER_DLLPUBLIC AccessibleEventNotifier

include/comphelper/accessibletexthelper.hxx

@@ -22,12 +22,13 @@
 
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
 #include <com/sun/star/accessibility/TextSegment.hpp>
-#include <com/sun/star/i18n/XBreakIterator.hpp>
-#include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <comphelper/accessiblecomponenthelper.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/comphelperdllapi.h>
 
+namespace com { namespace sun { namespace star { namespace i18n { class XBreakIterator; } } } }
+namespace com { namespace sun { namespace star { namespace i18n { class XCharacterClassification; } } } }
+namespace com { namespace sun { namespace star { namespace i18n { struct Boundary; } } } }
 
 namespace comphelper
 {

include/comphelper/accessiblewrapper.hxx

@@ -30,17 +30,17 @@
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <cppuhelper/compbase.hxx>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/uno3.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
+#include <cppuhelper/interfacecontainer.h>
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <comphelper/stl_types.hxx>
 #include <comphelper/comphelperdllapi.h>
 #include <rtl/ref.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
 namespace comphelper
 {

include/comphelper/accimplaccess.hxx

@@ -23,12 +23,6 @@
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <comphelper/comphelperdllapi.h>
-#include <memory>
-
-namespace com { namespace sun { namespace star { namespace accessibility {
-    class XAccessible;
-    class XAccessibleContext;
-}}}}
 
 namespace comphelper
 {

include/comphelper/backupfilehelper.hxx

@@ -14,9 +14,6 @@
 
 #include <comphelper/comphelperdllapi.h>
 #include <rtl/ustring.hxx>
-#include <sal/log.hxx>
-#include <osl/file.hxx>
-#include <memory>
 #include <set>
 #include <vector>
 

include/comphelper/base64.hxx

@@ -25,7 +25,8 @@
 #include <sal/types.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/strbuf.hxx>
-#include <com/sun/star/uno/Sequence.h>
+
+namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
 
 namespace comphelper {
 

include/comphelper/basicio.hxx

@@ -20,10 +20,11 @@
 #ifndef INCLUDED_COMPHELPER_BASICIO_HXX
 #define INCLUDED_COMPHELPER_BASICIO_HXX
 
-#include <com/sun/star/io/XPersistObject.hpp>
-#include <com/sun/star/awt/FontDescriptor.hpp>
+#include <com/sun/star/io/XObjectOutputStream.hpp>
+#include <com/sun/star/io/XObjectInputStream.hpp>
 #include <comphelper/comphelperdllapi.h>
 
+namespace com { namespace sun { namespace star { namespace awt { struct FontDescriptor; } } } }
 
 namespace comphelper
 {

include/comphelper/componentbase.hxx

@@ -21,7 +21,7 @@
 #define INCLUDED_COMPHELPER_COMPONENTBASE_HXX
 
 #include <comphelper/comphelperdllapi.h>
-#include <cppuhelper/interfacecontainer.hxx>
+#include <cppuhelper/interfacecontainer.h>
 
 
 namespace comphelper

include/comphelper/componentguard.hxx

@@ -23,7 +23,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
+#include <cppuhelper/interfacecontainer.h>
 
 
 namespace comphelper

include/comphelper/componentmodule.hxx

@@ -28,8 +28,6 @@
 
 #include <osl/mutex.hxx>
 
-#include <rtl/string.hxx>
-#include <rtl/instance.hxx>
 #include <memory>
 
 

include/comphelper/configuration.hxx

@@ -14,7 +14,7 @@
 
 #include <boost/optional.hpp>
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Reference.h>
 #include <comphelper/comphelperdllapi.h>
 #include <comphelper/processfactory.hxx>
 #include <sal/types.h>

include/comphelper/configurationhelper.hxx

@@ -20,17 +20,14 @@
 #ifndef INCLUDED_COMPHELPER_CONFIGURATIONHELPER_HXX
 #define INCLUDED_COMPHELPER_CONFIGURATIONHELPER_HXX
 
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Any.hxx>
 #include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <comphelper/comphelperdllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
 
 namespace comphelper
 {

include/comphelper/configurationlistener.hxx

@@ -10,19 +10,18 @@
 #ifndef INCLUDED_COMPHELPER_CONFIGURATIONLISTENER_HXX
 #define INCLUDED_COMPHELPER_CONFIGURATIONLISTENER_HXX
 
-#include <algorithm>
 #include <vector>
-#include <iterator>
 #include <comphelper/comphelperdllapi.h>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <rtl/ref.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/configurationhelper.hxx>
 
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyChangeEvent; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 namespace comphelper {
 
 class ConfigurationListener;

include/comphelper/dispatchcommand.hxx

@@ -12,9 +12,11 @@
 
 #include <comphelper/comphelperdllapi.h>
 #include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/frame/XDispatchResultListener.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XDispatchResultListener; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
 
 namespace comphelper
 {

include/comphelper/docpasswordhelper.hxx

@@ -20,7 +20,6 @@
 #ifndef INCLUDED_COMPHELPER_DOCPASSWORDHELPER_HXX
 #define INCLUDED_COMPHELPER_DOCPASSWORDHELPER_HXX
 
-#include <com/sun/star/beans/NamedValue.hpp>
 #include <comphelper/comphelperdllapi.h>
 #include <vector>
 #include <comphelper/docpasswordrequest.hxx>
@@ -28,6 +27,7 @@
 
 namespace com { namespace sun { namespace star { namespace task { class XInteractionHandler; } } } }
 namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
 
 namespace comphelper {
 

include/comphelper/docpasswordrequest.hxx

@@ -22,11 +22,12 @@
 
 #include <comphelper/comphelperdllapi.h>
 #include <com/sun/star/task/PasswordRequestMode.hpp>
-#include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
+namespace com { namespace sun { namespace star { namespace task { class XInteractionAbort; } } } }
+
 namespace comphelper {
 
 class PasswordContinuation;

include/comphelper/documentconstants.hxx

@@ -19,7 +19,6 @@
 #ifndef INCLUDED_COMPHELPER_DOCUMENTCONSTANTS_HXX
 #define INCLUDED_COMPHELPER_DOCUMENTCONSTANTS_HXX
 
-#include <rtl/ustring.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 // formats of SO6/7

include/comphelper/documentinfo.hxx

@@ -21,8 +21,10 @@
 #define INCLUDED_COMPHELPER_DOCUMENTINFO_HXX
 
 #include <comphelper/comphelperdllapi.h>
+#include <rtl/ustring.hxx>
 
-#include <com/sun/star/frame/XModel.hpp>
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
 
 
 namespace comphelper {

include/comphelper/embeddedobjectcontainer.hxx

@@ -20,17 +20,19 @@
 #define INCLUDED_COMPHELPER_EMBEDDEDOBJECTCONTAINER_HXX
 
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/uno/Sequence.h>
 #include <comphelper/comphelperdllapi.h>
 
 #include <rtl/ustring.hxx>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace embed { class XEmbeddedObject; } } } }
+namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
+namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
+namespace com { namespace sun { namespace star { namespace task { class XInteractionHandler; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+
 namespace comphelper
 {
     class EmbeddedObjectContainer;

include/comphelper/eventattachermgr.hxx

@@ -20,20 +20,16 @@
 #ifndef INCLUDED_COMPHELPER_EVENTATTACHERMGR_HXX
 #define INCLUDED_COMPHELPER_EVENTATTACHERMGR_HXX
 
-#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Reference.h>
 #include <comphelper/comphelperdllapi.h>
 
 namespace com { namespace sun { namespace star {
 namespace uno {
-    class Exception;
     class XComponentContext;
 }
 namespace script {
     class XEventAttacherManager;
 }
-namespace beans {
-    class XIntrospection;
-}
 } } }
 
 

include/comphelper/extract.hxx

@@ -25,9 +25,8 @@