[Libreoffice-commits] core.git: vcl/backendtest vcl/headless vcl/inc vcl/opengl vcl/osx vcl/qa vcl/qt5 vcl/quartz vcl/source vcl/unx vcl/win vcl/workben

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Jul 31 08:49:15 UTC 2018


 vcl/backendtest/VisualBackendTest.cxx          |    1 +
 vcl/headless/svpbmp.cxx                        |    1 +
 vcl/headless/svpframe.cxx                      |    1 +
 vcl/headless/svpgdi.cxx                        |    1 +
 vcl/headless/svpinst.cxx                       |    1 +
 vcl/inc/fontattributes.hxx                     |    1 +
 vcl/opengl/gdiimpl.cxx                         |    1 +
 vcl/opengl/salbmp.cxx                          |    1 +
 vcl/opengl/scale.cxx                           |    1 +
 vcl/opengl/texture.cxx                         |    1 +
 vcl/opengl/win/WinDeviceInfo.cxx               |    1 +
 vcl/opengl/win/blocklist_parser.cxx            |    2 ++
 vcl/opengl/win/gdiimpl.cxx                     |    1 +
 vcl/opengl/x11/X11DeviceInfo.cxx               |    1 +
 vcl/opengl/x11/gdiimpl.cxx                     |    1 +
 vcl/osx/DataFlavorMapping.cxx                  |    1 +
 vcl/osx/documentfocuslistener.cxx              |    1 +
 vcl/osx/salframe.cxx                           |    1 +
 vcl/osx/salinst.cxx                            |    1 +
 vcl/osx/salmenu.cxx                            |    1 +
 vcl/qa/cppunit/canvasbitmaptest.cxx            |    1 +
 vcl/qa/cppunit/outdev.cxx                      |    1 +
 vcl/qt5/Qt5Bitmap.cxx                          |    2 ++
 vcl/qt5/Qt5Data.cxx                            |    2 ++
 vcl/qt5/Qt5FilePicker.cxx                      |    1 +
 vcl/qt5/Qt5Graphics_GDI.cxx                    |    2 ++
 vcl/qt5/Qt5Menu.cxx                            |    1 +
 vcl/quartz/ctfonts.cxx                         |    1 +
 vcl/quartz/salbmp.cxx                          |    1 +
 vcl/quartz/salgdi.cxx                          |    1 +
 vcl/quartz/salgdicommon.cxx                    |    1 +
 vcl/quartz/salgdiutils.cxx                     |    1 +
 vcl/quartz/salvd.cxx                           |    1 +
 vcl/source/app/IconThemeScanner.cxx            |    1 +
 vcl/source/app/help.cxx                        |    1 +
 vcl/source/app/session.cxx                     |    1 +
 vcl/source/app/svapp.cxx                       |    1 +
 vcl/source/app/svdata.cxx                      |    1 +
 vcl/source/app/svmain.cxx                      |    1 +
 vcl/source/app/timer.cxx                       |    1 +
 vcl/source/app/unohelp2.cxx                    |    1 +
 vcl/source/bitmap/BitmapFastScaleFilter.cxx    |    1 +
 vcl/source/bitmap/BitmapScaleSuperFilter.cxx   |    1 +
 vcl/source/bitmap/BitmapTools.cxx              |    1 +
 vcl/source/bitmap/bitmapfilter.cxx             |    1 +
 vcl/source/control/button.cxx                  |    1 +
 vcl/source/control/combobox.cxx                |    1 +
 vcl/source/control/ctrl.cxx                    |    1 +
 vcl/source/control/edit.cxx                    |    1 +
 vcl/source/control/field.cxx                   |    1 +
 vcl/source/control/fixed.cxx                   |    1 +
 vcl/source/control/imp_listbox.cxx             |    1 +
 vcl/source/control/listbox.cxx                 |    1 +
 vcl/source/control/longcurr.cxx                |    1 +
 vcl/source/control/prgsbar.cxx                 |    1 +
 vcl/source/control/quickselectionengine.cxx    |    1 +
 vcl/source/control/scrbar.cxx                  |    1 +
 vcl/source/control/spinfld.cxx                 |    1 +
 vcl/source/control/tabctrl.cxx                 |    1 +
 vcl/source/control/throbber.cxx                |    1 +
 vcl/source/edit/textdata.cxx                   |    1 +
 vcl/source/edit/textdoc.cxx                    |    1 +
 vcl/source/edit/texteng.cxx                    |    1 +
 vcl/source/edit/textundo.cxx                   |    1 +
 vcl/source/edit/textview.cxx                   |    1 +
 vcl/source/filter/graphicfilter.cxx            |    1 +
 vcl/source/filter/igif/gifread.cxx             |    1 +
 vcl/source/filter/jpeg/JpegWriter.cxx          |    1 +
 vcl/source/filter/jpeg/jpegc.cxx               |    1 +
 vcl/source/filter/wmf/emfwr.cxx                |    1 +
 vcl/source/font/fontcache.cxx                  |    1 +
 vcl/source/font/fontcharmap.cxx                |    1 +
 vcl/source/font/fontmetric.cxx                 |    1 +
 vcl/source/fontsubset/cff.cxx                  |    1 +
 vcl/source/fontsubset/fontsubset.cxx           |    1 +
 vcl/source/fontsubset/sft.cxx                  |    1 +
 vcl/source/fontsubset/xlat.cxx                 |    1 +
 vcl/source/gdi/CommonSalLayout.cxx             |    1 +
 vcl/source/gdi/alpha.cxx                       |    1 +
 vcl/source/gdi/animate.cxx                     |    1 +
 vcl/source/gdi/bitmap3.cxx                     |    1 +
 vcl/source/gdi/bitmapex.cxx                    |    1 +
 vcl/source/gdi/bmpacc.cxx                      |    1 +
 vcl/source/gdi/bmpfast.cxx                     |    1 +
 vcl/source/gdi/configsettings.cxx              |    1 +
 vcl/source/gdi/dibtools.cxx                    |    1 +
 vcl/source/gdi/embeddedfontshelper.cxx         |    1 +
 vcl/source/gdi/gdimtf.cxx                      |    1 +
 vcl/source/gdi/gfxlink.cxx                     |    1 +
 vcl/source/gdi/impgraph.cxx                    |    1 +
 vcl/source/gdi/impvect.cxx                     |    1 +
 vcl/source/gdi/jobset.cxx                      |    1 +
 vcl/source/gdi/metaact.cxx                     |    1 +
 vcl/source/gdi/pdfextoutdevdata.cxx            |    1 +
 vcl/source/gdi/pdfwriter_impl.cxx              |    1 +
 vcl/source/gdi/pdfwriter_impl2.cxx             |    1 +
 vcl/source/gdi/pngread.cxx                     |    1 +
 vcl/source/gdi/print.cxx                       |    1 +
 vcl/source/gdi/print2.cxx                      |    1 +
 vcl/source/gdi/print3.cxx                      |    1 +
 vcl/source/gdi/regband.cxx                     |    1 +
 vcl/source/gdi/region.cxx                      |    1 +
 vcl/source/gdi/regionband.cxx                  |    1 +
 vcl/source/gdi/salgdilayout.cxx                |    1 +
 vcl/source/gdi/sallayout.cxx                   |    1 +
 vcl/source/gdi/salmisc.cxx                     |    1 +
 vcl/source/gdi/svmconverter.cxx                |    1 +
 vcl/source/gdi/textlayout.cxx                  |    1 +
 vcl/source/gdi/vectorgraphicdata.cxx           |    1 +
 vcl/source/gdi/virdev.cxx                      |    1 +
 vcl/source/graphic/Manager.cxx                 |    1 +
 vcl/source/graphic/UnoGraphicProvider.cxx      |    1 +
 vcl/source/helper/canvastools.cxx              |    1 +
 vcl/source/helper/lazydelete.cxx               |    1 +
 vcl/source/image/ImplImageTree.cxx             |    1 +
 vcl/source/opengl/OpenGLContext.cxx            |    1 +
 vcl/source/opengl/OpenGLHelper.cxx             |    1 +
 vcl/source/outdev/bitmap.cxx                   |    1 +
 vcl/source/outdev/font.cxx                     |    1 +
 vcl/source/outdev/map.cxx                      |    1 +
 vcl/source/outdev/nativecontrols.cxx           |    1 +
 vcl/source/outdev/outdev.cxx                   |    1 +
 vcl/source/outdev/outdevstate.cxx              |    1 +
 vcl/source/outdev/pixel.cxx                    |    1 +
 vcl/source/outdev/text.cxx                     |    1 +
 vcl/source/uitest/uiobject.cxx                 |    1 +
 vcl/source/window/accel.cxx                    |    2 +-
 vcl/source/window/accessibility.cxx            |    1 +
 vcl/source/window/debugevent.cxx               |    1 +
 vcl/source/window/dlgctrl.cxx                  |    1 +
 vcl/source/window/dndeventdispatcher.cxx       |    1 +
 vcl/source/window/dockmgr.cxx                  |    1 +
 vcl/source/window/dockwin.cxx                  |    1 +
 vcl/source/window/errinf.cxx                   |    1 +
 vcl/source/window/event.cxx                    |    1 +
 vcl/source/window/floatwin.cxx                 |    1 +
 vcl/source/window/layout.cxx                   |    1 +
 vcl/source/window/menu.cxx                     |    1 +
 vcl/source/window/menubarwindow.cxx            |    1 +
 vcl/source/window/menufloatingwindow.cxx       |    1 +
 vcl/source/window/paint.cxx                    |    1 +
 vcl/source/window/printdlg.cxx                 |    1 +
 vcl/source/window/scrwnd.cxx                   |    1 +
 vcl/source/window/seleng.cxx                   |    1 +
 vcl/source/window/splitwin.cxx                 |    1 +
 vcl/source/window/stacking.cxx                 |    1 +
 vcl/source/window/status.cxx                   |    1 +
 vcl/source/window/syswin.cxx                   |    1 +
 vcl/source/window/toolbox.cxx                  |    1 +
 vcl/source/window/toolbox2.cxx                 |    1 +
 vcl/source/window/window.cxx                   |    1 +
 vcl/source/window/window2.cxx                  |    1 +
 vcl/source/window/winproc.cxx                  |    1 +
 vcl/source/window/wrkwin.cxx                   |    1 +
 vcl/unx/generic/app/saldata.cxx                |    1 +
 vcl/unx/generic/app/sm.cxx                     |    1 +
 vcl/unx/generic/dtrans/X11_selection.cxx       |    1 +
 vcl/unx/generic/dtrans/X11_transferable.cxx    |    1 +
 vcl/unx/generic/fontmanager/fontconfig.cxx     |    1 +
 vcl/unx/generic/fontmanager/fontmanager.cxx    |    1 +
 vcl/unx/generic/fontmanager/helper.cxx         |    1 +
 vcl/unx/generic/gdi/cairo_xlib_cairo.cxx       |    1 +
 vcl/unx/generic/gdi/cairotextrender.cxx        |    1 +
 vcl/unx/generic/gdi/gdiimpl.cxx                |    1 +
 vcl/unx/generic/gdi/salbmp.cxx                 |    1 +
 vcl/unx/generic/gdi/salgdi.cxx                 |    1 +
 vcl/unx/generic/gdi/salgdi2.cxx                |    1 +
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |    1 +
 vcl/unx/generic/glyphs/glyphcache.cxx          |    1 +
 vcl/unx/generic/plugadapt/salplug.cxx          |    1 +
 vcl/unx/generic/print/genprnpsp.cxx            |    1 +
 vcl/unx/generic/print/genpspgraphics.cxx       |    1 +
 vcl/unx/generic/printer/cpdmgr.cxx             |    1 +
 vcl/unx/generic/printer/cupsmgr.cxx            |    1 +
 vcl/unx/generic/printer/ppdparser.cxx          |    1 +
 vcl/unx/generic/printer/printerinfomanager.cxx |    1 +
 vcl/unx/generic/window/salframe.cxx            |    1 +
 vcl/unx/generic/window/salobj.cxx              |    1 +
 vcl/unx/gtk/a11y/atklistener.cxx               |    1 +
 vcl/unx/gtk/a11y/atkutil.cxx                   |    1 +
 vcl/unx/gtk/a11y/atkwindow.cxx                 |    1 +
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx       |    1 +
 vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx     |    1 +
 vcl/unx/gtk/fpicker/SalGtkPicker.cxx           |    1 +
 vcl/unx/gtk/gloactiongroup.cxx                 |    2 ++
 vcl/unx/gtk/gtkdata.cxx                        |    1 +
 vcl/unx/gtk/gtkinst.cxx                        |    1 +
 vcl/unx/gtk/gtksalframe.cxx                    |    1 +
 vcl/unx/gtk/salprn-gtk.cxx                     |    1 +
 vcl/unx/gtk3/gtk3gtkdata.cxx                   |    1 +
 vcl/unx/gtk3/gtk3gtkframe.cxx                  |    1 +
 vcl/unx/gtk3/gtk3gtkinst.cxx                   |    1 +
 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx      |    1 +
 vcl/unx/kde4/KDE4FilePicker.cxx                |    1 +
 vcl/unx/kde4/KDESalFrame.cxx                   |    1 +
 vcl/unx/kde4/KDEXLib.cxx                       |    1 +
 vcl/unx/kde4/main.cxx                          |    1 +
 vcl/unx/kde5/KDE5FilePicker2.cxx               |    1 +
 vcl/unx/kde5/KDE5SalFrame.cxx                  |    1 +
 vcl/unx/kde5/KDE5SalInstance.cxx               |    1 +
 vcl/win/app/salinst.cxx                        |    1 +
 vcl/win/app/salshl.cxx                         |    1 +
 vcl/win/app/saltimer.cxx                       |    1 +
 vcl/win/gdi/DWriteTextRenderer.cxx             |    1 +
 vcl/win/gdi/gdiimpl.cxx                        |    1 +
 vcl/win/gdi/salbmp.cxx                         |    1 +
 vcl/win/gdi/salfont.cxx                        |    1 +
 vcl/win/gdi/salprn.cxx                         |    1 +
 vcl/win/gdi/salvd.cxx                          |    1 +
 vcl/win/gdi/winlayout.cxx                      |    1 +
 vcl/win/window/salframe.cxx                    |    1 +
 vcl/win/window/salobj.cxx                      |    1 +
 vcl/workben/icontest.cxx                       |    1 +
 vcl/workben/mtfdemo.cxx                        |    1 +
 vcl/workben/outdevgrind.cxx                    |    1 +
 vcl/workben/svdem.cxx                          |    1 +
 vcl/workben/svpclient.cxx                      |    1 +
 vcl/workben/svptest.cxx                        |    1 +
 vcl/workben/vcldemo.cxx                        |    1 +
 219 files changed, 224 insertions(+), 1 deletion(-)

New commits:
commit a43b79f6f9d16d52cdd30b990169160573e5de17
Author:     Gabor Kelemen <kelemeng at ubuntu.com>
AuthorDate: Sat Jul 28 15:57:23 2018 +0200
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Tue Jul 31 10:48:50 2018 +0200

    Add missing sal/log.hxx headers
    
    rtl/string.hxx and rtl/ustring.hxx both unnecessarily #include <sal/log.hxx> (and don't make use of it themselves), but many other files happen to depend on it.
    This is a continuation of commit 6ff2d84ade299cb3d14d4110e4cf1a4b8070c030 to be able to remove those unneeded includes.
    
    This commit adds missing headers to every file found by:
    grep -FwL sal/log.hxx $(git grep -Elw 'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF|SAL_DETAIL_LOG_STREAM|SAL_WHERE|SAL_STREAM|SAL_DEBUG')
    to directory vcl
    
    Change-Id: I205fe0f4e80a66cd9c3b19f7e9716411da1d1cf5
    Reviewed-on: https://gerrit.libreoffice.org/58221
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx
index 1169110f7a0c..dc86727eae4c 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -9,6 +9,7 @@
 
 #include <math.h>
 #include <rtl/math.hxx>
+#include <sal/log.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/bootstrap.hxx>
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index ed74e702fbee..543e2ba8574e 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cstring>
 
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 724220ad60a9..20a3ffa68823 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -21,6 +21,7 @@
 
 #include <comphelper/lok.hxx>
 #include <vcl/syswin.hxx>
+#include <sal/log.hxx>
 
 #include <headless/svpframe.hxx>
 #include <headless/svpinst.hxx>
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index de1145a6cc7c..bd7bb5e6d256 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -24,6 +24,7 @@
 #include <headless/svpcairotextrender.hxx>
 #include <saldatabasic.hxx>
 
+#include <sal/log.hxx>
 #include <o3tl/safeint.hxx>
 #include <vcl/sysdata.hxx>
 #include <config_cairo_canvas.h>
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 4291d594d5d3..5e0ec4c80b50 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -25,6 +25,7 @@
 #include <sys/poll.h>
 
 #include <sal/types.h>
+#include <sal/log.hxx>
 
 #include <vcl/inputtypes.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
diff --git a/vcl/inc/fontattributes.hxx b/vcl/inc/fontattributes.hxx
index b5fed601022c..7f5bd1d3b610 100644
--- a/vcl/inc/fontattributes.hxx
+++ b/vcl/inc/fontattributes.hxx
@@ -22,6 +22,7 @@
 
 #include <vcl/dllapi.h>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <vcl/vclenum.hxx>
 
 
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index d7965883d2d7..281153ceb376 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -29,6 +29,7 @@
 #include <basegfx/polygon/b2dpolygontriangulator.hxx>
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <basegfx/polygon/b2dtrapezoid.hxx>
+#include <sal/log.hxx>
 
 #include <vcl/opengl/OpenGLHelper.hxx>
 #include <salgdi.hxx>
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 20d0ac1fadd3..fd07b1659f0d 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -19,6 +19,7 @@
 
 #include <memory>
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <vcl/opengl/OpenGLHelper.hxx>
 
diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index a5280bf70817..6459933cb81b 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cmath>
 
diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index c26017e79118..45b3b35b7712 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 #include <tools/stream.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
 #include <vcl/opengl/OpenGLHelper.hxx>
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 9b4438cbccdb..29439b9ae43a 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -25,6 +25,7 @@
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <tools/stream.hxx>
 #include <o3tl/char16_t2wchar_t.hxx>
 
diff --git a/vcl/opengl/win/blocklist_parser.cxx b/vcl/opengl/win/blocklist_parser.cxx
index 8a6f9dbc4cda..ab89c0e4d567 100644
--- a/vcl/opengl/win/blocklist_parser.cxx
+++ b/vcl/opengl/win/blocklist_parser.cxx
@@ -9,6 +9,8 @@
 
 #include <opengl/win/blocklist_parser.hxx>
 
+#include <sal/log.hxx>
+
 WinBlocklistParser::WinBlocklistParser(const OUString& rURL,
         std::vector<wgl::DriverInfo>& rDriverList)
     : meBlockType(BlockType::UNKNOWN)
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 96f0b8bce57d..5d4158c3b3d7 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -11,6 +11,7 @@
 #include <thread>
 #include <opengl/win/gdiimpl.hxx>
 
+#include <sal/log.hxx>
 #include <comphelper/windowserrorstring.hxx>
 #include <opengl/zone.hxx>
 #include <win/wincomp.hxx>
diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx
index 5388f85c0c3d..ae0ef85e2a34 100644
--- a/vcl/opengl/x11/X11DeviceInfo.cxx
+++ b/vcl/opengl/x11/X11DeviceInfo.cxx
@@ -13,6 +13,7 @@
 #include <config_features.h>
 
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index 5104d6302973..27539319ed03 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -29,6 +29,7 @@
 
 #include <vcl/opengl/OpenGLContext.hxx>
 #include <vcl/opengl/OpenGLHelper.hxx>
+#include <sal/log.hxx>
 
 #include <o3tl/lru_map.hxx>
 #include <ControlCacheKey.hxx>
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 3b93b42da8d8..5ae33e660755 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include "DataFlavorMapping.hxx"
 #include "HtmlFmtFlt.hxx"
diff --git a/vcl/osx/documentfocuslistener.cxx b/vcl/osx/documentfocuslistener.cxx
index a695b2cd2d01..649f1324e75b 100644
--- a/vcl/osx/documentfocuslistener.cxx
+++ b/vcl/osx/documentfocuslistener.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::lang;
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index d4debf4ef09a..50dade6ff32c 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -21,6 +21,7 @@
 
 #include <comphelper/fileurl.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <osl/file.h>
 
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index b046fda9f4e2..17f7d89adb07 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <condition_variable>
 #include <mutex>
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 1cbdd979d56e..ee0e99278892 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <objc/objc-runtime.h>
 
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 8b3c210c2f41..52d3769ce74e 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -31,6 +31,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <tools/diagnose_ex.h>
 #include <rtl/ref.hxx>
+#include <sal/log.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/canvastools.hxx>
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index 07f056326a8f..c50481cb0f5a 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -17,6 +17,7 @@
 
 #include <tools/stream.hxx>
 #include <vcl/pngwrite.hxx>
+#include <sal/log.hxx>
 
 class VclOutdevTest : public test::BootstrapFixture
 {
diff --git a/vcl/qt5/Qt5Bitmap.cxx b/vcl/qt5/Qt5Bitmap.cxx
index 6e22ad187b39..23cde0cb31da 100644
--- a/vcl/qt5/Qt5Bitmap.cxx
+++ b/vcl/qt5/Qt5Bitmap.cxx
@@ -25,6 +25,8 @@
 #include <QtCore/QVector>
 #include <QtGui/QColor>
 
+#include <sal/log.hxx>
+
 Qt5Bitmap::Qt5Bitmap() {}
 
 Qt5Bitmap::Qt5Bitmap(const QImage& rImage) { m_pImage.reset(new QImage(rImage)); }
diff --git a/vcl/qt5/Qt5Data.cxx b/vcl/qt5/Qt5Data.cxx
index 60d555438944..1d1d3ece1de7 100644
--- a/vcl/qt5/Qt5Data.cxx
+++ b/vcl/qt5/Qt5Data.cxx
@@ -22,6 +22,8 @@
 #include <QtGui/QCursor>
 #include <QtGui/QBitmap>
 
+#include <sal/log.hxx>
+
 #include <unx/x11_cursors/ase_curs.h>
 #include <unx/x11_cursors/ase_mask.h>
 #include <unx/x11_cursors/asn_curs.h>
diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/Qt5FilePicker.cxx
index 1ffa1b993756..94a36990f15a 100644
--- a/vcl/qt5/Qt5FilePicker.cxx
+++ b/vcl/qt5/Qt5FilePicker.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/supportsservice.hxx>
+#include <sal/log.hxx>
 
 #include <QtCore/QDebug>
 #include <QtCore/QRegularExpression>
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
index 8070b7e2d6c0..4b4ae0ea545f 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -22,6 +22,8 @@
 #include <Qt5Bitmap.hxx>
 #include <Qt5Painter.hxx>
 
+#include <sal/log.hxx>
+
 #include <QtGui/QPainter>
 #include <QtGui/QScreen>
 #include <QtGui/QWindow>
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 5b915775f338..b594b8ad44c3 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -14,6 +14,7 @@
 #include <QtWidgets/QtWidgets>
 
 #include <vcl/svapp.hxx>
+#include <sal/log.hxx>
 
 Qt5Menu::Qt5Menu(bool bMenuBar)
     : mpVCLMenu(nullptr)
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 6e029da574bc..af7cb12970d8 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index d7de93591f8a..d586a120726a 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cstddef>
 #include <limits>
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 025e273ef272..428b5c5daf10 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 #include <config_folders.h>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 82dfe8932224..77241c282ea4 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cassert>
 #include <cstring>
diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx
index acda751afb67..7e0562b0fed2 100644
--- a/vcl/quartz/salgdiutils.cxx
+++ b/vcl/quartz/salgdiutils.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index 03f37fe67366..79d5725627a8 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/sysdata.hxx>
diff --git a/vcl/source/app/IconThemeScanner.cxx b/vcl/source/app/IconThemeScanner.cxx
index 86cf5112b15b..9ffc84d9bc12 100644
--- a/vcl/source/app/IconThemeScanner.cxx
+++ b/vcl/source/app/IconThemeScanner.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <deque>
 
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 35ef7ca2a476..d3ae8f7923f0 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/string.hxx>
+#include <sal/log.hxx>
 
 #include <tools/diagnose_ex.h>
 #include <tools/time.hxx>
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 35ec2f8cdb83..5679c7a9fb63 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -19,6 +19,7 @@
 
 #include <memory>
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 33420e5456fc..1bd65ba0570f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -25,6 +25,7 @@
 
 #include <rtl/tencinfo.h>
 #include <rtl/instance.hxx>
+#include <sal/log.hxx>
 
 #include <tools/debug.hxx>
 #include <tools/time.hxx>
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index d1f5480a27ed..414182375ce4 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -25,6 +25,7 @@
 #include <tools/gen.hxx>
 #include <unotools/resmgr.hxx>
 #include <uno/current_context.hxx>
+#include <sal/log.hxx>
 
 #include <vcl/button.hxx>
 #include <vcl/configsettings.hxx>
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 471abc951ffc..924d94052397 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cassert>
 
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 142a9c56b006..4e64c8806500 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/log.hxx>
 #include <tools/time.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/scheduler.hxx>
diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx
index 80d829964819..832156788215 100644
--- a/vcl/source/app/unohelp2.cxx
+++ b/vcl/source/app/unohelp2.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/log.hxx>
 #include <vcl/unohelp2.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
diff --git a/vcl/source/bitmap/BitmapFastScaleFilter.cxx b/vcl/source/bitmap/BitmapFastScaleFilter.cxx
index 6bf1700a476f..5d02e5ea32c6 100644
--- a/vcl/source/bitmap/BitmapFastScaleFilter.cxx
+++ b/vcl/source/bitmap/BitmapFastScaleFilter.cxx
@@ -24,6 +24,7 @@
 
 #include <bitmapwriteaccess.hxx>
 #include <BitmapFastScaleFilter.hxx>
+#include <sal/log.hxx>
 
 BitmapEx BitmapFastScaleFilter::execute(BitmapEx const& rBitmapEx)
 {
diff --git a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
index 01e922a9fa57..10ab46f5214c 100644
--- a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
+++ b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
@@ -26,6 +26,7 @@
 
 #include <algorithm>
 #include <memory>
+#include <sal/log.hxx>
 
 namespace {
 
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index 40f6c3d7258b..4f13511a5fab 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -10,6 +10,7 @@
 
 #include <vcl/BitmapTools.hxx>
 
+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/seqstream.hxx>
 #include <vcl/canvastools.hxx>
diff --git a/vcl/source/bitmap/bitmapfilter.cxx b/vcl/source/bitmap/bitmapfilter.cxx
index 4c20a83f0d40..51aae7bd8a0d 100644
--- a/vcl/source/bitmap/bitmapfilter.cxx
+++ b/vcl/source/bitmap/bitmapfilter.cxx
@@ -12,6 +12,7 @@
 #include <vcl/animate.hxx>
 
 #include <algorithm>
+#include <sal/log.hxx>
 
 BitmapFilter::BitmapFilter() {}
 
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 87d7b795e0fc..bfbbd4ab191d 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -43,6 +43,7 @@
 #include <window.h>
 #include <controldata.hxx>
 #include <o3tl/make_unique.hxx>
+#include <sal/log.hxx>
 
 #include <comphelper/dispatchcommand.hxx>
 
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 92ae580010f6..1aac3df64063 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -28,6 +28,7 @@
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/uitest/uiobject.hxx>
+#include <sal/log.hxx>
 
 #include <svdata.hxx>
 #include <listbox.hxx>
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 1d0b0c288858..dc1a66e530f9 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -26,6 +26,7 @@
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/uitest/logger.hxx>
+#include <sal/log.hxx>
 
 #include <textlayout.hxx>
 #include <svdata.hxx>
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 108ce15a984f..6349df729ffb 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -59,6 +59,7 @@
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 #include <sal/macros.h>
+#include <sal/log.hxx>
 
 #include <vcl/unohelp.hxx>
 #include <vcl/unohelp2.hxx>
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 2efb11938131..c4ce25c48a5e 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <comphelper/string.hxx>
 
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 2cf897c2fd82..74fb8c407250 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -26,6 +26,7 @@
 #include <vcl/settings.hxx>
 
 #include <comphelper/string.hxx>
+#include <sal/log.hxx>
 #include <controldata.hxx>
 #include <window.h>
 
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 32a82b1ac2cf..46418d2a1b22 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -38,6 +38,7 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 
 #include <rtl/instance.hxx>
+#include <sal/log.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/processfactory.hxx>
 
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index 1d8e256e80e2..d2e419a1a7a6 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -28,6 +28,7 @@
 #include <vcl/combobox.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/uitest/uiobject.hxx>
+#include <sal/log.hxx>
 
 #include <svdata.hxx>
 #include <controldata.hxx>
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index 183782037716..cc5da9b3409c 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -19,6 +19,7 @@
 
 #include <comphelper/string.hxx>
 #include <tools/bigint.hxx>
+#include <sal/log.hxx>
 
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx
index ac21e7c98ca3..20525ca63efc 100644
--- a/vcl/source/control/prgsbar.cxx
+++ b/vcl/source/control/prgsbar.cxx
@@ -20,6 +20,7 @@
 #include <vcl/status.hxx>
 #include <vcl/prgsbar.hxx>
 #include <vcl/settings.hxx>
+#include <sal/log.hxx>
 
 #define PROGRESSBAR_OFFSET          3
 #define PROGRESSBAR_WIN_OFFSET      2
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index c04931146d72..2e04cf68e164 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -23,6 +23,7 @@
 #include <vcl/i18nhelp.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <sal/log.hxx>
 
 #include <boost/optional.hpp>
 
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 4efc0c807061..61d22c90e3d9 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -26,6 +26,7 @@
 #include <svdata.hxx>
 
 #include <rtl/string.hxx>
+#include <sal/log.hxx>
 
 /*  #i77549#
     HACK: for scrollbars in case of thumb rect, page up and page down rect we
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 99e8703d6bfe..f73ecec535c8 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -22,6 +22,7 @@
 #include <vcl/spinfld.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/uitest/uiobject.hxx>
+#include <sal/log.hxx>
 
 #include <controldata.hxx>
 #include <spin.hxx>
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 1b55b832b569..1c42ba9d081a 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <vcl/notebookbar.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index b45e25cec9fb..eae208bf1698 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -28,6 +28,7 @@
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/processfactory.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 
diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx
index 95136829cdbe..493cb434e5de 100644
--- a/vcl/source/edit/textdata.cxx
+++ b/vcl/source/edit/textdata.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cstddef>
 
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index d9b540ddf86d..1c77a626dbfd 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -21,6 +21,7 @@
 #include "textdoc.hxx"
 #include <stdlib.h>
 #include <osl/diagnose.h>
+#include <sal/log.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/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 3205651c6f05..1f78eaea55cd 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -29,6 +29,7 @@
 #include <vcl/window.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/edit.hxx>
+#include <sal/log.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx
index 724745cf08d0..80e26d34c577 100644
--- a/vcl/source/edit/textundo.cxx
+++ b/vcl/source/edit/textundo.cxx
@@ -21,6 +21,7 @@
 #include "textund2.hxx"
 #include <strings.hrc>
 
+#include <sal/log.hxx>
 #include <vcl/texteng.hxx>
 #include <vcl/textview.hxx>
 #include <vcl/textdata.hxx>
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index d18797493341..5eb59e3eac9e 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -35,6 +35,7 @@
 #include <vcl/svapp.hxx>
 #include <tools/stream.hxx>
 
+#include <sal/log.hxx>
 #include <sot/formats.hxx>
 #include <svl/urlbmk.hxx>
 
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index fbf495aec3af..3a96985879cc 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -19,6 +19,7 @@
 
 #include <config_folders.h>
 
+#include <sal/log.hxx>
 #include <o3tl/make_unique.hxx>
 #include <osl/mutex.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index 0000ef1ce61d..8698a2672f3f 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/log.hxx>
 #include "decode.hxx"
 #include "gifread.hxx"
 #include <memory>
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index c5916a7a992d..49e4c6057858 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include "jpeg.h"
 #include <jpeglib.h>
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index c24b23463c21..cd87781ebd4f 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index ed02add407cc..17d119f4ee60 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <algorithm>
 
diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx
index 333bc8415c08..080521c771c9 100644
--- a/vcl/source/font/fontcache.cxx
+++ b/vcl/source/font/fontcache.cxx
@@ -24,6 +24,7 @@
 #include <PhysicalFontCollection.hxx>
 #include <PhysicalFontFace.hxx>
 #include <PhysicalFontFamily.hxx>
+#include <sal/log.hxx>
 
 size_t ImplFontCache::IFSD_Hash::operator()( const FontSelectPattern& rFSD ) const
 {
diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx
index bafa613b764d..153d5b62a918 100644
--- a/vcl/source/font/fontcharmap.cxx
+++ b/vcl/source/font/fontcharmap.cxx
@@ -18,6 +18,7 @@
 #include <vcl/fontcharmap.hxx>
 #include <fontinstance.hxx>
 #include <impfontcharmap.hxx>
+#include <sal/log.hxx>
 
 #include <vector>
 #include <set>
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index 4ef24c848ade..e6b507b161a6 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -22,6 +22,7 @@
 #include <unotools/configmgr.hxx>
 #include <vcl/fontcharmap.hxx>
 #include <vcl/metric.hxx>
+#include <sal/log.hxx>
 
 #include <fontinstance.hxx>
 #include <fontselect.hxx>
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index c573c88b5737..02a61e32d0d2 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -25,6 +25,7 @@
 #include <fontsubset.hxx>
 
 #include <vcl/strhelper.hxx>
+#include <sal/log.hxx>
 
 typedef sal_uInt8 U8;
 typedef sal_uInt16 U16;
diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx
index 8d2e1cf14218..2b50ed408a19 100644
--- a/vcl/source/fontsubset/fontsubset.cxx
+++ b/vcl/source/fontsubset/fontsubset.cxx
@@ -19,6 +19,7 @@
 
 
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 #include <fontsubset.hxx>
 #include <sft.hxx>
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 20e4f8382eaa..54dacc25152e 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -38,6 +38,7 @@
 #include "xlat.hxx"
 #include <rtl/crc.h>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/endian.h>
 #include <algorithm>
diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx
index 2a4e38175030..042d8e79517d 100644
--- a/vcl/source/fontsubset/xlat.cxx
+++ b/vcl/source/fontsubset/xlat.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <rtl/textcvt.h>
+#include <sal/log.hxx>
 #include "xlat.hxx"
 
 namespace {
diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 3d5d235fb601..2ce4e6890789 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -23,6 +23,7 @@
 
 #include <sallayout.hxx>
 
+#include <sal/log.hxx>
 #include <unotools/configmgr.hxx>
 #include <vcl/unohelp.hxx>
 #include <vcl/font/Feature.hxx>
diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx
index ae385ace0107..16e9c9965556 100644
--- a/vcl/source/gdi/alpha.cxx
+++ b/vcl/source/gdi/alpha.cxx
@@ -21,6 +21,7 @@
 #include <tools/color.hxx>
 #include <vcl/alpha.hxx>
 #include <bitmapwriteaccess.hxx>
+#include <sal/log.hxx>
 
 AlphaMask::AlphaMask() = default;
 
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 6896b1736a48..22519fa5b810 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -19,6 +19,7 @@
 
 #include <tools/stream.hxx>
 #include <rtl/crc.h>
+#include <sal/log.hxx>
 
 #include <vcl/animate.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index e178a0c845b3..2994bbc610aa 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -24,6 +24,7 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/bitmap.hxx>
 #include <config_features.h>
+#include <sal/log.hxx>
 #if HAVE_FEATURE_OPENGL
 #include <vcl/opengl/OpenGLHelper.hxx>
 #endif
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 4f3ac4f0b5da..ae7e5bcd858d 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -19,6 +19,7 @@
 
 #include <rtl/crc.h>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index ae82afd2bc0f..d180d8600d1d 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -27,6 +27,7 @@
 #include <salinst.hxx>
 
 #include <string.h>
+#include <sal/log.hxx>
 
 BitmapInfoAccess::BitmapInfoAccess( Bitmap& rBitmap, BitmapAccessMode nMode ) :
             mpBuffer        ( nullptr ),
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index be98cf70ee95..3f1d678f9767 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -24,6 +24,7 @@
 #define FAST_ARGB_BGRA
 
 #include <stdlib.h>
+#include <sal/log.hxx>
 
 typedef unsigned char PIXBYTE;
 
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index a63fb540a1f6..d4419f52b460 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <o3tl/any.hxx>
+#include <sal/log.hxx>
 
 using namespace utl;
 using namespace vcl;
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index f3a5456d2c93..62262bae7990 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cassert>
 
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx
index 55ff565988b8..30a6ae5b2ee3 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -13,6 +13,7 @@
 
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/embeddedfontshelper.hxx>
 
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index afad52d2cc3e..2c6a981d1542 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -20,6 +20,7 @@
 #include <rtl/crc.h>
 #include <cstdlib>
 #include <memory>
+#include <sal/log.hxx>
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
 #include <tools/fract.hxx>
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index d37938dba8a0..825823926a0d 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <osl/file.h>
+#include <sal/log.hxx>
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
 #include <unotools/tempfile.hxx>
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 467e130c8738..c0767474a01a 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 0c6acb105fda..8f80bbb11cf6 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -19,6 +19,7 @@
 
 #include <stdlib.h>
 
+#include <sal/log.hxx>
 #include <o3tl/make_unique.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <tools/poly.hxx>
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 95c8669a7f97..6326c6703a6b 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -19,6 +19,7 @@
 
 #include <rtl/alloc.h>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <tools/stream.hxx>
 #include <vcl/jobset.hxx>
 #include <jobset.h>
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 013662a7ab5a..f7d39099d624 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <osl/thread.h>
+#include <sal/log.hxx>
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
 #include <tools/helpers.hxx>
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 4384d96e1a47..cd9dbfbc4ac1 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -26,6 +26,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <sal/log.hxx>
 
 #include <set>
 #include <memory>
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 85d71d4c7844..7fd72ab9a671 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -55,6 +55,7 @@
 #include <rtl/crc.h>
 #include <rtl/digest.h>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <svl/urihelper.hxx>
 #include <tools/debug.hxx>
 #include <tools/fract.hxx>
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 562bec80759b..1551a6e36d67 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -45,6 +45,7 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <rtl/digest.h>
+#include <sal/log.hxx>
 #include <memory>
 
 using namespace vcl;
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index f4195fd5c352..908dc4c3d460 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cassert>
 #include <memory>
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 4760cdff6e90..b11b453395c8 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/types.h>
+#include <sal/log.hxx>
 
 #include <tools/helpers.hxx>
 
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index e131b061557b..dc72c5533e4b 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -25,6 +25,7 @@
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <sal/log.hxx>
 
 
 #include <vcl/virdev.hxx>
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 64d316bdd4aa..bcffc811fc67 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -27,6 +27,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 #include <sal/types.h>
+#include <sal/log.hxx>
 
 #include <printdlg.hxx>
 #include <svdata.hxx>
diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx
index 5b6d8efd856b..90af8e74da06 100644
--- a/vcl/source/gdi/regband.cxx
+++ b/vcl/source/gdi/regband.cxx
@@ -21,6 +21,7 @@
 
 #include <tools/helpers.hxx>
 #include <osl/diagnose.hxx>
+#include <sal/log.hxx>
 
 #include <regband.hxx>
 
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index 3beb8864db6b..abfc5ad55357 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -23,6 +23,7 @@
 #include <tools/stream.hxx>
 #include <tools/helpers.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <vcl/region.hxx>
 #include <regionband.hxx>
 
diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx
index 0cd74fa869a2..50f0cecd6616 100644
--- a/vcl/source/gdi/regionband.cxx
+++ b/vcl/source/gdi/regionband.cxx
@@ -21,6 +21,7 @@
 #include <tools/debug.hxx>
 #include <regionband.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 RegionBand::RegionBand()
 :   mpFirstBand(nullptr),
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 47b2f7590321..8a70deeb3a59 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -19,6 +19,7 @@
 
 #include <memory>
 #include <config_features.h>
+#include <sal/log.hxx>
 #if HAVE_FEATURE_OPENGL
 #include <openglgdiimpl.hxx>
 #include <opengl/zone.hxx>
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index d921354879fc..4ab8e9376cb4 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -21,6 +21,7 @@
 #include <iomanip>
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cstdio>
 
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx
index 15fef5272b9b..6af3de0fd755 100644
--- a/vcl/source/gdi/salmisc.cxx
+++ b/vcl/source/gdi/salmisc.cxx
@@ -22,6 +22,7 @@
 #include <bmpfast.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <memory>
 
 #define IMPL_CASE_GET_FORMAT( Format )                          \
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 4ec0d5df17d7..8393c482e41d 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -29,6 +29,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/lineinfo.hxx>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 
 #include <svmconverter.hxx>
 
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index eaecdd275d63..d0b9947aeb30 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -27,6 +27,7 @@
 
 #include <tools/diagnose_ex.h>
 #include <tools/fract.hxx>
+#include <sal/log.hxx>
 
 #if OSL_DEBUG_LEVEL > 1
 #include <rtl/strbuf.hxx>
diff --git a/vcl/source/gdi/vectorgraphicdata.cxx b/vcl/source/gdi/vectorgraphicdata.cxx
index 434736526294..3beb9b8aab4e 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <tools/stream.hxx>
+#include <sal/log.hxx>
 #include <vcl/vectorgraphicdata.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index dad14458705c..4f3b65b58ede 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -24,6 +24,7 @@
 #include <PhysicalFontCollection.hxx>
 #include <svdata.hxx>
 #include <vcl/ITiledRenderable.hxx>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star::uno;
 
diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx
index c2146a680e8a..83c2dfb73529 100644
--- a/vcl/source/graphic/Manager.cxx
+++ b/vcl/source/graphic/Manager.cxx
@@ -21,6 +21,7 @@
 #include <impgraph.hxx>
 #include <vcl/lazydelete.hxx>
 #include <o3tl/make_unique.hxx>
+#include <sal/log.hxx>
 
 using namespace css;
 
diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx b/vcl/source/graphic/UnoGraphicProvider.cxx
index 5b28ed3723c5..82823b8152b1 100644
--- a/vcl/source/graphic/UnoGraphicProvider.cxx
+++ b/vcl/source/graphic/UnoGraphicProvider.cxx
@@ -39,6 +39,7 @@
 #include <comphelper/fileformat.h>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <sal/log.hxx>
 
 #include <graphic/UnoGraphicDescriptor.hxx>
 #include <graphic/UnoGraphic.hxx>
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index 02b0fc338d72..aa3cce22863d 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -48,6 +48,7 @@
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
+#include <sal/log.hxx>
 #include <tools/poly.hxx>
 #include <tools/diagnose_ex.h>
 #include <rtl/uuid.h>
diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx
index 3fa7be908c92..6ce0c21effd5 100644
--- a/vcl/source/helper/lazydelete.cxx
+++ b/vcl/source/helper/lazydelete.cxx
@@ -21,6 +21,7 @@
 #include <vcl/menu.hxx>
 #include <vcl/lazydelete.hxx>
 #include <svdata.hxx>
+#include <sal/log.hxx>
 
 namespace vcl {
 
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index d48cd3044b07..fd1025dec240 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -20,6 +20,7 @@
 #include <config_folders.h>
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <deque>
 
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 9d3ad9497ccb..ffc1a5f61190 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -19,6 +19,7 @@
 #include <vcl/graph.hxx>
 
 #include <osl/thread.hxx>
+#include <sal/log.hxx>
 
 #include <svdata.hxx>
 #include <salgdi.hxx>
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 267c1c58f415..6fb97894df45 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -15,6 +15,7 @@
 #include <rtl/digest.h>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <config_folders.h>
 #include <vcl/salbtype.hxx>
 #include <vcl/bitmapaccess.hxx>
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 0ab77a8b578d..ffc1299925d8 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -43,6 +43,7 @@
 #include <memory>
 #include <comphelper/lok.hxx>
 #include <bitmapwriteaccess.hxx>
+#include <sal/log.hxx>
 
 void OutputDevice::DrawBitmap( const Point& rDestPt, const Bitmap& rBitmap )
 {
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 17fd97462947..d8015f6de0fa 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -26,6 +26,7 @@
 #include <vcl/sysdata.hxx>
 #include <vcl/fontcharmap.hxx>
 #include <font/FeatureCollector.hxx>
+#include <sal/log.hxx>
 
 #include <sallayout.hxx>
 #include <salgdi.hxx>
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index bae0162fd387..d88960d9da9b 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -23,6 +23,7 @@
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/wrkwin.hxx>
+#include <sal/log.hxx>
 
 #include <svdata.hxx>
 #include <window.h>
diff --git a/vcl/source/outdev/nativecontrols.cxx b/vcl/source/outdev/nativecontrols.cxx
index 81acddfe2f12..b96dc63c13fe 100644
--- a/vcl/source/outdev/nativecontrols.cxx
+++ b/vcl/source/outdev/nativecontrols.cxx
@@ -22,6 +22,7 @@
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
+#include <sal/log.hxx>
 
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/pdfextoutdevdata.hxx>
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index cb902f4fbc86..901b20580fdf 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index 24e0b75e3c3e..757ae1fc03e2 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
diff --git a/vcl/source/outdev/pixel.cxx b/vcl/source/outdev/pixel.cxx
index 04f35b41e777..270a50bf6710 100644
--- a/vcl/source/outdev/pixel.cxx
+++ b/vcl/source/outdev/pixel.cxx
@@ -20,6 +20,7 @@
 #include <cassert>
 
 #include <sal/types.h>
+#include <sal/log.hxx>
 
 #include <memory>
 #include <vcl/gdimtf.hxx>
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 31a19fb3c334..fdcca1565731 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 <sal/log.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/textrectinfo.hxx>
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 0540b9ba0ec4..7962a119fdd9 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -23,6 +23,7 @@
 #include <comphelper/string.hxx>
 
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <iostream>
 #include <memory>
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index d81ea72838ea..69a556e0ecaa 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
+#include <sal/log.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 #include <accel.h>
diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx
index 37ff8ddcff82..7500f0507a34 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -83,6 +83,7 @@
 
 #include <sal/macros.h>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 
 #include <set>
 #include <typeinfo>
diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx
index 59889e3720a0..25cf8693c867 100644
--- a/vcl/source/window/debugevent.cxx
+++ b/vcl/source/window/debugevent.cxx
@@ -10,6 +10,7 @@
 #include <comphelper/random.hxx>
 #include <rtl/math.hxx>
 #include <rtl/string.hxx>
+#include <sal/log.hxx>
 #include <tools/time.hxx>
 #include <vcl/keycodes.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 386abfaeac4f..76adefb1d2a1 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -31,6 +31,7 @@
 #include <vcl/button.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/unohelp.hxx>
+#include <sal/log.hxx>
 
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
 
diff --git a/vcl/source/window/dndeventdispatcher.cxx b/vcl/source/window/dndeventdispatcher.cxx
index 9a0814052b24..0b0059914259 100644
--- a/vcl/source/window/dndeventdispatcher.cxx
+++ b/vcl/source/window/dndeventdispatcher.cxx
@@ -21,6 +21,7 @@
 #include <dndlistenercontainer.hxx>
 #include <window.h>
 #include <svdata.hxx>
+#include <sal/log.hxx>
 
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index eb27e3e18c05..00d49f21a8a2 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <tools/time.hxx>
+#include <sal/log.hxx>
 
 #include <brdwin.hxx>
 #include <svdata.hxx>
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index f76a27bd6a1f..dadacee4cecb 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <tools/time.hxx>
+#include <sal/log.hxx>
 #include <vcl/event.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/dockwin.hxx>
diff --git a/vcl/source/window/errinf.cxx b/vcl/source/window/errinf.cxx
index f689fbac30b3..0ec0ca504b68 100644
--- a/vcl/source/window/errinf.cxx
+++ b/vcl/source/window/errinf.cxx
@@ -19,6 +19,7 @@
 
 #include <osl/diagnose.h>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 
 #include <vcl/errinf.hxx>
 #include <vcl/window.hxx>
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index b344d7104fc6..81a0558e3321 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -22,6 +22,7 @@
 #include <vcl/dockwin.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/opengl/OpenGLWrapper.hxx>
+#include <sal/log.hxx>
 
 #include <window.h>
 #include <svdata.hxx>
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index ea1001f3351e..5acbf1cc8bc2 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -23,6 +23,7 @@
 #include <salframe.hxx>
 
 #include <comphelper/lok.hxx>
+#include <sal/log.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 26cb8d0bb8d8..abaec7ce72a4 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -21,6 +21,7 @@
 #include <boost/multi_array.hpp>
 #include <officecfg/Office/Common.hxx>
 #include <vcl/abstdlg.hxx>
+#include <sal/log.hxx>
 
 #include <svdata.hxx>
 #include <strings.hrc>
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index a1e3180ace35..5f3bb6e02e0e 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -19,6 +19,7 @@
 
 #include <tools/diagnose_ex.h>
 #include <tools/stream.hxx>
+#include <sal/log.hxx>
 
 #include <comphelper/lok.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index e2d6660dd7af..6fbb4af4eac3 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -24,6 +24,7 @@
 #include <vcl/dockingarea.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/taskpanelist.hxx>
+#include <sal/log.hxx>
 
 #include <salframe.hxx>
 #include <salmenu.hxx>
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 5ef774b617f9..8e7254299a3d 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -21,6 +21,7 @@
 #include "menuitemlist.hxx"
 #include "menubarwindow.hxx"
 
+#include <sal/log.hxx>
 #include <salmenu.hxx>
 #include <svdata.hxx>
 #include <vcl/decoview.hxx>
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 294367559cc9..67bc756b30da 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -26,6 +26,7 @@
 #include <vcl/settings.hxx>
 
 #include <sal/types.h>
+#include <sal/log.hxx>
 
 #include <window.h>
 #include <salgdi.hxx>
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index f5bf9a09326d..35be2e7ae4ad 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -41,6 +41,7 @@
 #include <unotools/localedatawrapper.hxx>
 
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index 0f4e932f87ff..118ca5f77fca 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -27,6 +27,7 @@
 
 #include <vcl/timer.hxx>
 #include <vcl/event.hxx>
+#include <sal/log.hxx>
 
 #include <math.h>
 
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index 03fdc652bcfa..be4092de6822 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -20,6 +20,7 @@
 #include <vcl/window.hxx>
 #include <vcl/seleng.hxx>
 #include <comphelper/lok.hxx>
+#include <sal/log.hxx>
 
 FunctionSet::~FunctionSet()
 {
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 710ffb1acd96..d43da0bd2411 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -20,6 +20,7 @@
 #include <string.h>
 
 #include <tools/debug.hxx>
+#include <sal/log.hxx>
 
 #include <vcl/event.hxx>
 #include <vcl/wall.hxx>
diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx
index e32a93a001cc..00ea845972a8 100644
--- a/vcl/source/window/stacking.cxx
+++ b/vcl/source/window/stacking.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/window.hxx>
 #include <vcl/taskpanelist.hxx>
+#include <sal/log.hxx>
 
 // declare system types in sysdata.hxx
 #include <vcl/sysdata.hxx>
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 61b467b8360d..769e43e7b0c9 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -18,6 +18,7 @@
  */
 
 
+#include <sal/log.hxx>
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 5f8b22416dfc..187667e288a7 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -19,6 +19,7 @@
 
 #include <memory>
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cstdlib>
 
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index d1007d4badcd..c21499e00d29 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -34,6 +34,7 @@
 
 #include <tools/poly.hxx>
 #include <svl/imageitm.hxx>
+#include <sal/log.hxx>
 
 #include <svdata.hxx>
 #include <window.h>
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index ab4c90ece48f..0a28da840392 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <comphelper/processfactory.hxx>
 
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 02f856cf4eb6..08f61fe76f8f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -19,6 +19,7 @@
 
 #include <config_features.h>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 
 #include <sal/types.h>
 #include <vcl/salgtype.hxx>
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 096df67d2c99..4642b5fa820a 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -19,6 +19,7 @@
 
 #include <limits.h>
 #include <tools/poly.hxx>
+#include <sal/log.hxx>
 
 #include <vcl/bitmap.hxx>
 #include <vcl/dialog.hxx>
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 8a4c4c075242..2becf4a6914a 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -19,6 +19,7 @@
 
 #include <tools/debug.hxx>
 #include <tools/time.hxx>
+#include <sal/log.hxx>
 
 #include <unotools/localedatawrapper.hxx>
 
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 39d8395e7af8..1133a9f383ad 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -18,6 +18,7 @@
  */
 
 
+#include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 // declare system types in sysdata.hxx
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 9fb0aa5c799a..cf3ba86da73b 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -58,6 +58,7 @@
 #include <osl/thread.h>
 #include <rtl/strbuf.hxx>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index feb6bbca4d5e..722819a7f515 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -28,6 +28,7 @@
 #include <fcntl.h>
 
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 
 #include <rtl/process.h>
 #include <osl/security.h>
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 40455e4756b5..5e1c1b3754be 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cstdlib>
 
diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx
index 3b7453b7d89f..f83e6d581d82 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.cxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.cxx
@@ -21,6 +21,7 @@
 #include <X11/Xatom.h>
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.hpp>
 #include <com/sun/star/io/IOException.hpp>
+#include <sal/log.hxx>
 
 using namespace com::sun::star::datatransfer;
 using namespace com::sun::star::lang;
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index a746061b8ebb..10cb3a76f3fa 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -30,6 +30,7 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nutil/unicode.hxx>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 #include <unicode/uchar.h>
 #include <unicode/uscript.h>
 #include <officecfg/Office/Common.hxx>
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index a71fb7da6457..e301ab701d2b 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -47,6 +47,7 @@
 #include <rtl/strbuf.hxx>
 
 #include <sal/macros.h>
+#include <sal/log.hxx>
 
 #include <i18nlangtag/applelangid.hxx>
 #include <i18nlangtag/mslangid.hxx>
diff --git a/vcl/unx/generic/fontmanager/helper.cxx b/vcl/unx/generic/fontmanager/helper.cxx
index af06413190a1..7fa11915ed80 100644
--- a/vcl/unx/generic/fontmanager/helper.cxx
+++ b/vcl/unx/generic/fontmanager/helper.cxx
@@ -28,6 +28,7 @@
 #include <osl/thread.h>
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <tools/urlobj.hxx>
 #include <unx/helper.hxx>
 #include <vcl/ppdparser.hxx>
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
index fdb3ede4f44d..c2cd8496d168 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
@@ -30,6 +30,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
 #include <basegfx/vector/b2isize.hxx>
+#include <sal/log.hxx>
 
 #include <cairo-xlib.h>
 #include <cairo-xlib-xrender.h>
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 878abefb346b..799a0cbb4630 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -25,6 +25,7 @@
 #include <vcl/sysdata.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/fontcharmap.hxx>
+#include <sal/log.hxx>
 
 #include <unx/printergfx.hxx>
 #include <unx/genpspgraphics.h>
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 1fd3d61be2b8..901e9fd3b0ce 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -27,6 +27,7 @@
 
 #include <vcl/salbtype.hxx>
 #include <vcl/gradient.hxx>
+#include <sal/log.hxx>
 
 #include <unx/salunx.h>
 #include <unx/saldisp.hxx>
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index a8b5f365a83b..f800a776a6e3 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -29,6 +29,7 @@
 #include <X11/Xproto.h>
 
 #include <osl/endian.h>
+#include <sal/log.hxx>
 
 #include <vcl/bitmap.hxx>
 #include <vcl/salbtype.hxx>
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index e09766c1e598..622dc223dcc6 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -44,6 +44,7 @@
 #include <vcl/jobdata.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/virdev.hxx>
+#include <sal/log.hxx>
 
 #include <unx/salunx.h>
 #include <unx/saldisp.hxx>
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 33ab8498c3d6..15b9b313e9d2 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -22,6 +22,7 @@
 
 #include <vcl/salbtype.hxx>
 #include <vcl/sysdata.hxx>
+#include <sal/log.hxx>
 
 #include <unx/pixmap.hxx>
 #include <unx/salunx.h>
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index d17f02db69ff..32d6f9c8d10a 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -37,6 +37,7 @@
 
 #include <osl/file.hxx>
 #include <osl/thread.hxx>
+#include <sal/log.hxx>
 
 #include <langboost.hxx>
 #include <PhysicalFontCollection.hxx>
diff --git a/vcl/unx/generic/glyphs/glyphcache.cxx b/vcl/unx/generic/glyphs/glyphcache.cxx
index cff473c9036c..e43b6db2e238 100644
--- a/vcl/unx/generic/glyphs/glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/glyphcache.cxx
@@ -28,6 +28,7 @@
 
 #include <rtl/ustring.hxx>
 #include <osl/file.hxx>
+#include <sal/log.hxx>
 
 static GlyphCache* pInstance = nullptr;
 
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index d3939b986b41..cadfb34842ae 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -22,6 +22,7 @@
 
 #include <rtl/bootstrap.hxx>
 #include <rtl/process.h>
+#include <sal/log.hxx>
 
 #include <salinst.hxx>
 #include <unx/gensys.h>
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 58c70696fab1..0285449a124a 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -36,6 +36,7 @@
 
 #include <comphelper/fileurl.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 
 #include <vcl/idle.hxx>
 #include <vcl/print.hxx>
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 4bcc0a227dd0..b73fc595daea 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <vector>
 
diff --git a/vcl/unx/generic/printer/cpdmgr.cxx b/vcl/unx/generic/printer/cpdmgr.cxx
index 1e221d9547cd..d69b0bea726e 100644
--- a/vcl/unx/generic/printer/cpdmgr.cxx
+++ b/vcl/unx/generic/printer/cpdmgr.cxx
@@ -25,6 +25,7 @@
 #include <osl/thread.h>
 
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <config_dbus.h>
 #include <config_gio.h>
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index a6cae038aa36..4434ee0af464 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -31,6 +31,7 @@
 #include <osl/conditn.hxx>
 
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <officecfg/Office/Common.hxx>
 
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 78c0dad4e075..3b96fa79606a 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -40,6 +40,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>
 #include <sal/macros.h>
+#include <sal/log.hxx>
 #include <salhelper/linkhelper.hxx>
 
 #include <com/sun/star/lang/Locale.hpp>
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 8db7f9ee30b9..454dcdd150d3 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -34,6 +34,7 @@
 #include <i18nutil/paper.hxx>
 #include <rtl/strbuf.hxx>
 #include <sal/macros.h>
+#include <sal/log.hxx>
 
 #include <osl/thread.hxx>
 #include <osl/mutex.hxx>
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 88a9c455cbb1..7446dbf360f2 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -64,6 +64,7 @@
 #include <window.h>
 
 #include <sal/macros.h>
+#include <sal/log.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 
 #include <svdata.hxx>
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index 6cc70916a691..c406b152e3a4 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -28,6 +28,7 @@
 
 #include <vcl/keycodes.hxx>
 #include <vcl/event.hxx>
+#include <sal/log.hxx>
 
 #include <unx/salunx.h>
 #include <unx/salinst.h>
diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index 82f18a58a217..1c1cff15dd4b 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -36,6 +36,7 @@
 #include <vcl/svapp.hxx>
 
 #include <rtl/ref.hxx>
+#include <sal/log.hxx>
 
 #define DEBUG_ATK_LISTENER 0
 
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 16271c9696c5..b5748c12d1a9 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
+#include <sal/log.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index 930702f92b27..31cbf83fd429 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -21,6 +21,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/popupmenuwindow.hxx>
+#include <sal/log.hxx>
 
 #include "atkwindow.hxx"
 #include "atkwrapper.hxx"
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index fd65f6b380d2..f3e8e1ab7f39 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -38,6 +38,7 @@
 #include <osl/diagnose.h>
 #include <osl/process.h>
 #include <rtl/process.h>
+#include <sal/log.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index addd0b4dbb48..50fb9c0f4d08 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -35,6 +35,7 @@
 #include <vcl/svapp.hxx>
 #include <unx/gtk/gtkinst.hxx>
 #include <gtk/fpicker/SalGtkFolderPicker.hxx>
+#include <sal/log.hxx>
 
 #include <string.h>
 
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index 252798960ad7..b89a9cd9b8a7 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <rtl/process.h>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
 
diff --git a/vcl/unx/gtk/gloactiongroup.cxx b/vcl/unx/gtk/gloactiongroup.cxx
index fe946f08957f..0ba1112f928f 100644
--- a/vcl/unx/gtk/gloactiongroup.cxx
+++ b/vcl/unx/gtk/gloactiongroup.cxx
@@ -15,6 +15,8 @@
 #include <unx/gtk/gtkinst.hxx>
 #include <unx/gtk/gtkframe.hxx>
 
+#include <sal/log.hxx>
+
 /*
  * GLOAction
  */
diff --git a/vcl/unx/gtk/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx
index 689fa071ce5b..7263685368ce 100644
--- a/vcl/unx/gtk/gtkdata.cxx
+++ b/vcl/unx/gtk/gtkdata.cxx
@@ -38,6 +38,7 @@
 #include <unx/geninst.h>
 #include <osl/thread.h>
 #include <osl/process.h>
+#include <sal/log.hxx>
 
 #include <unx/i18n_im.hxx>
 #include <unx/i18n_xkb.hxx>
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index 20fc1a4e6a0a..a22529d0a8a6 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -35,6 +35,7 @@
 #include <vcl/inputtypes.hxx>
 #include <unx/genpspgraphics.h>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 #include <rtl/uri.hxx>
 
 #include <vcl/settings.hxx>
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 16e716b16daa..b63e4ac235ad 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -34,6 +34,7 @@
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/process.h>
+#include <sal/log.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
diff --git a/vcl/unx/gtk/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx
index 0eba1ccee23e..ddc9ba3ca234 100644
--- a/vcl/unx/gtk/salprn-gtk.cxx
+++ b/vcl/unx/gtk/salprn-gtk.cxx
@@ -37,6 +37,7 @@
 #include <officecfg/Office/Common.hxx>
 
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 
 #include <unotools/streamwrap.hxx>
 
diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index 024dac2a5014..030e922ae101 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -46,6 +46,7 @@
 #include <unx/x11_cursors/salcursors.h>
 
 #include <vcl/svapp.hxx>
+#include <sal/log.hxx>
 
 #ifdef GDK_WINDOWING_X11
 #  include <gdk/gdkx.h>
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index c1c560b3f9ce..1791b82ac4f8 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -36,6 +36,7 @@
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/process.h>
+#include <sal/log.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 2041f6d90f12..feafcc49a169 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -29,6 +29,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 #include <tools/fract.hxx>
 #include <tools/stream.hxx>
 #include <unotools/resmgr.hxx>
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 180a050ebc59..9037cff8c11b 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <config_cairo_canvas.h>
 
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index f601fe59f92f..c6ce35128e09 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -36,6 +36,7 @@
 #include <vcl/syswin.hxx>
 
 #include <osl/file.h>
+#include <sal/log.hxx>
 
 #include "FPServiceInfo.hxx"
 #include "VCLKDEApplication.hxx"
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 7dde568a23b1..e9b5f4ecc1ba 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -41,6 +41,7 @@
 
 #include <vcl/font.hxx>
 #include <vcl/settings.hxx>
+#include <sal/log.hxx>
 
 #include <unx/fontmanager.hxx>
 
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 60c39edff386..0852c543a6d7 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -39,6 +39,7 @@
 #include <unx/saldata.hxx>
 #include <o3tl/make_unique.hxx>
 #include <osl/process.h>
+#include <sal/log.hxx>
 
 #include "KDESalDisplay.hxx"
 
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index 13b0d46193b7..ce01db772fe6 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -25,6 +25,7 @@
 #include <vclpluginapi.h>
 
 #include <rtl/string.hxx>
+#include <sal/log.hxx>
 
 /// entry point for the KDE4 VCL plugin
 extern "C" {
diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index 123df3a09118..5de295453bd8 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
 #include <osl/mutex.hxx>
+#include <sal/log.hxx>
 
 #undef Region
 
diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx
index d282a083959a..0679ac0847b7 100644
--- a/vcl/unx/kde5/KDE5SalFrame.cxx
+++ b/vcl/unx/kde5/KDE5SalFrame.cxx
@@ -38,6 +38,7 @@
 
 #include <vcl/font.hxx>
 #include <vcl/settings.hxx>
+#include <sal/log.hxx>
 
 #include <unx/fontmanager.hxx>
 
diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
index 37021cbe9315..fecf22b49037 100644
--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
@@ -25,6 +25,7 @@
 #include <QtWidgets/QFrame>
 
 #include <osl/process.h>
+#include <sal/log.hxx>
 
 #include "KDE5FilePicker.hxx"
 #include "KDE5SalData.hxx"
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 468cff39f485..778d0a4b2e7e 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 <sal/log.hxx>
 #include <tools/time.hxx>
 #include <comphelper/solarmutex.hxx>
 #include <o3tl/char16_t2wchar_t.hxx>
diff --git a/vcl/win/app/salshl.cxx b/vcl/win/app/salshl.cxx
index 1cd38e05abeb..5619ece1f057 100644
--- a/vcl/win/app/salshl.cxx
+++ b/vcl/win/app/salshl.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <svsys.h>
+#include <sal/log.hxx>
 #include <win/saldata.hxx>
 
 SalShlData aSalShlData;
diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx
index c70189be4bba..689c055a55f5 100644
--- a/vcl/win/app/saltimer.cxx
+++ b/vcl/win/app/saltimer.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <tools/time.hxx>
 
diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx b/vcl/win/gdi/DWriteTextRenderer.cxx
index ffca720f3e6b..7662bcc0aff4 100644
--- a/vcl/win/gdi/DWriteTextRenderer.cxx
+++ b/vcl/win/gdi/DWriteTextRenderer.cxx
@@ -30,6 +30,7 @@
 #include <winver.h>
 
 #include <comphelper/windowserrorstring.hxx>
+#include <sal/log.hxx>
 
 HINSTANCE D2DWriteTextOutRenderer::mmD2d1 = nullptr,
           D2DWriteTextOutRenderer::mmDWrite = nullptr;
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 5b7f225e7d96..a66f1f5f9579 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -23,6 +23,7 @@
 
 #include <string.h>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 #include <tools/poly.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index 9e001429abb1..36bab849a316 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <vcl/timer.hxx>
 #include <cppuhelper/basemutex.hxx>
+#include <sal/log.hxx>
 #include <map>
 
 #if defined _MSC_VER
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 16613637f56b..61f76dd74608 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -36,6 +36,7 @@
 #include <osl/process.h>
 #include <rtl/bootstrap.hxx>
 #include <rtl/tencinfo.h>
+#include <sal/log.hxx>
 #include <o3tl/char16_t2wchar_t.hxx>
 #include <tools/helpers.hxx>
 #include <tools/stream.hxx>
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 0f16b32ab530..2cf633fb3ade 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <memory>
 #include <string.h>
diff --git a/vcl/win/gdi/salvd.cxx b/vcl/win/gdi/salvd.cxx
index 3532f2134f4d..f0cf1fc9f47b 100644
--- a/vcl/win/gdi/salvd.cxx
+++ b/vcl/win/gdi/salvd.cxx
@@ -29,6 +29,7 @@
 #include <win/salgdi.h>
 #include <win/salvd.h>
 #include <opengl/win/gdiimpl.hxx>
+#include <sal/log.hxx>
 
 HBITMAP WinSalVirtualDevice::ImplCreateVirDevBitmap(HDC hDC, long nDX, long nDY, sal_uInt16 nBitCount, void **ppData)
 {
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 1295d5bf1d4b..3800fcd9adc3 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -20,6 +20,7 @@
 #include <memory>
 #include <osl/module.h>
 #include <osl/file.h>
+#include <sal/log.hxx>
 
 #include <comphelper/windowserrorstring.hxx>
 
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 633e97c6670e..7d37bdcc652c 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -35,6 +35,7 @@
 
 #include <rtl/string.h>
 #include <rtl/ustring.h>
+#include <sal/log.hxx>
 
 #include <osl/module.h>
 
diff --git a/vcl/win/window/salobj.cxx b/vcl/win/window/salobj.cxx
index ad352217ed89..fcc2cd043f92 100644
--- a/vcl/win/window/salobj.cxx
+++ b/vcl/win/window/salobj.cxx
@@ -22,6 +22,7 @@
 #include <svsys.h>
 
 #include <vcl/svapp.hxx>
+#include <sal/log.hxx>
 
 #include <win/wincomp.hxx>
 #include <win/saldata.hxx>
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 9280ddeb9259..5f6743a52966 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -29,6 +29,7 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <osl/file.hxx>
+#include <sal/log.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx
index d70be0f230e1..7addd2bc54a3 100644
--- a/vcl/workben/mtfdemo.cxx
+++ b/vcl/workben/mtfdemo.cxx
@@ -25,6 +25,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/virdev.hxx>
+#include <sal/log.hxx>
 
 #include <cstdlib>
 
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 04889307c8ce..317762eaa861 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/main.h>
+#include <sal/log.hxx>
 #include <tools/extendapplicationenvironment.hxx>
 
 #include <cppuhelper/bootstrap.hxx>
diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx
index c406fba46c57..a2750f532e9e 100644
--- a/vcl/workben/svdem.cxx
+++ b/vcl/workben/svdem.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/main.h>
+#include <sal/log.hxx>
 #include <tools/extendapplicationenvironment.hxx>
 
 #include <cppuhelper/bootstrap.hxx>
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index c84919cb59aa..b096a205572d 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/main.h>
+#include <sal/log.hxx>
 
 #include <cppuhelper/bootstrap.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 190af5689bf3..00f99091e92d 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/main.h>
+#include <sal/log.hxx>
 #include <tools/extendapplicationenvironment.hxx>
 
 #include <cppuhelper/bootstrap.hxx>
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 4cac3e072ab7..ba27b77bdaab 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -11,6 +11,7 @@
 
 #include <math.h>
 #include <rtl/math.hxx>
+#include <sal/log.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/random.hxx>


More information about the Libreoffice-commits mailing list