From 6ff2d84ade299cb3d14d4110e4cf1a4b8070c030 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 22 Apr 2015 09:42:28 +0200
Subject: Various #include <sal/log.hxx> fixups

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.  Cleaned up some, but something like

  grep -FwL sal/log.hxx $(git grep -Elw \
    'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF') -- \*.cxx)

shows lots more files that potentially need fixing before the include can be
removed from rtl/string.hxx and rtl/ustring.hxx.

Change-Id: Ibf033363e83d37851776f392dc0b077381cd8b90
---
 avmedia/source/vlc/wrapper/SymbolLoader.hxx                   | 1 +
 basebmp/source/bitmapdevice.cxx                               | 1 +
 binaryurp/source/bridgefactory.cxx                            | 1 +
 binaryurp/source/reader.cxx                                   | 1 +
 bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx           | 1 +
 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx           | 1 +
 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx         | 1 +
 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx          | 1 +
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx           | 1 +
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx          | 1 +
 bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx           | 1 +
 bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx             | 1 +
 bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx            | 1 +
 bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx            | 1 +
 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx           | 1 +
 bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx            | 1 +
 bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx            | 1 +
 bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx         | 1 +
 bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx       | 1 +
 bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx            | 1 +
 bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx           | 1 +
 bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx           | 1 +
 bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx          | 1 +
 bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx             | 1 +
 bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx         | 1 +
 bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx         | 1 +
 bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx         | 1 +
 bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx                | 1 +
 bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx               | 1 +
 bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx           | 1 +
 bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx          | 1 +
 bridges/source/jni_uno/jni_base.h                             | 1 +
 comphelper/source/container/embeddedobjectcontainer.cxx       | 2 ++
 comphelper/source/misc/configuration.cxx                      | 1 +
 comphelper/source/misc/namedvaluecollection.cxx               | 1 +
 comphelper/source/misc/synchronousdispatch.cxx                | 3 +--
 comphelper/source/property/ChainablePropertySetInfo.cxx       | 1 +
 comphelper/source/property/MasterPropertySetInfo.cxx          | 1 +
 configmgr/source/access.cxx                                   | 1 +
 configmgr/source/parsemanager.cxx                             | 1 +
 configmgr/source/winreg.cxx                                   | 1 +
 cppu/source/LogBridge/LogBridge.cxx                           | 1 +
 cppu/source/UnsafeBridge/UnsafeBridge.cxx                     | 1 +
 cppu/source/uno/data.cxx                                      | 1 +
 cppu/source/uno/lbmap.cxx                                     | 1 +
 cppuhelper/source/component_context.cxx                       | 1 +
 cppuhelper/source/implbase_ex.cxx                             | 1 +
 cppuhelper/source/propshlp.cxx                                | 1 +
 cppuhelper/source/shlib.cxx                                   | 1 +
 cppuhelper/source/typemanager.cxx                             | 1 +
 dbaccess/source/ui/inc/directsql.hxx                          | 3 +++
 desktop/inc/app.hxx                                           | 1 +
 desktop/source/app/app.cxx                                    | 1 +
 desktop/source/app/appinit.cxx                                | 1 +
 desktop/source/app/check_ext_deps.cxx                         | 1 +
 desktop/source/app/dispatchwatcher.cxx                        | 2 ++
 desktop/source/app/officeipcthread.cxx                        | 1 +
 desktop/source/app/sofficemain.cxx                            | 1 +
 desktop/source/deployment/manager/dp_informationprovider.cxx  | 1 +
 desktop/source/deployment/manager/dp_manager.cxx              | 1 +
 desktop/source/deployment/misc/dp_misc.cxx                    | 1 +
 desktop/source/deployment/registry/component/dp_component.cxx | 1 +
 desktop/source/deployment/registry/dp_backend.cxx             | 1 +
 desktop/source/deployment/registry/package/dp_package.cxx     | 1 +
 desktop/source/lib/init.cxx                                   | 1 +
 desktop/source/migration/migration.cxx                        | 1 +
 desktop/source/migration/services/oo3extensionmigration.cxx   | 1 +
 desktop/source/offacc/acceptor.cxx                            | 1 +
 desktop/source/splash/splash.cxx                              | 1 +
 extensions/source/bibliography/datman.cxx                     | 1 +
 extensions/source/dbpilots/gridwizard.cxx                     | 1 +
 extensions/source/ole/olethread.cxx                           | 1 +
 extensions/source/plugin/base/xplugin.cxx                     | 1 +
 extensions/source/plugin/unx/npnapi.cxx                       | 1 +
 extensions/source/plugin/unx/nppapi.cxx                       | 1 +
 extensions/source/plugin/unx/npwrap.cxx                       | 1 +
 extensions/source/plugin/unx/plugcon.cxx                      | 2 ++
 extensions/source/plugin/unx/sysplug.cxx                      | 1 +
 extensions/source/plugin/win/sysplug.cxx                      | 2 ++
 extensions/source/propctrlr/formlinkdialog.cxx                | 1 +
 extensions/source/scanner/sane.cxx                            | 1 +
 extensions/source/update/feed/updatefeed.cxx                  | 1 +
 fpicker/source/win32/folderpicker/MtaFop.hxx                  | 3 +++
 framework/inc/classes/checkediterator.hxx                     | 3 +++
 i18npool/source/calendar/calendar_gregorian.cxx               | 1 +
 i18npool/source/localedata/localedata.cxx                     | 1 +
 i18npool/source/ordinalsuffix/ordinalsuffix.cxx               | 1 +
 i18npool/source/search/textsearch.cxx                         | 1 +
 i18nutil/source/utility/unicode.cxx                           | 1 +
 include/oox/token/tokenmap.hxx                                | 1 +
 include/svl/filerec.hxx                                       | 3 +++
 include/svx/svdtrans.hxx                                      | 1 +
 include/unotools/digitgroupingiterator.hxx                    | 1 +
 include/vcl/builder.hxx                                       | 1 +
 jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h               | 1 +
 opencl/source/openclconfig.cxx                                | 1 +
 opencl/source/openclwrapper.cxx                               | 1 +
 registry/source/keyimpl.cxx                                   | 1 +
 registry/source/reflread.cxx                                  | 1 +
 rsc/source/tools/rsctools.cxx                                 | 1 +
 sal/osl/unx/file_path_helper.cxx                              | 1 +
 sal/osl/unx/process_impl.cxx                                  | 1 +
 sal/textenc/textenc.cxx                                       | 1 +
 sax/source/expatwrap/sax_expat.cxx                            | 1 +
 sax/source/fastparser/fastparser.cxx                          | 1 +
 sax/source/tools/converter.cxx                                | 1 +
 sax/source/tools/fastserializer.cxx                           | 1 +
 sfx2/source/inc/sfxtypes.hxx                                  | 3 +++
 sot/source/sdstor/stgdir.cxx                                  | 1 +
 starmath/inc/caret.hxx                                        | 4 ++++
 starmath/inc/rect.hxx                                         | 1 +
 starmath/inc/utility.hxx                                      | 3 +++
 starmath/inc/visitors.hxx                                     | 4 ++++
 stoc/source/inspect/introspection.cxx                         | 1 +
 stoc/source/invocation_adapterfactory/iafactory.cxx           | 1 +
 stoc/source/javaloader/javaloader.cxx                         | 1 +
 stoc/test/testcorefl.cxx                                      | 3 +++
 store/source/lockbyte.cxx                                     | 1 +
 svl/source/filerec/filerec.cxx                                | 3 +++
 svl/source/items/grabbagitem.cxx                              | 3 +++
 svl/source/items/itempool.cxx                                 | 1 +
 svl/source/items/itemset.cxx                                  | 1 +
 svl/source/items/macitem.cxx                                  | 3 +++
 svl/source/items/rngitem.cxx                                  | 3 +++
 svl/source/items/srchitem.cxx                                 | 3 +++
 svl/source/items/style.cxx                                    | 1 +
 svl/source/numbers/zforfind.cxx                               | 1 +
 svl/source/numbers/zforlist.cxx                               | 3 +++
 svl/source/numbers/zformat.cxx                                | 1 +
 svl/source/numbers/zforscan.cxx                               | 1 +
 svl/source/undo/undo.cxx                                      | 1 +
 sw/inc/PostItMgr.hxx                                          | 1 +
 sw/inc/authfld.hxx                                            | 1 +
 sw/inc/tox.hxx                                                | 1 +
 sw/inc/unobaseclass.hxx                                       | 1 +
 sw/source/core/text/inftxt.hxx                                | 1 +
 tools/source/datetime/ttime.cxx                               | 3 ++-
 tools/source/fsys/urlobj.cxx                                  | 1 +
 tools/source/generic/color.cxx                                | 3 +++
 tools/source/generic/config.cxx                               | 1 +
 tools/source/generic/fract.cxx                                | 1 +
 tools/source/generic/gen.cxx                                  | 4 ++++
 tools/source/generic/poly.cxx                                 | 1 +
 tools/source/generic/poly2.cxx                                | 1 +
 tools/source/inet/inetstrm.cxx                                | 1 +
 tools/source/stream/stream.cxx                                | 1 +
 tools/source/stream/strmunx.cxx                               | 1 +
 ucbhelper/source/client/content.cxx                           | 1 +
 ucbhelper/source/provider/fd_inputstream.cxx                  | 1 +
 ucbhelper/source/provider/std_inputstream.cxx                 | 4 ++++
 ucbhelper/source/provider/std_outputstream.cxx                | 4 ++++
 unoidl/source/sourceprovider-parser.y                         | 1 +
 unotools/source/config/bootstrap.cxx                          | 1 +
 unotools/source/config/cmdoptions.cxx                         | 3 +++
 unotools/source/config/configitem.cxx                         | 3 +++
 unotools/source/config/configvaluecontainer.cxx               | 3 +++
 unotools/source/config/defaultoptions.cxx                     | 3 +++
 unotools/source/config/dynamicmenuoptions.cxx                 | 3 +++
 unotools/source/config/extendedsecurityoptions.cxx            | 3 +++
 unotools/source/config/historyoptions.cxx                     | 1 +
 unotools/source/config/lingucfg.cxx                           | 1 +
 unotools/source/config/pathoptions.cxx                        | 3 +++
 unotools/source/config/saveopt.cxx                            | 3 +++
 unotools/source/config/syslocaleoptions.cxx                   | 1 +
 unotools/source/config/useroptions.cxx                        | 3 +++
 unotools/source/i18n/calendarwrapper.cxx                      | 1 +
 unotools/source/i18n/charclass.cxx                            | 1 +
 unotools/source/i18n/collatorwrapper.cxx                      | 3 +++
 unotools/source/i18n/localedatawrapper.cxx                    | 1 +
 unotools/source/i18n/nativenumberwrapper.cxx                  | 3 +++
 unotools/source/i18n/numberformatcodewrapper.cxx              | 3 +++
 unotools/source/i18n/textsearch.cxx                           | 1 +
 unotools/source/i18n/transliterationwrapper.cxx               | 3 +++
 unotools/source/misc/fontcvt.cxx                              | 3 +++
 unotools/source/misc/mediadescriptor.cxx                      | 1 +
 unotools/source/misc/syslocale.cxx                            | 3 +++
 unotools/source/ucbhelper/localfilehelper.cxx                 | 1 +
 vcl/inc/outfont.hxx                                           | 1 +
 vcl/inc/sallayout.hxx                                         | 1 +
 xmlscript/source/xml_helper/xml_impctx.cxx                    | 2 ++
 xmlscript/source/xmldlg_imexp/xmldlg_export.cxx               | 1 +
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx            | 1 +
 xmlscript/source/xmldlg_imexp/xmldlg_import.cxx               | 1 +
 xmlscript/source/xmlflat_imexp/xmlbas_export.cxx              | 1 +
 xmlscript/source/xmlflat_imexp/xmlbas_import.cxx              | 1 +
 xmlscript/source/xmllib_imexp/xmllib_import.cxx               | 4 ++++
 xmlscript/source/xmlmod_imexp/xmlmod_import.cxx               | 4 ++++
 187 files changed, 272 insertions(+), 3 deletions(-)

diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index dce28f6230d4..a3c2aa31a0ed 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -15,6 +15,7 @@
 #endif
 #include <osl/module.h>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 
 #define SYM_MAP(a) { #a, reinterpret_cast<SymbolFunc *>(&a) }
 
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index e9bdf9c921d6..04d4892ac054 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -52,6 +52,7 @@
 #include "intconversion.hxx"
 
 #include <rtl/alloc.h>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 
 #include <basegfx/tools/tools.hxx>
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index c9d0a04259eb..8f079f077848 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -33,6 +33,7 @@
 #include "cppuhelper/implementationentry.hxx"
 #include <cppuhelper/supportsservice.hxx>
 #include "rtl/ref.hxx"
+#include "sal/log.hxx"
 #include "sal/types.h"
 
 #include "bridge.hxx"
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 99ad7c41c1e5..4c0ba375a9d4 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -37,6 +37,7 @@
 #include "cppu/unotype.hxx"
 #include "rtl/byteseq.h"
 #include "rtl/ustring.hxx"
+#include "sal/log.hxx"
 #include "sal/types.h"
 #include "typelib/typeclass.h"
 #include "typelib/typedescription.h"
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
index 8fb27d251074..af4583865570 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
index a5757ae4fa91..9bd110a4b1da 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
@@ -35,6 +35,7 @@
 // future unification easier.
 
 #include <com/sun/star/uno/RuntimeException.hpp>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
index ee9fb30a07a9..98ac5173eb8a 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
@@ -28,6 +28,7 @@
 // full of copy/paste. So I continue in that tradition...
 
 #include <com/sun/star/uno/RuntimeException.hpp>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
index e10a444ce5ac..5eb41411db75 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
@@ -31,6 +31,7 @@
 // copy/paste. So I continue in that tradition...
 
 #include <com/sun/star/uno/RuntimeException.hpp>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
index 29db017e350b..718bc980ef81 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
@@ -29,6 +29,7 @@
 // as possible, to make future unification easier.
 
 #include <com/sun/star/uno/RuntimeException.hpp>
+#include <sal/log.hxx>
 
 #include "bridges/cpp_uno/shared/bridge.hxx"
 #include "bridges/cpp_uno/shared/types.hxx"
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
index 0231c468ec5a..54af31e6c9d8 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
@@ -24,6 +24,7 @@
 // changes.
 
 #include <com/sun/star/uno/RuntimeException.hpp>
+#include <sal/log.hxx>
 
 #include "bridges/cpp_uno/shared/bridge.hxx"
 #include "bridges/cpp_uno/shared/types.hxx"
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
index e95a7b08f970..f132d7e8c728 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
@@ -19,6 +19,7 @@
 
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 0c7769748531..c7b5fd94cbc0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -20,6 +20,7 @@
 #include <malloc.h>
 
 #include <rtl/alloc.h>
+#include <sal/log.hxx>
 #include <osl/mutex.hxx>
 
 #include <com/sun/star/uno/genfunc.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index c664f28c5558..d20cc0b7476f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
@@ -24,6 +24,7 @@
 
 #include <com/sun/star/uno/genfunc.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
index 6efcd0687adf..ec333fd659c5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
@@ -19,6 +19,7 @@
 
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
index 88fc904e6b24..70784124d0be 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
@@ -20,6 +20,7 @@
 
 #include <com/sun/star/uno/genfunc.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
index 18efddbc23d6..d961a386e5a8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
@@ -20,6 +20,7 @@
 #include <malloc.h>
 
 #include <rtl/alloc.h>
+#include <sal/log.hxx>
 #include <osl/mutex.hxx>
 
 #include <com/sun/star/uno/genfunc.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index bba1ce6a771f..167b4ade539f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/data.h>
 #include <osl/endian.h>
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
index b49cab4cf2a8..69a590cb6b6f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index f2e5174a1929..0748d244f2f9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -19,6 +19,7 @@
 
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 #include <osl/endian.h>
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
index b0f4f7ea06c4..a14021ea5ae0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
@@ -19,6 +19,7 @@
 
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
index b21d4f9a25b7..82fd47258734 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
@@ -19,6 +19,7 @@
 
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
index fb475cf46d32..93b10de5f4a6 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/data.h>
 #include "bridges/cpp_uno/shared/bridge.hxx"
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index 5151cc52a5b5..735bb976cf9b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 
 #include <rtl/alloc.h>
+#include <sal/log.hxx>
 #include <osl/mutex.hxx>
 
 #include <com/sun/star/uno/genfunc.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index 08cd765639c9..575e43251bbb 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -31,6 +31,7 @@
 #include <rtl/instance.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <typelib/typedescription.h>
 
 #include <rtti.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
index 22e38bccea44..f08e9a7f78c0 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 
 #include <rtl/alloc.h>
+#include <sal/log.hxx>
 #include <osl/mutex.hxx>
 
 #include <com/sun/star/uno/genfunc.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
index 5ef0fdc80349..aee85cc7eae2 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
@@ -23,6 +23,7 @@
 
 #include <com/sun/star/uno/genfunc.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
index f5fe6e78a100..8742b72fd65c 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/data.h>
 #include "bridges/cpp_uno/shared/bridge.hxx"
diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
index 0d376e65be4f..abe666fc8ddb 100644
--- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
@@ -23,6 +23,7 @@
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 #include <sal/alloca.h>
+#include <sal/log.hxx>
 
 #include "bridges/cpp_uno/shared/bridge.hxx"
 #include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx"
diff --git a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
index dcbf8fe5212f..08c7b7b3df87 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 
 #include <rtl/alloc.h>
+#include <sal/log.hxx>
 #include <osl/mutex.hxx>
 
 #include <com/sun/star/uno/genfunc.hxx>
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index 78d4bcc7b72b..58e4d642efe4 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -21,6 +21,7 @@
 #include <malloc.h>
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
index 1cd29f70a6b7..d7f534d2e015 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -21,6 +21,7 @@
 #include <malloc.h>
 
 #include <com/sun/star/uno/genfunc.hxx>
+#include <sal/log.hxx>
 #include <uno/data.h>
 #include <typelib/typedescription.hxx>
 
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index 1663eeaecbc4..2b856aaad6f6 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -31,6 +31,7 @@
 
 #include "rtl/alloc.h"
 #include "rtl/ustring.hxx"
+#include "sal/log.hxx"
 
 #include "uno/environment.h"
 #include "typelib/typedescription.h"
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 1f3f61b3b9d6..10a75516e868 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -42,6 +42,8 @@
 #include <comphelper/sequence.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/weakref.hxx>
+#include <sal/log.hxx>
+
 #include <algorithm>
 #include <unordered_map>
 
diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx
index ed28d0f5e04c..b01bdaef477b 100644
--- a/comphelper/source/misc/configuration.cxx
+++ b/comphelper/source/misc/configuration.cxx
@@ -30,6 +30,7 @@
 #include <rtl/instance.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
 namespace {
diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index e38223535241..a5670f050e2c 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -25,6 +25,7 @@
 
 #include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>
+#include <sal/log.hxx>
 
 #include <algorithm>
 #include <functional>
diff --git a/comphelper/source/misc/synchronousdispatch.cxx b/comphelper/source/misc/synchronousdispatch.cxx
index 2bd6d26575fb..9c73ebbca434 100644
--- a/comphelper/source/misc/synchronousdispatch.cxx
+++ b/comphelper/source/misc/synchronousdispatch.cxx
@@ -26,8 +26,7 @@
 
 #include <comphelper/synchronousdispatch.hxx>
 #include <comphelper/processfactory.hxx>
-
-
+#include <sal/log.hxx>
 
 namespace comphelper
 {
diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx
index 23a8ae272c71..4f7868dfa3cb 100644
--- a/comphelper/source/property/ChainablePropertySetInfo.cxx
+++ b/comphelper/source/property/ChainablePropertySetInfo.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/ChainablePropertySetInfo.hxx>
+#include <sal/log.hxx>
 
 using ::comphelper::PropertyInfo;
 using ::comphelper::ChainablePropertySetInfo;
diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx
index afbd849eb08d..43f0dccdb628 100644
--- a/comphelper/source/property/MasterPropertySetInfo.cxx
+++ b/comphelper/source/property/MasterPropertySetInfo.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/MasterPropertySetInfo.hxx>
+#include <sal/log.hxx>
 
 using ::comphelper::PropertyInfo;
 using ::comphelper::MasterPropertySetInfo;
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index a97a6825e96f..41d86e78228b 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -80,6 +80,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <sal/types.h>
 
 #include "access.hxx"
diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx
index dab0c496e7c7..48ec7379e169 100644
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -24,6 +24,7 @@
 
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
+#include <sal/log.hxx>
 #include <sal/types.h>
 #include <xmlreader/span.hxx>
 #include <xmlreader/xmlreader.hxx>
diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx
index 7d4e9e9c7e2f..a5723d7588ef 100644
--- a/configmgr/source/winreg.cxx
+++ b/configmgr/source/winreg.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <osl/file.h>
 #include <osl/file.hxx>
 #include "winreg.hxx"
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index 2948d9bf32d8..f79bedcd2f1c 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -30,6 +30,7 @@
 #include "cppu/EnvDcp.hxx"
 #include "uno/environment.hxx"
 #include <com/sun/star/uno/Type.hxx>
+#include <sal/log.hxx>
 
 namespace
 {
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 533ff93b372c..a2e9887ddec6 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -21,6 +21,7 @@
 #include "osl/mutex.hxx"
 #include "osl/thread.h"
 #include "osl/thread.hxx"
+#include "sal/log.hxx"
 
 #include <cppu/Enterable.hxx>
 #include "cppu/helper/purpenv/Environment.hxx"
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 2f027f0ab49b..9ae11151a006 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -23,6 +23,7 @@
 
 #include "cppu/macros.hxx"
 #include "osl/mutex.hxx"
+#include "sal/log.hxx"
 #include "uno/data.h"
 
 #include "constr.hxx"
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index f4cc581811c9..7da528cb372e 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -32,6 +32,7 @@
 #include "osl/diagnose.h"
 #include "osl/mutex.hxx"
 #include "osl/interlck.h"
+#include "sal/log.hxx"
 
 #include "uno/dispatcher.h"
 #include "uno/mapping.h"
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index f44bac2ee2ce..7451daf4cf56 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -35,6 +35,7 @@
 #include <osl/mutex.hxx>
 
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <uno/lbnames.h>
 #include <uno/mapping.hxx>
diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx
index 4d9e04f01788..ca5e1736f73b 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -24,6 +24,7 @@
 #include <rtl/byteseq.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/uuid.h>
+#include <sal/log.hxx>
 #include <cppuhelper/compbase_ex.hxx>
 
 #include <com/sun/star/uno/RuntimeException.hpp>
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 42fdfcae17a5..bdeb5f2a28e9 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <boost/scoped_array.hpp>
+#include <sal/log.hxx>
 
 using namespace osl;
 using namespace com::sun::star::uno;
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 8868d591ee91..dc0c214baedc 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -27,6 +27,7 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/shlib.hxx>
 #include <osl/module.hxx>
+#include <sal/log.hxx>
 #include <uno/environment.hxx>
 #include <uno/mapping.hxx>
 
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index 84c749b1b658..2e32c5b33764 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -52,6 +52,7 @@
 #include <rtl/ref.hxx>
 #include <rtl/string.h>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <sal/macros.h>
 #include <sal/types.h>
 
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index d27de6c58125..401b46df7f8e 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -20,6 +20,9 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DIRECTSQL_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_DIRECTSQL_HXX
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <vcl/dialog.hxx>
 #include <svtools/editsyntaxhighlighter.hxx>
 #include <vcl/fixed.hxx>
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 4a98c6e8afac..d5d184d2e02d 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -23,6 +23,7 @@
 #include <boost/optional.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
 #include <tools/resmgr.hxx>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d0e5324e0165..f0c5d8090458 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -75,6 +75,7 @@
 #include <com/sun/star/frame/thePopupMenuControllerFactory.hpp>
 #include <com/sun/star/office/Quickstart.hpp>
 
+#include <sal/log.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/configuration.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index c0f5a2b92bc5..d51057868269 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -43,6 +43,7 @@
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 
 #include <tools/rcid.h>
 
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 8145db1de0c1..ab40ec8f2259 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -25,6 +25,7 @@
 
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <cppuhelper/compbase3.hxx>
 
 #include <vcl/wrkwin.hxx>
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index b971335a5337..fddfb428e9a9 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
 
+#include <sal/log.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 1a3cc9f77220..b3e5330af84c 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -27,6 +27,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <stdio.h>
 #include <osl/process.h>
+#include <sal/log.hxx>
 #include <unotools/bootstrap.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index dea30fd6a80a..25da9d8caafd 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -28,6 +28,7 @@
 
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 #include <tools/extendapplicationenvironment.hxx>
 #include <vcl/svmain.hxx>
 
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index 7ff3e911f2ed..be263726fb03 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -35,6 +35,7 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <rtl/ustring.hxx>
 #include <ucbhelper/content.hxx>
 
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 8164dd0ed329..3ddc5f83f757 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -29,6 +29,7 @@
 #include <rtl/string.hxx>
 #include <rtl/uri.hxx>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <osl/file.hxx>
 #include <osl/security.hxx>
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index c5b4eec6812c..bae18596fbbd 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -27,6 +27,7 @@
 #include <rtl/digest.h>
 #include <rtl/random.h>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 #include <unotools/bootstrap.hxx>
 #include <osl/file.hxx>
 #include <osl/pipe.hxx>
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index d859d043d790..670994bae1e8 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -26,6 +26,7 @@
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/uri.hxx>
+#include <sal/log.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <ucbhelper/content.hxx>
 #include <comphelper/anytostring.hxx>
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 516aca98a175..3627a9dd8ddf 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -26,6 +26,7 @@
 #include <rtl/ustring.hxx>
 #include <rtl/uri.hxx>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 #include <osl/file.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/servicedecl.hxx>
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index a3903d2f0094..b37b1fd96551 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -28,6 +28,7 @@
 #include "dp_descriptioninfoset.hxx"
 #include "dp_identifier.hxx"
 #include <rtl/uri.hxx>
+#include <sal/log.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0651480dfa79..a1162dfe21bc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -20,6 +20,7 @@
 #include <LibreOfficeKit/LibreOfficeKit.h>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
+#include <sal/log.hxx>
 #include <tools/errinf.hxx>
 #include <osl/file.hxx>
 #include <osl/process.h>
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 93ebeb1a697f..74f61742e230 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -28,6 +28,7 @@
 #include "migration.hxx"
 #include "migration_impl.hxx"
 
+#include <sal/log.hxx>
 #include <unotools/textsearch.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 3ace9469bc50..ef82a5bac06c 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -20,6 +20,7 @@
 
 #include "oo3extensionmigration.hxx"
 #include <rtl/instance.hxx>
+#include <sal/log.hxx>
 #include <osl/file.hxx>
 #include <osl/thread.h>
 #include <tools/urlobj.hxx>
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index f60eacc35f02..a7491b8ea185 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -26,6 +26,7 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <sal/log.hxx>
 
 using namespace css::bridge;
 using namespace css::connection;
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index f2303725b71c..2cfba719e758 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -20,6 +20,7 @@
 
 #include "splash.hxx"
 #include <stdio.h>
+#include <sal/log.hxx>
 #include <unotools/bootstrap.hxx>
 #include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 74715bc31404..257d08d189e0 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <osl/mutex.hxx>
+#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/io/XPersistObject.hpp>
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 0c68df814ee3..882847b0f99f 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/form/XGridColumnFactory.hpp>
 #include <com/sun/star/awt/MouseWheelBehavior.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
+#include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include "dbptools.hxx"
 #include "dbpilots.hrc"
diff --git a/extensions/source/ole/olethread.cxx b/extensions/source/ole/olethread.cxx
index 4fa8f582ad0f..99d3a331df31 100644
--- a/extensions/source/ole/olethread.cxx
+++ b/extensions/source/ole/olethread.cxx
@@ -20,6 +20,7 @@
 #include "ole2uno.hxx"
 
 #include <osl/thread.hxx>
+#include <sal/log.hxx>
 
 using namespace std;
 
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index 834b52ec766b..9933739cddca 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -45,6 +45,7 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/processfactory.hxx>
 #include <plugin/impl.hxx>
+#include <sal/log.hxx>
 #include <ucbhelper/content.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index 16329c9059c7..c56f37b5c3f5 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -39,6 +39,7 @@
 #include <dlfcn.h>
 
 #include <osl/module.h>
+#include <sal/log.hxx>
 
 #include <config_vclplug.h>
 
diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx
index 6197fcf2f62e..d755df17ab1b 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/unx/nppapi.cxx
@@ -35,6 +35,7 @@
 
 #include <cstdarg>
 
+#include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 
 #include <plugin/unx/plugcon.hxx>
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index 6f4b58b63ae4..cec4fe7d1a05 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -42,6 +42,7 @@
 
 #include <osl/file.h>
 #include <osl/module.h>
+#include <sal/log.hxx>
 
 #include <config_vclplug.h>
 
diff --git a/extensions/source/plugin/unx/plugcon.cxx b/extensions/source/plugin/unx/plugcon.cxx
index c54f7f2368d2..fe0bd5d12511 100644
--- a/extensions/source/plugin/unx/plugcon.cxx
+++ b/extensions/source/plugin/unx/plugcon.cxx
@@ -33,6 +33,8 @@
 #undef _LINUX_SOURCE_COMPAT
 #endif
 
+#include <sal/log.hxx>
+
 #include <plugin/unx/plugcon.hxx>
 
 #include <cstdarg>
diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx
index b19c01778719..e8a1af9b5539 100644
--- a/extensions/source/plugin/unx/sysplug.cxx
+++ b/extensions/source/plugin/unx/sysplug.cxx
@@ -40,6 +40,7 @@
 #include <osl/file.hxx>
 #include <osl/thread.h>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 
 #include <plugin/impl.hxx>
 
diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx
index 7d94acf3b218..d34c80012295 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -30,6 +30,8 @@
 #include <prewin.h>
 #include <postwin.h>
 
+#include <sal/log.hxx>
+
 #include <plugin/impl.hxx>
 
 #if defined _MSC_VER
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index c7fda6ba8361..81716b251d5d 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -23,6 +23,7 @@
 #include "modulepcr.hxx"
 #include "formresid.hrc"
 #include "formstrings.hxx"
+#include <sal/log.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/waitobj.hxx>
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index fe150b925b81..023aa854344c 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -20,6 +20,7 @@
 #include <cstdarg>
 #include <math.h>
 #include <osl/file.h>
+#include <sal/log.hxx>
 #include <tools/stream.hxx>
 #include <unotools/tempfile.hxx>
 #include <sane.hxx>
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 61f076172302..c04ed464eada 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -51,6 +51,7 @@
 #include <rtl/ref.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <osl/process.h>
 #include <osl/conditn.hxx>
diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx
index 4e2fb2c07835..62a01df6034b 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.hxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.hxx
@@ -20,6 +20,9 @@
 #ifndef INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_MTAFOP_HXX
 #define INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_MTAFOP_HXX
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx
index 727624e4d26f..6e82ed70d05d 100644
--- a/framework/inc/classes/checkediterator.hxx
+++ b/framework/inc/classes/checkediterator.hxx
@@ -20,6 +20,9 @@
 #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_CHECKEDITERATOR_HXX
 #define INCLUDED_FRAMEWORK_INC_CLASSES_CHECKEDITERATOR_HXX
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <sal/types.h>
 
 #include <iterator>
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index eb6331d27082..5b4a9b74b590 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -29,6 +29,7 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/math.hxx>
+#include <sal/log.hxx>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 54e7bb26560a..56d8fc88b7b3 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -22,6 +22,7 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 3f874c24de76..17546ef9ee15 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -21,6 +21,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/languagetagicu.hxx>
+#include <sal/log.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <string.h>
 #include "ordinalsuffix.hxx"
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index 9c2173581e45..b8005fb66ecf 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -35,6 +35,7 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
+#include <sal/log.hxx>
 
 #ifdef _MSC_VER
 // get rid of that dumb compiler warning
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index a3c953cecace..458a417d6496 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -24,6 +24,7 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/languagetagicu.hxx>
 #include <i18nutil/unicode.hxx>
+#include <sal/log.hxx>
 #include <unicode/numfmt.h>
 #include "unicode_data.h"
 
diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx
index 50984e753527..9de4ece0702b 100644
--- a/include/oox/token/tokenmap.hxx
+++ b/include/oox/token/tokenmap.hxx
@@ -24,6 +24,7 @@
 #include <oox/token/tokens.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
 namespace oox {
diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index 413e2090c211..9dfc58664fca 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -20,6 +20,9 @@
 #ifndef INCLUDED_SVL_FILEREC_HXX
 #define INCLUDED_SVL_FILEREC_HXX
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <svl/svldllapi.h>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index dd4945f81890..7ce7b8d8f807 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SVX_SVDTRANS_HXX
 
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <svx/svxdllapi.h>
 #include <tools/fract.hxx>
 #include <tools/gen.hxx>
diff --git a/include/unotools/digitgroupingiterator.hxx b/include/unotools/digitgroupingiterator.hxx
index c2ad320c5c91..5746b9631300 100644
--- a/include/unotools/digitgroupingiterator.hxx
+++ b/include/unotools/digitgroupingiterator.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_UNOTOOLS_DIGITGROUPINGITERATOR_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
+#include <sal/log.hxx>
 
 namespace utl {
 
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 179ca334bf52..011d45e14399 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -12,6 +12,7 @@
 
 #include <typeinfo>
 #include <osl/module.hxx>
+#include <sal/log.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/fldunit.hxx>
 #include <vcl/dllapi.h>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
index a536cad97cf0..59f85017d3a8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
+++ b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
@@ -23,6 +23,7 @@
 #include "sal/config.h"
 
 #include "rtl/ustring.hxx"
+#include <sal/log.hxx>
 
 #define JFW_ENSURE(c, m) SAL_WARN_IF(!(c), "jfw", m)
 
diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx
index 085a33ea733c..688dab17bf5f 100644
--- a/opencl/source/openclconfig.cxx
+++ b/opencl/source/openclconfig.cxx
@@ -15,6 +15,7 @@
 #include <opencl/openclconfig.hxx>
 #include <opencl/platforminfo.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <sal/types.h>
 
 OpenCLConfig::OpenCLConfig() :
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index ad3ead800afa..5574d2c3fa09 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -20,6 +20,7 @@
 #include <rtl/strbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <boost/scoped_array.hpp>
 #include <unicode/regex.h>
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 2df14b5454c5..c5b3a1b7265d 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -26,6 +26,7 @@
 #include "rtl/alloc.h"
 #include "rtl/ustrbuf.hxx"
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 using namespace store;
 
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index fe09ddac72f3..346fce02a8b7 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -28,6 +28,7 @@
 #include <osl/endian.h>
 #include <osl/diagnose.h>
 #include <registry/reflread.hxx>
+#include <sal/log.hxx>
 
 #include "registry/typereg_reader.hxx"
 #include "registry/version.h"
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index 7b25510c8f7c..5a486e0eecbf 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -31,6 +31,7 @@
 
 #include <osl/file.h>
 #include <rtl/alloc.h>
+#include <sal/log.hxx>
 
 /* case insensitive compare of two strings up to a given length */
 int rsc_strnicmp( const char *string1, const char *string2, size_t count )
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index 1ccd9bea484f..7f9e2fb8a692 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -23,6 +23,7 @@
 #include <boost/noncopyable.hpp>
 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 
 const sal_Unicode FPH_CHAR_PATH_SEPARATOR = (sal_Unicode)'/';
 const sal_Unicode FPH_CHAR_DOT            = (sal_Unicode)'.';
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 9a1ebd03f570..20cda833bf12 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -30,6 +30,7 @@
 #include "osl/thread.h"
 #include "rtl/ustring.hxx"
 #include "rtl/strbuf.h"
+#include "sal/log.hxx"
 
 #include "file_path_helper.hxx"
 
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index 94fe67de9ebe..99b3dbbe108e 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -33,6 +33,7 @@
 #include "rtl/textenc.h"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
+#include "sal/log.hxx"
 #include "sal/macros.h"
 #include "sal/types.h"
 
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index aca68c02b7bc..bbf608ff6abd 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -37,6 +37,7 @@
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/ref.hxx>
+#include <sal/log.hxx>
 
 #include <expat.h>
 
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 8768281ea2fe..f118a5d13e9b 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -34,6 +34,7 @@
 #include <osl/diagnose.h>
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <salhelper/thread.hxx>
 
 #include <boost/optional.hpp>
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index e4d3c962a830..3ef609e2f288 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -30,6 +30,7 @@
 
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
+#include <sal/log.hxx>
 #include <osl/time.h>
 #include <osl/diagnose.h>
 
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index 85c9694d3094..10e7ab39f174 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -21,6 +21,7 @@
 
 #include <com/sun/star/xml/sax/FastTokenHandler.hpp>
 #include <rtl/math.hxx>
+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 3eaafa447788..258f82920a9d 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -19,6 +19,9 @@
 #ifndef INCLUDED_SFX2_SOURCE_INC_SFXTYPES_HXX
 #define INCLUDED_SFX2_SOURCE_INC_SFXTYPES_HXX
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <tools/rc.hxx>
 #include <tools/rcid.h>
 #include <tools/resid.hxx>
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index 4aa83549a495..653e10abd259 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -28,6 +28,7 @@
 #include "stgio.hxx"
 
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 #include <boost/scoped_array.hpp>
 
diff --git a/starmath/inc/caret.hxx b/starmath/inc/caret.hxx
index 762df16364e6..3872b162e3d6 100644
--- a/starmath/inc/caret.hxx
+++ b/starmath/inc/caret.hxx
@@ -9,6 +9,10 @@
 #ifndef INCLUDED_STARMATH_INC_CARET_HXX
 #define INCLUDED_STARMATH_INC_CARET_HXX
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
+
 #include "node.hxx"
 
 /** Representation of caret position with an equation */
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index 480bb7c66ee5..074ae4cb36fc 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -23,6 +23,7 @@
 #include <new>
 
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <tools/gen.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/metric.hxx>
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index 304c10c7e841..ccd83f72274c 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -19,6 +19,9 @@
 #ifndef INCLUDED_STARMATH_INC_UTILITY_HXX
 #define INCLUDED_STARMATH_INC_UTILITY_HXX
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <vcl/font.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/combobox.hxx>
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index 2544d95dad8b..adbab3b5c091 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -9,6 +9,10 @@
 #ifndef INCLUDED_STARMATH_INC_VISITORS_HXX
 #define INCLUDED_STARMATH_INC_VISITORS_HXX
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
+
 #include "node.hxx"
 #include "caret.hxx"
 #include <memory>
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 67a610091518..86b2a38dd535 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -28,6 +28,7 @@
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <osl/thread.h>
+#include <sal/log.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase2.hxx>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 8bd1b3d98106..2894fb2c3df7 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -21,6 +21,7 @@
 #include <osl/diagnose.h>
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
+#include <sal/log.hxx>
 
 #include <uno/dispatcher.h>
 #include <uno/data.h>
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 8c8a0a5e2e33..ea09b30118c0 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -24,6 +24,7 @@
 
 #include <rtl/process.h>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <uno/environment.h>
 #include <uno/lbnames.h>
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 63ab8ca308eb..54fab3b47eb4 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <sal/main.h>
 #include <osl/diagnose.h>
 
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index 25d481f11f10..09925400d0a5 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -26,6 +26,7 @@
 #include "osl/process.h"
 #include "rtl/alloc.h"
 #include "rtl/ustring.hxx"
+#include "sal/log.hxx"
 
 #include "object.hxx"
 #include "storbase.hxx"
diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx
index e6ef65309536..172f61f1bfc4 100644
--- a/svl/source/filerec/filerec.cxx
+++ b/svl/source/filerec/filerec.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <svl/filerec.hxx>
 #include <osl/endian.h>
 
diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx
index 77558f2eb0c3..8ca9e2c9c0fc 100644
--- a/svl/source/items/grabbagitem.cxx
+++ b/svl/source/items/grabbagitem.cxx
@@ -7,6 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <svl/grabbagitem.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index b92e0bae185d..62c4aaf6c414 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -23,6 +23,7 @@
 #include <stdio.h>
 
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include "whassert.hxx"
 #include <svl/SfxBroadcaster.hxx>
 #include <svl/smplhint.hxx>
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 018a6ae25b0a..04c92fce3627 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -23,6 +23,7 @@
 #include <cstdarg>
 #include <libxml/xmlwriter.h>
 
+#include <sal/log.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemiter.hxx>
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 73bd8783cb5f..e36c79df52dc 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <tools/stream.hxx>
 
 #include <svl/macitem.hxx>
diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index 71e278fdf127..83728de6f7cf 100644
--- a/svl/source/items/rngitem.cxx
+++ b/svl/source/items/rngitem.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <tools/stream.hxx>
 #include <svl/rngitem.hxx>
 
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 5c0808f1b0bf..4a1f981611a5 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <svl/srchitem.hxx>
 #include <sal/macros.h>
 #include <osl/diagnose.h>
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index f336920b6799..9eabf2f473f9 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -21,6 +21,7 @@
 
 #include <com/sun/star/lang/XComponent.hpp>
 
+#include <sal/log.hxx>
 #include <tools/tenccvt.hxx>
 #include <osl/diagnose.h>
 #include <comphelper/processfactory.hxx>
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index c5e1e87bee24..740e8d152acd 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -22,6 +22,7 @@
 #include <float.h>
 #include <errno.h>
 #include <comphelper/string.hxx>
+#include <sal/log.hxx>
 #include <tools/date.hxx>
 #include <rtl/math.hxx>
 #include <unotools/charclass.hxx>
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index c941c6798e0c..341928408f13 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/currencytable.hxx>
 
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 9b22cacf26be..5a7d557b866e 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <comphelper/string.hxx>
+#include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <osl/diagnose.h>
 #include <i18nlangtag/mslangid.hxx>
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index c8835b30fc38..ba942391f668 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -20,6 +20,7 @@
 
 #include <stdlib.h>
 #include <comphelper/string.hxx>
+#include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <unotools/charclass.hxx>
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 41e2c6a10054..0d967f86f24e 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/uno/Exception.hpp>
 
 #include <osl/mutex.hxx>
+#include <sal/log.hxx>
 #include <comphelper/flagguard.hxx>
 #include <tools/diagnose_ex.h>
 #include <libxml/xmlwriter.h>
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index f880d609b34a..345151076569 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -24,6 +24,7 @@
 #include <vector>
 #include <editeng/outlobj.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <tools/link.hxx>
 #include <swrect.hxx>
 #include <unotools/configitem.hxx>
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 6e3926b72b73..11ce33e0c581 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -24,6 +24,7 @@
 #include <toxe.hxx>
 #include <vector>
 #include <boost/ptr_container/ptr_vector.hpp>
+#include <sal/log.hxx>
 
 class SwAuthEntry
 {
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 50c1c32144c7..6e394742b0bb 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SW_INC_TOX_HXX
 
 #include <cppuhelper/weakref.hxx>
+#include <sal/log.hxx>
 
 #include <i18nlangtag/lang.h>
 #include <svl/poolitem.hxx>
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 8db9f332fb50..a4f8abdad413 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/container/XEnumeration.hpp>
 
 #include <cppuhelper/implbase.hxx>
+#include <sal/log.hxx>
 
 class SfxPoolItem;
 class SwClient;
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 45680164e43a..c9dabd6825b1 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -31,6 +31,7 @@
 #include "txtfrm.hxx"
 #include "ndtxt.hxx"
 #include <editeng/paravertalignitem.hxx>
+#include <sal/log.hxx>
 
 namespace vcl { class Font; }
 class OutputDevice;
diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx
index ab1f651bb55e..47dd81b144b0 100644
--- a/tools/source/datetime/ttime.cxx
+++ b/tools/source/datetime/ttime.cxx
@@ -35,8 +35,9 @@
 #include <mach/clock.h>
 #include <mach/mach.h>
 #endif
-#include <tools/time.hxx>
 
+#include <sal/log.hxx>
+#include <tools/time.hxx>
 #include <osl/diagnose.h>
 
 #if defined(SOLARIS) && defined(__GNUC__)
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 08c0c6da5a7e..2fdb0d018bb7 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -33,6 +33,7 @@
 #include <rtl/string.h>
 #include <rtl/textenc.h>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <sal/types.h>
 
 #include <algorithm>
diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx
index cbdc6e4c8112..741cb159a4bf 100644
--- a/tools/source/generic/color.cxx
+++ b/tools/source/generic/color.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sstream>
 #include <stdlib.h>
 
 #include <tools/color.hxx>
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index 025db02ad106..257721eaa4b9 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -32,6 +32,7 @@
 #include <tools/config.hxx>
 #include <osl/security.h>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 
 struct ImplKeyData
 {
diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 2c48502a156c..b5db1e02607a 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -22,6 +22,7 @@
 #include <tools/lineend.hxx>
 #include <tools/stream.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 
 #include <limits.h>
diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx
index 925d4d61e866..cb5b1dc2a674 100644
--- a/tools/source/generic/gen.cxx
+++ b/tools/source/generic/gen.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sstream>
+
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
 #include <tools/stream.hxx>
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 53577424d666..76973f260ca4 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -19,6 +19,7 @@
 
 #include <osl/endian.h>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <tools/bigint.hxx>
 #include <tools/debug.hxx>
 #include <tools/helpers.hxx>
diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index a800f1ff5892..d390a6e862db 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -23,6 +23,7 @@
 #define POLY_CLIP_XOR   3
 
 #include <rtl/math.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <poly.h>
 #include <tools/poly.hxx>
diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index 3af2fdd4043c..80d68a07817f 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/string.hxx>
+#include <sal/log.hxx>
 #include <sal/types.h>
 #include <rtl/strbuf.hxx>
 #include <tools/inetmsg.hxx>
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 8e6c4de22a60..16cd3421c1a8 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -28,6 +28,7 @@
 
 #include <osl/endian.h>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 #include <comphelper/string.hxx>
 
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index c7610b440cca..c8e5986daa6a 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -30,6 +30,7 @@
 
 #include <osl/mutex.hxx>
 #include <osl/thread.h>
+#include <sal/log.hxx>
 
 // class FileBase
 #include <osl/file.hxx>
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index c9887dd771ae..f0f0572dc6ea 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -23,6 +23,7 @@
 
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
+#include <sal/log.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 #include <cppuhelper/weak.hxx>
 
diff --git a/ucbhelper/source/provider/fd_inputstream.cxx b/ucbhelper/source/provider/fd_inputstream.cxx
index d469fb75d584..26efac00832f 100644
--- a/ucbhelper/source/provider/fd_inputstream.cxx
+++ b/ucbhelper/source/provider/fd_inputstream.cxx
@@ -21,6 +21,7 @@
 
 #include <rtl/alloc.h>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <algorithm>
 
 using namespace com::sun::star::uno;
diff --git a/ucbhelper/source/provider/std_inputstream.cxx b/ucbhelper/source/provider/std_inputstream.cxx
index 172e284a99fd..513b9db9f53b 100644
--- a/ucbhelper/source/provider/std_inputstream.cxx
+++ b/ucbhelper/source/provider/std_inputstream.cxx
@@ -7,6 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
+
 #include "ucbhelper/std_inputstream.hxx"
 
 using namespace std;
diff --git a/ucbhelper/source/provider/std_outputstream.cxx b/ucbhelper/source/provider/std_outputstream.cxx
index 2f6ca9968eba..390ddbe4b408 100644
--- a/ucbhelper/source/provider/std_outputstream.cxx
+++ b/ucbhelper/source/provider/std_outputstream.cxx
@@ -7,6 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
+
 #include "ucbhelper/std_outputstream.hxx"
 
 using namespace std;
diff --git a/unoidl/source/sourceprovider-parser.y b/unoidl/source/sourceprovider-parser.y
index de3f8e93ce31..ad6c6574f19d 100644
--- a/unoidl/source/sourceprovider-parser.y
+++ b/unoidl/source/sourceprovider-parser.y
@@ -54,6 +54,7 @@
 
 #include "osl/file.h"
 #include "osl/thread.h"
+#include "sal/log.hxx"
 
 #include "sourceprovider-scanner.hxx"
 
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index 9a1a8985b964..020c846317d2 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -25,6 +25,7 @@
 
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
 #include <osl/diagnose.h>
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index b55d8a84f31c..17aca7fbf3a4 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <unotools/cmdoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index f445565d0bfb..97c4fabedcbd 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configpaths.hxx>
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index cf22ae9c71f9..57ed05701bef 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <unotools/configvaluecontainer.hxx>
 #include <unotools/confignode.hxx>
 #include <uno/data.h>
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index fffd62918b72..b937a10d84bc 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <unotools/defaultoptions.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/configitem.hxx>
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index f9f835b8c543..cf706c4b42e0 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <unotools/dynamicmenuoptions.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index 1443c7307a88..7ca01f35909a 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <unotools/extendedsecurityoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index a9acd9aa8ae0..94d87bdfc28d 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <osl/file.hxx>
+#include <sal/log.hxx>
 #include <unotools/historyoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 0849409c54e4..8052d410e8a4 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <rtl/instance.hxx>
+#include <sal/log.hxx>
 #include <osl/mutex.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index e107e446c39a..23f062c6b13b 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index f0b4a32b1141..ccea2c533af8 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <unotools/saveopt.hxx>
 #include <rtl/instance.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index 3ce1851b193c..ad5a61fcde51 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>
+#include <sal/log.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/debug.hxx>
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index fca529632017..7dd5de2eef2e 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <unotools/useroptions.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx
index 56695abf01bc..647e70574567 100644
--- a/unotools/source/i18n/calendarwrapper.cxx
+++ b/unotools/source/i18n/calendarwrapper.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 #include <unotools/calendarwrapper.hxx>
 #include <com/sun/star/i18n/CalendarFieldIndex.hpp>
 #include <com/sun/star/i18n/LocaleCalendar2.hpp>
diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx
index 452332a78cd8..a83b5f7b9233 100644
--- a/unotools/source/i18n/charclass.cxx
+++ b/unotools/source/i18n/charclass.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/processfactory.hxx>
+#include <sal/log.hxx>
 #include <unotools/charclass.hxx>
 #include <rtl/character.hxx>
 
diff --git a/unotools/source/i18n/collatorwrapper.cxx b/unotools/source/i18n/collatorwrapper.cxx
index 44c01ee6fa5b..ac3033e6511d 100644
--- a/unotools/source/i18n/collatorwrapper.cxx
+++ b/unotools/source/i18n/collatorwrapper.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <unotools/collatorwrapper.hxx>
 #include <com/sun/star/i18n/Collator.hpp>
 
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 1e77321c47b2..45c96bad4896 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <string>
 
+#include <sal/log.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/numberformatcodewrapper.hxx>
 #include <unotools/calendarwrapper.hxx>
diff --git a/unotools/source/i18n/nativenumberwrapper.cxx b/unotools/source/i18n/nativenumberwrapper.cxx
index 34867ba59f50..8597ee0259be 100644
--- a/unotools/source/i18n/nativenumberwrapper.cxx
+++ b/unotools/source/i18n/nativenumberwrapper.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <unotools/nativenumberwrapper.hxx>
 #include <com/sun/star/i18n/NativeNumberSupplier.hpp>
 
diff --git a/unotools/source/i18n/numberformatcodewrapper.cxx b/unotools/source/i18n/numberformatcodewrapper.cxx
index d71c04ad8a2d..ff27654c0fca 100644
--- a/unotools/source/i18n/numberformatcodewrapper.cxx
+++ b/unotools/source/i18n/numberformatcodewrapper.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <unotools/numberformatcodewrapper.hxx>
 #include <com/sun/star/i18n/NumberFormatMapper.hpp>
 
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 17f8fe81c9f2..046c581268d0 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/util/TextSearch.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
+#include <sal/log.hxx>
 #include <unotools/charclass.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/textsearch.hxx>
diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx
index a8b92a4d20f6..533655c97d85 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index cdc99a87b332..e1db618d65c0 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <unotools/fontcvt.hxx>
 #include <unotools/fontdefs.hxx>
 #include <sal/macros.h>
diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx
index c6aa46ef6f57..c85194b45542 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/docpasswordhelper.hxx>
+#include <sal/log.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/securityoptions.hxx>
 #include <comphelper/namedvaluecollection.hxx>
diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index 3a0c45105a17..179052045869 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/syslocaleoptions.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index d60245219fb5..b45976984a57 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/ucb/UniversalContentBroker.hpp>
 #include <comphelper/processfactory.hxx>
+#include <sal/log.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <ucbhelper/fileidentifierconverter.hxx>
 #include <rtl/ustring.hxx>
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 4533be7b06b3..6e03bf80a2a2 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_INC_OUTFONT_HXX
 
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <sal/types.h>
 #include <i18nlangtag/lang.h>
 #include <tools/solar.h>
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 990e9d8e84ce..0e38ad16485b 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -27,6 +27,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/gen.hxx>
+#include <sal/log.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/vclenum.hxx> // for typedef sal_UCS4
 #include <vcl/devicecoordinate.hxx>
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index 886b076d1952..06f279b7c9bf 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -31,6 +31,8 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <sal/log.hxx>
+
 #include <memory>
 #include <unordered_map>
 #include <vector>
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index 5763d710f770..129d87b34b45 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -20,6 +20,7 @@
 #include "exp_share.hxx"
 
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <com/sun/star/awt/CharSet.hpp>
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 7a317e815e21..315c08f288ad 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
 
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index df0b15507fe4..4619050c910c 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -37,6 +37,7 @@
 #include <com/sun/star/style/VerticalAlignment.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>
+#include <sal/log.hxx>
 #include <tools/date.hxx>
 #include <tools/time.hxx>
 #include <osl/diagnose.h>
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
index dd77b3333c6b..79d4255c0917 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
@@ -21,6 +21,7 @@
 
 #include "unoservices.hxx"
 #include "xmlbas_export.hxx"
+#include <sal/log.hxx>
 #include <xmlscript/xmlns.h>
 #include <xmlscript/xml_helper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
index 5359bde79941..9926fbe4d767 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
@@ -21,6 +21,7 @@
 
 #include "unoservices.hxx"
 #include "xmlbas_import.hxx"
+#include <sal/log.hxx>
 #include <xmlscript/xmlns.h>
 #include <xmlscript/xml_helper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
index 4aaec1fdb65d..f65ac55ab7d2 100644
--- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
+
 #include "imp_share.hxx"
 #include "xml_import.hxx"
 
diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
index 797af996eab1..a14e7a237d9e 100644
--- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <sal/log.hxx>
+
 #include "imp_share.hxx"
 #include "xml_import.hxx"
 
-- 
cgit