Add missing sal/log.hxx headers

rtl/string.hxx and rtl/ustring.hxx both unnecessarily #include <sal/log.hxx> (and don't make use of it themselves), but many other files happen to depend on it.
This is a continuation of commit 6ff2d84ade299cb3d14d4110e4cf1a4b8070c030 to be able to remove those unneeded includes.

This commit adds missing headers to every file found by:
grep -FwL sal/log.hxx $(git grep -Elw 'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF|SAL_DETAIL_LOG_STREAM|SAL_WHERE|SAL_STREAM|SAL_DEBUG')
to directories from connectivity to cui

Change-Id: I9903c10d0a04bbeb93d0f776d1d252b152459499
Reviewed-on: https://gerrit.libreoffice.org/57408
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

122 files changed, 125 insertions, 0 deletions

diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index ae9731e3f61f..025751399403 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -31,6 +31,7 @@
 #include <comphelper/numbers.hxx>
 #include <comphelper/types.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
 
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 625ac761fc09..dc302ceb5921 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -25,6 +25,7 @@
 #include <comphelper/extract.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 using namespace ::dbtools;
 using namespace ::com::sun::star::sdbc;
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 48dab7e1f6b1..6c7cd5f5aafc 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <connectivity/TTableHelper.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 3a32d21e5a77..2476315bc46c 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -77,6 +77,7 @@
 #include <o3tl/any.hxx>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/implbase.hxx>
 #include <strings.hrc>
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 53498e1d43d6..52b07c3ab6f9 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -36,6 +36,7 @@
 
 #include <connectivity/ParameterCont.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 namespace dbtools
 {
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 1d86449a0386..aa40d976f827 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -31,6 +31,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index 4a1934b44b00..1344fed82a66 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -22,6 +22,7 @@
 #include <ado/Awrapadox.hxx>
 #include <comphelper/types.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 using namespace connectivity::ado;
 
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index f1154f87dd68..37920acc88ba 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -39,6 +39,7 @@
 #include <component/CColumns.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <osl/thread.h>
 #include <cppuhelper/queryinterface.hxx>
 #include <svl/zforlist.hxx>
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 899e982fe433..4e8f9d07c201 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -24,6 +24,7 @@
 #include <dbase/DTable.hxx>
 #include <dbase/DIndexIter.hxx>
 #include <osl/file.hxx>
+#include <sal/log.hxx>
 #include <tools/config.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 3c2e3d832898..ee39a607ba83 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -51,6 +51,7 @@
 #include <connectivity/dbconversion.hxx>
 #include <strings.hrc>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 
 #include <algorithm>
 #include <cassert>
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 1bc8b37a2b4b..2c5f561173c9 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -23,6 +23,7 @@
 #include <dbase/DIndex.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
+#include <sal/log.hxx>
 
 #include <algorithm>
 #include <memory>
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 1913e5ed7e13..4697d572360a 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -26,6 +26,7 @@
 #include "NStatement.hxx"
 #include <connectivity/dbexception.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 
 using namespace connectivity::evoab;
 using namespace dbtools;
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 162c6da4aa6a..e852309963ae 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -42,6 +42,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <o3tl/make_unique.hxx>
 #include <rtl/string.hxx>
+#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/syslocale.hxx>
 #include <unotools/intlwrapper.hxx>
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index d21f41c10e56..57f918552b9b 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -20,6 +20,7 @@
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/FetchDirection.hpp>
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index ac20080d1994..51326c343717 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/ucb/SortedDynamicResultSetFactory.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <tools/urlobj.hxx>
+#include <sal/log.hxx>
 #include <file/FDriver.hxx>
 #include <file/FTable.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 5d5abc50afb1..7c17c55c1e41 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -36,6 +36,7 @@
 #include <connectivity/dbconversion.hxx>
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/propshlp.hxx>
+#include <sal/log.hxx>
 #include <iterator>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/FetchDirection.hpp>
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index d7156147fcff..eeed72c50bbe 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -24,6 +24,7 @@
 #include <file/FDriver.hxx>
 #include <file/FResultSet.hxx>
 #include <osl/thread.h>
+#include <sal/log.hxx>
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/FetchDirection.hpp>
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index b14b0f233186..1ad83491986c 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -19,6 +19,7 @@
 
 #include <file/fcode.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <connectivity/sqlparse.hxx>
 #include <sqlbison.hxx>
 #include <i18nlangtag/mslangid.hxx>
diff --git a/connectivity/source/drivers/firebird/Blob.cxx b/connectivity/source/drivers/firebird/Blob.cxx
index 71828e5563c0..d56516d2486a 100644
--- a/connectivity/source/drivers/firebird/Blob.cxx
+++ b/connectivity/source/drivers/firebird/Blob.cxx
@@ -18,6 +18,7 @@
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/exc_hlp.hxx>
+#include <sal/log.hxx>
 
 using namespace ::connectivity::firebird;
 
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index db7519b2725f..1c3da2b91647 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -53,6 +53,7 @@
 #include <unotools/localfilehelper.hxx>
 
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 
 using namespace connectivity::firebird;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 1d3f46d9b071..6408fea4d8b4 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -22,6 +22,7 @@
 
 #include <ibase.h>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <FDatabaseMetaDataResultSet.hxx>
 
 #include <com/sun/star/sdbc/ColumnValue.hpp>
diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index c7561b51e845..87dd693efc88 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -29,6 +29,7 @@
 #include <osl/file.hxx>
 #include <osl/process.h>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 #include <unotools/localfilehelper.hxx>
 
 using namespace com::sun::star;
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index fee4029088f4..e55266780242 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -28,6 +28,7 @@
 #include <propertyids.hxx>
 #include <time.h>
 #include <connectivity/dbtools.hxx>
+#include <sal/log.hxx>
 
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index ed46ecdbad6a..555741a12171 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -28,6 +28,7 @@
 #include <propertyids.hxx>
 #include <rtl/string.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <time.h>
 #include <TConnection.hxx>
 
diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
index 877964630c4f..6c1b8e8d09bb 100644
--- a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
@@ -25,6 +25,8 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 
+#include <sal/log.hxx>
+
 using namespace connectivity::firebird;
 
 using namespace com::sun::star::lang;
diff --git a/connectivity/source/drivers/firebird/Statement.cxx b/connectivity/source/drivers/firebird/Statement.cxx
index 62bff6d0aa28..285f68257074 100644
--- a/connectivity/source/drivers/firebird/Statement.cxx
+++ b/connectivity/source/drivers/firebird/Statement.cxx
@@ -27,6 +27,7 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <osl/thread.h>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index 157070c7fdb0..df9b775232e0 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -22,6 +22,7 @@
 #include "StatementCommonBase.hxx"
 #include "Util.hxx"
 
+#include <sal/log.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <propertyids.hxx>
diff --git a/connectivity/source/drivers/firebird/Table.cxx b/connectivity/source/drivers/firebird/Table.cxx
index 7726759e1cf6..0381128357da 100644
--- a/connectivity/source/drivers/firebird/Table.cxx
+++ b/connectivity/source/drivers/firebird/Table.cxx
@@ -14,6 +14,7 @@
 
 #include <TConnection.hxx>
 
+#include <sal/log.hxx>
 #include <comphelper/sequence.hxx>
 #include <connectivity/dbtools.hxx>
 
diff --git a/connectivity/source/drivers/firebird/Util.cxx b/connectivity/source/drivers/firebird/Util.cxx
index dd1213238d56..14844cfaaddb 100644
--- a/connectivity/source/drivers/firebird/Util.cxx
+++ b/connectivity/source/drivers/firebird/Util.cxx
@@ -10,6 +10,7 @@
 #include "Util.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 
 using namespace ::connectivity;
 
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index c1ccf54dd815..8472f8c2705b 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -27,6 +27,7 @@
 #include <osl/thread.h>
 #include <svl/zforlist.hxx>
 #include <rtl/math.hxx>
+#include <sal/log.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/numbers.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 4b43df187eda..ddcc01bffe68 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -35,6 +35,7 @@
 
 #include <cppuhelper/exc_hlp.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <resource/sharedresources.hxx>
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index bf55c45cf975..dffbeb996add 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -22,6 +22,7 @@
 #include <hsqldb/HDriver.hxx>
 #include <hsqldb/HConnection.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <connectivity/dbexception.hxx>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/sdbc/DriverManager.hpp>
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index ff5df7b01fe3..f3214e94359c 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <osl/diagnose.h>
 #include <osl/thread.h>
+#include <sal/log.hxx>
 #include <uno/mapping.hxx>
 #include <algorithm>
 
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index 76e506595817..a96309bc292c 100644
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <hsqldb/HStorageMap.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 
 using namespace ::com::sun::star::container;
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index 6f8aa6c950f0..33aa2ae8d94c 100644
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <com/sun/star/io/BufferSizeExceededException.hpp>
 #include <java/io/InputStream.hxx>
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index 0466d98309aa..888eb3f8d2f3 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -24,6 +24,7 @@
 #include <java/sql/Connection.hxx>
 #include <java/util/Property.hxx>
 #include <java/tools.hxx>
+#include <sal/log.hxx>
 #include <connectivity/dbexception.hxx>
 #include <jvmfwk/framework.hxx>
 #include <strings.hrc>
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index 855b78d2fe92..4ab64fccd9f1 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/lang/NullPointerException.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <strings.hrc>
 #include <comphelper/processfactory.hxx>
diff --git a/connectivity/source/drivers/mork/MColumnAlias.cxx b/connectivity/source/drivers/mork/MColumnAlias.cxx
index e857b0ffe961..0a4f9cddf164 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.cxx
@@ -23,6 +23,7 @@
 #include <officecfg/Office/DataAccess.hxx>
 
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 
 #include <algorithm>
 #include <functional>
diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx
index 076f120c2e16..03ff6372ed9c 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -15,6 +15,7 @@
 #include "MorkParser.hxx"
 
 #include <connectivity/dbexception.hxx>
+#include <sal/log.hxx>
 
 #include <strings.hrc>
 
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index cbf86ec30609..3e04925cf509 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -12,6 +12,7 @@
 
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
 #include <com/sun/star/sdbc/ColumnSearch.hpp>
+#include <sal/log.hxx>
 #include <strings.hrc>
 #include <vector>
 
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
index 9f29b641e8cb..41d3670a8077 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
@@ -22,6 +22,8 @@ static ::osl::Mutex m_aMetaMutex;
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/sdb/ErrorCondition.hpp>
 
+#include <sal/log.hxx>
+
 #include "MorkParser.hxx"
 
 using namespace connectivity;
diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx
index 7cd1dba4145c..95874decdce8 100644
--- a/connectivity/source/drivers/mork/MDriver.cxx
+++ b/connectivity/source/drivers/mork/MDriver.cxx
@@ -12,6 +12,8 @@
 
 #include <com/sun/star/mozilla/XMozillaBootstrap.hpp>
 
+#include <sal/log.hxx>
+
 using namespace connectivity::mork;
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_sdbc_MorkDriver_get_implementation(
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index 30c7fbc4a5c4..4945b26dd9c3 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -12,6 +12,7 @@
 #include "MResultSetMetaData.hxx"
 #include <connectivity/dbtools.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
+#include <sal/log.hxx>
 
 using namespace ::comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 0c0027c13733..9d855b675f60 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -33,6 +33,7 @@
 #include <strings.hrc>
 
 #include <unotools/textsearch.hxx>
+#include <sal/log.hxx>
 
 using namespace connectivity::mork;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 72e8c3aa3d06..fcaff0496c7b 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbcx/CompareBookmark.hpp>
 #include <connectivity/dbtools.hxx>
+#include <sal/log.hxx>
 
 #include <vector>
 #include <algorithm>
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 66e237a3ad90..813508f25994 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -19,6 +19,7 @@
 
 
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/processfactory.hxx>
 #include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/drivers/mork/mork_helper.cxx b/connectivity/source/drivers/mork/mork_helper.cxx
index 7b815ab9a4c2..1a8668bc049e 100644
--- a/connectivity/source/drivers/mork/mork_helper.cxx
+++ b/connectivity/source/drivers/mork/mork_helper.cxx
@@ -2,6 +2,7 @@
 
 #include "MorkParser.hxx"
 #include <iostream>
+#include <sal/log.hxx>
 
 bool openAddressBook(const std::string& path)
 {
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
index 178a2f794636..4706e2c557ea 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
@@ -19,6 +19,7 @@
 
 #include "MNSINIParser.hxx"
 #include <rtl/byteseq.hxx>
+#include <sal/log.hxx>
 
 IniParser::IniParser(OUString const & rIniName)
 {
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
index 7f6fe1b5a9bd..1f2ba68b02a0 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
@@ -29,6 +29,7 @@
 #include <TPrivilegesResultSet.hxx>
 #include <connectivity/dbexception.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 using namespace connectivity::odbc;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 40ca6d72c237..1da3a883a457 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -35,6 +35,7 @@
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
+#include <sal/log.hxx>
 
 using namespace ::comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx
index aa29a9ebb94d..b9d866ccc261 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -24,6 +24,7 @@
 #include <osl/endian.h>
 #include <odbc/OConnection.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <string.h>
 #include <string>
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 8eb1e0a05b28..fa0627e8100d 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -54,6 +54,7 @@
 #include <rtl/strbuf.hxx>
 #include <rtl/uuid.h>
 #include <rtl/bootstrap.hxx>
+#include <sal/log.hxx>
 #include <o3tl/enumarray.hxx>
 #include <osl/module.h>
 
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 46e66310cadb..06735b570338 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -39,6 +39,7 @@
 #include <o3tl/any.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/connectivity/source/drivers/writer/WConnection.cxx b/connectivity/source/drivers/writer/WConnection.cxx
index 26234ed5e7cf..ea8ac5da225e 100644
--- a/connectivity/source/drivers/writer/WConnection.cxx
+++ b/connectivity/source/drivers/writer/WConnection.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <tools/urlobj.hxx>
+#include <sal/log.hxx>
 #include <component/CPreparedStatement.hxx>
 #include <component/CStatement.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx
index d721bc40d3f4..cad61b502730 100644
--- a/connectivity/source/drivers/writer/WTable.cxx
+++ b/connectivity/source/drivers/writer/WTable.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <writer/WConnection.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
+#include <sal/log.hxx>
 
 namespace com
 {
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index dbf203f814a1..a93f3401cabc 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -45,6 +45,7 @@
 #include "connectivity/dbconversion.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <sal/macros.h>
+#include <sal/log.hxx>
 
 #if defined _MSC_VER
 #pragma warning(push)
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 49fa68d587d3..5ba5c11325be 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -37,6 +37,7 @@
 #include <comphelper/types.hxx>
 #include <connectivity/dbmetadata.hxx>
 #include <com/sun/star/sdb/SQLFilterOperator.hpp>
+#include <sal/log.hxx>
 
 #include <iterator>
 #include <memory>
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index adc48a446a2e..5b0007f24011 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -56,6 +56,7 @@
 #include <functional>
 #include <memory>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::util;
diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx
index 2667d957e605..f1e432d410e5 100644
--- a/connectivity/workben/iniParser/main.cxx
+++ b/connectivity/workben/iniParser/main.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/io/IOException.hpp>
 #include <osl/process.h>
 
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 32b97275e3c7..6d2a64dac5ec 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -30,6 +30,7 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/utils/canvastools.hxx>
+#include <sal/log.hxx>
 #include "cachedprimitivebase.hxx"
 #include "bitmapaction.hxx"
 #include <outdevstate.hxx>
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
index 8ffa1c6ab862..9100188271d5 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
@@ -25,6 +25,7 @@
 #include <cppcanvas/canvas.hxx>
 
 #include "cachedprimitivebase.hxx"
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/cppcanvas/source/mtfrenderer/emfpbrush.cxx b/cppcanvas/source/mtfrenderer/emfpbrush.cxx
index d46ddd4698cd..5f3e867f9180 100644
--- a/cppcanvas/source/mtfrenderer/emfpbrush.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpbrush.cxx
@@ -38,6 +38,7 @@
 #include <implrenderer.hxx>
 #include "emfpbrush.hxx"
 #include "emfppath.hxx"
+#include <sal/log.hxx>
 
 namespace cppcanvas
 {
diff --git a/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx b/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx
index 90e48264933a..8cb3c56114c9 100644
--- a/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx
@@ -34,6 +34,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <sal/log.hxx>
 #include <vcl/canvastools.hxx>
 #include <implrenderer.hxx>
 
diff --git a/cppcanvas/source/mtfrenderer/emfpfont.cxx b/cppcanvas/source/mtfrenderer/emfpfont.cxx
index b5bcceebf9e5..67c06a1f0f7e 100644
--- a/cppcanvas/source/mtfrenderer/emfpfont.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpfont.cxx
@@ -34,6 +34,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <sal/log.hxx>
 #include <vcl/canvastools.hxx>
 #include <implrenderer.hxx>
 #include "emfpfont.hxx"
diff --git a/cppcanvas/source/mtfrenderer/emfpimage.cxx b/cppcanvas/source/mtfrenderer/emfpimage.cxx
index e249d5c1acca..0e1f353845f7 100644
--- a/cppcanvas/source/mtfrenderer/emfpimage.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpimage.cxx
@@ -38,6 +38,7 @@
 #include <implrenderer.hxx>
 #include <vcl/graphicfilter.hxx>
 #include "emfpimage.hxx"
+#include <sal/log.hxx>
 
 
 namespace cppcanvas
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index f2dcb9906bf3..a7dc17a11430 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -37,6 +37,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <vcl/canvastools.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
 #include <com/sun/star/rendering/PanoseWeight.hpp>
diff --git a/cppcanvas/source/mtfrenderer/emfppath.cxx b/cppcanvas/source/mtfrenderer/emfppath.cxx
index 162873750ad0..82e99a94ea0b 100644
--- a/cppcanvas/source/mtfrenderer/emfppath.cxx
+++ b/cppcanvas/source/mtfrenderer/emfppath.cxx
@@ -34,6 +34,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <sal/log.hxx>
 #include <vcl/canvastools.hxx>
 #include <implrenderer.hxx>
 #include "emfppath.hxx"
diff --git a/cppcanvas/source/mtfrenderer/emfppen.cxx b/cppcanvas/source/mtfrenderer/emfppen.cxx
index aa34a527a33d..6c5b4c7acbb8 100644
--- a/cppcanvas/source/mtfrenderer/emfppen.cxx
+++ b/cppcanvas/source/mtfrenderer/emfppen.cxx
@@ -34,6 +34,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <sal/log.hxx>
 #include <vcl/canvastools.hxx>
 #include <implrenderer.hxx>
 #include "emfppen.hxx"
diff --git a/cppcanvas/source/mtfrenderer/emfpregion.cxx b/cppcanvas/source/mtfrenderer/emfpregion.cxx
index 6c548cd2e9be..b8a92436c6fd 100644
--- a/cppcanvas/source/mtfrenderer/emfpregion.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpregion.cxx
@@ -34,6 +34,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <sal/log.hxx>
 #include <vcl/canvastools.hxx>
 #include <implrenderer.hxx>
 #include "emfpregion.hxx"
diff --git a/cppcanvas/source/mtfrenderer/emfpstringformat.cxx b/cppcanvas/source/mtfrenderer/emfpstringformat.cxx
index 76ba0d29266c..319870186542 100644
--- a/cppcanvas/source/mtfrenderer/emfpstringformat.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpstringformat.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <vcl/canvastools.hxx>
 #include <implrenderer.hxx>
+#include <sal/log.hxx>
 #include "emfpstringformat.hxx"
 
 namespace cppcanvas
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index d6918db4a3fe..e43192869947 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -63,6 +63,7 @@
 #include <tools.hxx>
 #include <outdevstate.hxx>
 #include <action.hxx>
+#include <sal/log.hxx>
 #include "bitmapaction.hxx"
 #include "lineaction.hxx"
 #include "pointaction.hxx"
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx
index 6a5062ab3bca..e1eafbc82cf8 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.cxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.cxx
@@ -30,6 +30,7 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <canvas/canvastools.hxx>
+#include <sal/log.hxx>
 
 #include <cppcanvas/canvas.hxx>
 
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index 8869a5744701..03000f85b329 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/rendering/XCanvas.hpp>
 
 #include <sal/types.h>
+#include <sal/log.hxx>
 #include <vcl/canvastools.hxx>
 
 #include <basegfx/range/b2drange.hxx>
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index b0a3e55d1d68..b2bf7e5ab816 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -30,6 +30,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <canvas/canvastools.hxx>
+#include <sal/log.hxx>
 
 #include "cachedprimitivebase.hxx"
 #include "polypolyaction.hxx"
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index c6f9c8ef0a41..9d9d9d76f2b0 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -40,6 +40,7 @@
 #include <basegfx/utils/canvastools.hxx>
 #include <canvas/canvastools.hxx>
 #include <memory>
+#include <sal/log.hxx>
 
 #include "textaction.hxx"
 #include <outdevstate.hxx>
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index f8026e4d7f78..c7cd718fc805 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -47,6 +47,7 @@
 #include <basegfx/tuple/b2dtuple.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <sal/log.hxx>
 
 #include "transparencygroupaction.hxx"
 #include <outdevstate.hxx>
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index 9926d56ca0ab..55bf58d7e917 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -22,6 +22,7 @@
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 #include <cppu/Enterable.hxx>
 #include <cppu/helper/purpenv/Environment.hxx>
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index d1de047f4679..9bead78d0ce0 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -21,6 +21,7 @@
 #include <cppu/helper/purpenv/Environment.hxx>
 
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <uno/lbnames.h>
 #include <cppu/Enterable.hxx>
 
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
index 41a338f27a53..ea935424abab 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
@@ -23,6 +23,7 @@
 #include "Proxy.hxx"
 
 #include <osl/interlck.h>
+#include <sal/log.hxx>
 #include <uno/environment.hxx>
 #include <uno/dispatcher.h>
 #include <typelib/typedescription.h>
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
index e0ce8b74aa27..7ee3a4dadb0d 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
@@ -21,6 +21,7 @@
 #include "Proxy.hxx"
 
 #include <sal/alloca.h>
+#include <sal/log.hxx>
 #include <uno/dispatcher.h>
 #include <typelib/typedescription.hxx>
 #include <cppu/EnvDcp.hxx>
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index ac3b23567897..c586ae2220ea 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <new>
+#include <sal/log.hxx>
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index 16cf56f257e6..1c3585ee17d4 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -19,6 +19,7 @@
 
 #include <rtl/string.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <cppuhelper/component.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 2503245330b8..12efac1fb061 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index f16c587431f0..f5242bf054f3 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -20,6 +20,7 @@
 #include <cppuhelper/compbase_ex.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/string.hxx>
 
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index fd0e99c9e520..1627e2277526 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -19,6 +19,7 @@
 
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <vector>
 
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index fb2ccfdfe5d7..fc53cc56d440 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <osl/mutex.hxx>
 #include <cppuhelper/weakagg.hxx>
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 81114584eedf..cc92cdf355b2 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -20,6 +20,7 @@
 #include <stdio.h>
 
 #include <sal/main.h>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <osl/conditn.hxx>
diff --git a/cui/source/customize/CommandCategoryListBox.cxx b/cui/source/customize/CommandCategoryListBox.cxx
index e68ad9ec0211..523008fb8287 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -42,6 +42,7 @@
 #include <comphelper/sequenceashashmap.hxx>
 #include <o3tl/make_unique.hxx>
 #include <i18nutil/searchopt.hxx>
+#include <sal/log.hxx>
 
 #include <cfg.hxx> //for SaveInData
 
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index 826814b9248c..691a18d37a3b 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cassert>
 #include <stdlib.h>
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
index 4e66f814cae7..bba9b5c844d0 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cassert>
 #include <stdlib.h>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 44784ae283f5..466b2caa877d 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cassert>
 #include <stdlib.h>
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 1907bae13dee..4e89b9c7a2d4 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -54,6 +54,7 @@
 #include <svtools/imagemgr.hxx>
 #include <svtools/treelistentry.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <unotools/configmgr.hxx>
 #include <dialmgr.hxx>
 #include <svl/stritem.hxx>
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx
index 6566d6f66f41..29b26f4f645e 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -10,6 +10,7 @@
 #include <SignSignatureLineDialog.hxx>
 
 #include <sal/types.h>
+#include <sal/log.hxx>
 
 #include <dialmgr.hxx>
 #include <strings.hrc>
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index b3672ff1c727..073095d01c5f 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -54,6 +54,7 @@
 #include <treeopt.hxx>
 #include <svtools/langtab.hxx>
 #include <cppuhelper/exc_hlp.hxx>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index df8a0b131319..152b49ec9d1f 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -19,6 +19,7 @@
 
 #include <config_features.h>
 #include <osl/process.h>
+#include <sal/log.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/svapp.hxx>
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index f674c71488a0..bb7c12b627ef 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -24,6 +24,7 @@
 #include <strings.hrc>
 
 #include <algorithm>
+#include <sal/log.hxx>
 #include <vcl/controllayout.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/decoview.hxx>
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index abc8b1bc23c2..c055268dd9f3 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -25,6 +25,7 @@
 #include <svtools/langtab.hxx>
 #include <svx/dlgutil.hxx>
 #include <vcl/builderfactory.hxx>
+#include <sal/log.hxx>
 
 #define HYPH_POS_CHAR       '='
 
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index eccfd85a2fc2..bb9b8eadcb97 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -22,6 +22,7 @@
 #include <iconcdlg.hxx>
 #include <cuihyperdlg.hxx>
 
+#include <sal/log.hxx>
 #include <unotools/viewoptions.hxx>
 #include <svtools/apearcfg.hxx>
 #include <vcl/mnemonic.hxx>
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index ac5e7f096773..54fb29dabf54 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -38,6 +38,7 @@
 #include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 
+#include <sal/log.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #include <svl/urihelper.hxx>
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index dfa899f3feb3..2eb32ff94025 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <linkdlg.hxx>
+#include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 
 #include <tools/urlobj.hxx>
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 12ff8b2236ef..18ee71314a1f 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -20,6 +20,7 @@
 #include <memory>
 #include <utility>
 
+#include <sal/log.hxx>
 #include <sfx2/objsh.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 9e4ba7cfbfb4..0f2907ce02dc 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <srchxtra.hxx>
+#include <sal/log.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/whiter.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 05c404a88b5e..ff973f402668 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/pageids.hxx>
 #include <sfx2/request.hxx>
+#include <sal/log.hxx>
 #include <svx/dialogs.hrc>
 #include <numfmt.hxx>
 #include <splitcelldlg.hxx>
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 59d0d8834b0c..a315222f45cf 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -11,6 +11,7 @@
 #include <osl/file.hxx>
 #include <osl/security.hxx>
 #include <osl/thread.h>
+#include <sal/log.hxx>
 #include <svtools/treelistentry.hxx>
 #include <unotools/securityoptions.hxx>
 #include "certpath.hxx"
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 7cbd051e9130..8ac51f0ba678 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -19,6 +19,7 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <tools/stream.hxx>
+#include <sal/log.hxx>
 #include "cfgchart.hxx"
 #include <dialmgr.hxx>
 #include <strings.hrc>
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index cb4cd323a4fc..54348cbe63f1 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/util/SearchAlgorithms2.hpp>
 #include <unotools/textsearch.hxx>
 #include <o3tl/make_unique.hxx>
+#include <sal/log.hxx>
 
 #include <memory>
 #include <vector>
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index a6bf4d835a2e..18c23123df74 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -19,6 +19,7 @@
 
 #include "optctl.hxx"
 #include <svl/ctloptions.hxx>
+#include <sal/log.hxx>
 
 // class SvxCTLOptionsPage -----------------------------------------------------
 
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e4255ee55bf6..9c6bec7b1c0d 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -64,6 +64,7 @@
 #include <unotools/saveopt.hxx>
 #include <unotools/searchopt.hxx>
 #include <sal/macros.h>
+#include <sal/log.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <officecfg/Setup.hxx>
 #include <comphelper/configuration.hxx>
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 0971cb0b68e7..8124c7d8998c 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -72,6 +72,7 @@
 #endif
 #include <sal/types.h>
 #include <sal/macros.h>
+#include <sal/log.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/file.hxx>
 #include <osl/process.h>
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 527c8ee8985c..dd76e58280d0 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <memory>
 #include <vector>
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 8b62b3f5b13b..a746afe5117f 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -51,6 +51,7 @@
 #include <svl/intitem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/svapp.hxx>
+#include <sal/log.hxx>
 
 #include <svx/svxdlg.hxx>
 #include <editeng/optitems.hxx>
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 7b3ebad23a64..cca312d78608 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -51,6 +51,7 @@
 #include "optHeaderTabListbox.hxx"
 #include <vcl/help.hxx>
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 
 using namespace css;
 using namespace css::beans;
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 6091c2e84eda..55e3c4eef9da 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -35,6 +35,7 @@
 #include <vcl/fixed.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/optionsdlg.hxx>
+#include <sal/log.hxx>
 
 #include <sfx2/fcontnr.hxx>
 
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 889c743b31b7..a42f9050220a 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <osl/file.hxx>
 #include <osl/security.hxx>
+#include <sal/log.hxx>
 
 using namespace ::css;
 
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 1a1b0671fa1c..63df32ae9484 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -106,6 +106,7 @@
 #include <vcl/waitobj.hxx>
 #include <vcl/settings.hxx>
 #include <svtools/treelistentry.hxx>
+#include <sal/log.hxx>
 
 #ifdef LINUX
 #include <sys/stat.h>
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index df496a095585..f439986c6159 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -10,6 +10,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <svx/svxdlg.hxx>
 #include <comphelper/sequence.hxx>
+#include <sal/log.hxx>
 
 #include "tsaurls.hxx"
 
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 13dbe1d2524a..83e3dc17e6e0 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -70,6 +70,7 @@
 #include <sfx2/request.hxx>
 #include <svx/flagsdef.hxx>
 #include <FontFeaturesDialog.hxx>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 60642f9d555f..abb258b84ef0 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -76,6 +76,7 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <rtl/ustring.h>
+#include <sal/log.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <svx/SvxNumOptionsTabPageHelper.hxx>
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 201634ecc1f0..83c072503a50 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -43,6 +43,7 @@
 #include <sfx2/viewsh.hxx>
 #include <sfx2/dialoghelper.hxx>
 #include <o3tl/make_unique.hxx>
+#include <sal/log.hxx>
 
 using namespace com::sun::star;
 
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index fb12fddfdbdf..8e3e9d3d579a 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -41,6 +41,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
+#include <sal/log.hxx>
 
 #include <o3tl/make_unique.hxx>
 
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index e103b509417e..a51ceabe8378 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -43,6 +43,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
+#include <sal/log.hxx>
 
 #include <o3tl/make_unique.hxx>
 
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 712bef2dc03e..6ac3c4c19650 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -46,6 +46,7 @@
 #include <svx/svxdlg.hxx>
 #include <dialmgr.hxx>
 #include <sfx2/opengrf.hxx>
+#include <sal/log.hxx>
 
 #include <o3tl/make_unique.hxx>