tdf#42949 Fix IWYU warnings in extensions/source/*/*hxx

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

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

78 files changed, 63 insertions, 96 deletions

diff --git a/extensions/IwyuFilter_extensions.yaml b/extensions/IwyuFilter_extensions.yaml
new file mode 100644
index 000000000000..712079f6e7c7
--- /dev/null
+++ b/extensions/IwyuFilter_extensions.yaml
@@ -0,0 +1,6 @@
+---
+assumeFilename: extensions/source/propctrlr/formcomponenthandler.cxx
+blacklist:
+    extensions/source/logging/loghandler.hxx:
+    # Don't propose hxx -> h change in URE libs
+    - cppuhelper/interfacecontainer.hxx
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index d48ad56aab09..28ac37810c46 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -24,6 +24,7 @@
 #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"
diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx
index 97d84339d52f..57216922b7c7 100644
--- a/extensions/source/bibliography/bibbeam.hxx
+++ b/extensions/source/bibliography/bibbeam.hxx
@@ -21,9 +21,6 @@
 #define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBBEAM_HXX
 
 #include <com/sun/star/awt/XControlContainer.hpp>
-#include <com/sun/star/awt/XControl.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
-#include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
 #include "toolbar.hxx"
 #include "formcontrolcontainer.hxx"
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index 73b8f2c8ad16..aca9f0e68fc3 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBCONT_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBCONT_HXX
 
-#include <com/sun/star/frame/XFrame.hpp>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include "bibshortcuthandler.hxx"
diff --git a/extensions/source/bibliography/bibmod.hxx b/extensions/source/bibliography/bibmod.hxx
index 10f2777d838d..e651f720e753 100644
--- a/extensions/source/bibliography/bibmod.hxx
+++ b/extensions/source/bibliography/bibmod.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBMOD_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBMOD_HXX
 
+#include <locale>
+
 class BibDataManager;
 class BibConfig;
 
diff --git a/extensions/source/bibliography/bibprop.hxx b/extensions/source/bibliography/bibprop.hxx
index 57e5687ffdb3..85ba484d6ac9 100644
--- a/extensions/source/bibliography/bibprop.hxx
+++ b/extensions/source/bibliography/bibprop.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HXX
 
+#include <rtl/ustring.hxx>
+
 extern const OUString FM_PROP_LABEL;
 extern const OUString FM_PROP_NAME;
 extern const OUString FM_PROP_CONTROLSOURCE;
diff --git a/extensions/source/bibliography/bibtools.hxx b/extensions/source/bibliography/bibtools.hxx
index 86a316fdb7ef..1fc9f0a358b2 100644
--- a/extensions/source/bibliography/bibtools.hxx
+++ b/extensions/source/bibliography/bibtools.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBTOOLS_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBTOOLS_HXX
 
-#include <vcl/taskpanelist.hxx>
+#include <vcl/window.hxx>
 
 namespace bib
 {
diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx
index 5ac24ae9bc03..cd6d77633346 100644
--- a/extensions/source/bibliography/bibview.hxx
+++ b/extensions/source/bibliography/bibview.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBVIEW_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBVIEW_HXX
 
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include "formcontrolcontainer.hxx"
 #include "bibshortcuthandler.hxx"
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index eab668b7e571..3be03aaa9197 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -20,9 +20,10 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_DATMAN_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_DATMAN_HXX
 
+#include "bibview.hxx"
+
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/form/XForm.hpp>
-#include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 #include <com/sun/star/form/runtime/XFormController.hpp>
 #include <cppuhelper/compbase.hxx>
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 21e5f7b23fae..22a0900f707d 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -19,11 +19,10 @@
 
 #ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_FRAMECTR_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_FRAMECTR_HXX
-#include <com/sun/star/beans/XPropertyChangeListener.hpp>
+
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/frame/XDispatchInformationProvider.hpp>
 #include <cppuhelper/implbase.hxx>
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 450bcc9ef882..d1f6f41421c1 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -28,6 +28,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <vcl/builder.hxx>
+#include <vcl/scrbar.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/fixed.hxx>
 #include "general.hxx"
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 6c0dc6899762..f48573fa5eb4 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -27,7 +27,6 @@
 
 #include <vcl/layout.hxx>
 #include <vcl/tabpage.hxx>
-#include <vcl/scrbar.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include "bibshortcuthandler.hxx"
 
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index afc36c106b11..c20dc735e850 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -25,6 +25,8 @@
 #include <rtl/strbuf.hxx>
 #include <o3tl/char16_t2wchar_t.hxx>
 
+#include <com/sun/star/ldap/LdapConnectionException.hpp>
+
 
 namespace extensions::config::ldap {
 
diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx
index 7ed05a7b6078..a0e6bce3b569 100644
--- a/extensions/source/config/ldap/ldapaccess.hxx
+++ b/extensions/source/config/ldap/ldapaccess.hxx
@@ -36,9 +36,7 @@
 
 #include <com/sun/star/ldap/LdapGenericException.hpp>
 
-#include <com/sun/star/ldap/LdapConnectionException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <osl/module.h>
 
 namespace extensions { namespace config { namespace ldap {
 
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx
index 100a6061d615..88f14eabc474 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.hxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx
@@ -21,10 +21,8 @@
 #define INCLUDED_EXTENSIONS_SOURCE_CONFIG_LDAP_LDAPUSERPROFILEBE_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <cppuhelper/compbase.hxx>
 
 #include "ldapaccess.hxx"
diff --git a/extensions/source/dbpilots/dbpservices.hxx b/extensions/source/dbpilots/dbpservices.hxx
index 2d135df17287..2feea60c17b3 100644
--- a/extensions/source/dbpilots/dbpservices.hxx
+++ b/extensions/source/dbpilots/dbpservices.hxx
@@ -22,8 +22,6 @@
 
 #include <sal/config.h>
 
-#include <sal/types.h>
-
 extern "C" {
 
 void createRegistryInfo_OGridWizard();
diff --git a/extensions/source/dbpilots/dbptypes.hxx b/extensions/source/dbpilots/dbptypes.hxx
index 0f0630e6eace..976e4f24d0d9 100644
--- a/extensions/source/dbpilots/dbptypes.hxx
+++ b/extensions/source/dbpilots/dbptypes.hxx
@@ -22,6 +22,8 @@
 
 #include <sal/config.h>
 
+#include <rtl/ustring.hxx>
+
 #include <map>
 #include <set>
 
diff --git a/extensions/source/dbpilots/optiongrouplayouter.hxx b/extensions/source/dbpilots/optiongrouplayouter.hxx
index f6ccccf62b2a..7891f10d90c2 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.hxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.hxx
@@ -20,11 +20,8 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_OPTIONGROUPLAYOUTER_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_OPTIONGROUPLAYOUTER_HXX
 
-#include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/drawing/XControlShape.hpp>
-#include "dbptypes.hxx"
 
 
 namespace dbp
diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx
index 899c0f9e6315..d697ab86644e 100644
--- a/extensions/source/inc/componentmodule.hxx
+++ b/extensions/source/inc/componentmodule.hxx
@@ -25,14 +25,10 @@
     More precise, you find helper classes to ease the use of resources and the registration of services.
 */
 
-#include <osl/mutex.hxx>
-#include <unotools/resmgr.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <cppuhelper/factory.hxx>
-#include <rtl/string.hxx>
 #include <vector>
 
 namespace compmodule
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
index 94f8d7e4124b..50adc854e3d0 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
@@ -23,6 +23,7 @@
 #include <vcl/svapp.hxx>
 #include "MasterDetailLinkDialog.hxx"
 #include "formlinkdialog.hxx"
+#include "modulepcr.hxx"
 #include "pcrservices.hxx"
 
 extern "C" void createRegistryInfo_MasterDetailLinkDialog()
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
index 167fab31dc4d..d18560794fc5 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
@@ -21,7 +21,6 @@
 
 #include <comphelper/proparrhlp.hxx>
 #include <svtools/genericunodialog.hxx>
-#include "modulepcr.hxx"
 
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index a73f264db445..a012a108adb0 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -19,6 +19,7 @@
 
 #include "browserlistbox.hxx"
 #include <strings.hrc>
+#include "pcrcommon.hxx"
 #include "proplinelistener.hxx"
 #include "propcontrolobserver.hxx"
 #include "linedescriptor.hxx"
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index aa312b6fd071..aac20fc5d7c8 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -21,19 +21,13 @@
 #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERLISTBOX_HXX
 
 #include "browserline.hxx"
-#include "modulepcr.hxx"
-#include "pcrcommon.hxx"
 
 #include <com/sun/star/inspection/XPropertyControl.hpp>
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <vcl/weld.hxx>
-#include <tools/link.hxx>
 #include <rtl/ref.hxx>
 
-#include <limits>
 #include <memory>
-#include <set>
-#include <unordered_map>
 #include <vector>
 
 #define EDITOR_LIST_REPLACE_EXISTING \
diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx
index cb13f1383050..6ac48fd221aa 100644
--- a/extensions/source/propctrlr/browserpage.hxx
+++ b/extensions/source/propctrlr/browserpage.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERPAGE_HXX
 
 #include <o3tl/deleter.hxx>
-#include <vcl/builderpage.hxx>
 #include "browserlistbox.hxx"
 
 namespace pcr
diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx
index 6201aacd217f..ac2042b84b10 100644
--- a/extensions/source/propctrlr/browserview.hxx
+++ b/extensions/source/propctrlr/browserview.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERVIEW_HXX
 
 #include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <o3tl/deleter.hxx>
 #include <vcl/weld.hxx>
diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx
index 9dec4bcd5169..7814ce5b8ad4 100644
--- a/extensions/source/propctrlr/cellbindinghandler.hxx
+++ b/extensions/source/propctrlr/cellbindinghandler.hxx
@@ -22,7 +22,6 @@
 
 #include "propertyhandler.hxx"
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <rtl/ref.hxx>
 
 #include <memory>
diff --git a/extensions/source/propctrlr/cellbindinghelper.hxx b/extensions/source/propctrlr/cellbindinghelper.hxx
index 30e70c34272e..0f1fb8b91fa6 100644
--- a/extensions/source/propctrlr/cellbindinghelper.hxx
+++ b/extensions/source/propctrlr/cellbindinghelper.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/table/CellRangeAddress.hpp>
 #include <com/sun/star/form/binding/XValueBinding.hpp>
 #include <com/sun/star/form/binding/XListEntrySource.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
 
 
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index fc77505352f5..af9332c4696e 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -25,11 +25,8 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <tools/link.hxx>
-#include <tools/wintypes.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/weldutils.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <type_traits>
 
 class NotifyEvent;
 class ColorListBox;
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index 4d59e51f9544..61c207341abd 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -18,16 +18,20 @@
  */
 
 #include "composeduiupdate.hxx"
+#include "pcrcommon.hxx"
 
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/NullPointerException.hpp>
 #include <com/sun/star/inspection/PropertyLineElement.hpp>
+#include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 #include <cppuhelper/implbase.hxx>
 
 #include <algorithm>
+#include <map>
+#include <set>
 
 
 namespace pcr
diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx
index 7e3f9f128be6..a3d620c003a3 100644
--- a/extensions/source/propctrlr/composeduiupdate.hxx
+++ b/extensions/source/propctrlr/composeduiupdate.hxx
@@ -20,12 +20,9 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_COMPOSEDUIUPDATE_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_COMPOSEDUIUPDATE_HXX
 
-#include "propertyhandler.hxx"
-
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
+#include <com/sun/star/inspection/XPropertyHandler.hpp>
 
-#include <map>
-#include <set>
 #include <memory>
 
 
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index 03d1db272e60..6a597aa2f2eb 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -25,6 +25,7 @@
 #include <vcl/svapp.hxx>
 #include "fontdialog.hxx"
 #include "formstrings.hxx"
+#include "modulepcr.hxx"
 #include "pcrcommon.hxx"
 #include "pcrservices.hxx"
 
diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx
index 89fc5920d4e5..c48b7fd9b4fa 100644
--- a/extensions/source/propctrlr/controlfontdialog.hxx
+++ b/extensions/source/propctrlr/controlfontdialog.hxx
@@ -22,7 +22,6 @@
 
 #include <comphelper/proparrhlp.hxx>
 #include <svtools/genericunodialog.hxx>
-#include "modulepcr.hxx"
 
 class SfxItemSet;
 class SfxItemPool;
diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx
index c21292f1bd2e..0fd28b1e4cfd 100644
--- a/extensions/source/propctrlr/defaultforminspection.hxx
+++ b/extensions/source/propctrlr/defaultforminspection.hxx
@@ -21,6 +21,8 @@
 
 #include "inspectormodelbase.hxx"
 
+#include <com/sun/star/uno/XComponentContext.hpp>
+
 #include <memory>
 
 
diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx
index 90428590e670..ef7a94596e34 100644
--- a/extensions/source/propctrlr/enumrepresentation.hxx
+++ b/extensions/source/propctrlr/enumrepresentation.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_ENUMREPRESENTATION_HXX
 
 #include <com/sun/star/uno/Any.hxx>
-#include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index 059c68433435..bb1b982b4f9b 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_EVENTHANDLER_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_EVENTHANDLER_HXX
 
-#include "pcrcommontypes.hxx"
 #include "pcrcommon.hxx"
 
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
@@ -31,6 +30,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/compbase.hxx>
 
+#include <unordered_map>
 
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 147a614de217..d394bf94abcb 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -34,6 +34,7 @@
 #include "listselectiondlg.hxx"
 #include "pcrcommon.hxx"
 #include "selectlabeldialog.hxx"
+#include "standardcontrol.hxx"
 #include "taborder.hxx"
 #include "usercontrol.hxx"
 
diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx
index e43cdec09891..019d6ecf8357 100644
--- a/extensions/source/propctrlr/formcomponenthandler.hxx
+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
@@ -23,15 +23,12 @@
 #include <memory>
 #include "propertyhandler.hxx"
 #include "sqlcommanddesign.hxx"
-#include "pcrcommon.hxx"
 #include <comphelper/uno3.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
-#include <com/sun/star/form/XForm.hpp>
-#include <tools/fldunit.hxx>
 #include <connectivity/dbtools.hxx>
 
 #include <set>
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index b9eb032776b0..52be550ffe7f 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "formcontroller.hxx"
+#include "modulepcr.hxx"
 #include "pcrcommon.hxx"
 #include "pcrservices.hxx"
 #include "formstrings.hxx"
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index f6a2d7a15d31..99ff37e2efaa 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -43,6 +43,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/componentbase.hxx>
+#include <rtl/ref.hxx>
 #include <tools/diagnose_ex.h>
 
 namespace pcr
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 005c80d25853..2ff5ce0c20e4 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -46,7 +46,6 @@ namespace pcr
 
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::lang;
-    using namespace ::com::sun::star::form;
     using namespace ::com::sun::star::sdb;
     using namespace ::com::sun::star::sdbc;
     using namespace ::com::sun::star::sdbcx;
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index 45d669137120..fe1c64b0159f 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -22,8 +22,6 @@
 
 #include <vcl/weld.hxx>
 
-#include <com/sun/star/form/XForm.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index f2e3c0328c84..4936214d13d7 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -19,6 +19,7 @@
 
 #include "formmetadata.hxx"
 #include "formstrings.hxx"
+#include "modulepcr.hxx"
 #include <command.hrc>
 #include <helpids.h>
 #include <strings.hrc>
diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx
index c67f75e6d4aa..f72266712eab 100644
--- a/extensions/source/propctrlr/formmetadata.hxx
+++ b/extensions/source/propctrlr/formmetadata.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMMETADATA_HXX
 
 #include "propertyinfo.hxx"
-#include "modulepcr.hxx"
 #include "enumrepresentation.hxx"
 
 
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 7768a74caa69..0f5dd6c3f5e9 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -21,6 +21,7 @@
 #include "formmetadata.hxx"
 #include "handlerhelper.hxx"
 #include "pcrservices.hxx"
+#include "propertyhandler.hxx"
 
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/lang/NullPointerException.hpp>
diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx
index 9f2fceca768d..3f197ffad9b3 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.hxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.hxx
@@ -20,15 +20,17 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_GENERICPROPERTYHANDLER_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_GENERICPROPERTYHANDLER_HXX
 
-#include "propertyhandler.hxx"
 #include "pcrcommontypes.hxx"
 #include "pcrcommon.hxx"
 
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XIntrospectionAccess.hpp>
+#include <com/sun/star/inspection/XPropertyHandler.hpp>
+#include <com/sun/star/script/XTypeConverter.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/compbase.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 #include <rtl/ref.hxx>
 
 #include <map>
diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx
index bf2aec5baf9c..6d61cd12e10a 100644
--- a/extensions/source/propctrlr/handlerhelper.hxx
+++ b/extensions/source/propctrlr/handlerhelper.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
-#include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/inspection/XPropertyControlFactory.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/Optional.hpp>
diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx
index 5156e1c68dc0..09a4901681a2 100644
--- a/extensions/source/propctrlr/inspectormodelbase.hxx
+++ b/extensions/source/propctrlr/inspectormodelbase.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/inspection/XObjectInspectorModel.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/propshlp.hxx>
diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx
index df44fbb415f8..04b1b23b78b9 100644
--- a/extensions/source/propctrlr/linedescriptor.hxx
+++ b/extensions/source/propctrlr/linedescriptor.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_LINEDESCRIPTOR_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_LINEDESCRIPTOR_HXX
 
-#include <vcl/image.hxx>
 #include <com/sun/star/inspection/LineDescriptor.hpp>
+#include <com/sun/star/inspection/XPropertyHandler.hpp>
 
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/pcrservices.hxx b/extensions/source/propctrlr/pcrservices.hxx
index f6649cc39d09..f92323889d4a 100644
--- a/extensions/source/propctrlr/pcrservices.hxx
+++ b/extensions/source/propctrlr/pcrservices.hxx
@@ -22,8 +22,6 @@
 
 #include <sal/config.h>
 
-#include <sal/types.h>
-
 extern "C" {
 
 void createRegistryInfo_ButtonNavigationHandler();
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index e54b9438a8fa..7b2f456839f2 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
+#include "modulepcr.hxx"
 #include "pcrservices.hxx"
 #include "pcrunodialogs.hxx"
 #include "formstrings.hxx"
diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx
index 99dbee245023..9ad4387c4463 100644
--- a/extensions/source/propctrlr/pcrunodialogs.hxx
+++ b/extensions/source/propctrlr/pcrunodialogs.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PCRUNODIALOGS_HXX
 
 #include <svtools/genericunodialog.hxx>
-#include "modulepcr.hxx"
 #include <com/sun/star/awt/XTabControllerModel.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <comphelper/proparrhlp.hxx>
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 54b6a1bea66a..45fb345502a4 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -32,6 +32,7 @@
 #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>
@@ -70,7 +71,6 @@ namespace pcr
     using namespace ::com::sun::star;
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::awt;
-    using namespace ::com::sun::star::form;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::script;
     using namespace ::com::sun::star::lang;
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index 7cfeba92030e..1afc7a7728b2 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -21,35 +21,24 @@
 #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPCONTROLLER_HXX
 
 #include "composeduiupdate.hxx"
-#include "formbrowsertools.hxx"
-#include "formmetadata.hxx"
 #include "proplinelistener.hxx"
 #include "propcontrolobserver.hxx"
 #include "browserview.hxx"
-#include "modulepcr.hxx"
-#include "propertyinfo.hxx"
 
 #include <com/sun/star/awt/XFocusListener.hpp>
-#include <com/sun/star/beans/XPropertyState.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/form/XForm.hpp>
-#include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/awt/XLayoutConstrains.hpp>
-#include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/inspection/XPropertyControlFactory.hpp>
 #include <com/sun/star/inspection/XObjectInspector.hpp>
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <connectivity/dbtools.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
+#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <vcl/weld.hxx>
diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx
index fd7818eeb8c5..7b43a809b4fa 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -24,11 +24,8 @@
 #include "composeduiupdate.hxx"
 #include "formbrowsertools.hxx"
 
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/beans/UnknownPropertyException.hpp>
-#include <com/sun/star/beans/PropertyVetoException.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index db9a55233928..82a81ea2c7b0 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYEDITOR_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYEDITOR_HXX
 
+#include "browserpage.hxx"
 #include "pcrcommon.hxx"
 
 #include <com/sun/star/inspection/XPropertyControl.hpp>
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index 2f4cb7652fb3..b667a50a8f38 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -34,10 +34,8 @@
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/DateTime.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <osl/interlck.h>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase1.hxx>
diff --git a/extensions/source/propctrlr/proplinelistener.hxx b/extensions/source/propctrlr/proplinelistener.hxx
index cd9ee5f3fca3..f0558b8735c0 100644
--- a/extensions/source/propctrlr/proplinelistener.hxx
+++ b/extensions/source/propctrlr/proplinelistener.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPLINELISTENER_HXX
 
 #include <rtl/ustring.hxx>
-
+#include <com/sun/star/uno/Any.hxx>
 
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 2f963ea81c5c..b82677eb039c 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -22,6 +22,7 @@
 #include <bitmaps.hlst>
 #include "formbrowsertools.hxx"
 #include "formstrings.hxx"
+#include "modulepcr.hxx"
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx
index a380dba739ed..2d2fd3188302 100644
--- a/extensions/source/propctrlr/selectlabeldialog.hxx
+++ b/extensions/source/propctrlr/selectlabeldialog.hxx
@@ -22,7 +22,6 @@
 
 #include <vcl/weld.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "modulepcr.hxx"
 
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx
index fe99a7ece42c..5048f183a0aa 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.hxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <connectivity/dbtools.hxx>
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 60dab204547c..52f8d665d4ce 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -31,6 +31,7 @@
 #include <o3tl/float_int_conversion.hxx>
 #include <rtl/math.hxx>
 #include <sfx2/objsh.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 
 // ugly dependencies for the OColorControl
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index 3eaf71f5a1f7..710eff79e3e5 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -30,8 +30,6 @@
 #include <svtools/ctrlbox.hxx>
 #include <svx/colorbox.hxx>
 
-#include <set>
-
 namespace pcr
 {
 
diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx
index 2832852fe459..cd4328bde221 100644
--- a/extensions/source/propctrlr/submissionhandler.hxx
+++ b/extensions/source/propctrlr/submissionhandler.hxx
@@ -24,7 +24,6 @@
 #include "propertyhandler.hxx"
 #include "eformshelper.hxx"
 
-#include <com/sun/star/xforms/XSubmission.hpp>
 #include <comphelper/propmultiplex.hxx>
 #include <rtl/ref.hxx>
 
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 960686e20323..0c7610f23116 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -26,6 +26,7 @@
 #include <comphelper/types.hxx>
 #include <comphelper/property.hxx>
 #include <cppuhelper/implbase.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/form/runtime/FormController.hpp>
 #include <osl/diagnose.h>
diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx
index 5cbe5d82bb8f..4ce5a664943b 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/awt/XTabControllerModel.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <vcl/weld.hxx>
diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx
index b95f9b663be0..93969d2afb21 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -23,7 +23,6 @@
 #include "commoncontrol.hxx"
 #include <svtools/inettbc.hxx>
 #include <svl/zforlist.hxx>
-#include "standardcontrol.hxx"
 
 class SvNumberFormatsSupplierObj;
 
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index 135fe8872048..7963e677128a 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -18,12 +18,17 @@
  */
 #pragma once
 
+#include <cppuhelper/implbase.hxx>
 #include <osl/thread.h>
 #include <osl/module.h>
 #include <tools/stream.hxx>
 #include <tools/link.hxx>
 #include <sane/sane.h>
-#include "scanner.hxx"
+
+#include <com/sun/star/awt/XBitmap.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+
+using namespace com::sun::star::uno;
 
 
 class BitmapTransporter: public cppu::WeakImplHelper<css::awt::XBitmap>
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index da3b9d7b80c4..9f59fccc6957 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -30,9 +30,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/scanner/XScannerManager2.hpp>
-#include <com/sun/star/scanner/ScannerException.hpp>
 
 using namespace cppu;
 using namespace com::sun::star::uno;
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index 41c0b66dba24..fd37c7a39ac1 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -27,6 +27,8 @@
 #include <vcl/svapp.hxx>
 #include <memory>
 
+#include <com/sun/star/scanner/ScannerException.hpp>
+
 BitmapTransporter::BitmapTransporter()
 {
     SAL_INFO("extensions.scanner", "BitmapTransporter");
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 131cf5f50a1b..a346b4b5064c 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/scanner/ScannerException.hpp>
 
 #include "twain32shim.hxx"
 
diff --git a/extensions/source/update/check/actionlistener.hxx b/extensions/source/update/check/actionlistener.hxx
index 33304b711118..6253d7e643e1 100644
--- a/extensions/source/update/check/actionlistener.hxx
+++ b/extensions/source/update/check/actionlistener.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_ACTIONLISTENER_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_ACTIONLISTENER_HXX
 
-#include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
 class IActionListener : public virtual salhelper::SimpleReferenceObject
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
index a40b7b1c5367..b59ab56dcfe9 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -21,6 +21,7 @@
 #include <curl/curl.h>
 
 #include <osl/diagnose.h>
+#include <osl/file.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/extensions/source/update/check/download.hxx b/extensions/source/update/check/download.hxx
index 9ecce2e55119..c21671ef44db 100644
--- a/extensions/source/update/check/download.hxx
+++ b/extensions/source/update/check/download.hxx
@@ -25,7 +25,6 @@
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/conditn.hxx>
-#include <osl/file.h>
 #include <salhelper/simplereferenceobject.hxx>
 
 struct DownloadInteractionHandler : public virtual salhelper::SimpleReferenceObject
diff --git a/extensions/source/update/check/onlinecheck.hxx b/extensions/source/update/check/onlinecheck.hxx
index 78d1bf4252d2..5b3cd74d2aa8 100644
--- a/extensions/source/update/check/onlinecheck.hxx
+++ b/extensions/source/update/check/onlinecheck.hxx
@@ -22,8 +22,6 @@
 
 #include <sal/config.h>
 
-#include <sal/types.h>
-
 #if defined(_WIN32)
 extern "C" bool WNT_hasInternetConnection();
 #endif
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 9f49ad6129b3..6b25564725b4 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -23,6 +23,7 @@
 
 #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>
diff --git a/extensions/source/update/check/updatecheckconfiglistener.hxx b/extensions/source/update/check/updatecheckconfiglistener.hxx
index 277ca23e0643..b251220de44e 100644
--- a/extensions/source/update/check/updatecheckconfiglistener.hxx
+++ b/extensions/source/update/check/updatecheckconfiglistener.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATECHECKCONFIGLISTENER_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATECHECKCONFIGLISTENER_HXX
 
-#include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
 /* This interface should be implemented by classes acting
diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx
index bb49d779ed6c..7bdddf4c15de 100644
--- a/extensions/source/update/check/updatehdl.hxx
+++ b/extensions/source/update/check/updatehdl.hxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <cppuhelper/implbase.hxx>
+#include <rtl/ref.hxx>
 
 #include "actionlistener.hxx"
 
diff --git a/extensions/source/update/check/updateprotocol.hxx b/extensions/source/update/check/updateprotocol.hxx
index 96e7ed8932ac..5b6422a02e1b 100644
--- a/extensions/source/update/check/updateprotocol.hxx
+++ b/extensions/source/update/check/updateprotocol.hxx
@@ -22,9 +22,8 @@
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/deployment/UpdateInformationProvider.hpp>
+#include <com/sun/star/deployment/XUpdateInformationProvider.hpp>
 
-#include <vector>
 #include "updateinfo.hxx"
 
 // Returns 'true' if successfully connected to the update server