tdf#42949 Fix IWYU warnings in include/comphelper/[m-z]*

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

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

accessibility/source/standard/vclxaccessibletoolbox.cxx

@@ -30,6 +30,8 @@
 #include <vcl/toolbox.hxx>
 #include <comphelper/accessiblewrapper.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/types.hxx>
+#include <cppuhelper/typeprovider.hxx>
 
 using namespace ::comphelper;
 using namespace ::com::sun::star;

basctl/source/dlged/dlgedfac.cxx

@@ -24,6 +24,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/ScrollBarOrientation.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <comphelper/processfactory.hxx>
 
 namespace basctl

canvas/source/vcl/canvas.hxx

@@ -33,6 +33,8 @@
 
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
+#include <comphelper/types.hxx>
+#include <cppu/unotype.hxx>
 
 #include <canvas/base/basemutexhelper.hxx>
 #include <canvas/base/integerbitmapbase.hxx>

canvas/source/vcl/canvascustomsprite.cxx

@@ -28,6 +28,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <comphelper/types.hxx>
 #include <rtl/math.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/alpha.hxx>

canvas/source/vcl/canvascustomsprite.hxx

@@ -22,6 +22,7 @@
 
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
+#include <comphelper/types.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XComponent.hpp>

canvas/source/vcl/spritecanvas.hxx

@@ -34,6 +34,7 @@
 
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
+#include <comphelper/types.hxx>
 
 #include <canvas/base/spritecanvasbase.hxx>
 #include <canvas/base/disambiguationhelper.hxx>

comphelper/qa/string/test_string.cxx

@@ -20,6 +20,8 @@
 #include <comphelper/string.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/i18n/CharType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <com/sun/star/i18n/XCollator.hpp>
 
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>

comphelper/source/container/namecontainer.cxx

@@ -25,6 +25,7 @@
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
+#include <com/sun/star/container/XNameContainer.hpp>
 
 typedef std::map<OUString, css::uno::Any> SvGenericNameContainerMapImpl;
 

comphelper/source/misc/SelectionMultiplex.cxx

@@ -19,7 +19,7 @@
 
 
 #include <comphelper/SelectionMultiplex.hxx>
-
+#include <com/sun/star/view/XSelectionSupplier.hpp>
 
 namespace comphelper
 {

comphelper/source/misc/mimeconfighelper.cxx

@@ -20,6 +20,8 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XContainerQuery.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/embed/VerbDescriptor.hpp>
 #include <com/sun/star/document/XTypeDetection.hpp>
 
 #include <osl/diagnose.h>

comphelper/source/misc/namedvaluecollection.cxx

@@ -22,6 +22,7 @@
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>

comphelper/source/misc/numberedcollection.cxx

@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <comphelper/numberedcollection.hxx>
 #include <com/sun/star/frame/UntitledNumbersConst.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 
 namespace comphelper{
 

comphelper/source/misc/numbers.cxx

@@ -21,6 +21,7 @@
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 #include <com/sun/star/util/NumberFormat.hpp>
+#include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/Locale.hpp>

comphelper/source/misc/sequenceashashmap.cxx

@@ -19,6 +19,8 @@
 
 #include <sal/config.h>
 
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <comphelper/sequenceashashmap.hxx>
 

comphelper/source/misc/serviceinfohelper.cxx

@@ -19,8 +19,7 @@
 
 
 #include <comphelper/serviceinfohelper.hxx>
-
-// #####################################################################
+#include <com/sun/star/uno/Sequence.hxx>
 
 namespace comphelper
 {

comphelper/source/misc/solarmutex.cxx

@@ -20,6 +20,7 @@
 #include <sal/config.h>
 
 #include <comphelper/solarmutex.hxx>
+#include <osl/thread.hxx>
 
 #include <assert.h>
 #include <cstdlib>

comphelper/source/processfactory/processfactory.cxx

@@ -23,6 +23,7 @@
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/DeploymentException.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 using namespace ::com::sun::star;
 using namespace com::sun::star::uno;

comphelper/source/property/genericpropertyset.cxx

@@ -28,6 +28,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/propertysethelper.hxx>
 #include <osl/mutex.hxx>
+#include <rtl/ref.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/propertysetinfo.hxx>
 

comphelper/source/property/property.cxx

@@ -31,6 +31,7 @@
     #include <typeinfo>
 #endif
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/uno/genfunc.h>
 #include <rtl/ustrbuf.hxx>

comphelper/source/property/propertybag.cxx

@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/propertybag.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/beans/IllegalTypeException.hpp>
 #include <com/sun/star/beans/PropertyExistException.hpp>
@@ -25,6 +26,7 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/NotRemoveableException.hpp>
+#include <com/sun/star/beans/UnknownPropertyException.hpp>
 
 #include <map>
 

comphelper/source/property/propertycontainerhelper.cxx

@@ -22,6 +22,7 @@
 #include <osl/diagnose.h>
 #include <uno/data.h>
 #include <com/sun/star/uno/genfunc.h>
+#include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
 #include <rtl/ustrbuf.hxx>

comphelper/source/property/propertysethelper.cxx

@@ -20,6 +20,7 @@
 #include <comphelper/propertysetinfo.hxx>
 #include <comphelper/propertysethelper.hxx>
 #include <osl/diagnose.h>
+#include <rtl/ref.hxx>
 
 #include <memory>
 

comphelper/source/streaming/oslfile2streamwrap.cxx

@@ -22,6 +22,7 @@
 #include <com/sun/star/io/BufferSizeExceededException.hpp>
 #include <com/sun/star/io/NotConnectedException.hpp>
 #include <comphelper/oslfile2streamwrap.hxx>
+#include <osl/file.hxx>
 
 #include <algorithm>
 

comphelper/source/streaming/streamsection.cxx

@@ -18,6 +18,9 @@
  */
 
 #include <comphelper/streamsection.hxx>
+#include <com/sun/star/io/XMarkableStream.hpp>
+#include <com/sun/star/io/XDataInputStream.hpp>
+#include <com/sun/star/io/XDataOutputStream.hpp>
 #include <osl/diagnose.h>
 
 namespace comphelper

connectivity/source/commontools/DateConversion.cxx

@@ -22,6 +22,7 @@
 #include <com/sun/star/script/XTypeConverter.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
+#include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <com/sun/star/sdb/XColumnUpdate.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>

connectivity/source/commontools/TDatabaseMetaDataBase.cxx

@@ -22,6 +22,7 @@
 
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/evtlistenerhlp.hxx>
+#include <comphelper/types.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <resource/sharedresources.hxx>
 #include <strings.hrc>

connectivity/source/drivers/file/FStatement.cxx

@@ -32,6 +32,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/typeprovider.hxx>
+#include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <strings.hrc>
 #include <algorithm>

connectivity/source/drivers/hsqldb/HDriver.cxx

@@ -48,6 +48,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <comphelper/types.hxx>
 #include <unotools/confignode.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <strings.hrc>

connectivity/source/drivers/hsqldb/HUser.cxx

@@ -22,6 +22,7 @@
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
+#include <comphelper/types.hxx>
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbcx/PrivilegeObject.hpp>
 #include <TConnection.hxx>

connectivity/source/drivers/jdbc/PreparedStatement.cxx

@@ -27,6 +27,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/sequence.hxx>
+#include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/FValue.hxx>
 #include <connectivity/dbexception.hxx>

connectivity/source/drivers/macab/MacabResultSet.cxx

@@ -29,6 +29,8 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/sdbcx/CompareBookmark.hpp>
 #include <TConnection.hxx>
+#include <cppuhelper/typeprovider.hxx>
+#include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <resource/sharedresources.hxx>
 #include <strings.hrc>

connectivity/source/drivers/macab/MacabStatement.cxx

@@ -28,6 +28,7 @@
 #include "macabcondition.hxx"
 #include "macaborder.hxx"
 #include <TConnection.hxx>
+#include <cppuhelper/typeprovider.hxx>
 #include <connectivity/dbexception.hxx>
 #include <resource/sharedresources.hxx>
 #include <strings.hrc>

connectivity/source/drivers/mork/MPreparedStatement.cxx

@@ -11,6 +11,7 @@
 #include "MPreparedStatement.hxx"
 #include "MResultSetMetaData.hxx"
 #include <connectivity/dbtools.hxx>
+#include <comphelper/types.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <sal/log.hxx>
 

connectivity/source/drivers/mork/MResultSet.cxx

@@ -22,6 +22,7 @@
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbcx/CompareBookmark.hpp>
 #include <connectivity/dbtools.hxx>
+#include <comphelper/types.hxx>
 #include <sal/log.hxx>
 
 #include <vector>

connectivity/source/inc/TConnection.hxx

@@ -20,6 +20,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_TCONNECTION_HXX
 
 #include <rtl/textenc.h>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>

dbaccess/source/core/api/RowSetCache.cxx

@@ -44,6 +44,7 @@
 
 #include <comphelper/extract.hxx>
 #include <comphelper/property.hxx>
+#include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/sqliterator.hxx>

dbaccess/source/core/api/querycontainer.cxx

@@ -36,6 +36,7 @@
 #include <osl/diagnose.h>
 #include <comphelper/uno3.hxx>
 #include <comphelper/property.hxx>
+#include <comphelper/types.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 
 using namespace dbtools;

dbaccess/source/core/dataaccess/ModelImpl.cxx

@@ -45,6 +45,7 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/typeprovider.hxx>
+#include <comphelper/types.hxx>
 #include <rtl/digest.h>
 #include <sfx2/signaturestate.hxx>
 #include <tools/debug.hxx>

dbaccess/source/core/dataaccess/connection.cxx

@@ -48,6 +48,7 @@
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include <comphelper/sequence.hxx>
+#include <comphelper/types.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
 

dbaccess/source/core/dataaccess/databasedocument.cxx

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

dbaccess/source/core/dataaccess/datasource.cxx

@@ -54,6 +54,7 @@
 #include <comphelper/interaction.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/sequence.hxx>
+#include <comphelper/types.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>

dbaccess/source/core/dataaccess/documentdefinition.cxx

@@ -27,6 +27,7 @@
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/classids.hxx>
 #include <comphelper/propertysequence.hxx>
+#include <comphelper/types.hxx>
 #include <com/sun/star/frame/XUntitledNumbers.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/awt/Size.hpp>

dbaccess/source/ui/app/AppControllerGen.cxx

@@ -51,6 +51,7 @@
 #include <com/sun/star/util/XRefreshable.hpp>
 
 #include <cppuhelper/exc_hlp.hxx>
+#include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/sqlerror.hxx>

dbaccess/source/ui/browser/brwctrlr.cxx

@@ -71,6 +71,7 @@
 #include <comphelper/interaction.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/string.hxx>
+#include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/sqlerror.hxx>

dbaccess/source/ui/browser/sbagrid.cxx

@@ -70,6 +70,7 @@
 #include <connectivity/dbconversion.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/servicehelper.hxx>
+#include <comphelper/types.hxx>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <browserids.hxx>

dbaccess/source/ui/control/dbtreelistbox.cxx

@@ -27,6 +27,7 @@
 #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
 #include <com/sun/star/ui/XContextMenuInterceptor.hpp>
 #include <com/sun/star/util/URL.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/processfactory.hxx>

dbaccess/source/ui/querydesign/QTableWindow.cxx

@@ -37,6 +37,7 @@
 #include "TableFieldInfo.hxx"
 #include <UITools.hxx>
 #include <svtools/treelistentry.hxx>
+#include <comphelper/types.hxx>
 
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;

drawinglayer/source/primitive2d/controlprimitive2d.cxx

@@ -21,6 +21,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/awt/XWindow2.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>

drawinglayer/source/primitive2d/textlayoutdevice.cxx

@@ -32,6 +32,7 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <vcl/svapp.hxx>
+#include <o3tl/deleter.hxx>
 
 
 // VDev RevDevice provider

embeddedobj/source/commonembedding/xfactory.cxx

@@ -22,6 +22,7 @@
 #include <com/sun/star/document/XTypeDetection.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/io/IOException.hpp>
 #include <comphelper/processfactory.hxx>

extensions/source/propctrlr/formcomponenthandler.cxx

@@ -75,6 +75,7 @@
 #include <com/sun/star/text/WritingMode2.hpp>
 
 #include <comphelper/extract.hxx>
+#include <comphelper/types.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/exc_hlp.hxx>

extensions/source/propctrlr/genericpropertyhandler.cxx

@@ -37,6 +37,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/extract.hxx>
+#include <comphelper/types.hxx>
 #include <tools/debug.hxx>
 
 #include <algorithm>

filter/source/msfilter/mscodec.cxx

@@ -27,6 +27,7 @@
 #include <comphelper/hash.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/docpasswordhelper.hxx>
+#include <com/sun/star/beans/NamedValue.hpp>
 
 #define DEBUG_MSO_ENCRYPTION_STD97 0
 

forms/source/component/Columns.cxx

@@ -35,6 +35,7 @@
 #include <comphelper/property.hxx>
 #include <comphelper/basicio.hxx>
 #include <comphelper/servicehelper.hxx>
+#include <comphelper/types.hxx>
 #include <services.hxx>
 #include <strings.hrc>
 #include <tools/debug.hxx>

forms/source/component/Currency.cxx

@@ -22,6 +22,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/syslocale.hxx>
+#include <comphelper/types.hxx>
 
 
 namespace frm

forms/source/component/DatabaseForm.cxx

@@ -61,6 +61,7 @@
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <comphelper/types.hxx>
 #include <rtl/math.hxx>
 #include <rtl/tencinfo.h>
 #include <svl/inettype.hxx>

forms/source/component/Edit.cxx

@@ -37,6 +37,7 @@
 #include <connectivity/dbconversion.hxx>
 
 #include <comphelper/property.hxx>
+#include <comphelper/types.hxx>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 

forms/source/component/EditBase.cxx

@@ -23,6 +23,7 @@
 #include <tools/debug.hxx>
 #include <comphelper/basicio.hxx>
 #include <comphelper/property.hxx>
+#include <comphelper/types.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <frm_resource.hxx>
 #include <strings.hrc>

forms/source/component/Filter.cxx

@@ -48,6 +48,7 @@
 #include <com/sun/star/awt/XItemList.hpp>
 
 #include <comphelper/property.hxx>
+#include <comphelper/types.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <connectivity/dbtools.hxx>

forms/source/component/FormattedField.cxx

@@ -25,6 +25,7 @@
 #include <comphelper/property.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/numbers.hxx>
+#include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <o3tl/any.hxx>

forms/source/component/Grid.cxx

@@ -30,6 +30,7 @@
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <comphelper/basicio.hxx>
 #include <comphelper/property.hxx>
+#include <comphelper/types.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <vcl/unohelp.hxx>
 #include <vcl/svapp.hxx>

forms/source/component/ImageControl.cxx

@@ -51,6 +51,7 @@
 #include <unotools/streamhelper.hxx>
 #include <comphelper/guarding.hxx>
 #include <comphelper/property.hxx>
+#include <comphelper/types.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <svl/urihelper.hxx>
 

forms/source/component/ListBox.cxx

@@ -41,6 +41,7 @@
 #include <comphelper/basicio.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/sequence.hxx>
+#include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/formattedcolumnvalue.hxx>
 #include <connectivity/dbconversion.hxx>

forms/source/component/Numeric.cxx

@@ -18,6 +18,7 @@
  */
 
 #include "Numeric.hxx"
+#include <comphelper/types.hxx>
 
 namespace frm
 {

forms/source/component/clickableimage.cxx

@@ -44,6 +44,7 @@
 #include <services.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/property.hxx>
+#include <comphelper/types.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <svtools/imageresourceaccess.hxx>
 #define LOCAL_URL_PREFIX    '#'

forms/source/misc/InterfaceContainer.cxx

@@ -40,6 +40,7 @@
 #include <comphelper/eventattachermgr.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/sequence.hxx>
+#include <comphelper/types.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <tools/debug.hxx>

framework/source/uielement/toolbarmodemenucontroller.cxx

@@ -36,6 +36,7 @@
 #include <vcl/settings.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
+#include <comphelper/types.hxx>
 #include <vcl/window.hxx>
 #include <svtools/menuoptions.hxx>
 #include <svtools/miscopt.hxx>

include/IwyuFilter_include.yaml

@@ -155,3 +155,49 @@ blacklist:
     - com/sun/star/task/XInteractionDisapprove.hpp
     - com/sun/star/task/XInteractionRequest.hpp
     - com/sun/star/task/XInteractionRetry.hpp
+    include/comphelper/SelectionMultiplex.hxx:
+    # base class has to be a complete type
+    - com/sun/star/view/XSelectionChangeListener.hpp
+    include/comphelper/namedvaluecollection.hxx:
+    # Needed for template class
+    - com/sun/star/beans/PropertyValue.hpp
+    - com/sun/star/beans/NamedValue.hpp
+    include/comphelper/numberedcollection.hxx:
+    # base class has to be a complete type
+    - com/sun/star/frame/XUntitledNumbers.hpp
+    include/comphelper/oslfile2streamwrap.hxx:
+    # base class has to be a complete type
+    - com/sun/star/io/XInputStream.hpp
+    - com/sun/star/io/XOutputStream.hpp
+    include/comphelper/propmultiplex.hxx:
+    # base class has to be a complete type
+    - com/sun/star/beans/XPropertyChangeListener.hpp
+    include/comphelper/propertystatecontainer.hxx:
+    # base class has to be a complete type
+    - com/sun/star/beans/XPropertyState.hpp
+    include/comphelper/seqstream.hxx:
+    # base class has to be a complete type
+    - com/sun/star/io/XInputStream.hpp
+    - com/sun/star/io/XSeekable.hpp
+    include/comphelper/sequence.hxx:
+    # Needed for implicit dtor
+    - com/sun/star/uno/Sequence.hxx
+    include/comphelper/sequenceashashmap.hxx:
+    # Needed for implicit dtor
+    - com/sun/star/uno/Sequence.hxx
+    include/comphelper/servicedecl.hxx:
+    # base class has to be a complete type
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/uno/XComponentContext.hpp
+    include/comphelper/servicehelper.hxx:
+    # Needed for macro
+    - rtl/instance.hxx
+    include/comphelper/simplefileaccessinteraction.hxx:
+    # base class has to be a complete type
+    - com/sun/star/task/XInteractionHandler.hpp
+    include/comphelper/unique_disposing_ptr.hxx:
+    # base class has to be a complete type
+    - com/sun/star/lang/XServiceInfo.hpp
+    include/comphelper/uno3.hxx:
+    # Needed for macro
+    - comphelper/sequence.hxx

include/comphelper/MasterPropertySet.hxx

@@ -22,12 +22,13 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <comphelper/PropertyInfoHash.hxx>
 #include <comphelper/comphelperdllapi.h>
-#include <comphelper/solarmutex.hxx>
 #include <rtl/ref.hxx>
 #include <map>
 
+namespace comphelper { class SolarMutex; }
+namespace comphelper { struct PropertyInfo; }
+
 namespace comphelper
 {
     class MasterPropertySetInfo;

include/comphelper/PropertyInfoHash.hxx

@@ -21,7 +21,7 @@