From 2b44f9490853c9de5a0e92c41fdc1279b6c91e06 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemeng@ubuntu.com>
Date: Sun, 10 Apr 2022 13:11:33 +0200
Subject: [PATCH] Recheck modules [uU]* with IWYU

See tdf#42949 for motivation

Change-Id: If710445176681de8e0a0b6c65f58ecaca19dbccf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132768
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 UnoControls/IwyuFilter_UnoControls.yaml              |  6 ++++++
 UnoControls/inc/basecontainercontrol.hxx             |  1 -
 UnoControls/inc/basecontrol.hxx                      |  1 -
 UnoControls/source/controls/progressbar.cxx          |  2 --
 UnoControls/source/inc/progressmonitor.hxx           |  1 -
 ucb/IwyuFilter_ucb.yaml                              | 11 +++++++++++
 ucb/source/cacher/cachedcontentresultset.hxx         |  2 --
 ucb/source/cacher/cachedcontentresultsetstub.hxx     |  2 --
 ucb/source/cacher/cacheddynamicresultset.hxx         |  2 --
 ucb/source/cacher/cacheddynamicresultsetstub.hxx     |  2 --
 ucb/source/cacher/contentresultsetwrapper.cxx        |  1 -
 ucb/source/cacher/contentresultsetwrapper.hxx        |  1 -
 ucb/source/core/cmdenv.hxx                           |  2 --
 ucb/source/core/provprox.hxx                         |  2 --
 ucb/source/core/ucb.cxx                              |  3 +--
 ucb/source/core/ucb.hxx                              |  2 --
 ucb/source/core/ucbcmds.cxx                          |  1 -
 ucb/source/core/ucbcmds.hxx                          |  1 +
 ucb/source/core/ucbprops.cxx                         |  4 ++--
 ucb/source/core/ucbprops.hxx                         |  2 --
 ucb/source/core/ucbstore.cxx                         |  3 +--
 ucb/source/core/ucbstore.hxx                         |  2 +-
 ucb/source/sorter/sortdynres.cxx                     |  1 -
 ucb/source/sorter/sortresult.cxx                     |  3 ---
 ucb/source/ucp/cmis/cmis_content.cxx                 |  1 -
 ucb/source/ucp/cmis/cmis_provider.cxx                |  1 -
 ucb/source/ucp/cmis/cmis_strings.hxx                 |  2 ++
 ucb/source/ucp/expand/ucpexpand.cxx                  |  3 ---
 ucb/source/ucp/ext/ucpext_content.cxx                |  1 -
 ucb/source/ucp/ext/ucpext_datasupplier.cxx           |  1 -
 ucb/source/ucp/ext/ucpext_datasupplier.hxx           |  2 ++
 ucb/source/ucp/ext/ucpext_resultset.hxx              |  2 ++
 ucb/source/ucp/file/bc.cxx                           |  1 -
 ucb/source/ucp/file/filinl.hxx                       |  4 ++++
 ucb/source/ucp/file/filnot.hxx                       |  2 --
 ucb/source/ucp/file/prov.cxx                         |  1 -
 ucb/source/ucp/file/prov.hxx                         |  3 ---
 ucb/source/ucp/ftp/ftpcontentprovider.cxx            |  1 -
 ucb/source/ucp/ftp/ftpurl.cxx                        |  2 --
 ucb/source/ucp/gio/gio_provider.hxx                  |  2 --
 ucb/source/ucp/hierarchy/hierarchydata.hxx           |  1 -
 ucb/source/ucp/hierarchy/hierarchydatasource.cxx     |  1 -
 ucb/source/ucp/hierarchy/hierarchydatasource.hxx     |  1 -
 ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx   |  2 --
 ucb/source/ucp/hierarchy/hierarchyprovider.hxx       |  1 -
 ucb/source/ucp/image/ucpimage.cxx                    |  1 -
 ucb/source/ucp/package/pkgprovider.hxx               |  2 --
 ucb/source/ucp/tdoc/tdoc_datasupplier.cxx            |  1 -
 ucb/source/ucp/tdoc/tdoc_datasupplier.hxx            |  1 -
 ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx  |  2 --
 ucb/source/ucp/tdoc/tdoc_provider.hxx                |  2 --
 ucb/source/ucp/tdoc/tdoc_stgelems.hxx                |  1 -
 ucb/source/ucp/webdav-curl/ContentProperties.cxx     |  2 --
 ucb/source/ucp/webdav-curl/CurlSession.cxx           |  2 +-
 ucb/source/ucp/webdav-curl/DAVRequestEnvironment.hxx |  1 -
 ucb/source/ucp/webdav-curl/DAVResourceAccess.cxx     |  1 -
 ucb/source/ucp/webdav-curl/DAVTypes.hxx              |  2 --
 ucb/source/ucp/webdav-curl/PropfindCache.hxx         |  1 -
 ucb/source/ucp/webdav-curl/UCBDeadPropertyValue.cxx  |  1 -
 ucb/source/ucp/webdav-curl/UCBDeadPropertyValue.hxx  |  1 -
 ucbhelper/IwyuFilter_ucbhelper.yaml                  |  3 +++
 ucbhelper/source/provider/contentidentifier.cxx      |  2 --
 ucbhelper/source/provider/contentinfo.cxx            |  3 ---
 ucbhelper/source/provider/contentinfo.hxx            |  1 -
 ucbhelper/source/provider/propertyvalueset.cxx       |  3 ---
 ucbhelper/source/provider/providerhelper.cxx         |  2 --
 ucbhelper/source/provider/resultsethelper.cxx        |  4 +---
 ucbhelper/source/provider/resultsetmetadata.cxx      |  2 --
 unodevtools/IwyuFilter_unodevtools.yaml              |  2 ++
 unodevtools/inc/options.hxx                          |  2 +-
 unodevtools/source/skeletonmaker/skeletoncommon.cxx  |  3 ---
 unodevtools/source/skeletonmaker/skeletoncommon.hxx  |  1 -
 unodevtools/source/unodevtools/options.cxx           |  2 --
 unotools/IwyuFilter_unotools.yaml                    |  4 +++-
 unotools/source/config/compatibility.cxx             |  1 -
 unotools/source/config/configitem.cxx                |  1 -
 unotools/source/config/defaultoptions.cxx            |  3 ---
 unotools/source/config/dynamicmenuoptions.cxx        |  3 ---
 unotools/source/config/historyoptions.cxx            |  7 -------
 unotools/source/config/itemholder1.cxx               |  7 -------
 unotools/source/config/pathoptions.cxx               |  1 -
 unotools/source/config/saveopt.cxx                   |  7 -------
 unotools/source/config/securityoptions.cxx           |  1 -
 unotools/source/config/useroptions.cxx               |  1 -
 unotools/source/config/viewoptions.cxx               |  2 --
 unotools/source/i18n/charclass.cxx                   |  1 -
 unotools/source/i18n/localedatawrapper.cxx           |  5 ++---
 unotools/source/i18n/nativenumberwrapper.cxx         |  1 -
 unotools/source/i18n/resmgr.cxx                      |  2 --
 unotools/source/i18n/textsearch.cxx                  |  1 -
 unotools/source/i18n/transliterationwrapper.cxx      |  1 -
 unotools/source/misc/ServiceDocumenter.cxx           |  1 -
 unotools/source/misc/mediadescriptor.cxx             |  1 -
 unotools/source/misc/syslocale.cxx                   |  1 -
 unotools/source/misc/wincodepage.cxx                 |  1 -
 unotools/source/ucbhelper/ucbhelper.cxx              |  2 --
 unoxml/qa/unit/domtest.cxx                           |  2 +-
 unoxml/source/dom/documentbuilder.cxx                |  2 --
 unoxml/source/dom/documentbuilder.hxx                |  2 --
 unoxml/source/dom/saxbuilder.cxx                     |  1 -
 unoxml/source/dom/saxbuilder.hxx                     |  1 -
 unoxml/source/rdf/librdf_repository.cxx              |  1 -
 unoxml/source/xpath/xpathapi.hxx                     |  1 -
 uui/inc/ids.hrc                                      |  1 +
 uui/source/passwordcontainer.cxx                     |  2 --
 uui/source/passwordcontainer.hxx                     |  4 ----
 uui/source/reloadeditable.cxx                        |  1 -
 uui/source/secmacrowarnings.cxx                      |  1 -
 108 files changed, 48 insertions(+), 170 deletions(-)
 create mode 100644 unodevtools/IwyuFilter_unodevtools.yaml

diff --git a/UnoControls/IwyuFilter_UnoControls.yaml b/UnoControls/IwyuFilter_UnoControls.yaml
index f49bd7b8c20e..7f18b36621cb 100644
--- a/UnoControls/IwyuFilter_UnoControls.yaml
+++ b/UnoControls/IwyuFilter_UnoControls.yaml
@@ -10,3 +10,9 @@ excludelist:
     UnoControls/source/controls/framecontrol.cxx:
     # Needed for use in cppu::UnoType template
     - com/sun/star/awt/XControlContainer.hpp
+    UnoControls/source/controls/progressbar.cxx:
+    # Actually used
+    - com/sun/star/awt/XGraphics.hpp
+    UnoControls/source/controls/progressmonitor.cxx:
+    # Actually used
+    - com/sun/star/awt/XGraphics.hpp
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
index 507dd2be394a..3d5b08f81d7f 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <memory>
 #include <vector>
 
 #include "basecontrol.hxx"
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index a45f0ed6856f..30f2dd4414e0 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XView.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <osl/mutex.hxx>
 #include <cppuhelper/component.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <rtl/ref.hxx>
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index 9d88ad8312f1..fbb0b13421c1 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -24,8 +24,6 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/typeprovider.hxx>
 
-#include <limits.h>
-
 using namespace ::cppu;
 using namespace ::osl;
 using namespace ::com::sun::star::uno;
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 24f06380382b..90d1ffa18873 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -25,7 +25,6 @@
 #include <rtl/ref.hxx>
 
 #include <vector>
-#include <memory>
 
 #include <basecontainercontrol.hxx>
 
diff --git a/ucb/IwyuFilter_ucb.yaml b/ucb/IwyuFilter_ucb.yaml
index 1b242fd561b3..8501abb22fd0 100644
--- a/ucb/IwyuFilter_ucb.yaml
+++ b/ucb/IwyuFilter_ucb.yaml
@@ -17,10 +17,14 @@ excludelist:
     # Needed for UnoType
     - com/sun/star/beans/XPropertySetInfo.hpp
     - com/sun/star/ucb/XCommandInfo.hpp
+    # Needed for boost::make_shared
+    - boost/make_shared.hpp
     ucb/source/ucp/cmis/cmis_repo_content.cxx:
     # Needed for UnoType
     - com/sun/star/ucb/XCommandInfo.hpp
     - com/sun/star/beans/XPropertySetInfo.hpp
+    # Needed for boost::make_shared
+    - boost/make_shared.hpp
     ucb/source/ucp/ext/ucpext_content.cxx:
     # Needed for UnoType
     - com/sun/star/beans/XPropertySetInfo.hpp
@@ -61,3 +65,10 @@ excludelist:
     ucb/source/ucp/webdav-curl/webdavcontent.cxx:
     # Needed for UnoType
     - com/sun/star/ucb/XCommandInfo.hpp
+    ucb/source/ucp/webdav-curl/CurlSession.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
+    ucb/source/ucp/webdav-curl/webdavcontent.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    - com/sun/star/ucb/XCommandInfo.hpp
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index efc4966f3046..2f6ee771a640 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -21,10 +21,8 @@
 
 #include "contentresultsetwrapper.hxx"
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/ucb/XFetchProvider.hpp>
 #include <com/sun/star/ucb/XFetchProviderForContentAccess.hpp>
 #include <com/sun/star/ucb/FetchResult.hpp>
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 8c1aba4201a6..592a8d8afc06 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -20,10 +20,8 @@
 #pragma once
 
 #include "contentresultsetwrapper.hxx"
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/ucb/XFetchProvider.hpp>
 #include <com/sun/star/ucb/XFetchProviderForContentAccess.hpp>
 #include <com/sun/star/ucb/XCachedContentResultSetStubFactory.hpp>
diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx
index 27b037718b34..76075b98eb20 100644
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
@@ -20,8 +20,6 @@
 #pragma once
 
 #include "dynamicresultsetwrapper.hxx"
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/ucb/XContentIdentifierMapping.hpp>
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index d6386625f01b..b148efec9d5e 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -20,8 +20,6 @@
 #pragma once
 
 #include "dynamicresultsetwrapper.hxx"
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/ucb/XCachedDynamicResultSetStubFactory.hpp>
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 8e8542e98f26..0106b3a37551 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -23,7 +23,6 @@
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
 #include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx
index ce39650317c0..235e3181a816 100644
--- a/ucb/source/cacher/contentresultsetwrapper.hxx
+++ b/ucb/source/cacher/contentresultsetwrapper.hxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <cppuhelper/interfacecontainer.h>
 #include <comphelper/interfacecontainer3.hxx>
 #include <comphelper/multiinterfacecontainer3.hxx>
 #include <memory>
diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx
index 8896cab85fe1..0cc4b46f422c 100644
--- a/ucb/source/core/cmdenv.hxx
+++ b/ucb/source/core/cmdenv.hxx
@@ -22,9 +22,7 @@
 #include <comphelper/compbase.hxx>
 
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 
 namespace ucb_cmdenv {
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index b71fdfe7031c..1654fa342158 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -19,10 +19,8 @@
 
 #pragma once
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/ucb/XContentProviderFactory.hpp>
 #include <com/sun/star/ucb/XContentProvider.hpp>
 #include <com/sun/star/ucb/XParameterizedContentProvider.hpp>
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index ed8ddce76525..48d02b3dfdae 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -32,7 +32,6 @@
 #include <sal/log.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/ucb/DuplicateProviderException.hpp>
@@ -44,9 +43,9 @@
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/uno/Any.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <ucbhelper/cancelcommandexecution.hxx>
-#include <ucbhelper/macros.hxx>
 #include <tools/diagnose_ex.h>
 #include "identify.hxx"
 #include "ucbcmds.hxx"
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index ea6d3800033d..49c6e0b37d8d 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -22,10 +22,8 @@
 
 #include <com/sun/star/ucb/CheckinArgument.hpp>
 #include <com/sun/star/ucb/XUniversalContentBroker.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/XChangesListener.hpp>
 #include <com/sun/star/util/XChangesNotifier.hpp>
 
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 77b6ca347754..88c187199665 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <memory>
 #include <osl/diagnose.h>
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/implbase.hxx>
diff --git a/ucb/source/core/ucbcmds.hxx b/ucb/source/core/ucbcmds.hxx
index c34a3564d4ae..063c79e5f998 100644
--- a/ucb/source/core/ucbcmds.hxx
+++ b/ucb/source/core/ucbcmds.hxx
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <rtl/ustring.hxx>
 
 // Definitions for the commands supported by the UCB.
 
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 1260e406c1e1..808923adafd4 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/ucb/CrossReference.hpp>
 #include <com/sun/star/util/DateTime.hpp>
@@ -34,8 +33,9 @@
 #include <com/sun/star/ucb/SynchronizePolicy.hpp>
 #include <com/sun/star/ucb/VerificationMode.hpp>
 #include <com/sun/star/ucb/XDataContainer.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
-#include <ucbhelper/macros.hxx>
 
 #include "ucbprops.hxx"
 
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 328b4ef2c3dc..a78222317529 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <cppuhelper/implbase.hxx>
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index fcdc0138ede0..bac04d27d2da 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -30,7 +30,6 @@
 #include <tools/diagnose_ex.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ref.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <com/sun/star/beans/IllegalTypeException.hpp>
@@ -44,9 +43,9 @@
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weak.hxx>
-#include <ucbhelper/macros.hxx>
 #include "ucbstore.hxx"
 
 using namespace com::sun::star::beans;
diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index 0042bbafadc2..8b8597f756e4 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -21,7 +21,6 @@
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/ucb/XPropertySetRegistryFactory.hpp>
@@ -36,6 +35,7 @@
 #include <comphelper/interfacecontainer3.hxx>
 #include <comphelper/multiinterfacecontainer3.hxx>
 #include <comphelper/compbase.hxx>
+#include <rtl/ref.hxx>
 #include <unordered_map>
 
 
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 2625fd781a24..2f7039b55a0a 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "sortdynres.hxx"
-#include <comphelper/interfacecontainer2.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/ucb/ContentResultSetCapability.hpp>
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 0af835978c9a..e5b7ce7465c6 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <vector>
 #include "sortresult.hxx"
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
@@ -26,8 +25,6 @@
 #include <com/sun/star/ucb/ListActionType.hpp>
 #include <com/sun/star/ucb/XAnyCompare.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
-#include <comphelper/interfacecontainer2.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <tools/diagnose_ex.h>
 #include <memory>
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 9cc4e5ca2511..60e62315d869 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <cstdio>
 #include <string_view>
 
 #include <boost/make_shared.hpp>
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index 3807ebeac391..290b9c755629 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -10,7 +10,6 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
-#include <ucbhelper/contenthelper.hxx>
 #include <ucbhelper/macros.hxx>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
diff --git a/ucb/source/ucp/cmis/cmis_strings.hxx b/ucb/source/ucp/cmis/cmis_strings.hxx
index 0a7b81d24e70..8b93198560b8 100644
--- a/ucb/source/ucp/cmis/cmis_strings.hxx
+++ b/ucb/source/ucp/cmis/cmis_strings.hxx
@@ -12,6 +12,8 @@
 
 #pragma once
 
+#include <rtl/ustring.hxx>
+
 inline constexpr OUStringLiteral CMIS_TYPE_STRING = u"String";
 inline constexpr OUStringLiteral CMIS_TYPE_INTEGER = u"Integer";
 inline constexpr OUStringLiteral CMIS_TYPE_DECIMAL = u"Decimal";
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 2838c5cb728b..ab9080f45ea3 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -19,10 +19,7 @@
 
 
 #include <rtl/uri.hxx>
-#include <osl/mutex.hxx>
 #include <comphelper/compbase.hxx>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <ucbhelper/content.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 214ca98045a9..6bcfedd37c78 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/lang/IllegalAccessException.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/ucb/XCommandInfo.hpp>
 #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
index 8d505c94f7dd..3c515358f82b 100644
--- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
@@ -24,7 +24,6 @@
 
 #include <com/sun/star/deployment/PackageInformationProvider.hpp>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
-#include <com/sun/star/ucb/ResultSetException.hpp>
 #include <o3tl/string_view.hxx>
 #include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/providerhelper.hxx>
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx
index 12a5b8ae26af..f0118d6798aa 100644
--- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include "ucpext_content.hxx"
+
 #include <rtl/ref.hxx>
 #include <ucbhelper/resultset.hxx>
 
diff --git a/ucb/source/ucp/ext/ucpext_resultset.hxx b/ucb/source/ucp/ext/ucpext_resultset.hxx
index ef8c19886134..abd9fee9aeb7 100644
--- a/ucb/source/ucp/ext/ucpext_resultset.hxx
+++ b/ucb/source/ucp/ext/ucpext_resultset.hxx
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include "ucpext_content.hxx"
+
 #include <rtl/ref.hxx>
 #include <ucbhelper/resultsethelper.hxx>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 9bb4fc26ec66..fe6086160ac6 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <comphelper/fileurl.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include "filglob.hxx"
 #include "filid.hxx"
diff --git a/ucb/source/ucp/file/filinl.hxx b/ucb/source/ucp/file/filinl.hxx
index c2d584f194cd..b29d938def1c 100644
--- a/ucb/source/ucp/file/filinl.hxx
+++ b/ucb/source/ucp/file/filinl.hxx
@@ -18,6 +18,10 @@
  */
 #pragma once
 
+#include "filtask.hxx"
+
+using namespace fileaccess;
+
 inline const bool& TaskManager::MyProperty::IsNative() const
 {
     return isNative;
diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx
index f51a0e67332c..898a57dd03a6 100644
--- a/ucb/source/ucp/file/filnot.hxx
+++ b/ucb/source/ucp/file/filnot.hxx
@@ -19,13 +19,11 @@
 #pragma once
 
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/beans/XPropertySetInfoChangeListener.hpp>
 #include <com/sun/star/beans/XPropertiesChangeListener.hpp>
 #include <com/sun/star/ucb/XContentIdentifier.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
-#include <memory>
 #include <optional>
 #include <unordered_map>
 #include <vector>
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 4145080fb18f..eab4ec5300b7 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/ucb/FileSystemNotation.hpp>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include "filglob.hxx"
 #include "filid.hxx"
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index c12a87867224..530010be1f4d 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -19,11 +19,8 @@
 
 #pragma once
 
-#include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ucb/XContentProvider.hpp>
 #include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 7a237da55258..5200fcfd1acf 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -26,7 +26,6 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/weak.hxx>
 #include "ftpcontentprovider.hxx"
 #include "ftpcontent.hxx"
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 798dd9bed3a5..7910a293d570 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -26,8 +26,6 @@
 #include <sal/config.h>
 #include <sal/log.hxx>
 
-#include <vector>
-
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/ucb/OpenMode.hpp>
 #include <string.h>
diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx
index 5f895f2e3d93..f90d09805b3e 100644
--- a/ucb/source/ucp/gio/gio_provider.hxx
+++ b/ucb/source/ucp/gio/gio_provider.hxx
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <ucbhelper/providerhelper.hxx>
 
 namespace gio
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx
index f8882650fc12..34e24cdb6c35 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx
@@ -23,7 +23,6 @@
 #include <osl/mutex.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <memory>
 
 namespace com::sun::star {
     namespace container {
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index afd9f350ca42..c42ebe2af20e 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -29,7 +29,6 @@
 #include "hierarchydatasource.hxx"
 #include <osl/diagnose.h>
 
-#include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index 54ff6c309057..39dfdb8a424d 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <comphelper/interfacecontainer3.hxx>
 #include <cppuhelper/implbase.hxx>
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
index 34bfe557c04c..77747883bcbb 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
@@ -24,8 +24,6 @@
 
  *************************************************************************/
 
-#include <vector>
-
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
 #include <ucbhelper/contentidentifier.hxx>
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index 5ac80de3faed..cbd2911d4ad0 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -21,7 +21,6 @@
 
 #include <ucbhelper/providerhelper.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <unordered_map>
 
diff --git a/ucb/source/ucp/image/ucpimage.cxx b/ucb/source/ucp/image/ucpimage.cxx
index 478509a716a3..db8ca00d414b 100644
--- a/ucb/source/ucp/image/ucpimage.cxx
+++ b/ucb/source/ucp/image/ucpimage.cxx
@@ -18,7 +18,6 @@
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
 #include <comphelper/compbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/ImageTree.hxx>
diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx
index 115d30e9c71b..37584e9734c7 100644
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
@@ -21,8 +21,6 @@
 
 #include <memory>
 #include <ucbhelper/providerhelper.hxx>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include "pkguri.hxx"
 
 namespace com::sun::star::container {
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index 9347fa34472b..8873e1da29ef 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
@@ -25,7 +25,6 @@
  *************************************************************************/
 
 #include <optional>
-#include <vector>
 
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
 #include <com/sun/star/ucb/ResultSetException.hpp>
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
index d1983e921250..e9f13800284d 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
@@ -22,7 +22,6 @@
 #include <rtl/ref.hxx>
 #include <ucbhelper/resultset.hxx>
 #include <optional>
-#include <memory>
 #include <vector>
 #include <string_view>
 
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
index 84d59df3d378..cd40d6d0e75c 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
@@ -24,8 +24,6 @@
 
  *************************************************************************/
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 813b9d1103d9..95ffa789f730 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -26,8 +26,6 @@
 #include <rtl/ref.hxx>
 #include <com/sun/star/frame/XTransientDocumentsDocumentContentFactory.hpp>
 #include <com/sun/star/frame/XTransientDocumentsDocumentContentIdentifierFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <ucbhelper/providerhelper.hxx>
 #include "tdoc_uri.hxx"
 #include "tdoc_docmgr.hxx"
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
index ba311953dd47..4842a3711601 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
@@ -33,7 +33,6 @@
 
 #include "tdoc_storage.hxx"
 
-#include <memory>
 #include <mutex>
 
 namespace tdoc_ucp {
diff --git a/ucb/source/ucp/webdav-curl/ContentProperties.cxx b/ucb/source/ucp/webdav-curl/ContentProperties.cxx
index 59773db1cbdc..397d225f2068 100644
--- a/ucb/source/ucp/webdav-curl/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav-curl/ContentProperties.cxx
@@ -26,8 +26,6 @@
 #include "webdavprovider.hxx"
 #include "ContentProperties.hxx"
 
-#include <sal/log.hxx>
-
 using namespace com::sun::star;
 using namespace http_dav_ucp;
 
diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx b/ucb/source/ucp/webdav-curl/CurlSession.cxx
index 3e48874c3108..7ad84fb9b217 100644
--- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
+++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
@@ -30,6 +30,7 @@
 
 #include <osl/time.h>
 #include <sal/log.hxx>
+#include <rtl/uri.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <config_version.h>
@@ -37,7 +38,6 @@
 #include <map>
 #include <optional>
 #include <tuple>
-#include <vector>
 
 using namespace ::com::sun::star;
 
diff --git a/ucb/source/ucp/webdav-curl/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav-curl/DAVRequestEnvironment.hxx
index dd2f4f9cf0bc..88cdebde5a90 100644
--- a/ucb/source/ucp/webdav-curl/DAVRequestEnvironment.hxx
+++ b/ucb/source/ucp/webdav-curl/DAVRequestEnvironment.hxx
@@ -22,7 +22,6 @@
 
 #include <vector>
 #include <rtl/ref.hxx>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include "DAVAuthListener.hxx"
 
 namespace http_dav_ucp
diff --git a/ucb/source/ucp/webdav-curl/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-curl/DAVResourceAccess.cxx
index d1adcdd81e1a..0119495e3bbf 100644
--- a/ucb/source/ucp/webdav-curl/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav-curl/DAVResourceAccess.cxx
@@ -23,7 +23,6 @@
 
 #include <ucbhelper/simpleauthenticationrequest.hxx>
 #include <comphelper/seekableinput.hxx>
-#include <sal/log.hxx>
 
 #include "DAVAuthListenerImpl.hxx"
 #include "DAVResourceAccess.hxx"
diff --git a/ucb/source/ucp/webdav-curl/DAVTypes.hxx b/ucb/source/ucp/webdav-curl/DAVTypes.hxx
index ac43becc79c5..f09bb6b2e0a0 100644
--- a/ucb/source/ucp/webdav-curl/DAVTypes.hxx
+++ b/ucb/source/ucp/webdav-curl/DAVTypes.hxx
@@ -21,10 +21,8 @@
 #pragma once
 
 #include <memory>
-#include <list>
 #include <map>
 #include <mutex>
-#include <rtl/uri.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
diff --git a/ucb/source/ucp/webdav-curl/PropfindCache.hxx b/ucb/source/ucp/webdav-curl/PropfindCache.hxx
index 1f4d68afd688..b55ef2a51d11 100644
--- a/ucb/source/ucp/webdav-curl/PropfindCache.hxx
+++ b/ucb/source/ucp/webdav-curl/PropfindCache.hxx
@@ -13,7 +13,6 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <mutex>
-#include <list>
 #include <map>
 #include <vector>
 
diff --git a/ucb/source/ucp/webdav-curl/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-curl/UCBDeadPropertyValue.cxx
index 4f3460a26785..03b4f0008ce9 100644
--- a/ucb/source/ucp/webdav-curl/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav-curl/UCBDeadPropertyValue.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include "UCBDeadPropertyValue.hxx"
 
diff --git a/ucb/source/ucp/webdav-curl/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav-curl/UCBDeadPropertyValue.hxx
index 8b696ed12da3..03240d010df1 100644
--- a/ucb/source/ucp/webdav-curl/UCBDeadPropertyValue.hxx
+++ b/ucb/source/ucp/webdav-curl/UCBDeadPropertyValue.hxx
@@ -23,7 +23,6 @@
 #include <optional>
 #include <utility>
 
-#include <rtl/string.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
 namespace http_dav_ucp
diff --git a/ucbhelper/IwyuFilter_ucbhelper.yaml b/ucbhelper/IwyuFilter_ucbhelper.yaml
index d566f7a0e437..5193d909b72e 100644
--- a/ucbhelper/IwyuFilter_ucbhelper.yaml
+++ b/ucbhelper/IwyuFilter_ucbhelper.yaml
@@ -18,3 +18,6 @@ excludelist:
     - com/sun/star/util/Date.hpp
     - com/sun/star/util/Time.hpp
     - com/sun/star/util/DateTime.hpp
+    ucbhelper/source/provider/simpleioerrorrequest.cxx:
+    # Actually used
+    - com/sun/star/ucb/XCommandProcessor.hpp
diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx
index 6f14d953b766..d4c13b2c0144 100644
--- a/ucbhelper/source/provider/contentidentifier.cxx
+++ b/ucbhelper/source/provider/contentidentifier.cxx
@@ -24,8 +24,6 @@
 
  *************************************************************************/
 #include <ucbhelper/contentidentifier.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/queryinterface.hxx>
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx
index 5ea61e825e8b..b5ca80b79d0b 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -27,11 +27,8 @@
 #include <com/sun/star/ucb/XPersistentPropertySet.hpp>
 #include <com/sun/star/ucb/XCommandInfo.hpp>
 
-#include <cppuhelper/queryinterface.hxx>
-#include <osl/mutex.hxx>
 #include <ucbhelper/contenthelper.hxx>
 #include "contentinfo.hxx"
-#include <ucbhelper/macros.hxx>
 
 using namespace com::sun::star;
 
diff --git a/ucbhelper/source/provider/contentinfo.hxx b/ucbhelper/source/provider/contentinfo.hxx
index eaff22c4ea05..9223848321ac 100644
--- a/ucbhelper/source/provider/contentinfo.hxx
+++ b/ucbhelper/source/provider/contentinfo.hxx
@@ -22,7 +22,6 @@
 
 #include <optional>
 #include <com/sun/star/ucb/XCommandInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <cppuhelper/implbase.hxx>
 
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 1c2345a8c4c0..f2601dcb6bd7 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -33,11 +33,8 @@
 #include <com/sun/star/script/Converter.hpp>
 
 #include <osl/diagnose.h>
-#include <osl/mutex.hxx>
 #include <ucbhelper/propertyvalueset.hxx>
-#include <ucbhelper/macros.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <cppuhelper/queryinterface.hxx>
 
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index 438468a36c90..c0bbc86166c2 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.cxx
@@ -28,10 +28,8 @@
 #include <com/sun/star/ucb/XPropertySetRegistry.hpp>
 #include <com/sun/star/ucb/XPropertySetRegistryFactory.hpp>
 #include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/queryinterface.hxx>
 #include <ucbhelper/contenthelper.hxx>
 #include <ucbhelper/providerhelper.hxx>
-#include <ucbhelper/macros.hxx>
 
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index 6d750c82dbba..60f8977d1852 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -32,10 +32,8 @@
 #include <com/sun/star/ucb/WelcomeDynamicResultSetStruct.hpp>
 #include <com/sun/star/ucb/CachedDynamicResultSetStubFactory.hpp>
 #include <com/sun/star/ucb/XSourceInitialization.hpp>
-#include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/queryinterface.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <ucbhelper/resultsethelper.hxx>
-#include <ucbhelper/macros.hxx>
 
 #include <osl/diagnose.h>
 
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index 1b989229c60e..40f69053f7df 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -38,9 +38,7 @@
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/ucb/PropertiesManager.hpp>
-#include <ucbhelper/macros.hxx>
 #include <ucbhelper/resultsetmetadata.hxx>
-#include <cppuhelper/queryinterface.hxx>
 #include <mutex>
 
 using namespace com::sun::star::beans;
diff --git a/unodevtools/IwyuFilter_unodevtools.yaml b/unodevtools/IwyuFilter_unodevtools.yaml
new file mode 100644
index 000000000000..5e1f0b518aff
--- /dev/null
+++ b/unodevtools/IwyuFilter_unodevtools.yaml
@@ -0,0 +1,2 @@
+---
+assumeFilename: unodevtools/source/skeletonmaker/skeletonmaker.cxx
diff --git a/unodevtools/inc/options.hxx b/unodevtools/inc/options.hxx
index 5094a11ef5e1..8cbaf50e190b 100644
--- a/unodevtools/inc/options.hxx
+++ b/unodevtools/inc/options.hxx
@@ -23,7 +23,7 @@
 
 #include <string_view>
 
-#include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.hxx>
 
 namespace unodevtools {
 
diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
index cc68d744066f..664bc90888aa 100644
--- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx
+++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/thread.hxx>
-
-#include <codemaker/commonjava.hxx>
 #include <codemaker/commoncpp.hxx>
 #include <codemaker/generatedtypeset.hxx>
 #include <codemaker/global.hxx>
diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.hxx b/unodevtools/source/skeletonmaker/skeletoncommon.hxx
index b0bf3e5d01c7..a6ff05069613 100644
--- a/unodevtools/source/skeletonmaker/skeletoncommon.hxx
+++ b/unodevtools/source/skeletonmaker/skeletoncommon.hxx
@@ -23,7 +23,6 @@
 #include <rtl/ref.hxx>
 #include <rtl/string.hxx>
 #include <codemaker/typemanager.hxx>
-#include <codemaker/unotype.hxx>
 #include <unoidl/unoidl.hxx>
 
 #include <fstream>
diff --git a/unodevtools/source/unodevtools/options.cxx b/unodevtools/source/unodevtools/options.cxx
index 8cd2b652f8b0..290f70ce06ce 100644
--- a/unodevtools/source/unodevtools/options.cxx
+++ b/unodevtools/source/unodevtools/options.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <stdio.h>
-
 #include <codemaker/global.hxx>
 #include <o3tl/string_view.hxx>
 #include <rtl/ustring.hxx>
diff --git a/unotools/IwyuFilter_unotools.yaml b/unotools/IwyuFilter_unotools.yaml
index 63574a54c7fe..0a3b6eeff08e 100644
--- a/unotools/IwyuFilter_unotools.yaml
+++ b/unotools/IwyuFilter_unotools.yaml
@@ -38,4 +38,6 @@ excludelist:
     unotools/source/ucbhelper/ucbstreamhelper.cxx:
     # Needed for direct member access
     - com/sun/star/beans/PropertyValue.hpp
-
+    unotools/source/misc/datetime.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index b12cf6174d58..affcaf5a38e0 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -31,7 +31,6 @@
 #include "itemholder1.hxx"
 
 #include <algorithm>
-#include <vector>
 
 using namespace ::std;
 using namespace ::utl;
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index d6741142a9a5..2632a79fb3b7 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -38,7 +38,6 @@
 #include <osl/diagnose.h>
 #include <comphelper/sequence.hxx>
 #include <comphelper/solarmutex.hxx>
-#include <rtl/ref.hxx>
 #include <tools/diagnose_ex.h>
 
 using namespace utl;
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index 2cdbc263b2be..127cc685801d 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -20,11 +20,8 @@
 #include <sal/config.h>
 
 #include <osl/file.hxx>
-#include <sal/log.hxx>
 #include <unotools/defaultoptions.hxx>
 #include <unotools/pathoptions.hxx>
-#include <tools/debug.hxx>
-#include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <officecfg/Office/Common.hxx>
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index 3872d5a92120..60c07baacafb 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -20,15 +20,12 @@
 #include <sal/config.h>
 
 #include <o3tl/string_view.hxx>
-#include <sal/log.hxx>
 #include <unotools/dynamicmenuoptions.hxx>
 #include <tools/debug.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <comphelper/string.hxx>
 
 #include <vector>
 #include <algorithm>
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index c317aff79918..de8186795cda 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -21,12 +21,6 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include <cassert>
-#include <algorithm>
-
-#include "itemholder1.hxx"
-
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -36,7 +30,6 @@
 #include <tools/diagnose_ex.h>
 #include <optional>
 
-using namespace ::utl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx
index 5931026995ac..88ab894491b0 100644
--- a/unotools/source/config/itemholder1.cxx
+++ b/unotools/source/config/itemholder1.cxx
@@ -26,19 +26,12 @@
 #include <unotools/useroptions.hxx>
 #include <unotools/cmdoptions.hxx>
 #include <unotools/compatibility.hxx>
-#include <unotools/defaultoptions.hxx>
-#include <unotools/dynamicmenuoptions.hxx>
-#include <unotools/historyoptions.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/pathoptions.hxx>
-#include <unotools/optionsdlg.hxx>
-#include <unotools/securityoptions.hxx>
-#include <unotools/viewoptions.hxx>
 #include <unotools/options.hxx>
 #include <unotools/syslocaleoptions.hxx>
 #include <rtl/ref.hxx>
-#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
 
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 27ddbed79c24..8e6feef618ab 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -43,7 +43,6 @@
 
 #include <set>
 #include <unordered_map>
-#include <vector>
 
 using namespace osl;
 using namespace utl;
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 6bac9ea28d04..b91ba8639619 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -22,14 +22,7 @@
 #include <sal/log.hxx>
 #include <unotools/saveopt.hxx>
 #include <unotools/configmgr.hxx>
-#include <unotools/configitem.hxx>
-#include <tools/debug.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
 
-#include <osl/diagnose.h>
-#include <osl/mutex.hxx>
-#include <officecfg/Office/Recovery.hxx>
 #include <officecfg/Office/Common.hxx>
 
 using namespace utl;
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index 8dc0a8ac8461..4749065fb431 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -21,7 +21,6 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/ucbhelper.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index b26d2a5015bc..d605e6662e18 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -22,7 +22,6 @@
 #include <unotools/useroptions.hxx>
 #include <unotools/syslocale.hxx>
 #include <com/sun/star/uno/Any.hxx>
-#include <osl/mutex.hxx>
 #include "itemholder1.hxx"
 
 #include <cppuhelper/implbase.hxx>
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 4fff44a2051a..de72225876e3 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -24,8 +24,6 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <osl/diagnose.h>
-#include <sal/log.hxx>
 #include <unotools/configmgr.hxx>
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx
index dee05388e150..e11ffb6e27d0 100644
--- a/unotools/source/i18n/charclass.cxx
+++ b/unotools/source/i18n/charclass.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <comphelper/processfactory.hxx>
-#include <sal/log.hxx>
 #include <unotools/charclass.hxx>
 #include <rtl/character.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 83a2d65ac41f..170e826e7eed 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -23,7 +23,6 @@
 
 #include <sal/log.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <unotools/calendarwrapper.hxx>
 #include <unotools/digitgroupingiterator.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/debug.hxx>
@@ -32,8 +31,6 @@
 #include <com/sun/star/i18n/KNumberFormatUsage.hpp>
 #include <com/sun/star/i18n/KNumberFormatType.hpp>
 #include <com/sun/star/i18n/LocaleData2.hpp>
-#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
-#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
 #include <com/sun/star/i18n/NumberFormatIndex.hpp>
 #include <com/sun/star/i18n/NumberFormatMapper.hpp>
 
@@ -41,6 +38,8 @@
 #include <comphelper/sequence.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
+#include <tools/date.hxx>
+#include <tools/time.hxx>
 
 const sal_uInt16 nCurrFormatDefault = 0;
 
diff --git a/unotools/source/i18n/nativenumberwrapper.cxx b/unotools/source/i18n/nativenumberwrapper.cxx
index 5c1bb4c0b5de..9c7b7d422919 100644
--- a/unotools/source/i18n/nativenumberwrapper.cxx
+++ b/unotools/source/i18n/nativenumberwrapper.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <sal/log.hxx>
 #include <unotools/nativenumberwrapper.hxx>
 #include <com/sun/star/i18n/NativeNumberSupplier2.hpp>
 #include <tools/diagnose_ex.h>
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index a10b4710ad8d..fb6d32a45d6b 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -51,9 +51,7 @@
 #include <boost/locale.hpp>
 #include <boost/locale/gnu_gettext.hpp>
 
-#include <array>
 #include <unordered_map>
-#include <memory>
 
 #ifdef ANDROID
 #include <osl/detail/android-bootstrap.h>
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 0ed0539b0e17..79d5cc68f580 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/util/TextSearch2.hpp>
 #include <com/sun/star/util/SearchAlgorithms2.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
-#include <sal/log.hxx>
 #include <unotools/charclass.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/textsearch.hxx>
diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx
index ff6f4933d88c..904ec82dc326 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <sal/log.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nutil/transliteration.hxx>
diff --git a/unotools/source/misc/ServiceDocumenter.cxx b/unotools/source/misc/ServiceDocumenter.cxx
index 695272641080..0bf1ce9fa52f 100644
--- a/unotools/source/misc/ServiceDocumenter.cxx
+++ b/unotools/source/misc/ServiceDocumenter.cxx
@@ -11,7 +11,6 @@
 #include <com/sun/star/system/XSystemShellExecute.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/supportsservice.hxx>
-#include <rtl/ref.hxx>
 
 using namespace com::sun::star;
 using uno::Reference;
diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx
index 348fa8fe7673..55a066cfe58b 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -28,7 +28,6 @@
 
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/io/XActiveDataSink.hpp>
diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index f6fd3c18a45b..889d9b34688f 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -25,7 +25,6 @@
 #include <unotools/syslocale.hxx>
 #include <unotools/syslocaleoptions.hxx>
 #include <comphelper/lok.hxx>
-#include <comphelper/sequence.hxx>
 #include <rtl/tencinfo.h>
 #include <rtl/locale.h>
 #include <osl/thread.h>
diff --git a/unotools/source/misc/wincodepage.cxx b/unotools/source/misc/wincodepage.cxx
index a5ba6d428a7d..79353e47ce94 100644
--- a/unotools/source/misc/wincodepage.cxx
+++ b/unotools/source/misc/wincodepage.cxx
@@ -12,7 +12,6 @@
 #include <string_view>
 
 #include <unotools/wincodepage.hxx>
-#include <rtl/string.h>
 #include <rtl/textenc.h>
 
 namespace{
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index f91fac4e921b..e6a31ef318bb 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -41,12 +41,10 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/simplefileaccessinteraction.hxx>
 #include <osl/file.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
-#include <sal/types.h>
 #include <tools/datetime.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx
index 3a715a9ed314..8aa2ba4b737f 100644
--- a/unoxml/qa/unit/domtest.cxx
+++ b/unoxml/qa/unit/domtest.cxx
@@ -26,7 +26,7 @@
 #include <cppunit/plugin/TestPlugIn.h>
 #include <test/bootstrapfixture.hxx>
 
-#include <com/sun/star/xml/dom/DocumentBuilder.hpp>
+#include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
 #include <com/sun/star/xml/sax/FastToken.hpp>
 #include <com/sun/star/xml/sax/XSAXSerializable.hpp>
 #include <com/sun/star/xml/sax/XFastSAXSerializable.hpp>
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
index 8139a4c7d8f1..90de083f25c8 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -25,8 +25,6 @@
 
 #include <memory>
 
-#include <rtl/ustrbuf.hxx>
-#include <osl/diagnose.h>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/unoxml/source/dom/documentbuilder.hxx b/unoxml/source/dom/documentbuilder.hxx
index 4e3d123094f5..b29e0410e76e 100644
--- a/unoxml/source/dom/documentbuilder.hxx
+++ b/unoxml/source/dom/documentbuilder.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 
-#include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
 #include <com/sun/star/xml/dom/XDOMImplementation.hpp>
@@ -34,7 +33,6 @@
 #include <com/sun/star/xml/sax/XErrorHandler.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <mutex>
 
 namespace DOM
diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx
index 43dd54ed3130..61b7a496a5a3 100644
--- a/unoxml/source/dom/saxbuilder.cxx
+++ b/unoxml/source/dom/saxbuilder.cxx
@@ -21,7 +21,6 @@
 
 #include <com/sun/star/xml/dom/DocumentBuilder.hpp>
 #include <com/sun/star/xml/sax/SAXException.hpp>
-#include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <sax/fastattribs.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/unoxml/source/dom/saxbuilder.hxx b/unoxml/source/dom/saxbuilder.hxx
index 2d092a67366d..83b82912e612 100644
--- a/unoxml/source/dom/saxbuilder.hxx
+++ b/unoxml/source/dom/saxbuilder.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 
-#include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/xml/dom/XSAXDocumentBuilder2.hpp>
 #include <com/sun/star/xml/dom/SAXDocumentBuilderState.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
index 176a871fa872..45648c342a8a 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -53,7 +53,6 @@
 #include <com/sun/star/rdf/Literal.hpp>
 
 #include <rtl/ref.hxx>
-#include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
diff --git a/unoxml/source/xpath/xpathapi.hxx b/unoxml/source/xpath/xpathapi.hxx
index 50fa1952eae8..bb37922c8bb7 100644
--- a/unoxml/source/xpath/xpathapi.hxx
+++ b/unoxml/source/xpath/xpathapi.hxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 
-#include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/xml/xpath/XXPathAPI.hpp>
 #include <com/sun/star/xml/dom/XNode.hpp>
 #include <com/sun/star/xml/dom/XNodeList.hpp>
diff --git a/uui/inc/ids.hrc b/uui/inc/ids.hrc
index 7359fe79f74f..4821c555918b 100644
--- a/uui/inc/ids.hrc
+++ b/uui/inc/ids.hrc
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <unotools/resmgr.hxx>
 #include <vcl/errcode.hxx>
 
 #include <utility>
diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx
index 2e2d0b0ac3cb..80ad1495a72d 100644
--- a/uui/source/passwordcontainer.cxx
+++ b/uui/source/passwordcontainer.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <comphelper/processfactory.hxx>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
 
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index a18951161a80..e111dcb34fc7 100644
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
@@ -22,7 +22,6 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/task/XInteractionHandler2.hpp>
 #include <com/sun/star/task/XPasswordContainer2.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -30,9 +29,6 @@
 namespace com {
     namespace sun {
         namespace star {
-            namespace lang {
-                class XMultiServiceFactory;
-            }
             namespace ucb {
                 class AuthenticationRequest;
                 class XInteractionSupplyAuthentication;
diff --git a/uui/source/reloadeditable.cxx b/uui/source/reloadeditable.cxx
index 9dad2e183abf..e665c9a8efc7 100644
--- a/uui/source/reloadeditable.cxx
+++ b/uui/source/reloadeditable.cxx
@@ -19,7 +19,6 @@
 
 #include <strings.hrc>
 #include "reloadeditable.hxx"
-#include <officecfg/Office/Common.hxx>
 #include <unotools/resmgr.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 601796e656a5..8f8e222c99e8 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -22,7 +22,6 @@
 #include <comphelper/processfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/file.hxx>
-#include <osl/file.h>
 #include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <unotools/securityoptions.hxx>