[Libreoffice-commits] core.git: accessibility/source chart2/source comphelper/source connectivity/source dbaccess/qa dbaccess/source desktop/source editeng/source filter/source forms/source framework/source include/comphelper include/IwyuFilter_include.yaml include/toolkit package/source reportdesign/source sc/IwyuFilter_sc.yaml scripting/source sc/source sd/source sfx2/source starmath/source svx/source sw/qa sw/source writerfilter/source xmloff/qa xmloff/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Sep 24 21:23:46 UTC 2018 

 accessibility/source/extended/textwindowaccessibility.cxx     |    1 
 chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx |    1 
 chart2/source/model/filter/XMLFilter.cxx                      |    1 
 comphelper/source/container/embeddedobjectcontainer.cxx       |    1 
 comphelper/source/misc/accessibleeventnotifier.cxx            |    1 
 comphelper/source/misc/backupfilehelper.cxx                   |    1 
 comphelper/source/misc/configurationhelper.cxx                |    3 
 comphelper/source/misc/docpasswordhelper.cxx                  |    1 
 comphelper/source/misc/documentinfo.cxx                       |    1 
 comphelper/source/misc/listenernotification.cxx               |    2 
 comphelper/source/misc/lok.cxx                                |    1 
 comphelper/source/streaming/basicio.cxx                       |    2 
 connectivity/source/drivers/jdbc/Object.cxx                   |    1 
 connectivity/source/manager/mdrivermanager.cxx                |    1 
 dbaccess/qa/extras/dialog-save.cxx                            |    1 
 dbaccess/qa/extras/empty-stdlib-save.cxx                      |    1 
 dbaccess/qa/extras/nolib-save.cxx                             |    1 
 dbaccess/source/core/dataaccess/databasedocument.cxx          |    1 
 dbaccess/source/core/dataaccess/databaseregistrations.cxx     |    1 
 desktop/source/lib/init.cxx                                   |    1 
 editeng/source/accessibility/AccessibleEditableTextPara.cxx   |    1 
 filter/source/msfilter/msdffimp.cxx                           |    1 
 filter/source/msfilter/msoleexp.cxx                           |    1 
 filter/source/msfilter/svdfppt.cxx                            |    1 
 filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx           |    1 
 forms/source/misc/listenercontainers.cxx                      |    1 
 forms/source/richtext/attributedispatcher.cxx                 |    1 
 forms/source/richtext/clipboarddispatcher.cxx                 |    1 
 forms/source/richtext/featuredispatcher.cxx                   |    1 
 forms/source/richtext/parametrizedattributedispatcher.cxx     |    1 
 forms/source/richtext/specialdispatchers.cxx                  |    1 
 framework/source/accelerators/acceleratorconfiguration.cxx    |    1 
 include/IwyuFilter_include.yaml                               |   49 ++++++++++
 include/comphelper/ChainablePropertySet.hxx                   |    5 -
 include/comphelper/IdPropArrayHelper.hxx                      |    2 
 include/comphelper/accessiblecontexthelper.hxx                |    1 
 include/comphelper/accessibleeventnotifier.hxx                |    8 +
 include/comphelper/accessibletexthelper.hxx                   |    5 -
 include/comphelper/accessiblewrapper.hxx                      |    4 
 include/comphelper/accimplaccess.hxx                          |    6 -
 include/comphelper/backupfilehelper.hxx                       |    3 
 include/comphelper/base64.hxx                                 |    3 
 include/comphelper/basicio.hxx                                |    5 -
 include/comphelper/componentbase.hxx                          |    2 
 include/comphelper/componentguard.hxx                         |    2 
 include/comphelper/componentmodule.hxx                        |    2 
 include/comphelper/configuration.hxx                          |    2 
 include/comphelper/configurationhelper.hxx                    |   11 --
 include/comphelper/configurationlistener.hxx                  |    7 -
 include/comphelper/dispatchcommand.hxx                        |    8 +
 include/comphelper/docpasswordhelper.hxx                      |    2 
 include/comphelper/docpasswordrequest.hxx                     |    3 
 include/comphelper/documentconstants.hxx                      |    1 
 include/comphelper/documentinfo.hxx                           |    4 
 include/comphelper/embeddedobjectcontainer.hxx                |   14 +-
 include/comphelper/eventattachermgr.hxx                       |    6 -
 include/comphelper/extract.hxx                                |    3 
 include/comphelper/genericpropertyset.hxx                     |    6 -
 include/comphelper/getexpandeduri.hxx                         |    4 
 include/comphelper/graphicmimetype.hxx                        |   31 +++++-
 include/comphelper/guarding.hxx                               |    2 
 include/comphelper/interfacecontainer2.hxx                    |   11 --
 include/comphelper/listenernotification.hxx                   |    3 
 include/comphelper/logging.hxx                                |    8 -
 include/comphelper/lok.hxx                                    |    3 
 include/toolkit/helper/macros.hxx                             |    1 
 package/source/zippackage/zipfileaccess.cxx                   |    1 
 reportdesign/source/core/sdr/ReportDrawPage.cxx               |    1 
 reportdesign/source/filter/xml/xmlColumn.cxx                  |    1 
 reportdesign/source/filter/xml/xmlHelper.cxx                  |    1 
 reportdesign/source/filter/xml/xmlfilter.cxx                  |    1 
 sc/IwyuFilter_sc.yaml                                         |    3 
 sc/source/core/tool/charthelper.cxx                           |    1 
 sc/source/filter/inc/xistream.hxx                             |    1 
 scripting/source/stringresource/stringresource.cxx            |    1 
 sd/source/core/sdpage.cxx                                     |    1 
 sfx2/source/doc/objstor.cxx                                   |    1 
 starmath/source/mathmlexport.cxx                              |    1 
 starmath/source/mathmlimport.cxx                              |    1 
 svx/source/unodraw/unopage.cxx                                |    1 
 svx/source/unodraw/unoshap4.cxx                               |    1 
 sw/qa/extras/tiledrendering/tiledrendering.cxx                |    1 
 sw/source/core/access/accpara.cxx                             |    2 
 sw/source/core/doc/DocumentChartDataProviderManager.cxx       |    1 
 sw/source/core/doc/DocumentContentOperationsManager.cxx       |    1 
 sw/source/core/doc/docdesc.cxx                                |    1 
 sw/source/core/doc/doctxm.cxx                                 |    1 
 sw/source/core/doc/notxtfrm.cxx                               |    1 
 sw/source/core/draw/dview.cxx                                 |    1 
 sw/source/core/frmedt/fefly1.cxx                              |    1 
 sw/source/core/ole/ndole.cxx                                  |    1 
 sw/source/core/unocore/unochart.cxx                           |    1 
 sw/source/filter/html/SwAppletImpl.cxx                        |    1 
 sw/source/filter/xml/swxml.cxx                                |    1 
 sw/source/filter/xml/wrtxml.cxx                               |    1 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx                |    1 
 xmloff/qa/unit/uxmloff.cxx                                    |    1 
 xmloff/source/core/xmlexp.cxx                                 |    1 
 xmloff/source/meta/MetaExportComponent.cxx                    |    1 
 99 files changed, 216 insertions(+), 83 deletions(-)

New commits:
commit 8df9935dcbdb1b64385642fbd37d43ab5b3d092c
Author:     Gabor Kelemen <kelemeng at ubuntu.com>
AuthorDate: Thu Sep 20 20:26:40 2018 +0200
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Mon Sep 24 23:23:20 2018 +0200

    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 at collabora.co.uk>

diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index ed673c473c66..853d944864fd 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/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>
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 264fb16cfc76..c4b4c74cbe66 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/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;
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 91fb9b1b9d85..f4012e7d3248 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/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>
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 1395b63f5258..456c1f605bdc 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/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>
diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx
index e3f5a3e9d443..f14176a03528 100644
--- a/comphelper/source/misc/accessibleeventnotifier.cxx
+++ b/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>
 
diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx
index 7e5a76983e43..ee3f336f7d15 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/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>
diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx
index bf97ddff1783..f3853baeff81 100644
--- a/comphelper/source/misc/configurationhelper.cxx
+++ b/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{
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index 39dfb266197c..1458d0c0a4f6 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/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>
diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx
index 38be204a5f00..5c460e07f043 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/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>
 
diff --git a/comphelper/source/misc/listenernotification.cxx b/comphelper/source/misc/listenernotification.cxx
index 5c0c56de2458..4bb4e7f619a0 100644
--- a/comphelper/source/misc/listenernotification.cxx
+++ b/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
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index 0b983dba6a6b..0641e01660ab 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <comphelper/lok.hxx>
+#include <i18nlangtag/languagetag.hxx>
 
 #include <iostream>
 #include <sstream>
diff --git a/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx
index b43b6b1c7da0..d86427b7de81 100644
--- a/comphelper/source/streaming/basicio.cxx
+++ b/comphelper/source/streaming/basicio.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <comphelper/basicio.hxx>
-
+#include <com/sun/star/awt/FontDescriptor.hpp>
 
 namespace comphelper
 {
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index 8fac24980fb7..13f9c79da482 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/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>
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index cac14c1d673f..ad58f39d85e7 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/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>
diff --git a/dbaccess/qa/extras/dialog-save.cxx b/dbaccess/qa/extras/dialog-save.cxx
index eb1095fe4ba7..9d67e0b45d54 100644
--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/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>
diff --git a/dbaccess/qa/extras/empty-stdlib-save.cxx b/dbaccess/qa/extras/empty-stdlib-save.cxx
index 86f381cf8519..8e38fe03a951 100644
--- a/dbaccess/qa/extras/empty-stdlib-save.cxx
+++ b/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>
diff --git a/dbaccess/qa/extras/nolib-save.cxx b/dbaccess/qa/extras/nolib-save.cxx
index f5e4ae59b837..c8c8d2ec8727 100644
--- a/dbaccess/qa/extras/nolib-save.cxx
+++ b/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>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 1229f7a16942..b495e1afb5ef 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/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>
 
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 0f44a8f6a35b..61b7497f06ee 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/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>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index adbb33de93e8..c52b5dcd8292 100644
--- a/desktop/source/lib/init.cxx
+++ b/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>
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index bb796458482d..5c549f2e24f5 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/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>
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index c484871dfe81..b3a54e3c28fa 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/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>
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 13b24f80e936..43652af5f7ea 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/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>
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index f15f4b245900..687943db3950 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/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>
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index d5152c5d13e6..9cafc79cf542 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/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>
diff --git a/forms/source/misc/listenercontainers.cxx b/forms/source/misc/listenercontainers.cxx
index 78c07626a95a..13adf3e612ad 100644
--- a/forms/source/misc/listenercontainers.cxx
+++ b/forms/source/misc/listenercontainers.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <listenercontainers.hxx>
+#include <osl/diagnose.h>
 
 
 namespace frm
diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx
index 309bc6b8d8fc..98c9acf2b6c6 100644
--- a/forms/source/richtext/attributedispatcher.cxx
+++ b/forms/source/richtext/attributedispatcher.cxx
@@ -21,6 +21,7 @@
 
 #include <editeng/editview.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 
 namespace frm
diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx
index 125e47bd0d2f..c872d05ebc84 100644
--- a/forms/source/richtext/clipboarddispatcher.cxx
+++ b/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
diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx
index d01571bff032..ac425532f008 100644
--- a/forms/source/richtext/featuredispatcher.cxx
+++ b/forms/source/richtext/featuredispatcher.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "featuredispatcher.hxx"
+#include <osl/diagnose.h>
 
 
 namespace frm
diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx
index 01ef4f6af300..f60699c172e2 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.cxx
+++ b/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>
diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx
index 31a1c6cde092..a45ccca5a502 100644
--- a/forms/source/richtext/specialdispatchers.cxx
+++ b/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
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 3fd201ddeaf3..04017f25a783 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/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>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index f88b608591a8..1569881e4a48 100644
--- a/include/IwyuFilter_include.yaml
+++ b/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
diff --git a/include/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx
index e048883ada7c..829b1a2d9fb6 100644
--- a/include/comphelper/ChainablePropertySet.hxx
+++ b/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;
diff --git a/include/comphelper/IdPropArrayHelper.hxx b/include/comphelper/IdPropArrayHelper.hxx
index fdc0d4614d72..6a0f5b48975d 100644
--- a/include/comphelper/IdPropArrayHelper.hxx
+++ b/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>
diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx
index c29f61ff3bb0..7af467872faa 100644
--- a/include/comphelper/accessiblecontexthelper.hxx
+++ b/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>
diff --git a/include/comphelper/accessibleeventnotifier.hxx b/include/comphelper/accessibleeventnotifier.hxx
index f8cf110f65ad..90df00caabb4 100644
--- a/include/comphelper/accessibleeventnotifier.hxx
+++ b/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
diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx
index 4f400f5d79e4..04de7c7d87e9 100644
--- a/include/comphelper/accessibletexthelper.hxx
+++ b/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
 {
diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx
index 73643169cd39..30f775f255e5 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/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
 {
diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx
index a304ccc3cc94..86b16c8ad97a 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/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
 {
diff --git a/include/comphelper/backupfilehelper.hxx b/include/comphelper/backupfilehelper.hxx
index 2ad1e54ae0a3..33042e917ec3 100644
--- a/include/comphelper/backupfilehelper.hxx
+++ b/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>
 
diff --git a/include/comphelper/base64.hxx b/include/comphelper/base64.hxx
index cfa80bf39a25..763312caaa78 100644
--- a/include/comphelper/base64.hxx
+++ b/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 {
 
diff --git a/include/comphelper/basicio.hxx b/include/comphelper/basicio.hxx
index de444e0c12a1..cd54f37a569b 100644
--- a/include/comphelper/basicio.hxx
+++ b/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
 {
diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx
index 993b81eeeb73..3d785087b87a 100644
--- a/include/comphelper/componentbase.hxx
+++ b/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
diff --git a/include/comphelper/componentguard.hxx b/include/comphelper/componentguard.hxx
index 072b2857dabd..f3cf1bd5e426 100644
--- a/include/comphelper/componentguard.hxx
+++ b/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
diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx
index 67818ac3d8a3..a60c83aee70d 100644
--- a/include/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.hxx
@@ -28,8 +28,6 @@
 
 #include <osl/mutex.hxx>
 
-#include <rtl/string.hxx>
-#include <rtl/instance.hxx>
 #include <memory>
 
 
diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx
index d2df43b4d880..fa298c54a621 100644
--- a/include/comphelper/configuration.hxx
+++ b/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>
diff --git a/include/comphelper/configurationhelper.hxx b/include/comphelper/configurationhelper.hxx
index 48b1e240f104..eb9e7b8fd3f5 100644
--- a/include/comphelper/configurationhelper.hxx
+++ b/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
 {
diff --git a/include/comphelper/configurationlistener.hxx b/include/comphelper/configurationlistener.hxx
index 7dc39a308144..4897323b8b9e 100644
--- a/include/comphelper/configurationlistener.hxx
+++ b/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;
diff --git a/include/comphelper/dispatchcommand.hxx b/include/comphelper/dispatchcommand.hxx
index 0a8e158366bd..475317742157 100644
--- a/include/comphelper/dispatchcommand.hxx
+++ b/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
 {
diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx
index 62c856c40c9a..240545848b30 100644
--- a/include/comphelper/docpasswordhelper.hxx
+++ b/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 {
 
diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx
index 5440616f849d..31b49bb09c72 100644
--- a/include/comphelper/docpasswordrequest.hxx
+++ b/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;
diff --git a/include/comphelper/documentconstants.hxx b/include/comphelper/documentconstants.hxx
index 89d5178d33d5..3f7f166416e0 100644
--- a/include/comphelper/documentconstants.hxx
+++ b/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
diff --git a/include/comphelper/documentinfo.hxx b/include/comphelper/documentinfo.hxx
index c30d79b40c95..d47f1d02ea50 100644
--- a/include/comphelper/documentinfo.hxx
+++ b/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 {
diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx
index 466cb49ebede..93f7327b5435 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/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;
diff --git a/include/comphelper/eventattachermgr.hxx b/include/comphelper/eventattachermgr.hxx
index 97e6dee6c1d5..22323514aace 100644
--- a/include/comphelper/eventattachermgr.hxx
+++ b/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;
-}
 } } }
 
 
diff --git a/include/comphelper/extract.hxx b/include/comphelper/extract.hxx
index e0eab28897af..91682400d770 100644
--- a/include/comphelper/extract.hxx
+++ b/include/comphelper/extract.hxx
@@ -25,9 +25,8 @@
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/uno/TypeClass.hpp>
-#include <com/sun/star/uno/Type.hxx>
+#include <com/sun/star/uno/Type.h>
 #include <com/sun/star/uno/Any.hxx>
-#include <cppu/unotype.hxx>
 
 namespace cppu
 {
diff --git a/include/comphelper/genericpropertyset.hxx b/include/comphelper/genericpropertyset.hxx
index ca30d46a2cdb..527b7d8e4960 100644
--- a/include/comphelper/genericpropertyset.hxx
+++ b/include/comphelper/genericpropertyset.hxx
@@ -20,10 +20,12 @@
 #ifndef INCLUDED_COMPHELPER_GENERICPROPERTYSET_HXX
 #define INCLUDED_COMPHELPER_GENERICPROPERTYSET_HXX
 
-#include <comphelper/propertysetinfo.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/uno/Reference.h>
 #include <comphelper/comphelperdllapi.h>
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace comphelper { class PropertySetInfo; }
+
 namespace comphelper
 {
     COMPHELPER_DLLPUBLIC css::uno::Reference< css::beans::XPropertySet > GenericPropertySet_CreateInstance( PropertySetInfo* pInfo );
diff --git a/include/comphelper/getexpandeduri.hxx b/include/comphelper/getexpandeduri.hxx
index 9da095821e66..ab73a5ff8596 100644
--- a/include/comphelper/getexpandeduri.hxx
+++ b/include/comphelper/getexpandeduri.hxx
@@ -12,15 +12,15 @@
 
 #include <sal/config.h>
 
-#include <com/sun/star/uno/Reference.hxx>
 #include <comphelper/comphelperdllapi.h>
 #include <rtl/ustring.hxx>
-#include <sal/types.h>
 
 namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;
 } } } }
 
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
 namespace comphelper {
 
 /**
diff --git a/include/comphelper/graphicmimetype.hxx b/include/comphelper/graphicmimetype.hxx
index 7cf1e88240c0..c278ee669d03 100644
--- a/include/comphelper/graphicmimetype.hxx
+++ b/include/comphelper/graphicmimetype.hxx
@@ -14,9 +14,34 @@
 #include <rtl/ustring.hxx>
 #include <vcl/salctype.hxx>
 
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Reference.h>
+
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace graphic
+{
+class XGraphic;
+}
+}
+}
+}
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace io
+{
+class XInputStream;
+}
+}
+}
+}
 
 namespace comphelper
 {
diff --git a/include/comphelper/guarding.hxx b/include/comphelper/guarding.hxx
index a750d479064b..3bbf4ac71390 100644
--- a/include/comphelper/guarding.hxx
+++ b/include/comphelper/guarding.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_COMPHELPER_GUARDING_HXX
 #define INCLUDED_COMPHELPER_GUARDING_HXX
 
-#include <osl/mutex.hxx>
+namespace osl { class Mutex; }
 
 
 namespace comphelper
diff --git a/include/comphelper/interfacecontainer2.hxx b/include/comphelper/interfacecontainer2.hxx
index 22c1277e5fe0..f5907d205aa7 100644
--- a/include/comphelper/interfacecontainer2.hxx
+++ b/include/comphelper/interfacecontainer2.hxx
@@ -21,21 +21,16 @@
 
 #include <sal/config.h>
 
-#include <cstddef>
-#include <functional>
 #include <vector>
-#include <utility>
 
-#include <osl/diagnose.h>
-#include <osl/mutex.hxx>
-#include <rtl/alloc.h>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <comphelper/comphelperdllapi.h>
 
+namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace osl { class Mutex; }
+
 /** */ //for docpp
 namespace comphelper
 {
diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx
index 610ac31cb6ce..cadb85297d8f 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -22,11 +22,12 @@
 
 #include <comphelper/interfacecontainer2.hxx>
 
-#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/lang/EventObject.hpp>
 #include <comphelper/comphelperdllapi.h>
 
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace lang { class XEventListener; } } } }
 
 namespace comphelper
 {
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index fd04e83f732d..475f067062bf 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -21,14 +21,14 @@
 #define INCLUDED_COMPHELPER_LOGGING_HXX
 
 #include <comphelper/comphelperdllapi.h>
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/logging/XLogHandler.hpp>
-#include <com/sun/star/logging/LogLevel.hpp>
+#include <rtl/ustring.hxx>
 
 #include <boost/optional.hpp>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 namespace comphelper
 {
 
diff --git a/include/comphelper/lok.hxx b/include/comphelper/lok.hxx
index e0bd65690261..7fb4d5a04800 100644
--- a/include/comphelper/lok.hxx
+++ b/include/comphelper/lok.hxx
@@ -11,8 +11,9 @@
 #define INCLUDED_COMPHELPER_LOK_HXX
 
 #include <comphelper/comphelperdllapi.h>
+#include <rtl/ustring.hxx>
 
-#include <i18nlangtag/languagetag.hxx>
+class LanguageTag;
 
 // Interface between the LibreOfficeKit implementation called by LibreOfficeKit clients and other
 // LibreOffice code.
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
index 1e8aa7f6e126..8413606fade0 100644
--- a/include/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
@@ -23,6 +23,7 @@
 #include <string.h>
 
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <comphelper/servicehelper.hxx>
 
 #define IMPL_XUNOTUNNEL_MINIMAL( ClassName ) \
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index 70b8d3f7a96f..fb6007d8e203 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -36,6 +36,7 @@
 #include <rtl/ref.hxx>
 #include <o3tl/make_unique.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star;
 
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index d5226c1935d3..87984ce3b445 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -30,6 +30,7 @@
 #include <svx/svdmodel.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <tools/diagnose_ex.h>
 #include <svx/unoshape.hxx>
 #include <svx/svdpage.hxx>
diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx
index af1af1891d9d..75a1e1873852 100644
--- a/reportdesign/source/filter/xml/xmlColumn.cxx
+++ b/reportdesign/source/filter/xml/xmlColumn.cxx
@@ -28,6 +28,7 @@
 #include "xmlStyleImport.hxx"
 #include "xmlTable.hxx"
 #include <comphelper/genericpropertyset.hxx>
+#include <comphelper/propertysetinfo.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <strings.hxx>
 
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index 799322e05610..524248f647a3 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -23,6 +23,7 @@
 #include <xmloff/controlpropertyhdl.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/genericpropertyset.hxx>
+#include <comphelper/propertysetinfo.hxx>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/awt/TextAlign.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index c2f0ff43eda1..a709f0418972 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -46,6 +46,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include <comphelper/genericpropertyset.hxx>
+#include <comphelper/propertysetinfo.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <xmloff/ProgressBarHelper.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 6ad4546a6514..80362e3bb13a 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -391,6 +391,9 @@ blacklist:
     sc/source/filter/inc/xerecord.hxx:
     # Needed for member access
     - xestream.hxx
+    sc/source/filter/inc/xistream.hxx:
+    # Needed for implicit dtor
+    - com/sun/star/beans/NamedValue.hpp
     sc/source/filter/inc/xlstring.hxx:
     # Needed for template
     - o3tl/typed_flags_set.hxx
diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx
index b6cd5c3db7ba..eca8d48f3e9b 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -31,6 +31,7 @@
 
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 
 using namespace com::sun::star;
diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx
index ad8cd462cb1d..58d9176fb643 100644
--- a/sc/source/filter/inc/xistream.hxx
+++ b/sc/source/filter/inc/xistream.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_XISTREAM_HXX
 
 #include <comphelper/docpasswordhelper.hxx>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <filter/msfilter/mscodec.hxx>
 #include <tools/stream.hxx>
 #include <memory>
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index faf2fc3193a4..a17977536056 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -37,6 +37,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 
+#include <osl/diagnose.h>
 #include <rtl/tencinfo.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/strbuf.hxx>
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index ce76e92a6d78..5b65ce98bcf9 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -52,6 +52,7 @@
 #include <com/sun/star/animations/XAnimationNode.hpp>
 #include <com/sun/star/animations/XTimeContainer.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/xml/dom/XNode.hpp>
 #include <com/sun/star/xml/dom/XNodeList.hpp>
 #include <com/sun/star/xml/dom/XNamedNodeMap.hpp>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 86a94f0d57ba..d8deaf5df902 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -54,6 +54,7 @@
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/XTransactedObject.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/EntryInitModes.hpp>
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 52b417622eaf..9ec4f68c2f9d 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -48,6 +48,7 @@
 #include <xmloff/attrlist.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/servicehelper.hxx>
+#include <comphelper/propertysetinfo.hxx>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index eff9032df3e7..27fc49018455 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -38,6 +38,7 @@ one go*/
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/servicehelper.hxx>
+#include <comphelper/propertysetinfo.hxx>
 #include <o3tl/make_unique.hxx>
 #include <rtl/character.hxx>
 #include <sal/log.hxx>
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index f18938084d6d..1e0fa47af5bb 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -20,6 +20,7 @@
 #include <config_features.h>
 
 #include <com/sun/star/document/EventObject.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <osl/mutex.hxx>
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index e0e619841e40..0e1300884c8d 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/util/XModifiable.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XLinkageSupport.hpp>
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index df8958a9eaab..65bfd7087058 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -11,6 +11,7 @@
 #include <boost/property_tree/json_parser.hpp>
 
 #include <com/sun/star/frame/DispatchResultState.hpp>
+#include <com/sun/star/frame/XDispatchResultListener.hpp>
 #include <swmodeltestbase.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/dispatchcommand.hxx>
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index c7bd35214480..9f42970e2392 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -38,8 +38,10 @@
 #include <com/sun/star/accessibility/AccessibleTextType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
+#include <com/sun/star/i18n/Boundary.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
 #include <breakit.hxx>
 #include "accpara.hxx"
diff --git a/sw/source/core/doc/DocumentChartDataProviderManager.cxx b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
index 363bc2a2a0e6..c2ab8eea204d 100644
--- a/sw/source/core/doc/DocumentChartDataProviderManager.cxx
+++ b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
@@ -27,6 +27,7 @@
 #include <frmfmt.hxx>
 #include <ndole.hxx>
 #include <com/sun/star/chart2/XChartDocument.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 
 
 using namespace com::sun::star;
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 1e15c9a22fc2..7fa2ee18f161 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -80,6 +80,7 @@
 #include <o3tl/make_unique.hxx>
 #include <com/sun/star/i18n/Boundary.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <memory>
 
 
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 983ac37e83b4..7ccfb2b58328 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -63,6 +63,7 @@
 #include <unotools/syslocale.hxx>
 #include <svx/swframetypes.hxx>
 #include <svx/svxids.hrc>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 25d7a66829c8..bee42efe9074 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -73,6 +73,7 @@
 #include <o3tl/make_unique.hxx>
 #include <tools/datetimeutils.hxx>
 #include <tools/globname.hxx>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 
 #include <memory>
 
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index b0c228967859..e90b0454aa5a 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -68,6 +68,7 @@
 #include <accessibilityoptions.hxx>
 #include <com/sun/star/embed/EmbedMisc.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <svtools/embedhlp.hxx>
 #include <dview.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index aeccb79f030e..d02eb2e6f2f6 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -26,6 +26,7 @@
 #include <tools/globname.hxx>
 #include <editeng/outliner.hxx>
 #include <com/sun/star/embed/EmbedMisc.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 
 #include <swtypes.hxx>
 #include <pagefrm.hxx>
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 7d2ce8e6015f..43e8a4219bfe 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -29,6 +29,7 @@
 #include <tools/globname.hxx>
 #include <com/sun/star/form/FormButtonType.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <comphelper/types.hxx>
 #include <fmtanchr.hxx>
 #include <txtflcnt.hxx>
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index ca9decce9af3..ee11c90fc626 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/container/XChild.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/EmbedMisc.hpp>
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 675499349fa2..8a49a513aa42 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -21,6 +21,7 @@
 
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/chart2/data/LabelOrigin.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/mutex.hxx>
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx
index ce4bfc54e460..a60fd75f36e6 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -21,6 +21,7 @@
 #include <svtools/htmlkywd.hxx>
 #include <svl/urihelper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 
 #include <comphelper/embeddedobjectcontainer.hxx>
 #include <comphelper/classids.hxx>
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index cc4fe8616983..f36ffb47a147 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -48,6 +48,7 @@
 #include <svx/xmleohlp.hxx>
 #include <comphelper/fileformat.h>
 #include <comphelper/genericpropertyset.hxx>
+#include <comphelper/propertysetinfo.hxx>
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <sfx2/frame.hxx>
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 87ecd70566fb..df75d14868db 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -31,6 +31,7 @@
 #include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/genericpropertyset.hxx>
+#include <comphelper/propertysetinfo.hxx>
 #include <vcl/errinf.hxx>
 #include <o3tl/any.hxx>
 #include <sal/log.hxx>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1c6c858bc12d..b5a96b401e89 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -9,6 +9,7 @@
 
 #include "rtfdocumentimpl.hxx"
 #include <memory>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/io/WrongFormatException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/xmloff/qa/unit/uxmloff.cxx b/xmloff/qa/unit/uxmloff.cxx
index 707210b92767..258a921ae1c6 100644
--- a/xmloff/qa/unit/uxmloff.cxx
+++ b/xmloff/qa/unit/uxmloff.cxx
@@ -13,6 +13,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include <comphelper/genericpropertyset.hxx>
+#include <comphelper/propertysetinfo.hxx>
 
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlmetai.hxx>
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index c3b82f214246..42e14d56bdab 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <i18nlangtag/languagetag.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/propertysetinfo.hxx>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index ee5f5229bf48..0760b917cbdd 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <comphelper/genericpropertyset.hxx>
+#include <comphelper/propertysetinfo.hxx>
 #include <comphelper/processfactory.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmlnmspe.hxx>

More information about the Libreoffice-commits mailing list