tdf#42949 Fix IWYU warnings in extensions/*/*cxx

Except for Windows-specific parts

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

Change-Id: I36c81bced6c8b1567e52ba3a4a688a963f294bb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90179
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

75 files changed, 81 insertions, 223 deletions

diff --git a/extensions/IwyuFilter_extensions.yaml b/extensions/IwyuFilter_extensions.yaml
index 712079f6e7c7..8abfa63ba0ef 100644
--- a/extensions/IwyuFilter_extensions.yaml
+++ b/extensions/IwyuFilter_extensions.yaml
@@ -4,3 +4,75 @@ blacklist:
     extensions/source/logging/loghandler.hxx:
     # Don't propose hxx -> h change in URE libs
     - cppuhelper/interfacecontainer.hxx
+    extensions/source/abpilot/admininvokationimpl.cxx:
+    # Needed for direct member access
+    - com/sun/star/awt/XWindow.hpp
+    extensions/source/abpilot/unodialogabp.cxx:
+    # Needed for direct member access
+    - com/sun/star/awt/XWindow.hpp
+    extensions/source/bibliography/bibmod.cxx:
+    # Needed for STATIC_USTRING macro + extern string magic to work at linking time
+    - bibprop.hxx
+    extensions/source/bibliography/framectr.cxx:
+    # Don't propose hxx -> h change in URE libs
+    - cppuhelper/interfacecontainer.hxx
+    # Actually used
+    - com/sun/star/form/runtime/XFormController.hpp
+    - com/sun/star/beans/PropertyValue.hpp
+    extensions/source/config/ldap/ldapaccess.cxx:
+    # Needed on WIN32
+    - o3tl/char16_t2wchar_t.hxx
+    extensions/source/config/ldap/ldapuserprofilebe.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
+    extensions/source/dbpilots/listcombowizard.cxx:
+    # Actually used
+    - com/sun/star/container/XNameAccess.hpp
+    extensions/source/dbpilots/commonpagesdbp.cxx:
+    # Actually used
+    - com/sun/star/sdbc/XConnection.hpp
+    extensions/source/update/check/updatecheck.cxx:
+    # Needed on WIN32 for WNT_hasInternetConnection
+    - onlinecheck.hxx
+    extensions/source/update/check/updatecheckconfig.cxx:
+    # Needed on WIN32
+    - o3tl/char16_t2wchar_t.hxx
+    extensions/source/propctrlr/editpropertyhandler.cxx:
+    # Actually used
+    - com/sun/star/inspection/XObjectInspectorUI.hpp
+    extensions/source/propctrlr/cellbindinghandler.cxx:
+    # Actually used
+    - com/sun/star/inspection/XObjectInspectorUI.hpp
+    extensions/source/propctrlr/eformspropertyhandler.cxx:
+    # Actually used
+    - com/sun/star/inspection/XObjectInspectorUI.hpp
+    extensions/source/propctrlr/formcomponenthandler.cxx:
+    # Actually used
+    - com/sun/star/inspection/XObjectInspectorUI.hpp
+    extensions/source/propctrlr/formgeometryhandler.cxx:
+    # Don't propose hxx -> h change in URE libs
+    - cppuhelper/interfacecontainer.hxx
+    extensions/source/propctrlr/handlerhelper.cxx:
+    # Actually used
+    - com/sun/star/inspection/LineDescriptor.hpp
+    extensions/source/propctrlr/pcrunodialogs.cxx:
+    # Actually used
+    - com/sun/star/awt/XWindow.hpp
+    extensions/source/propctrlr/sqlcommanddesign.cxx:
+    # Actually used
+    - com/sun/star/sdbc/XConnection.hpp
+    extensions/source/propctrlr/xsddatatypes.cxx:
+    # Actually used
+    - com/sun/star/xsd/XDataType.hpp
+    extensions/source/propctrlr/submissionhandler.cxx:
+    # Actually used
+    - com/sun/star/inspection/XObjectInspectorUI.hpp
+    extensions/source/propctrlr/selectlabeldialog.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySet.hpp
+    extensions/source/propctrlr/xsdvalidationhelper.cxx:
+    # Actually used
+    - com/sun/star/xforms/XDataTypeRepository.hpp
+    extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx:
+    # Actually used
+    - com/sun/star/inspection/XObjectInspectorUI.hpp
diff --git a/extensions/qa/update/test_update.cxx b/extensions/qa/update/test_update.cxx
index f8654edbc40e..fe6316245cc4 100644
--- a/extensions/qa/update/test_update.cxx
+++ b/extensions/qa/update/test_update.cxx
@@ -11,13 +11,10 @@
 #include <cstddef>
 
 #include <test/bootstrapfixture.hxx>
-#include <cppuhelper/bootstrap.hxx>
 
 #include <com/sun/star/deployment/UpdateInformationEntry.hpp>
 #include <com/sun/star/deployment/UpdateInformationProvider.hpp>
 #include <com/sun/star/xml/dom/XNodeList.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include "../../source/update/check/updatecheck.hxx"
 #include "../../source/update/check/updateprotocol.hxx"
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 388568c12651..802b0d853b52 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -27,7 +27,6 @@
 #include <unotools/pathoptions.hxx>
 #include <svl/filenotation.hxx>
 #include <sfx2/docfilt.hxx>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
 namespace abp
 {
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 8b5e734142c5..be1f98daf0eb 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -25,7 +25,6 @@
 #include "typeselectionpage.hxx"
 #include "admininvokationpage.hxx"
 #include "tableselectionpage.hxx"
-#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <osl/diagnose.h>
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index 8b7f034ed99c..a151647a1f9e 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -19,7 +19,6 @@
 
 #include "admininvokationimpl.hxx"
 #include <tools/debug.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/sdbc/DriverManager.hpp>
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index d4cbc5842d37..00ab85a2486a 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -27,8 +27,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/sdb/DatabaseContext.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
@@ -37,7 +35,6 @@
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
-#include <com/sun/star/uno/XNamingService.hpp>
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
 #include <com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.hpp>
 
@@ -45,7 +42,6 @@
 #include <comphelper/processfactory.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <unotools/confignode.hxx>
 #include <unotools/sharedunocomponent.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/weld.hxx>
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index b91101b29b0e..602ffed7f983 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -18,15 +18,12 @@
  */
 
 #include "fieldmappingimpl.hxx"
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/ui/AddressBookSourceDialog.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <tools/debug.hxx>
-#include <vcl/stdtext.hxx>
 #include <vcl/weld.hxx>
 #include <com/sun/star/util/AliasProgrammaticPair.hpp>
 #include <strings.hrc>
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index b8a958c51668..812773213daa 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "unodialogabp.hxx"
-#include <cppuhelper/typeprovider.hxx>
 #include "abspilot.hxx"
 #include <comphelper/sequence.hxx>
 #include <vcl/svapp.hxx>
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 28ac37810c46..2b085f6a3de8 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -20,15 +20,11 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <vcl/edit.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <tools/debug.hxx>
 #include "bibbeam.hxx"
-#include "bibview.hxx"
-#include "bibresid.hxx"
 #include "datman.hxx"
 #include "bibtools.hxx"
 
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 986b9f700eae..a06bc2a6c74d 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -22,8 +22,6 @@
 #include "bibconfig.hxx"
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sdb/DatabaseContext.hpp>
 #include <comphelper/processfactory.hxx>
 #include <o3tl/any.hxx>
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 8d65c0015b7a..562d720a35e8 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -18,17 +18,11 @@
  */
 
 
-#include <cppuhelper/weak.hxx>
 #include <vcl/event.hxx>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/awt/XWindowPeer.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include "bibconfig.hxx"
 
 
-#include "datman.hxx"
 #include "bibcont.hxx"
-#include "bibview.hxx"
 
 
 BibShortCutHandler::~BibShortCutHandler()
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 6098e693c0c1..10067f17b23c 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -19,11 +19,8 @@
 
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <cppuhelper/weak.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <svl/itemprop.hxx>
-#include <uno/environment.h>
-#include <svl/urihelper.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/factory.hxx>
@@ -31,10 +28,8 @@
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
-#include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/frame/XFrameLoader.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -45,10 +40,8 @@
 #include <com/sun/star/text/BibliographyDataField.hpp>
 #include <com/sun/star/form/XLoadListener.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
-#include <com/sun/star/uno/XAggregation.hpp>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <vcl/window.hxx>
-#include <vcl/edit.hxx>
 #include <vcl/svapp.hxx>
 
 #include "bibresid.hxx"
diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx
index 71515a03fe53..3e2cd829c32e 100644
--- a/extensions/source/bibliography/bibmod.cxx
+++ b/extensions/source/bibliography/bibmod.cxx
@@ -18,16 +18,9 @@
  */
 
 #include <unotools/resmgr.hxx>
-#include <svl/urihelper.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/util/XLocalizedAliases.hpp>
-#include <com/sun/star/lang/XLocalizable.hpp>
 
 #include "bibmod.hxx"
 #include "bibprop.hxx"
-#include "bibview.hxx"
 #include "bibresid.hxx"
 #include "datman.hxx"
 #include "bibconfig.hxx"
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index 4f6af6e86415..fbc0f4d2d4ab 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -19,8 +19,6 @@
 
 
 #include <strings.hrc>
-#include "bibcont.hxx"
-#include "bibbeam.hxx"
 #include "general.hxx"
 #include "bibview.hxx"
 #include "datman.hxx"
@@ -31,7 +29,6 @@
 
 #include <vcl/svapp.hxx>
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#include <com/sun/star/form/XLoadable.hpp>
 #include <vcl/weld.hxx>
 #include <tools/debug.hxx>
 
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 06e35ec28d87..bc50ad0fc7af 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -23,16 +23,12 @@
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/io/XPersistObject.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
-#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <com/sun/star/sdb/XDatabaseEnvironment.hpp>
-#include <com/sun/star/uno/XNamingService.hpp>
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/DatabaseContext.hpp>
@@ -46,11 +42,10 @@
 #include <com/sun/star/form/runtime/FormController.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/form/XGridColumnFactory.hpp>
-#include <com/sun/star/io/XDataInputStream.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <svl/urihelper.hxx>
 #include <tools/debug.hxx>
+#include <tools/urlobj.hxx>
 #include <vcl/weld.hxx>
 #include "datman.hxx"
 #include "bibresid.hxx"
diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx
index 29bd584bd662..5e9f7d37aa35 100644
--- a/extensions/source/bibliography/formcontrolcontainer.cxx
+++ b/extensions/source/bibliography/formcontrolcontainer.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "formcontrolcontainer.hxx"
-#include <osl/diagnose.h>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 694d2c31a78c..4bd5bdbd2b27 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -17,15 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/util/URL.hpp>
-#include <vcl/stdtext.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/sequence.hxx>
 #include "framectr.hxx"
 #include "datman.hxx"
-#include "bibview.hxx"
-#include "bibresid.hxx"
-#include <strings.hrc>
 #include <toolkit/helper/vclunohelper.hxx>
 #include "bibconfig.hxx"
 #include <cppuhelper/implbase.hxx>
@@ -34,7 +29,6 @@
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/form/XConfirmDeleteListener.hpp>
 #include <com/sun/star/form/runtime/XFormController.hpp>
-#include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/sdbcx/Privilege.hpp>
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index d1f6f41421c1..6ca1ca09b647 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
@@ -35,19 +34,14 @@
 #include "bibresid.hxx"
 #include "datman.hxx"
 #include "bibconfig.hxx"
-#include "bibprop.hxx"
 #include <strings.hrc>
 #include "bibmod.hxx"
-#include "bibview.hxx"
-#include "bibtools.hxx"
 #include <helpids.h>
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <algorithm>
-#include <functional>
-#include <vector>
 #include <tools/urlobj.hxx>
 
 using namespace ::com::sun::star;
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 5ab0303b90a0..8530f1697316 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -24,18 +24,14 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include "datman.hxx"
+#include "toolbar.hxx"
 #include <o3tl/any.hxx>
-#include <svx/svxids.hrc>
 #include <svtools/miscopt.hxx>
 #include <svtools/imgdef.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/event.hxx>
-#include "bibbeam.hxx"
-#include "bibview.hxx"
-#include "bibresid.hxx"
-#include <strings.hrc>
 #include <bitmaps.hlst>
 
 #include "bibtools.hxx"
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index c20dc735e850..3e275e898443 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -21,8 +21,6 @@
 #include "ldapaccess.hxx"
 
 #include <osl/diagnose.h>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/strbuf.hxx>
 #include <o3tl/char16_t2wchar_t.hxx>
 
 #include <com/sun/star/ldap/LdapConnectionException.hpp>
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx
index a6baa51b0505..e5272711e51d 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.cxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx
@@ -20,11 +20,6 @@
 
 #include "ldapaccess.hxx"
 #include "ldapuserprofilebe.hxx"
-#include <osl/file.hxx>
-#include <osl/module.hxx>
-#include <osl/process.h>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/byteseq.h>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index cf45bd1d1921..883f1a78536c 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -34,7 +34,6 @@
 #include <tools/diagnose_ex.h>
 #include <comphelper/interaction.hxx>
 #include <connectivity/dbtools.hxx>
-#include <vcl/stdtext.hxx>
 #include <sfx2/docfilt.hxx>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 3f979332a1da..c78b5d930865 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -22,7 +22,6 @@
 #include <vector>
 
 #include "gridwizard.hxx"
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/form/XGridColumnFactory.hpp>
 #include <com/sun/star/awt/MouseWheelBehavior.hpp>
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 4e723e1685e3..6892536ae6b5 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -20,10 +20,8 @@
 #include "groupboxwiz.hxx"
 #include "commonpagesdbp.hxx"
 #include <tools/debug.hxx>
-#include <vcl/svapp.hxx>
 #include "optiongrouplayouter.hxx"
 #include <helpids.h>
-#include <comphelper/processfactory.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
 
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index a1440f2468a3..cde03e22356e 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -28,7 +28,6 @@
 #include <tools/diagnose_ex.h>
 #include <connectivity/dbtools.hxx>
 #include <helpids.h>
-#include <sal/log.hxx>
 #include <osl/diagnose.h>
 
 
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index 9b72a92f6938..04cd5a84746b 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -20,14 +20,12 @@
 #include "optiongrouplayouter.hxx"
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/drawing/ShapeCollection.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/drawing/XShapeGrouper.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
-#include "controlwizard.hxx"
 #include "groupboxwiz.hxx"
 #include "dbptools.hxx"
 #include <osl/diagnose.h>
diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx
index 18f589c77ccc..fa55250df2d5 100644
--- a/extensions/source/inc/componentmodule.cxx
+++ b/extensions/source/inc/componentmodule.cxx
@@ -17,14 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <memory>
 #include "componentmodule.hxx"
 #include <unotools/resmgr.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
-#include <svl/solar.hrc>
-#include <tools/debug.hxx>
-#include <rtl/strbuf.hxx>
 #include <osl/diagnose.h>
 
 namespace compmodule
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index 42c51a348701..866833c41fd5 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <com/sun/star/logging/XCsvLogFormatter.hpp>
-#include <com/sun/star/logging/XLogFormatter.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -29,10 +28,8 @@
 #include <cppuhelper/supportsservice.hxx>
 
 #include <rtl/ustrbuf.hxx>
-#include <osl/thread.h>
 
 #include <stdio.h>
-#include <string>
 
 namespace logging
 {
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index cd62535ad15c..222146b0b4d2 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -35,9 +35,7 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <osl/thread.h>
 #include <osl/file.hxx>
-#include <rtl/strbuf.hxx>
 
 #include <memory>
 
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index b882b9d40834..4855380b5000 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -35,13 +35,9 @@
 
 #include <tools/diagnose_ex.h>
 #include <osl/process.h>
-#include <rtl/ustrbuf.hxx>
 
 #include <cppuhelper/component_context.hxx>
 
-#include <vector>
-#include <sal/macros.h>
-
 
 namespace logging
 {
diff --git a/extensions/source/logging/simpletextformatter.cxx b/extensions/source/logging/simpletextformatter.cxx
index 542f696e5d34..83416e61c7d6 100644
--- a/extensions/source/logging/simpletextformatter.cxx
+++ b/extensions/source/logging/simpletextformatter.cxx
@@ -28,9 +28,6 @@
 #include <cppuhelper/supportsservice.hxx>
 
 #include <rtl/ustrbuf.hxx>
-#include <osl/thread.h>
-
-#include <stdio.h>
 
 namespace logging
 {
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index a012a108adb0..17d9c2081de6 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "browserlistbox.hxx"
-#include <strings.hrc>
 #include "pcrcommon.hxx"
 #include "proplinelistener.hxx"
 #include "propcontrolobserver.hxx"
@@ -33,8 +32,6 @@
 #include <tools/diagnose_ex.h>
 #include <comphelper/asyncnotification.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <vcl/commandevent.hxx>
-#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx
index fb4c28d827e5..b599856e123f 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -20,8 +20,6 @@
 #include "browserview.hxx"
 #include "propertyeditor.hxx"
 #include <helpids.h>
-#include <propctrlr.h>
-#include <vcl/event.hxx>
 #include <memory>
 
 namespace pcr
diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx
index 77e83b969c31..5207a9621fc8 100644
--- a/extensions/source/propctrlr/cellbindinghelper.cxx
+++ b/extensions/source/propctrlr/cellbindinghelper.cxx
@@ -23,9 +23,7 @@
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/form/XGridColumnFactory.hpp>
 #include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-#include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/form/XFormsSupplier.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx
index e4c9eac2cd85..6eced5b222f3 100644
--- a/extensions/source/propctrlr/commoncontrol.cxx
+++ b/extensions/source/propctrlr/commoncontrol.cxx
@@ -18,8 +18,6 @@
  */
 
 #include "commoncontrol.hxx"
-#include "pcrcommon.hxx"
-#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
 
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index 6a597aa2f2eb..f6a44d357caf 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -21,7 +21,6 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include "controlfontdialog.hxx"
-#include <cppuhelper/typeprovider.hxx>
 #include <vcl/svapp.hxx>
 #include "fontdialog.hxx"
 #include "formstrings.hxx"
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index 841961788543..45570c757892 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -23,7 +23,6 @@
 #include <helpids.h>
 #include <strings.hrc>
 #include "modulepcr.hxx"
-#include <propctrlr.h>
 #include "formmetadata.hxx"
 
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index 62f16f437728..81c7b77d9a63 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/xsd/DataTypeClass.hpp>
 #include <com/sun/star/form/binding/XListEntrySink.hpp>
 #include <tools/diagnose_ex.h>
-#include <rtl/ustrbuf.hxx>
 
 #include <algorithm>
 #include <o3tl/functional.hxx>
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index d26b6fa57a1f..7b11d1191929 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -22,7 +22,6 @@
 #include "formmetadata.hxx"
 #include "pcrservices.hxx"
 #include <propctrlr.h>
-#include "formbrowsertools.hxx"
 #include "eformshelper.hxx"
 #include "handlerhelper.hxx"
 
@@ -34,8 +33,6 @@
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 
-#include <functional>
-
 
 extern "C" void createRegistryInfo_EFormsPropertyHandler()
 {
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index a62487ecff4c..26d745b4ddc7 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -28,7 +28,6 @@
 #include "handlerhelper.hxx"
 #include "modulepcr.hxx"
 #include "pcrcommon.hxx"
-#include "pcrstrings.hxx"
 #include "propertycontrolextender.hxx"
 
 #include <com/sun/star/awt/XTabControllerModel.hpp>
@@ -59,17 +58,12 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <sfx2/app.hxx>
-#include <svl/eitem.hxx>
-#include <svl/itemset.hxx>
 #include <svx/svxdlg.hxx>
-#include <svx/svxids.hrc>
 #include <tools/diagnose_ex.h>
 
 #include <map>
 #include <algorithm>
 #include <iterator>
-#include <o3tl/functional.hxx>
 
 extern "C" void createRegistryInfo_EventHandler()
 {
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 093b466dc6bd..995f0b94f25f 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -17,10 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sfxsids.hrc>
 #include "fontdialog.hxx"
-#include <strings.hrc>
-#include "modulepcr.hxx"
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index d394bf94abcb..70aaff29210d 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -39,7 +39,6 @@
 #include "usercontrol.hxx"
 
 #include <com/sun/star/lang/NullPointerException.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -100,7 +99,6 @@
 #include <vcl/graph.hxx>
 #include <vcl/unohelp.hxx>
 #include <tools/diagnose_ex.h>
-#include <vcl/stdtext.hxx>
 #include <sal/macros.h>
 #include <sal/log.hxx>
 
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index 52be550ffe7f..196e6b0c2fa5 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -23,7 +23,6 @@
 #include "pcrservices.hxx"
 #include "formstrings.hxx"
 #include "defaultforminspection.hxx"
-#include <propctrlr.h>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/util/VetoException.hpp>
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index 4936214d13d7..3fd9e92b3a0f 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -24,7 +24,6 @@
 #include <helpids.h>
 #include <strings.hrc>
 #include <stringarrays.hrc>
-#include <propctrlr.h>
 #include <comphelper/extract.hxx>
 #include <osl/diagnose.h>
 #include <sal/macros.h>
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 0f5dd6c3f5e9..2f6bee221ed6 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "enumrepresentation.hxx"
 #include "genericpropertyhandler.hxx"
-#include "formmetadata.hxx"
 #include "handlerhelper.hxx"
+#include "modulepcr.hxx"
 #include "pcrservices.hxx"
-#include "propertyhandler.hxx"
 
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/lang/NullPointerException.hpp>
@@ -38,12 +38,12 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/extract.hxx>
+#include <comphelper/sequence.hxx>
 #include <comphelper/types.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <algorithm>
-#include <o3tl/functional.hxx>
 
 extern "C" void createRegistryInfo_GenericPropertyHandler()
 {
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index 148ac41e8a52..f06913275571 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -18,16 +18,11 @@
  */
 
 #include "handlerhelper.hxx"
-#include <strings.hrc>
 #include <yesno.hrc>
 #include "modulepcr.hxx"
-#include "enumrepresentation.hxx"
-#include "formmetadata.hxx"
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/inspection/StringRepresentation.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/inspection/LineDescriptor.hpp>
@@ -35,11 +30,9 @@
 #include <com/sun/star/inspection/XStringListControl.hpp>
 #include <com/sun/star/inspection/XNumericControl.hpp>
 #include <tools/diagnose_ex.h>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/weldutils.hxx>
-#include <vcl/window.hxx>
 
 #include <algorithm>
 
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx
index 2ade8a57a3f5..a57c4ffedbaf 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.cxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "inspectorhelpwindow.hxx"
-#include "modulepcr.hxx"
-#include <strings.hrc>
 
 
 namespace pcr
diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx
index f66847387499..1fdc8a0b5dfc 100644
--- a/extensions/source/propctrlr/inspectormodelbase.cxx
+++ b/extensions/source/propctrlr/inspectormodelbase.cxx
@@ -19,7 +19,6 @@
 
 #include <memory>
 #include "inspectormodelbase.hxx"
-#include "pcrcommon.hxx"
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx
index 4cd7d610fafb..3dec4d7a79d3 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -19,8 +19,6 @@
 
 #include "listselectiondlg.hxx"
 
-#include "modulepcr.hxx"
-#include <strings.hrc>
 #include "formstrings.hxx"
 #include <comphelper/sequence.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/extensions/source/propctrlr/modulepcr.cxx b/extensions/source/propctrlr/modulepcr.cxx
index 88b6d4d97152..37d119e8e824 100644
--- a/extensions/source/propctrlr/modulepcr.cxx
+++ b/extensions/source/propctrlr/modulepcr.cxx
@@ -20,8 +20,6 @@
 #include "modulepcr.hxx"
 
 #include <unotools/resmgr.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
 
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx
index 1b0f4e1c0947..f9bd1df24873 100644
--- a/extensions/source/propctrlr/newdatatype.cxx
+++ b/extensions/source/propctrlr/newdatatype.cxx
@@ -18,8 +18,6 @@
  */
 
 #include "newdatatype.hxx"
-#include "modulepcr.hxx"
-#include <strings.hrc>
 
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx
index ff65c025f43f..90924d7fc7e4 100644
--- a/extensions/source/propctrlr/pcrcommon.cxx
+++ b/extensions/source/propctrlr/pcrcommon.cxx
@@ -18,8 +18,6 @@
  */
 
 #include "pcrcommon.hxx"
-#include "modulepcr.hxx"
-#include <strings.hrc>
 
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <rtl/ustrbuf.hxx>
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index 7b2f456839f2..738e4d933304 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include "modulepcr.hxx"
 #include "pcrservices.hxx"
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 45fb345502a4..1e00a9e33283 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -19,7 +19,6 @@
 
 #include "pcrservices.hxx"
 #include "propcontroller.hxx"
-#include "pcrstrings.hxx"
 #include "handlerhelper.hxx"
 #include "standardcontrol.hxx"
 #include "linedescriptor.hxx"
@@ -27,14 +26,12 @@
 #include "propertyeditor.hxx"
 #include "modulepcr.hxx"
 #include "formstrings.hxx"
-#include "formmetadata.hxx"
 #include "formbrowsertools.hxx"
 #include "propertycomposer.hxx"
 
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
@@ -42,22 +39,15 @@
 #include <com/sun/star/util/VetoException.hpp>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <comphelper/types.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <comphelper/property.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/weldutils.hxx>
 #include <osl/mutex.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/component_context.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <algorithm>
-#include <functional>
-#include <sal/macros.h>
 #include <sal/log.hxx>
 
 // !!! outside the namespace !!!
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index b1997bd79c53..c5b5d32e341c 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -27,7 +27,6 @@
 
 #include <algorithm>
 #include <iterator>
-#include <map>
 
 
 namespace pcr
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index b4f846f10f0f..e30c38020444 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -24,7 +24,6 @@
 #include "handlerhelper.hxx"
 #include "formstrings.hxx"
 
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/lang/NullPointerException.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/script/Converter.hpp>
diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx
index 0158e92160f7..2e54bb642819 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.cxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.cxx
@@ -20,7 +20,6 @@
 #include "sqlcommanddesign.hxx"
 #include "formstrings.hxx"
 #include <command.hrc>
-#include <strings.hrc>
 #include "modulepcr.hxx"
 #include "unourl.hxx"
 
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 52f8d665d4ce..a5e732497512 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -21,6 +21,7 @@
 #include "pcrcommon.hxx"
 
 #include <com/sun/star/beans/IllegalTypeException.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>
@@ -29,26 +30,15 @@
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 #include <comphelper/string.hxx>
 #include <o3tl/float_int_conversion.hxx>
-#include <rtl/math.hxx>
-#include <sfx2/objsh.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
 
 // ugly dependencies for the OColorControl
 #include <svx/svxids.hrc>
-#include <svx/drawitem.hxx>
-#include <svx/xtable.hxx>
 
-#include <svtools/colorcfg.hxx>
-#include <svl/zforlist.hxx>
-#include <unotools/syslocale.hxx>
+#include <tools/datetime.hxx>
 #include <unotools/datetime.hxx>
-#include <i18nlangtag/languagetag.hxx>
-#include <vcl/event.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 
-#include <cstdlib>
 #include <limits>
 #include <memory>
 
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index c16565028355..69a0f6e59fec 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -19,10 +19,9 @@
 
 #include <sal/config.h>
 
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/inspection/XStringRepresentation.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -30,7 +29,6 @@
 #include <com/sun/star/script/XTypeConverter.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/reflection/XConstantsTypeDescription.hpp>
-#include <com/sun/star/beans/XIntrospection.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>
@@ -39,13 +37,11 @@
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
-#include <strings.hrc>
 #include <yesno.hrc>
 #include "pcrservices.hxx"
 #include <comphelper/types.hxx>
 #include "modulepcr.hxx"
 
-#include <functional>
 #include <algorithm>
 
 // component helper namespace
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index 03452bd0638d..2d338e966f05 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -26,14 +26,11 @@
 #include "handlerhelper.hxx"
 
 #include <com/sun/star/form/FormButtonType.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/form/submission/XSubmissionSupplier.hpp>
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
 #include <com/sun/star/lang/NullPointerException.hpp>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <rtl/ustrbuf.hxx>
 
 
 extern "C" void createRegistryInfo_SubmissionPropertyHandler()
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 0c7610f23116..d41018a833b3 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -19,8 +19,6 @@
 
 #include "taborder.hxx"
 
-#include "modulepcr.hxx"
-#include <strings.hrc>
 #include <bitmaps.hlst>
 #include "formstrings.hxx"
 #include <comphelper/types.hxx>
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index b2d2a5384310..cab4402c77d8 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -21,13 +21,11 @@
 
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 #include <svl/numuno.hxx>
-#include <rtl/math.hxx>
 #include <vcl/GraphicObject.hxx>
 #include <vcl/event.hxx>
 #include <tools/debug.hxx>
 #include <svl/zformat.hxx>
 #include <connectivity/dbconversion.hxx>
-#include <com/sun/star/util/Time.hpp>
 #include "modulepcr.hxx"
 #include <strings.hrc>
 
diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx
index 27a101d9999b..fdaea8e21fc8 100644
--- a/extensions/source/propctrlr/xsddatatypes.cxx
+++ b/extensions/source/propctrlr/xsddatatypes.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "xsddatatypes.hxx"
-#include "formstrings.hxx"
 
 #include <com/sun/star/xsd/DataTypeClass.hpp>
 #include <com/sun/star/xsd/XDataType.hpp>
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 0ead90425b61..7d00e32486d2 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -46,7 +46,6 @@
 #include <sal/macros.h>
 
 #include <algorithm>
-#include <functional>
 #include <limits>
 
 
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index c58cf1e15c7c..0127db4a0926 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cstdarg>
 #include <type_traits>
 #include <math.h>
 
@@ -29,9 +28,7 @@
 #include "sane.hxx"
 #include <dlfcn.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <sal/config.h>
 #include <sal/macros.h>
 #include <memory>
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 2a5ad9ea23f3..5b94119b5484 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -25,7 +25,6 @@
 #include <vcl/customweld.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/event.hxx>
 #include "sanedlg.hxx"
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index fd37c7a39ac1..6a81f5fbf6e3 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -22,8 +22,6 @@
 #include <o3tl/safeint.hxx>
 #include <osl/thread.hxx>
 #include <sal/log.hxx>
-#include <tools/solar.h>
-#include <cppuhelper/queryinterface.hxx>
 #include <vcl/svapp.hxx>
 #include <memory>
 
diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx
index 37fe176b35a1..5c5cca36b0d2 100644
--- a/extensions/source/scanner/scnserv.cxx
+++ b/extensions/source/scanner/scnserv.cxx
@@ -18,10 +18,8 @@
  */
 
 #include <cppuhelper/factory.hxx>
-#include <uno/mapping.hxx>
 #include "scanner.hxx"
 
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 using namespace com::sun::star::registry;
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 6b25564725b4..ad7251da2c3d 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -24,7 +24,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <com/sun/star/deployment/UpdateInformationProvider.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/office/Quickstart.hpp>
 #include <com/sun/star/system/SystemShellExecute.hpp>
@@ -33,11 +32,8 @@
 #include <com/sun/star/task/XJob.hpp>
 #include <com/sun/star/task/XJobExecutor.hpp>
 
-#include <rtl/ustrbuf.hxx>
-
 #include <rtl/bootstrap.hxx>
 #include <osl/process.h>
-#include <osl/module.hxx>
 #include <osl/file.hxx>
 #include <sal/macros.h>
 #include <sal/log.hxx>
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index b7a8393806b7..546325e74861 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -19,7 +19,6 @@
 
 #include "updatecheckconfig.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 7a91c1c7bf03..3656a214ff02 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -28,7 +28,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <com/sun/star/frame/Desktop.hpp>
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 23b78f30bf55..a857ea8af76c 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -22,15 +22,11 @@
 #include <helpids.h>
 
 #include <osl/diagnose.h>
-#include <osl/thread.hxx>
 #include <osl/file.hxx>
 #include <rtl/ustring.hxx>
-#include <rtl/bootstrap.hxx>
 
 #include <com/sun/star/uno/Sequence.h>
 
-#include <com/sun/star/style/VerticalAlignment.hpp>
-
 #include <com/sun/star/awt/ActionEvent.hpp>
 #include <com/sun/star/awt/PushButtonType.hpp>
 #include <com/sun/star/awt/UnoControlDialog.hpp>
@@ -64,8 +60,6 @@
 #include <unotools/resmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
 
 #define COMMAND_CLOSE       "close"
 
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index 0b083657b5bc..369489fed399 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -30,12 +30,8 @@
 
 
 #include <rtl/ref.hxx>
-#include <rtl/uri.hxx>
-#include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <rtl/bootstrap.hxx>
 #include <osl/diagnose.h>
-#include <osl/process.h>
 
 namespace container = css::container ;
 namespace deployment = css::deployment ;
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index be7dcef13d85..e6762d635410 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -26,26 +26,20 @@
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/deployment/UpdateInformationEntry.hpp>
-#include <com/sun/star/deployment/UpdateInformationProvider.hpp>
+#include <com/sun/star/deployment/XUpdateInformationProvider.hpp>
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/ucb/UniversalContentBroker.hpp>
 #include <com/sun/star/ucb/XWebDAVCommandEnvironment.hpp>
 #include <com/sun/star/ucb/XCommandProcessor2.hpp>
-#include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
-#include <com/sun/star/ucb/XContentProvider.hpp>
-#include <com/sun/star/ucb/XInteractionSupplyAuthentication.hpp>
 #include <com/sun/star/ucb/OpenCommandArgument3.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/task/PasswordContainerInteractionHandler.hpp>
 #include <com/sun/star/xml/dom/DocumentBuilder.hpp>
 #include <com/sun/star/xml/xpath/XPathAPI.hpp>
@@ -55,7 +49,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
-#include <osl/process.h>
 #include <osl/conditn.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 8c7c311a84c4..bb923cbd21ed 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -18,13 +18,10 @@
  */
 
 
-#include <list>
-
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/document/XDocumentEventListener.hpp>
 #include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>