[Libreoffice-commits] core.git: basctl/source basegfx/source basegfx/test canvas/source chart2/qa chart2/source cppcanvas/source cui/source dbaccess/source desktop/qa desktop/source drawinglayer/source editeng/source extensions/source filter/source include/basegfx include/IwyuFilter_include.yaml include/tools include/vcl include/xmloff sc/qa sc/source sdext/source sd/source sfx2/source slideshow/source starmath/inc starmath/source svgio/inc svgio/source svl/source svtools/source svx/source sw/source toolkit/source UnoControls/source uui/source vbahelper/source vcl/osx vcl/source vcl/unx vcl/win xmloff/source

[Gabor Kelemen (via logerrit)]

 UnoControls/source/controls/progressmonitor.cxx                    |    1 +
 basctl/source/basicide/baside2.hxx                                 |    1 +
 basegfx/source/color/bcolortools.cxx                               |    1 +
 basegfx/source/polygon/b2dpolypolygontools.cxx                     |    1 +
 basegfx/source/polygon/b3dpolygon.cxx                              |    1 +
 basegfx/source/polygon/b3dpolygontools.cxx                         |    1 +
 basegfx/source/range/b2drangeclipper.cxx                           |    1 +
 basegfx/test/boxclipper.cxx                                        |    1 +
 canvas/source/cairo/cairo_canvashelper_text.cxx                    |    1 +
 canvas/source/directx/dx_textlayout_drawhelper.cxx                 |    1 +
 canvas/source/opengl/ogl_canvashelper.cxx                          |    1 +
 canvas/source/vcl/spritecanvashelper.cxx                           |    1 +
 chart2/qa/extras/chart2dump/chart2dump.cxx                         |    1 +
 chart2/qa/extras/charttest.hxx                                     |    1 +
 chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |    1 +
 chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx |    1 +
 chart2/source/tools/ExplicitCategoriesProvider.cxx                 |    1 +
 chart2/source/tools/ThreeDHelper.cxx                               |    1 +
 chart2/source/view/axes/Tickmarks.cxx                              |    1 -
 chart2/source/view/main/ChartView.cxx                              |    1 +
 chart2/source/view/main/VLegend.cxx                                |    1 +
 cppcanvas/source/mtfrenderer/implrenderer.cxx                      |    1 +
 cppcanvas/source/mtfrenderer/mtftools.cxx                          |    1 +
 cui/source/customize/cfg.cxx                                       |    1 +
 cui/source/dialogs/FontFeaturesDialog.cxx                          |    1 +
 cui/source/dialogs/SpellDialog.cxx                                 |    1 +
 cui/source/options/optaboutconfig.cxx                              |    1 +
 dbaccess/source/filter/xml/xmlServerDatabase.cxx                   |    1 +
 desktop/qa/desktop_lib/test_desktop_lib.cxx                        |    1 +
 desktop/source/deployment/gui/dp_gui_dialog2.cxx                   |    1 +
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx                |    1 +
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx       |    1 +
 desktop/source/splash/splash.cxx                                   |    1 +
 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx          |    1 +
 drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx       |    1 +
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx         |    1 +
 editeng/source/accessibility/AccessibleStaticTextBase.cxx          |    1 +
 editeng/source/editeng/eehtml.hxx                                  |    1 +
 editeng/source/items/frmitems.cxx                                  |    1 +
 editeng/source/items/numitem.cxx                                   |    1 +
 editeng/source/items/textitem.cxx                                  |    1 +
 extensions/source/propctrlr/selectlabeldialog.cxx                  |    1 +
 filter/source/msfilter/msdffimp.cxx                                |    1 +
 include/IwyuFilter_include.yaml                                    |    3 +++
 include/basegfx/numeric/ftools.hxx                                 |    6 ++++--
 include/basegfx/tuple/b2dtuple.hxx                                 |    4 ++--
 include/basegfx/tuple/b3dtuple.hxx                                 |    6 +++---
 include/tools/color.hxx                                            |    1 +
 include/vcl/edit.hxx                                               |    1 +
 include/xmloff/XMLBase64ImportContext.hxx                          |    1 +
 sc/qa/unit/ucalc_sort.cxx                                          |    1 +
 sc/source/core/data/dpobject.cxx                                   |    1 +
 sc/source/filter/excel/xlchart.cxx                                 |    1 +
 sc/source/filter/xml/xmlbodyi.cxx                                  |    1 +
 sc/source/ui/cctrl/checklistmenu.cxx                               |    1 +
 sc/source/ui/vba/vbaformat.cxx                                     |    1 +
 sd/source/core/sdpage2.cxx                                         |    1 +
 sd/source/filter/html/htmlex.hxx                                   |    1 +
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx          |    1 +
 sd/source/ui/framework/configuration/Configuration.cxx             |    1 +
 sd/source/ui/framework/tools/FrameworkHelper.cxx                   |    1 +
 sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx     |    1 +
 sd/source/ui/view/drviewsh.cxx                                     |    1 +
 sdext/source/pdfimport/misc/pdfihelper.cxx                         |    1 +
 sdext/source/pdfimport/tree/drawtreevisiting.cxx                   |    1 +
 sfx2/source/control/dispatch.cxx                                   |    1 +
 sfx2/source/control/emojicontrol.cxx                               |    1 +
 sfx2/source/control/emojiviewitem.cxx                              |    1 +
 sfx2/source/control/unoctitm.cxx                                   |    1 +
 sfx2/source/dialog/passwd.cxx                                      |    1 +
 sfx2/source/dialog/splitwin.cxx                                    |    1 +
 sfx2/source/view/lokhelper.cxx                                     |    2 ++
 slideshow/source/engine/color.cxx                                  |    1 +
 starmath/inc/node.hxx                                              |    1 +
 starmath/source/node.cxx                                           |    1 +
 starmath/source/visitors.cxx                                       |    1 +
 svgio/inc/svgtools.hxx                                             |    1 +
 svgio/source/svgreader/svgtools.cxx                                |    1 +
 svl/source/numbers/zforlist.cxx                                    |    1 +
 svtools/source/control/ctrlbox.cxx                                 |    1 +
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx            |    1 +
 svx/source/dialog/ClassificationCommon.cxx                         |    1 +
 svx/source/dialog/framelink.cxx                                    |    1 +
 svx/source/dialog/svxruler.cxx                                     |    1 +
 svx/source/engine3d/cube3d.cxx                                     |    1 +
 svx/source/engine3d/extrud3d.cxx                                   |    1 +
 svx/source/engine3d/lathe3d.cxx                                    |    1 +
 svx/source/engine3d/obj3d.cxx                                      |    1 +
 svx/source/engine3d/scene3d.cxx                                    |    1 +
 svx/source/engine3d/sphere3d.cxx                                   |    1 +
 svx/source/sidebar/glow/GlowPropertyPanel.cxx                      |    1 +
 svx/source/svdraw/svdmodel.cxx                                     |    1 +
 svx/source/svdraw/svdmrkv.cxx                                      |    1 +
 svx/source/svdraw/svdoashp.cxx                                     |    1 +
 svx/source/svdraw/svdobj.cxx                                       |    1 +
 svx/source/svdraw/svdocapt.cxx                                     |    1 +
 svx/source/svdraw/svdocirc.cxx                                     |    1 +
 svx/source/svdraw/svdoedge.cxx                                     |    1 +
 svx/source/svdraw/svdograf.cxx                                     |    1 +
 svx/source/svdraw/svdogrp.cxx                                      |    1 +
 svx/source/svdraw/svdomeas.cxx                                     |    1 +
 svx/source/svdraw/svdomedia.cxx                                    |    1 +
 svx/source/svdraw/svdoole2.cxx                                     |    1 +
 svx/source/svdraw/svdopage.cxx                                     |    1 +
 svx/source/svdraw/svdopath.cxx                                     |    1 +
 svx/source/svdraw/svdorect.cxx                                     |    1 +
 svx/source/svdraw/svdouno.cxx                                      |    1 +
 svx/source/svdraw/svdovirt.cxx                                     |    2 +-
 svx/source/svdraw/svdtrans.cxx                                     |    1 +
 svx/source/table/svdotable.cxx                                     |    1 +
 svx/source/toolbars/extrusionbar.cxx                               |    1 +
 svx/source/xoutdev/xtabgrdt.cxx                                    |    1 +
 svx/source/xoutdev/xtabhtch.cxx                                    |    1 +
 svx/source/xoutdev/xtabptrn.cxx                                    |    1 +
 sw/source/core/crsr/findtxt.cxx                                    |    1 +
 sw/source/core/crsr/pam.cxx                                        |    1 +
 sw/source/core/doc/DocumentOutlineNodesManager.cxx                 |    1 +
 sw/source/core/doc/doccomp.cxx                                     |    1 +
 sw/source/core/doc/number.cxx                                      |    1 +
 sw/source/core/fields/ddefld.cxx                                   |    1 +
 sw/source/core/layout/dbg_lay.cxx                                  |    1 +
 sw/source/core/tox/ToxTextGenerator.cxx                            |    1 +
 sw/source/core/txtnode/atrftn.cxx                                  |    1 +
 sw/source/core/undo/undel.cxx                                      |    1 +
 sw/source/filter/html/htmlforw.cxx                                 |    1 +
 sw/source/filter/html/swhtml.hxx                                   |    1 +
 sw/source/ui/chrdlg/drpcps.cxx                                     |    1 +
 sw/source/ui/dialog/wordcountdialog.cxx                            |    1 +
 sw/source/ui/index/swuiidxmrk.cxx                                  |    1 +
 sw/source/ui/misc/bookmark.cxx                                     |    1 +
 sw/source/uibase/app/docstyle.cxx                                  |    1 +
 sw/source/uibase/config/modcfg.cxx                                 |    1 +
 sw/source/uibase/config/usrpref.cxx                                |    1 +
 sw/source/uibase/dbui/mmconfigitem.cxx                             |    1 +
 sw/source/uibase/envelp/envimg.cxx                                 |    1 +
 sw/source/uibase/shells/drwtxtsh.cxx                               |    1 +
 sw/source/uibase/uiview/pview.cxx                                  |    1 +
 sw/source/uibase/wrtsh/wrtundo.cxx                                 |    1 +
 toolkit/source/awt/vclxprinter.cxx                                 |    1 +
 toolkit/source/awt/vclxwindow.cxx                                  |    1 +
 uui/source/iahndl-authentication.cxx                               |    1 +
 uui/source/iahndl-errorhandler.cxx                                 |    1 +
 uui/source/iahndl.cxx                                              |    1 +
 uui/source/secmacrowarnings.cxx                                    |    1 +
 vbahelper/source/vbahelper/vbahelper.cxx                           |    1 +
 vcl/osx/printaccessoryview.mm                                      |    1 +
 vcl/source/app/svapp.cxx                                           |    1 +
 vcl/source/edit/textdoc.cxx                                        |    1 +
 vcl/source/gdi/bitmapex.cxx                                        |    1 +
 vcl/source/gdi/mtfxmldump.cxx                                      |    1 +
 vcl/source/graphic/GraphicID.cxx                                   |    1 +
 vcl/source/outdev/bitmap.cxx                                       |    1 +
 vcl/source/outdev/font.cxx                                         |    1 +
 vcl/source/outdev/text.cxx                                         |    1 +
 vcl/source/outdev/transparent.cxx                                  |    1 +
 vcl/source/treelist/headbar.cxx                                    |    1 +
 vcl/source/treelist/svtabbx.cxx                                    |    1 +
 vcl/source/window/menu.cxx                                         |    1 +
 vcl/source/window/printdlg.cxx                                     |    1 +
 vcl/unx/generic/dtrans/X11_selection.cxx                           |    1 +
 vcl/unx/generic/print/genprnpsp.cxx                                |    1 +
 vcl/unx/generic/printer/cupsmgr.cxx                                |    1 +
 vcl/unx/gtk3/gtk3salprn-gtk.cxx                                    |    1 +
 vcl/win/app/salinst.cxx                                            |    1 +
 xmloff/source/chart/SchXMLAxisContext.cxx                          |    1 +
 xmloff/source/chart/SchXMLPlotAreaContext.hxx                      |    1 +
 xmloff/source/meta/xmlmetai.cxx                                    |    1 +
 xmloff/source/style/xmlnumfi.cxx                                   |    1 +
 xmloff/source/transform/StyleOOoTContext.cxx                       |    1 +
 169 files changed, 177 insertions(+), 9 deletions(-)

New commits:
commit e12fa18c69cbe1f441e972f3519d33638f15658e
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Sun Apr 19 20:36:58 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Apr 22 15:36:50 2020 +0200

    tdf#42949 Simplify use of rtl::math::approxEqual in include/basegfx/
    
    Turns out we can save about 500Mb of preprocessor input if we use
    rtl_math_approxEqual from rtl/math.h instead of its C++ wrapper
    rtl::math::approxEqual from rtl/math.hxx
    
    and manage the fallout accordingly.
    
    Before:
    bin/includebloat.awk | head
    sum total bytes included (excluding system headers): 19017296671
    
    After:
    $ bin/includebloat.awk | head
    sum total bytes included (excluding system headers): 18535432672
    
    Change-Id: I1691171f3a309405a7099882ad9989d147f59118
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92508
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index 0f5048722806..78278250942d 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <algorithm>
 
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 342397cd66a2..97d175368bea 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -32,6 +32,7 @@
 
 #include <svtools/colorcfg.hxx>
 #include <o3tl/enumarray.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <set>
 
diff --git a/basegfx/source/color/bcolortools.cxx b/basegfx/source/color/bcolortools.cxx
index 0ff808bc8367..727b9c781774 100644
--- a/basegfx/source/color/bcolortools.cxx
+++ b/basegfx/source/color/bcolortools.cxx
@@ -20,6 +20,7 @@
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/color/bcolortools.hxx>
+#include <rtl/math.hxx>
 
 namespace basegfx::utils
 {
diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx
index b763aef823c2..74cdf23241d3 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.cxx
@@ -24,6 +24,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/numeric/ftools.hxx>
+#include <rtl/math.hxx>
 
 #include <algorithm>
 #include <numeric>
diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx
index e3aa78d9bf3f..9be2f882c526 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -24,6 +24,7 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <rtl/math.hxx>
 #include <vector>
 #include <algorithm>
 
diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx
index a0349a156626..bf982f9c3e22 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.cxx
@@ -25,6 +25,7 @@
 #include <basegfx/range/b3drange.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/tuple/b3ituple.hxx>
+#include <rtl/math.hxx>
 #include <numeric>
 
 namespace basegfx::utils
diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx
index 3fe16599c290..9cf24d53428c 100644
--- a/basegfx/source/range/b2drangeclipper.cxx
+++ b/basegfx/source/range/b2drangeclipper.cxx
@@ -24,6 +24,7 @@
 #include <basegfx/range/b2drangeclipper.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/range/b2drectangle.hxx>
+#include <rtl/math.hxx>
 
 #include <o3tl/vector_pool.hxx>
 
diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx
index d7c7c094b962..47d3584df06e 100644
--- a/basegfx/test/boxclipper.cxx
+++ b/basegfx/test/boxclipper.cxx
@@ -29,6 +29,7 @@
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <comphelper/random.hxx>
+#include <rtl/math.hxx>
 
 #include "boxclipper.hxx"
 
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index e86d6aadc132..fc0d70947b26 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -21,6 +21,7 @@
 
 #include <com/sun/star/rendering/TextDirection.hpp>
 
+#include <rtl/math.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/canvastools.hxx>
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index 71c4c7e3a904..ea628079e7ff 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/rendering/XCanvasFont.hpp>
 #include <comphelper/scopeguard.hxx>
 #include <i18nlangtag/languagetag.hxx>
+#include <rtl/math.hxx>
 #include <tools/color.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/poly.hxx>
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx
index 4095650791e9..6dcf933f0723 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -19,6 +19,7 @@
 #include <basegfx/utils/canvastools.hxx>
 #include <com/sun/star/rendering/CompositeOperation.hpp>
 #include <rtl/crc.h>
+#include <rtl/math.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/font.hxx>
 #include <vcl/metric.hxx>
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index d7fe7d37be0a..552bf2c6c514 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -23,6 +23,7 @@
 #include <boost/cast.hpp>
 
 #include <basegfx/range/b2drectangle.hxx>
+#include <rtl/math.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/canvastools.hxx>
 #include <vcl/outdev.hxx>
diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx
index 50f4610e84af..680744bab5a1 100644
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -20,6 +20,7 @@
 #include <editeng/unoprnms.hxx>
 #include <test/xmltesttools.hxx>
 #include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <fstream>
 
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 60a526be0b8a..89c91ae3905f 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/frame/XStorable.hpp>
 
 #include <unotools/tempfile.hxx>
+#include <rtl/math.hxx>
 
 #include <com/sun/star/chart2/XAnyDescriptionAccess.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 38a1f4292a67..a931151e1c2c 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -48,6 +48,7 @@
 #include <tools/diagnose_ex.h>
 #include <vcl/graph.hxx>
 #include <oox/helper/containerhelper.hxx>
+#include <rtl/math.hxx>
 
 #include <svx/tabline.hxx>
 
diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
index eec17e7adb89..21ac2411bf0c 100644
--- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
@@ -36,6 +36,7 @@
 #include <svx/tabline.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/graph.hxx>
+#include <rtl/math.hxx>
 
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index e75fe8376a40..c0b232240710 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -29,6 +29,7 @@
 
 #include <com/sun/star/chart2/AxisType.hpp>
 #include <o3tl/safeint.hxx>
+#include <rtl/math.hxx>
 #include <tools/diagnose_ex.h>
 
 namespace chart
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index fd45dc44e257..fe788397d40d 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/drawing/ShadeMode.hpp>
 #include <tools/diagnose_ex.h>
 #include <tools/helpers.hxx>
+#include <rtl/math.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx
index e1dc3953bd11..8332f01ff9a2 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/chart2/AxisType.hpp>
 
 using namespace ::com::sun::star;
-using namespace ::rtl::math;
 using ::basegfx::B2DVector;
 
 namespace chart {
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index c9fa8ebd4d30..f33f696a898d 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -54,6 +54,7 @@
 #include <comphelper/scopeguard.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <rtl/math.hxx>
 #include <unotools/streamwrap.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/unopage.hxx>
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index d7928b08e756..facfe388fa42 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/chart2/XFormattedString2.hpp>
 #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp>
 #include <com/sun/star/chart2/data/PivotTableFieldEntry.hpp>
+#include <rtl/math.hxx>
 #include <svl/languageoptions.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index c856a237f8bc..77554ef40fb7 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -44,6 +44,7 @@
 #include <basegfx/tuple/b2dtuple.hxx>
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
 #include <canvas/canvastools.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx
index f043162ee9f2..c5d36eb00652 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.cxx
@@ -26,6 +26,7 @@
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <canvas/canvastools.hxx>
+#include <rtl/math.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/metric.hxx>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index cc1c210819c9..d5b09321c096 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -39,6 +39,7 @@
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <svl/stritem.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx
index 20ac4b67e3c8..a34912d5d0f2 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -9,6 +9,7 @@
  */
 
 #include <FontFeaturesDialog.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <vcl/font/FeatureParser.hxx>
 #include <vcl/virdev.hxx>
 #include <svtools/colorcfg.hxx>
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index cfa05034727e..388856498f5d 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 #include <sfx2/app.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <vcl/specialchars.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index f5afdca178dd..799f31c38962 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/util/SearchAlgorithms2.hpp>
+#include <rtl/ustrbuf.hxx>
 #include <unotools/textsearch.hxx>
 #include <vcl/event.hxx>
 #include <sal/log.hxx>
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
index 8c77f9591352..ad5d51c21aa3 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
@@ -21,6 +21,7 @@
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <strings.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
 
 namespace dbaxml
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index c243b75a25f8..ce0a55d2acf8 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -25,6 +25,7 @@
 #include <vcl/syswin.hxx>
 #include <vcl/window.hxx>
 #include <comphelper/processfactory.hxx>
+#include <rtl/math.hxx>
 #include <rtl/uri.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/lokhelper.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index b2f4d0c48c68..a345a87d22a9 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -39,6 +39,7 @@
 
 #include <osl/mutex.hxx>
 #include <sal/log.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <svtools/restartdialog.hxx>
 
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 3e0ca1a7ab9c..e42b6e41c172 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -36,6 +36,7 @@
 #include <cppuhelper/weakref.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <osl/diagnose.h>
+#include <rtl/ustrbuf.hxx>
 #include <vcl/event.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <vcl/svapp.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 8db0ece84be2..0ebfa19694ab 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -46,6 +46,7 @@
 #include <dp_misc.h>
 #include "dp_gui_extensioncmdqueue.hxx"
 #include <ucbhelper/content.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <rtl/ref.hxx>
 #include <salhelper/thread.hxx>
 #include <com/sun/star/uno/Sequence.h>
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index bb90234881f7..b42ffe11b347 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -31,6 +31,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/strbuf.hxx>
+#include <rtl/math.hxx>
 #include <vcl/introwin.hxx>
 #include <vcl/virdev.hxx>
 
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 32c95fb02a66..a5c2a51bc44e 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -23,6 +23,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx>
+#include <rtl/math.hxx>
 
 #include <algorithm>
 
diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
index a2707cc3ca96..23b0c5ffe40c 100644
--- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
@@ -26,6 +26,7 @@
 #include <drawinglayer/attribute/lineattribute.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
+#include <rtl/ustrbuf.hxx>
 
 
 namespace drawinglayer::primitive2d
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index e3e03e6a7f69..b3c0d773fbff 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -19,6 +19,7 @@
 
 #include <memory>
 #include "vclmetafileprocessor2d.hxx"
+#include <rtl/math.hxx>
 #include <tools/gen.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/virdev.hxx>
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 37aaf2b80459..1abfd2c40de5 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -25,6 +25,7 @@
 #include <memory>
 #include <vector>
 #include <algorithm>
+#include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx
index 8a7394d25e59..a2aa0e0448af 100644
--- a/editeng/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -21,6 +21,7 @@
 
 #include <memory>
 #include <editdoc.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <svtools/parhtml.hxx>
 
 class EditEngine;
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 9f8764454f7c..8c0a44be5911 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -42,6 +42,7 @@
 #include <vcl/GraphicObject.hxx>
 #include <tools/urlobj.hxx>
 #include <svl/memberid.h>
+#include <rtl/math.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/mapunit.hxx>
 #include <vcl/graphicfilter.hxx>
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 7f76e830ff25..82d511b00715 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -25,6 +25,7 @@
 
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <editeng/brushitem.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <vcl/font.hxx>
 #include <vcl/settings.hxx>
 #include <editeng/editids.hrc>
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index b24500387a61..2e2cf4fe7604 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -35,6 +35,7 @@
 #include <editeng/editrids.hrc>
 #include <tools/mapunit.hxx>
 
+#include <rtl/math.hxx>
 #include <rtl/ustring.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <svl/itemset.hxx>
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index b82677eb039c..3ff66c82ba97 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -33,6 +33,7 @@
 #include <comphelper/types.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
+#include <rtl/ustrbuf.hxx>
 
 
 namespace pcr
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 6c244b25160d..dc3ddb76b5c7 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -29,6 +29,7 @@
 #include <osl/file.hxx>
 #include <tools/solar.h>
 #include <sal/log.hxx>
+#include <rtl/math.hxx>
 
 #include <comphelper/classids.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index d2a5838c2b7e..6ed80bd73cf8 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -216,6 +216,9 @@ blacklist:
     include/sot/exchange.hxx:
     # Used in a macro #define
     - com/sun/star/datatransfer/dnd/DNDConstants.hpp
+    include/tools/color.hxx:
+    # OSL_BIGENDIAN is being checked
+    - osl/endian.h
     include/tools/debug.hxx:
     # Used behind #ifndef
     - tools/toolsdllapi.h
diff --git a/include/basegfx/numeric/ftools.hxx b/include/basegfx/numeric/ftools.hxx
index a272cb76b22c..78f4eb1e722f 100644
--- a/include/basegfx/numeric/ftools.hxx
+++ b/include/basegfx/numeric/ftools.hxx
@@ -19,7 +19,9 @@
 
 #pragma once
 
-#include <rtl/math.hxx>
+#include <rtl/math.h>
+#include <cmath>
+#include <math.h>
 #include <basegfx/basegfxdllapi.h>
 #include <limits>
 #include <algorithm>
@@ -194,7 +196,7 @@ namespace basegfx
         static bool equal(const double& rfValA, const double& rfValB)
         {
             // changed to approxEqual usage for better numerical correctness
-            return rtl::math::approxEqual(rfValA, rfValB);
+            return rtl_math_approxEqual(rfValA, rfValB);
         }
 
         static bool equal(const double& rfValA, const double& rfValB, const double& rfSmallValue)
diff --git a/include/basegfx/tuple/b2dtuple.hxx b/include/basegfx/tuple/b2dtuple.hxx
index d26310de9975..efe44f5863f3 100644
--- a/include/basegfx/tuple/b2dtuple.hxx
+++ b/include/basegfx/tuple/b2dtuple.hxx
@@ -229,8 +229,8 @@ namespace basegfx
     inline B2DTuple average(const B2DTuple& rOld1, const B2DTuple& rOld2)
     {
         return B2DTuple(
-            rtl::math::approxEqual(rOld1.getX(), rOld2.getX()) ? rOld1.getX() : (rOld1.getX() + rOld2.getX()) * 0.5,
-            rtl::math::approxEqual(rOld1.getY(), rOld2.getY()) ? rOld1.getY() : (rOld1.getY() + rOld2.getY()) * 0.5);
+            rtl_math_approxEqual(rOld1.getX(), rOld2.getX()) ? rOld1.getX() : (rOld1.getX() + rOld2.getX()) * 0.5,
+            rtl_math_approxEqual(rOld1.getY(), rOld2.getY()) ? rOld1.getY() : (rOld1.getY() + rOld2.getY()) * 0.5);
     }
 
     inline B2DTuple operator+(const B2DTuple& rTupA, const B2DTuple& rTupB)
diff --git a/include/basegfx/tuple/b3dtuple.hxx b/include/basegfx/tuple/b3dtuple.hxx
index 9237517beb0f..08f46c0cdbfb 100644
--- a/include/basegfx/tuple/b3dtuple.hxx
+++ b/include/basegfx/tuple/b3dtuple.hxx
@@ -286,9 +286,9 @@ namespace basegfx
     inline B3DTuple average(const B3DTuple& rOld1, const B3DTuple& rOld2)
     {
         return B3DTuple(
-            rtl::math::approxEqual(rOld1.getX(), rOld2.getX()) ? rOld1.getX() : (rOld1.getX() + rOld2.getX()) * 0.5,
-            rtl::math::approxEqual(rOld1.getY(), rOld2.getY()) ? rOld1.getY() : (rOld1.getY() + rOld2.getY()) * 0.5,
-            rtl::math::approxEqual(rOld1.getZ(), rOld2.getZ()) ? rOld1.getZ() : (rOld1.getZ() + rOld2.getZ()) * 0.5);
+            rtl_math_approxEqual(rOld1.getX(), rOld2.getX()) ? rOld1.getX() : (rOld1.getX() + rOld2.getX()) * 0.5,
+            rtl_math_approxEqual(rOld1.getY(), rOld2.getY()) ? rOld1.getY() : (rOld1.getY() + rOld2.getY()) * 0.5,
+            rtl_math_approxEqual(rOld1.getZ(), rOld2.getZ()) ? rOld1.getZ() : (rOld1.getZ() + rOld2.getZ()) * 0.5);
     }
 
     inline B3DTuple operator+(const B3DTuple& rTupA, const B3DTuple& rTupB)
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index b5555c4cfccd..f66d49b51442 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -23,6 +23,7 @@
 #include <tools/toolsdllapi.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <basegfx/color/bcolor.hxx>
+#include <osl/endian.h>
 
 namespace color
 {
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 1f59b7382a77..66304d33f74e 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -25,6 +25,7 @@
 
 #include <memory>
 
+#include <rtl/ustrbuf.hxx>
 #include <o3tl/deleter.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
diff --git a/include/xmloff/XMLBase64ImportContext.hxx b/include/xmloff/XMLBase64ImportContext.hxx
index 8169b64281eb..9ec437ea0784 100644
--- a/include/xmloff/XMLBase64ImportContext.hxx
+++ b/include/xmloff/XMLBase64ImportContext.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_XMLOFF_XMLBASE64IMPORTCONTEXT_HXX
 
 #include <sal/config.h>
+#include <rtl/ustrbuf.hxx>
 #include <xmloff/dllapi.h>
 #include <xmloff/xmlictxt.hxx>
 
diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx
index b611924da5b6..4dc3897421fc 100644
--- a/sc/qa/unit/ucalc_sort.cxx
+++ b/sc/qa/unit/ucalc_sort.cxx
@@ -32,6 +32,7 @@
 #include <editeng/editobj.hxx>
 #include <svx/svdocirc.hxx>
 #include <svx/svdpage.hxx>
+#include <rtl/math.hxx>
 
 void Test::testSort()
 {
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 8c32b58d16e3..f23a040325fc 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -69,6 +69,7 @@
 #include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
 #include <sal/macros.h>
+#include <rtl/math.hxx>
 #include <tools/diagnose_ex.h>
 #include <svl/zforlist.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index 75e37d8ff256..8d271665ce82 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/chart2/Symbol.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
+#include <rtl/math.hxx>
 #include <sal/macros.h>
 #include <svl/itemset.hxx>
 #include <svx/xfillit0.hxx>
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index 36d9b85472a6..da459b48a19a 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -49,6 +49,7 @@
 #include <comphelper/servicehelper.hxx>
 #include <sal/types.h>
 #include <sal/log.hxx>
+#include <rtl/math.hxx>
 
 #include <memory>
 
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 927674911384..f892851a087c 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -26,6 +26,7 @@
 #include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
+#include <rtl/math.hxx>
 #include <tools/wintypes.hxx>
 #include <unotools/charclass.hxx>
 
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 6f65b444df3c..46e29a8229b8 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/frame/XModel.hpp>
 
 #include <basic/sberrors.hxx>
+#include <rtl/math.hxx>
 
 #include "excelvbahelper.hxx"
 #include "vbaborders.hxx"
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 9b79f54a9c31..d5e23641ae1a 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/text/XTextCopy.hpp>
 #include <tools/debug.hxx>
 #include <svx/svddef.hxx>
+#include <rtl/math.hxx>
 
 #include <Annotation.hxx>
 #include <notifydocumentevent.hxx>
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index c81a528a0c66..f49dde487f39 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SD_SOURCE_FILTER_HTML_HTMLEX_HXX
 
 #include <resltn.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <tools/color.hxx>
 #include <tools/solar.h>
 #include <vcl/errinf.hxx>
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 43420abcbb2b..540a4db23fea 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <rtl/ustrbuf.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index 138d7883078b..05f5d924b9c1 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.hpp>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 9a1ab0b05090..d969d60a1465 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/frame/XController.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <svl/lstner.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <sfx2/request.hxx>
 
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index a1a94040ea15..ca059ec8d98d 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -31,6 +31,7 @@
 #include <Window.hxx>
 
 #include <o3tl/safeint.hxx>
+#include <rtl/math.hxx>
 #include <vcl/virdev.hxx>
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx
index 5b714de73837..f6e92706993d 100644
--- a/sd/source/ui/view/drviewsh.cxx
+++ b/sd/source/ui/view/drviewsh.cxx
@@ -20,6 +20,7 @@
 #include <DrawViewShell.hxx>
 
 #include <sal/log.hxx>
+#include <rtl/math.hxx>
 #include <comphelper/lok.hxx>
 
 #include <DrawDocShell.hxx>
diff --git a/sdext/source/pdfimport/misc/pdfihelper.cxx b/sdext/source/pdfimport/misc/pdfihelper.cxx
index 3c6c85538158..bd29d406b1be 100644
--- a/sdext/source/pdfimport/misc/pdfihelper.cxx
+++ b/sdext/source/pdfimport/misc/pdfihelper.cxx
@@ -22,6 +22,7 @@
 
 #include <rtl/ustrbuf.hxx>
 #include <basegfx/numeric/ftools.hxx>
+#include <rtl/math.hxx>
 
 #include <math.h>
 
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 4ff3c2ad7dab..61e3905d20ca 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -28,6 +28,7 @@
 
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <osl/diagnose.h>
+#include <rtl/math.hxx>
 #include <com/sun/star/i18n/BreakIterator.hpp>
 #include <com/sun/star/i18n/CharacterClassification.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 9b1d83891fae..48874f59ac7e 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -39,6 +39,7 @@
 #include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
+#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sfx2/source/control/emojicontrol.cxx b/sfx2/source/control/emojicontrol.cxx
index 2baf021d37bf..b2961c35df25 100644
--- a/sfx2/source/control/emojicontrol.cxx
+++ b/sfx2/source/control/emojicontrol.cxx
@@ -21,6 +21,7 @@
 #include <sfx2/emojipopup.hxx>
 #include <emojiview.hxx>
 #include <thumbnailviewitem.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <vcl/tabpage.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/dispatchcommand.hxx>
diff --git a/sfx2/source/control/emojiviewitem.cxx b/sfx2/source/control/emojiviewitem.cxx
index e7c772dc421d..4ee1a55e4592 100644
--- a/sfx2/source/control/emojiviewitem.cxx
+++ b/sfx2/source/control/emojiviewitem.cxx
@@ -14,6 +14,7 @@
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <com/sun/star/lang/Locale.hpp>
+#include <rtl/ustrbuf.hxx>
 #include <tools/poly.hxx>
 
 using namespace basegfx;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 9d4bc6612be0..a95ae4f49ed5 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -19,6 +19,7 @@
 
 #include <config_java.h>
 
+#include <rtl/strbuf.hxx>
 #include <tools/debug.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 3cd59d8cb254..efc108278c09 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -20,6 +20,7 @@
 #include <sfx2/passwd.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/strings.hrc>
+#include <rtl/ustrbuf.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index cd4be8687acb..2c29307b1f49 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -22,6 +22,7 @@
 #endif
 
 #include <unotools/viewoptions.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 56f7d7f4bc32..e70b511c2cbd 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -12,6 +12,8 @@
 #include <com/sun/star/frame/Desktop.hpp>
 
 #include <comphelper/processfactory.hxx>
+#include <rtl/strbuf.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <vcl/lok.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/commandevent.hxx>
diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx
index 4ae8b17ca6fb..1109d4e68b2b 100644
--- a/slideshow/source/engine/color.cxx
+++ b/slideshow/source/engine/color.cxx
@@ -22,6 +22,7 @@
 #include <rgbcolor.hxx>
 
 #include <basegfx/numeric/ftools.hxx>
+#include <rtl/math.hxx>
 
 #include <cmath>
 #include <algorithm>
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 493f732529d2..1e301369c592 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -26,6 +26,7 @@
 #include "format.hxx"
 
 #include <o3tl/typed_flags_set.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <cassert>
 #include <vector>
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 1ab81d10d0e4..6238416a6bda 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -35,6 +35,7 @@
 #include <vcl/outdev.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
+#include <rtl/math.hxx>
 
 #include <cassert>
 #include <math.h>
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx
index a88375a831b1..5362551fe5f8 100644
--- a/starmath/source/visitors.cxx
+++ b/starmath/source/visitors.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <rtl/math.hxx>
 #include <sal/log.hxx>
 #include <tools/gen.hxx>
 #include <vcl/lineinfo.hxx>
diff --git a/svgio/inc/svgtools.hxx b/svgio/inc/svgtools.hxx
index 2f701ea30ba4..215ea6e8742f 100644
--- a/svgio/inc/svgtools.hxx
+++ b/svgio/inc/svgtools.hxx
@@ -23,6 +23,7 @@
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/vector/b2ivector.hxx>
+#include <rtl/ustrbuf.hxx>
 #include "svgpaint.hxx"
 #include <vector>
 
diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx
index 580ec0429313..0c628511ddbd 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -21,6 +21,7 @@
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/color.hxx>
+#include <rtl/math.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <svgtoken.hxx>
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 4edf0692a41e..4fd3464e6d23 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -51,6 +51,7 @@
 #include <unotools/digitgroupingiterator.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/strbuf.hxx>
+#include <rtl/math.hxx>
 
 #include <math.h>
 #include <limits>
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index d1b9943dfd2c..78be607b51fc 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -29,6 +29,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/image.hxx>
 #include <vcl/virdev.hxx>
+#include <rtl/math.hxx>
 #include <sal/macros.h>
 #include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 7cdafddd4929..cddb4571e93a 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -48,6 +48,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <sal/log.hxx>
+#include <rtl/math.hxx>
 
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
diff --git a/svx/source/dialog/ClassificationCommon.cxx b/svx/source/dialog/ClassificationCommon.cxx
index d34b3a501c53..d5561ec5b32c 100644
--- a/svx/source/dialog/ClassificationCommon.cxx
+++ b/svx/source/dialog/ClassificationCommon.cxx
@@ -10,6 +10,7 @@
 
 #include <svx/ClassificationCommon.hxx>
 #include <svx/ClassificationField.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 286113e01dfb..62d60094b1e2 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <rtl/math.hxx>
 #include <svx/framelink.hxx>
 
 #include <editeng/borderline.hxx>
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 3a0e28473148..32a6b3d9576e 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -41,6 +41,7 @@
 #include <editeng/lrspitem.hxx>
 #include <editeng/protitem.hxx>
 #include <osl/diagnose.h>
+#include <rtl/math.hxx>
 
 #include "rlrcitem.hxx"
 #include <memory>
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index dddf6c3c930a..401e1b085410 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -25,6 +25,7 @@
 #include <svx/globl3d.hxx>
 #include <basegfx/point/b3dpoint.hxx>
 #include <sdr/contact/viewcontactofe3dcube.hxx>
+#include <rtl/ustrbuf.hxx>
 
 
 // DrawContact section
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 4f5269e1e6a1..d4aa1f024ae5 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -34,6 +34,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b3dpolypolygontools.hxx>
+#include <rtl/ustrbuf.hxx>
 
 
 // DrawContact section
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 47ae21449a1b..37060f96e73a 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -31,6 +31,7 @@
 #include <sdr/contact/viewcontactofe3dlathe.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <rtl/ustrbuf.hxx>
 
 
 // DrawContact section
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 131ea08de758..eca597bb4eeb 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
 #include <svx/e3dsceneupdater.hxx>
+#include <rtl/ustrbuf.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 7ca73dd76b83..66b13477067e 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -36,6 +36,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svx/e3dsceneupdater.hxx>
 #include <svx/svdmodel.hxx>
+#include <rtl/ustrbuf.hxx>
 
 namespace {
 
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 95f439db5bc9..e5e6939c1872 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -29,6 +29,7 @@
 #include <basegfx/vector/b3dvector.hxx>
 #include <basegfx/point/b3dpoint.hxx>
 #include <sdr/contact/viewcontactofe3dsphere.hxx>
+#include <rtl/ustrbuf.hxx>
 
 // DrawContact section
 std::unique_ptr<sdr::contact::ViewContact> E3dSphereObj::CreateObjectSpecificViewContact()
diff --git a/svx/source/sidebar/glow/GlowPropertyPanel.cxx b/svx/source/sidebar/glow/GlowPropertyPanel.cxx
index 545394e5f7b6..07e10e916fff 100644
--- a/svx/source/sidebar/glow/GlowPropertyPanel.cxx
+++ b/svx/source/sidebar/glow/GlowPropertyPanel.cxx
@@ -18,6 +18,7 @@
 #include <svx/svddef.hxx>
 #include <svx/svxids.hrc>
 #include <svx/xcolit.hxx>
+#include <rtl/math.hxx>
 
 namespace
 {
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index d0c7226dc020..ccab4da45a4a 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -21,6 +21,7 @@
 #include <cassert>
 #include <math.h>
 #include <sal/log.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index b08023a3fe0a..7e360f4b43cd 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -25,6 +25,7 @@
 #include <svx/svdotable.hxx>
 
 #include <osl/thread.h>
+#include <rtl/strbuf.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/xgrad.hxx>
 #include <svx/xfillit0.hxx>
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 6c77b5b306ce..3d4e6bfc409b 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -81,6 +81,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <svdobjplusdata.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include "presetooxhandleadjustmentrelations.hxx"
 
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 8081df8269e5..7b1b5cc5db61 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -22,6 +22,7 @@
 
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index cedb72282ef6..b6c3168f6cbb 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -28,6 +28,7 @@
 #include <basegfx/tuple/b2dtuple.hxx>
 #include <tools/bigint.hxx>
 #include <tools/helpers.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 658a67f290e6..93978f1ef592 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -23,6 +23,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <math.h>
+#include <rtl/ustrbuf.hxx>
 
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 327ed76d661c..f4dd1c994eca 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -23,6 +23,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <svl/hint.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <sdr/contact/viewcontactofsdredgeobj.hxx>
 #include <sdr/properties/connectorproperties.hxx>
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index e565f3de71e0..5c216bd2835d 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -20,6 +20,7 @@
 #include <unotools/streamwrap.hxx>
 
 #include <sfx2/lnkbase.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <tools/helpers.hxx>
 #include <tools/stream.hxx>
 #include <sot/exchange.hxx>
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 1824546f5670..0ee6ef6a8fb6 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -32,6 +32,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <libxml/xmlwriter.h>
+#include <rtl/ustrbuf.hxx>
 #include <vcl/canvastools.hxx>
 
 // BaseProperties section
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 5a7c334b2132..af407f84be7b 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -62,6 +62,7 @@
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnwtit.hxx>
 #include <svx/xpoly.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/ptrstyle.hxx>
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 6e68116928a6..886ff96fd983 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -22,6 +22,7 @@
 #include <svx/svdomedia.hxx>
 
 #include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
 #include <ucbhelper/content.hxx>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 50afc8fcbd36..65b30eaed7e3 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -77,6 +77,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <editeng/outlobj.hxx>
 #include <svx/svdpage.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <rtl/ref.hxx>
 #include <bitmaps.hlst>
 
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index a5fc10fb7e8d..aa91331b5393 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -25,6 +25,7 @@
 #include <svx/svdpage.hxx>
 #include <sdr/properties/pageproperties.hxx>
 #include <sdr/contact/viewcontactofpageobj.hxx>
+#include <rtl/ustrbuf.hxx>
 
 
 // BaseProperties section
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index bba20891df41..93b08170fcb6 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -19,6 +19,7 @@
 
 #include <tools/bigint.hxx>
 #include <tools/helpers.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <svx/svdopath.hxx>
 #include <math.h>
 #include <svx/xpoly.hxx>
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 3fdfeb035d39..0c648189317a 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -28,6 +28,7 @@
 #include <svx/strings.hrc>
 #include <sdr/properties/rectangleproperties.hxx>
 #include <sdr/contact/viewcontactofsdrrectobj.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <vcl/ptrstyle.hxx>
 
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 915a387bebe2..49cea290ae4c 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -32,6 +32,7 @@
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdviter.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <rtl/ref.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index bec8f74cb481..1fc49087a839 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -24,7 +24,7 @@
 #include <svx/svdograf.hxx>
 #include <svx/svddrgv.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-
+#include <rtl/ustrbuf.hxx>
 
 sdr::properties::BaseProperties& SdrVirtObj::GetProperties() const
 {
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index af98fec68d0c..b47fda17bf4f 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -21,6 +21,7 @@
 #include <svx/svdtrans.hxx>
 #include <math.h>
 #include <svx/xpoly.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <vcl/virdev.hxx>
 #include <tools/bigint.hxx>
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 545d9759d9af..7672e29cb021 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -52,6 +52,7 @@
 #include <editeng/frmdiritem.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <libxml/xmlwriter.h>
+#include <rtl/ustrbuf.hxx>
 
 #include <boost/property_tree/ptree.hpp>
 
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index f19637c85976..5ca8a22d1b2b 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -39,6 +39,7 @@
 #include <svx/chrtitem.hxx>
 #include <svx/sdasitm.hxx>
 #include <svl/intitem.hxx>
+#include <rtl/math.hxx>
 
 #include <svx/extrusionbar.hxx>
 #include <extrusiondepthdialog.hxx>
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index ab51c4d3889b..1a29fbcaca86 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -24,6 +24,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
 
+#include <rtl/ustrbuf.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 6fd1646d79f0..3b84601fac27 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -31,6 +31,7 @@
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <drawinglayer/processor2d/processor2dtools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <memory>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/xoutdev/xtabptrn.cxx b/svx/source/xoutdev/xtabptrn.cxx
index b7ee2b94a5a8..8a53168b491b 100644
--- a/svx/source/xoutdev/xtabptrn.cxx
+++ b/svx/source/xoutdev/xtabptrn.cxx
@@ -23,6 +23,7 @@
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/BitmapTools.hxx>
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index eecda929e687..526fe6ac40db 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/util/SearchResult.hpp>
 #include <comphelper/lok.hxx>
 #include <o3tl/safeint.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <svx/svdview.hxx>
 #include <svl/srchitem.hxx>
 #include <sfx2/sfxsids.hrc>
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index c10f6ea37f58..0473d8bacfd1 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -45,6 +45,7 @@
 #include <hints.hxx>
 #include <txatbase.hxx>
 #include <xmloff/odffields.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <editsh.hxx>
 
diff --git a/sw/source/core/doc/DocumentOutlineNodesManager.cxx b/sw/source/core/doc/DocumentOutlineNodesManager.cxx
index 4f66fd4a3d0e..25f3814767bb 100644
--- a/sw/source/core/doc/DocumentOutlineNodesManager.cxx
+++ b/sw/source/core/doc/DocumentOutlineNodesManager.cxx
@@ -22,6 +22,7 @@
 #include <txtfrm.hxx>
 #include <rootfrm.hxx>
 #include <modeltoviewhelper.hxx>
+#include <rtl/ustrbuf.hxx>
 
 namespace sw
 {
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 0b0448b73562..574747e77690 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <rtl/ustrbuf.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
 #include <rtl/character.hxx>
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 4bdfe17c4781..cce3aefe0714 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -44,6 +44,7 @@
 #include <unordered_map>
 #include <libxml/xmlwriter.h>
 
+#include <rtl/ustrbuf.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <unotools/saveopt.hxx>
 #include <osl/diagnose.h>
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index dacd71201b57..f03bf02575ce 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -22,6 +22,7 @@
 #include <o3tl/any.hxx>
 #include <osl/diagnose.h>
 #include <osl/thread.h>
+#include <rtl/ustrbuf.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <sot/exchange.hxx>
 #include <doc.hxx>
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index e67428eb010f..f395efeaeb6d 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -106,6 +106,7 @@
 #include <frame.hxx>
 #include <swtable.hxx>
 #include <ndtxt.hxx>
+#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <tools/stream.hxx>
 
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx
index 42f947d4d868..cfef4d3561f5 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -39,6 +39,7 @@
 #include <txatbase.hxx>
 #include <modeltoviewhelper.hxx>
 
+#include <rtl/ustrbuf.hxx>
 #include <svl/itemiter.hxx>
 
 #include <cassert>
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index ad5110d4082a..fd8f65185987 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -37,6 +37,7 @@
 #include <calbck.hxx>
 #include <hints.hxx>
 #include <pam.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <vcl/svapp.hxx>
 #include <unotextrange.hxx>
 
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 6b4b4b3786de..563de152f872 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -19,6 +19,7 @@
 
 #include <UndoDelete.hxx>
 #include <hintids.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <unotools/charclass.hxx>
 #include <frmfmt.hxx>
 #include <fmtanchr.hxx>
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 14791f86759b..052f5c70a57d 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <hintids.hxx>
 #include <o3tl/any.hxx>
+#include <rtl/math.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/macitem.hxx>
 #include <svtools/htmlout.hxx>
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 9abff414bee4..f1e5b99eba9f 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -27,6 +27,7 @@
 #include <svtools/htmltokn.h>
 #include <editeng/svxenum.hxx>
 #include <rtl/ref.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <fltshell.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/form/XFormComponent.hpp>
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index dfa4fee9237a..a02cd8dfe215 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -29,6 +29,7 @@
 #include <vcl/metric.hxx>
 #include <vcl/settings.hxx>
 
+#include <rtl/ustrbuf.hxx>
 #include <svl/stritem.hxx>
 #include <editeng/fontitem.hxx>
 #include <sfx2/dialoghelper.hxx>
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 1f8902867b3c..ab337a76b261 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -24,6 +24,7 @@
 #include <view.hxx>
 #include <swwait.hxx>
 #include <wrtsh.hxx>
+#include <rtl/math.hxx>
 #include <svl/cjkoptions.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/settings.hxx>
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index b18689d9df18..d8b3481b3286 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/i18n/IndexEntrySupplier.hpp>
 #include <com/sun/star/util/SearchAlgorithms2.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
+#include <rtl/ustrbuf.hxx>
 #include <i18nutil/searchopt.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index d480068b1865..ed540b942f05 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <rtl/ustrbuf.hxx>
 #include <sfx2/request.hxx>
 #include <svl/stritem.hxx>
 #include <vcl/weld.hxx>
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 5f07333ecdaa..89de80e10925 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -24,6 +24,7 @@
 #include <cstdlib>
 
 #include <hintids.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <svl/itemiter.hxx>
 #include <svl/eitem.hxx>
 #include <unotools/syslocale.hxx>
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index f11eba893f57..80727fb0f71f 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -24,6 +24,7 @@
 #include <editeng/svxenum.hxx>
 #include <editeng/editids.hrc>
 #include <osl/diagnose.h>
+#include <rtl/ustrbuf.hxx>
 
 #include <tools/mapunit.hxx>
 #include <tools/globname.hxx>
diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx
index ee63272c5dd8..ab771b8b45e3 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <cstring>
 #include <osl/diagnose.h>
 #include <o3tl/any.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 617511c29929..84cb6774253e 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -34,6 +34,7 @@
 #include <comphelper/types.hxx>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <comphelper/sequence.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx
index aee3992c1d0e..6f849460175c 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -21,6 +21,7 @@
 #include <osl/diagnose.h>
 #include <editeng/paperinf.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <unotools/useroptions.hxx>
 #include <swmodule.hxx>
 #include <swtypes.hxx>
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 5763afd54c47..b8d79ebb9816 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -20,6 +20,7 @@
 #include <hintids.hxx>
 #include <i18nlangtag/lang.h>
 #include <i18nutil/transliteration.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <svl/slstitm.hxx>
 #include <svl/stritem.hxx>
 #include <editeng/fontitem.hxx>
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index ac0309973449..a5eee7c4c96f 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -25,6 +25,7 @@
 #include <vcl/syswin.hxx>
 #include <vcl/weld.hxx>
 
+#include <rtl/ustrbuf.hxx>
 #include <svl/whiter.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtundo.cxx b/sw/source/uibase/wrtsh/wrtundo.cxx
index 081704835501..1e92006a232b 100644
--- a/sw/source/uibase/wrtsh/wrtundo.cxx
+++ b/sw/source/uibase/wrtsh/wrtundo.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <svl/slstitm.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <wrtsh.hxx>
 #include <swundo.hxx>
 #include <IDocumentUndoRedo.hxx>
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index 6c9fa0e5f7ed..b5ff7aba5efb 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -28,6 +28,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 
+#include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 62d6ef49d477..8aeb3a49679f 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -38,6 +38,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <toolkit/helper/property.hxx>
+#include <rtl/math.hxx>
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 0a4cca10a817..ad975d3f9ae7 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -32,6 +32,7 @@
 
 #include <osl/diagnose.h>
 #include <rtl/digest.h>
+#include <rtl/ustrbuf.hxx>
 #include <unotools/resmgr.hxx>
 #include <vcl/errinf.hxx>
 #include <vcl/abstdlg.hxx>
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 6abe1c30cfc4..56f54255d730 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -30,6 +30,7 @@
 #include <svx/svxerr.hxx>
 #include <unotools/resmgr.hxx>
 #include <osl/diagnose.h>
+#include <rtl/ustrbuf.hxx>
 
 #include <ids.hrc>
 #include "getcontinuations.hxx"
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index f3c7c3b94088..f65a225558bc 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -59,6 +59,7 @@
 #include <com/sun/star/loader/CannotActivateFactoryException.hpp>
 
 #include <sal/log.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <osl/conditn.hxx>
 #include <unotools/resmgr.hxx>
 #include <vcl/errinf.hxx>
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 0288d5d1ec15..2f987b241fe9 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/security/DocumentDigitalSignatures.hpp>
 #include <comphelper/processfactory.hxx>
 #include <osl/file.h>
+#include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <unotools/securityoptions.hxx>
 
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index 71f990685dd6..1f2dea7bcfa0 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -60,6 +60,7 @@
 #include <basic/sbmod.hxx>
 #include <basic/sbuno.hxx>
 #include <basic/sberrors.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sal/log.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 48d99ec384ba..c6490ee36f68 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -21,6 +21,7 @@
 #include <sal/log.hxx>
 
 #include <i18nlangtag/languagetag.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <vcl/print.hxx>
 #include <vcl/image.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 301b934b4ab9..651d4aa456dd 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -22,6 +22,7 @@
 #include <osl/file.hxx>
 #include <osl/thread.hxx>
 #include <osl/module.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <sal/log.hxx>
 
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index 1c54fbbfbf81..cba52bc5d22d 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -21,6 +21,7 @@
 #include "textdoc.hxx"
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
+#include <rtl/ustrbuf.hxx>
 
 // compare function called by QuickSort
 static bool CompareStart( const std::unique_ptr<TextCharAttrib>& pFirst, const std::unique_ptr<TextCharAttrib>& pSecond )
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 10f71cab4008..88ff6b5c2fb8 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/log.hxx>
+#include <rtl/math.hxx>
 #include <o3tl/underlyingenumvalue.hxx>
 #include <osl/diagnose.h>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/vcl/source/gdi/mtfxmldump.cxx b/vcl/source/gdi/mtfxmldump.cxx
index 8c242bcb7c21..461321c1cb54 100644
--- a/vcl/source/gdi/mtfxmldump.cxx
+++ b/vcl/source/gdi/mtfxmldump.cxx
@@ -14,6 +14,7 @@
 #include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
 #include <rtl/string.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <sstream>
 
diff --git a/vcl/source/graphic/GraphicID.cxx b/vcl/source/graphic/GraphicID.cxx
index 96f256cf45da..1cad217241fa 100644
--- a/vcl/source/graphic/GraphicID.cxx
+++ b/vcl/source/graphic/GraphicID.cxx
@@ -20,6 +20,7 @@
 #include <graphic/GraphicID.hxx>
 
 #include <impgraph.hxx>
+#include <rtl/strbuf.hxx>
 
 GraphicID::GraphicID(ImpGraphic const& rGraphic)
 {
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 99a2c9bcfde7..58cf53ef61ae 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -48,6 +48,7 @@
 #include <osl/diagnose.h>
 #include <tools/helpers.hxx>
 #include <tools/debug.hxx>
+#include <rtl/math.hxx>
 
 #include <vcl/dibtools.hxx>
 #include <tools/stream.hxx>
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index d7e0ecaf50af..de9670e33a55 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -28,6 +28,7 @@
 #include <vcl/fontcharmap.hxx>
 #include <vcl/event.hxx>
 #include <font/FeatureCollector.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 91cc10784bb4..f17f3375f246 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -26,6 +26,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <osl/file.h>
+#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <tools/lineend.hxx>
 #include <tools/debug.hxx>
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index c6baa93ed7c3..0cf325d0b40a 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -21,6 +21,7 @@
 
 #include <sal/types.h>
 #include <tools/helpers.hxx>
+#include <rtl/math.hxx>
 
 #include <memory>
 
diff --git a/vcl/source/treelist/headbar.cxx b/vcl/source/treelist/headbar.cxx
index fead6923b20a..6f9ec3a0e842 100644
--- a/vcl/source/treelist/headbar.cxx
+++ b/vcl/source/treelist/headbar.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <vcl/headbar.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index 9ffdaf8c37c7..7c4b44631540 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -25,6 +25,7 @@
 #include <vcl/treelistentry.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 35fe8561e58e..c3cf735253aa 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -49,6 +49,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <vcl/toolkit/unowrap.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <configsettings.hxx>
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 82174b2872b7..2a5d6cde641a 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -37,6 +37,7 @@
 
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
+#include <rtl/ustrbuf.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 11cc3a921bcf..5545a2a9f441 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -64,6 +64,7 @@
 #include <com/sun/star/awt/MouseButton.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <rtl/tencinfo.h>
+#include <rtl/ustrbuf.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/solarmutex.hxx>
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 49fd6be7cd7b..f88d8e18bbe2 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -36,6 +36,7 @@
 
 #include <comphelper/fileurl.hxx>
 #include <o3tl/safeint.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index f2251cb886f3..f5a50345a210 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -30,6 +30,7 @@
 #include <osl/file.h>
 #include <osl/conditn.hxx>
 
+#include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
diff --git a/vcl/unx/gtk3/gtk3salprn-gtk.cxx b/vcl/unx/gtk3/gtk3salprn-gtk.cxx
index 388d5b129f8f..62e88c919ee6 100644
--- a/vcl/unx/gtk3/gtk3salprn-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salprn-gtk.cxx
@@ -27,6 +27,7 @@
 
 #include <officecfg/Office/Common.hxx>
 
+#include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 5a10de216f96..179a134204e9 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -23,6 +23,7 @@
 
 #include <osl/conditn.hxx>
 #include <osl/file.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <tools/time.hxx>
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index 577d87b1ac49..ac2c7010343a 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -30,6 +30,7 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 
+#include <rtl/math.hxx>
 #include <tools/color.hxx>
 #include <sal/log.hxx>
 
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index d55fb5dd04a9..0dc789028b43 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLPLOTAREACONTEXT_HXX
 
 #include "SchXMLChartContext.hxx"
+#include <rtl/ustrbuf.hxx>
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/prstylei.hxx>
 #include <xmloff/shapeimport.hxx>
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index a24a6f8c31b9..715bd0ba052b 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -31,6 +31,7 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <rtl/character.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <xmloff/xmlmetai.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index bfdf1671a127..79a68e424be8 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -24,6 +24,7 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/color.hxx>
 #include <osl/diagnose.h>
+#include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index 584ae5985790..56a6504cc146 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -37,6 +37,7 @@
 
 #include "StyleOOoTContext.hxx"
 #include <xmloff/xmluconv.hxx>
+#include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>