basctl/source/basicide/baside2b.cxx                        |    2 
 canvas/source/directx/dx_textlayout_drawhelper.cxx         |    1 
 canvas/source/vcl/canvascustomsprite.cxx                   |    1 
 canvas/source/vcl/canvashelper.cxx                         |    1 
 canvas/source/vcl/impltools.hxx                            |    1 
 chart2/source/controller/main/ChartWindow.cxx              |    2 
 chart2/source/tools/CharacterProperties.cxx                |    2 
 cppcanvas/qa/unit/test.cxx                                 |    1 
 cppcanvas/source/mtfrenderer/transparencygroupaction.cxx   |    1 
 cui/source/dialogs/screenshotannotationdlg.cxx             |    1 
 cui/source/tabpages/autocdlg.cxx                           |    2 
 cui/source/tabpages/grfpage.cxx                            |    1 
 dbaccess/source/ui/control/sqledit.cxx                     |    2 
 dbaccess/source/ui/misc/TokenWriter.cxx                    |    2 
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx      |    2 
 desktop/source/lib/init.cxx                                |    2 
 drawinglayer/qa/unit/border.cxx                            |    1 
 drawinglayer/qa/unit/vclmetafileprocessor2d.cxx            |    1 
 drawinglayer/source/processor2d/cairopixelprocessor2d.cxx  |    1 
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |    1 
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx    |    1 
 drawinglayer/source/processor2d/vclprocessor2d.cxx         |    1 
 drawinglayer/source/tools/wmfemfhelper.cxx                 |    1 
 editeng/source/editeng/eehtml.cxx                          |    2 
 editeng/source/editeng/impedit4.cxx                        |    1 
 editeng/source/items/bulitem.cxx                           |    2 
 editeng/source/items/textitem.cxx                          |    1 
 filter/source/svg/svgexport.cxx                            |    1 
 filter/source/svg/svgfontexport.cxx                        |    1 
 filter/source/svg/svgwriter.cxx                            |    1 
 forms/source/richtext/richtextcontrol.cxx                  |    1 
 include/vcl/event.hxx                                      |    1 
 include/vcl/outdev.hxx                                     |   33 +++++++------
 include/vcl/outdev/ScopedStates.hxx                        |    1 
 reportdesign/source/core/api/ReportComponent.cxx           |    2 
 sc/source/core/data/docpool.cxx                            |    2 
 sc/source/core/data/stlpool.cxx                            |    2 
 sc/source/core/tool/autoform.cxx                           |    2 
 sc/source/filter/rtf/rtfexp.cxx                            |    1 
 sc/source/ui/dbgui/csvgrid.cxx                             |    3 +
 sc/source/ui/inc/SparklineRenderer.hxx                     |    1 
 sc/source/ui/view/cellsh1.cxx                              |    2 
 sc/source/ui/view/gridmerg.cxx                             |    1 
 sc/source/ui/view/output.cxx                               |    1 
 sc/source/ui/view/output3.cxx                              |    1 
 sd/source/core/drawdoc4.cxx                                |    2 
 sd/source/filter/eppt/pptx-text.cxx                        |    1 
 sd/source/ui/func/fuhhconv.cxx                             |    2 
 sd/source/ui/inc/ViewShell.hxx                             |    1 
 sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx     |    1 
 sd/source/ui/view/outlview.cxx                             |    2 
 sd/source/ui/view/sdview3.cxx                              |    1 
 sfx2/source/doc/SfxRedactionHelper.cxx                     |    1 
 sfx2/source/doc/objcont.cxx                                |    1 
 slideshow/source/engine/shapes/drawshape.cxx               |    1 
 slideshow/source/engine/shapes/drawshapesubsetting.cxx     |    1 
 slideshow/source/engine/shapes/gdimtftools.cxx             |    1 
 starmath/source/ElementsDockingWindow.cxx                  |    1 
 starmath/source/cfgitem.cxx                                |    2 
 starmath/source/document.cxx                               |    1 
 starmath/source/smediteng.cxx                              |    2 
 svtools/source/brwbox/brwbox2.cxx                          |    1 
 svtools/source/brwbox/editbrowsebox.cxx                    |    1 
 svtools/source/config/fontsubstconfig.cxx                  |    1 
 svtools/source/control/ctrlbox.cxx                         |    1 
 svtools/source/control/ctrltool.cxx                        |    1 
 svtools/source/control/tabbar.cxx                          |    1 
 svtools/source/filter/DocumentToGraphicRenderer.cxx        |    1 
 svtools/source/misc/sampletext.cxx                         |    1 
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx    |    1 
 svx/source/dialog/_bmpmask.cxx                             |    1 
 svx/source/dialog/dialcontrol.cxx                          |    2 
 svx/source/dialog/dlgctrl.cxx                              |    1 
 svx/source/dialog/pagenumberlistbox.cxx                    |    2 
 svx/source/dialog/svxbmpnumvalueset.cxx                    |    2 
 svx/source/dialog/swframeexample.cxx                       |    2 
 svx/source/fmcomp/gridcell.cxx                             |    1 
 svx/source/form/fmcontrollayout.cxx                        |    2 
 svx/source/sdr/contact/objectcontactofpageview.cxx         |    1 
 svx/source/sdr/overlay/overlaymanager.cxx                  |    1 
 svx/source/sidebar/line/LineWidthValueSet.cxx              |    2 
 svx/source/svdraw/svdfmtf.cxx                              |    1 
 svx/source/svdraw/svdmodel.cxx                             |    2 
 svx/source/svdraw/svdotext.cxx                             |    2 
 svx/source/svdraw/svdpagv.cxx                              |    1 
 svx/source/svdraw/svdpdf.cxx                               |    1 
 svx/source/unodraw/UnoGraphicExporter.cxx                  |    1 
 svx/source/xoutdev/xtabdash.cxx                            |    1 
 svx/source/xoutdev/xtabgrdt.cxx                            |    1 
 svx/source/xoutdev/xtabhtch.cxx                            |    1 
 svx/source/xoutdev/xtablend.cxx                            |    1 
 sw/source/core/crsr/contentcontrolbutton.cxx               |    1 
 sw/source/core/doc/DocumentStylePoolManager.cxx            |    2 
 sw/source/core/doc/notxtfrm.cxx                            |    1 
 sw/source/core/layout/paintfrm.cxx                         |    4 +
 sw/source/core/text/porfly.cxx                             |    1 
 sw/source/core/txtnode/fntcache.cxx                        |    1 
 sw/source/core/view/vdraw.cxx                              |    1 
 sw/source/filter/html/htmlform.cxx                         |    2 
 sw/source/filter/html/htmlforw.cxx                         |    2 
 sw/source/filter/ww8/writerwordglue.cxx                    |    1 
 sw/source/filter/ww8/wrtw8num.cxx                          |    1 
 sw/source/ui/config/optpage.cxx                            |    2 
 sw/source/ui/dialog/ascfldlg.cxx                           |    2 
 sw/source/ui/misc/outline.cxx                              |    2 
 sw/source/ui/table/autoformatpreview.cxx                   |    1 
 sw/source/uibase/app/docshini.cxx                          |    2 
 sw/source/uibase/config/fontcfg.cxx                        |    2 
 sw/source/uibase/docvw/SidebarTxtControl.cxx               |    1 
 sw/source/uibase/docvw/srcedtw.cxx                         |    2 
 sw/source/uibase/shells/annotsh.cxx                        |    2 
 sw/source/uibase/shells/drwtxtsh.cxx                       |    2 
 sw/source/uibase/uiview/viewling.cxx                       |    2 
 toolkit/source/awt/vclxtabpagecontainer.cxx                |    1 
 toolkit/source/awt/vclxwindow.cxx                          |    1 
 toolkit/source/awt/vclxwindows.cxx                         |    1 
 vcl/backendtest/VisualBackendTest.cxx                      |    1 
 vcl/backendtest/outputdevice/common.cxx                    |    1 
 vcl/backendtest/outputdevice/line.cxx                      |    1 
 vcl/backendtest/outputdevice/polygon.cxx                   |    1 
 vcl/backendtest/outputdevice/polyline.cxx                  |    1 
 vcl/qa/cppunit/BackendTest.cxx                             |    1 
 vcl/qa/cppunit/cjktext.cxx                                 |    1 
 vcl/qa/cppunit/gen/gen.cxx                                 |    1 
 vcl/qa/cppunit/outdev.cxx                                  |    4 +
 vcl/qa/cppunit/physicalfontcollection.cxx                  |    1 
 vcl/qa/cppunit/skia/skia.cxx                               |    1 
 vcl/qa/cppunit/text.cxx                                    |    1 
 vcl/source/app/help.cxx                                    |    1 
 vcl/source/app/salvtables.cxx                              |    2 
 vcl/source/control/InterimItemWindow.cxx                   |    1 
 vcl/source/control/button.cxx                              |    1 
 vcl/source/control/combobox.cxx                            |    2 
 vcl/source/control/edit.cxx                                |    2 
 vcl/source/control/fixed.cxx                               |    1 
 vcl/source/control/imivctl1.cxx                            |    1 
 vcl/source/control/imp_listbox.cxx                         |    1 
 vcl/source/control/listbox.cxx                             |    2 
 vcl/source/control/prgsbar.cxx                             |    1 
 vcl/source/control/scrbar.cxx                              |    1 
 vcl/source/control/slider.cxx                              |    1 
 vcl/source/control/spinbtn.cxx                             |    2 
 vcl/source/control/spinfld.cxx                             |    2 
 vcl/source/control/tabctrl.cxx                             |    1 
 vcl/source/filter/eps/eps.cxx                              |    1 
 vcl/source/filter/wmf/emfwr.cxx                            |    1 
 vcl/source/filter/wmf/wmfwr.cxx                            |    2 
 vcl/source/font/fontcache.cxx                              |    1 
 vcl/source/font/fontmetric.cxx                             |    1 
 vcl/source/gdi/gdimetafiletools.cxx                        |    1 
 vcl/source/gdi/gdimtf.cxx                                  |    1 
 vcl/source/gdi/impgraph.cxx                                |    2 
 vcl/source/gdi/metaact.cxx                                 |    1 
 vcl/source/gdi/print.cxx                                   |    2 
 vcl/source/gdi/print3.cxx                                  |    1 
 vcl/source/gdi/virdev.cxx                                  |    1 
 vcl/source/graphic/GraphicObject.cxx                       |    1 
 vcl/source/graphic/UnoGraphicProvider.cxx                  |    1 
 vcl/source/outdev/bitmap.cxx                               |    1 
 vcl/source/outdev/font.cxx                                 |    2 
 vcl/source/outdev/gradient.cxx                             |    1 
 vcl/source/outdev/line.cxx                                 |    1 
 vcl/source/outdev/mask.cxx                                 |    1 
 vcl/source/outdev/outdev.cxx                               |    3 +
 vcl/source/outdev/polygon.cxx                              |    1 
 vcl/source/outdev/polyline.cxx                             |    1 
 vcl/source/outdev/rect.cxx                                 |    1 
 vcl/source/outdev/text.cxx                                 |    2 
 vcl/source/outdev/textline.cxx                             |    1 
 vcl/source/outdev/transparent.cxx                          |    3 +
 vcl/source/outdev/wallpaper.cxx                            |    1 
 vcl/source/pdf/pdfextoutdevdata.cxx                        |    1 
 vcl/source/pdf/pdfwriter_impl.cxx                          |    1 
 vcl/source/pdf/pdfwriter_impl2.cxx                         |    2 
 vcl/source/toolkit/group.cxx                               |    1 
 vcl/source/treelist/headbar.cxx                            |    1 
 vcl/source/treelist/treelistbox.cxx                        |    1 
 vcl/source/window/brdwin.cxx                               |    1 
 vcl/source/window/decoview.cxx                             |    1 
 vcl/source/window/dialog.cxx                               |    1 
 vcl/source/window/layout.cxx                               |    1 
 vcl/source/window/menu.cxx                                 |    1 
 vcl/source/window/menufloatingwindow.cxx                   |    1 
 vcl/source/window/printdlg.cxx                             |    1 
 vcl/source/window/splitwin.cxx                             |    1 
 vcl/source/window/status.cxx                               |    1 
 vcl/source/window/tabpage.cxx                              |    1 
 vcl/source/window/toolbox.cxx                              |    1 
 vcl/source/window/window.cxx                               |    3 +
 vcl/unx/generic/fontmanager/fontsubst.cxx                  |    1 
 vcl/win/gdi/salfont.cxx                                    |    1 
 vcl/workben/vcldemo.cxx                                    |    1 
 192 files changed, 275 insertions(+), 15 deletions(-)

New commits:
commit 49cb3077fb4a2a4b601281cd7fd6dde91021f070
Author:     Gabor Kelemen <[email protected]>
AuthorDate: Sat Jan 17 01:53:06 2026 +0100
Commit:     Gabor Kelemen <[email protected]>
CommitDate: Fri Jan 23 21:27:08 2026 +0100

    tdf#146619 Use more forward declarations in include/vcl/outdev.hxx
    
    these were skipped in previous runs, since they contain some code behind #if
    
    After inspecting these, it seems like the removals should not cause trouble.
    
    This also shaves off some 140M input
    
    Change-Id: Ie1f57174dd6fec3ba5b0b91eb0688acdc1a8143d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197494
    Tested-by: Jenkins
    Reviewed-by: Gabor Kelemen <[email protected]>

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 5e3d08b0fb47..b1507f37ed1d 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -48,8 +48,10 @@
 #include <sfx2/progress.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <tools/debug.hxx>
+#include <unotools/fontdefs.hxx>
 #include <utility>
 #include <vcl/image.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/weld/weldutils.hxx>
 #include <svl/urihelper.hxx>
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx 
b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index ced84e58b7ce..cb9de68275a0 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -36,6 +36,7 @@
 #include <vcl/canvastools.hxx>
 #include <vcl/kernarray.hxx>
 #include <vcl/metric.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/virdev.hxx>
 
diff --git a/canvas/source/vcl/canvascustomsprite.cxx 
b/canvas/source/vcl/canvascustomsprite.cxx
index 316176f6ac24..873bd91d99b9 100644
--- a/canvas/source/vcl/canvascustomsprite.cxx
+++ b/canvas/source/vcl/canvascustomsprite.cxx
@@ -24,6 +24,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 
 #include "canvascustomsprite.hxx"
 
diff --git a/canvas/source/vcl/canvashelper.cxx 
b/canvas/source/vcl/canvashelper.cxx
index 68d7fda9d9b8..3d0bdaf754ed 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -43,6 +43,7 @@
 #include <vcl/BitmapReadAccess.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/bitmap/BitmapAlphaClampFilter.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
 
 #include <canvas/canvastools.hxx>
diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx
index 6368778a2d73..430d81985b0b 100644
--- a/canvas/source/vcl/impltools.hxx
+++ b/canvas/source/vcl/impltools.hxx
@@ -21,6 +21,7 @@
 
 #include <osl/mutex.hxx>
 
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
 
diff --git a/chart2/source/controller/main/ChartWindow.cxx 
b/chart2/source/controller/main/ChartWindow.cxx
index 82dbf1cd1c83..44db06c5c368 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -24,6 +24,8 @@
 #include <uiobject.hxx>
 
 #include <vcl/help.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/settings.hxx>
 
 #include <sfx2/ipclient.hxx>
diff --git a/chart2/source/tools/CharacterProperties.cxx 
b/chart2/source/tools/CharacterProperties.cxx
index 44c08c170f45..65384fd3a518 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -33,11 +33,13 @@
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <osl/diagnose.h>
+#include <unotools/fontdefs.hxx>
 #include <unotools/lingucfg.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/color.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
diff --git a/cppcanvas/qa/unit/test.cxx b/cppcanvas/qa/unit/test.cxx
index ca836170ff36..adab86604cfc 100644
--- a/cppcanvas/qa/unit/test.cxx
+++ b/cppcanvas/qa/unit/test.cxx
@@ -14,6 +14,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 
 #include <com/sun/star/rendering/XBitmap.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx 
b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 29fc27e68841..d6d188531caf 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/rendering/XCanvas.hpp>
 
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/gdimtf.hxx>
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index c7f0d334d64c..6750b66a8755 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -43,6 +43,7 @@
 #include <vcl/event.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/salgtype.hxx>
 #include <vcl/virdev.hxx>
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index e20c9720ef22..41467d7fa521 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -24,6 +24,7 @@
 #include <utility>
 #include <vcl/event.hxx>
 #include <vcl/keycodes.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/transfer.hxx>
 #include <vcl/weld/MetricSpinButton.hxx>
@@ -33,6 +34,7 @@
 #include <sfx2/viewsh.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/collatorwrapper.hxx>
+#include <unotools/fontdefs.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/module.hxx>
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 53e78ddcc72d..389dba34084d 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -33,6 +33,7 @@
 #include <strings.hrc>
 #include <vcl/fieldvalues.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/unitconv.hxx>
diff --git a/dbaccess/source/ui/control/sqledit.cxx 
b/dbaccess/source/ui/control/sqledit.cxx
index 791d5b3d3860..17402c4c48d8 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -33,10 +33,12 @@
 #include <sqledit.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <i18nlangtag/languagetag.hxx>
+#include <unotools/fontdefs.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/specialchars.hxx>
 #include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx 
b/dbaccess/source/ui/misc/TokenWriter.cxx
index 768177354f41..bd7c9eaafdb1 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -48,11 +48,13 @@
 #include <svtools/htmlout.hxx>
 #include <sfx2/frmhtmlw.hxx>
 #include <svl/numuno.hxx>
+#include <unotools/fontdefs.hxx>
 #include <utility>
 #include <vcl/svapp.hxx>
 #include <UITools.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/settings.hxx>
 #include <svtools/rtfout.hxx>
 #include <o3tl/string_view.hxx>
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx 
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 4d277995d8a3..7022f6547fdf 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -46,7 +46,9 @@
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
 #include <i18nlangtag/languagetag.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <o3tl/string_view.hxx>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index bb89f6b735d2..7b6019ab6ac0 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -168,6 +168,7 @@
 #include <svx/ucsubset.hxx>
 #include <vcl/vclevent.hxx>
 #include <vcl/GestureEventPan.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/resmgr.hxx>
 #include <tools/debug.hxx>
@@ -187,6 +188,7 @@
 #include <vcl/BitmapTools.hxx>
 #endif
 #include <unicode/uchar.h>
+#include <unotools/fontdefs.hxx>
 #include <unotools/securityoptions.hxx>
 #include <unotools/confignode.hxx>
 #include <unotools/syslocaleoptions.hxx>
diff --git a/drawinglayer/qa/unit/border.cxx b/drawinglayer/qa/unit/border.cxx
index 682bfeb17281..f7ea5ba85d26 100644
--- a/drawinglayer/qa/unit/border.cxx
+++ b/drawinglayer/qa/unit/border.cxx
@@ -20,6 +20,7 @@
 #include <rtl/ref.hxx>
 #include <test/bootstrapfixture.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/virdev.hxx>
 #include <editeng/borderline.hxx>
diff --git a/drawinglayer/qa/unit/vclmetafileprocessor2d.cxx 
b/drawinglayer/qa/unit/vclmetafileprocessor2d.cxx
index d71cfc4bbe7d..a6ba7a1172a2 100644
--- a/drawinglayer/qa/unit/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/qa/unit/vclmetafileprocessor2d.cxx
@@ -14,6 +14,7 @@
 #include <vcl/BitmapReadAccess.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/gdimtf.hxx>
 #include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
diff --git a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
index 26871b351307..b13036558783 100644
--- a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
@@ -19,6 +19,7 @@
 #include <vcl/CairoFormats.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/lok.hxx>
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index e8cf383787b6..306bf0af7dea 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -37,6 +37,7 @@
 #include <vcl/graphictools.hxx>
 #include <tools/lazydelete.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/graph.hxx> // for PDFExtOutDevData Graphic support
 #include <vcl/formpdfexport.hxx> // for PDFExtOutDevData Graphic support
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index e9260abd6cde..762c61b6e85f 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -25,6 +25,7 @@
 #include <vcl/outdev.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/canvastools.hxx>
+#include <vcl/vclenum.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/utils/bgradient.hxx>
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 2167af670862..bcaaa1c3c360 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -32,6 +32,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/kernarray.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <sal/log.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx 
b/drawinglayer/source/tools/wmfemfhelper.cxx
index 2f42bf62dbd2..716c1653b33a 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -24,6 +24,7 @@
 #include <vcl/fntstyle.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <drawinglayer/primitive2d/PolygonStrokePrimitive2D.hxx>
diff --git a/editeng/source/editeng/eehtml.cxx 
b/editeng/source/editeng/eehtml.cxx
index 06df5006b7ee..0f6b670d6ab9 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -31,8 +31,10 @@
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
 #include <tools/tenccvt.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 
 #include <editeng/editeng.hxx>
 #include <utility>
diff --git a/editeng/source/editeng/impedit4.cxx 
b/editeng/source/editeng/impedit4.cxx
index 8ccf389603b5..fe65d27fe113 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -66,6 +66,7 @@
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
+#include <unotools/fontdefs.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/textsearch.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 84ddc4a9de1f..df958a9c641f 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <unotools/fontdefs.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 
 #include <editeng/bulletitem.hxx>
 
diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index 8e5153b961ba..8f1c35935d73 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -29,6 +29,7 @@
 #include <unotools/syslocale.hxx>
 #include <utility>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/unohelp.hxx>
 #include <svtools/unitconv.hxx>
 
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index c84ffe526bd1..14f3d59057cb 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -55,6 +55,7 @@
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/filter/SvmReader.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
 #include <xmloff/namespacemap.hxx>
 #include <xmloff/xmlnamespace.hxx>
diff --git a/filter/source/svg/svgfontexport.cxx 
b/filter/source/svg/svgfontexport.cxx
index 3a59b1052f76..661c0b029d46 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -24,6 +24,7 @@
 
 #include <vcl/unohelp.hxx>
 #include <vcl/font.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 407979a21c3e..b9d65661119f 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -26,6 +26,7 @@
 #include <sal/log.hxx>
 #include <vcl/unohelp.hxx>
 #include <vcl/cvtgrf.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
diff --git a/forms/source/richtext/richtextcontrol.cxx 
b/forms/source/richtext/richtextcontrol.cxx
index 5840782e8df9..28bae22e97a7 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -33,6 +33,7 @@
 #include <tools/debug.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <sal/log.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/svapp.hxx>
 
 #include <svx/svxids.hrc>
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 83ff1f059e0e..12ab1c8dd9c7 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -24,6 +24,7 @@
 #include <tools/gen.hxx>
 #include <vcl/keycod.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/vclenum.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/outdev.hxx>
 #include <optional>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 9f8f1be9ae27..5ec3694ddad0 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -27,47 +27,32 @@
 #include <tools/solar.h>
 #include <tools/color.hxx>
 #include <tools/poly.hxx>
-#include <vcl/bitmap.hxx>
 #include <vcl/cairo.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/font.hxx>
 #include <vcl/kernarray.hxx>
 #include <vcl/region.hxx>
-#include <vcl/rendercontext/AddFontSubstituteFlags.hxx>
-#include <vcl/rendercontext/AntialiasingFlags.hxx>
-#include <vcl/rendercontext/SystemTextColorFlags.hxx>
-#include <vcl/rendercontext/DrawGridFlags.hxx>
 #include <vcl/rendercontext/DrawImageFlags.hxx>
-#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/rendercontext/DrawTextFlags.hxx>
-#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/rendercontext/ImplMapRes.hxx>
 #include <vcl/rendercontext/InvertFlags.hxx>
-#include <vcl/rendercontext/RasterOp.hxx>
 #include <vcl/rendercontext/SalLayoutFlags.hxx>
 #include <vcl/rendercontext/State.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/wall.hxx>
-#include <vcl/metaactiontypes.hxx>
-#include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/vclenum.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/vclreferencebase.hxx>
 
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/numeric/ftools.hxx>
-#include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2enums.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
-#include <unotools/fontdefs.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <cppuhelper/weakref.hxx>
 
 #include <com/sun/star/drawing/LineCap.hpp>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/awt/DeviceInfo.hpp>
 
 #include <memory>
 #include <optional>
@@ -75,6 +60,8 @@
 #include <string_view>
 #include <vector>
 
+class Bitmap;
+class ImplControlValue;
 struct ImplOutDevData;
 class LogicalFontInstance;
 struct SystemGraphicsData;
@@ -101,6 +88,20 @@ class Printer;
 class VCLXGraphics;
 class SalLayoutGlyphs;
 
+enum class AddFontSubstituteFlags;
+enum class AntialiasingFlags;
+enum class ControlPart;
+enum class ControlState;
+enum class ControlType;
+enum class DefaultFontType;
+enum class DrawGridFlags;
+enum class DrawModeFlags : sal_uInt32;
+enum class GetDefaultFontFlags;
+enum class MetaActionType;
+enum class OutDevSupportType;
+enum class RasterOp;
+enum class SystemTextColorFlags;
+
 namespace vcl
 {
     class ExtOutDevData;
@@ -122,11 +123,13 @@ namespace vcl
 
 namespace basegfx {
     class B2DHomMatrix;
+    class B2DPoint;
     class B2ISize;
 }
 
 namespace com::sun::star::awt {
     class XGraphics;
+    struct DeviceInfo;
 }
 
 namespace com::sun::star::rendering {
diff --git a/include/vcl/outdev/ScopedStates.hxx 
b/include/vcl/outdev/ScopedStates.hxx
index 7542cfeed548..5a075924a933 100644
--- a/include/vcl/outdev/ScopedStates.hxx
+++ b/include/vcl/outdev/ScopedStates.hxx
@@ -12,6 +12,7 @@
 #define INCLUDED_VCL_SCOPEDSTATES_HXX
 
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 
 namespace vcl
 {
diff --git a/reportdesign/source/core/api/ReportComponent.cxx 
b/reportdesign/source/core/api/ReportComponent.cxx
index adfee3596914..a703b908366d 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -19,6 +19,7 @@
 #include <ReportComponent.hxx>
 
 #include <comphelper/solarmutex.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
@@ -29,6 +30,7 @@
 #include <ReportControlModel.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <comphelper/uno3.hxx>
+#include <unotools/fontdefs.hxx>
 #include <unotools/lingucfg.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index b640d7540cb9..afbe7d0e2758 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -23,7 +23,9 @@
 
 #include <comphelper/string.hxx>
 #include <i18nutil/unicode.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <svl/itemiter.hxx>
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index bc7225d4e06d..a193bdbbd30c 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -33,7 +33,9 @@
 #include <svl/zforlist.hxx>
 #include <svl/IndexedStyleSheets.hxx>
 #include <unotools/charclass.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <osl/diagnose.h>
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 599e28af1035..c74deca0f72e 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -26,6 +26,7 @@
 #include <svl/intitem.hxx>
 #include <svl/itemset.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <svx/algitem.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/rotmodit.hxx>
@@ -49,6 +50,7 @@
 #include <tools/urlobj.hxx>
 #include <comphelper/fileformat.h>
 #include <unotools/collatorwrapper.hxx>
+#include <unotools/fontdefs.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <tools/tenccvt.hxx>
 #include <osl/diagnose.h>
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index cea6979f5a6a..586d0ee35597 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -30,6 +30,7 @@
 #include <svtools/rtfout.hxx>
 #include <svtools/rtfkeywd.hxx>
 #include <tools/stream.hxx>
+#include <unotools/fontdefs.hxx>
 
 #include <rtfexp.hxx>
 #include <cellvalue.hxx>
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 9305c162a418..e6ca23eee077 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -34,8 +34,11 @@
 
 // *** edit engine ***
 #include <editeng/eeitem.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
+#include <vcl/rendercontext/DrawGridFlags.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
diff --git a/sc/source/ui/inc/SparklineRenderer.hxx 
b/sc/source/ui/inc/SparklineRenderer.hxx
index 8fb5f64d214b..3b6cace30642 100644
--- a/sc/source/ui/inc/SparklineRenderer.hxx
+++ b/sc/source/ui/inc/SparklineRenderer.hxx
@@ -15,6 +15,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 
 #include <Sparkline.hxx>
 #include <SparklineGroup.hxx>
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index cd77cf1f4bd6..0af2287af08f 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -37,8 +37,10 @@
 #include <svl/zformat.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/unohelp2.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weld.hxx>
 #include <svx/svxdlg.hxx>
diff --git a/sc/source/ui/view/gridmerg.cxx b/sc/source/ui/view/gridmerg.cxx
index 37e3bc5936b7..556596655276 100644
--- a/sc/source/ui/view/gridmerg.cxx
+++ b/sc/source/ui/view/gridmerg.cxx
@@ -22,6 +22,7 @@
 #include <tools/mapunit.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/DrawGridFlags.hxx>
 
 #include <gridmerg.hxx>
 
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 9c7513516801..0df29e543c71 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -35,6 +35,7 @@
 #include <officecfg/Office/Calc.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/gradient.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/pdf/PDFNote.hxx>
 #include <svx/unoapi.hxx>
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index a50c1c648734..61fcfbfc731d 100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -23,6 +23,7 @@
 #include <svx/svdoutl.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdview.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <osl/diagnose.h>
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 5da42c02be51..afe46d51779e 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -39,11 +39,13 @@
 #include <comphelper/propertyvalue.hxx>
 #include <rtl/bootstrap.hxx>
 #include <comphelper/configuration.hxx>
+#include <unotools/fontdefs.hxx>
 #include <unotools/streamwrap.hxx>
 #include <tools/stream.hxx>
 #include <tools/UnitConversion.hxx>
 
 #include <vcl/idle.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sd/source/filter/eppt/pptx-text.cxx 
b/sd/source/filter/eppt/pptx-text.cxx
index be7435009a2b..bd5c1d07ce1a 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -50,6 +50,7 @@
 #include <osl/diagnose.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/UnitConversion.hxx>
+#include <unotools/fontdefs.hxx>
 
 #include <vcl/settings.hxx>
 #include <vcl/metric.hxx>
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 822317cc16c7..cb8c53b660af 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -28,6 +28,8 @@
 #include <comphelper/propertysequence.hxx>
 #include <svl/style.hxx>
 #include <svx/chinese_translation_unodialog.hxx>
+#include <unotools/fontdefs.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/fontitem.hxx>
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 7920e7434739..ce54644a5afe 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -25,6 +25,7 @@
 #include <svl/typedwhich.hxx>
 #include <svtools/scrolladaptor.hxx>
 #include <vcl/prntypes.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <o3tl/deleter.hxx>
 #include <pres.hxx>
 #include "View.hxx"
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx 
b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index 4ed190ecf6ca..38521334dd78 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -29,6 +29,7 @@
 #include <cache/SlsPageCache.hxx>
 #include <Window.hxx>
 #include <sdpage.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/virdev.hxx>
 #include <CustomAnimationEffect.hxx>
 #include <osl/diagnose.h>
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 5aca5f0c5970..cb411fb7d535 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -20,6 +20,7 @@
 #include <OutlineView.hxx>
 #include <sfx2/progress.hxx>
 #include <vcl/commandinfoprovider.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/svxids.hrc>
 #include <editeng/outliner.hxx>
@@ -36,6 +37,7 @@
 #include <xmloff/autolayout.hxx>
 #include <tools/debug.hxx>
 #include <officecfg/Office/Common.hxx>
+#include <unotools/fontdefs.hxx>
 
 #include <editeng/editobj.hxx>
 #include <editeng/editund2.hxx>
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 6d3bc7e4d519..a0f189ba64aa 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -43,6 +43,7 @@
 #include <unotools/streamwrap.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/pdfread.hxx>
 #include <vcl/TypeSerializer.hxx>
 #include <svx/svxids.hrc>
diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx 
b/sfx2/source/doc/SfxRedactionHelper.cxx
index 92fca5eec366..548455883188 100644
--- a/sfx2/source/doc/SfxRedactionHelper.cxx
+++ b/sfx2/source/doc/SfxRedactionHelper.cxx
@@ -53,6 +53,7 @@
 
 #include <vcl/wmf.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/vcllayout.hxx>
 #include <o3tl/string_view.hxx>
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 94c3c59722f3..3e729d396414 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/UpdateDocMode.hpp>
 #include <comphelper/fileurl.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weld.hxx>
 #include <svl/style.hxx>
diff --git a/slideshow/source/engine/shapes/drawshape.cxx 
b/slideshow/source/engine/shapes/drawshape.cxx
index 7fe3b5c58265..243e2a767322 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -26,6 +26,7 @@
 #include <utility>
 #include <vcl/animate/Animation.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/graph.hxx>
 
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx 
b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 746e7f786888..41994643145a 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -25,6 +25,7 @@
 #include <sal/log.hxx>
 #include <utility>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/gdimtf.hxx>
 
 #include "drawshapesubsetting.hxx"
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx 
b/slideshow/source/engine/shapes/gdimtftools.cxx
index 5bf70615bce2..d2e07baa4569 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -34,6 +34,7 @@
 #include <vcl/alpha.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/animate/Animation.hxx>
diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index f5143ada9e8c..60d29ccd999d 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -34,6 +34,7 @@
 #include <sfx2/sfxmodelfactory.hxx>
 #include <svl/stritem.hxx>
 #include <vcl/event.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/uitest/eventdescription.hxx>
 #include <vcl/uitest/logger.hxx>
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 6f0134047d07..25eec2f22ed8 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -22,8 +22,10 @@
 #include <svl/eitem.hxx>
 #include <svl/languageoptions.hxx>
 #include <comphelper/configuration.hxx>
+#include <unotools/fontdefs.hxx>
 #include <utility>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <sal/log.hxx>
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 7db9176eed19..2e1ab7843882 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -51,6 +51,7 @@
 #include <svl/undo.hxx>
 #include <svl/whiter.hxx>
 #include <vcl/mapmod.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/virdev.hxx>
 #include <tools/mapunit.hxx>
 #include <vcl/settings.hxx>
diff --git a/starmath/source/smediteng.cxx b/starmath/source/smediteng.cxx
index 23df3b5b71af..4074dfa54467 100644
--- a/starmath/source/smediteng.cxx
+++ b/starmath/source/smediteng.cxx
@@ -17,7 +17,9 @@
 #include <editeng/fontitem.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 
 SmEditEngine::SmEditEngine(SfxItemPool* pItemPool)
diff --git a/svtools/source/brwbox/brwbox2.cxx 
b/svtools/source/brwbox/brwbox2.cxx
index 2e5ef9a8c8d2..c9effc90ddd8 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -30,6 +30,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/help.hxx>
 #include <vcl/ptrstyle.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/settings.hxx>
 
 #include <tools/multisel.hxx>
diff --git a/svtools/source/brwbox/editbrowsebox.cxx 
b/svtools/source/brwbox/editbrowsebox.cxx
index c15a287ace2b..3ffc16b89fed 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -21,6 +21,7 @@
 
 #include <tools/debug.hxx>
 #include <vcl/image.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svtools/source/config/fontsubstconfig.cxx 
b/svtools/source/config/fontsubstconfig.cxx
index 66a7a4e038ef..62f6043f1927 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -24,6 +24,7 @@
 #include <o3tl/any.hxx>
 #include <tools/debug.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/AddFontSubstituteFlags.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 
diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index a204bb8986a4..d131b0b29bed 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -27,6 +27,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <tools/stream.hxx>
 #include <vcl/event.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/fieldvalues.hxx>
 #include <vcl/settings.hxx>
diff --git a/svtools/source/control/ctrltool.cxx 
b/svtools/source/control/ctrltool.cxx
index f8a4e7249229..6f4d49f04b62 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -35,6 +35,7 @@
 #include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <svtools/ctrltool.hxx>
+#include <unotools/fontdefs.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <o3tl/string_view.hxx>
 #include <comphelper/lok.hxx>
diff --git a/svtools/source/control/tabbar.cxx 
b/svtools/source/control/tabbar.cxx
index 293ebaf56a94..430a66964fc1 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -25,6 +25,7 @@
 #include <utility>
 #include <vcl/InterimItemWindow.hxx>
 #include <vcl/bitmap.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <vcl/decoview.hxx>
diff --git a/svtools/source/filter/DocumentToGraphicRenderer.cxx 
b/svtools/source/filter/DocumentToGraphicRenderer.cxx
index 16668b7e9e3b..cceb3aa63764 100644
--- a/svtools/source/filter/DocumentToGraphicRenderer.cxx
+++ b/svtools/source/filter/DocumentToGraphicRenderer.cxx
@@ -24,6 +24,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/pdfextoutdevdata.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 
 #include <tools/fract.hxx>
 
diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index 9fabb15e5baf..49e3b99c214c 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 #include <svtools/sampletext.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/font.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx 
b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index be5884188cb5..cc0d20d81e9f 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -24,6 +24,7 @@
 #include <svx/svdopath.hxx>
 #include <vcl/kernarray.hxx>
 #include <vcl/metric.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <svx/sdasitm.hxx>
 #include <svx/sdtfsitm.hxx>
 #include <vcl/virdev.hxx>
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 2e5f329c4896..5671b1b7d498 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -22,6 +22,7 @@
 #include <vcl/animate/AnimationFrame.hxx>
 #include <vcl/event.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/virdev.hxx>
 #include <svtools/valueset.hxx>
 #include <svl/eitem.hxx>
diff --git a/svx/source/dialog/dialcontrol.cxx 
b/svx/source/dialog/dialcontrol.cxx
index b8c5c6d682d3..c8449b6d1fed 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -20,10 +20,12 @@
 #include <svx/dialcontrol.hxx>
 #include <svx/svdtrans.hxx>
 #include <cmath>
+#include <unotools/fontdefs.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/event.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/settings.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 5330e5e8d72f..d6da32e181e1 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -19,6 +19,7 @@
 
 #include <config_wasm_strip.h>
 
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
diff --git a/svx/source/dialog/pagenumberlistbox.cxx 
b/svx/source/dialog/pagenumberlistbox.cxx
index cba1045c6647..839160b14d66 100644
--- a/svx/source/dialog/pagenumberlistbox.cxx
+++ b/svx/source/dialog/pagenumberlistbox.cxx
@@ -24,8 +24,10 @@
 #include <svx/dialmgr.hxx>
 #include <svx/numberingpreview.hxx>
 #include <svx/pagenumberlistbox.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/metric.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/virdev.hxx>
 #include <numberingtype.hrc>
 
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx 
b/svx/source/dialog/svxbmpnumvalueset.cxx
index 82349b5d9123..7e0b613eebf1 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -24,11 +24,13 @@
 #include <comphelper/diagnose_ex.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <svtools/valueset.hxx>
+#include <unotools/fontdefs.hxx>
 #include <editeng/numitem.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <svx/gallery.hxx>
 #include <vcl/event.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/virdev.hxx>
 #include <svx/numvset.hxx>
 #include <com/sun/star/style/NumberingType.hpp>
diff --git a/svx/source/dialog/swframeexample.cxx 
b/svx/source/dialog/swframeexample.cxx
index 57d4216b0d49..ccb775f77677 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -18,8 +18,10 @@
  */
 
 #include <tools/mapunit.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <svtools/colorcfg.hxx>
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 2e9b49f359ed..7e9c319ff444 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -62,6 +62,7 @@
 #include <tools/debug.hxx>
 #include <tools/fract.hxx>
 #include <comphelper/diagnose_ex.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <connectivity/CommonTools.hxx>
diff --git a/svx/source/form/fmcontrollayout.cxx 
b/svx/source/form/fmcontrollayout.cxx
index e54bf5433ba2..75d0a20a43af 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -34,6 +34,7 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <unotools/confignode.hxx>
+#include <unotools/fontdefs.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/localedatawrapper.hxx>
 
@@ -41,6 +42,7 @@
 #include <tools/debug.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 
 
 namespace svxform
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx 
b/svx/source/sdr/contact/objectcontactofpageview.cxx
index e6badd628b7d..b9d226f6dce5 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -41,6 +41,7 @@
 #include <comphelper/configuration.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/pdfextoutdevdata.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <comphelper/lok.hxx>
 
 #include <memory>
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx 
b/svx/source/sdr/overlay/overlaymanager.cxx
index 266555716e74..c89586e5b5cd 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -23,6 +23,7 @@
 #include <tools/gen.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/window.hxx>
 #include <vcl/gdimtf.hxx>
 #include <svx/sdr/overlay/overlayobject.hxx>
diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx 
b/svx/source/sidebar/line/LineWidthValueSet.cxx
index 284f876668f5..ffff42375df3 100644
--- a/svx/source/sidebar/line/LineWidthValueSet.cxx
+++ b/svx/source/sidebar/line/LineWidthValueSet.cxx
@@ -20,7 +20,9 @@
 
 #include <i18nlangtag/mslangid.hxx>
 #include <tools/mapunit.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/event.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index fa77ec8898d1..fa45bdb9b6a2 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -39,6 +39,7 @@
 #include <editeng/colritem.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/canvastools.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/metric.hxx>
 #include <editeng/charscaleitem.hxx>
 #include <svx/xflhtit.hxx>
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 26584b7064fb..10c331a5a8cd 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <unotools/configmgr.hxx>
+#include <unotools/fontdefs.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/whiter.hxx>
 #include <svl/asiancfg.hxx>
@@ -66,6 +67,7 @@
 #include <unotools/syslocale.hxx>
 #include <editeng/eeitem.hxx>
 #include <svl/itemset.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <memory>
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 31fe9103a92d..2659eb352a78 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -48,6 +48,7 @@
 #include <basegfx/tuple/b2dtuple.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/virdev.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <sal/log.hxx>
@@ -56,6 +57,7 @@
 #include <comphelper/configuration.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/fhgtitem.hxx>
+#include <unotools/fontdefs.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index dd809885df98..969558353431 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -37,6 +37,7 @@
 #include <comphelper/scopeguard.hxx>
 #include <basegfx/range/b2irectangle.hxx>
 #include <osl/diagnose.h>
+#include <vcl/rendercontext/DrawGridFlags.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index 2ad97c9c4ab0..eb573ccb53c7 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -29,6 +29,7 @@
 #include <vcl/pdf/PDFPageObjectType.hxx>
 #include <vcl/pdf/PDFSegmentType.hxx>
 #include <vcl/pdf/PDFTextRenderMode.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/vectorgraphicdata.hxx>
 
 #include <editeng/eeitem.hxx>
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx 
b/svx/source/unodraw/UnoGraphicExporter.cxx
index 799fe3af9bb3..235ebc5d3752 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -44,6 +44,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <svl/outstrm.hxx>
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 07b32f44b225..a7467b35c8c2 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -20,6 +20,7 @@
 #include <XPropertyTable.hxx>
 
 #include <tools/mapunit.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 26d24a60815a..631edc3a3f86 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -25,6 +25,7 @@
 #include <svx/xtable.hxx>
 
 #include <rtl/ustrbuf.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <osl/diagnose.h>
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 498b8448b892..e7633525581d 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -19,6 +19,7 @@
 
 #include <XPropertyTable.hxx>
 #include <tools/mapunit.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/svapp.hxx>
 
 #include <vcl/virdev.hxx>
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index 58632f09b387..a1816e3803e7 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -20,6 +20,7 @@
 #include <XPropertyTable.hxx>
 #include <vcl/virdev.hxx>
 
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/sw/source/core/crsr/contentcontrolbutton.cxx 
b/sw/source/core/crsr/contentcontrolbutton.cxx
index 377d8326b7f5..499e0ffc5715 100644
--- a/sw/source/core/crsr/contentcontrolbutton.cxx
+++ b/sw/source/core/crsr/contentcontrolbutton.cxx
@@ -13,6 +13,7 @@
 #include <vcl/weld/weldutils.hxx>
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 
 #include <edtwin.hxx>
 #include <dview.hxx>
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx 
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 1c44da184b9a..4b1667a37f05 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -62,6 +62,8 @@
 #include <svx/dialmgr.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
+#include <unotools/fontdefs.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <strings.hrc>
 #include <frmatr.hxx>
 #include <frameformats.hxx>
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 30d9eeb447ac..ee06d9bfeeff 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -21,6 +21,7 @@
 #include <tools/urlobj.hxx>
 #include <vcl/imapobj.hxx>
 #include <vcl/imap.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <svl/urihelper.hxx>
 #include <sfx2/progress.hxx>
 #include <sfx2/printer.hxx>
diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 1ebc9203e0e4..d77fe8aa13c2 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -104,6 +104,7 @@
 #include <svx/unoapi.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/xfillit0.hxx>
+#include <unotools/fontdefs.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/color/bcolortools.hxx>
 #include <basegfx/utils/b2dclipstate.hxx>
@@ -130,6 +131,9 @@
 #include <ndtxt.hxx>
 #include <unotools/configmgr.hxx>
 #include <vcl/hatch.hxx>
+#include <vcl/rendercontext/DrawGridFlags.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <poolfmt.hxx>
 
 using namespace ::editeng;
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index da4fcbfdcd4e..95c135276e83 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -39,6 +39,7 @@
 
 #include <sortedobjs.hxx>
 #include <officecfg/Office/Common.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <PostItMgr.hxx>
 #include <viewopt.hxx>
 
diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index fcbce1563c9a..a0ce3ebf396d 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -21,6 +21,7 @@
 
 #include <i18nlangtag/mslangid.hxx>
 #include <officecfg/Office/Common.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/kernarray.hxx>
 #include <vcl/lineinfo.hxx>
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 837ad92d4cb4..c217029ad4b0 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -36,6 +36,7 @@
 #include <dcontact.hxx>
 #include <dview.hxx>
 #include <flyfrm.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/canvastools.hxx>
diff --git a/sw/source/filter/html/htmlform.cxx 
b/sw/source/filter/html/htmlform.cxx
index 5cd68c0c76e1..9521724e27ef 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -25,6 +25,7 @@
 #include <comphelper/documentinfo.hxx>
 #include <comphelper/string.hxx>
 #include <utility>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/UnitConversion.hxx>
 
@@ -38,6 +39,7 @@
 #include <sfx2/event.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/viewfrm.hxx>
+#include <unotools/fontdefs.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/brushitem.hxx>
diff --git a/sw/source/filter/html/htmlforw.cxx 
b/sw/source/filter/html/htmlforw.cxx
index 65b77180c959..808ffeff8b09 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -32,6 +32,7 @@
 #include <o3tl/any.hxx>
 #include <rtl/math.hxx>
 #include <utility>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/macitem.hxx>
 #include <svtools/htmlout.hxx>
@@ -39,6 +40,7 @@
 #include <svl/urihelper.hxx>
 #include <vcl/unohelp.hxx>
 #include <svx/svdouno.hxx>
+#include <unotools/fontdefs.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/fhgtitem.hxx>
diff --git a/sw/source/filter/ww8/writerwordglue.cxx 
b/sw/source/filter/ww8/writerwordglue.cxx
index 06c94de5bf17..01e5eaeeafe6 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -29,6 +29,7 @@
 #include <rtl/tencinfo.h>
 #include <sal/log.hxx>
 #include <svl/numformat.hxx>
+#include <unotools/fontdefs.hxx>
 
 #include <unicode/ubidi.h>
 #include <tools/tenccvt.hxx>
diff --git a/sw/source/filter/ww8/wrtw8num.cxx 
b/sw/source/filter/ww8/wrtw8num.cxx
index e72789615419..e504d49b72f1 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -20,6 +20,7 @@
 #include <hintids.hxx>
 #include <vcl/font.hxx>
 #include <editeng/langitem.hxx>
+#include <unotools/fontdefs.hxx>
 #include <doc.hxx>
 #include <docary.hxx>
 #include <numrule.hxx>
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 69003e54e926..6e1751cc8b03 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -66,7 +66,9 @@
 #include <svtools/ctrltool.hxx>
 #include <svtools/unitconv.hxx>
 #include <sfx2/htmlmode.hxx>
+#include <unotools/fontdefs.hxx>
 
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index ef2eb019f74c..5bf5289c0a91 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -26,6 +26,8 @@
 #include <rtl/textenc.h>
 #include <i18nlangtag/mslangid.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
+#include <unotools/fontdefs.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/viewoptions.hxx>
 #include <sfx2/sfxsids.hrc>
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index bd9455bcc9d7..e0b271e71f34 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -19,11 +19,13 @@
 
 #include <hintids.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <editeng/brushitem.hxx>
 #include <unotools/configmgr.hxx>
+#include <unotools/fontdefs.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <num.hxx>
 #include <view.hxx>
diff --git a/sw/source/ui/table/autoformatpreview.cxx 
b/sw/source/ui/table/autoformatpreview.cxx
index 92f149536c1e..f023c0acf797 100644
--- a/sw/source/ui/table/autoformatpreview.cxx
+++ b/sw/source/ui/table/autoformatpreview.cxx
@@ -28,6 +28,7 @@
 #include <editeng/shdditem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/wghtitem.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/settings.hxx>
 #include <com/sun/star/i18n/BreakIterator.hpp>
 #include <comphelper/processfactory.hxx>
diff --git a/sw/source/uibase/app/docshini.cxx 
b/sw/source/uibase/app/docshini.cxx
index 238b51b02852..e7599745f463 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -25,6 +25,7 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <svtools/ctrltool.hxx>
 #include <unotools/configmgr.hxx>
+#include <unotools/fontdefs.hxx>
 #include <unotools/lingucfg.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
@@ -46,6 +47,7 @@
 #include <editeng/orphitem.hxx>
 #include <editeng/widwitem.hxx>
 #include <editeng/hyphenzoneitem.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <prtopt.hxx>
diff --git a/sw/source/uibase/config/fontcfg.cxx 
b/sw/source/uibase/config/fontcfg.cxx
index a17104f4803f..b31ad853fcd6 100644
--- a/sw/source/uibase/config/fontcfg.cxx
+++ b/sw/source/uibase/config/fontcfg.cxx
@@ -22,7 +22,9 @@
 #include <osl/diagnose.h>
 #include <tools/UnitConversion.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <comphelper/configuration.hxx>
+#include <unotools/fontdefs.hxx>
 #include <unotools/lingucfg.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx 
b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index 085547477051..9fd17a915a68 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -40,6 +40,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/ptrstyle.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/gradient.hxx>
diff --git a/sw/source/uibase/docvw/srcedtw.cxx 
b/sw/source/uibase/docvw/srcedtw.cxx
index 9df4e07f47ea..67fab7dc92cb 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -31,6 +31,7 @@
 #include <sal/log.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/textview.hxx>
 #include <vcl/ptrstyle.hxx>
@@ -45,6 +46,7 @@
 #include <svtools/ctrltool.hxx>
 #include <svtools/scrolladaptor.hxx>
 #include <tools/time.hxx>
+#include <unotools/fontdefs.hxx>
 #include <swmodule.hxx>
 #include <docsh.hxx>
 #include <srcview.hxx>
diff --git a/sw/source/uibase/shells/annotsh.cxx 
b/sw/source/uibase/shells/annotsh.cxx
index cb7e6a09d101..b3da5d3aeddb 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -59,6 +59,7 @@
 #include <svl/whiter.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
+#include <unotools/fontdefs.hxx>
 #include <unotools/useroptions.hxx>
 #include <editeng/flditem.hxx>
 #include <svx/hlnkitem.hxx>
@@ -86,6 +87,7 @@
 #include <svx/svxdlg.hxx>
 
 #include <vcl/EnumContext.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <svl/itempool.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/editview.hxx>
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx 
b/sw/source/uibase/shells/drwtxtsh.cxx
index 8bb470f515b9..f1dbbb343e91 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -39,6 +39,7 @@
 #include <svx/fontwork.hxx>
 #include <sfx2/request.hxx>
 #include <vcl/EnumContext.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <svl/whiter.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/editstat.hxx>
@@ -51,6 +52,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <comphelper/propertysequence.hxx>
 #include <osl/diagnose.h>
+#include <unotools/fontdefs.hxx>
 #include <swtypes.hxx>
 #include <view.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/uibase/uiview/viewling.cxx 
b/sw/source/uibase/uiview/viewling.cxx
index a88e62975c45..3fe63717a5bd 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -30,6 +30,8 @@
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <unotools/fontdefs.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/weld/weld.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index e2788f715d6f..43a813a3e194 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -24,6 +24,7 @@
 #include <sal/log.hxx>
 #include <helper/property.hxx>
 #include <vcl/image.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/svapp.hxx>
diff --git a/toolkit/source/awt/vclxwindow.cxx 
b/toolkit/source/awt/vclxwindow.cxx
index e9efe8d6ccb2..c1cfd6ffdc68 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -50,6 +50,7 @@
 #include <vcl/event.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/pdfextoutdevdata.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/ctrl.hxx>
 #include <vcl/settings.hxx>
diff --git a/toolkit/source/awt/vclxwindows.cxx 
b/toolkit/source/awt/vclxwindows.cxx
index c67f0c40b17b..61e43e126512 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -37,6 +37,7 @@
 #include <awt/vclxwindows.hxx>
 #include <controls/filectrl.hxx>
 #include <controls/svmedit.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/toolkit/button.hxx>
 #include <vcl/toolkit/fmtfield.hxx>
 #include <vcl/graph.hxx>
diff --git a/vcl/backendtest/VisualBackendTest.cxx 
b/vcl/backendtest/VisualBackendTest.cxx
index ab39d72e7283..6614cabdc055 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -20,6 +20,7 @@
 #include <vcl/gradient.hxx>
 #include <vcl/vclmain.hxx>
 
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/backendtest/outputdevice/common.cxx 
b/vcl/backendtest/outputdevice/common.cxx
index 1448129bc8fe..5502ec2cc5b8 100644
--- a/vcl/backendtest/outputdevice/common.cxx
+++ b/vcl/backendtest/outputdevice/common.cxx
@@ -12,6 +12,7 @@
 
 #include <vcl/BitmapWriteAccess.hxx>
 #include <vcl/bitmap.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <salgdi.hxx>
 
 #include <map>
diff --git a/vcl/backendtest/outputdevice/line.cxx 
b/vcl/backendtest/outputdevice/line.cxx
index 5cb6db10a9af..bf8c55f7f7d0 100644
--- a/vcl/backendtest/outputdevice/line.cxx
+++ b/vcl/backendtest/outputdevice/line.cxx
@@ -12,6 +12,7 @@
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <vcl/BitmapReadAccess.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 
 #include <list>
 
diff --git a/vcl/backendtest/outputdevice/polygon.cxx 
b/vcl/backendtest/outputdevice/polygon.cxx
index 051c0d893cb1..4784faaca1e3 100644
--- a/vcl/backendtest/outputdevice/polygon.cxx
+++ b/vcl/backendtest/outputdevice/polygon.cxx
@@ -9,6 +9,7 @@
  */
 
 #include <test/outputdevice.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 
 namespace vcl::test
 {
diff --git a/vcl/backendtest/outputdevice/polyline.cxx 
b/vcl/backendtest/outputdevice/polyline.cxx
index 3deed34ca76a..9e54957e5edb 100644
--- a/vcl/backendtest/outputdevice/polyline.cxx
+++ b/vcl/backendtest/outputdevice/polyline.cxx
@@ -9,6 +9,7 @@
  */
 
 #include <test/outputdevice.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 
 namespace vcl::test {
 
diff --git a/vcl/qa/cppunit/BackendTest.cxx b/vcl/qa/cppunit/BackendTest.cxx
index ce88052cd8de..1545c4ec3eb4 100644
--- a/vcl/qa/cppunit/BackendTest.cxx
+++ b/vcl/qa/cppunit/BackendTest.cxx
@@ -14,6 +14,7 @@
 #include <vcl/bitmap.hxx>
 #include <tools/stream.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
diff --git a/vcl/qa/cppunit/cjktext.cxx b/vcl/qa/cppunit/cjktext.cxx
index 9550a16e9837..793e56fd08d2 100644
--- a/vcl/qa/cppunit/cjktext.cxx
+++ b/vcl/qa/cppunit/cjktext.cxx
@@ -16,6 +16,7 @@
 #include <vcl/BitmapReadAccess.hxx>
 #include <comphelper/errcode.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/virdev.hxx>
 
 #include <salgdi.hxx>
diff --git a/vcl/qa/cppunit/gen/gen.cxx b/vcl/qa/cppunit/gen/gen.cxx
index 75a058b86c5e..654bdb2cf1bf 100644
--- a/vcl/qa/cppunit/gen/gen.cxx
+++ b/vcl/qa/cppunit/gen/gen.cxx
@@ -14,6 +14,7 @@
 #include <sfx2/sfxbasemodel.hxx>
 #include <vcl/BitmapReadAccess.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/virdev.hxx>
 
 using namespace com::sun::star;
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index a0d2f5f11018..126e589cf934 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -22,11 +22,15 @@
 #include <vcl/gradient.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/print.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/rendercontext/RasterOp.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 
 #include <vcl/BitmapWriteAccess.hxx>
 #include <bufferdevice.hxx>
diff --git a/vcl/qa/cppunit/physicalfontcollection.cxx 
b/vcl/qa/cppunit/physicalfontcollection.cxx
index cd685cdda85d..96066ee1e732 100644
--- a/vcl/qa/cppunit/physicalfontcollection.cxx
+++ b/vcl/qa/cppunit/physicalfontcollection.cxx
@@ -11,6 +11,7 @@
 
 #include <test/bootstrapfixture.hxx>
 #include <cppunit/TestAssert.h>
+#include <unotools/fontdefs.hxx>
 
 #include <font/PhysicalFontCollection.hxx>
 #include <font/PhysicalFontFamily.hxx>
diff --git a/vcl/qa/cppunit/skia/skia.cxx b/vcl/qa/cppunit/skia/skia.cxx
index 4d36b0244a7e..655597723201 100644
--- a/vcl/qa/cppunit/skia/skia.cxx
+++ b/vcl/qa/cppunit/skia/skia.cxx
@@ -12,6 +12,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 
 #include <vcl/alpha.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
 
diff --git a/vcl/qa/cppunit/text.cxx b/vcl/qa/cppunit/text.cxx
index 4858d55b61db..81ac84e78450 100644
--- a/vcl/qa/cppunit/text.cxx
+++ b/vcl/qa/cppunit/text.cxx
@@ -17,6 +17,7 @@
 #include <vcl/fntstyle.hxx>
 #include <vcl/glyphitem.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/virdev.hxx>
 
 #include <ImplLayoutArgs.hxx>
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 9e684f26c3f1..2085543fcae1 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -25,6 +25,7 @@
 
 #include <vcl/window.hxx>
 #include <vcl/event.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/help.hxx>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 886baa2756b4..052bbe69d822 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -47,6 +47,7 @@
 #include <treeglue.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <unotools/configmgr.hxx>
+#include <unotools/fontdefs.hxx>
 #include <utility>
 #include <tools/helpers.hxx>
 #include <vcl/abstdlg.hxx>
@@ -63,6 +64,7 @@
 #include <vcl/toolkit/MenuButton.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <slider.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/toolkit/svlbitm.hxx>
 #include <vcl/toolkit/svtabbx.hxx>
diff --git a/vcl/source/control/InterimItemWindow.cxx 
b/vcl/source/control/InterimItemWindow.cxx
index d95e05ce5278..2c92ae0f25a4 100644
--- a/vcl/source/control/InterimItemWindow.cxx
+++ b/vcl/source/control/InterimItemWindow.cxx
@@ -9,6 +9,7 @@
 
 #include <vcl/InterimItemWindow.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/weld.hxx>
 #include <salobj.hxx>
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index cb0ab6c71f37..6d4d17c2223d 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -25,6 +25,7 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/toolkit/dialog.hxx>
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 2e2a0284d4bb..ef83cfafadd2 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -26,6 +26,8 @@
 #include <vcl/builder.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/uitest/uiobject.hxx>
 #include <vcl/vclevent.hxx>
 
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 8bfc04d17b22..b0fb68c55ea3 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -30,6 +30,8 @@
 #include <vcl/menu.hxx>
 #include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/ptrstyle.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/specialchars.hxx>
 #include <vcl/toolkit/edit.hxx>
 #include <vcl/transfer.hxx>
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 96a77b2367f4..5a68fadf07cc 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -22,6 +22,7 @@
 #include <vcl/cvtgrf.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/toolkit/fixed.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index 6760ee2e2583..5a472a573ba1 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -25,6 +25,7 @@
 #include <vcl/help.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/poly.hxx>
 #include <vcl/lineinfo.hxx>
diff --git a/vcl/source/control/imp_listbox.cxx 
b/vcl/source/control/imp_listbox.cxx
index 4bad0adcaa2e..5bb37fe74495 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -19,6 +19,7 @@
 
 #include <memory>
 
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/event.hxx>
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index 58b789d4bc56..281e18a45a6c 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -22,6 +22,8 @@
 #include <vcl/dndlistenercontainer.hxx>
 #include <vcl/event.hxx>
 #include <vcl/toolkit/lstbox.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/uitest/uiobject.hxx>
 #include <sal/log.hxx>
diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx
index f4727b97ad6e..54cf39a5d3df 100644
--- a/vcl/source/control/prgsbar.cxx
+++ b/vcl/source/control/prgsbar.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <vcl/event.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/status.hxx>
 #include <vcl/toolkit/prgsbar.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index d8d0be11c9b9..c4ac0a00f8f2 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -22,6 +22,7 @@
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/timer.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/toolkit/scrbar.hxx>
 #include <vcl/vclevent.hxx>
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 8531067c8769..119ae6d65ba5 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -20,6 +20,7 @@
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <slider.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 
 #include "thumbpos.hxx"
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index f2399cbc288d..a1ec82287ef1 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -18,7 +18,9 @@
  */
 
 #include <vcl/event.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/toolkit/spin.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/vclevent.hxx>
 
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 941ff64f5fef..721cb6aaf510 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -20,7 +20,9 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/toolkit/spinfld.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/uitest/uiobject.hxx>
 #include <sal/log.hxx>
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index bea117d71930..8668ebcdd369 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -25,6 +25,7 @@
 #include <vcl/help.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/notebookbar/notebookbar.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
diff --git a/vcl/source/filter/eps/eps.cxx b/vcl/source/filter/eps/eps.cxx
index e65f27ca5fe1..e2cefd8681d6 100644
--- a/vcl/source/filter/eps/eps.cxx
+++ b/vcl/source/filter/eps/eps.cxx
@@ -28,6 +28,7 @@
 #include <vcl/alpha.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/BitmapReadAccess.hxx>
 #include <vcl/region.hxx>
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 68bddb24e55c..42454314c144 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -33,6 +33,7 @@
 #include <vcl/lineinfo.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <memory>
 
 #define WIN_EMR_POLYGON                     3
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 67bce73e32ac..b695841529bb 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -32,9 +32,11 @@
 #include <tools/tenccvt.hxx>
 #include <tools/fract.hxx>
 #include <tools/stream.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx
index b3e926719b66..9c2e87781ff8 100644
--- a/vcl/source/font/fontcache.cxx
+++ b/vcl/source/font/fontcache.cxx
@@ -27,6 +27,7 @@
 #include <font/LogicalFontInstance.hxx>
 #include <o3tl/test_info.hxx>
 #include <tools/debug.hxx>
+#include <unotools/fontdefs.hxx>
 #include <impfontcache.hxx>
 
 using namespace vcl::font;
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index d2008484f6cc..fded43237d8d 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -24,6 +24,7 @@
 #include <sal/log.hxx>
 #include <tools/stream.hxx>
 #include <unotools/configmgr.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 
diff --git a/vcl/source/gdi/gdimetafiletools.cxx 
b/vcl/source/gdi/gdimetafiletools.cxx
index 540da568062f..b3343911d2a5 100644
--- a/vcl/source/gdi/gdimetafiletools.cxx
+++ b/vcl/source/gdi/gdimetafiletools.cxx
@@ -20,6 +20,7 @@
 #include <vcl/alpha.hxx>
 #include <vcl/gdimetafiletools.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/canvastools.hxx>
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 76b6768ef1a2..0605d23feb34 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -32,6 +32,7 @@
 #include <vcl/BitmapPalette.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/window.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 198da6e106fd..03801668c2d4 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -33,12 +33,14 @@
 #include <vcl/filter/SvmReader.hxx>
 #include <vcl/filter/SvmWriter.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <impgraph.hxx>
 #include <com/sun/star/graphic/XPrimitive2D.hpp>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 5e4bc581549d..2e40fece2934 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -30,6 +30,7 @@
 #include <vcl/filter/SvmWriter.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/graphictools.hxx>
 #include <comphelper/configuration.hxx>
 #include <unotools/fontdefs.hxx>
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 875971e58c52..0c8e6e7bf31c 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -34,6 +34,7 @@
 #include <vcl/print.hxx>
 #include <vcl/printer/Options.hxx>
 #include <vcl/PrinterSupport.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 
 #include <jobset.h>
 #include <print.h>
@@ -50,6 +51,7 @@
 #include <salvd.hxx>
 #include <svdata.hxx>
 
+#include <com/sun/star/awt/DeviceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 4814f5b6a98a..7ffb7893875a 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -33,6 +33,7 @@
 #include <vcl/metaact.hxx>
 #include <vcl/print.hxx>
 #include <vcl/printer/Options.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index c8245a4c4934..31ce1680660c 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -24,6 +24,7 @@
 #include <tools/debug.hxx>
 
 #include <vcl/pdfextoutdevdata.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/virdev.hxx>
 
 #include <ImplOutDevData.hxx>
diff --git a/vcl/source/graphic/GraphicObject.cxx 
b/vcl/source/graphic/GraphicObject.cxx
index c6f669c7ddb1..0d406a864940 100644
--- a/vcl/source/graphic/GraphicObject.cxx
+++ b/vcl/source/graphic/GraphicObject.cxx
@@ -34,6 +34,7 @@
 #include <vcl/GraphicObject.hxx>
 #include <vcl/GraphicLoader.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx 
b/vcl/source/graphic/UnoGraphicProvider.cxx
index 6dc157ea60ae..75551101f5bd 100644
--- a/vcl/source/graphic/UnoGraphicProvider.cxx
+++ b/vcl/source/graphic/UnoGraphicProvider.cxx
@@ -22,6 +22,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/image.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <imagerepository.hxx>
 #include <tools/fract.hxx>
 #include <tools/mapunit.hxx>
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 95f6802a2fe8..1902488df8ee 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -25,6 +25,7 @@
 
 #include <vcl/image.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 8e0415cd9a81..c9b51908680f 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -33,6 +33,8 @@
 #include <vcl/metaact.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/print.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/virdev.hxx>
 
diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx
index 60fb5fc5ad1a..7f0d8870248d 100644
--- a/vcl/source/outdev/gradient.cxx
+++ b/vcl/source/outdev/gradient.cxx
@@ -21,6 +21,7 @@
 
 #include <vcl/gradient.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
diff --git a/vcl/source/outdev/line.cxx b/vcl/source/outdev/line.cxx
index 5ef7a4dbcce2..d2af5f4ef8b7 100644
--- a/vcl/source/outdev/line.cxx
+++ b/vcl/source/outdev/line.cxx
@@ -26,6 +26,7 @@
 
 #include <vcl/lineinfo.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/virdev.hxx>
 
 #include <drawmode.hxx>
diff --git a/vcl/source/outdev/mask.cxx b/vcl/source/outdev/mask.cxx
index cd07b33ae0dd..070929b68695 100644
--- a/vcl/source/outdev/mask.cxx
+++ b/vcl/source/outdev/mask.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/virdev.hxx>
 
 #include <salgdi.hxx>
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 9e60ece1f622..7cc13831015e 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -28,6 +28,8 @@
 #include <tools/lazydelete.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/toolkit/unowrap.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/virdev.hxx>
@@ -38,6 +40,7 @@
 #include <window.h>
 
 #include <com/sun/star/awt/DeviceCapability.hpp>
+#include <com/sun/star/awt/DeviceInfo.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/rendering/CanvasFactory.hpp>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx
index 19c5ff050b39..c21bfef4a606 100644
--- a/vcl/source/outdev/polygon.cxx
+++ b/vcl/source/outdev/polygon.cxx
@@ -21,6 +21,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <tools/poly.hxx>
 
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 
diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx
index 63dafcbb4308..5d14bd0dbc5a 100644
--- a/vcl/source/outdev/polyline.cxx
+++ b/vcl/source/outdev/polyline.cxx
@@ -21,6 +21,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dlinegeometry.hxx>
 
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 
diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx
index 27ad85802e22..15ca8e40e9f3 100644
--- a/vcl/source/outdev/rect.cxx
+++ b/vcl/source/outdev/rect.cxx
@@ -22,6 +22,7 @@
 #include <tools/helpers.hxx>
 
 #include <vcl/metaact.hxx>
+#include <vcl/rendercontext/DrawGridFlags.hxx>
 #include <vcl/virdev.hxx>
 
 #include <salgdi.hxx>
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index c0f202d4a325..65513661208d 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -24,6 +24,7 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <tools/lineend.hxx>
 #include <tools/debug.hxx>
+#include <unotools/fontdefs.hxx>
 #include <comphelper/configuration.hxx>
 
 #include <vcl/ctrl.hxx>
@@ -32,6 +33,7 @@
 #include <vcl/metaact.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/mnemonic.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/textrectinfo.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/sysdata.hxx>
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index dc8af5d042e9..38f0975a8980 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -27,6 +27,7 @@
 #include <tools/lazydelete.hxx>
 #include <vcl/dropcache.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
diff --git a/vcl/source/outdev/transparent.cxx 
b/vcl/source/outdev/transparent.cxx
index b2683510d674..f880bea6ffe4 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -27,7 +27,10 @@
 
 #include <vcl/BitmapTools.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/print.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/source/outdev/wallpaper.cxx b/vcl/source/outdev/wallpaper.cxx
index 186fe90927ee..2b642bb9c2b9 100644
--- a/vcl/source/outdev/wallpaper.cxx
+++ b/vcl/source/outdev/wallpaper.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <vcl/metaact.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/virdev.hxx>
 #include <salgdi.hxx>
 
diff --git a/vcl/source/pdf/pdfextoutdevdata.cxx 
b/vcl/source/pdf/pdfextoutdevdata.cxx
index 66654cd2ec3a..80a21ef49aa9 100644
--- a/vcl/source/pdf/pdfextoutdevdata.cxx
+++ b/vcl/source/pdf/pdfextoutdevdata.cxx
@@ -24,6 +24,7 @@
 #include <vcl/outdev.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/graphic/GraphicMetadata.hxx>
 #include <vcl/pdf/PDFNote.hxx>
diff --git a/vcl/source/pdf/pdfwriter_impl.cxx 
b/vcl/source/pdf/pdfwriter_impl.cxx
index 12b67ab07f7a..65f4ffc42aef 100644
--- a/vcl/source/pdf/pdfwriter_impl.cxx
+++ b/vcl/source/pdf/pdfwriter_impl.cxx
@@ -78,6 +78,7 @@
 #include <vcl/metric.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/pdfread.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/settings.hxx>
 #include <strhelper.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/pdf/pdfwriter_impl2.cxx 
b/vcl/source/pdf/pdfwriter_impl2.cxx
index 53c682f2aba8..a02930141107 100644
--- a/vcl/source/pdf/pdfwriter_impl2.cxx
+++ b/vcl/source/pdf/pdfwriter_impl2.cxx
@@ -21,9 +21,11 @@
 
 #include <vcl/dibtools.hxx>
 #include <vcl/pdfextoutdevdata.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/BitmapReadAccess.hxx>
 #include <vcl/graph.hxx>
 #include <pdf/IPDFEncryptor.hxx>
diff --git a/vcl/source/toolkit/group.cxx b/vcl/source/toolkit/group.cxx
index 1c693de52d81..16e090819354 100644
--- a/vcl/source/toolkit/group.cxx
+++ b/vcl/source/toolkit/group.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/event.hxx>
 #include <vcl/toolkit/group.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/settings.hxx>
 
 #define GROUP_BORDER            12
diff --git a/vcl/source/treelist/headbar.cxx b/vcl/source/treelist/headbar.cxx
index 8b60a6b3c382..eed3867e55f6 100644
--- a/vcl/source/treelist/headbar.cxx
+++ b/vcl/source/treelist/headbar.cxx
@@ -26,6 +26,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <vcl/image.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
diff --git a/vcl/source/treelist/treelistbox.cxx 
b/vcl/source/treelist/treelistbox.cxx
index 8fb39b1140a0..4d9d3b9e0651 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -28,6 +28,7 @@
 #include <vcl/toolkit/treelistbox.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <vcl/help.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/toolkit/edit.hxx>
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 9bb0dfdb8c22..5a3951fb210e 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -26,6 +26,7 @@
 #include <vcl/textrectinfo.hxx>
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/toolkit/floatwin.hxx>
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 1730b969ab8f..e5440f852a3c 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/decoview.hxx>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 81ad62a01023..04ac7e4d0d90 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -55,6 +55,7 @@
 #include <vcl/mnemonic.hxx>
 #include <vcl/toolkit/dialog.hxx>
 #include <vcl/dialoghelper.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 1400d6a047c8..68bd949aaa47 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -45,6 +45,7 @@
 #include <vcl/toolkit/dialog.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/toolkit/scrbar.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/split.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 299d34fceb70..612f34741b3e 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -28,6 +28,7 @@
 #include <comphelper/types.hxx>
 #include <comphelper/lok.hxx>
 #include <vcl/dialoghelper.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/image.hxx>
diff --git a/vcl/source/window/menufloatingwindow.cxx 
b/vcl/source/window/menufloatingwindow.cxx
index 5103018d3e96..cb7b4c3310f1 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -27,6 +27,7 @@
 #include <salframe.hxx>
 #include <svdata.hxx>
 #include <vcl/decoview.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 #include <window.h>
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index e28ba9ea3beb..29485a4e522e 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -35,6 +35,7 @@
 #include <vcl/print.hxx>
 #include <vcl/printer/Options.hxx>
 #include <vcl/PrinterSupport.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 0fb784f57b2e..4b07b384e997 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -25,6 +25,7 @@
 #include <vcl/event.hxx>
 #include <vcl/wall.hxx>
 #include <vcl/help.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/splitwin.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/ptrstyle.hxx>
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index fc8b4944208d..df2642596925 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -23,6 +23,7 @@
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/glyphitemcache.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <vcl/vcllayout.hxx>
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 7fd7f701cab4..6454e2746bfd 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -21,6 +21,7 @@
 #include <vcl/layout.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/bitmap.hxx>
+#include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/toolkit/scrbar.hxx>
 #include <svdata.hxx>
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 0cf0197f1f2f..2d1caa8cbaa8 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -21,6 +21,7 @@
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/toolkit/floatwin.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <vcl/mnemonic.hxx>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 543c888fc0ca..958e72dd75f9 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -29,6 +29,8 @@
 #include <vcl/salgtype.hxx>
 #include <vcl/event.hxx>
 #include <vcl/cursor.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
+#include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/transfer.hxx>
 #include <vcl/vclevent.hxx>
@@ -78,6 +80,7 @@
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
 #include <tools/json_writer.hxx>
+#include <unotools/fontdefs.hxx>
 #include <boost/property_tree/ptree.hpp>
 
 #include <cassert>
diff --git a/vcl/unx/generic/fontmanager/fontsubst.cxx 
b/vcl/unx/generic/fontmanager/fontsubst.cxx
index a5c34a112d78..2b979df0370b 100644
--- a/vcl/unx/generic/fontmanager/fontsubst.cxx
+++ b/vcl/unx/generic/fontmanager/fontsubst.cxx
@@ -23,6 +23,7 @@
 #include <font/PhysicalFontCollection.hxx>
 #include <font/fontsubstitution.hxx>
 #include <unx/fontmanager.hxx>
+#include <unotools/fontdefs.hxx>
 
 // platform specific font substitution hooks
 
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index b6e3bd4838d6..0414a0826f62 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -48,6 +48,7 @@
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/fontcfg.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/metric.hxx>
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 86a9ca99de5c..467f8a52eee0 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -32,6 +32,7 @@
 #include <salhelper/thread.hxx>
 
 #include <comphelper/diagnose_ex.hxx>
+#include <vcl/rendercontext/AntialiasingFlags.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/virdev.hxx>

Reply via email to