diff --git a/canvas/inc/base/canvasbase.hxx b/canvas/inc/base/canvasbase.hxx
index b0f244e5951c..24737f784d59 100644
--- a/canvas/inc/base/canvasbase.hxx
+++ b/canvas/inc/base/canvasbase.hxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/rendering/TextDirection.hpp>
-#include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <verifyinput.hxx>
 
diff --git a/canvas/inc/base/integerbitmapbase.hxx b/canvas/inc/base/integerbitmapbase.hxx
index d485233d45c7..43c4401c5ac5 100644
--- a/canvas/inc/base/integerbitmapbase.hxx
+++ b/canvas/inc/base/integerbitmapbase.hxx
@@ -21,7 +21,6 @@
 
 #include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
 #include <verifyinput.hxx>
-#include <osl/diagnose.h>
 
 
 namespace canvas
diff --git a/canvas/inc/vclwrapper.hxx b/canvas/inc/vclwrapper.hxx
index a77b2757f8bf..3c1dfbf2d686 100644
--- a/canvas/inc/vclwrapper.hxx
+++ b/canvas/inc/vclwrapper.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <vcl/svapp.hxx>
+#include <memory>
 
 namespace canvas
 {
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index 912e3b678ca8..4ee68f94de46 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -30,7 +30,6 @@
 
 #include <canvas/canvastools.hxx>
 #include <verifyinput.hxx>
-#include <cairo.h>
 
 #include "cairo_canvasfont.hxx"
 #include "cairo_canvashelper.hxx"
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index b7235b30d3c1..6f5d114aa99c 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -30,20 +30,11 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/metric.hxx>
-#include <vcl/sysdata.hxx>
 #include <vcl/virdev.hxx>
 
 
 #include "cairo_textlayout.hxx"
 
-#include <cairo.h>
-
-#if defined CAIRO_HAS_FT_FONT
-# include <cairo-ft.h>
-#else
-# error Native API needed.
-#endif
-
 using namespace ::cairo;
 using namespace ::com::sun::star;
 
diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx
index b2e5c72d0b53..b4159e737e48 100644
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.hxx
@@ -29,7 +29,6 @@
 
 #include <vcl/outdev.hxx>
 
-#include <vcl/cairo.hxx>
 #include "cairo_canvasfont.hxx"
 
 
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index bc4651f54157..bcca03d0bd45 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -28,8 +28,6 @@
 #include "ogl_canvascustomsprite.hxx"
 #include "ogl_texturecache.hxx"
 
-#include <iterator>
-
 using namespace ::com::sun::star;
 
 static void initContext()
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index e56a273a1fe1..8930f8fccb80 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -25,7 +25,6 @@
 #include <basegfx/polygon/b2dlinegeometry.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/vector/b2dsize.hxx>
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 4854a07d1ace..e19e1f45f2af 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -26,7 +26,6 @@
 #include <basegfx/utils/canvastools.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/rendering/CompositeOperation.hpp>
-#include <com/sun/star/rendering/FillRule.hpp>
 #include <com/sun/star/rendering/PathCapType.hpp>
 #include <com/sun/star/rendering/PathJoinType.hpp>
 #include <com/sun/star/rendering/RenderState.hpp>
@@ -35,15 +34,13 @@
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
-#include <com/sun/star/ucb/UniversalContentBroker.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/random.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/vclmain.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
 
 using namespace ::com::sun::star;
diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml
index 5381da1e9cd5..e18c8e3851cb 100644
--- a/chart2/IwyuFilter_chart2.yaml
+++ b/chart2/IwyuFilter_chart2.yaml
@@ -456,6 +456,8 @@ excludelist:
     chart2/source/view/axes/VAxisBase.cxx:
     # Needed for direct member access
     - com/sun/star/drawing/XShapes.hpp
+    # Needed for implicit dtor
+    - com/sun/star/chart2/XAxis.hpp
     chart2/source/view/axes/VAxisProperties.cxx:
     # Actually used
     - com/sun/star/chart2/XAxis.hpp
@@ -464,9 +466,15 @@ excludelist:
     chart2/source/view/axes/VCartesianCoordinateSystem.cxx:
     # Actually used
     - com/sun/star/chart2/XCoordinateSystem.hpp
+    chart2/source/view/axes/VPolarAngleAxis.cxx:
+    # Needed for implicit dtor
+    - com/sun/star/chart2/XAxis.hpp
     chart2/source/view/axes/VPolarCoordinateSystem.cxx:
     # Actually used
     - com/sun/star/chart2/XCoordinateSystem.hpp
+    chart2/source/view/axes/VCartesianAxis.cxx:
+    # Needed for implicit dtor
+    - com/sun/star/chart2/XAxis.hpp
     chart2/source/view/axes/VCartesianGrid.hxx:
     # base class has to be a complete type
     - com/sun/star/beans/XPropertySet.hpp
@@ -486,6 +494,8 @@ excludelist:
     # Actually used
     - com/sun/star/beans/XPropertySet.hpp
     - com/sun/star/drawing/XShape.hpp
+    # Actually used
+    - rtl/math.hxx
     chart2/source/view/main/VButton.cxx:
     # Actually used
     - com/sun/star/lang/XMultiServiceFactory.hpp
@@ -591,6 +601,9 @@ excludelist:
     chart2/source/controller/accessibility/AccessibleChartView.cxx:
     # Actually used
     - com/sun/star/view/XSelectionSupplier.hpp
+    chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:
+    # Needed for implicit dtor
+    - com/sun/star/frame/XModel.hpp
     chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:
     # Needed for rtl::math::round
     - rtl/math.hxx
@@ -607,6 +620,9 @@ excludelist:
     chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:
     # Actually used
     - vector
+    chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx:
+    # Needed for implicit dtor
+    - com/sun/star/chart2/XAxis.hpp
     chart2/source/controller/dialogs/ChartTypeDialogController.cxx:
     # Actually used
     - com/sun/star/chart2/XChartDocument.hpp
@@ -623,6 +639,9 @@ excludelist:
     chart2/source/controller/dialogs/dlg_DataEditor.cxx:
     # Needed for direct member access
     - com/sun/star/awt/XWindow.hpp
+    chart2/source/controller/dialogs/dlg_View3D.cxx:
+    # Needed for implicit dtor
+    - com/sun/star/chart2/XDiagram.hpp
     chart2/source/controller/dialogs/RangeSelectionHelper.cxx:
     # Actually used
     - com/sun/star/chart2/XChartDocument.hpp
@@ -638,6 +657,12 @@ excludelist:
     chart2/source/controller/dialogs/tp_ChartType.cxx:
     # Actually used
     - com/sun/star/chart2/XChartDocument.hpp
+    chart2/source/controller/dialogs/tp_DataSource.cxx:
+    # Needed for implicit dtor
+    - com/sun/star/frame/XModel.hpp
+    chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
     chart2/source/controller/itemsetwrapper/ItemConverter.cxx:
     # Actually used
     - com/sun/star/beans/XPropertySet.hpp
@@ -660,6 +685,8 @@ excludelist:
     chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx:
     # Actually used
     - com/sun/star/beans/XPropertySet.hpp
+    # Needed for rtl::math::round
+    - rtl/math.hxx
     chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx:
     # Needed for rtl::math::round
     - rtl/math.hxx
@@ -713,6 +740,8 @@ excludelist:
     chart2/source/controller/main/PositionAndSizeHelper.cxx:
     # Actually used
     - com/sun/star/awt/Rectangle.hpp
+    # Needed for implicit dtor
+    - com/sun/star/chart2/XDiagram.hpp
     chart2/source/controller/main/StatusBarCommandDispatch.cxx:
     # Actually used
     - com/sun/star/view/XSelectionSupplier.hpp
diff --git a/chart2/qa/extras/chart2geometry.cxx b/chart2/qa/extras/chart2geometry.cxx
index 08e909162766..6ded1a5e76ab 100644
--- a/chart2/qa/extras/chart2geometry.cxx
+++ b/chart2/qa/extras/chart2geometry.cxx
@@ -13,11 +13,8 @@
 
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XDataSeries.hpp>
-#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
-#include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/packages/zip/ZipFileAccess.hpp>
 
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 6701c1061b01..b2c819a87874 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -48,7 +48,6 @@
 #include <com/sun/star/drawing/LineJoint.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/Hatch.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 5411277f8f0b..1b8c50d385f1 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -27,9 +27,7 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <tools/diagnose_ex.h>
-#include <comphelper/lok.hxx>
 #include <sfx2/viewsh.hxx>
 
 namespace chart
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 3ee495b7f84d..07ce43a171b0 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "tp_3D_SceneIllumination.hxx"
-#include <bitmaps.hlst>
 #include <CommonConverters.hxx>
 #include <ControllerLockGuard.hxx>
 
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 4d9598430d08..9d448b4119fe 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -34,9 +34,7 @@
 #include <svx/unoshape.hxx>
 #include <editeng/fhgtitem.hxx>
 
-#include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 
 #include <sfx2/objsh.hxx>
 #include <svx/helperhittest3d.hxx>
diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
index fb829f7be853..645d4bbec094 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
@@ -30,8 +30,6 @@
 
 #include "dlg_CreationWizard.hxx"
 #include <tools/link.hxx>
-#include <vcl/vclptr.hxx>
-#include <vcl/vclevent.hxx>
 
 namespace com::sun::star::awt { class XWindow; }
 namespace com::sun::star::frame { class XModel; }
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 5e280c94b7c0..552316bdd5eb 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -20,8 +20,6 @@
 #include <memory>
 #include <sal/config.h>
 
-#include <set>
-
 #include <ChartController.hxx>
 #include <servicenames.hxx>
 #include <ResId.hxx>
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 51de2bd9ee92..c8c46ba7541f 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -72,7 +72,6 @@
 #include <toolkit/awt/vclxmenu.hxx>
 
 #include <sfx2/viewsh.hxx>
-#include <sfx2/ipclient.hxx>
 #include <svx/ActionDescriptionProvider.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/scene3d.hxx>
@@ -87,7 +86,6 @@
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 
-#include <sfx2/lokhelper.hxx>
 #include <boost/property_tree/json_parser.hpp>
 #include <sfx2/dispatch.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index dd690aa1cf1c..00f5b2c51f73 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -27,7 +27,6 @@
 #include <o3tl/unsafe_downcast.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/itempool.hxx>
-#include <editeng/adjustitem.hxx>
 #include <editeng/eeitem.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx
index 84e4325e3ef2..63ddb818fd0d 100644
--- a/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -19,7 +19,6 @@
 
 #include <PositionAndSizeHelper.hxx>
 #include <ControllerLockGuard.hxx>
-#include <com/sun/star/chart2/LegendPosition.hpp>
 #include <com/sun/star/chart/ChartLegendExpansion.hpp>
 #include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index cb0b04d07741..3ae57de73739 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -9,15 +9,11 @@
 
 #include "ChartLinePanel.hxx"
 
-#include <PropertyHelper.hxx>
 #include <ChartController.hxx>
 
-#include <svx/xlineit0.hxx>
 #include <svx/xlnwtit.hxx>
 #include <svx/xlinjoit.hxx>
-#include <svx/xlndsit.hxx>
 #include <svx/xlntrit.hxx>
-#include <svx/unomid.hxx>
 
 #include <svx/linectrl.hxx>
 #include <svx/tbcontrl.hxx>
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx b/chart2/source/controller/sidebar/ChartTypePanel.cxx
index 2fbe55d3eb10..74a8e7bd0983 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -22,7 +22,6 @@
 
 #include <ChartController.hxx>
 #include <ChartModelHelper.hxx>
-#include <ChartResourceGroupDlgs.hxx>
 #include <ChartResourceGroups.hxx>
 #include <ChartTypeDialogController.hxx>
 #include <DiagramHelper.hxx>
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index d2368ecc3ab8..aa0bf918c42c 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <com/sun/star/style/XStyleSupplier.hpp>
-#include "charttoolsdllapi.hxx"
 
 #include <memory>
 
diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx
index 3e4bf485e335..0b9600e99dc5 100644
--- a/chart2/source/inc/RegressionCalculationHelper.hxx
+++ b/chart2/source/inc/RegressionCalculationHelper.hxx
@@ -20,8 +20,7 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include <rtl/math.hxx>
-
+#include <cmath>
 #include <utility>
 #include <vector>
 
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 76f88027a0e2..22291fac852e 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -24,7 +24,6 @@
 #include <unotools/saveopt.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/propertysetinfo.hxx>
-#include <comphelper/propertysequence.hxx>
 #include <comphelper/documentconstants.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/sequence.hxx>
@@ -35,7 +34,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
-#include <com/sun/star/xml/sax/FastToken.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
@@ -51,7 +49,6 @@
 #include <com/sun/star/document/GraphicStorageHandler.hpp>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
-#include <xmloff/xmlnamespace.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index a68fbc8dfa5e..aefa18b248b2 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -41,7 +41,6 @@
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/chart2/data/XDataSource.hpp>
 
-#include <rtl/math.hxx>
 #include <sal/log.hxx>
 
 #include <com/sun/star/lang/XServiceName.hpp>
diff --git a/chart2/source/tools/ChartViewHelper.cxx b/chart2/source/tools/ChartViewHelper.cxx
index a341f8894f14..f11ea7421c5a 100644
--- a/chart2/source/tools/ChartViewHelper.cxx
+++ b/chart2/source/tools/ChartViewHelper.cxx
@@ -21,7 +21,6 @@
 #include <servicenames.hxx>
 
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <tools/diagnose_ex.h>
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index cb74e60eaa54..3d6bb54592fe 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -36,8 +36,6 @@
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
 #include <tools/diagnose_ex.h>
 
-#include <iterator>
-
 namespace chart
 {
 using namespace ::com::sun::star;
diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx
index 7d09a329fc33..537adef9d94d 100644
--- a/chart2/source/tools/ImplOPropertySet.cxx
+++ b/chart2/source/tools/ImplOPropertySet.cxx
@@ -21,7 +21,6 @@
 #include <CloneHelper.hxx>
 
 #include <algorithm>
-#include <iterator>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/style/XStyle.hpp>
 
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx
index 1a93888b7428..70d9ac85fbb4 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -34,7 +34,6 @@ namespace chart
 {
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
-using namespace ::rtl::math;
 
 VPolarAngleAxis::VPolarAngleAxis( const AxisProperties& rAxisProperties
             , const uno::Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx
index 6bf0b0f47d3b..08f30252fc91 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.cxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx
@@ -27,7 +27,6 @@ namespace chart
 {
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
-using namespace ::rtl::math;
 
 VPolarRadiusAxis::VPolarRadiusAxis( const AxisProperties& rAxisProperties
             , const uno::Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index e13c24bf1f27..9c89d5450bb4 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -32,7 +32,6 @@
 namespace chart
 {
 using namespace ::com::sun::star;
-using namespace ::rtl::math;
 using namespace ::com::sun::star::chart2;
 
 CandleStickChart::CandleStickChart( const uno::Reference<XChartType>& xChartTypeModel
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index bda5509c4e4b..d40d52e7bc7a 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -60,7 +60,6 @@
 #include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
-#include <editeng/unoprnms.hxx>
 #include <tools/color.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
@@ -69,7 +68,6 @@
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
 
-#include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 
 #include <unotools/localedatawrapper.hxx>
diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx
index 763b7205209e..0962868b0f31 100644
--- a/chart2/source/view/inc/PlottingPositionHelper.hxx
+++ b/chart2/source/view/inc/PlottingPositionHelper.hxx
@@ -21,7 +21,6 @@
 #include <chartview/ExplicitScaleValues.hxx>
 
 #include <basegfx/range/b2drectangle.hxx>
-#include <rtl/math.hxx>
 #include <tools/long.hxx>
 #include <com/sun/star/drawing/Direction3D.hpp>
 #include <com/sun/star/drawing/Position3D.hpp>
diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx
index 811bf7ad148b..35d19ebc5ab5 100644
--- a/chart2/source/view/main/LabelPositionHelper.cxx
+++ b/chart2/source/view/main/LabelPositionHelper.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
+#include <rtl/math.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx
index 6479668c67ef..9de0a8133b4e 100644
--- a/chart2/source/view/main/PlotterBase.cxx
+++ b/chart2/source/view/main/PlotterBase.cxx
@@ -20,7 +20,6 @@
 #include <PlotterBase.hxx>
 #include <PlottingPositionHelper.hxx>
 #include <ShapeFactory.hxx>
-#include <rtl/math.hxx>
 #include <osl/diagnose.h>
 
 namespace chart
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index e2f85b71fb83..22e23d27dc80 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -26,7 +26,6 @@
 #include <RegressionCurveHelper.hxx>
 #include <unonames.hxx>
 
-#include <com/sun/star/chart/DataLabelPlacement.hpp>
 #include <com/sun/star/chart/MissingValueTreatment.hpp>
 #include <com/sun/star/chart2/DataPointLabel.hpp>
 #include <com/sun/star/chart2/Symbol.hpp>
diff --git a/comphelper/IwyuFilter_comphelper.yaml b/comphelper/IwyuFilter_comphelper.yaml
index 6d6ec0903716..3e22a187b7e5 100644
--- a/comphelper/IwyuFilter_comphelper.yaml
+++ b/comphelper/IwyuFilter_comphelper.yaml
@@ -19,6 +19,12 @@ excludelist:
     # Base class has to be a complete type
     - com/sun/star/lang/XServiceInfo.hpp
     - com/sun/star/util/XOfficeInstallationDirectories.hpp
+    comphelper/qa/unit/test_guards.cxx:
+        # Keep for system-cppunit; see also commit 456d61ec526e250fd1af894e109d5914ac9c9e6e
+    - unotest/bootstrapfixturebase.hxx
+    comphelper/source/container/embeddedobjectcontainer.cxx:
+    # Keep for OSL_DEBUG_LEVEL > 1
+    - com/sun/star/container/XNameAccess.hpp
     comphelper/source/container/IndexedPropertyValuesContainer.cxx:
     # Needed for typedef
     - com/sun/star/beans/PropertyValue.hpp
@@ -37,6 +43,9 @@ excludelist:
     comphelper/source/misc/fileurl.cxx:
     # Needed for linker visibility
     - comphelper/fileurl.hxx
+    comphelper/source/misc/AccessibleImplementationHelper.cxx:
+    # Needed for template
+    - com/sun/star/uno/Sequence.hxx
     comphelper/source/misc/getexpandeduri.cxx:
     # Needed for linker visibility
     - comphelper/getexpandeduri.hxx
@@ -46,6 +55,9 @@ excludelist:
     comphelper/source/misc/hash.cxx:
     # OSL_BIGENDIAN is being checked
     - osl/endian.h
+    comphelper/source/misc/instancelocker.cxx:
+    # Needed for template
+    - com/sun/star/embed/XActionsApproval.hpp
     include/comphelper/interaction.hxx:
     # Stop warnings about include/
     - com/sun/star/task/XInteractionApprove.hpp
diff --git a/comphelper/qa/unit/test_guards.cxx b/comphelper/qa/unit/test_guards.cxx
index 1d2b5f209daa..02daffaa521b 100644
--- a/comphelper/qa/unit/test_guards.cxx
+++ b/comphelper/qa/unit/test_guards.cxx
@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <sal/types.h>
 #include <comphelper/flagguard.hxx>
 #include <unotest/bootstrapfixturebase.hxx>
 
diff --git a/comphelper/qa/unit/types_test.cxx b/comphelper/qa/unit/types_test.cxx
index 89ad6cae870f..a0f136a5f49f 100644
--- a/comphelper/qa/unit/types_test.cxx
+++ b/comphelper/qa/unit/types_test.cxx
@@ -13,7 +13,6 @@
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
 
 using namespace css;
 
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index 2add21d262b6..1730d2dc2668 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -34,9 +34,9 @@
 #include <cppuhelper/compbase3.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <rtl/math.hxx>
 #include <typelib/typedescription.hxx>
 
+#include <cmath>
 #include <map>
 #include <memory>
 #include <utility>
diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx
index 24657ab011f5..a4041de4bb54 100644
--- a/comphelper/source/misc/configuration.cxx
+++ b/comphelper/source/misc/configuration.cxx
@@ -28,7 +28,6 @@
 #include <comphelper/configuration.hxx>
 #include <comphelper/configurationlistener.hxx>
 #include <rtl/instance.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx
index 044a6d0103fd..60901fefeefe 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -29,7 +29,6 @@
 
 #include <cppuhelper/exc_hlp.hxx>
 
-#include <osl/diagnose.h>
 #include <sal/log.hxx>
 
 namespace comphelper {
diff --git a/comphelper/source/misc/hash.cxx b/comphelper/source/misc/hash.cxx
index 67b79c1af8a0..50fd8cd0f961 100644
--- a/comphelper/source/misc/hash.cxx
+++ b/comphelper/source/misc/hash.cxx
@@ -9,7 +9,7 @@
 
 #include <sal/config.h>
 
-#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
 #include <comphelper/hash.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/alloc.h>
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index c0e0726b7440..82e5c7aed4f9 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -12,7 +12,6 @@
 #include <sal/log.hxx>
 
 #include <iostream>
-#include <map>
 
 namespace comphelper::LibreOfficeKit
 {
diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx
index c473bfae4bec..8b3658a8e892 100644
--- a/comphelper/source/misc/officerestartmanager.hxx
+++ b/comphelper/source/misc/officerestartmanager.hxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/task/XRestartManager.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/awt/XCallback.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <osl/mutex.hxx>
 #include <cppuhelper/implbase.hxx>
diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx
index 044362eef055..3c335e7f4761 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -28,9 +28,6 @@
 #if defined(_WIN32)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#elif defined UNX
-#include <unistd.h>
-#include <fcntl.h>
 #endif
 
 namespace comphelper {
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx
index 5f5a1289ba31..f906374064af 100644
--- a/comphelper/source/property/opropertybag.cxx
+++ b/comphelper/source/property/opropertybag.cxx
@@ -30,7 +30,6 @@
 #include <cppuhelper/exc_hlp.hxx>
 
 #include <algorithm>
-#include <iterator>
 
 namespace com::sun::star::uno { class XComponentContext; }
 
diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx
index e83d4752a57e..35598b262a68 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <comphelper/propertystatecontainer.hxx>
-#include <rtl/ustrbuf.hxx>
 
 
 namespace comphelper
diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx
index fa918d01da29..d99139c852ea 100644
--- a/comphelper/source/xml/attributelist.cxx
+++ b/comphelper/source/xml/attributelist.cxx
@@ -19,8 +19,6 @@
 
 #include <comphelper/attributelist.hxx>
 
-#include <vector>
-
 using namespace osl;
 using namespace com::sun::star;
 
diff --git a/configmgr/IwyuFilter_configmgr.yaml b/configmgr/IwyuFilter_configmgr.yaml
index 9a74a25f8a92..3a54ce434a21 100644
--- a/configmgr/IwyuFilter_configmgr.yaml
+++ b/configmgr/IwyuFilter_configmgr.yaml
@@ -13,3 +13,43 @@ excludelist:
     configmgr/source/dconf.cxx:
     # Generic wrapper for dconf
     - dconf/dconf.h
+    configmgr/source/broadcaster.cxx:
+    # Needed for template
+    - com/sun/star/beans/XPropertiesChangeListener.hpp
+    - com/sun/star/beans/XPropertyChangeListener.hpp
+    - com/sun/star/container/XContainerListener.hpp
+    - com/sun/star/lang/XEventListener.hpp
+    - com/sun/star/util/XChangesListener.hpp
+    configmgr/source/childaccess.cxx:
+    # Actually used
+    - vector
+    - com/sun/star/uno/XInterface.hpp
+    configmgr/source/configurationprovider.cxx:
+    # Actually used
+    - com/sun/star/uno/XInterface.hpp
+    configmgr/source/components.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    configmgr/source/access.cxx:
+    # Actually used
+    - vector
+    - com/sun/star/beans/XPropertiesChangeListener.hpp
+    - com/sun/star/beans/XPropertyChangeListener.hpp
+    - com/sun/star/beans/XVetoableChangeListener.hpp
+    - com/sun/star/container/XContainerListener.hpp
+    - com/sun/star/lang/XEventListener.hpp
+    - com/sun/star/uno/XInterface.hpp
+    configmgr/source/parsemanager.cxx:
+    # Actually used
+    - set
+    configmgr/source/partial.cxx:
+    # Actually used
+    - set
+    configmgr/source/rootaccess.cxx:
+    # Actually used
+    - vector
+    - com/sun/star/util/ElementChange.hpp
+    - com/sun/star/util/XChangesListener.hpp
+    configmgr/source/xcdparser.cxx:
+    # Actually used
+    - set
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index 2d9e1189dec0..d74019e6b05c 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/lang/XLocalizable.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.hxx>
@@ -42,8 +41,6 @@
 #include <cppu/unotype.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/mutex.hxx>
diff --git a/configmgr/source/configurationprovider.hxx b/configmgr/source/configurationprovider.hxx
index 278a82bd3bfb..96d40b895e61 100644
--- a/configmgr/source/configurationprovider.hxx
+++ b/configmgr/source/configurationprovider.hxx
@@ -22,7 +22,6 @@
 #include <sal/config.h>
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
 
 namespace com::sun::star {
     namespace uno {
diff --git a/configmgr/source/defaultprovider.hxx b/configmgr/source/defaultprovider.hxx
index a07098a65bc0..7c5af3100cdf 100644
--- a/configmgr/source/defaultprovider.hxx
+++ b/configmgr/source/defaultprovider.hxx
@@ -21,7 +21,6 @@
 
 #include <sal/config.h>
 
-#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
 namespace configmgr::default_provider {
diff --git a/configmgr/source/setnode.cxx b/configmgr/source/setnode.cxx
index cd3a437e0357..2ba4c50be681 100644
--- a/configmgr/source/setnode.cxx
+++ b/configmgr/source/setnode.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <algorithm>
-#include <vector>
 
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
diff --git a/connectivity/IwyuFilter_connectivity.yaml b/connectivity/IwyuFilter_connectivity.yaml
index 70d68ab79554..94f4f1d6c1ff 100644
--- a/connectivity/IwyuFilter_connectivity.yaml
+++ b/connectivity/IwyuFilter_connectivity.yaml
@@ -18,6 +18,9 @@ excludelist:
     connectivity/source/commontools/dbexception.cxx:
     # Actually used
     - com/sun/star/sdb/SQLErrorEvent.hpp
+    connectivity/source/commontools/dbtools2.cxx:
+    # Actually used
+    - com/sun/star/sdbc/XDataSource.hpp
     connectivity/source/commontools/paramwrapper.cxx:
     # Actually used
     - com/sun/star/sdbc/XParameters.hpp
@@ -45,6 +48,9 @@ excludelist:
     connectivity/source/drivers/file/FCatalog.cxx:
     # Actually used
     - com/sun/star/sdbc/XRow.hpp
+    connectivity/source/drivers/file/FNumericFunctions.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
     connectivity/source/drivers/hsqldb/HStorageAccess.cxx:
     # Needed for HSQLDB_DBG
     - accesslog.hxx
@@ -65,6 +71,9 @@ excludelist:
     connectivity/source/drivers/mork/MDriver.cxx:
     # Actually used
     - com/sun/star/uno/XComponentContext.hpp
+    connectivity/source/drivers/mork/MColumnAlias.cxx:
+    # Needed for indirect dtor
+    - com/sun/star/container/XHierarchicalNameAccess.hpp
     connectivity/source/drivers/mysql_jdbc/YDriver.cxx:
     # Actually used
     - com/sun/star/uno/XComponentContext.hpp
diff --git a/connectivity/inc/ParameterCont.hxx b/connectivity/inc/ParameterCont.hxx
index 848cec78e4e0..9e479db92064 100644
--- a/connectivity/inc/ParameterCont.hxx
+++ b/connectivity/inc/ParameterCont.hxx
@@ -20,7 +20,6 @@
 
 #include <com/sun/star/sdb/XInteractionSupplyParameters.hpp>
 #include <comphelper/interaction.hxx>
-#include <connectivity/dbtoolsdllapi.hxx>
 
 namespace dbtools
 {
diff --git a/connectivity/inc/TIndex.hxx b/connectivity/inc/TIndex.hxx
index 1ac2f5c4f9f2..7523b787e4b0 100644
--- a/connectivity/inc/TIndex.hxx
+++ b/connectivity/inc/TIndex.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <connectivity/dbtoolsdllapi.hxx>
 #include "sdbcx/VIndex.hxx"
 
 namespace connectivity
diff --git a/connectivity/inc/TIndexColumns.hxx b/connectivity/inc/TIndexColumns.hxx
index aa5687afc212..6d02c445eda2 100644
--- a/connectivity/inc/TIndexColumns.hxx
+++ b/connectivity/inc/TIndexColumns.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <connectivity/sdbcx/VCollection.hxx>
-#include <connectivity/dbtoolsdllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/inc/TKey.hxx b/connectivity/inc/TKey.hxx
index a4d1d92ff2cc..d7c762e308e1 100644
--- a/connectivity/inc/TKey.hxx
+++ b/connectivity/inc/TKey.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <connectivity/dbtoolsdllapi.hxx>
 #include "sdbcx/VKey.hxx"
 
 namespace connectivity
diff --git a/connectivity/inc/TKeyColumns.hxx b/connectivity/inc/TKeyColumns.hxx
index c40cd1cd7a61..19510e4965e9 100644
--- a/connectivity/inc/TKeyColumns.hxx
+++ b/connectivity/inc/TKeyColumns.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <connectivity/sdbcx/VCollection.hxx>
-#include <connectivity/dbtoolsdllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/inc/sdbcx/VKeyColumn.hxx b/connectivity/inc/sdbcx/VKeyColumn.hxx
index 2a1b50403982..5adf3e0aab9d 100644
--- a/connectivity/inc/sdbcx/VKeyColumn.hxx
+++ b/connectivity/inc/sdbcx/VKeyColumn.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 
 namespace connectivity::sdbcx
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index ffc0feb75a8b..24be4d72a6ce 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -25,8 +25,6 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <connectivity/dbexception.hxx>
 #include <o3tl/unreachable.hxx>
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
index 0082f96b61d1..5e07982773ce 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <sal/config.h>
-#include <sal/log.hxx>
 
 #include "mysqlc_connection.hxx"
 #include "mysqlc_propertyids.hxx"
@@ -27,7 +26,6 @@
 #include "mysqlc_general.hxx"
 
 #include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 using namespace connectivity::mysqlc;
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 31dbe09d85d6..d9889dea8091 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -35,7 +35,6 @@
  ************************************************************************/
 
 #include <vector>
-#include <time.h>
 #include <string.h>
 
 #include <memory>
@@ -49,12 +48,8 @@
 #include "pq_xusers.hxx"
 
 #include <rtl/uuid.h>
-#include <rtl/bootstrap.hxx>
 #include <sal/log.hxx>
-#include <o3tl/enumarray.hxx>
-#include <osl/module.h>
 
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx
index 58f626901706..9727d38cb3b0 100644
--- a/connectivity/source/inc/hsqldb/HDriver.hxx
+++ b/connectivity/source/inc/hsqldb/HDriver.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
 #include <com/sun/star/sdbcx/XCreateCatalog.hpp>
 #include <com/sun/star/embed/XTransactionListener.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/compbase.hxx>
diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx
index 3deba1b9887d..2fd49b252bdc 100644
--- a/connectivity/source/inc/java/sql/Driver.hxx
+++ b/connectivity/source/inc/java/sql/Driver.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <comphelper/logging.hxx>
diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx
index f4065dcc7fb0..545e9dde05fa 100644
--- a/connectivity/source/inc/mysql/YDriver.hxx
+++ b/connectivity/source/inc/mysql/YDriver.hxx
@@ -25,7 +25,6 @@
 
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/compbase.hxx>
diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx
index 1e05a61b0193..5765aad01523 100644
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ b/connectivity/source/inc/odbc/OBoundParam.hxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <odbc/odbcbasedllapi.hxx>
+#include <connectivity/odbc.hxx>
 
 namespace connectivity::odbc
     {
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index 09ccd11e05c3..ec72df370dd4 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -26,7 +26,6 @@
 #include <vector>
 
 #include <com/sun/star/sdbc/XDriverManager2.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XNamingService.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
@@ -34,7 +33,6 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/logging.hxx>
-#include <osl/mutex.hxx>
 #include <connectivity/DriversConfig.hxx>
 
 namespace drivermanager
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index 78097e26e854..e1c3a414d4b3 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -360,7 +360,6 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
-#include <o3tl/cppunittraitshelper.hxx>
 #include <rtl/ustring.hxx>
 
 #include <cstddef>
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index 7dfed7a714de..f5fbc0c9dbc8 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Type.hxx>
-#include <o3tl/cppunittraitshelper.hxx>
 #include <osl/interlck.h>
 #include <rtl/ustring.hxx>
 
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 0a84ee4cb708..5d0d0b84f573 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -33,7 +33,6 @@
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>
 #include <osl/diagnose.h>
 #include <typelib/typedescription.h>
diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx
index f3ba0ba21616..f2811a5958d4 100644
--- a/cppu/source/uno/loadmodule.cxx
+++ b/cppu/source/uno/loadmodule.cxx
@@ -26,7 +26,6 @@
 #include <osl/module.hxx>
 #include <rtl/malformeduriexception.hxx>
 #include <rtl/uri.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 
diff --git a/cppuhelper/IwyuFilter_cppuhelper.yaml b/cppuhelper/IwyuFilter_cppuhelper.yaml
index c3f92ce5e093..cbae100fb19d 100644
--- a/cppuhelper/IwyuFilter_cppuhelper.yaml
+++ b/cppuhelper/IwyuFilter_cppuhelper.yaml
@@ -22,6 +22,10 @@ excludelist:
     cppuhelper/source/exc_thrower.cxx:
     # No hpp -> hdl switch
     - cppuhelper/detail/XExceptionThrower.hpp
+    # Needed for mobile versions
+    - sal/log.hxx
+    - com/sun/star/ucb/InteractiveAugmentedIOException.hpp
+    - com/sun/star/ucb/NameClashException.hpp
     # Needed for cppu::throwException
     - cppuhelper/exc_hlp.hxx
     cppuhelper/source/findsofficepath.c:
@@ -46,3 +50,10 @@ excludelist:
     cppuhelper/source/tdmgr.cxx:
     # Needed to inherit linker visibility from function declaration
     - cppuhelper/bootstrap.hxx
+    cppuhelper/source/typemanager.cxx:
+    # Actually used
+    - com/sun/star/reflection/TypeDescriptionSearchDepth.hpp
+    - com/sun/star/uno/TypeClass.hpp
+    cppuhelper/source/servicemanager.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index 7c40d12db16e..ab7ed83f53e1 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -17,11 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_features.h>
-
 #include <rtl/instance.hxx>
 #include <osl/diagnose.h>
-#include <osl/doublecheckedlocking.h>
 #include <sal/log.hxx>
 #include <uno/dispatcher.hxx>
 #include <uno/lbnames.h>
diff --git a/cppuhelper/source/supportsservice.cxx b/cppuhelper/source/supportsservice.cxx
index eea82602a2ef..f7f267ea0fd5 100644
--- a/cppuhelper/source/supportsservice.cxx
+++ b/cppuhelper/source/supportsservice.cxx
@@ -16,7 +16,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/ustring.hxx>
-#include <sal/types.h>
 
 bool cppu::supportsService(
     css::lang::XServiceInfo * implementation, OUString const & name)
diff --git a/cui/IwyuFilter_cui.yaml b/cui/IwyuFilter_cui.yaml
index c2f63e05282c..69ecc5b3d9de 100644
--- a/cui/IwyuFilter_cui.yaml
+++ b/cui/IwyuFilter_cui.yaml
@@ -13,6 +13,9 @@ excludelist:
     cui/source/dialogs/DiagramDialog.cxx:
     # Needed for direct member access
     - com/sun/star/beans/PropertyValue.hpp
+    cui/source/dialogs/pastedlg.cxx:
+    # Needed for direct member access
+    - com/sun/star/beans/PropertyValue.hpp
     cui/source/dialogs/SignSignatureLineDialog.cxx:
     # Actually used
     - com/sun/star/graphic/XGraphic.hpp
@@ -21,6 +24,15 @@ excludelist:
     # Actually used
     - com/sun/star/linguistic2/XMeaning.hpp
     - com/sun/star/linguistic2/XThesaurus.hpp
+    cui/source/dialogs/tipofthedaydlg.cxx:
+    # Needed for direct member access
+    - com/sun/star/beans/PropertyValue.hpp
+    cui/source/dialogs/toolbarmodedlg.cxx:
+    # Needed for direct member access
+    - com/sun/star/beans/PropertyValue.hpp
+    cui/source/tabpages/numfmt.cxx:
+    # Actually used
+    - com/sun/star/frame/XModel.hpp
     cui/source/customize/cfg.cxx:
     # Actually used
     - com/sun/star/ui/dialogs/XFilePicker3.hpp
diff --git a/cui/qa/unit/cui-dialogs-test.cxx b/cui/qa/unit/cui-dialogs-test.cxx
index fe8091a8e33e..f580644e37c9 100644
--- a/cui/qa/unit/cui-dialogs-test.cxx
+++ b/cui/qa/unit/cui-dialogs-test.cxx
@@ -9,9 +9,6 @@
 
 #include <sal/config.h>
 #include <test/screenshot_test.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <sfx2/app.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svxdlg.hxx>
 #include <vcl/abstdlg.hxx>
diff --git a/cui/qa/unit/cui-dialogs-test_2.cxx b/cui/qa/unit/cui-dialogs-test_2.cxx
index f9c040636e6c..af1b27fc5b78 100644
--- a/cui/qa/unit/cui-dialogs-test_2.cxx
+++ b/cui/qa/unit/cui-dialogs-test_2.cxx
@@ -9,9 +9,6 @@
 
 #include <sal/config.h>
 #include <test/screenshot_test.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <sfx2/app.hxx>
 #include <vcl/abstdlg.hxx>
 
 using namespace ::com::sun::star;
diff --git a/cui/qa/unit/cui-dialogs-test_3.cxx b/cui/qa/unit/cui-dialogs-test_3.cxx
index d13c756785e0..e369fd11fd39 100644
--- a/cui/qa/unit/cui-dialogs-test_3.cxx
+++ b/cui/qa/unit/cui-dialogs-test_3.cxx
@@ -9,9 +9,6 @@
 
 #include <sal/config.h>
 #include <test/screenshot_test.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <sfx2/app.hxx>
 #include <vcl/abstdlg.hxx>
 
 using namespace ::com::sun::star;
diff --git a/cui/qa/unit/cui-dialogs-test_4.cxx b/cui/qa/unit/cui-dialogs-test_4.cxx
index 27449310b7fb..7183811b98f1 100644
--- a/cui/qa/unit/cui-dialogs-test_4.cxx
+++ b/cui/qa/unit/cui-dialogs-test_4.cxx
@@ -9,9 +9,6 @@
 
 #include <sal/config.h>
 #include <test/screenshot_test.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <sfx2/app.hxx>
 #include <vcl/abstdlg.hxx>
 
 using namespace ::com::sun::star;
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 19860e19b2d3..b6e4694dddac 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -32,10 +32,6 @@
 #include <strings.hrc>
 #include <comphelper/namedvaluecollection.hxx>
 
-#include <algorithm>
-#include <iterator>
-#include <set>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx
index ab91e47cd21b..383afdaa62dc 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -10,6 +10,8 @@
 #include <config_folders.h>
 
 #include <AdditionsDialog.hxx>
+#include <dialmgr.hxx>
+#include <strings.hrc>
 
 #include <sal/log.hxx>
 
@@ -35,6 +37,7 @@
 #include <ucbhelper/content.hxx>
 
 #include <com/sun/star/deployment/DeploymentException.hpp>
+#include <com/sun/star/deployment/ExtensionManager.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/ucb/CommandFailedException.hpp>
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx
index 0c33d35d6aa7..28bbfabcf845 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -42,7 +42,6 @@
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/XTextViewCursor.hpp>
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
-#include <config_fuzzers.h>
 #include <com/sun/star/drawing/XDrawView.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 
diff --git a/cui/source/dialogs/SignatureLineDialogBase.cxx b/cui/source/dialogs/SignatureLineDialogBase.cxx
index 50214308fe10..d824e85e8e3e 100644
--- a/cui/source/dialogs/SignatureLineDialogBase.cxx
+++ b/cui/source/dialogs/SignatureLineDialogBase.cxx
@@ -11,11 +11,7 @@
 
 #include <utility>
 
-#include <config_folders.h>
 #include <vcl/weld.hxx>
-#include <sal/log.hxx>
-#include <rtl/bootstrap.hxx>
-#include <tools/stream.hxx>
 
 using namespace css;
 using namespace css::uno;
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index ff7173763e11..a4701019c938 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -20,7 +20,6 @@
 #include <about.hxx>
 
 #include <osl/process.h>     //osl_getProcessLocale
-#include <rtl/character.hxx> //rtl::isAsciiHexDigit
 #include <sal/log.hxx>       //SAL_WARN
 #include <vcl/settings.hxx>  //GetSettings
 #include <vcl/svapp.hxx>     //Application::
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 3e94ad472e63..d22837c7b4eb 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -36,7 +36,6 @@
 #include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 
-#include <sal/log.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 375a966c7786..d86d277cc34f 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -26,8 +26,8 @@
 #include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <tools/lineend.hxx>
-#include <comphelper/propertysequence.hxx>
 #include <comphelper/dispatchcommand.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
 
 SvPasteObjectDialog::SvPasteObjectDialog(weld::Window* pParent)
     : GenericDialogController(pParent, "cui/ui/pastespecial.ui", "PasteSpecialDialog")
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx b/cui/source/dialogs/tipofthedaydlg.cxx
index ac6a4b9e6138..2404052271e6 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/util/URLTransformer.hpp>
 
 #include <comphelper/dispatchcommand.hxx>
-#include <comphelper/propertysequence.hxx>
 #include <dialmgr.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <officecfg/Office/Common.hxx>
@@ -41,6 +40,7 @@
 #include <rtl/bootstrap.hxx>
 #include <unotools/resmgr.hxx>
 #include <unotools/configmgr.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
 
 TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
     : GenericDialogController(pParent, "cui/ui/tipofthedaydialog.ui", "TipOfTheDayDialog")
diff --git a/cui/source/dialogs/toolbarmodedlg.cxx b/cui/source/dialogs/toolbarmodedlg.cxx
index 8c3e54bbe489..e645f6bb26d0 100644
--- a/cui/source/dialogs/toolbarmodedlg.cxx
+++ b/cui/source/dialogs/toolbarmodedlg.cxx
@@ -14,7 +14,6 @@
 
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <comphelper/dispatchcommand.hxx>
-#include <comphelper/propertysequence.hxx>
 #include <comphelper/types.hxx>
 #include <dialmgr.hxx>
 #include <officecfg/Office/Common.hxx>
@@ -28,6 +27,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/EnumContext.hxx>
 #include <vcl/weld.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
 
 static OUString GetCurrentApp()
 {
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 89ba22069339..a9d521708f5d 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -25,7 +25,6 @@
 #include <tools/link.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 
-#include <about.hxx>
 #include <cfgutil.hxx>
 #include <cui/cuicharmap.hxx>
 #include <cuifmsearch.hxx>
@@ -56,7 +55,6 @@
 #include <SpellDialog.hxx>
 #include <srchxtra.hxx>
 #include <thesdlg.hxx>
-#include <tipofthedaydlg.hxx>
 #include <transfrm.hxx>
 #include <zoom.hxx>
 #include <AdditionsDialog.hxx>
diff --git a/cui/source/inc/AdditionsDialog.hxx b/cui/source/inc/AdditionsDialog.hxx
index c550034a16db..f11c4ee24691 100644
--- a/cui/source/inc/AdditionsDialog.hxx
+++ b/cui/source/inc/AdditionsDialog.hxx
@@ -10,13 +10,9 @@
 
 #pragma once
 
-#include <vcl/svapp.hxx>
 #include <salhelper/thread.hxx>
 #include <rtl/ref.hxx>
 #include <vcl/weld.hxx>
-#include <strings.hrc>
-#include <comphelper/string.hxx>
-#include "dialmgr.hxx"
 
 // Detect changes on the UI
 #include <vcl/timer.hxx>
@@ -26,20 +22,14 @@
 
 // Extension Manager Connection
 #include <com/sun/star/deployment/XExtensionManager.hpp>
-#include <com/sun/star/deployment/ExtensionManager.hpp>
-#include <com/sun/star/deployment/XPackageManager.hpp>
 
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/task/XJob.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
 #include <cppuhelper/implbase.hxx>
 
+#include <atomic>
+
 class AdditionsDialog;
 class SearchAndParseThread;
 class AdditionsItem;
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 27d07ce0d722..2cfc65a894f4 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -18,7 +18,6 @@
  */
 #pragma once
 
-#include <vcl/bitmapex.hxx>
 #include <vcl/weld.hxx>
 
 class AboutDialog : public weld::GenericDialogController
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 17616cf945f8..5aa4a8c6041f 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -20,7 +20,6 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <svx/langbox.hxx>
-#include <vcl/metric.hxx>
 
 #include <map>
 #include <set>
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 23501f1fd25e..1513347e481f 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -25,6 +25,7 @@
 #include <svx/frmdirlbox.hxx>
 #include <i18nutil/paper.hxx>
 #include <svx/flagsdef.hxx>
+#include <vcl/print.hxx>
 
 // class SvxPageDescPage -------------------------------------------------
 /*
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 846e4a23e3f9..65e76e534ffd 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -21,7 +21,6 @@
 
 #include <memory>
 #include <sfx2/basedlgs.hxx>
-#include <vcl/abstdlg.hxx>
 #include <vcl/weld.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index b47cd1178149..3f7bad1d804a 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -39,7 +39,6 @@
 #include <com/sun/star/task/InteractionHandler.hpp>
 
 #include <sal/types.h>
-#include <sal/log.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/file.hxx>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 1000dbf0983e..45aad05aef44 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -38,7 +38,6 @@
 #include <editeng/wrlmitem.hxx>
 #include <editeng/cmapitem.hxx>
 #include <editeng/kernitem.hxx>
-#include <editeng/blinkitem.hxx>
 #include <editeng/flstitem.hxx>
 #include <editeng/autokernitem.hxx>
 #include <editeng/colritem.hxx>