diff --git a/editeng/IwyuFilter_editeng.yaml b/editeng/IwyuFilter_editeng.yaml
index 3e6d3f79d9ea..45f989e4fb51 100644
--- a/editeng/IwyuFilter_editeng.yaml
+++ b/editeng/IwyuFilter_editeng.yaml
@@ -20,9 +20,18 @@ excludelist:
     editeng/source/items/CustomPropertyField.cxx:
     # Actually used
     - com/sun/star/document/XDocumentProperties.hpp
+    editeng/source/items/frmitems.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
+    editeng/source/items/textitem.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
     editeng/source/misc/SvXMLAutoCorrectExport.cxx:
     # Actually used
     - com/sun/star/xml/sax/XDocumentHandler.hpp
+    editeng/source/misc/unolingu.cxx:
+    # NEeded for OSL_DEBUG_LEVEL > 1
+    - com/sun/star/frame/XStorable.hpp
     editeng/source/uno/unotext.cxx:
     # Needed for macro defines
     - editeng/unoprnms.hxx
diff --git a/editeng/inc/AccessibleStringWrap.hxx b/editeng/inc/AccessibleStringWrap.hxx
index 022c63086b24..5281becdde61 100644
--- a/editeng/inc/AccessibleStringWrap.hxx
+++ b/editeng/inc/AccessibleStringWrap.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <editeng/editengdllapi.h>
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index bfbba8257424..11d18adae056 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -37,7 +37,6 @@
 #include <editeng/emphasismarkitem.hxx>
 #include <editeng/charscaleitem.hxx>
 #include <editeng/charreliefitem.hxx>
-#include <editeng/xmlcnitm.hxx>
 #include <editeng/editids.hrc>
 #include <editeng/editdata.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 3133126ba638..35965e1e276a 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -66,7 +66,6 @@
 #include <comphelper/lok.hxx>
 #include <sfx2/viewsh.hxx>
 #include <osl/diagnose.h>
-#include <sfx2/lokhelper.hxx>
 #include <boost/property_tree/json_parser.hpp>
 #include <sfx2/dispatch.hxx>
 
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 9e82cedf32f4..03615ca3e465 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -41,7 +41,7 @@
 #include <comphelper/string.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/lokhelper.hxx>
-#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index fb70bf4b1844..a271aa37c1e6 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -32,7 +32,6 @@
 #include <editeng/editview.hxx>
 #include <editeng/escapementitem.hxx>
 #include <editeng/txtrange.hxx>
-#include <editeng/colritem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/lrspitem.hxx>
@@ -54,7 +53,6 @@
 
 #include <unotools/configmgr.hxx>
 
-#include <set>
 #include <math.h>
 #include <vcl/metric.hxx>
 #include <com/sun/star/i18n/BreakIterator.hpp>
@@ -70,7 +68,6 @@
 #include <o3tl/sorted_vector.hxx>
 #include <osl/diagnose.h>
 #include <comphelper/string.hxx>
-#include <comphelper/lok.hxx>
 #include <memory>
 
 #include <vcl/outdev/ScopedStates.hxx>
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index e9f5a6df6d59..283fc2fb6eab 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/graphic/XGraphic.hpp>
 
 #include <osl/diagnose.h>
-#include <sal/log.hxx>
 #include <i18nutil/unicode.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
index 9128995a7ecc..352f77385a67 100644
--- a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
@@ -13,8 +13,6 @@
 #include <sal/types.h>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnamespace.hxx>
-#include <cppuhelper/implbase.hxx>
-#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
 #include <com/sun/star/xml/sax/FastToken.hpp>
 #include <sax/fastattribs.hxx>
 
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index f15e57c8f704..6761f8b8b622 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -31,8 +31,6 @@
 #include <rtl/instance.hxx>
 #include <tools/debug.hxx>
 
-#include <editeng/fontitem.hxx>
-#include <editeng/tstpitem.hxx>
 #include <editeng/unoprnms.hxx>
 #include <editeng/unotext.hxx>
 #include <editeng/unoedsrc.hxx>
diff --git a/embeddedobj/IwyuFilter_embeddedobj.yaml b/embeddedobj/IwyuFilter_embeddedobj.yaml
index 206c94c69fa8..cee5248e9e39 100644
--- a/embeddedobj/IwyuFilter_embeddedobj.yaml
+++ b/embeddedobj/IwyuFilter_embeddedobj.yaml
@@ -30,3 +30,6 @@ excludelist:
     embeddedobj/source/commonembedding/embedobj.cxx:
     # Don't propose hxx -> h change in URE libs
     - cppuhelper/interfacecontainer.hxx
+    embeddedobj/source/msole/xolefactory.cxx:
+    # Actually used
+    - com/sun/star/beans/PropertyValue.hpp
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index dbe7ff0dba54..a4cc71c0f8d8 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -21,7 +21,6 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XEmbeddedOleObject.hpp>
 #include <com/sun/star/embed/XInplaceObject.hpp>
diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx
index 5fdb5ec94f72..7cfcce4fd13a 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/embed/VerbDescriptor.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/implbase.hxx>
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index 21a53e2a5306..19084209e7d3 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -31,10 +31,10 @@
 #include <comphelper/seqstream.hxx>
 #include <filter/msfilter/classids.hxx>
 #include <sal/log.hxx>
-#include <tools/diagnose_ex.h>
 
 #if defined(_WIN32)
 #include "olecomponent.hxx"
+#include <tools/diagnose_ex.h>
 #endif
 
 using namespace ::com::sun::star;
diff --git a/embeddedobj/source/msole/ownview.hxx b/embeddedobj/source/msole/ownview.hxx
index 1470df0d7cf5..5277602bb198 100644
--- a/embeddedobj/source/msole/ownview.hxx
+++ b/embeddedobj/source/msole/ownview.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/XCloseListener.hpp>
 #include <com/sun/star/document/XEventListener.hpp>
 #include <com/sun/star/frame/XModel.hpp>
diff --git a/embeddedobj/source/msole/xdialogcreator.hxx b/embeddedobj/source/msole/xdialogcreator.hxx
index acb94a82082f..a7c28df80246 100644
--- a/embeddedobj/source/msole/xdialogcreator.hxx
+++ b/embeddedobj/source/msole/xdialogcreator.hxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/embed/XInsertObjectDialog.hpp>
 #include <com/sun/star/embed/XEmbedObjectClipboardCreator.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <cppuhelper/implbase.hxx>
diff --git a/embeddedobj/source/msole/xolefactory.hxx b/embeddedobj/source/msole/xolefactory.hxx
index aedea8d7056c..56e632202a2b 100644
--- a/embeddedobj/source/msole/xolefactory.hxx
+++ b/embeddedobj/source/msole/xolefactory.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <com/sun/star/embed/XEmbeddedObjectCreator.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index 45894455141e..9c03f92eb061 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/graphic/EmfTools.hpp>
 
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 #include <drawinglayer/tools/primitive2dxmldump.hxx>
 #include <vcl/bitmapaccess.hxx>
 
diff --git a/emfio/source/emfuno/xemfparser.cxx b/emfio/source/emfuno/xemfparser.cxx
index 0c623d7659aa..8667ccf1faea 100644
--- a/emfio/source/emfuno/xemfparser.cxx
+++ b/emfio/source/emfuno/xemfparser.cxx
@@ -24,7 +24,7 @@
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/sequence.hxx>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index 48dac12a3a95..9dd229f32e0d 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -19,7 +19,6 @@
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/beans/IntrospectionException.hpp>
 #include <com/sun/star/beans/theIntrospection.hpp>
 #include <com/sun/star/beans/MethodConcept.hpp>
@@ -34,7 +33,6 @@
 
 // InvocationToAllListenerMapper
 #include <com/sun/star/script/XInvocation.hpp>
-#include <comphelper/processfactory.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/factory.hxx>
diff --git a/extensions/IwyuFilter_extensions.yaml b/extensions/IwyuFilter_extensions.yaml
index 043e83076d66..4dd6ee91c36e 100644
--- a/extensions/IwyuFilter_extensions.yaml
+++ b/extensions/IwyuFilter_extensions.yaml
@@ -31,6 +31,8 @@ excludelist:
     extensions/source/update/check/updatecheck.cxx:
     # Needed on WIN32 for WNT_hasInternetConnection
     - onlinecheck.hxx
+    # Actually used 
+    - comphelper/scopeguard.hxx
     extensions/source/update/check/updatecheckconfig.cxx:
     # Needed on WIN32
     - o3tl/char16_t2wchar_t.hxx
@@ -46,6 +48,11 @@ excludelist:
     extensions/source/propctrlr/formcomponenthandler.cxx:
     # Actually used
     - com/sun/star/inspection/XObjectInspectorUI.hpp
+    # Needed for template
+    - com/sun/star/ui/dialogs/XFilePicker3.hpp
+    extensions/source/propctrlr/formlinkdialog.cxx:
+    # Needed for template
+    - com/sun/star/sdb/XSingleSelectQueryComposer.hpp
     extensions/source/propctrlr/formgeometryhandler.cxx:
     # Don't propose hxx -> h change in URE libs
     - cppuhelper/interfacecontainer.hxx
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 4bdf7a7f9b46..312c47432f4a 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -23,7 +23,6 @@
 #include <svl/itemprop.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/factory.hxx>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
@@ -32,13 +31,12 @@
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/frame/XFrameLoader.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/text/BibliographyDataField.hpp>
-#include <com/sun/star/form/XLoadListener.hpp>
+#include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <vcl/window.hxx>
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
index f015b297ba33..5f38856fc9c4 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
@@ -18,12 +18,10 @@
  */
 
 #include <sal/log.hxx>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <vcl/svapp.hxx>
 #include "MasterDetailLinkDialog.hxx"
 #include "formlinkdialog.hxx"
-#include "modulepcr.hxx"
 
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index d534cc66df24..26afa43a20bf 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -24,7 +24,6 @@
 #include <vcl/svapp.hxx>
 #include "fontdialog.hxx"
 #include "formstrings.hxx"
-#include "modulepcr.hxx"
 #include "pcrcommon.hxx"
 
 namespace pcr
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index 809279330ae8..b3b0c82af496 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -26,6 +26,7 @@
 
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <sal/macros.h>
 
 
diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx
index 38865b10f69c..454bbb58ed47 100644
--- a/extensions/source/propctrlr/defaultforminspection.hxx
+++ b/extensions/source/propctrlr/defaultforminspection.hxx
@@ -21,8 +21,6 @@
 
 #include "inspectormodelbase.hxx"
 
-#include <com/sun/star/uno/XComponentContext.hpp>
-
 #include <memory>
 
 
diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx
index 0148e6e4a82c..0d7792edd1d5 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.cxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.cxx
@@ -20,10 +20,10 @@
 
 #include "defaulthelpprovider.hxx"
 #include "pcrcommon.hxx"
-#include "modulepcr.hxx"
 
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx
index e70ad124912b..66f4a8991d92 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.hxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <cppuhelper/implbase.hxx>
 
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 669aa0cacd6a..a981f7dff30c 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -19,6 +19,7 @@
 
 
 #include "controltype.hxx"
+#include "modulepcr.hxx"
 #include <propctrlr.h>
 #include <helpids.h>
 #include "fontdialog.hxx"
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index 41bc6b30318f..e6be69492f2c 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "formcontroller.hxx"
-#include "modulepcr.hxx"
 #include "pcrcommon.hxx"
 #include "formstrings.hxx"
 #include "defaultforminspection.hxx"
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index b8ae6f37bc5f..984f951dfd58 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -20,7 +20,6 @@
 #include "enumrepresentation.hxx"
 #include "genericpropertyhandler.hxx"
 #include "handlerhelper.hxx"
-#include "modulepcr.hxx"
 
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/lang/NullPointerException.hpp>
diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx
index 6ed1db687aa0..e320a0f8f24b 100644
--- a/extensions/source/propctrlr/objectinspectormodel.cxx
+++ b/extensions/source/propctrlr/objectinspectormodel.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "modulepcr.hxx"
 #include "pcrcommon.hxx"
 #include "inspectormodelbase.hxx"
 
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index 29abba01411b..2c6113647855 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <vcl/svapp.hxx>
-#include "modulepcr.hxx"
 #include "pcrunodialogs.hxx"
 #include "formstrings.hxx"
 #include "pcrstrings.hxx"
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index b547e9600f9b..21a59303cc27 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYHANDLER_HXX
 
 #include "pcrcommon.hxx"
-#include "modulepcr.hxx"
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 6da52c02fab6..977e7fbaa12f 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -29,7 +29,6 @@
 #include <utility>
 
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 08ca0429203b..0e00bcd18848 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -21,7 +21,6 @@
 
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/beans/Property.hpp>
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 4d4676113f2c..b34821ff936f 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -19,7 +19,6 @@
 
 
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/document/XDocumentEventListener.hpp>
diff --git a/filter/IwyuFilter_filter.yaml b/filter/IwyuFilter_filter.yaml
index 6eb00b8760d7..14ae4e91a041 100644
--- a/filter/IwyuFilter_filter.yaml
+++ b/filter/IwyuFilter_filter.yaml
@@ -10,6 +10,12 @@ excludelist:
     filter/source/msfilter/mscodec.cxx:
     # Actually used
     - com/sun/star/beans/NamedValue.hpp
+    filter/source/msfilter/msdffimp.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
+    filter/source/msfilter/mstoolbar.cxx:
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
     filter/source/msfilter/svdfppt.cxx:
     # OSL_BIGENDIAN is being checked
     - osl/endian.h
diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx
index 1546956e6a2b..f3e284556681 100644
--- a/filter/source/config/cache/configflush.hxx
+++ b/filter/source/config/cache/configflush.hxx
@@ -21,7 +21,6 @@
 
 #include "cacheitem.hxx"
 #include <com/sun/star/util/XRefreshable.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/implbase.hxx>
diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx
index 0f04e4f000d2..a5140acdbed2 100644
--- a/filter/source/config/cache/contenthandlerfactory.cxx
+++ b/filter/source/config/cache/contenthandlerfactory.cxx
@@ -21,7 +21,6 @@
 #include "contenthandlerfactory.hxx"
 
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 
 
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 079be5723c81..fa26ee7ba580 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -22,7 +22,6 @@
 #include "constant.hxx"
 
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <comphelper/processfactory.hxx>
 #include <comphelper/enumhelper.hxx>
 #include <comphelper/sequence.hxx>
 #include <officecfg/Setup.hxx>
diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx
index 220fa252982f..c7906b4acf1d 100644
--- a/filter/source/config/cache/frameloaderfactory.cxx
+++ b/filter/source/config/cache/frameloaderfactory.cxx
@@ -21,7 +21,6 @@
 #include "frameloaderfactory.hxx"
 
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 
 
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index ef164df45c26..e9e149511cff 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -34,7 +34,6 @@
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <comphelper/fileurl.hxx>
-#include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 
 #define DEBUG_TYPE_DETECTION 0
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index 93c2d32b1da5..b0281d5f983d 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -22,7 +22,6 @@
 #include "basecontainer.hxx"
 #include <com/sun/star/document/XTypeDetection.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <unotools/mediadescriptor.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase.hxx>
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 38d234e3108f..3d110bf21941 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <tools/poly.hxx>
 #include <tools/fract.hxx>
diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.hxx b/filter/source/graphicfilter/idxf/dxfgrprd.hxx
index f114f043eea8..4d20ae2bff0f 100644
--- a/filter/source/graphicfilter/idxf/dxfgrprd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfgrprd.hxx
@@ -22,7 +22,6 @@
 
 #include <rtl/string.hxx>
 #include <sal/types.h>
-#include <tools/solar.h>
 #include <tools/long.hxx>
 
 class SvStream;
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx b/filter/source/graphicfilter/idxf/dxfreprd.cxx
index d03bf4cf702f..1f74ada603a3 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx
@@ -22,7 +22,6 @@
 #include <osl/nlsupport.h>
 #include <unotools/defaultencoding.hxx>
 #include <unotools/wincodepage.hxx>
-#include <unotools/configmgr.hxx>
 
 //------------------DXFBoundingBox--------------------------------------------
 
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 2c67a6effa3c..6834ec637c1f 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <tools/solar.h>
 #include <vcl/svapp.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/graph.hxx>
diff --git a/filter/source/graphicfilter/itiff/ccidecom.hxx b/filter/source/graphicfilter/itiff/ccidecom.hxx
index fa2ae3bd31bd..89e23656b150 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.hxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ITIFF_CCIDECOM_HXX
 
 #include <sal/types.h>
-#include <tools/solar.h>
 #include <array>
 #include <memory>
 
diff --git a/filter/source/graphicfilter/itiff/lzwdecom.hxx b/filter/source/graphicfilter/itiff/lzwdecom.hxx
index 0d02e8833bcd..8f2675b9d53f 100644
--- a/filter/source/graphicfilter/itiff/lzwdecom.hxx
+++ b/filter/source/graphicfilter/itiff/lzwdecom.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ITIFF_LZWDECOM_HXX
 
 #include <sal/types.h>
-#include <tools/solar.h>
 #include <array>
 
 #define MAX_TABLE_SIZE 4096
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 31ec360272a5..6cba89b7d4fa 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -137,7 +137,6 @@
 #include <com/sun/star/drawing/ShadeMode.hpp>
 #include <vcl/dibtools.hxx>
 #include <vcl/svapp.hxx>
-#include <svx/svx3ditems.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/EnhancedCustomShapeTypeNames.hxx>
 #include <svx/EnhancedCustomShapeGeometry.hxx>
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 6adf8aa6c5fe..36e58f2438f1 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -126,7 +126,6 @@
 
 #include <algorithm>
 #include <cassert>
-#include <set>
 #include <utility>
 #include <rtl/strbuf.hxx>
 #include <tools/time.hxx>
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index 23106bf1daf2..082f701d125e 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -19,7 +19,6 @@
 #include <sax/tools/documenthandleradapter.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 
diff --git a/filter/source/pdf/pdfdecomposer.cxx b/filter/source/pdf/pdfdecomposer.cxx
index d1e89ccdc7b4..ce1321a3ceb5 100644
--- a/filter/source/pdf/pdfdecomposer.cxx
+++ b/filter/source/pdf/pdfdecomposer.cxx
@@ -10,7 +10,6 @@
 #include <vector>
 
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index fb2dd7d0859b..44953c242fb3 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -21,7 +21,6 @@
 #include "pdfdialog.hxx"
 #include "impdialog.hxx"
 #include <vcl/svapp.hxx>
-#include <comphelper/processfactory.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx
index 47a915a728b4..463307a857f2 100644
--- a/filter/source/pdf/pdfdialog.hxx
+++ b/filter/source/pdf/pdfdialog.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 namespace vcl { class Window; }
 
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 0e2ea643d727..3bdc5a8cb756 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -19,7 +19,6 @@
 
 #include "pdffilter.hxx"
 #include "pdfexport.hxx"
-#include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx
index d63f5f4c7355..afd2b6d571be 100644
--- a/filter/source/pdf/pdffilter.hxx
+++ b/filter/source/pdf/pdffilter.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 using namespace ::com::sun::star;
diff --git a/filter/source/pdf/pdfinteract.hxx b/filter/source/pdf/pdfinteract.hxx
index 18deba69dfce..9ad7405a3f56 100644
--- a/filter/source/pdf/pdfinteract.hxx
+++ b/filter/source/pdf/pdfinteract.hxx
@@ -23,7 +23,6 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/task/XInteractionHandler2.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 1d2d5110dc2a..8025550b5837 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -48,7 +48,6 @@
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
 
 #include "svgfilter.hxx"
-#include "svgwriter.hxx"
 
 #include <svx/unopage.hxx>
 #include <vcl/graphicfilter.hxx>
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 02de5a40e649..6b7f082c8668 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -35,11 +35,10 @@
 #include <xmloff/namespacemap.hxx>
 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <svx/unoshape.hxx>
-#include <svx/svdograf.hxx>
 
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index ddc50a74ab62..6b8841ac1e77 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/awt/UnoControlDialog.hpp>
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <osl/diagnose.h>
 #include <rtl/ref.hxx>
 #include <rtl/character.hxx>
diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx
index 5a1bfa513e13..a703da411830 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XLocalizable.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 44839ceb3f2d..4e62aba199e7 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -24,7 +24,6 @@
 #include <tools/urlobj.hxx>
 #include "XmlFilterAdaptor.hxx"
 #include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
 #include <com/sun/star/xml/XImportFilter.hpp>
 #include <com/sun/star/xml/XImportFilter2.hpp>
 #include <com/sun/star/xml/XExportFilter.hpp>
@@ -33,7 +32,6 @@
 #include <com/sun/star/style/XStyleLoader.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <comphelper/fileurl.hxx>
-#include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
index c00a46e6211b..e6b97f041db3 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index f49f44af6d7a..649c9785ba96 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -22,7 +22,6 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/component.hxx>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <cppuhelper/supportsservice.hxx>
@@ -33,7 +32,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <vcl/svapp.hxx>
 #include <rtl/instance.hxx>
-#include <comphelper/processfactory.hxx>
 
 #include "xmlfiltersettingsdialog.hxx"
 
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 9ed506d6c5ab..b48a68befc19 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -67,8 +67,6 @@
 #include <com/sun/star/xml/xslt/XSLT2Transformer.hpp>
 #include <com/sun/star/xml/xslt/XSLTTransformer.hpp>
 
-#include "LibXSLTTransformer.hxx"
-
 #define TRANSFORMATION_TIMEOUT_SEC 60
 
 using namespace ::cppu;
diff --git a/forms/IwyuFilter_forms.yaml b/forms/IwyuFilter_forms.yaml
index 90ef1452e50b..51ae8148e320 100644
--- a/forms/IwyuFilter_forms.yaml
+++ b/forms/IwyuFilter_forms.yaml
@@ -22,9 +22,15 @@ excludelist:
     - com/sun/star/io/XObjectInputStream.hpp
     - com/sun/star/io/XObjectOutputStream.hpp
     - tools/datetime.hxx
+    forms/source/component/ImageControl.cxx:
+    # Needed for template
+    - com/sun/star/ui/dialogs/XFilePicker3.hpp
     forms/source/component/imgprod.cxx:
     # Actually used
     - com/sun/star/io/XInputStream.hpp
+    forms/source/component/scrollbar.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
     forms/source/richtext/parametrizedattributedispatcher.cxx:
     # Actually used
     - com/sun/star/beans/PropertyValue.hpp
@@ -33,6 +39,9 @@ excludelist:
     - com/sun/star/lang/Locale.hpp
     # Needed for macro defines to work
     - editeng/unoprnms.hxx
+    forms/source/runtime/formoperations.cxx:
+    # Needed for template
+    - com/sun/star/sdbc/XConnection.hpp
     forms/source/solar/component/navbarcontrol.cxx:
     # Actually used
     - com/sun/star/awt/XControlModel.hpp
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index ee7a3fe73b77..e1a9c231d71a 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -29,7 +29,6 @@
 #include <vcl/outdev.hxx>
 
 #include <editeng/adjustitem.hxx>
-#include <editeng/wghtitem.hxx>
 #include <editeng/escapementitem.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/fhgtitem.hxx>
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 07480edc690b..e6497a8ea939 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -29,7 +29,6 @@
 
 #include <svx/labelitemwindow.hxx>
 
-#include <vcl/event.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/toolbox.hxx>
 
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 55398f8a2c5c..d68018f47d22 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -21,7 +21,6 @@
 #include "convert.hxx"
 
 #include <sstream>
-#include <o3tl/functional.hxx>
 #include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
@@ -37,7 +36,6 @@ using xforms::Convert;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::makeAny;
 using namespace std;
-using namespace o3tl;
 using namespace utl;
 
 Convert::Convert()
diff --git a/fpicker/IwyuFilter_fpicker.yaml b/fpicker/IwyuFilter_fpicker.yaml
index ce44fed1a666..978f04862d40 100644
--- a/fpicker/IwyuFilter_fpicker.yaml
+++ b/fpicker/IwyuFilter_fpicker.yaml
@@ -1,2 +1,2 @@
 ---
-assumeFilename: fpicker/source/office/fps_office.cxx
+assumeFilename: fpicker/source/office/iodlg.cxx
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 59f1073092fd..877dd15acaa6 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 
 #include "commonpicker.hxx"
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index db55849881b2..6f3863b53157 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include "commonpicker.hxx"
 
 class Dialog;
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 2fc919f9b1d9..0ad9e0f4c88d 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -10,7 +10,6 @@
 #include "PlacesListBox.hxx"
 #include <svtools/PlaceEditDialog.hxx>
 
-#include <vcl/event.hxx>
 #include <bitmaps.hlst>
 
 PlacesListBox::PlacesListBox(std::unique_ptr<weld::TreeView> xControl,
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index d676cbae3e1b..30115abd93e8 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -23,9 +23,10 @@
 #include <tools/debug.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <vcl/errinf.hxx>
-#include <bitmaps.hlst>
 #include <officecfg/Office/Common.hxx>
 
+using namespace ::svt;
+
 RemoteFilesDialog::RemoteFilesDialog( weld::Window* pParent, PickerFlags nBits )
     : SvtFileDialog_Base( pParent, "fps/ui/remotefilesdialog.ui", "RemoteFilesDialog" )
     , m_xContext( comphelper::getProcessComponentContext() )
diff --git a/fpicker/source/office/autocmpledit.cxx b/fpicker/source/office/autocmpledit.cxx
index ab7887fff612..89f6d87b014b 100644
--- a/fpicker/source/office/autocmpledit.cxx
+++ b/fpicker/source/office/autocmpledit.cxx
@@ -8,8 +8,6 @@
  */
 
 #include "autocmpledit.hxx"
-#include <vcl/svapp.hxx>
-#include <vcl/event.hxx>
 
 AutocompleteEdit::AutocompleteEdit(std::unique_ptr<weld::Entry> xEntry)
     : m_xEntry(std::move(xEntry))
diff --git a/fpicker/source/office/contentenumeration.cxx b/fpicker/source/office/contentenumeration.cxx
index 6ed0d7626007..044e67e7bc43 100644
--- a/fpicker/source/office/contentenumeration.cxx
+++ b/fpicker/source/office/contentenumeration.cxx
@@ -31,7 +31,6 @@
 #include <comphelper/sequence.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx
index 184a330d2830..32b0df044673 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -25,7 +25,6 @@
 #include <svtools/querydelete.hxx>
 #include <svtools/strings.hrc>
 #include <bitmaps.hlst>
-#include <toolkit/helper/vclunohelper.hxx>
 #include "contentenumeration.hxx"
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
diff --git a/fpicker/source/office/fileview.hxx b/fpicker/source/office/fileview.hxx
index 19c22391e7fb..81b0cc6279c4 100644
--- a/fpicker/source/office/fileview.hxx
+++ b/fpicker/source/office/fileview.hxx
@@ -21,7 +21,6 @@
 
 #include <memory>
 #include <com/sun/star/uno/Sequence.h>
-#include <vcl/errinf.hxx>
 #include <vcl/weld.hxx>
 #include <rtl/ustring.hxx>
 
diff --git a/fpicker/source/office/foldertree.cxx b/fpicker/source/office/foldertree.cxx
index 49007c982b3d..2c37f25677f2 100644
--- a/fpicker/source/office/foldertree.cxx
+++ b/fpicker/source/office/foldertree.cxx
@@ -8,7 +8,6 @@
  */
 
 #include <comphelper/processfactory.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/urlobj.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <com/sun/star/task/InteractionHandler.hpp>
@@ -18,6 +17,8 @@
 
 using namespace ::com::sun::star::task;
 
+using namespace ::svt;
+
 FolderTree::FolderTree(std::unique_ptr<weld::TreeView> xTreeView, weld::Window* pTopLevel)
     : m_xTreeView(std::move(xTreeView))
     , m_xScratchIter(m_xTreeView->make_iterator())
diff --git a/fpicker/source/office/foldertree.hxx b/fpicker/source/office/foldertree.hxx
index da888e332308..9dc019cdc03e 100644
--- a/fpicker/source/office/foldertree.hxx
+++ b/fpicker/source/office/foldertree.hxx
@@ -17,7 +17,6 @@ namespace com :: sun :: star :: ucb { class XCommandEnvironment; }
 
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::uno;
-using namespace ::svt;
 
 class FolderTree
 {
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 87e3170c8e4f..cabdd16af71d 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -30,6 +30,7 @@
 #include <tools/diagnose_ex.h>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
+#include <vcl/errinf.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
@@ -41,7 +42,6 @@
 #include <fpicker/strings.hrc>
 #include <svtools/helpids.h>
 #include <strings.hrc>
-#include <bitmaps.hlst>
 #include "asyncfilepicker.hxx"
 #include "iodlgimp.hxx"
 #include <svtools/inettbc.hxx>
@@ -65,7 +65,6 @@
 
 #include <osl/file.hxx>
 #include <vcl/dibtools.hxx>
-#include <vcl/settings.hxx>
 
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 89716e5c5b5d..eef79a9a2233 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -23,7 +23,6 @@
 #include <tools/urlobj.hxx>
 #include <svtools/inettbc.hxx>
 #include "iodlg.hxx"
-#include <bitmaps.hlst>
 #include <svtools/imagemgr.hxx>
 #include <svl/svlresid.hxx>
 #include <svl/svl.hrc>
diff --git a/framework/IwyuFilter_framework.yaml b/framework/IwyuFilter_framework.yaml
index 25ef5d7182cf..88b8dfae4ae3 100644
--- a/framework/IwyuFilter_framework.yaml
+++ b/framework/IwyuFilter_framework.yaml
@@ -15,6 +15,12 @@ excludelist:
     framework/inc/uielement/toolbarmanager.hxx:
     #  Don't propose hxx -> h change in URE libs
     - cppuhelper/interfacecontainer.hxx
+    framework/inc/statusbarconfiguration.hxx:
+    # Needed for css shortcut
+    - sal/types.h
+    framework/inc/toolboxconfiguration.hxx:
+    # Needed for css shortcut
+    - sal/types.h
     framework/source/uiconfiguration/imagemanagerimpl.hxx:
     #  Don't propose hxx -> h change in URE libs
     - cppuhelper/interfacecontainer.hxx
@@ -57,6 +63,8 @@ excludelist:
     framework/source/services/substitutepathvars.cxx:
     #  Don't propose hxx -> h change in URE libs
     - osl/thread.hxx
+    # Needed for template
+    - com/sun/star/container/XNameAccess.hpp
     framework/source/uifactory/menubarfactory.cxx:
     # Actually used
     - com/sun/star/uno/XComponentContext.hpp
@@ -77,15 +85,18 @@ excludelist:
     framework/source/uielement/dropdownboxtoolbarcontroller.cxx:
     # Actually used
     - com/sun/star/beans/PropertyValue.hpp
-    framework/source/uielement/comboboxtoolbarcontroller.cxx::
-    # Actually used
-    - com/sun/star/beans/PropertyValue.hpp
-    framework/source/uielement/edittoolbarcontroller.cxx:
-    # Actually used
-    - com/sun/star/beans/PropertyValue.hpp
     framework/source/uielement/comboboxtoolbarcontroller.cxx:
     # Actually used
     - com/sun/star/beans/PropertyValue.hpp
+    framework/source/uielement/controlmenucontroller.cxx:
+    # Needed for template
+    - com/sun/star/frame/XFrame.hpp
+    framework/source/uielement/edittoolbarcontroller.cxx:
+    # Actually used
+    - com/sun/star/beans/PropertyValue.hpp
+    framework/source/uielement/fontmenucontroller.cxx:
+    # Needed for template
+    - com/sun/star/frame/XFrame.hpp
     framework/source/uielement/imagebuttontoolbarcontroller.cxx:
     # Actually used
     - com/sun/star/uno/XComponentContext.hpp
diff --git a/framework/inc/addonmenu.hxx b/framework/inc/addonmenu.hxx
index 0b778b705afe..1f6443b48a79 100644
--- a/framework/inc/addonmenu.hxx
+++ b/framework/inc/addonmenu.hxx
@@ -18,12 +18,9 @@
  */
 #pragma once
 
-#include <config_options.h>
 #include <rtl/ustring.hxx>
 #include <vcl/vclptr.hxx>
 
-#include <framework/fwkdllapi.h>
-
 namespace com::sun::star::beans { struct PropertyValue; }
 namespace com::sun::star::frame { class XFrame; }
 namespace com::sun::star::uno { template <class E> class Sequence; }
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index 9c318c89a231..520bf37d3943 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#include <framework/fwkdllapi.h>
 
 #define SERVICENAME_ACTIONTRIGGERCONTAINER          "com.sun.star.ui.ActionTriggerContainer"
 #define IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER   "com.sun.star.comp.ui.ActionTriggerContainer"
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 9131e3e275b0..964d25d99f86 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#include <framework/fwkdllapi.h>
 
 #define SERVICENAME_ACTIONTRIGGER "com.sun.star.ui.ActionTrigger"
 #define IMPLEMENTATIONNAME_ACTIONTRIGGER "com.sun.star.comp.ui.ActionTrigger"
diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx
index 7841a237d905..66c6c716258b 100644
--- a/framework/inc/classes/converter.hxx
+++ b/framework/inc/classes/converter.hxx
@@ -20,14 +20,12 @@
 #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_CONVERTER_HXX
 #define INCLUDED_FRAMEWORK_INC_CLASSES_CONVERTER_HXX
 
-#include <config_options.h>
 #include <vector>
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <tools/datetime.hxx>
-#include <framework/fwkdllapi.h>
 
 namespace framework{
 
diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index f68d5773a4ad..26044593710f 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <vcl/image.hxx>
-#include <framework/fwkdllapi.h>
 
 namespace framework
 {
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 849a7f548144..bbee8e729d89 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_PROTOCOLHANDLERCACHE_HXX
 #define INCLUDED_FRAMEWORK_INC_CLASSES_PROTOCOLHANDLERCACHE_HXX
 
-#include <config_options.h>
 #include <unordered_map>
 
 #include <com/sun/star/util/URL.hpp>
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index 01bec3510d5c..b263f617b617 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#include <framework/fwkdllapi.h>
 
 #define IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER   "com.sun.star.comp.ui.RootActionTriggerContainer"
 
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 4f5e084e3870..3ffb9c883035 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX
 #define INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XNotifyingDispatch.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 8d67ee008f18..95e9faeb5b77 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -35,7 +35,6 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
-#include <cppuhelper/interfacecontainer.h>
 
 namespace framework{
 
diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index fdbf809c1dbf..6ad2dc86cb88 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -27,7 +27,6 @@
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <framework/fwkdllapi.h>
 
 namespace framework
 {
diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx
index 81b7a6d5f7ae..9e6c3ac41c97 100644
--- a/framework/inc/helper/shareablemutex.hxx
+++ b/framework/inc/helper/shareablemutex.hxx
@@ -22,7 +22,6 @@
 
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
-#include <framework/fwkdllapi.h>
 
 namespace framework
 {
diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx
index fc0dce8d6068..3301a63d2c4c 100644
--- a/framework/inc/jobs/configaccess.hxx
+++ b/framework/inc/jobs/configaccess.hxx
@@ -20,11 +20,9 @@
 #ifndef INCLUDED_FRAMEWORK_INC_JOBS_CONFIGACCESS_HXX
 #define INCLUDED_FRAMEWORK_INC_JOBS_CONFIGACCESS_HXX
 
-#include <config_options.h>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <rtl/ustring.hxx>
-#include <framework/fwkdllapi.h>
 
 namespace framework{
 
diff --git a/framework/inc/menuconfiguration.hxx b/framework/inc/menuconfiguration.hxx
index ea3acc41a2f0..a076de21b504 100644
--- a/framework/inc/menuconfiguration.hxx
+++ b/framework/inc/menuconfiguration.hxx
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <config_options.h>
-
 #include <cppuhelper/weakref.hxx>
 
 namespace com::sun::star::container { class XIndexAccess; }
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index 806fe3cb2f22..2a7afc550177 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/frame/XDispatchRecorder.hpp>
 #include <com/sun/star/frame/DispatchStatement.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx
index dbeecff88bbc..934b82df0452 100644
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -21,11 +21,9 @@
 #define INCLUDED_FRAMEWORK_INC_RECORDING_DISPATCHRECORDERSUPPLIER_HXX
 
 #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <cppuhelper/implbase.hxx>
 
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index 4cdab138379d..80a7fc4b91b3 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/util/XStringMapping.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <cppuhelper/implbase.hxx>
 
diff --git a/framework/inc/statusbarconfiguration.hxx b/framework/inc/statusbarconfiguration.hxx
index 262e08613839..a65a9ab4a831 100644
--- a/framework/inc/statusbarconfiguration.hxx
+++ b/framework/inc/statusbarconfiguration.hxx
@@ -18,8 +18,7 @@
  */
 #pragma once
 
-#include <config_options.h>
-#include <framework/fwkdllapi.h>
+#include <sal/types.h>
 
 namespace com::sun::star::container { class XIndexAccess; }
 namespace com::sun::star::container { class XIndexContainer; }
diff --git a/framework/inc/toolboxconfiguration.hxx b/framework/inc/toolboxconfiguration.hxx
index 0981a8780f82..66bedb153e4d 100644
--- a/framework/inc/toolboxconfiguration.hxx
+++ b/framework/inc/toolboxconfiguration.hxx
@@ -18,8 +18,7 @@
  */
 #pragma once
 
-#include <config_options.h>
-#include <framework/fwkdllapi.h>
+#include <sal/types.h>
 
 namespace com::sun::star::container { class XIndexAccess; }
 namespace com::sun::star::container { class XIndexContainer; }
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index df14769caa07..8dcf79b03510 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -24,8 +24,6 @@
 
 #include <uielement/complextoolbarcontroller.hxx>
 
-#include <vcl/event.hxx>
-
 namespace framework
 {
 
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index c70bcae8ca21..512baa2cb467 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX
 
-#include <config_options.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
@@ -32,7 +31,6 @@
 #include <cppuhelper/propshlp.hxx>
 
 #include <vector>
-#include <framework/fwkdllapi.h>
 
 namespace framework
 {
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index 193af5920634..21e7f6935f6d 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/frame/ControlCommand.hpp>
 
 #include <uielement/complextoolbarcontroller.hxx>
-#include <vcl/event.hxx>
 
 class ToolBox;
 
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index 6c869e21e916..27da18f204a5 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTMENUCONTROLLER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTMENUCONTROLLER_HXX
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 
 #include <svtools/popupmenucontrollerbase.hxx>
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index 5c57623559d1..f7feba920825 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTSIZEMENUCONTROLLER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTSIZEMENUCONTROLLER_HXX
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/status/FontHeight.hpp>
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index ea05b52337b3..bf395bf75af7 100644
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_HEADERMENUCONTROLLER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_HEADERMENUCONTROLLER_HXX
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 
 #include <svtools/popupmenucontrollerbase.hxx>
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index b38aa6bfe123..5f2142caa19b 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -28,7 +28,6 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <vector>
-#include <framework/fwkdllapi.h>
 
 namespace framework
 {
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 32f2a45bac9c..0651a1ababb3 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_LANGSELECTIONMENUCONTROLLER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_LANGSELECTIONMENUCONTROLLER_HXX
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 
 #include <svtools/popupmenucontrollerbase.hxx>
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index f17c38e441bd..819dc316f3f5 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_MACROSMENUCONTROLLER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_MACROSMENUCONTROLLER_HXX
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <svtools/popupmenucontrollerbase.hxx>
 #include <vcl/menu.hxx>
 
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index f4bbe873f519..8356ab4925e7 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_NEWMENUCONTROLLER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_NEWMENUCONTROLLER_HXX
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
 
 #include <svtools/popupmenucontrollerbase.hxx>
diff --git a/framework/inc/uielement/toolbarmodemenucontroller.hxx b/framework/inc/uielement/toolbarmodemenucontroller.hxx
index 44f667dcb8d2..fb3072c6bbf7 100644
--- a/framework/inc/uielement/toolbarmodemenucontroller.hxx
+++ b/framework/inc/uielement/toolbarmodemenucontroller.hxx
@@ -20,9 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMODEMENUCONTROLLER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMODEMENUCONTROLLER_HXX
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-
 #include <svtools/popupmenucontrollerbase.hxx>
 
 namespace framework
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 23846457aee8..5016235f9c16 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index 157b20eb7a3c..8b97a554d9cc 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -20,14 +20,12 @@
 #ifndef INCLUDED_FRAMEWORK_INC_XML_SAXNAMESPACEFILTER_HXX
 #define INCLUDED_FRAMEWORK_INC_XML_SAXNAMESPACEFILTER_HXX
 
-#include <config_options.h>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <xml/xmlnamespaces.hxx>
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase.hxx>
 
 #include <stack>
-#include <framework/fwkdllapi.h>
 
 namespace framework
 {
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 4c61e56e8266..fd38d5b64140 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -28,7 +28,6 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <unordered_map>
-#include <framework/fwkdllapi.h>
 
 namespace framework{
 
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 39196fd4ddc6..06ca242cd4dc 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -26,7 +26,6 @@
 
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <framework/fwkdllapi.h>
 
 #include <unordered_map>
 
diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx
index ed6bb61406e7..d02039321764 100644
--- a/framework/inc/xml/xmlnamespaces.hxx
+++ b/framework/inc/xml/xmlnamespaces.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FRAMEWORK_INC_XML_XMLNAMESPACES_HXX
 
 #include <map>
-#include <framework/fwkdllapi.h>
 
 #include <rtl/ustring.hxx>
 
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index aae5849b89a8..baaaa7aba708 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <classes/taskcreator.hxx>
-#include <loadenv/targethelper.hxx>
 #include <services.h>
 #include <taskcreatordefs.hxx>
 
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index 46dff460e406..254e07fed72e 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <dispatch/oxt_handler.hxx>
-#include <services.h>
 #include <unotools/mediadescriptor.hxx>
 
 #include <com/sun/star/frame/DispatchResultState.hpp>
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 16b0fbd678cc..1b845347454f 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
 #include <com/sun/star/ui/XUIElement.hpp>
 
-#include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 2509ffa981c7..4b5a7ff06f10 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <stdio.h>
 #include <sal/macros.h>
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index fa66360ce334..5a05dfb54e43 100644
--- a/framework/source/fwe/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
@@ -22,8 +22,6 @@
 */
 #include <vector>
 
-#include <stdio.h>
-
 #include <com/sun/star/xml/sax/SAXException.hpp>
 
 #include <xml/saxnamespacefilter.hxx>
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 2306f4f46737..94dd1817872f 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <stdio.h>
-
 #include <xml/statusbardocumenthandler.hxx>
 
 #include <com/sun/star/xml/sax/SAXException.hpp>
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 02999b5cf902..5ed0ee665405 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <stdio.h>
-
 #include <xml/toolboxdocumenthandler.hxx>
 #include <xml/toolboxconfigurationdefines.hxx>
 
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index dbe80f802c25..59687abbeefb 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -41,7 +41,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/document/XTypeDetection.hpp>
 #include <com/sun/star/document/XActionLockable.hpp>
diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx
index 08acf223b401..39707aca6e22 100644
--- a/framework/source/recording/dispatchrecordersupplier.cxx
+++ b/framework/source/recording/dispatchrecordersupplier.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <recording/dispatchrecordersupplier.hxx>
-#include <services.h>
 
 #include <com/sun/star/frame/XRecordableDispatch.hpp>
 
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index b4e5718ab56b..380eab11ec67 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <framework/dispatchhelper.hxx>
-#include <services.h>
 
 #include <com/sun/star/frame/XNotifyingDispatch.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index f4388d217c13..440a3d59a022 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -18,9 +18,9 @@
  */
 
 #include <services/mediatypedetectionhelper.hxx>
-#include <services.h>
 #include <svl/inettype.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 namespace framework
 {
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index abccde76f59d..6faa0c8e3d55 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <services/uriabbreviation.hxx>
-#include <services.h>
 
 #include <sal/config.h>
 
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 471bd67ca7c7..d83382b3361e 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -29,7 +29,6 @@
 #include <sal/log.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <unotools/configmgr.hxx>
 #include <unotools/syslocale.hxx>
 
 #include <comphelper/propertysequence.hxx>
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index f2b56cee1526..fb7ac0f0f5e8 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -25,7 +25,6 @@
 
 #include <toolkit/helper/vclunohelper.hxx>
 
-#include <svtools/miscopt.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 4fd3fca717bb..745b25d2cf99 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -20,7 +20,6 @@
 #include <uielement/comboboxtoolbarcontroller.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/util/Color.hpp>
 
 #include <vcl/InterimItemWindow.hxx>
 #include <svtools/toolboxcontroller.hxx>
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index a4c3f96b0583..b62febf87663 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -32,7 +32,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/toolbox.hxx>
-#include <vcl/settings.hxx>
 
 using namespace ::com::sun::star;
 using namespace css::awt;
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index c6fec020f502..31c22d03bbb1 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -20,7 +20,7 @@
 #include <framework/generictoolbarcontroller.hxx>
 
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/status/ItemStatus.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index f9bd9f2312ba..b2d1f7cbd372 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -35,14 +35,12 @@
 #include <com/sun/star/lang/SystemDependent.hpp>
 #include <com/sun/star/ui/GlobalAcceleratorConfiguration.hpp>
 #include <com/sun/star/ui/ItemType.hpp>
-#include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/ItemStyle.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 
-#include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <svtools/menuoptions.hxx>
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index fe0ed307e76d..af07acef9f04 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -24,13 +24,11 @@
 #include <comphelper/propertyvalue.hxx>
 #include <menuconfiguration.hxx>
 #include <svtools/imagemgr.hxx>
-#include <svtools/miscopt.hxx>
 #include <svtools/toolboxcontroller.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
-#include <unotools/moduleoptions.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx
index 6faa4036efc3..cd6f2716a23a 100644
--- a/framework/source/uielement/toolbarmodemenucontroller.cxx
+++ b/framework/source/uielement/toolbarmodemenucontroller.cxx
@@ -21,12 +21,9 @@
 #include <services.h>
 
 #include <com/sun/star/awt/MenuItemStyle.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/ui/UIElementType.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 
 
 #include <officecfg/Office/Common.hxx>
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 8e26d09b8982..b74aa19136f3 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -26,7 +26,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <cppuhelper/queryinterface.hxx>
 
-#include <svtools/miscopt.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx
index 021d3dc02c53..0c3f5d4fba7c 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -28,7 +28,6 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <o3tl/safeint.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace com::sun::star::uno;