basic/source/runtime/inputbox.cxx                                  |    1 
 basic/source/runtime/methods1.cxx                                  |    1 
 basic/source/runtime/stdobj1.cxx                                   |    1 
 canvas/source/cairo/cairo_devicehelper.cxx                         |    1 
 canvas/source/vcl/devicehelper.cxx                                 |    1 
 chart2/source/controller/accessibility/AccessibleViewForwarder.cxx |    1 
 chart2/source/controller/dialogs/tp_ChartType.cxx                  |    1 
 cppcanvas/source/mtfrenderer/implrenderer.cxx                      |    1 
 cui/source/dialogs/screenshotannotationdlg.cxx                     |    1 
 cui/source/tabpages/page.cxx                                       |    1 
 dbaccess/source/ui/app/AppView.cxx                                 |    1 
 dbaccess/source/ui/control/FieldDescControl.cxx                    |    1 
 dbaccess/source/ui/tabledesign/TableDesignControl.cxx              |    1 
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx                |    1 
 drawinglayer/qa/unit/vclmetafileprocessor2d.cxx                    |    1 
 drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx       |    1 
 drawinglayer/source/primitive2d/sceneprimitive2d.cxx               |    1 
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx         |    1 
 drawinglayer/source/tools/converters.cxx                           |    1 
 drawinglayer/source/tools/wmfemfhelper.cxx                         |    1 
 emfio/inc/mtftools.hxx                                             |    3 ++
 emfio/source/emfuno/xemfparser.cxx                                 |    1 
 emfio/source/reader/mtftools.cxx                                   |    1 
 emfio/source/reader/wmfreader.cxx                                  |    1 
 extensions/source/scanner/grid.cxx                                 |    1 
 extensions/source/scanner/sanedlg.cxx                              |    1 
 filter/source/pdf/pdfexport.cxx                                    |    2 +
 forms/source/inc/commandimageprovider.hxx                          |    1 
 framework/source/uiconfiguration/CommandImageResolver.hxx          |    1 
 framework/source/uiconfiguration/ImageList.cxx                     |    1 
 framework/source/uiconfiguration/imagemanagerimpl.cxx              |    1 
 include/IwyuFilter_include.yaml                                    |    3 ++
 include/vcl/hatch.hxx                                              |    2 -
 include/vcl/headbar.hxx                                            |    3 +-
 include/vcl/hexcolorcontrol.hxx                                    |    5 +++-
 include/vcl/image.hxx                                              |   10 
+++++----
 include/vcl/imap.hxx                                               |    6 ++++-
 include/vcl/inetimg.hxx                                            |    2 -
 include/vcl/lineinfo.hxx                                           |    4 +--
 include/vcl/lok.hxx                                                |    6 ++++-
 include/vcl/mapmod.hxx                                             |    2 -
 include/vcl/menubarupdateicon.hxx                                  |    1 
 include/vcl/metaact.hxx                                            |    9 
++++----
 include/vcl/pdf/pwdinteract.hxx                                    |   11 
+++++++++-
 include/vcl/pdfwriter.hxx                                          |   10 
+++++++--
 include/vcl/print.hxx                                              |    7 
+++---
 include/vcl/toolkit/svtabbx.hxx                                    |    1 
 lotuswordpro/source/filter/lwppagelayout.cxx                       |    1 
 oox/source/helper/graphichelper.cxx                                |    1 
 sc/source/ui/cctrl/cbuttonw.cxx                                    |    1 
 sc/source/ui/view/gridmerg.cxx                                     |    1 
 sc/source/ui/view/hintwin.cxx                                      |    1 
 sd/inc/SlideRenderer.hxx                                           |    1 
 sd/source/filter/eppt/pptx-epptbase.cxx                            |    1 
 sd/source/ui/animations/CustomAnimationList.cxx                    |    1 
 sd/source/ui/inc/PreviewRenderer.hxx                               |    2 +
 sd/source/ui/sidebar/MasterPageDescriptor.hxx                      |    1 
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx               |    1 
 sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx        |    1 
 sd/source/ui/slidesorter/view/SlsTheme.cxx                         |    1 
 sfx2/source/dialog/dialoghelper.cxx                                |    1 
 sfx2/source/doc/printhelper.cxx                                    |    2 +
 slideshow/source/engine/rehearsetimingsactivity.cxx                |    1 
 svtools/source/brwbox/brwbox2.cxx                                  |    1 
 svtools/source/control/ruler.cxx                                   |    1 
 svtools/source/dialogs/prnsetup.cxx                                |    1 
 svtools/source/filter/exportdialog.cxx                             |    1 
 svtools/source/svhtml/htmlout.cxx                                  |    1 
 svx/source/dialog/paraprev.cxx                                     |    1 
 svx/source/dialog/swframeexample.cxx                               |    1 
 svx/source/fmcomp/fmgridif.cxx                                     |    1 
 svx/source/sdr/overlay/overlayobjectlist.cxx                       |    1 
 svx/source/sidebar/line/LineWidthValueSet.cxx                      |    1 
 svx/source/tbxctrls/bulletsnumbering.cxx                           |    1 
 svx/source/tbxctrls/layctrl.cxx                                    |    1 
 svx/source/xoutdev/xtabdash.cxx                                    |    1 
 svx/source/xoutdev/xtabhtch.cxx                                    |    1 
 sw/source/core/bastyp/swtypes.cxx                                  |    1 
 sw/source/ui/dbui/mmresultdialogs.cxx                              |    1 
 toolkit/source/controls/controlmodelcontainerbase.cxx              |    1 
 toolkit/source/controls/dialogcontrol.cxx                          |    1 
 toolkit/source/controls/svtxgridcontrol.cxx                        |    1 
 toolkit/source/controls/table/tablecontrol_impl.cxx                |    1 
 toolkit/source/controls/tabpagemodel.cxx                           |    1 
 vcl/inc/graphic/SwapInfo.hxx                                       |    1 
 vcl/osx/salprn.cxx                                                 |    2 +
 vcl/qa/cppunit/GraphicDescriptorTest.cxx                           |    1 
 vcl/qa/cppunit/GraphicTest.cxx                                     |    1 
 vcl/qa/cppunit/TypeSerializerTest.cxx                              |    1 
 vcl/qa/cppunit/filter/igif/igif.cxx                                |    1 
 vcl/qa/cppunit/gradient.cxx                                        |    1 
 vcl/qa/cppunit/outdev.cxx                                          |    1 
 vcl/qa/cppunit/svm/svmtest.cxx                                     |    1 
 vcl/qa/cppunit/vclmaptest.cxx                                      |    1 
 vcl/source/app/settings.cxx                                        |    1 
 vcl/source/bitmap/BitmapTools.cxx                                  |    1 
 vcl/source/bitmap/Vectorizer.cxx                                   |    1 
 vcl/source/bitmap/bitmap.cxx                                       |    1 
 vcl/source/bitmap/bitmappaint.cxx                                  |    1 
 vcl/source/bitmap/dibtools.cxx                                     |    1 
 vcl/source/control/button.cxx                                      |    1 
 vcl/source/control/ctrl.cxx                                        |    1 
 vcl/source/control/field.cxx                                       |    1 
 vcl/source/control/roadmap.cxx                                     |    1 
 vcl/source/control/roadmapwizard.cxx                               |    1 
 vcl/source/control/scrbar.cxx                                      |    1 
 vcl/source/control/tabctrl.cxx                                     |    1 
 vcl/source/filter/GraphicFormatDetector.cxx                        |    1 
 vcl/source/filter/egif/egif.cxx                                    |    1 
 vcl/source/filter/eps/eps.cxx                                      |    1 
 vcl/source/filter/etiff/etiff.cxx                                  |    1 
 vcl/source/filter/graphicfilter2.cxx                               |    1 
 vcl/source/filter/idxf/dxf2mtf.cxx                                 |    1 
 vcl/source/filter/idxf/dxfreprd.hxx                                |    1 
 vcl/source/filter/ieps/ieps.cxx                                    |    1 
 vcl/source/filter/igif/gifread.cxx                                 |    1 
 vcl/source/filter/imet/ios2met.cxx                                 |    1 
 vcl/source/filter/ipict/ipict.cxx                                  |    1 
 vcl/source/filter/ipsd/ipsd.cxx                                    |    1 
 vcl/source/filter/itiff/itiff.cxx                                  |    1 
 vcl/source/filter/jpeg/JpegReader.cxx                              |    1 
 vcl/source/filter/png/PngImageReader.cxx                           |    1 
 vcl/source/filter/png/PngImageWriter.cxx                           |    1 
 vcl/source/filter/svm/SvmConverter.cxx                             |    1 
 vcl/source/filter/svm/SvmReader.cxx                                |    1 
 vcl/source/filter/svm/SvmWriter.cxx                                |    1 
 vcl/source/filter/wmf/emfwr.cxx                                    |    1 
 vcl/source/filter/wmf/wmfwr.cxx                                    |    1 
 vcl/source/gdi/TypeSerializer.cxx                                  |    1 
 vcl/source/gdi/gdimetafiletools.cxx                                |    1 
 vcl/source/gdi/gdimtf.cxx                                          |    1 
 vcl/source/gdi/gradient.cxx                                        |    1 
 vcl/source/gdi/hatch.cxx                                           |    1 
 vcl/source/gdi/lineinfo.cxx                                        |    2 +
 vcl/source/gdi/mapmod.cxx                                          |    1 
 vcl/source/gdi/mtfxmldump.cxx                                      |    1 
 vcl/source/gdi/oldprintadaptor.cxx                                 |    1 
 vcl/source/gdi/print.cxx                                           |    2 +
 vcl/source/gdi/print3.cxx                                          |    2 +
 vcl/source/gdi/vectorgraphicdata.cxx                               |    1 
 vcl/source/graphic/GraphicObject.cxx                               |    1 
 vcl/source/graphic/UnoGraphicDescriptor.cxx                        |    1 
 vcl/source/graphic/UnoGraphicProvider.cxx                          |    1 
 vcl/source/outdev/bitmapex.cxx                                     |    1 
 vcl/source/outdev/map.cxx                                          |    1 
 vcl/source/outdev/outdev.cxx                                       |    1 
 vcl/source/outdev/transparent.cxx                                  |    1 
 vcl/source/pdf/pdfwriter_impl2.cxx                                 |    1 
 vcl/source/pdf/pdfwriter_utils.hxx                                 |    1 
 vcl/source/text/textlayout.cxx                                     |    1 
 vcl/source/toolkit/morebtn.cxx                                     |    1 
 vcl/source/treelist/imap2.cxx                                      |    1 
 vcl/source/treelist/imap3.cxx                                      |    1 
 vcl/source/window/cursor.cxx                                       |    1 
 vcl/source/window/floatwin.cxx                                     |    1 
 vcl/source/window/menubarwindow.cxx                                |    1 
 vcl/source/window/menuitemlist.hxx                                 |    1 
 vcl/source/window/paint.cxx                                        |    1 
 vcl/source/window/printdlg.cxx                                     |    2 +
 vcl/source/window/split.cxx                                        |    1 
 vcl/source/window/window2.cxx                                      |    1 
 vcl/unx/generic/print/genprnpsp.cxx                                |    3 ++
 vcl/workben/svptest.cxx                                            |    1 
 writerperfect/source/writer/EPUBExportFilter.cxx                   |    1 
 xmloff/source/core/xmlgrhlp.cxx                                    |    1 
 165 files changed, 220 insertions(+), 23 deletions(-)

New commits:
commit 47fe1cce1bc0ec46050fcb33ee68a8d4ef56afde
Author:     Gabor Kelemen <[email protected]>
AuthorDate: Wed Dec 31 14:12:04 2025 +0100
Commit:     Gabor Kelemen <[email protected]>
CommitDate: Wed Jan 14 10:19:31 2026 +0100

    tdf#146619 Use more forward declarations in include/vcl/[h-p]*
    
    Found after running bin/find-unneeded-includes --headersfwd 
include/vcl/[n-p]*
    
    Change-Id: If6436f3ef8300693c3869c2521e2fa2aa8a4edc8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196397
    Tested-by: Jenkins
    Reviewed-by: Gabor Kelemen <[email protected]>

diff --git a/basic/source/runtime/inputbox.cxx 
b/basic/source/runtime/inputbox.cxx
index a35ae2dce8c5..788c71b031fd 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -19,6 +19,7 @@
 
 #include <basic/sberrors.hxx>
 #include <tools/lineend.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/DialogController.hxx>
diff --git a/basic/source/runtime/methods1.cxx 
b/basic/source/runtime/methods1.cxx
index 8bcc61f08581..1a2cc078f184 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -31,6 +31,7 @@
 #include <basic/sbxvar.hxx>
 #include <basic/sbx.hxx>
 #include <svl/zforlist.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/fract.hxx>
 #include <o3tl/environment.hxx>
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 533eb2f92f24..3d189fedfd41 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -19,6 +19,7 @@
 
 #include <basic/sberrors.hxx>
 #include <basic/sbstar.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
 #include <sbstdobj.hxx>
 
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx 
b/canvas/source/cairo/cairo_devicehelper.cxx
index ff2a17c716ca..3e899c03e199 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -22,6 +22,7 @@
 
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/utils/unopolypolygon.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/canvastools.hxx>
diff --git a/canvas/source/vcl/devicehelper.cxx 
b/canvas/source/vcl/devicehelper.cxx
index 7023458175b4..69d8e381fd90 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -22,6 +22,7 @@
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/utils/unopolypolygon.hxx>
 #include <canvas/canvastools.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/dibtools.hxx>
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx 
b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
index dbd8ac0d51f2..407a8f9098c1 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
@@ -20,6 +20,7 @@
 #include "AccessibleViewForwarder.hxx"
 #include <AccessibleChartView.hxx>
 
+#include <tools/mapunit.hxx>
 #include <vcl/window.hxx>
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx 
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 3e87bb55fa09..062fbeb912af 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -28,6 +28,7 @@
 #include <unonames.hxx>
 
 #include <svtools/valueset.hxx>
+#include <tools/mapunit.hxx>
 
 #include <utility>
 #include <vcl/weld/TreeView.hxx>
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx 
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index e8bd10291ba6..cf9e845a8193 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -19,6 +19,7 @@
 
 #include <comphelper/diagnose_ex.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <utility>
 #include <vcl/svapp.hxx>
 #include <comphelper/propertysequence.hxx>
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index c1ff3c15aca7..c7f0d334d64c 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -36,6 +36,7 @@
 
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <sfx2/filedlghelper.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/bitmap.hxx>
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index bda85c9570a0..bbd8e9fb7d16 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -25,6 +25,7 @@
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
 #include <svtools/unitconv.hxx>
+#include <vcl/PrinterSupport.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weld.hxx>
 #include <sfx2/htmlmode.hxx>
diff --git a/dbaccess/source/ui/app/AppView.cxx 
b/dbaccess/source/ui/app/AppView.cxx
index 5df68fcac5ee..aa8124934334 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -20,6 +20,7 @@
 #include "AppView.hxx"
 #include <strings.hrc>
 #include <comphelper/diagnose_ex.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/event.hxx>
 #include <vcl/weld/weld.hxx>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx 
b/dbaccess/source/ui/control/FieldDescControl.cxx
index 041b15c48b9c..e7e7055689d4 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -21,6 +21,7 @@
 #include <FieldDescControl.hxx>
 #include <FieldControls.hxx>
 #include <comphelper/diagnose_ex.hxx>
+#include <tools/mapunit.hxx>
 #include <TableDesignHelpBar.hxx>
 #include <vcl/svapp.hxx>
 #include <FieldDescriptions.hxx>
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx 
b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index a8174d75971f..3427383b0042 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -22,6 +22,7 @@
 #include <TableController.hxx>
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <tools/mapunit.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weldutils.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx 
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index cd9c27163578..1c3c58007766 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -38,6 +38,7 @@
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
+#include <tools/mapunit.hxx>
 #include <utility>
 #include <vcl/event.hxx>
 #include <vcl/ptrstyle.hxx>
diff --git a/drawinglayer/qa/unit/vclmetafileprocessor2d.cxx 
b/drawinglayer/qa/unit/vclmetafileprocessor2d.cxx
index 4e5e5752656e..d71cfc4bbe7d 100644
--- a/drawinglayer/qa/unit/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/qa/unit/vclmetafileprocessor2d.cxx
@@ -15,6 +15,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/primitive2d/PolygonStrokePrimitive2D.hxx>
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx 
b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 93235e8a3263..bfa56abc5914 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -25,6 +25,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <basegfx/numeric/ftools.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/canvastools.hxx>
 #include <com/sun/star/geometry/RealRectangle2D.hpp>
diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx 
b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
index fbc651acf11e..76d04c44e5ca 100644
--- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
@@ -33,6 +33,7 @@
 #include <processor3d/geometry2dextractor.hxx>
 #include <basegfx/raster/bzpixelraster.hxx>
 #include <utility>
+#include <tools/mapunit.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <vcl/RawBitmap.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 7d45071f6702..df2f68c7f583 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -22,6 +22,7 @@
 #include "vclmetafileprocessor2d.hxx"
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <comphelper/flagguard.hxx>
diff --git a/drawinglayer/source/tools/converters.cxx 
b/drawinglayer/source/tools/converters.cxx
index fc6bef06fd21..5673a2f08d05 100644
--- a/drawinglayer/source/tools/converters.cxx
+++ b/drawinglayer/source/tools/converters.cxx
@@ -23,6 +23,7 @@
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <drawinglayer/processor2d/processor2dtools.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx 
b/drawinglayer/source/tools/wmfemfhelper.cxx
index a86d92caf7b0..2f42bf62dbd2 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -49,6 +49,7 @@
 #include <drawinglayer/primitive2d/epsprimitive2d.hxx>
 #include <sal/log.hxx>
 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/gradient.hxx>
diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx
index 47c556b16038..91d7ce815450 100644
--- a/emfio/inc/mtftools.hxx
+++ b/emfio/inc/mtftools.hxx
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <basegfx/utils/b2dclipstate.hxx>
+#include <basegfx/vector/b2enums.hxx>
 #include <tools/poly.hxx>
 #include <vcl/font.hxx>
 #include <vcl/bitmap.hxx>
@@ -27,6 +28,8 @@
 #include <vcl/metaact.hxx>
 #include <rtl/ref.hxx>
 
+#include <com/sun/star/drawing/LineCap.hpp>
+
 #include "emfiodllapi.h"
 
 namespace emfio
diff --git a/emfio/source/emfuno/xemfparser.cxx 
b/emfio/source/emfuno/xemfparser.cxx
index 0caa7345c936..dcdea7df6f91 100644
--- a/emfio/source/emfuno/xemfparser.cxx
+++ b/emfio/source/emfuno/xemfparser.cxx
@@ -25,6 +25,7 @@
 #include <cppuhelper/supportsservice.hxx>
 
 #include <utility>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wmfexternal.hxx>
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index a8380cb374fc..a2145510cf6f 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -23,6 +23,7 @@
 #include <memory>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/graphictools.hxx>
 #include <vcl/BitmapTools.hxx>
diff --git a/emfio/source/reader/wmfreader.cxx 
b/emfio/source/reader/wmfreader.cxx
index de6f1ff9cd1f..6a321842a794 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -29,6 +29,7 @@
 #include <rtl/crc.h>
 #include <rtl/tencinfo.h>
 #include <sal/log.hxx>
+#include <tools/mapunit.hxx>
 #include <osl/endian.h>
 #include <vcl/gdimtf.hxx>
 #include <vcl/svapp.hxx>
diff --git a/extensions/source/scanner/grid.cxx 
b/extensions/source/scanner/grid.cxx
index 0c66a498a145..c8b7f64d4db9 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -21,6 +21,7 @@
 #include <o3tl/sprintf.hxx>
 #include <osl/thread.h>
 #include <rtl/math.hxx>
+#include <tools/mapunit.hxx>
 
 #include <bitmaps.hlst>
 #include <cmath>
diff --git a/extensions/source/scanner/sanedlg.cxx 
b/extensions/source/scanner/sanedlg.cxx
index b331b3304d5e..72fa8a04f516 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <o3tl/sprintf.hxx>
 #include <tools/config.hxx>
+#include <tools/mapunit.hxx>
 #include <unotools/resmgr.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/dibtools.hxx>
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 582f23a4baac..ac622a722950 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -20,6 +20,7 @@
 
 #include <osl/file.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/poly.hxx>
 #include <comphelper/diagnose_ex.hxx>
@@ -27,6 +28,7 @@
 #include <vcl/canvastools.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphic/GraphicMetadata.hxx>
 #include <vcl/pdf/PDFEncryptionInitialization.hxx>
 #include <rtl/ustring.hxx>
diff --git a/forms/source/inc/commandimageprovider.hxx 
b/forms/source/inc/commandimageprovider.hxx
index 02742b5a99bf..f59fe94c0b3e 100644
--- a/forms/source/inc/commandimageprovider.hxx
+++ b/forms/source/inc/commandimageprovider.hxx
@@ -26,6 +26,7 @@
 #include <vcl/image.hxx>
 
 #include <memory>
+#include <vector>
 
 
 namespace frm
diff --git a/framework/source/uiconfiguration/CommandImageResolver.hxx 
b/framework/source/uiconfiguration/CommandImageResolver.hxx
index a826e6005a51..a6169ce75494 100644
--- a/framework/source/uiconfiguration/CommandImageResolver.hxx
+++ b/framework/source/uiconfiguration/CommandImageResolver.hxx
@@ -10,6 +10,7 @@
 #pragma once
 
 #include <vcl/image.hxx>
+#include <vcl/vclenum.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
 
diff --git a/framework/source/uiconfiguration/ImageList.cxx 
b/framework/source/uiconfiguration/ImageList.cxx
index 3b130a8eb3bd..fc9b133962f5 100644
--- a/framework/source/uiconfiguration/ImageList.cxx
+++ b/framework/source/uiconfiguration/ImageList.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
+#include <vcl/bitmap.hxx>
 #include <vcl/image.hxx>
 #include "ImageList.hxx"
 
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx 
b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 8d4a468c61eb..d6a61bc3e59c 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -37,6 +37,7 @@
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/ui/ImageType.hpp>
+#include <vcl/bitmap.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <o3tl/enumrange.hxx>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 004fe2eec294..1f3c852cf7ae 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -342,6 +342,9 @@ excludelist:
     # Needed for macros
     - com/sun/star/awt/Key.hpp
     - com/sun/star/awt/KeyGroup.hpp
+    include/vcl/imap.hxx:
+    # Needed for std::vector<std::unique_ptr<IMapObject>> type
+    - vcl/imapobj.hxx
     include/vcl/transfer.hxx:
     # base class has to be a complete type
     - com/sun/star/datatransfer/XTransferable2.hpp
diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx
index 713f22b95dd1..e9bba682f609 100644
--- a/include/vcl/hatch.hxx
+++ b/include/vcl/hatch.hxx
@@ -25,11 +25,11 @@
 #include <tools/degree.hxx>
 #include <vcl/dllapi.h>
 
-#include <vcl/vclenum.hxx>
 #include <o3tl/cow_wrapper.hxx>
 
 
 class SvStream;
+enum class HatchStyle;
 
 struct ImplHatch
 {
diff --git a/include/vcl/headbar.hxx b/include/vcl/headbar.hxx
index f88153c87eaf..52ad396d460d 100644
--- a/include/vcl/headbar.hxx
+++ b/include/vcl/headbar.hxx
@@ -20,13 +20,14 @@
 #ifndef INCLUDED_VCL_HEADBAR_HXX
 #define INCLUDED_VCL_HEADBAR_HXX
 
-#include <comphelper/OAccessible.hxx>
 #include <vcl/dllapi.h>
 #include <tools/link.hxx>
 #include <vcl/window.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
 
+namespace comphelper { class OAccessible; }
+
 /*************************************************************************
 
 Description
diff --git a/include/vcl/hexcolorcontrol.hxx b/include/vcl/hexcolorcontrol.hxx
index 29dd27545d9c..a303e6175d74 100644
--- a/include/vcl/hexcolorcontrol.hxx
+++ b/include/vcl/hexcolorcontrol.hxx
@@ -19,13 +19,16 @@
 
 #pragma once
 
-#include <tools/color.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/link.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/weld/Entry.hxx>
 
+#include <memory>
+
 namespace weld { class Entry; }
 
+class Color;
 struct ImplSVEvent;
 
 namespace weld {
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index 4ba056197493..e72b35b99066 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -21,13 +21,15 @@
 #define INCLUDED_VCL_IMAGE_HXX
 
 #include <vcl/dllapi.h>
-#include <tools/gen.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/outdev.hxx>
-
+#include <rtl/ustring.hxx>
 #include <memory>
 
 class ImplImage;
+class Bitmap;
+class OutputDevice;
+class Point;
+class Size;
+enum class DrawImageFlags;
 
 namespace com::sun::star::graphic { class XGraphic; }
 namespace com::sun::star::uno { template <class interface_type> class 
Reference; }
diff --git a/include/vcl/imap.hxx b/include/vcl/imap.hxx
index 8565f321ac83..b5f0562db43c 100644
--- a/include/vcl/imap.hxx
+++ b/include/vcl/imap.hxx
@@ -22,7 +22,8 @@
 
 #include <vcl/imapobj.hxx>
 #include <vcl/dllapi.h>
-#include <tools/stream.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/long.hxx>
 #include <tools/solar.h>
 #include <memory>
 #include <vector>
@@ -30,6 +31,9 @@
 class Point;
 class Size;
 class Fraction;
+class SvStream;
+enum class IMapFormat;
+enum class StreamMode;
 
 class VCL_DLLPUBLIC ImageMap final
 {
diff --git a/include/vcl/inetimg.hxx b/include/vcl/inetimg.hxx
index 9cb4a11060c4..f70ebad1f9d7 100644
--- a/include/vcl/inetimg.hxx
+++ b/include/vcl/inetimg.hxx
@@ -21,10 +21,10 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include <sot/formats.hxx>
 #include <utility>
 
 class SvStream;
+enum class SotClipboardFormatId : sal_uInt32;
 
 class INetImage
 {
diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx
index 0644359954b9..f6f24a01f3c5 100644
--- a/include/vcl/lineinfo.hxx
+++ b/include/vcl/lineinfo.hxx
@@ -23,14 +23,14 @@
 #include <sal/types.h>
 #include <vcl/dllapi.h>
 #include <vcl/vclenum.hxx>
-#include <basegfx/vector/b2enums.hxx>
-#include <com/sun/star/drawing/LineCap.hpp>
 #include <o3tl/cow_wrapper.hxx>
 
 #include <vector>
 
 class SvStream;
 namespace basegfx { class B2DPolyPolygon; }
+namespace basegfx { enum class B2DLineJoin; }
+namespace com::sun::star::drawing { enum class LineCap; }
 
 struct ImplLineInfo
 {
diff --git a/include/vcl/lok.hxx b/include/vcl/lok.hxx
index ea7ffadd437b..d4591a53a98a 100644
--- a/include/vcl/lok.hxx
+++ b/include/vcl/lok.hxx
@@ -12,9 +12,13 @@
 
 #include <sal/config.h>
 #include <vcl/dllapi.h>
-#include <rtl/strbuf.hxx>
 #include <LibreOfficeKit/LibreOfficeKitTypes.h>
 
+namespace rtl
+{
+class OStringBuffer;
+}
+
 namespace vcl::lok
 {
 bool VCL_DLLPUBLIC isUnipoll();
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index fc5af32f9284..691b0e31ac17 100644
--- a/include/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
@@ -21,13 +21,13 @@
 #define INCLUDED_VCL_MAPMOD_HXX
 
 #include <vcl/dllapi.h>
-#include <tools/mapunit.hxx>
 #include <o3tl/cow_wrapper.hxx>
 
 #include <ostream>
 
 class Point;
 class Fraction;
+enum class MapUnit : sal_uInt8;
 
 class SAL_WARN_UNUSED VCL_DLLPUBLIC MapMode
 {
diff --git a/include/vcl/menubarupdateicon.hxx 
b/include/vcl/menubarupdateicon.hxx
index b068bb7db6c5..d8d8edc21c17 100644
--- a/include/vcl/menubarupdateicon.hxx
+++ b/include/vcl/menubarupdateicon.hxx
@@ -22,6 +22,7 @@
 #include <tools/link.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/image.hxx>
+#include <vcl/vclptr.hxx>
 
 class BubbleWindow;
 class MenuBar;
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 62655d770b49..95f486b36811 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -22,12 +22,10 @@
 
 #include <sal/config.h>
 
-#include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 #include <tools/poly.hxx>
 
 #include <vcl/dllapi.h>
-#include <vcl/rendercontext/State.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/font.hxx>
 #include <vcl/gdimtf.hxx>
@@ -36,9 +34,7 @@
 #include <vcl/hatch.hxx>
 #include <vcl/kernarray.hxx>
 #include <vcl/lineinfo.hxx>
-#include <vcl/metaactiontypes.hxx>
 #include <vcl/region.hxx>
-#include <vcl/rendercontext/RasterOp.hxx>
 #include <vcl/wall.hxx>
 #include <basegfx/utils/bgradient.hxx>
 
@@ -47,6 +43,11 @@
 
 class OutputDevice;
 enum class DrawTextFlags;
+enum class MetaActionType;
+enum class RasterOp;
+namespace rtl { template <class reference_type> class Reference; }
+namespace vcl { enum class PushFlags; }
+namespace vcl::text { enum class ComplexTextLayoutFlags : sal_uInt8; }
 
 struct ImplMetaReadData
 {
diff --git a/include/vcl/pdf/pwdinteract.hxx b/include/vcl/pdf/pwdinteract.hxx
index 99b8442c516d..b50827937ef1 100644
--- a/include/vcl/pdf/pwdinteract.hxx
+++ b/include/vcl/pdf/pwdinteract.hxx
@@ -11,7 +11,16 @@
 #pragma once
 
 #include <vcl/dllapi.h>
-#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <rtl/ustring.hxx>
+
+namespace com::sun::star::uno
+{
+template <class interface_type> class Reference;
+}
+namespace com::sun::star::task
+{
+class XInteractionHandler;
+}
 
 namespace vcl::pdf
 {
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 65922a71440c..ad0e494c2a54 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -26,21 +26,27 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/font.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/kernarray.hxx>
+#include <vcl/rendercontext/DrawTextFlags.hxx>
+#include <vcl/rendercontext/State.hxx>
+#include <vcl/vclptr.hxx>
 
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
 
 #include <memory>
 #include <vector>
 #include <set>
+#include <span>
 
 namespace com::sun::star::beans { class XMaterialHolder; }
 namespace com::sun::star::io { class XOutputStream; }
 namespace com::sun::star::security { class XCertificate; }
 
+class AlphaMask;
 class GDIMetaFile;
+class Graphic;
 class MapMode;
 class LineInfo;
 namespace tools {
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index d9e4500534a7..78e5809819ed 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -26,11 +26,9 @@
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
 #include <tools/long.hxx>
-#include <i18nutil/paper.hxx>
 
 #include <vcl/dllapi.h>
 #include <utility>
-#include <vcl/PrinterSupport.hxx>
 #include <comphelper/errcode.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/prntypes.hxx>
@@ -38,7 +36,6 @@
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/view/PrintableState.hpp>
 
 #include <memory>
 #include <unordered_map>
@@ -46,10 +43,13 @@
 class GDIMetaFile;
 class SalInfoPrinter;
 struct SalPrinterQueueInfo;
+class PaperInfo;
 class QueueInfo;
 class SalPrinter;
 class VirtualDevice;
 enum class SalPrinterError;
+enum class PrinterSupport;
+enum Paper : unsigned int;
 
 namespace vcl {
     class PrinterController;
@@ -60,6 +60,7 @@ namespace vcl {
 }
 
 namespace weld { class Window; }
+namespace com::sun::star::view { enum class PrintableState; }
 
 class VCL_DLLPUBLIC Printer : public OutputDevice
 {
diff --git a/include/vcl/toolkit/svtabbx.hxx b/include/vcl/toolkit/svtabbx.hxx
index 97cad1431e80..9f8b60107e45 100644
--- a/include/vcl/toolkit/svtabbx.hxx
+++ b/include/vcl/toolkit/svtabbx.hxx
@@ -25,6 +25,7 @@
 
 #include <config_options.h>
 #include <accessibility/accessibletablistbox.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/toolkit/treelistbox.hxx>
 #include <vcl/accessibletableprovider.hxx>
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx 
b/lotuswordpro/source/filter/lwppagelayout.cxx
index ae5d63ae42a8..d782e3d5404d 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -75,6 +75,7 @@
 #include <lwpfilehdr.hxx>
 #include <lwpglobalmgr.hxx>
 #include <o3tl/sorted_vector.hxx>
+#include <tools/mapunit.hxx>
 #include <sal/log.hxx>
 #include <vcl/print.hxx>
 
diff --git a/oox/source/helper/graphichelper.cxx 
b/oox/source/helper/graphichelper.cxx
index 4a6e42c2e2f0..e31f1b23c52f 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/graphic/GraphicMapper.hpp>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
+#include <tools/mapunit.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/seqstream.hxx>
 #include <utility>
diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx
index b7f99f73181b..7d46fd3582aa 100644
--- a/sc/source/ui/cctrl/cbuttonw.cxx
+++ b/sc/source/ui/cctrl/cbuttonw.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/lok.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sc/source/ui/view/gridmerg.cxx b/sc/source/ui/view/gridmerg.cxx
index 117b3e1ad79a..37e3bc5936b7 100644
--- a/sc/source/ui/view/gridmerg.cxx
+++ b/sc/source/ui/view/gridmerg.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <tools/mapunit.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/outdev.hxx>
 
diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx
index a322cc324a4b..273cbec56c8f 100644
--- a/sc/source/ui/view/hintwin.cxx
+++ b/sc/source/ui/view/hintwin.cxx
@@ -28,6 +28,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <tools/lineend.hxx>
+#include <tools/mapunit.hxx>
 #include <utility>
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
diff --git a/sd/inc/SlideRenderer.hxx b/sd/inc/SlideRenderer.hxx
index 209d1333d44c..ba8a2b129665 100644
--- a/sd/inc/SlideRenderer.hxx
+++ b/sd/inc/SlideRenderer.hxx
@@ -24,6 +24,7 @@
 #include <comphelper/compbase.hxx>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/rendering/XBitmap.hpp>
+#include <com/sun/star/rendering/XCanvas.hpp>
 
 namespace com::sun::star::drawing { class XDrawPage; }
 
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx 
b/sd/source/filter/eppt/pptx-epptbase.cxx
index 1d7eb254910d..41fa16247e6a 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -31,6 +31,7 @@
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/UnitConversion.hxx>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx 
b/sd/source/ui/animations/CustomAnimationList.cxx
index 0b05b95b2c36..70d997234515 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -40,6 +40,7 @@
 #include <vcl/weld/weldutils.hxx>
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
+#include <tools/mapunit.hxx>
 #include <comphelper/diagnose_ex.hxx>
 
 #include <sdresid.hxx>
diff --git a/sd/source/ui/inc/PreviewRenderer.hxx 
b/sd/source/ui/inc/PreviewRenderer.hxx
index 3ecb60ac8dbd..c474a4fdd899 100644
--- a/sd/source/ui/inc/PreviewRenderer.hxx
+++ b/sd/source/ui/inc/PreviewRenderer.hxx
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <tools/color.hxx>
 #include <vcl/image.hxx>
+#include <vcl/vclptr.hxx>
 #include <memory>
 
 #include <svl/lstner.hxx>
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx 
b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
index 24e77e65bda4..c61a2130b264 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
@@ -21,6 +21,7 @@
 
 #include "MasterPageContainer.hxx"
 #include <memory>
+#include <vector>
 
 namespace sd { class PreviewRenderer; }
 class SdDrawDocument;
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 
b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
index 58b239eda9f2..be754719cda1 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
@@ -23,6 +23,7 @@
 #include "SlsRequestPriorityClass.hxx"
 #include "SlsBitmapFactory.hxx"
 
+#include <tools/gen.hxx>
 #include <vcl/timer.hxx>
 #include <mutex>
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx 
b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index 8bb77a988fef..7c8fb98198e3 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -22,6 +22,7 @@
 #include <model/SlsSharedPageDescriptor.hxx>
 #include <tools/gen.hxx>
 #include <vcl/image.hxx>
+#include <vcl/vclptr.hxx>
 
 namespace vcl { class Font; }
 namespace sd { class Window; }
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx 
b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index 2c1fb51db7f4..ec069809d68c 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -21,6 +21,7 @@
 #include <view/SlsTheme.hxx>
 #include <controller/SlsProperties.hxx>
 #include <tools/color.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/sfx2/source/dialog/dialoghelper.cxx 
b/sfx2/source/dialog/dialoghelper.cxx
index 9585c8baac80..f4b029fbb41b 100644
--- a/sfx2/source/dialog/dialoghelper.cxx
+++ b/sfx2/source/dialog/dialoghelper.cxx
@@ -10,6 +10,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <sfx2/dialoghelper.hxx>
 #include <tools/datetime.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
 
 Size getParagraphPreviewOptimalSize(const OutputDevice& rReference)
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 1d4625421165..e385ba09dd59 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/view/DuplexMode.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
+#include <i18nutil/paper.hxx>
 #include <svl/itemset.hxx>
 #include <svl/lstner.hxx>
 #include <unotools/tempfile.hxx>
@@ -41,6 +42,7 @@
 #include <comphelper/interfacecontainer4.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <utility>
+#include <vcl/PrinterSupport.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx 
b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 4b40c9b3c5f4..0417e9931783 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -30,6 +30,7 @@
 #include <basegfx/vector/b2dsize.hxx>
 #include <osl/diagnose.h>
 #include <comphelper/diagnose_ex.hxx>
+#include <tools/mapunit.hxx>
 
 #include <com/sun/star/awt/MouseButton.hpp>
 #include <com/sun/star/awt/MouseEvent.hpp>
diff --git a/svtools/source/brwbox/brwbox2.cxx 
b/svtools/source/brwbox/brwbox2.cxx
index 1984dc2290de..2e5ef9a8c8d2 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -21,6 +21,7 @@
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <svtools/brwbox.hxx>
 #include <svtools/brwhead.hxx>
 #include <svtools/colorcfg.hxx>
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index e4da613bef16..3fe07aed772a 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <vcl/event.hxx>
 #include <vcl/themecolors.hxx>
diff --git a/svtools/source/dialogs/prnsetup.cxx 
b/svtools/source/dialogs/prnsetup.cxx
index 9d71832b3513..00ddd9efb7be 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -27,6 +27,7 @@
 #include <vcl/QueueInfo.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/print.hxx>
+#include <vcl/PrinterSupport.hxx>
 #include <vcl/event.hxx>
 #include <sal/log.hxx>
 
diff --git a/svtools/source/filter/exportdialog.cxx 
b/svtools/source/filter/exportdialog.cxx
index 45982fe99010..80a5a3c3fc29 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -23,6 +23,7 @@
 
 #include <comphelper/propertyvalue.hxx>
 #include <o3tl/safeint.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <tools/fract.hxx>
 #include <utility>
diff --git a/svtools/source/svhtml/htmlout.cxx 
b/svtools/source/svhtml/htmlout.cxx
index 5d3e1a912d14..b5d03ec8a694 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -34,6 +34,7 @@
 #include <svl/urihelper.hxx>
 #include <rtl/character.hxx>
 #include <tools/debug.hxx>
+#include <tools/stream.hxx>
 #include <o3tl/string_view.hxx>
 
 #include <sstream>
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index ee9fa7ad4397..d77ad513a2ba 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/mapunit.hxx>
 #include <sfx2/dialoghelper.hxx>
 #include <svx/paraprev.hxx>
 #include <vcl/outdev.hxx>
diff --git a/svx/source/dialog/swframeexample.cxx 
b/svx/source/dialog/swframeexample.cxx
index db46cf58a8da..57d4216b0d49 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/mapunit.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index d3964dbcc0e5..4399d5452ad6 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -59,6 +59,7 @@
 #include <vcl/unohelp.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <sal/macros.h>
 
diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx 
b/svx/source/sdr/overlay/overlayobjectlist.cxx
index 6cda0e57d078..4cec67ddebd3 100644
--- a/svx/source/sdr/overlay/overlayobjectlist.cxx
+++ b/svx/source/sdr/overlay/overlayobjectlist.cxx
@@ -21,6 +21,7 @@
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <vcl/outdev.hxx>
 #include <tools/gen.hxx>
+#include <tools/mapunit.hxx>
 
 #include <drawinglayer/processor2d/hittestprocessor2d.hxx>
 #include <comphelper/lok.hxx>
diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx 
b/svx/source/sidebar/line/LineWidthValueSet.cxx
index 47f7e670279c..284f876668f5 100644
--- a/svx/source/sidebar/line/LineWidthValueSet.cxx
+++ b/svx/source/sidebar/line/LineWidthValueSet.cxx
@@ -19,6 +19,7 @@
 #include "LineWidthValueSet.hxx"
 
 #include <i18nlangtag/mslangid.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx 
b/svx/source/tbxctrls/bulletsnumbering.cxx
index 90a7b0c5e7a7..e0156209843c 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -17,6 +17,7 @@
 #include <svtools/popupwindowcontroller.hxx>
 #include <svtools/toolbarmenu.hxx>
 #include <svx/numvset.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/settings.hxx>
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 957ee18d3b93..49ad03128597 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -31,6 +31,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <svtools/toolbarmenu.hxx>
+#include <tools/mapunit.hxx>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 3a5b16444e9a..07b32f44b225 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -19,6 +19,7 @@
 
 #include <XPropertyTable.hxx>
 
+#include <tools/mapunit.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 7b5f17f06f07..498b8448b892 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <XPropertyTable.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/svapp.hxx>
 
 #include <vcl/virdev.hxx>
diff --git a/sw/source/core/bastyp/swtypes.cxx 
b/sw/source/core/bastyp/swtypes.cxx
index 507804363e9a..b0b1c2f162bc 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -20,6 +20,7 @@
 #include <swtypes.hxx>
 
 #include <editeng/unolingu.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/graph.hxx>
 
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx 
b/sw/source/ui/dbui/mmresultdialogs.cxx
index a9f5194e7e5f..1f6035115f49 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -39,6 +39,7 @@
 #include <svl/stritem.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/sfxecode.hxx>
+#include <vcl/PrinterSupport.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx 
b/toolkit/source/controls/controlmodelcontainerbase.cxx
index ff836be7d921..733c72dfbb3e 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -38,6 +38,7 @@
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/outdev.hxx>
 #include <comphelper/types.hxx>
diff --git a/toolkit/source/controls/dialogcontrol.cxx 
b/toolkit/source/controls/dialogcontrol.cxx
index 110e56c88406..2948ab2c9ebc 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -35,6 +35,7 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <comphelper/sequence.hxx>
 #include <vcl/outdev.hxx>
 
diff --git a/toolkit/source/controls/svtxgridcontrol.cxx 
b/toolkit/source/controls/svtxgridcontrol.cxx
index 93300befe99b..d6cba15f9956 100644
--- a/toolkit/source/controls/svtxgridcontrol.cxx
+++ b/toolkit/source/controls/svtxgridcontrol.cxx
@@ -26,6 +26,7 @@
 #include <controls/table/gridtablerenderer.hxx>
 #include "unocontroltablemodel.hxx"
 #include <sal/log.hxx>
+#include <tools/mapunit.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <helper/property.hxx>
 #include <com/sun/star/awt/grid/XGridColumn.hpp>
diff --git a/toolkit/source/controls/table/tablecontrol_impl.cxx 
b/toolkit/source/controls/table/tablecontrol_impl.cxx
index bef96aa7e9e8..55d0b0dd27d0 100644
--- a/toolkit/source/controls/table/tablecontrol_impl.cxx
+++ b/toolkit/source/controls/table/tablecontrol_impl.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
 
 #include <comphelper/flagguard.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/toolkit/scrbar.hxx>
 #include <vcl/seleng.hxx>
 #include <vcl/settings.hxx>
diff --git a/toolkit/source/controls/tabpagemodel.cxx 
b/toolkit/source/controls/tabpagemodel.cxx
index 5deadb5fb7ca..1114cd03868b 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
 
 #include <controls/controlmodelcontainerbase.hxx>
diff --git a/vcl/inc/graphic/SwapInfo.hxx b/vcl/inc/graphic/SwapInfo.hxx
index e9a6fb9c001a..5e0a539fa457 100644
--- a/vcl/inc/graphic/SwapInfo.hxx
+++ b/vcl/inc/graphic/SwapInfo.hxx
@@ -21,6 +21,7 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/GraphicExternalLink.hxx>
+#include <tools/mapunit.hxx>
 
 struct SwapInfo
 {
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index e70c78d79378..687a583e78f4 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -24,6 +24,7 @@
 #include <sal/macros.h>
 #include <osl/diagnose.h>
 #include <tools/long.hxx>
+#include <tools/mapunit.hxx>
 
 #include <osx/salinst.h>
 #include <osx/salprn.h>
@@ -38,6 +39,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/view/PrintableState.hpp>
 
 #include <algorithm>
 #include <cstdlib>
diff --git a/vcl/qa/cppunit/GraphicDescriptorTest.cxx 
b/vcl/qa/cppunit/GraphicDescriptorTest.cxx
index 123a4084c763..28fe9e29a25d 100644
--- a/vcl/qa/cppunit/GraphicDescriptorTest.cxx
+++ b/vcl/qa/cppunit/GraphicDescriptorTest.cxx
@@ -18,6 +18,7 @@
 
 #include <vcl/graphicfilter.hxx>
 #include <tools/color.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 
 using namespace css;
diff --git a/vcl/qa/cppunit/GraphicTest.cxx b/vcl/qa/cppunit/GraphicTest.cxx
index bf042f1dbe62..a07a178324b8 100644
--- a/vcl/qa/cppunit/GraphicTest.cxx
+++ b/vcl/qa/cppunit/GraphicTest.cxx
@@ -26,6 +26,7 @@
 #include <comphelper/hash.hxx>
 #include <unotools/tempfile.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/wmf.hxx>
 #include "CommonTools.hxx"
 
diff --git a/vcl/qa/cppunit/TypeSerializerTest.cxx 
b/vcl/qa/cppunit/TypeSerializerTest.cxx
index 9472dfc016ca..761969148cb2 100644
--- a/vcl/qa/cppunit/TypeSerializerTest.cxx
+++ b/vcl/qa/cppunit/TypeSerializerTest.cxx
@@ -21,6 +21,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/gdimtf.hxx>
 #include <comphelper/hash.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/vcompat.hxx>
 #include <comphelper/fileformat.h>
 #include <tools/fract.hxx>
diff --git a/vcl/qa/cppunit/filter/igif/igif.cxx 
b/vcl/qa/cppunit/filter/igif/igif.cxx
index 4c730247f446..61963c6389dc 100644
--- a/vcl/qa/cppunit/filter/igif/igif.cxx
+++ b/vcl/qa/cppunit/filter/igif/igif.cxx
@@ -11,6 +11,7 @@
 
 #include <test/bootstrapfixture.hxx>
 
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <unotest/directories.hxx>
 #include <vcl/graph.hxx>
diff --git a/vcl/qa/cppunit/gradient.cxx b/vcl/qa/cppunit/gradient.cxx
index 989037b081a4..2815410cada2 100644
--- a/vcl/qa/cppunit/gradient.cxx
+++ b/vcl/qa/cppunit/gradient.cxx
@@ -12,6 +12,7 @@
 #include <vcl/gradient.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 
 class VclGradientTest : public test::BootstrapFixture
 {
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index f64c20d255b9..a0d2f5f11018 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -17,6 +17,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/vector/b2enums.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <tools/mapunit.hxx>
 
 #include <vcl/gradient.hxx>
 #include <vcl/lineinfo.hxx>
diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index cdc842157220..918c621724ac 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -23,6 +23,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/filter/SvmReader.hxx>
 #include <vcl/filter/SvmWriter.hxx>
diff --git a/vcl/qa/cppunit/vclmaptest.cxx b/vcl/qa/cppunit/vclmaptest.cxx
index 04dfc34f2147..d186e6426f1e 100644
--- a/vcl/qa/cppunit/vclmaptest.cxx
+++ b/vcl/qa/cppunit/vclmaptest.cxx
@@ -12,6 +12,7 @@
 #include <cppunit/plugin/TestPlugIn.h>
 
 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>
 
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 8dc6b2c49b70..12dcf20f73ce 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -29,6 +29,7 @@
 #include <comphelper/processfactory.hxx>
 #include <o3tl/test_info.hxx>
 #include <rtl/bootstrap.hxx>
+#include <tools/mapunit.hxx>
 
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/vcl/source/bitmap/BitmapTools.cxx 
b/vcl/source/bitmap/BitmapTools.cxx
index 58170eff5e03..842297d14f02 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -14,6 +14,7 @@
 #include <utility>
 
 #include <tools/helpers.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/BitmapTools.hxx>
 
 #include <sal/log.hxx>
diff --git a/vcl/source/bitmap/Vectorizer.cxx b/vcl/source/bitmap/Vectorizer.cxx
index efc064e01778..3665740250ce 100644
--- a/vcl/source/bitmap/Vectorizer.cxx
+++ b/vcl/source/bitmap/Vectorizer.cxx
@@ -22,6 +22,7 @@
 #include <tools/link.hxx>
 #include <tools/poly.hxx>
 #include <tools/helpers.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx
index 9473f9cd9dce..25a2e85404d0 100644
--- a/vcl/source/bitmap/bitmap.cxx
+++ b/vcl/source/bitmap/bitmap.cxx
@@ -23,6 +23,7 @@
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/helpers.hxx>
+#include <tools/mapunit.hxx>
 
 #include <utility>
 #include <vcl/alpha.hxx>
diff --git a/vcl/source/bitmap/bitmappaint.cxx 
b/vcl/source/bitmap/bitmappaint.cxx
index 3c60d73542be..4c0896e32fb4 100644
--- a/vcl/source/bitmap/bitmappaint.cxx
+++ b/vcl/source/bitmap/bitmappaint.cxx
@@ -19,6 +19,7 @@
 
 #include <tools/poly.hxx>
 #include <tools/helpers.hxx>
+#include <tools/mapunit.hxx>
 
 #include <vcl/bitmap.hxx>
 #include <vcl/alpha.hxx>
diff --git a/vcl/source/bitmap/dibtools.cxx b/vcl/source/bitmap/dibtools.cxx
index eff4b8dbe309..55457c1820ee 100644
--- a/vcl/source/bitmap/dibtools.cxx
+++ b/vcl/source/bitmap/dibtools.cxx
@@ -30,6 +30,7 @@
 #include <tools/fract.hxx>
 #include <tools/helpers.hxx>
 #include <tools/GenericTypeSerializer.hxx>
+#include <tools/mapunit.hxx>
 #include <comphelper/configuration.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/bitmap.hxx>
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index e1b97c7ddaf2..cb0ab6c71f37 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -51,6 +51,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <boost/property_tree/ptree.hpp>
 #include <tools/json_writer.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 
 
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 81d2cc99f004..ccf6dbc5c8b7 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/lok.hxx>
+#include <tools/mapunit.hxx>
 
 #include <vcl/DocWindow.hxx>
 #include <vcl/ctrl.hxx>
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 305c72213dc5..fa32ece73bf6 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -22,6 +22,7 @@
 #include <osl/diagnose.hxx>
 #include <comphelper/string.hxx>
 #include <tools/json_writer.hxx>
+#include <tools/mapunit.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <o3tl/string_view.hxx>
 #include <i18nutil/unicode.hxx>
diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx
index 5e8749bf5ce4..f0a9351bd39f 100644
--- a/vcl/source/control/roadmap.cxx
+++ b/vcl/source/control/roadmap.cxx
@@ -26,6 +26,7 @@
 #include <vcl/vclevent.hxx>
 #include <hyperlabel.hxx>
 #include <tools/color.hxx>
+#include <tools/mapunit.hxx>
 #include <rtl/ustring.hxx>
 
 constexpr tools::Long LABELBASEMAPHEIGHT = 8;
diff --git a/vcl/source/control/roadmapwizard.cxx 
b/vcl/source/control/roadmapwizard.cxx
index 93eef513540b..3b8adfd8093d 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -20,6 +20,7 @@
 
 #include <tools/debug.hxx>
 #include <tools/json_writer.hxx>
+#include <tools/mapunit.hxx>
 #include <osl/diagnose.h>
 #include <vcl/event.hxx>
 
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index e91977e3893a..d8d0be11c9b9 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -27,6 +27,7 @@
 #include <vcl/vclevent.hxx>
 
 #include <sal/log.hxx>
+#include <tools/mapunit.hxx>
 #include <scrollbarvalue.hxx>
 
 /*  #i77549#
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 741bc53dedca..4805ca2c635f 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <tools/mapunit.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/help.hxx>
 #include <vcl/layout.hxx>
diff --git a/vcl/source/filter/GraphicFormatDetector.cxx 
b/vcl/source/filter/GraphicFormatDetector.cxx
index 0b2e5073b508..6f64f7111423 100644
--- a/vcl/source/filter/GraphicFormatDetector.cxx
+++ b/vcl/source/filter/GraphicFormatDetector.cxx
@@ -27,6 +27,7 @@
 #include <tools/solar.h>
 #include <tools/zcodec.hxx>
 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>
 #include <filter/WebpReader.hxx>
 #include "igif/gifread.hxx"
 #include <vcl/TypeSerializer.hxx>
diff --git a/vcl/source/filter/egif/egif.cxx b/vcl/source/filter/egif/egif.cxx
index d5fb001f1a5a..e7449a277940 100644
--- a/vcl/source/filter/egif/egif.cxx
+++ b/vcl/source/filter/egif/egif.cxx
@@ -20,6 +20,7 @@
 
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/animate/Animation.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
 #include <vcl/BitmapReadAccess.hxx>
diff --git a/vcl/source/filter/eps/eps.cxx b/vcl/source/filter/eps/eps.cxx
index 87219e9e2f3e..e65f27ca5fe1 100644
--- a/vcl/source/filter/eps/eps.cxx
+++ b/vcl/source/filter/eps/eps.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <filter/EpsWriter.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <tools/poly.hxx>
 #include <tools/fract.hxx>
diff --git a/vcl/source/filter/etiff/etiff.cxx 
b/vcl/source/filter/etiff/etiff.cxx
index cd5f993f7f55..3efa97377d86 100644
--- a/vcl/source/filter/etiff/etiff.cxx
+++ b/vcl/source/filter/etiff/etiff.cxx
@@ -18,6 +18,7 @@
  */
 
 
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <vcl/animate/Animation.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
diff --git a/vcl/source/filter/graphicfilter2.cxx 
b/vcl/source/filter/graphicfilter2.cxx
index d1a84c7b1ad9..97a396114d7d 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <string.h>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <tools/fract.hxx>
 #include <tools/urlobj.hxx>
diff --git a/vcl/source/filter/idxf/dxf2mtf.cxx 
b/vcl/source/filter/idxf/dxf2mtf.cxx
index f9b0ac8bd66b..e3df66ecd05c 100644
--- a/vcl/source/filter/idxf/dxf2mtf.cxx
+++ b/vcl/source/filter/idxf/dxf2mtf.cxx
@@ -22,6 +22,7 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include "dxf2mtf.hxx"
 
diff --git a/vcl/source/filter/idxf/dxfreprd.hxx 
b/vcl/source/filter/idxf/dxfreprd.hxx
index 734193fcec84..4478151d99ce 100644
--- a/vcl/source/filter/idxf/dxfreprd.hxx
+++ b/vcl/source/filter/idxf/dxfreprd.hxx
@@ -21,6 +21,7 @@
 
 #include "dxfblkrd.hxx"
 #include "dxftblrd.hxx"
+#include <rtl/ustring.hxx>
 #include <array>
 #include <string_view>
 
diff --git a/vcl/source/filter/ieps/ieps.cxx b/vcl/source/filter/ieps/ieps.cxx
index 892390427a4c..9857ef210efa 100644
--- a/vcl/source/filter/ieps/ieps.cxx
+++ b/vcl/source/filter/ieps/ieps.cxx
@@ -19,6 +19,7 @@
 
 
 #include <filter/EpsReader.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/graph.hxx>
diff --git a/vcl/source/filter/igif/gifread.cxx 
b/vcl/source/filter/igif/gifread.cxx
index d4e6f5d554ae..cdeef5c59448 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/log.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include "decode.hxx"
 #include "gifread.hxx"
diff --git a/vcl/source/filter/imet/ios2met.cxx 
b/vcl/source/filter/imet/ios2met.cxx
index dfd9b8d969f2..c989888eb8e6 100644
--- a/vcl/source/filter/imet/ios2met.cxx
+++ b/vcl/source/filter/imet/ios2met.cxx
@@ -19,6 +19,7 @@
 
 #include <osl/thread.h>
 #include <o3tl/safeint.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/fract.hxx>
 #include <tools/stream.hxx>
diff --git a/vcl/source/filter/ipict/ipict.cxx 
b/vcl/source/filter/ipict/ipict.cxx
index dba81bc750bf..5cbf379867f5 100644
--- a/vcl/source/filter/ipict/ipict.cxx
+++ b/vcl/source/filter/ipict/ipict.cxx
@@ -25,6 +25,7 @@
 #include <vcl/RawBitmap.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/gdimtf.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/fract.hxx>
 #include <tools/stream.hxx>
diff --git a/vcl/source/filter/ipsd/ipsd.cxx b/vcl/source/filter/ipsd/ipsd.cxx
index 27254a9fcad8..e669e2227c79 100644
--- a/vcl/source/filter/ipsd/ipsd.cxx
+++ b/vcl/source/filter/ipsd/ipsd.cxx
@@ -25,6 +25,7 @@
 #include <sal/log.hxx>
 #include <tools/fract.hxx>
 #include <tools/helpers.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <memory>
 #include <filter/PsdReader.hxx>
diff --git a/vcl/source/filter/itiff/itiff.cxx 
b/vcl/source/filter/itiff/itiff.cxx
index 8d0700b2ae4b..b4747e949bd4 100644
--- a/vcl/source/filter/itiff/itiff.cxx
+++ b/vcl/source/filter/itiff/itiff.cxx
@@ -27,6 +27,7 @@
 #include <vcl/animate/AnimationFrame.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <comphelper/configuration.hxx>
 
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx 
b/vcl/source/filter/jpeg/JpegReader.cxx
index 28cdbbfffff4..b497dd751786 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -27,6 +27,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/outdev.hxx>
 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <memory>
 
diff --git a/vcl/source/filter/png/PngImageReader.cxx 
b/vcl/source/filter/png/PngImageReader.cxx
index 4c41a6c4850f..7bfeab6888a2 100644
--- a/vcl/source/filter/png/PngImageReader.cxx
+++ b/vcl/source/filter/png/PngImageReader.cxx
@@ -12,6 +12,7 @@
 #include <png.h>
 #include <iostream>
 #include <rtl/crc.h>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/alpha.hxx>
diff --git a/vcl/source/filter/png/PngImageWriter.cxx 
b/vcl/source/filter/png/PngImageWriter.cxx
index cad7d1ea068b..9f4ff1ac2c33 100644
--- a/vcl/source/filter/png/PngImageWriter.cxx
+++ b/vcl/source/filter/png/PngImageWriter.cxx
@@ -10,6 +10,7 @@
 #include <vcl/filter/PngImageWriter.hxx>
 #include <png.h>
 #include <basegfx/vector/b2dsize.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/animate/Animation.hxx>
diff --git a/vcl/source/filter/svm/SvmConverter.cxx 
b/vcl/source/filter/svm/SvmConverter.cxx
index a192d66df890..51d480f29e83 100644
--- a/vcl/source/filter/svm/SvmConverter.cxx
+++ b/vcl/source/filter/svm/SvmConverter.cxx
@@ -21,6 +21,7 @@
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <o3tl/safeint.hxx>
 
diff --git a/vcl/source/filter/svm/SvmReader.cxx 
b/vcl/source/filter/svm/SvmReader.cxx
index cf1ca8491629..24c03a6ef4c8 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -29,6 +29,7 @@
 #include <vcl/dibtools.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 
 #include "SvmConverter.hxx"
 
diff --git a/vcl/source/filter/svm/SvmWriter.cxx 
b/vcl/source/filter/svm/SvmWriter.cxx
index aa7e0087f407..647d30893a54 100644
--- a/vcl/source/filter/svm/SvmWriter.cxx
+++ b/vcl/source/filter/svm/SvmWriter.cxx
@@ -21,6 +21,7 @@
 #include <vcl/TypeSerializer.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <rtl/crc.h>
 #include <tools/solar.h>
 #include <tools/vcompat.hxx>
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 96e813d68b73..68bddb24e55c 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -25,6 +25,7 @@
 #include "emfwr.hxx"
 #include <tools/helpers.hxx>
 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index f076917131aa..67bce73e32ac 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -28,6 +28,7 @@
 #include <rtl/tencinfo.h>
 #include <tools/bigint.hxx>
 #include <tools/helpers.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/tenccvt.hxx>
 #include <tools/fract.hxx>
 #include <tools/stream.hxx>
diff --git a/vcl/source/gdi/TypeSerializer.cxx 
b/vcl/source/gdi/TypeSerializer.cxx
index f83cff921320..f366cebdf5c6 100644
--- a/vcl/source/gdi/TypeSerializer.cxx
+++ b/vcl/source/gdi/TypeSerializer.cxx
@@ -20,6 +20,7 @@
 #include <vcl/TypeSerializer.hxx>
 #include <vcl/animate/Animation.hxx>
 #include <vcl/BinaryDataContainer.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/vcompat.hxx>
 #include <tools/fract.hxx>
 #include <sal/log.hxx>
diff --git a/vcl/source/gdi/gdimetafiletools.cxx 
b/vcl/source/gdi/gdimetafiletools.cxx
index 7fe525ba9a25..540da568062f 100644
--- a/vcl/source/gdi/gdimetafiletools.cxx
+++ b/vcl/source/gdi/gdimetafiletools.cxx
@@ -30,6 +30,7 @@
 #include <vcl/graphictools.hxx>
 #include <osl/diagnose.h>
 #include <tools/stream.hxx>
+#include <tools/mapunit.hxx>
 
 // helpers
 
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 3690568f61d4..76b6768ef1a2 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -26,6 +26,7 @@
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/BitmapColor.hxx>
 #include <vcl/BitmapPalette.hxx>
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index 75a53a2a93a7..80f8ca124063 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -21,6 +21,7 @@
 
 #include <vcl/gradient.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/rendercontext/State.hxx>
 #include <cmath>
 
 class Gradient::Impl
diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx
index e097f2f36dd3..c58412da03e5 100644
--- a/vcl/source/gdi/hatch.cxx
+++ b/vcl/source/gdi/hatch.cxx
@@ -21,6 +21,7 @@
 #include <tools/vcompat.hxx>
 #include <tools/GenericTypeSerializer.hxx>
 #include <vcl/hatch.hxx>
+#include <vcl/vclenum.hxx>
 
 ImplHatch::ImplHatch() :
     maColor     ( COL_BLACK ),
diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx
index a6c31bebb741..0510334a7255 100644
--- a/vcl/source/gdi/lineinfo.cxx
+++ b/vcl/source/gdi/lineinfo.cxx
@@ -24,6 +24,8 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dlinegeometry.hxx>
+#include <basegfx/vector/b2enums.hxx>
+#include <com/sun/star/drawing/LineCap.hpp>
 #include <numeric>
 
 
diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx
index 85d8b6d48914..4d8afe2a898a 100644
--- a/vcl/source/gdi/mapmod.cxx
+++ b/vcl/source/gdi/mapmod.cxx
@@ -22,6 +22,7 @@
 #include <o3tl/hash_combine.hxx>
 #include <tools/gen.hxx>
 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
 #include <vcl/TypeSerializer.hxx>
diff --git a/vcl/source/gdi/mtfxmldump.cxx b/vcl/source/gdi/mtfxmldump.cxx
index fb19ae2ab976..26384025a84d 100644
--- a/vcl/source/gdi/mtfxmldump.cxx
+++ b/vcl/source/gdi/mtfxmldump.cxx
@@ -10,6 +10,7 @@
 #include <vcl/mtfxmldump.hxx>
 #include <tools/XmlWriter.hxx>
 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>
 
 #include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
diff --git a/vcl/source/gdi/oldprintadaptor.cxx 
b/vcl/source/gdi/oldprintadaptor.cxx
index d42b02f866ce..699e6f63f000 100644
--- a/vcl/source/gdi/oldprintadaptor.cxx
+++ b/vcl/source/gdi/oldprintadaptor.cxx
@@ -20,6 +20,7 @@
 #include <sal/config.h>
 
 #include <comphelper/propertyvalue.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/oldprintadaptor.hxx>
 #include <vcl/gdimtf.hxx>
 
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index b0a893221412..875971e58c52 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -25,6 +25,7 @@
 #include <o3tl/safeint.hxx>
 #include <tools/debug.hxx>
 #include <tools/helpers.hxx>
+#include <tools/mapunit.hxx>
 
 #include <vcl/alpha.hxx>
 #include <vcl/QueueInfo.hxx>
@@ -32,6 +33,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/print.hxx>
 #include <vcl/printer/Options.hxx>
+#include <vcl/PrinterSupport.hxx>
 
 #include <jobset.h>
 #include <print.h>
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 6de96f0c2c80..4814f5b6a98a 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -26,6 +26,7 @@
 #include <officecfg/VCL.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/urlobj.hxx>
 
 #include <utility>
@@ -48,6 +49,7 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/view/DuplexMode.hpp>
 #include <com/sun/star/view/PaperOrientation.hpp>
+#include <com/sun/star/view/PrintableState.hpp>
 
 #include <unordered_map>
 #include <unordered_set>
diff --git a/vcl/source/gdi/vectorgraphicdata.cxx 
b/vcl/source/gdi/vectorgraphicdata.cxx
index 6125ae9a19f8..4da5f79fdeb7 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/diagnose_ex.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <sal/log.hxx>
 #include <utility>
diff --git a/vcl/source/graphic/GraphicObject.cxx 
b/vcl/source/graphic/GraphicObject.cxx
index 1b500277e950..c6f669c7ddb1 100644
--- a/vcl/source/graphic/GraphicObject.cxx
+++ b/vcl/source/graphic/GraphicObject.cxx
@@ -25,6 +25,7 @@
 #include <osl/diagnose.h>
 #include <tools/fract.hxx>
 #include <tools/helpers.hxx>
+#include <tools/mapunit.hxx>
 #include <utility>
 #include <vcl/animate/Animation.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx 
b/vcl/source/graphic/UnoGraphicDescriptor.cxx
index 02977b1723b7..a0990fc1498c 100644
--- a/vcl/source/graphic/UnoGraphicDescriptor.cxx
+++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx
@@ -20,6 +20,7 @@
 #include <graphic/UnoGraphicDescriptor.hxx>
 
 #include <cppuhelper/weakagg.hxx>
+#include <tools/mapunit.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx 
b/vcl/source/graphic/UnoGraphicProvider.cxx
index 150f0d6fc795..6dc157ea60ae 100644
--- a/vcl/source/graphic/UnoGraphicProvider.cxx
+++ b/vcl/source/graphic/UnoGraphicProvider.cxx
@@ -24,6 +24,7 @@
 #include <vcl/metaact.hxx>
 #include <imagerepository.hxx>
 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graphic/BitmapHelper.hxx>
 #include <vcl/graphicfilter.hxx>
diff --git a/vcl/source/outdev/bitmapex.cxx b/vcl/source/outdev/bitmapex.cxx
index 437cb43db1d5..835c860ec176 100644
--- a/vcl/source/outdev/bitmapex.cxx
+++ b/vcl/source/outdev/bitmapex.cxx
@@ -22,6 +22,7 @@
 #include <rtl/math.hxx>
 #include <comphelper/lok.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <tools/mapunit.hxx>
 
 #include <vcl/alpha.hxx>
 #include <vcl/canvastools.hxx>
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 1bb4548d9d6f..a052c8a910a3 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -23,6 +23,7 @@
 #include <osl/diagnose.h>
 #include <tools/bigint.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 
 #include <vcl/cursor.hxx>
 #include <vcl/lineinfo.hxx>
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 14aafc740baf..9e60ece1f622 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -22,6 +22,7 @@
 #include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 
 #include <vcl/graph.hxx>
 #include <tools/lazydelete.hxx>
diff --git a/vcl/source/outdev/transparent.cxx 
b/vcl/source/outdev/transparent.cxx
index 0c55cd727646..b2683510d674 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -22,6 +22,7 @@
 #include <rtl/math.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <tools/helpers.hxx>
+#include <tools/mapunit.hxx>
 #include <officecfg/Office/Common.hxx>
 
 #include <vcl/BitmapTools.hxx>
diff --git a/vcl/source/pdf/pdfwriter_impl2.cxx 
b/vcl/source/pdf/pdfwriter_impl2.cxx
index c50eea665e21..53c682f2aba8 100644
--- a/vcl/source/pdf/pdfwriter_impl2.cxx
+++ b/vcl/source/pdf/pdfwriter_impl2.cxx
@@ -32,6 +32,7 @@
 
 #include <tools/helpers.hxx>
 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 
 #include <comphelper/fileformat.h>
diff --git a/vcl/source/pdf/pdfwriter_utils.hxx 
b/vcl/source/pdf/pdfwriter_utils.hxx
index 8a860b659ef8..24164e53b68b 100644
--- a/vcl/source/pdf/pdfwriter_utils.hxx
+++ b/vcl/source/pdf/pdfwriter_utils.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <rtl/strbuf.hxx>
+#include <tools/mapunit.hxx>
 
 #include <vcl/outdev.hxx>
 #include <vcl/mapmod.hxx>
diff --git a/vcl/source/text/textlayout.cxx b/vcl/source/text/textlayout.cxx
index 8705459df647..3272876318d0 100644
--- a/vcl/source/text/textlayout.cxx
+++ b/vcl/source/text/textlayout.cxx
@@ -22,6 +22,7 @@
 #include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <i18nlangtag/languagetag.hxx>
+#include <tools/mapunit.hxx>
 
 #include <vcl/ctrl.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/toolkit/morebtn.cxx b/vcl/source/toolkit/morebtn.cxx
index 9c0f6c505a49..e83802391483 100644
--- a/vcl/source/toolkit/morebtn.cxx
+++ b/vcl/source/toolkit/morebtn.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/mapunit.hxx>
 #include <vcl/toolkit/morebtn.hxx>
 #include <vcl/stdtext.hxx>
 
diff --git a/vcl/source/treelist/imap2.cxx b/vcl/source/treelist/imap2.cxx
index f905ca52f533..1ff612a7de29 100644
--- a/vcl/source/treelist/imap2.cxx
+++ b/vcl/source/treelist/imap2.cxx
@@ -21,6 +21,7 @@
 #include <comphelper/string.hxx>
 #include <string.h>
 #include <o3tl/string_view.hxx>
+#include <tools/stream.hxx>
 #include <rtl/strbuf.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/treelist/imap3.cxx b/vcl/source/treelist/imap3.cxx
index 073725f34b21..4b58b83e29b9 100644
--- a/vcl/source/treelist/imap3.cxx
+++ b/vcl/source/treelist/imap3.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/stream.hxx>
 #include <vcl/imap.hxx>
 
 #include <tools/debug.hxx>
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 2437fc321348..3ef540da2486 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -20,6 +20,7 @@
 #include <memory>
 
 #include <comphelper/lok.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index c8f940e58ef5..477b08b0e682 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -25,6 +25,7 @@
 
 #include <comphelper/lok.hxx>
 #include <sal/log.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/vcl/source/window/menubarwindow.cxx 
b/vcl/source/window/menubarwindow.cxx
index f3044bda9083..aab008e35206 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -21,6 +21,7 @@
 #include "menuitemlist.hxx"
 #include "menufloatingwindow.hxx"
 
+#include <tools/mapunit.hxx>
 #include <vcl/dockingarea.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/taskpanelist.hxx>
diff --git a/vcl/source/window/menuitemlist.hxx 
b/vcl/source/window/menuitemlist.hxx
index fc25a402922d..92f5c74e2685 100644
--- a/vcl/source/window/menuitemlist.hxx
+++ b/vcl/source/window/menuitemlist.hxx
@@ -18,6 +18,7 @@
  */
 
 #include <utility>
+#include <tools/gen.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/glyphitem.hxx>
 #include <vcl/image.hxx>
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index f336f08424f9..676b6af3902a 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -19,6 +19,7 @@
 
 #include <config_features.h>
 #include <vcl/gdimtf.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/window.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/cursor.hxx>
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index e59960092e72..e28ba9ea3beb 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -21,6 +21,7 @@
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
+#include <tools/mapunit.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <officecfg/VCL.hxx>
@@ -33,6 +34,7 @@
 #include <vcl/naturalsort.hxx>
 #include <vcl/print.hxx>
 #include <vcl/printer/Options.hxx>
+#include <vcl/PrinterSupport.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 25d4f0c605c1..fbf2dfd709ed 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -28,6 +28,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <tools/lazydelete.hxx>
+#include <tools/mapunit.hxx>
 
 #include <window.h>
 
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 93a81bb259a6..704acf9e03ec 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -23,6 +23,7 @@
 #include <sal/log.hxx>
 
 #include <tools/helpers.hxx>
+#include <tools/mapunit.hxx>
 
 #include <vcl/toolkit/dialog.hxx>
 #include <vcl/event.hxx>
diff --git a/vcl/unx/generic/print/genprnpsp.cxx 
b/vcl/unx/generic/print/genprnpsp.cxx
index c61fddcbb105..37a99301d9ff 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -38,6 +38,7 @@
 #include <comphelper/fileurl.hxx>
 #include <o3tl/safeint.hxx>
 #include <o3tl/unit_conversion.hxx>
+#include <tools/mapunit.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
@@ -49,6 +50,7 @@
 #include <vcl/idle.hxx>
 #include <vcl/printer/Options.hxx>
 #include <vcl/print.hxx>
+#include <vcl/PrinterSupport.hxx>
 #include <vcl/QueueInfo.hxx>
 #include <vcl/pdfwriter.hxx>
 #include <printerinfomanager.hxx>
@@ -66,6 +68,7 @@
 #include <salptype.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/view/PrintableState.hpp>
 
 using namespace psp;
 using namespace com::sun::star;
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 8a4e93bd6d01..6e3fca648533 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -23,6 +23,7 @@
 #include <sal/log.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <tools/extendapplicationenvironment.hxx>
+#include <tools/mapunit.hxx>
 
 #include <cppuhelper/bootstrap.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/writerperfect/source/writer/EPUBExportFilter.cxx 
b/writerperfect/source/writer/EPUBExportFilter.cxx
index 439122bb6228..800db4cd1ae8 100644
--- a/writerperfect/source/writer/EPUBExportFilter.cxx
+++ b/writerperfect/source/writer/EPUBExportFilter.cxx
@@ -28,6 +28,7 @@
 #include <vcl/filter/SvmWriter.hxx>
 #include <vcl/gdimtf.hxx>
 #include <tools/color.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <unotools/mediadescriptor.hxx>
 
diff --git a/xmloff/source/core/xmlgrhlp.cxx b/xmloff/source/core/xmlgrhlp.cxx
index 0b8834b5b0c4..eb8ca5392a5b 100644
--- a/xmloff/source/core/xmlgrhlp.cxx
+++ b/xmloff/source/core/xmlgrhlp.cxx
@@ -41,6 +41,7 @@
 #include <vcl/filter/SvmWriter.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <tools/debug.hxx>
 #include <tools/zcodec.hxx>
 #include <comphelper/diagnose_ex.hxx>

Reply via email to