From c920592d2e431d96a1a8c5896a23d7dc59b01cf6 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Date: Fri, 25 Oct 2019 12:05:23 +0200
Subject: tdf#42949 Fix IWYU warnings in ucb/*/*cxx

Also recheck hxx files after recent changes in f-u-i

Note: to build ucb/source/ucp/webdav one needs to use the
--with-webdav=serf
configure option

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

Change-Id: I69c3a869394b0667b4d51e18e5293000872227a5
Reviewed-on: https://gerrit.libreoffice.org/81496
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 ucb/IwyuFilter_ucb.yaml                            | 76 ++++++++++++++++++++++
 ucb/qa/cppunit/webdav/webdav_options.cxx           |  2 -
 ucb/qa/cppunit/webdav/webdav_propfindcache.cxx     |  1 -
 ucb/source/cacher/cachedcontentresultset.cxx       |  4 +-
 ucb/source/cacher/cacheddynamicresultset.cxx       |  2 -
 ucb/source/cacher/cacheddynamicresultsetstub.cxx   |  2 -
 ucb/source/cacher/cacheserv.cxx                    |  2 -
 ucb/source/cacher/contentresultsetwrapper.cxx      |  4 --
 ucb/source/cacher/dynamicresultsetwrapper.cxx      |  2 -
 ucb/source/core/FileAccess.cxx                     |  3 -
 ucb/source/core/provprox.cxx                       |  1 -
 ucb/source/core/ucb.cxx                            |  5 --
 ucb/source/core/ucb.hxx                            |  1 -
 ucb/source/core/ucbcmds.cxx                        |  2 -
 ucb/source/core/ucbstore.cxx                       |  2 -
 ucb/source/sorter/sortdynres.cxx                   |  1 -
 ucb/source/sorter/sortresult.cxx                   |  2 -
 ucb/source/ucp/cmis/certvalidation_handler.cxx     |  1 -
 ucb/source/ucp/cmis/cmis_content.cxx               |  5 --
 ucb/source/ucp/cmis/cmis_datasupplier.cxx          |  6 --
 ucb/source/ucp/cmis/cmis_provider.cxx              |  2 -
 ucb/source/ucp/cmis/cmis_repo_content.cxx          |  5 --
 ucb/source/ucp/cmis/cmis_url.cxx                   | 11 ----
 ucb/source/ucp/expand/ucpexpand.cxx                |  3 -
 ucb/source/ucp/ext/ucpext_content.cxx              |  4 +-
 ucb/source/ucp/file/bc.cxx                         | 11 ----
 ucb/source/ucp/file/bc.hxx                         |  1 -
 ucb/source/ucp/file/filcmd.cxx                     |  2 -
 ucb/source/ucp/file/filglob.cxx                    |  4 --
 ucb/source/ucp/file/filid.cxx                      |  3 -
 ucb/source/ucp/file/filid.hxx                      |  1 -
 ucb/source/ucp/file/filinpstr.cxx                  |  5 +-
 ucb/source/ucp/file/filinsreq.cxx                  |  1 -
 ucb/source/ucp/file/filnot.cxx                     |  1 -
 ucb/source/ucp/file/filprp.cxx                     |  2 -
 ucb/source/ucp/file/filrow.cxx                     |  3 -
 ucb/source/ucp/file/filstr.cxx                     |  7 +-
 ucb/source/ucp/file/prov.cxx                       |  2 -
 ucb/source/ucp/ftp/ftpcontent.cxx                  |  6 --
 ucb/source/ucp/ftp/ftpcontentidentifier.cxx        |  4 --
 ucb/source/ucp/ftp/ftpcontentidentifier.hxx        |  1 -
 ucb/source/ucp/ftp/ftpcontentprovider.cxx          |  2 -
 ucb/source/ucp/ftp/ftpresultsetI.cxx               |  3 -
 ucb/source/ucp/ftp/ftpresultsetbase.cxx            |  3 -
 ucb/source/ucp/ftp/ftpservices.cxx                 |  1 -
 ucb/source/ucp/ftp/ftpurl.cxx                      |  2 -
 ucb/source/ucp/gio/gio_content.cxx                 | 17 +----
 ucb/source/ucp/gio/gio_datasupplier.cxx            |  3 -
 ucb/source/ucp/gio/gio_inputstream.cxx             |  3 -
 ucb/source/ucp/gio/gio_outputstream.cxx            |  3 -
 ucb/source/ucp/gio/gio_provider.cxx                |  2 -
 ucb/source/ucp/gio/gio_seekable.cxx                |  3 -
 ucb/source/ucp/hierarchy/hierarchycontent.cxx      |  4 --
 ucb/source/ucp/hierarchy/hierarchydata.cxx         |  2 -
 ucb/source/ucp/hierarchy/hierarchydatasource.cxx   |  1 -
 ucb/source/ucp/hierarchy/hierarchydatasource.hxx   |  1 -
 ucb/source/ucp/hierarchy/hierarchyprovider.cxx     |  1 -
 ucb/source/ucp/hierarchy/hierarchyuri.cxx          |  2 -
 ucb/source/ucp/package/pkgcontent.cxx              |  5 --
 ucb/source/ucp/package/pkgprovider.cxx             |  1 -
 ucb/source/ucp/package/pkgservices.cxx             |  1 -
 ucb/source/ucp/package/pkguri.cxx                  |  1 -
 ucb/source/ucp/tdoc/tdoc_content.cxx               |  5 --
 ucb/source/ucp/tdoc/tdoc_docmgr.cxx                |  1 -
 .../ucp/tdoc/tdoc_documentcontentfactory.cxx       |  1 -
 ucb/source/ucp/tdoc/tdoc_provider.cxx              |  4 --
 ucb/source/ucp/tdoc/tdoc_services.cxx              |  1 -
 ucb/source/ucp/tdoc/tdoc_storage.cxx               |  3 -
 ucb/source/ucp/tdoc/tdoc_uri.cxx                   |  1 -
 ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx   |  1 -
 ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx     |  2 -
 ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx |  1 -
 ucb/source/ucp/webdav-neon/NeonSession.cxx         |  3 -
 ucb/source/ucp/webdav-neon/NeonUri.cxx             |  1 -
 ucb/source/ucp/webdav-neon/webdavcontent.cxx       |  4 +-
 ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx   |  1 -
 ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx  |  1 -
 ucb/source/ucp/webdav-neon/webdavresultset.cxx     |  1 -
 ucb/source/ucp/webdav-neon/webdavservices.cxx      |  1 -
 ucb/source/ucp/webdav/DAVSessionFactory.cxx        |  1 -
 ucb/source/ucp/webdav/SerfSession.cxx              |  2 -
 ucb/source/ucp/webdav/SerfUri.cxx                  |  1 -
 ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx     |  1 -
 ucb/source/ucp/webdav/webdavcontent.cxx            |  1 -
 ucb/source/ucp/webdav/webdavcontentcaps.cxx        |  1 -
 ucb/source/ucp/webdav/webdavdatasupplier.cxx       |  1 -
 ucb/source/ucp/webdav/webdavprovider.cxx           |  4 --
 ucb/source/ucp/webdav/webdavresultset.cxx          |  1 -
 ucb/source/ucp/webdav/webdavservices.cxx           |  2 -
 89 files changed, 84 insertions(+), 227 deletions(-)

(limited to 'ucb')

diff --git a/ucb/IwyuFilter_ucb.yaml b/ucb/IwyuFilter_ucb.yaml
index a1bf73528e1e..812b811df49a 100644
--- a/ucb/IwyuFilter_ucb.yaml
+++ b/ucb/IwyuFilter_ucb.yaml
@@ -56,3 +56,79 @@ blacklist:
     ucb/source/ucp/webdav-neon/webdavprovider.hxx:
     # Needed for LGPL code licensing
     - config_lgpl.h
+    ucb/source/core/ucb.cxx:
+    # Needed for UnoType
+    - com/sun/star/ucb/XCommandInfo.hpp
+    ucb/source/ucp/cmis/cmis_content.cxx:
+    # Needed for UnoType
+    - com/sun/star/beans/XPropertySetInfo.hpp
+    - com/sun/star/ucb/XCommandInfo.hpp
+    ucb/source/ucp/cmis/cmis_repo_content.cxx:
+    # Needed for UnoType
+    - com/sun/star/ucb/XCommandInfo.hpp
+    - com/sun/star/beans/XPropertySetInfo.hpp
+    ucb/source/ucp/ext/ucpext_content.cxx:
+    # Needed for UnoType
+    - com/sun/star/beans/XPropertySetInfo.hpp
+    - com/sun/star/ucb/XCommandInfo.hpp
+    ucb/source/ucp/ftp/ftpcontent.cxx:
+    # Needed for UnoType
+    - com/sun/star/ucb/XCommandInfo.hpp
+    # Wrapper for external lib
+    - curl.hxx
+    ucb/source/ucp/ftp/ftploaderthread.cxx:
+    # Wrapper for external lib
+    - curl.hxx
+    ucb/source/ucp/gio/gio_content.cxx:
+    # Needed for UnoType
+    - com/sun/star/beans/PropertyValue.hpp
+    - com/sun/star/beans/XPropertySetInfo.hpp
+    - com/sun/star/ucb/XCommandInfo.hpp
+    ucb/source/ucp/hierarchy/hierarchydata.cxx:
+    # Actually in use
+    - com/sun/star/util/XOfficeInstallationDirectories.hpp
+    ucb/source/ucp/hierarchy/hierarchycontent.cxx:
+    # Needed for UnoType
+    - com/sun/star/ucb/XCommandInfo.hpp
+    ucb/source/ucp/package/pkgprovider.cxx:
+    # Actually in use
+    - com/sun/star/uno/XComponentContext.hpp
+    ucb/source/ucp/package/pkgcontent.cxx:
+    # Actually in use
+    - com/sun/star/container/XHierarchicalNameAccess.hpp
+    # Needed for UnoType
+    - com/sun/star/ucb/XCommandInfo.hpp
+    ucb/source/ucp/tdoc/tdoc_content.cxx:
+    # Needed for UnoType
+    - com/sun/star/ucb/XCommandInfo.hpp
+    ucb/source/ucp/webdav-neon/DateTimeHelper.cxx:
+    # Actually in use
+    - com/sun/star/util/DateTime.hpp
+    ucb/source/ucp/webdav-neon/LockEntrySequence.cxx:
+    # Needed for LGPL code licensing
+    - config_lgpl.h
+    ucb/source/ucp/webdav-neon/LinkSequence.cxx:
+    # Needed for LGPL code licensing
+    - config_lgpl.h
+    ucb/source/ucp/webdav-neon/LinkSequence.cxx:
+    # Needed for LGPL code licensing
+    - config_lgpl.h
+    ucb/source/ucp/webdav-neon/LockSequence.cxx:
+    # Needed for LGPL code licensing
+    - config_lgpl.h
+    ucb/source/ucp/webdav-neon/NeonSession.cxx:
+    # Needed for UnoType
+    - com/sun/star/ucb/Lock.hpp
+    - com/sun/star/beans/NamedValue.hpp
+    ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx:
+    # Needed for LGPL code licensing
+    - config_lgpl.h
+    ucb/source/ucp/webdav-neon/webdavcontent.cxx:
+    # Needed for UnoType
+    - com/sun/star/ucb/XCommandInfo.hpp
+    ucb/source/ucp/webdav/DateTimeHelper.cxx:
+    # Actually in use
+    - com/sun/star/util/DateTime.hpp
+    ucb/source/ucp/webdav/webdavcontent.cxx:
+    # Needed for UnoType
+    - com/sun/star/ucb/XCommandInfo.hpp
diff --git a/ucb/qa/cppunit/webdav/webdav_options.cxx b/ucb/qa/cppunit/webdav/webdav_options.cxx
index a7919dfcca06..ef0cc1b969fc 100644
--- a/ucb/qa/cppunit/webdav/webdav_options.cxx
+++ b/ucb/qa/cppunit/webdav/webdav_options.cxx
@@ -9,8 +9,6 @@
 
 #include <test/bootstrapfixture.hxx>
 #include <cppunit/plugin/TestPlugIn.h>
-#include <DAVResourceAccess.hxx>
-#include <DAVException.hxx>
 #include <DAVTypes.hxx>
 
 using namespace webdav_ucp;
diff --git a/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx b/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx
index 6ce15a9df269..29ccf8a462be 100644
--- a/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx
+++ b/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx
@@ -9,7 +9,6 @@
 
 #include <test/bootstrapfixture.hxx>
 #include <cppunit/plugin/TestPlugIn.h>
-#include <cmath>
 #include <PropfindCache.hxx>
 
 using namespace webdav_ucp;
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index a6a2899aef99..20b355769754 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -20,17 +20,15 @@
 
 #include "cachedcontentresultset.hxx"
 #include <com/sun/star/sdbc/FetchDirection.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/ucb/FetchError.hpp>
-#include <com/sun/star/ucb/ResultSetException.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/script/CannotConvertException.hpp>
 #include <com/sun/star/script/Converter.hpp>
-#include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <rtl/ustring.hxx>
 #include <o3tl/any.hxx>
 #include <osl/diagnose.h>
-#include <comphelper/processfactory.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <ucbhelper/getcomponentcontext.hxx>
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index 074bf0cc431f..f513bd79f3b9 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -19,11 +19,9 @@
 
 
 #include "cacheddynamicresultset.hxx"
-#include <com/sun/star/sdbc/XResultSet.hpp>
 #include "cachedcontentresultset.hxx"
 #include <osl/diagnose.h>
 #include <cppuhelper/queryinterface.hxx>
-#include <comphelper/processfactory.hxx>
 #include <ucbhelper/getcomponentcontext.hxx>
 #include <ucbhelper/macros.hxx>
 
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index 330d159bca67..f3799f4c3f92 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -19,12 +19,10 @@
 
 
 #include "cacheddynamicresultsetstub.hxx"
-#include <com/sun/star/sdbc/XResultSet.hpp>
 #include "cachedcontentresultsetstub.hxx"
 #include <com/sun/star/ucb/ContentResultSetCapability.hpp>
 #include <com/sun/star/ucb/SortedDynamicResultSetFactory.hpp>
 #include <osl/diagnose.h>
-#include <comphelper/processfactory.hxx>
 #include <ucbhelper/getcomponentcontext.hxx>
 #include <ucbhelper/macros.hxx>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx
index 5321d0c2ab6f..93c3f9191394 100644
--- a/ucb/source/cacher/cacheserv.cxx
+++ b/ucb/source/cacher/cacheserv.cxx
@@ -19,7 +19,6 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include "cachedcontentresultset.hxx"
 #include "cachedcontentresultsetstub.hxx"
 #include "cacheddynamicresultset.hxx"
@@ -27,7 +26,6 @@
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
-using namespace com::sun::star::registry;
 
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * cached1_component_getFactory(
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 9d154afca062..3bb8bb4ed924 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -19,10 +19,6 @@
 
 
 #include "contentresultsetwrapper.hxx"
-#include <com/sun/star/sdbc/FetchDirection.hpp>
-#include <com/sun/star/ucb/FetchError.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index e33f710f0724..ad1f580bf1fa 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -19,10 +19,8 @@
 
 
 #include "dynamicresultsetwrapper.hxx"
-#include <ucbhelper/macros.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <osl/diagnose.h>
-#include <rtl/ustring.hxx>
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
 #include <com/sun/star/ucb/ListActionType.hpp>
 #include <com/sun/star/ucb/ListenerAlreadySetException.hpp>
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 0a6ec8759b2f..218bcad33a81 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <uno/mapping.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
@@ -33,7 +32,6 @@
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/io/XActiveDataStreamer.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -45,7 +43,6 @@
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
 #include <com/sun/star/ucb/InteractiveIOException.hpp>
 #include <com/sun/star/ucb/NameClash.hpp>
-#include <com/sun/star/ucb/NameClashException.hpp>
 #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index 7ccfc6b8c7ea..252fdaa2277d 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -20,7 +20,6 @@
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 #include <rtl/strbuf.hxx>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include "provprox.hxx"
 #include <com/sun/star/lang/XInitialization.hpp>
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 062db439784b..6a2796a2282d 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -29,17 +29,12 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/propertysequence.hxx>
-#include <cppuhelper/queryinterface.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/ucb/DuplicateProviderException.hpp>
 #include <com/sun/star/ucb/GlobalTransferCommandArgument2.hpp>
 #include <com/sun/star/ucb/UnsupportedCommandException.hpp>
 #include <com/sun/star/ucb/XCommandInfo.hpp>
-#include <com/sun/star/ucb/XContentProvider.hpp>
 #include <com/sun/star/ucb/XContentProviderSupplier.hpp>
-#include <com/sun/star/ucb/XParameterizedContentProvider.hpp>
-#include <com/sun/star/ucb/XContentProviderFactory.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index f4236bc7ebbe..41cd606561e7 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -27,7 +27,6 @@
 #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/lang/XTypeProvider.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 4e511a0b44d3..c53890d6bd84 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -22,12 +22,10 @@
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/io/Pipe.hpp>
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index cdd746ceb7e6..a32e8d69607a 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -25,7 +25,6 @@
   *************************************************************************/
 
 #include <memory>
-#include <list>
 #include <unordered_map>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
@@ -45,7 +44,6 @@
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <ucbhelper/getcomponentcontext.hxx>
 #include <ucbhelper/macros.hxx>
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 513566dd4b4b..52229f62d7a3 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vector>
 #include "sortdynres.hxx"
 #include <comphelper/interfacecontainer2.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 54536c883eb3..6069808ccff9 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -22,11 +22,9 @@
 #include "sortresult.hxx"
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
 #include <com/sun/star/ucb/ListActionType.hpp>
 #include <com/sun/star/ucb/XAnyCompare.hpp>
-#include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/interfacecontainer2.hxx>
diff --git a/ucb/source/ucp/cmis/certvalidation_handler.cxx b/ucb/source/ucp/cmis/certvalidation_handler.cxx
index 9d580bf6546c..cbb0848867de 100644
--- a/ucb/source/ucp/cmis/certvalidation_handler.cxx
+++ b/ucb/source/ucp/cmis/certvalidation_handler.cxx
@@ -13,7 +13,6 @@
 #include <com/sun/star/security/CertificateContainer.hpp>
 #include <com/sun/star/security/XCertificate.hpp>
 #include <com/sun/star/security/XCertificateContainer.hpp>
-#include <com/sun/star/security/CertificateValidity.hpp>
 #include <com/sun/star/xml/crypto/SEInitializer.hpp>
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
 
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 9f0607248c66..7d146a52bbaf 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -12,7 +12,6 @@
 #include <com/sun/star/beans/IllegalTypeException.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/document/CmisProperty.hpp>
 #include <com/sun/star/io/XActiveDataSink.hpp>
@@ -27,18 +26,14 @@
 #include <com/sun/star/ucb/InteractiveBadTransferURLException.hpp>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <com/sun/star/ucb/MissingInputStreamException.hpp>
-#include <com/sun/star/ucb/NameClash.hpp>
-#include <com/sun/star/ucb/NameClashException.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
 #include <com/sun/star/ucb/UnsupportedCommandException.hpp>
 #include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
-#include <com/sun/star/ucb/UnsupportedNameClashException.hpp>
 #include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
 #include <com/sun/star/ucb/XCommandInfo.hpp>
 #include <com/sun/star/ucb/XDynamicResultSet.hpp>
 #ifndef SYSTEM_CURL
 #include <com/sun/star/xml/crypto/XDigestContext.hpp>
-#include <com/sun/star/xml/crypto/XDigestContextSupplier.hpp>
 #include <com/sun/star/xml/crypto/DigestID.hpp>
 #include <com/sun/star/xml/crypto/NSSInitializer.hpp>
 #endif
diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.cxx b/ucb/source/ucp/cmis/cmis_datasupplier.cxx
index dead6a2d6203..2a91770cd8f6 100644
--- a/ucb/source/ucp/cmis/cmis_datasupplier.cxx
+++ b/ucb/source/ucp/cmis/cmis_datasupplier.cxx
@@ -7,16 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <vector>
-
-#include <ucbhelper/contentidentifier.hxx>
-#include <ucbhelper/providerhelper.hxx>
-
 #include <com/sun/star/ucb/OpenMode.hpp>
 
 #include "cmis_datasupplier.hxx"
 #include "cmis_content.hxx"
-#include "cmis_provider.hxx"
 
 using namespace com::sun::star;
 
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index effed0a78fc9..127cd15c4d4f 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -9,9 +9,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/contenthelper.hxx>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <ucbhelper/getcomponentcontext.hxx>
 #include <ucbhelper/macros.hxx>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 867e311cb7d2..7225d51502aa 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -11,14 +11,10 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/ucb/XCommandInfo.hpp>
 #include <com/sun/star/ucb/XDynamicResultSet.hpp>
-#include <com/sun/star/ucb/XProgressHandler.hpp>
 #ifndef SYSTEM_CURL
 #include <com/sun/star/xml/crypto/XDigestContext.hpp>
-#include <com/sun/star/xml/crypto/XDigestContextSupplier.hpp>
 #include <com/sun/star/xml/crypto/DigestID.hpp>
 #include <com/sun/star/xml/crypto/NSSInitializer.hpp>
 #endif
@@ -28,7 +24,6 @@
 #include <sal/log.hxx>
 #include <tools/urlobj.hxx>
 #include <ucbhelper/cancelcommandexecution.hxx>
-#include <ucbhelper/commandenvironment.hxx>
 #include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/propertyvalueset.hxx>
 #include <ucbhelper/proxydecider.hxx>
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index b83d6bee316b..ae2bce9dd59a 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -9,17 +9,6 @@
 
 #include <sal/config.h>
 
-#if defined __GNUC__ && !defined __clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated"
-#pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
-#endif
-#include <libcmis/libcmis.hxx>
-#if defined __GNUC__ && !defined __clang__
-#pragma GCC diagnostic pop
-#endif
-
-#include <config_oauth2.h>
 #include <rtl/uri.hxx>
 #include <tools/urlobj.hxx>
 
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 5cf78de32789..82d80c27674d 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -20,7 +20,6 @@
 
 #include <rtl/uri.hxx>
 #include <osl/mutex.hxx>
-#include <sal/log.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
@@ -29,8 +28,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/util/theMacroExpander.hpp>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
 #include <com/sun/star/ucb/XContentProvider.hpp>
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 757a0b49cec4..25e3f8aa312a 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -22,19 +22,17 @@
 #include "ucpext_resultset.hxx"
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
+#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/XPersistentPropertySet.hpp>
 #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
 #include <com/sun/star/ucb/UnsupportedCommandException.hpp>
 #include <com/sun/star/ucb/XDynamicResultSet.hpp>
 #include <com/sun/star/deployment/PackageInformationProvider.hpp>
 
-#include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/propertyvalueset.hxx>
 #include <ucbhelper/cancelcommandexecution.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index fe00d74c8533..07645451d0b0 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -19,8 +19,6 @@
 
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <sal/log.hxx>
-#include <osl/file.hxx>
 
 #include <osl/diagnose.h>
 #include <com/sun/star/lang/NoSupportException.hpp>
@@ -28,22 +26,13 @@
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
 #include <com/sun/star/beans/IllegalTypeException.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/ucb/XProgressHandler.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/io/XActiveDataStreamer.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/ucb/NumberedSortingInfo.hpp>
 #include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/beans/PropertySetInfoChange.hpp>
-#include <com/sun/star/ucb/ContentAction.hpp>
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <comphelper/fileurl.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/queryinterface.hxx>
-#include <ucbhelper/macros.hxx>
 #include "filglob.hxx"
 #include "filid.hxx"
 #include "filrow.hxx"
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index 5d6e36d88957..655bb3a46a07 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -25,7 +25,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/ucb/XCommandProcessor.hpp>
 #include <com/sun/star/beans/XPropertiesChangeNotifier.hpp>
diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx
index c046051bcecd..a6f0f954cc98 100644
--- a/ucb/source/ucp/file/filcmd.cxx
+++ b/ucb/source/ucp/file/filcmd.cxx
@@ -18,14 +18,12 @@
  */
 
 #include <sal/config.h>
-#include <sal/log.hxx>
 #include <cppuhelper/queryinterface.hxx>
 
 #include <com/sun/star/ucb/UnsupportedCommandException.hpp>
 
 #include "filcmd.hxx"
 #include "filtask.hxx"
-#include "prov.hxx"
 
 using namespace fileaccess;
 using namespace com::sun::star;
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index 679c79a36f16..18610efd92ba 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -19,12 +19,9 @@
 
 #include "filglob.hxx"
 #include "filerror.hxx"
-#include "filtask.hxx"
 #include "bc.hxx"
 #include <osl/file.hxx>
-#include <vector>
 #include <ucbhelper/cancelcommandexecution.hxx>
-#include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/ucb/UnsupportedCommandException.hpp>
 #include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -40,7 +37,6 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/diagnose.h>
-#include <rtl/ustrbuf.hxx>
 #include <rtl/uri.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index 11ce232c7ea8..d42fd194d643 100644
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
@@ -20,9 +20,6 @@
 #include "filid.hxx"
 #include "filtask.hxx"
 
-#include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/typeprovider.hxx>
-
 using namespace fileaccess;
 using namespace com::sun::star;
 using namespace com::sun::star::ucb;
diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx
index 769ddcecfcb7..5eaaf62f86cb 100644
--- a/ucb/source/ucp/file/filid.hxx
+++ b/ucb/source/ucp/file/filid.hxx
@@ -21,7 +21,6 @@
 
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/ucb/XContentIdentifier.hpp>
 
 namespace fileaccess {
diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx
index 865b5e11ad62..5838dcda39ac 100644
--- a/ucb/source/ucp/file/filinpstr.cxx
+++ b/ucb/source/ucp/file/filinpstr.cxx
@@ -18,18 +18,15 @@
  */
 
 #include <sal/config.h>
-#include <sal/log.hxx>
 
 #include <com/sun/star/io/IOException.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 
 #include "filinpstr.hxx"
 #include "filerror.hxx"
-#include "filtask.hxx"
-#include "prov.hxx"
 
 using namespace fileaccess;
 using namespace com::sun::star;
-using namespace com::sun::star::ucb;
 
 #if OSL_DEBUG_LEVEL > 0
 #define THROW_WHERE SAL_WHERE
diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx
index 359b420ee181..21a4b4c66d68 100644
--- a/ucb/source/ucp/file/filinsreq.cxx
+++ b/ucb/source/ucp/file/filinsreq.cxx
@@ -19,7 +19,6 @@
 
 #include "filinsreq.hxx"
 #include "filtask.hxx"
-#include "filglob.hxx"
 
 #include <comphelper/interaction.hxx>
 
diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx
index ba33e6662bfa..c5d25b38d058 100644
--- a/ucb/source/ucp/file/filnot.cxx
+++ b/ucb/source/ucp/file/filnot.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/ucb/ContentAction.hpp>
 #include <com/sun/star/beans/PropertySetInfoChange.hpp>
 #include "filnot.hxx"
diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx
index 0110be272759..7f64caa145e0 100644
--- a/ucb/source/ucp/file/filprp.cxx
+++ b/ucb/source/ucp/file/filprp.cxx
@@ -21,8 +21,6 @@
 #include "prov.hxx"
 #include "filprp.hxx"
 
-#include <sal/log.hxx>
-
 using namespace fileaccess;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index 60081f340c54..54ba6140f040 100644
--- a/ucb/source/ucp/file/filrow.cxx
+++ b/ucb/source/ucp/file/filrow.cxx
@@ -19,13 +19,10 @@
 
 #include "filrow.hxx"
 #include "filtask.hxx"
-#include "prov.hxx"
 #include <com/sun/star/script/CannotConvertException.hpp>
 #include <com/sun/star/script/Converter.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
 
-#include <sal/log.hxx>
-
 using namespace fileaccess;
 using namespace com::sun::star;
 using namespace css::uno;
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index 8b23813abdc4..3031510a6b7f 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -18,20 +18,17 @@
  */
 
 #include <sal/config.h>
-#include <sal/log.hxx>
 
 #include <com/sun/star/io/BufferSizeExceededException.hpp>
 #include <com/sun/star/io/IOException.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <osl/diagnose.h>
 #include "filstr.hxx"
-#include "filtask.hxx"
-#include "prov.hxx"
-#include <memory>
+#include "filerror.hxx"
 
 using namespace fileaccess;
 using namespace com::sun::star;
-using namespace css::ucb;
 
 #if OSL_DEBUG_LEVEL > 0
 #define THROW_WHERE SAL_WHERE
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index eac7d2b3b01b..7c5c66e23e6e 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -20,7 +20,6 @@
 #include <osl/security.hxx>
 #include <osl/file.hxx>
 #include <osl/socket.h>
-#include <sal/log.hxx>
 #include <tools/urlobj.hxx>
 #include <ucbhelper/content.hxx>
 #include <cppuhelper/queryinterface.hxx>
@@ -28,7 +27,6 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/ucb/FileSystemNotation.hpp>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
-#include <com/sun/star/beans/PropertyState.hpp>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include "filglob.hxx"
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index b84c49e05ae1..92c3639bebf0 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -32,20 +32,17 @@
 #include "ftpcontentprovider.hxx"
 #include "ftpdirp.hxx"
 #include "ftpcontentidentifier.hxx"
-#include "ftpcfunc.hxx"
 #include "ftpintreq.hxx"
 
 #include <memory>
 #include <vector>
 #include <string.h>
 #include "curl.hxx"
-#include <curl/easy.h>
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <ucbhelper/cancelcommandexecution.hxx>
-#include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/fd_inputstream.hxx>
 #include <ucbhelper/propertyvalueset.hxx>
 #include <ucbhelper/simpleauthenticationrequest.hxx>
@@ -56,14 +53,12 @@
 #include <com/sun/star/beans/IllegalTypeException.hpp>
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
 #include <com/sun/star/beans/Property.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/ucb/XCommandInfo.hpp>
 #include <com/sun/star/io/BufferSizeExceededException.hpp>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/io/NotConnectedException.hpp>
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XActiveDataStreamer.hpp>
 #include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
 #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
 #include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
@@ -73,7 +68,6 @@
 #include <com/sun/star/ucb/MissingPropertiesException.hpp>
 #include <com/sun/star/ucb/MissingInputStreamException.hpp>
 #include <com/sun/star/ucb/UnsupportedNameClashException.hpp>
-#include <com/sun/star/ucb/NameClashException.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
 #include <com/sun/star/ucb/IOErrorCode.hpp>
 
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index ece8525d8631..8bdc1b93528d 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -24,10 +24,6 @@
 
  *************************************************************************/
 #include "ftpcontentidentifier.hxx"
-#include "ftpcontentprovider.hxx"
-#include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/supportsservice.hxx>
 
 using namespace ftp;
 using namespace com::sun::star::uno;
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
index 367c7820b413..218f4aaacac1 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
@@ -27,7 +27,6 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/ucb/XContentIdentifier.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 
 
 namespace ftp {
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 76d196cfe8b2..57df6e2f6348 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -22,14 +22,12 @@
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
 #include <com/sun/star/ucb/UniversalContentBroker.hpp>
-#include <comphelper/processfactory.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/factory.hxx>
 #include <ucbhelper/getcomponentcontext.hxx>
-#include <osl/socket.hxx>
 #include "ftpcontentprovider.hxx"
 #include "ftpcontent.hxx"
 #include "ftploaderthread.hxx"
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx
index 6ef79b786e04..838850229708 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx
@@ -21,9 +21,6 @@
 #include <ucbhelper/propertyvalueset.hxx>
 #include <rtl/ref.hxx>
 #include <com/sun/star/ucb/Command.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <com/sun/star/ucb/XCommandProcessor.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
 #include "ftpresultsetI.hxx"
 #include "ftpcontent.hxx"
 
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index 69acdf6fcf8a..f777dad67a5b 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -19,11 +19,8 @@
 
 #include <ucbhelper/contentidentifier.hxx>
 #include <com/sun/star/sdbc/SQLException.hpp>
-#include <com/sun/star/ucb/OpenMode.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/ucb/ListActionType.hpp>
-#include <com/sun/star/ucb/XSourceInitialization.hpp>
 #include <ucbhelper/resultsetmetadata.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include "ftpresultsetbase.hxx"
diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx
index 653134d5fec3..cd70ca522825 100644
--- a/ucb/source/ucp/ftp/ftpservices.cxx
+++ b/ucb/source/ucp/ftp/ftpservices.cxx
@@ -19,7 +19,6 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include "ftpcontentprovider.hxx"
 
 using namespace com::sun::star;
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 413b89c8605c..ecc9fdcc8191 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -26,14 +26,12 @@
 #include <sal/config.h>
 #include <sal/log.hxx>
 
-#include <cstring>
 #include <vector>
 
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/ucb/OpenMode.hpp>
 #include <string.h>
 #include <rtl/uri.hxx>
-#include <rtl/strbuf.hxx>
 
 #include "ftpurl.hxx"
 #include "ftpcontentprovider.hxx"
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index d165262159a0..7b6c75953e93 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -22,7 +22,6 @@
 #include <utility>
 
 #include <string.h>
-#include <unistd.h>
 #include <sys/types.h>
 #include <sal/macros.h>
 #include <osl/time.h>
@@ -31,33 +30,24 @@
 #include <com/sun/star/beans/IllegalTypeException.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/beans/PropertySetInfoChange.hpp>
-#include <com/sun/star/beans/PropertySetInfoChangeEvent.hpp>
+#include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/lang/IllegalAccessException.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/ucb/ContentInfoAttribute.hpp>
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
-#include <com/sun/star/ucb/InteractiveBadTransferURLException.hpp>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
-#include <com/sun/star/ucb/InteractiveNetworkWriteException.hpp>
-#include <com/sun/star/ucb/InteractiveNetworkConnectException.hpp>
 #include <com/sun/star/ucb/InteractiveNetworkGeneralException.hpp>
-#include <com/sun/star/ucb/InteractiveNetworkReadException.hpp>
 #include <com/sun/star/ucb/InteractiveNetworkResolveNameException.hpp>
-#include <com/sun/star/ucb/NameClash.hpp>
 #include <com/sun/star/ucb/NameClashException.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
-#include <com/sun/star/ucb/PostCommandArgument2.hpp>
 #include <com/sun/star/ucb/XCommandInfo.hpp>
-#include <com/sun/star/ucb/XPersistentPropertySet.hpp>
 #include <com/sun/star/ucb/MissingInputStreamException.hpp>
-#include <com/sun/star/ucb/MissingPropertiesException.hpp>
 #include <com/sun/star/ucb/UnsupportedCommandException.hpp>
 #include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
-#include <com/sun/star/ucb/UnsupportedNameClashException.hpp>
 #include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
 #include <com/sun/star/ucb/XDynamicResultSet.hpp>
 #include <com/sun/star/ucb/XContentCreator.hpp>
@@ -67,13 +57,10 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/propertyvalueset.hxx>
-#include <ucbhelper/interactionrequest.hxx>
 #include <ucbhelper/cancelcommandexecution.hxx>
 #include <ucbhelper/macros.hxx>
 #include <vcl/svapp.hxx>
 
-#include <osl/conditn.hxx>
-
 #include "gio_content.hxx"
 #include "gio_provider.hxx"
 #include "gio_resultset.hxx"
diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx
index 8b556d892fed..fd4335dc570c 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.cxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vector>
-
 #include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/providerhelper.hxx>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
@@ -26,7 +24,6 @@
 
 #include "gio_datasupplier.hxx"
 #include "gio_content.hxx"
-#include "gio_provider.hxx"
 
 using namespace gio;
 
diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx
index 1fbac6806b54..c6df4572b55e 100644
--- a/ucb/source/ucp/gio/gio_inputstream.cxx
+++ b/ucb/source/ucp/gio/gio_inputstream.cxx
@@ -21,9 +21,6 @@
 
 #include <com/sun/star/io/BufferSizeExceededException.hpp>
 #include <com/sun/star/io/NotConnectedException.hpp>
-#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
-#include <ucbhelper/cancelcommandexecution.hxx>
-#include <string.h>
 
 #include "gio_inputstream.hxx"
 #include "gio_content.hxx"
diff --git a/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx
index e6740b421b9d..1f334f4df8d8 100644
--- a/ucb/source/ucp/gio/gio_outputstream.cxx
+++ b/ucb/source/ucp/gio/gio_outputstream.cxx
@@ -20,10 +20,7 @@
 #include <sal/config.h>
 
 #include <com/sun/star/io/NotConnectedException.hpp>
-#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
-#include <ucbhelper/cancelcommandexecution.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include <string.h>
 
 #include "gio_outputstream.hxx"
 #include "gio_content.hxx"
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index 0587cedfdc80..912de0e8e008 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -18,14 +18,12 @@
  */
 
 #include <sal/log.hxx>
-#include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/contenthelper.hxx>
 #include <ucbhelper/getcomponentcontext.hxx>
 #include <ucbhelper/macros.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include "gio_provider.hxx"
 #include "gio_content.hxx"
 
diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx
index c5315ab35548..1f1da5948d8c 100644
--- a/ucb/source/ucp/gio/gio_seekable.cxx
+++ b/ucb/source/ucp/gio/gio_seekable.cxx
@@ -21,10 +21,7 @@
 
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/io/NotConnectedException.hpp>
-#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
-#include <ucbhelper/cancelcommandexecution.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include <string.h>
 
 #include "gio_seekable.hxx"
 #include "gio_content.hxx"
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 6f2029888bcb..5a15896cfca5 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -37,16 +37,12 @@
  *************************************************************************/
 #include <osl/diagnose.h>
 
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/beans/IllegalTypeException.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyExistException.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/lang/IllegalAccessException.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/ucb/ContentInfoAttribute.hpp>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index f1ff3cdbd64b..0f78cd033707 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -28,10 +28,8 @@
  *************************************************************************/
 #include "hierarchydata.hxx"
 
-#include <vector>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 490c3c0eaecf..004c27a5f2c1 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/processfactory.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index 48015ea2b0da..3c2eb82ba64d 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
@@ -25,7 +25,6 @@
 #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/lang/XTypeProvider.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <memory>
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index 8371072bf75e..d95d39dd0a9d 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
 #include <com/sun/star/util/theOfficeInstallationDirectories.hpp>
-#include <comphelper/processfactory.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/getcomponentcontext.hxx>
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
index cc7aed266e58..0c1a187504be 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
@@ -24,8 +24,6 @@
 
  *************************************************************************/
 
-#include <rtl/ustrbuf.hxx>
-
 #include "hierarchyuri.hxx"
 
 using namespace hierarchy_ucp;
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index e9e3296900b3..8b645a0b70fb 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -24,14 +24,11 @@
  *************************************************************************/
 #include <osl/diagnose.h>
 
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/beans/IllegalTypeException.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyExistException.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -39,10 +36,8 @@
 #include <com/sun/star/io/BufferSizeExceededException.hpp>
 #include <com/sun/star/io/NotConnectedException.hpp>
 #include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/lang/IllegalAccessException.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/ucb/ContentInfoAttribute.hpp>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index 0d969812e4bd..ea4549a32268 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -24,7 +24,6 @@
 
  *************************************************************************/
 
-#include <comphelper/processfactory.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx
index 874814b8e2c0..d0e0d8930166 100644
--- a/ucb/source/ucp/package/pkgservices.cxx
+++ b/ucb/source/ucp/package/pkgservices.cxx
@@ -19,7 +19,6 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include "pkgprovider.hxx"
 
 using namespace com::sun::star;
diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx
index 0458e73085a3..d259448cdf07 100644
--- a/ucb/source/ucp/package/pkguri.cxx
+++ b/ucb/source/ucp/package/pkguri.cxx
@@ -24,7 +24,6 @@
 
  *************************************************************************/
 
-#include <rtl/ustrbuf.hxx>
 #include <comphelper/storagehelper.hxx>
 
 #include "../inc/urihelper.hxx"
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 0e3ccadf9b89..fa7aa636d21a 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -32,12 +32,9 @@
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/beans/IllegalTypeException.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/InvalidStorageException.hpp>
 #include <com/sun/star/embed/StorageWrappedTargetException.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/io/BufferSizeExceededException.hpp>
 #include <com/sun/star/io/IOException.hpp>
@@ -46,7 +43,6 @@
 #include <com/sun/star/io/XActiveDataStreamer.hpp>
 #include <com/sun/star/lang/IllegalAccessException.hpp>
 #include <com/sun/star/packages/WrongPasswordException.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/task/DocumentPasswordRequest.hpp>
 #include <com/sun/star/task/XInteractionPassword.hpp>
 #include <com/sun/star/ucb/CommandFailedException.hpp>
@@ -56,7 +52,6 @@
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
 #include <com/sun/star/ucb/InteractiveBadTransferURLException.hpp>
 #include <com/sun/star/ucb/MissingInputStreamException.hpp>
-#include <com/sun/star/ucb/MissingPropertiesException.hpp>
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <com/sun/star/ucb/NameClashException.hpp>
 #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
index 2600189d8c06..6713d5401ffe 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
@@ -20,7 +20,6 @@
 
 #include <osl/diagnose.h>
 #include <rtl/ref.hxx>
-#include <cppuhelper/weak.hxx>
 
 #include <comphelper/documentinfo.hxx>
 #include <comphelper/namedvaluecollection.hxx>
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
index c79380c9b5b7..eadd8fcd681f 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
@@ -26,7 +26,6 @@
 
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include "tdoc_documentcontentfactory.hxx"
 
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index d738d59bb935..d2d8c6ae2035 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -24,16 +24,12 @@
 
  *************************************************************************/
 
-#include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
 
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/embed/InvalidStorageException.hpp>
 #include <com/sun/star/embed/StorageWrappedTargetException.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
-#include <comphelper/processfactory.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/getcomponentcontext.hxx>
diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx
index fcef4671f9b7..f65ed1972649 100644
--- a/ucb/source/ucp/tdoc/tdoc_services.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_services.cxx
@@ -20,7 +20,6 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 
 #include "tdoc_provider.hxx"
 #include "tdoc_documentcontentfactory.hxx"
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx
index 28d86a7c8e94..014065416cb5 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <memory>
-
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/InvalidStorageException.hpp>
@@ -26,7 +24,6 @@
 #include <com/sun/star/embed/StorageWrappedTargetException.hpp>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/packages/NoEncryptionException.hpp>
-#include <com/sun/star/uno/XAggregation.hpp>
 #include <cppuhelper/exc_hlp.hxx>
 #include <osl/diagnose.h>
 
diff --git a/ucb/source/ucp/tdoc/tdoc_uri.cxx b/ucb/source/ucp/tdoc/tdoc_uri.cxx
index 82dca8080d6f..592977ea03ee 100644
--- a/ucb/source/ucp/tdoc/tdoc_uri.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.cxx
@@ -24,7 +24,6 @@
 
  *************************************************************************/
 
-#include <rtl/ustrbuf.hxx>
 #include "../inc/urihelper.hxx"
 
 #include "tdoc_uri.hxx"
diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
index 173a8445ccdb..fd6fca081e80 100644
--- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
@@ -31,7 +31,6 @@
 #include "NeonSession.hxx"
 #include "NeonUri.hxx"
 #include <osl/diagnose.h>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 using namespace webdav_ucp;
 using namespace com::sun::star;
diff --git a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
index b830fb7926b7..e124bfd524dd 100644
--- a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
@@ -28,8 +28,6 @@
 
 #include <osl/mutex.hxx>
 #include <sal/log.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/PropertyState.hpp>
 #include "NeonHeadRequest.hxx"
 #include "NeonSession.hxx"
 
diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
index 531ab229f976..cf03274c5952 100644
--- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
@@ -32,7 +32,6 @@
 #include <sal/log.hxx>
 #include "NeonSession.hxx"
 #include "NeonTypes.hxx"
-#include "DAVException.hxx"
 #include "DAVProperties.hxx"
 #include "NeonPropFindRequest.hxx"
 #include "LinkSequence.hxx"
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index ee59d4b0291b..cdd703615b4c 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -33,7 +33,6 @@
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <osl/time.h>
-#include <rtl/string.h>
 #include <ne_socket.h>
 #include <ne_auth.h>
 #include <ne_redirect.h>
@@ -45,8 +44,6 @@ extern "C" {
 }
 
 #include <libxml/parser.h>
-#include <rtl/ustrbuf.hxx>
-#include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 #include <ucbhelper/simplecertificatevalidationrequest.hxx>
 
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx
index f7e94b38ddca..c1c263421de4 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx
@@ -28,7 +28,6 @@
 
 #include <sal/config.h>
 
-#include <string.h>
 #include <rtl/uri.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 71b62e3e1925..10b5441aa64f 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -34,7 +34,6 @@
  *************************************************************************/
 
 #include <memory>
-#include <osl/diagnose.h>
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
@@ -54,6 +53,7 @@
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/lang/IllegalAccessException.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/task/PasswordContainerInteractionHandler.hpp>
 #include <com/sun/star/ucb/CommandEnvironment.hpp>
 #include <com/sun/star/ucb/CommandFailedException.hpp>
@@ -85,8 +85,6 @@
 #include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
 #include <com/sun/star/ucb/XCommandInfo.hpp>
 #include <com/sun/star/ucb/XPersistentPropertySet.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/ucb/ResultSetException.hpp>
 #include <ucbhelper/macros.hxx>
 
 #include "webdavcontent.hxx"
diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
index 34daa30b9d09..d8ff4ff6fb03 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
@@ -51,7 +51,6 @@
 #include <com/sun/star/ucb/LockEntry.hpp>
 #include "webdavcontent.hxx"
 #include "webdavprovider.hxx"
-#include "DAVSession.hxx"
 #include "ContentProperties.hxx"
 #include "PropfindCache.hxx"
 
diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
index 253999e6079c..00085956aa3c 100644
--- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
@@ -44,7 +44,6 @@
 #include "webdavdatasupplier.hxx"
 #include "webdavcontent.hxx"
 #include "ContentProperties.hxx"
-#include "DAVSession.hxx"
 #include "NeonUri.hxx"
 
 using namespace com::sun::star;
diff --git a/ucb/source/ucp/webdav-neon/webdavresultset.cxx b/ucb/source/ucp/webdav-neon/webdavresultset.cxx
index d7b70c3d8794..be4fadc9bf39 100644
--- a/ucb/source/ucp/webdav-neon/webdavresultset.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavresultset.cxx
@@ -36,7 +36,6 @@
 
  *************************************************************************/
 #include "webdavresultset.hxx"
-#include "DAVSession.hxx"
 
 using namespace com::sun::star;
 using namespace webdav_ucp;
diff --git a/ucb/source/ucp/webdav-neon/webdavservices.cxx b/ucb/source/ucp/webdav-neon/webdavservices.cxx
index 3ee252834caf..f5a3116a9475 100644
--- a/ucb/source/ucp/webdav-neon/webdavservices.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavservices.cxx
@@ -28,7 +28,6 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include "webdavprovider.hxx"
 
 using namespace com::sun::star;
diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
index a0f5df5a9ad2..78aadb7e2dfa 100644
--- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
@@ -21,7 +21,6 @@
 #include "DAVSessionFactory.hxx"
 #include "SerfSession.hxx"
 #include "SerfUri.hxx"
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 using namespace http_dav_ucp;
 using namespace com::sun::star;
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index 6bcdc0b1ec11..3eef64b9e4dd 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -19,7 +19,6 @@
 
 #include <vector>
 #include <string.h>
-#include <rtl/string.h>
 #include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
@@ -34,7 +33,6 @@
 #include "SerfRequestProcessor.hxx"
 #include "SerfCallbacks.hxx"
 #include "SerfInputStream.hxx"
-#include "UCBDeadPropertyValue.hxx"
 
 #include <com/sun/star/xml/crypto/SEInitializer.hpp>
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx
index 43bf4ce56c85..f146dfade70b 100644
--- a/ucb/source/ucp/webdav/SerfUri.cxx
+++ b/ucb/source/ucp/webdav/SerfUri.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <string.h>
 #include <rtl/uri.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
index 39e9cda4b9c9..0f3543012ce7 100644
--- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <string.h>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include "UCBDeadPropertyValue.hxx"
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 813c2c620582..de9031a30781 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -20,7 +20,6 @@
 #include <memory>
 
 #include <cppuhelper/queryinterface.hxx>
-#include <osl/diagnose.h>
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index 6e0e09d32b11..f26ebb01d21f 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -36,7 +36,6 @@
 #include "webdavcontent.hxx"
 #include "webdavprovider.hxx"
 #include "DAVProperties.hxx"
-#include "DAVSession.hxx"
 #include "ContentProperties.hxx"
 
 using namespace com::sun::star;
diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
index c0afdc6448e8..17f4f2051b41 100644
--- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
@@ -29,7 +29,6 @@
 #include "webdavdatasupplier.hxx"
 #include "webdavcontent.hxx"
 #include "ContentProperties.hxx"
-#include "DAVSession.hxx"
 #include "DAVProperties.hxx"
 #include "SerfUri.hxx"
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 62cfe28d626d..9a78c0648ebe 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -25,10 +25,6 @@
 
 #include <cppuhelper/queryinterface.hxx>
 #include <osl/mutex.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
 
 #include <tools/urlobj.hxx>
diff --git a/ucb/source/ucp/webdav/webdavresultset.cxx b/ucb/source/ucp/webdav/webdavresultset.cxx
index dfe3f8816317..e67dd1558d1a 100644
--- a/ucb/source/ucp/webdav/webdavresultset.cxx
+++ b/ucb/source/ucp/webdav/webdavresultset.cxx
@@ -26,7 +26,6 @@
 
  *************************************************************************/
 #include "webdavresultset.hxx"
-#include "DAVSession.hxx"
 
 using namespace com::sun::star;
 using namespace http_dav_ucp;
diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx
index d082176d176a..110daa90596a 100644
--- a/ucb/source/ucp/webdav/webdavservices.cxx
+++ b/ucb/source/ucp/webdav/webdavservices.cxx
@@ -19,8 +19,6 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <uno/lbnames.h>
 #include "webdavprovider.hxx"
 
 using namespace com::sun::star;
-- 
cgit v1.2.3