From 0132f27d4e062b9306e4fb90c38a58afffbe6cf0 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemeng@ubuntu.com>
Date: Wed, 11 Jul 2018 08:00:51 +0200
Subject: 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 w* x*

Change-Id: I27bff44da3d34d24262031c7489e755311599bc5
Reviewed-on: https://gerrit.libreoffice.org/57307
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
---
 winaccessibility/source/service/AccTopWindowListener.cxx          | 2 ++
 winaccessibility/source/service/msaaservice_impl.cxx              | 1 +
 writerfilter/source/dmapper/CellMarginHandler.cxx                 | 1 +
 writerfilter/source/dmapper/DomainMapper.cxx                      | 1 +
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx          | 1 +
 writerfilter/source/dmapper/DomainMapperTableManager.cxx          | 1 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx                 | 1 +
 writerfilter/source/dmapper/FontTable.cxx                         | 1 +
 writerfilter/source/dmapper/GraphicHelpers.cxx                    | 1 +
 writerfilter/source/dmapper/GraphicImport.cxx                     | 1 +
 writerfilter/source/dmapper/NumberingManager.cxx                  | 1 +
 writerfilter/source/dmapper/OLEHandler.cxx                        | 1 +
 writerfilter/source/dmapper/PropertyMap.cxx                       | 1 +
 writerfilter/source/dmapper/SdtHelper.cxx                         | 1 +
 writerfilter/source/dmapper/SmartTagHandler.cxx                   | 2 ++
 writerfilter/source/dmapper/StyleSheetTable.cxx                   | 1 +
 writerfilter/source/dmapper/TableManager.cxx                      | 2 ++
 writerfilter/source/dmapper/WrapPolygonHandler.cxx                | 2 ++
 writerfilter/source/filter/RtfFilter.cxx                          | 1 +
 writerfilter/source/filter/WriterFilter.cxx                       | 2 ++
 writerfilter/source/ooxml/Handler.cxx                             | 2 ++
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx                   | 1 +
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx             | 1 +
 writerfilter/source/ooxml/OOXMLParserState.cxx                    | 2 ++
 writerfilter/source/rtftok/rtfdispatchdestination.cxx             | 1 +
 writerfilter/source/rtftok/rtfdispatchflag.cxx                    | 2 ++
 writerfilter/source/rtftok/rtfdispatchsymbol.cxx                  | 2 ++
 writerfilter/source/rtftok/rtfdispatchvalue.cxx                   | 1 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx                    | 1 +
 writerfilter/source/rtftok/rtfsdrimport.cxx                       | 1 +
 writerfilter/source/rtftok/rtftokenizer.cxx                       | 1 +
 writerperfect/source/calc/MSWorksCalcImportFilter.cxx             | 1 +
 writerperfect/source/common/WPXSvInputStream.cxx                  | 1 +
 writerperfect/source/writer/EBookImportFilter.cxx                 | 1 +
 writerperfect/source/writer/EPUBPackage.cxx                       | 1 +
 writerperfect/source/writer/MSWorksImportFilter.cxx               | 1 +
 writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx      | 2 ++
 writerperfect/source/writer/exp/XMLTextFrameContext.cxx           | 2 ++
 writerperfect/source/writer/exp/txtparai.cxx                      | 2 ++
 writerperfect/source/writer/exp/xmlfmt.cxx                        | 2 ++
 writerperfect/source/writer/exp/xmltbli.cxx                       | 2 ++
 xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx             | 1 +
 xmlhelp/source/treeview/tvread.cxx                                | 1 +
 xmloff/source/chart/SchXMLAxisContext.cxx                         | 1 +
 xmloff/source/chart/SchXMLChartContext.cxx                        | 1 +
 xmloff/source/chart/SchXMLExport.cxx                              | 1 +
 xmloff/source/chart/SchXMLImport.cxx                              | 1 +
 xmloff/source/chart/SchXMLLegendContext.cxx                       | 2 ++
 xmloff/source/chart/SchXMLPlotAreaContext.cxx                     | 1 +
 xmloff/source/chart/SchXMLSeries2Context.cxx                      | 1 +
 xmloff/source/chart/SchXMLSeriesHelper.cxx                        | 1 +
 xmloff/source/chart/SchXMLTableContext.cxx                        | 1 +
 xmloff/source/chart/SchXMLTools.cxx                               | 1 +
 xmloff/source/chart/XMLChartStyleContext.cxx                      | 2 ++
 xmloff/source/chart/contexts.cxx                                  | 2 ++
 xmloff/source/core/DocumentSettingsContext.cxx                    | 1 +
 xmloff/source/core/DomBuilderContext.cxx                          | 1 +
 xmloff/source/core/DomExport.cxx                                  | 1 +
 xmloff/source/core/RDFaImportHelper.cxx                           | 1 +
 xmloff/source/core/SettingsExportHelper.cxx                       | 1 +
 xmloff/source/core/SvXMLAttrCollection.cxx                        | 1 +
 xmloff/source/core/i18nmap.cxx                                    | 1 +
 xmloff/source/core/nmspmap.cxx                                    | 1 +
 xmloff/source/core/xmlerror.cxx                                   | 1 +
 xmloff/source/core/xmlexp.cxx                                     | 1 +
 xmloff/source/core/xmlimp.cxx                                     | 1 +
 xmloff/source/core/xmluconv.cxx                                   | 1 +
 xmloff/source/draw/SignatureLineContext.cxx                       | 1 +
 xmloff/source/draw/XMLNumberStyles.cxx                            | 2 ++
 xmloff/source/draw/XMLShapeStyleContext.cxx                       | 1 +
 xmloff/source/draw/animationexport.cxx                            | 1 +
 xmloff/source/draw/animexp.cxx                                    | 1 +
 xmloff/source/draw/eventimp.cxx                                   | 1 +
 xmloff/source/draw/layerimp.cxx                                   | 1 +
 xmloff/source/draw/propimp0.cxx                                   | 1 +
 xmloff/source/draw/sdxmlexp.cxx                                   | 1 +
 xmloff/source/draw/sdxmlimp.cxx                                   | 1 +
 xmloff/source/draw/shapeexport.cxx                                | 1 +
 xmloff/source/draw/shapeimport.cxx                                | 1 +
 xmloff/source/draw/ximp3dscene.cxx                                | 1 +
 xmloff/source/draw/ximpbody.cxx                                   | 1 +
 xmloff/source/draw/ximpshap.cxx                                   | 1 +
 xmloff/source/draw/ximpstyl.cxx                                   | 1 +
 xmloff/source/forms/elementexport.cxx                             | 1 +
 xmloff/source/forms/elementimport.cxx                             | 1 +
 xmloff/source/forms/eventexport.cxx                               | 1 +
 xmloff/source/forms/layerexport.cxx                               | 1 +
 xmloff/source/forms/property_meta_data.cxx                        | 1 +
 xmloff/source/forms/propertyexport.cxx                            | 1 +
 xmloff/source/forms/propertyimport.cxx                            | 1 +
 xmloff/source/meta/xmlmetae.cxx                                   | 1 +
 xmloff/source/script/XMLEventExport.cxx                           | 1 +
 xmloff/source/style/DashStyle.cxx                                 | 1 +
 xmloff/source/style/GradientStyle.cxx                             | 1 +
 xmloff/source/style/HatchStyle.cxx                                | 1 +
 xmloff/source/style/ImageStyle.cxx                                | 1 +
 xmloff/source/style/MultiPropertySetHelper.cxx                    | 1 +
 xmloff/source/style/TransGradientStyle.cxx                        | 1 +
 xmloff/source/style/XMLClipPropertyHandler.cxx                    | 1 +
 xmloff/source/style/XMLFontAutoStylePool.cxx                      | 1 +
 xmloff/source/style/XMLFontStylesContext.cxx                      | 1 +
 xmloff/source/style/XMLFootnoteSeparatorImport.cxx                | 1 +
 xmloff/source/style/XMLPageExport.cxx                             | 1 +
 xmloff/source/style/backhdl.cxx                                   | 1 +
 xmloff/source/style/chrlohdl.cxx                                  | 1 +
 xmloff/source/style/impastpl.cxx                                  | 1 +
 xmloff/source/style/prhdlfac.cxx                                  | 1 +
 xmloff/source/style/prstylei.cxx                                  | 1 +
 xmloff/source/style/xmlbahdl.cxx                                  | 1 +
 xmloff/source/style/xmlimppr.cxx                                  | 1 +
 xmloff/source/style/xmlnume.cxx                                   | 1 +
 xmloff/source/style/xmlnumfe.cxx                                  | 1 +
 xmloff/source/style/xmlnumfi.cxx                                  | 1 +
 xmloff/source/style/xmlnumi.cxx                                   | 1 +
 xmloff/source/style/xmlstyle.cxx                                  | 1 +
 xmloff/source/table/XMLTableExport.cxx                            | 1 +
 xmloff/source/table/XMLTableImport.cxx                            | 1 +
 xmloff/source/text/XMLIndexTabStopEntryContext.cxx                | 1 +
 xmloff/source/text/XMLIndexTemplateContext.cxx                    | 1 +
 xmloff/source/text/XMLRedlineExport.cxx                           | 1 +
 xmloff/source/text/XMLSectionFootnoteConfigExport.cxx             | 1 +
 xmloff/source/text/XMLTextFrameContext.cxx                        | 1 +
 xmloff/source/text/XMLTextListAutoStylePool.cxx                   | 1 +
 xmloff/source/text/XMLTextListBlockContext.cxx                    | 1 +
 xmloff/source/text/XMLTextMarkImportContext.cxx                   | 1 +
 xmloff/source/text/XMLTextMasterPageExport.cxx                    | 1 +
 xmloff/source/text/XMLTextNumRuleInfo.cxx                         | 1 +
 xmloff/source/text/txtexppr.cxx                                   | 1 +
 xmloff/source/text/txtflde.cxx                                    | 1 +
 xmloff/source/text/txtfldi.cxx                                    | 1 +
 xmloff/source/text/txtftne.cxx                                    | 1 +
 xmloff/source/text/txtimp.cxx                                     | 1 +
 xmloff/source/text/txtlists.cxx                                   | 1 +
 xmloff/source/text/txtparae.cxx                                   | 1 +
 xmloff/source/text/txtparai.cxx                                   | 1 +
 xmloff/source/text/txtprhdl.cxx                                   | 1 +
 xmloff/source/text/txtprmap.cxx                                   | 1 +
 xmloff/source/text/txtstyli.cxx                                   | 1 +
 xmloff/source/transform/EventOASISTContext.cxx                    | 1 +
 xmloff/source/transform/Oasis2OOo.cxx                             | 1 +
 xmloff/source/transform/StyleOOoTContext.cxx                      | 1 +
 xmloff/source/xforms/SchemaRestrictionContext.cxx                 | 1 +
 xmloff/source/xforms/TokenContext.cxx                             | 1 +
 xmloff/source/xforms/XFormsBindContext.cxx                        | 1 +
 xmloff/source/xforms/XFormsInstanceContext.cxx                    | 1 +
 xmloff/source/xforms/XFormsSubmissionContext.cxx                  | 1 +
 xmloff/source/xforms/xformsapi.cxx                                | 1 +
 xmloff/source/xforms/xformsexport.cxx                             | 1 +
 xmlscript/test/imexp.cxx                                          | 1 +
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx                     | 1 +
 xmlsecurity/source/component/documentdigitalsignatures.cxx        | 1 +
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx            | 1 +
 xmlsecurity/source/dialogs/macrosecurity.cxx                      | 1 +
 xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx                   | 1 +
 xmlsecurity/source/helper/documentsignaturehelper.cxx             | 1 +
 xmlsecurity/source/helper/documentsignaturemanager.cxx            | 1 +
 xmlsecurity/source/helper/ooxmlsecexporter.cxx                    | 1 +
 xmlsecurity/source/helper/ooxmlsecparser.cxx                      | 1 +
 xmlsecurity/source/helper/pdfsignaturehelper.cxx                  | 1 +
 xmlsecurity/source/helper/xmlsignaturehelper.cxx                  | 1 +
 xmlsecurity/source/helper/xmlsignaturehelper2.cxx                 | 1 +
 xmlsecurity/source/helper/xsecctl.cxx                             | 1 +
 xmlsecurity/source/helper/xsecparser.cxx                          | 1 +
 xmlsecurity/source/helper/xsecsign.cxx                            | 1 +
 xmlsecurity/source/xmlsec/errorcallback.cxx                       | 2 ++
 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 1 +
 xmlsecurity/workben/pdfverify.cxx                                 | 1 +
 167 files changed, 186 insertions(+)

diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx
index 65b95c6e7bbe..e697fe368c08 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+
+#include <sal/log.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <com/sun/star/bridge/XUnoUrlResolver.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx
index 95968c4d65ad..2982ca82e0e2 100644
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <rtl/ref.hxx>
+#include <sal/log.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx
index 194e9e2722ec..a30b56a1c9a2 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.cxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.cxx
@@ -22,6 +22,7 @@
 #include <ooxml/resourceids.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/sequence.hxx>
+#include <sal/log.hxx>
 
 namespace writerfilter {
 namespace dmapper {
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index d3719e745b13..80bcfa67175d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -78,6 +78,7 @@
 #include "GraphicHelpers.hxx"
 #include <dmapper/GraphicZOrderHelper.hxx>
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star;
 using namespace oox;
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 443d44bbd40a..2e9bfa959249 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -36,6 +36,7 @@
 #include "ConversionHelper.hxx"
 #include "util.hxx"
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <comphelper/sequence.hxx>
 
 #ifdef DEBUG_WRITERFILTER
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 5b105402d1a5..633eca7e987b 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -33,6 +33,7 @@
 #include <ooxml/resourceids.hxx>
 #include "DomainMapper.hxx"
 #include <rtl/math.hxx>
+#include <sal/log.hxx>
 
 namespace writerfilter {
 namespace dmapper {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8b1462b7b527..6b0663ad5d07 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -93,6 +93,7 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 
 
 using namespace ::com::sun::star;
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index 67224202b886..1d3de2c1779e 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -20,6 +20,7 @@
 #include "FontTable.hxx"
 #include <ooxml/resourceids.hxx>
 #include <vector>
+#include <sal/log.hxx>
 #include <osl/file.hxx>
 #include <rtl/tencinfo.h>
 #include <vcl/embeddedfontshelper.hxx>
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index ca2892a013af..2b08671156de 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/text/RelOrientation.hpp>
 
 #include <oox/drawingml/drawingmltypes.hxx>
+#include <sal/log.hxx>
 #include <unotools/resmgr.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index cf79af44647c..73f9746eb548 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -47,6 +47,7 @@
 #include <svx/unoapi.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <rtl/math.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/sequenceashashmap.hxx>
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 5defd92f0d49..83e487c415e4 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -38,6 +38,7 @@
 
 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/propertyvalue.hxx>
 
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index fc0268623f5d..8ebf88c7c6f2 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -25,6 +25,7 @@
 #include <oox/ole/oleobjecthelper.hxx>
 #include <ooxml/resourceids.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <unotools/mediadescriptor.hxx>
 #include <officecfg/Office/Common.hxx>
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index ed7632b2551f..5cf50c69d0d6 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -24,6 +24,7 @@
 #include <i18nutil/paper.hxx>
 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index b80903e44efa..12c11c38798a 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -12,6 +12,7 @@
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
+#include <sal/log.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <editeng/unoprnms.hxx>
 #include <vcl/svapp.hxx>
diff --git a/writerfilter/source/dmapper/SmartTagHandler.cxx b/writerfilter/source/dmapper/SmartTagHandler.cxx
index e942c23aaa0f..41f68ac08b0e 100644
--- a/writerfilter/source/dmapper/SmartTagHandler.cxx
+++ b/writerfilter/source/dmapper/SmartTagHandler.cxx
@@ -15,6 +15,8 @@
 
 #include <ooxml/resourceids.hxx>
 
+#include <sal/log.hxx>
+
 namespace
 {
 OUString lcl_getTypePath(OUString& rType)
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index a9bb010db5da..188359b4b38a 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -40,6 +40,7 @@
 #include <set>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/sequence.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx
index 198a793e61e1..486381a0f08d 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -22,6 +22,8 @@
 #include "DomainMapper_Impl.hxx"
 #include "util.hxx"
 
+#include <sal/log.hxx>
+
 namespace writerfilter
 {
 namespace dmapper
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
index 010cf2e195a6..862dae53e2e2 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@@ -26,6 +26,8 @@
 #include "WrapPolygonHandler.hxx"
 #include "util.hxx"
 
+#include <sal/log.hxx>
+
 namespace writerfilter {
 
 using namespace com::sun::star;
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index ba6e3faa8d97..b024a2214e1e 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -30,6 +30,7 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/file.hxx>
+#include <sal/log.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index eb3ead50bd97..655b0e57b17e 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -41,6 +41,8 @@
 #include <oox/ole/vbaproject.hxx>
 #include <ooxml/OOXMLDocument.hxx>
 #include <unotools/mediadescriptor.hxx>
+#include <rtl/ref.hxx>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/writerfilter/source/ooxml/Handler.cxx b/writerfilter/source/ooxml/Handler.cxx
index c0d59ffeadb6..290a4b749758 100644
--- a/writerfilter/source/ooxml/Handler.cxx
+++ b/writerfilter/source/ooxml/Handler.cxx
@@ -20,6 +20,8 @@
 #include <ooxml/resourceids.hxx>
 #include "Handler.hxx"
 
+#include <sal/log.hxx>
+
 namespace writerfilter {
 namespace ooxml
 {
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 3b5cdd6573af..789a8e790963 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -33,6 +33,7 @@
 #include "OOXMLFastDocumentHandler.hxx"
 #include "OOXMLPropertySet.hxx"
 
+#include <sal/log.hxx>
 #include <unotools/resmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index bac67461d74d..33db6201101c 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/xml/sax/SAXException.hpp>
 #include <ooxml/resourceids.hxx>
 #include <oox/token/namespaces.hxx>
+#include <sal/log.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <tools/globname.hxx>
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx
index 0e13832c5631..4b3104f166db 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -22,6 +22,8 @@
 #include "OOXMLParserState.hxx"
 #include "Handler.hxx"
 
+#include <sal/log.hxx>
+
 namespace writerfilter {
 namespace ooxml
 {
diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
index bb9253a201f5..02e6c3da72fd 100644
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
@@ -17,6 +17,7 @@
 #include <filter/msfilter/escherex.hxx>
 #include <rtl/character.hxx>
 #include <tools/stream.hxx>
+#include <sal/log.hxx>
 
 #include <dmapper/DomainMapperFactory.hxx>
 #include <ooxml/resourceids.hxx>
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index ec73d0b4b64d..d48893f38d4d 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -19,6 +19,8 @@
 
 #include <ooxml/resourceids.hxx>
 
+#include <sal/log.hxx>
+
 #include "rtfsdrimport.hxx"
 #include "rtfskipdestination.hxx"
 
diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
index 5478f5ec0f1a..f7371ee7ac22 100644
--- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
@@ -14,6 +14,8 @@
 
 #include <ooxml/resourceids.hxx>
 
+#include <sal/log.hxx>
+
 #include "rtfreferenceproperties.hxx"
 #include "rtfskipdestination.hxx"
 
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index f10e95119e26..14c7b93853bc 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -15,6 +15,7 @@
 #include <comphelper/sequence.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <osl/thread.h>
+#include <sal/log.hxx>
 #include <rtl/tencinfo.h>
 #include <tools/mapunit.hxx>
 
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 20fb1ca4fab8..f669fd52eada 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -32,6 +32,7 @@
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <rtl/uri.hxx>
 #include <rtl/tencinfo.h>
+#include <sal/log.hxx>
 #include <oox/helper/graphichelper.hxx>
 #include <vcl/wmfexternal.hxx>
 #include <vcl/graph.hxx>
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 1b6c819b671d..272c7e796083 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -32,6 +32,7 @@
 #include <filter/msfilter/escherex.hxx>
 #include <filter/msfilter/util.hxx>
 #include <filter/msfilter/rtfutil.hxx>
+#include <sal/log.hxx>
 #include <svx/svdtrans.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/propertyvalue.hxx>
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index a3a4aff2da7e..65a80932e90d 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -14,6 +14,7 @@
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/character.hxx>
+#include <sal/log.hxx>
 #include "rtfskipdestination.hxx"
 #include <com/sun/star/io/BufferSizeExceededException.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index ee5cc3096d79..cda4256a5ca6 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -14,6 +14,7 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <sfx2/passwd.hxx>
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index 1c06f1b784bd..f4d4a5593229 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -15,6 +15,7 @@
 #include <comphelper/seekableinput.hxx>
 
 #include <rtl/string.hxx>
+#include <sal/log.hxx>
 
 #include <sot/storage.hxx>
 
diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx
index b60efff74123..4c80c6cf075e 100644
--- a/writerperfect/source/writer/EBookImportFilter.cxx
+++ b/writerperfect/source/writer/EBookImportFilter.cxx
@@ -10,6 +10,7 @@
  */
 
 #include <cppuhelper/supportsservice.hxx>
+#include <sal/log.hxx>
 
 #include <libe-book/libe-book.h>
 
diff --git a/writerperfect/source/writer/EPUBPackage.cxx b/writerperfect/source/writer/EPUBPackage.cxx
index 96a0bb714789..e13f2b3eb71b 100644
--- a/writerperfect/source/writer/EPUBPackage.cxx
+++ b/writerperfect/source/writer/EPUBPackage.cxx
@@ -16,6 +16,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
 
+#include <sal/log.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <xmloff/attrlist.hxx>
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 1b082c806a9b..b67a6e14f4ac 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -10,6 +10,7 @@
  */
 
 #include <cppuhelper/supportsservice.hxx>
+#include <sal/log.hxx>
 
 #include <libwps/libwps.h>
 
diff --git a/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx b/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
index e23f60932773..5f1b53c804a8 100644
--- a/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
+++ b/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
@@ -12,6 +12,8 @@
 #include "xmlimp.hxx"
 #include "xmltext.hxx"
 
+#include <sal/log.hxx>
+
 using namespace com::sun::star;
 
 namespace writerperfect
diff --git a/writerperfect/source/writer/exp/XMLTextFrameContext.cxx b/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
index 37848e668593..cb7d3f9a8340 100644
--- a/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
+++ b/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
@@ -14,6 +14,8 @@
 #include "xmlimp.hxx"
 #include "xmltext.hxx"
 
+#include <sal/log.hxx>
+
 using namespace com::sun::star;
 
 namespace writerperfect
diff --git a/writerperfect/source/writer/exp/txtparai.cxx b/writerperfect/source/writer/exp/txtparai.cxx
index 3a5d6bf44d46..b947b87813e0 100644
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -13,6 +13,8 @@
 #include "XMLTextFrameContext.hxx"
 #include "xmlimp.hxx"
 
+#include <sal/log.hxx>
+
 using namespace com::sun::star;
 
 namespace
diff --git a/writerperfect/source/writer/exp/xmlfmt.cxx b/writerperfect/source/writer/exp/xmlfmt.cxx
index fca68bf7900d..349bd71af60e 100644
--- a/writerperfect/source/writer/exp/xmlfmt.cxx
+++ b/writerperfect/source/writer/exp/xmlfmt.cxx
@@ -13,6 +13,8 @@
 #include "txtstyli.hxx"
 #include "xmlimp.hxx"
 
+#include <sal/log.hxx>
+
 using namespace com::sun::star;
 
 namespace writerperfect
diff --git a/writerperfect/source/writer/exp/xmltbli.cxx b/writerperfect/source/writer/exp/xmltbli.cxx
index b5c16388b750..bc029faf369a 100644
--- a/writerperfect/source/writer/exp/xmltbli.cxx
+++ b/writerperfect/source/writer/exp/xmltbli.cxx
@@ -13,6 +13,8 @@
 #include "xmlimp.hxx"
 #include "xmltext.hxx"
 
+#include <sal/log.hxx>
+
 using namespace com::sun::star;
 
 namespace writerperfect
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 485712502737..647bff41e982 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -36,6 +36,7 @@
 #endif
 
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 
 #include <algorithm>
 #include <set>
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index f3fe31b44d46..2d98eb7755dd 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <rtl/character.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tvread.hxx>
 #include <expat.h>
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index bb8c2ac91e92..29992bb8ca2e 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -30,6 +30,7 @@
 #include <xmloff/xmluconv.hxx>
 
 #include <tools/color.hxx>
+#include <sal/log.hxx>
 
 #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
 #include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 10f3c9345e16..3766ffc25e91 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -26,6 +26,7 @@
 #include "SchXMLSeries2Context.hxx"
 #include "SchXMLTools.hxx"
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlement.hxx>
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index f29f7ae80af8..db0cc741013f 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -19,6 +19,7 @@
 
 #include <memory>
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <sax/tools/converter.hxx>
 
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 081be8686bd0..f79b88d99877 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -26,6 +26,7 @@
 
 #include <o3tl/make_unique.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/prstylei.hxx>
diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx
index 600b6b96c878..5e2ccab63d92 100644
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -26,6 +26,8 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 
+#include <sal/log.hxx>
+
 #include <com/sun/star/chart/ChartLegendPosition.hpp>
 #include <com/sun/star/chart/ChartLegendExpansion.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index b59843e03844..46fee917baf1 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -27,6 +27,7 @@
 #include "SchXMLTools.hxx"
 
 #include <comphelper/processfactory.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 332597235dcb..fba8bc84d600 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -45,6 +45,7 @@
 #include <comphelper/processfactory.hxx>
 
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index 7391109664a5..5966a44391e6 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <rtl/ustring.h>
+#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <typeinfo>
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index 0c7e30ad362e..721ac1cf3801 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -27,6 +27,7 @@
 #include "transporttypes.hxx"
 #include <XMLStringBufferImportContext.hxx>
 #include <rtl/math.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index ff3647b82ab7..74d4989292a3 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -48,6 +48,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 #include <algorithm>
 #include <map>
 
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index 153b3b5f066e..e3a8b40e052d 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -24,6 +24,8 @@
 #include <xmloff/families.hxx>
 #include <xmloff/xmltypes.hxx>
 
+#include <sal/log.hxx>
+
 #include "XMLChartPropertyContext.hxx"
 
 using namespace com::sun::star;
diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx
index ebba9adaed70..c0006b26637a 100644
--- a/xmloff/source/chart/contexts.cxx
+++ b/xmloff/source/chart/contexts.cxx
@@ -27,6 +27,8 @@
 #include "contexts.hxx"
 #include "SchXMLChartContext.hxx"
 
+#include <sal/log.hxx>
+
 using namespace com::sun::star;
 using namespace ::xmloff::token;
 
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index ac9c05af753d..8179c5ace523 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -43,6 +43,7 @@
 #include <com/sun/star/document/IndexedPropertyValues.hpp>
 #include <com/sun/star/document/NamedPropertyValues.hpp>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <unotools/configmgr.hxx>
 #include "xmlenums.hxx"
diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx
index d96372de01eb..83e345deb08c 100644
--- a/xmloff/source/core/DomBuilderContext.cxx
+++ b/xmloff/source/core/DomBuilderContext.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/xml/dom/NodeType.hpp>
 
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 
 #include <comphelper/processfactory.hxx>
 
diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx
index e42f085b5d8a..e6d018242676 100644
--- a/xmloff/source/core/DomExport.cxx
+++ b/xmloff/source/core/DomExport.cxx
@@ -37,6 +37,7 @@
 
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 
 #include <vector>
diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx
index e8d3d8f1df73..4cb9f729b46d 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/rdf/XDocumentRepository.hpp>
 
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 
 #include <map>
 #include <iterator>
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index 51bc30d68ab1..3ea9d3f6110d 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -23,6 +23,7 @@
 #include <xmloff/SettingsExportHelper.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
+#include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/base64.hxx>
diff --git a/xmloff/source/core/SvXMLAttrCollection.cxx b/xmloff/source/core/SvXMLAttrCollection.cxx
index fcb9a5b0dd9a..fd79079a7a40 100644
--- a/xmloff/source/core/SvXMLAttrCollection.cxx
+++ b/xmloff/source/core/SvXMLAttrCollection.cxx
@@ -10,6 +10,7 @@
 #include "SvXMLAttrCollection.hxx"
 #include <limits.h>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 bool SvXMLAttrCollection::operator ==( const SvXMLAttrCollection& rCmp ) const
 {
diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx
index 85bd293cb775..db760ca1db3b 100644
--- a/xmloff/source/core/i18nmap.cxx
+++ b/xmloff/source/core/i18nmap.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <xmloff/i18nmap.hxx>
 
 void SvI18NMap::Add( sal_uInt16 nKind, const OUString& rName,
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index cb6e09720edf..a0a949e821f5 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -21,6 +21,7 @@
 
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index 10961175beaf..d7dba21a6870 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -20,6 +20,7 @@
 #include <xmloff/xmlerror.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <com/sun/star/xml/sax/XLocator.hpp>
 #include <com/sun/star/xml/sax/SAXParseException.hpp>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 835b9ea18f80..57780431d090 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -19,6 +19,7 @@
 
 #include <memory>
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <stack>
 #include <string.h>
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 0145347cb86d..1c4099badb70 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <tools/urlobj.hxx>
 #include <vcl/graph.hxx>
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index ee92f3e4bb5a..affb5843f193 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/util/Date.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <rtl/math.hxx>
diff --git a/xmloff/source/draw/SignatureLineContext.cxx b/xmloff/source/draw/SignatureLineContext.cxx
index 445d9c73c2bc..b22a7465c46d 100644
--- a/xmloff/source/draw/SignatureLineContext.cxx
+++ b/xmloff/source/draw/SignatureLineContext.cxx
@@ -17,6 +17,7 @@
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 
+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 809d86b1a7b5..cde5c2c29583 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -24,6 +24,8 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 
+#include <sal/log.hxx>
+
 #include "sdxmlexp_impl.hxx"
 #include "sdxmlimp_impl.hxx"
 
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index 634a75ce4c50..31f4beeb2044 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <tools/debug.hxx>
+#include <sal/log.hxx>
 #include <xmloff/XMLShapeStyleContext.hxx>
 #include <XMLShapePropertySetContext.hxx>
 #include <xmloff/contextid.hxx>
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 3a7170e27860..6efa20d7b5c5 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -53,6 +53,7 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <o3tl/any.hxx>
 #include <sax/tools/converter.hxx>
+#include <sal/log.hxx>
 
 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
 #include "sdxmlexp_impl.hxx"
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index c0073838559b..49c436ae536b 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -23,6 +23,7 @@
 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
 
 #include <sax/tools/converter.hxx>
+#include <sal/log.hxx>
 
 #include <list>
 #include <comphelper/extract.hxx>
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index b2b7749b1d76..c543eee01752 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/presentation/ClickAction.hpp>
 #include <tools/urlobj.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 #include <sax/tools/converter.hxx>
 
diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index df2597c458fe..3ffde05a447d 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -19,6 +19,7 @@
 
 
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <com/sun/star/drawing/XLayerManager.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx
index 24613f7e2200..762d4162c41f 100644
--- a/xmloff/source/draw/propimp0.cxx
+++ b/xmloff/source/draw/propimp0.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <propimp0.hxx>
 #include "sdxmlexp_impl.hxx"
 #include <com/sun/star/drawing/LineDash.hpp>
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 859a8aea8c2e..5e6694179778 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -52,6 +52,7 @@
 #include <com/sun/star/util/Duration.hpp>
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <tools/gen.hxx>
 #include <sax/tools/converter.hxx>
 #include <xmloff/xmlaustp.hxx>
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 2430ff381a13..8049ad7e5783 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -19,6 +19,7 @@
 
 #include <o3tl/make_unique.hxx>
 #include <osl/thread.h>
+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 
 #include <xmloff/xmlscripti.hxx>
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 733df9b1ba98..7c443b2b8b06 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -92,6 +92,7 @@
 
 #include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <sax/tools/converter.hxx>
 
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index b066336de0f4..762fc3e38bc8 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -21,6 +21,7 @@
 
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 
 #include <com/sun/star/text/PositionLayoutDir.hpp>
 #include <com/sun/star/chart/XChartDocument.hpp>
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index ea4ed913fc25..2792c7df8d52 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -19,6 +19,7 @@
 
 #include <sax/tools/converter.hxx>
 #include <rtl/math.hxx>
+#include <sal/log.hxx>
 
 #include "ximp3dscene.hxx"
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index fae52c7d06c2..0b682b4a4494 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -38,6 +38,7 @@
 #include <PropertySetMerger.hxx>
 #include <animationimport.hxx>
 #include <osl/diagnose.hxx>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 5f5420f4fb72..137def939f91 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -20,6 +20,7 @@
 #include <cassert>
 
 #include <tools/debug.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/presentation/ClickAction.hpp>
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 17173a91e79b..425c0a3b9942 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -26,6 +26,7 @@
 #include <tools/debug.hxx>
 #include <o3tl/make_unique.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 3ba0762e9623..393fd3c55e59 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -62,6 +62,7 @@
 #include <tools/diagnose_ex.h>
 #include <comphelper/extract.hxx>
 #include <sal/macros.h>
+#include <sal/log.hxx>
 
 #include <algorithm>
 
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 7cce225e0257..4850289e346f 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -45,6 +45,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx
index 62be80443c31..24c6d6cd3bda 100644
--- a/xmloff/source/forms/eventexport.cxx
+++ b/xmloff/source/forms/eventexport.cxx
@@ -20,6 +20,7 @@
 #include "eventexport.hxx"
 #include "strings.hxx"
 #include <comphelper/sequence.hxx>
+#include <sal/log.hxx>
 
 namespace xmloff
 {
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index 1e4687c377ce..6ce24c9bfa95 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -30,6 +30,7 @@
 #include <xmloff/contextid.hxx>
 #include <xmloff/controlpropertyhdl.hxx>
 #include <xmloff/maptype.hxx>
+#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/debug.hxx>
 #include "controlpropertymap.hxx"
diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx
index cc86f513d8c2..87ccd36fc160 100644
--- a/xmloff/source/forms/property_meta_data.cxx
+++ b/xmloff/source/forms/property_meta_data.cxx
@@ -26,6 +26,7 @@
 
 #include <tools/debug.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 #include <unordered_map>
 
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx
index 4fbf337600d4..2fad2f4c98d4 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -31,6 +31,7 @@
 #include <sax/tools/converter.hxx>
 #include <osl/diagnose.h>
 #include <rtl/strbuf.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index d133e01a1d63..cee59ee8d1d7 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -30,6 +30,7 @@
 #include <xmloff/nmspmap.hxx>
 #include <o3tl/temporary.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <comphelper/extract.hxx>
 #include "callbacks.hxx"
 #include <xmloff/xmlnmspe.hxx>
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index 821b41960962..c6d32a8b0229 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -19,6 +19,7 @@
 
 #include <i18nlangtag/languagetag.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <xmloff/xmlmetae.hxx>
 #include <xmloff/xmlexp.hxx>
diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx
index aa110820e98b..34a6faadccfd 100644
--- a/xmloff/source/script/XMLEventExport.cxx
+++ b/xmloff/source/script/XMLEventExport.cxx
@@ -25,6 +25,7 @@
 
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <tools/debug.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index 96ee20aed5e0..238ec749278e 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -32,6 +32,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmltkmap.hxx>
 
 using namespace ::com::sun::star;
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index b91cb3c53f67..48333873501e 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -30,6 +30,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index bcc24c5d0c78..702f4a9d34e9 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -31,6 +31,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmltkmap.hxx>
 
 using namespace ::com::sun::star;
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index 9976327103d8..0bb70da5b87d 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -28,6 +28,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmltkmap.hxx>
 
 using namespace css;
diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx
index 4c5367fb3d9f..93d06b64dcfc 100644
--- a/xmloff/source/style/MultiPropertySetHelper.cxx
+++ b/xmloff/source/style/MultiPropertySetHelper.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 
+#include <sal/log.hxx>
 
 using ::com::sun::star::beans::XMultiPropertySet;
 using ::com::sun::star::beans::XPropertySet;
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index 622e2af57366..acaf88fa8a0c 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -29,6 +29,7 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <tools/color.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmlexp.hxx>
diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx
index 2a6658c9239e..1beaa5debdca 100644
--- a/xmloff/source/style/XMLClipPropertyHandler.cxx
+++ b/xmloff/source/style/XMLClipPropertyHandler.cxx
@@ -20,6 +20,7 @@
 #include <XMLClipPropertyHandler.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/text/GraphicCrop.hpp>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index 56bb2211e990..029db3c3b421 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -27,6 +27,7 @@
 #include <xmloff/XMLFontAutoStylePool.hxx>
 #include <vcl/embeddedfontshelper.hxx>
 #include <osl/file.hxx>
+#include <sal/log.hxx>
 
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index c3272dc720a3..b5f076dbe744 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -27,6 +27,7 @@
 #include <comphelper/seqstream.hxx>
 
 #include <osl/file.hxx>
+#include <sal/log.hxx>
 #include <vcl/embeddedfontshelper.hxx>
 
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
index 9ebf9549e45e..a41a31d725f9 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
@@ -21,6 +21,7 @@
 #include "XMLFootnoteSeparatorImport.hxx"
 
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index dd599528bb6b..c923705f9a41 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -19,6 +19,7 @@
 
 #include <xmloff/XMLPageExport.hxx>
 #include <o3tl/any.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx
index ed0b56d98784..0b086ed8acdc 100644
--- a/xmloff/source/style/backhdl.cxx
+++ b/xmloff/source/style/backhdl.cxx
@@ -23,6 +23,7 @@
 #include <sax/tools/converter.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx
index 16a02b4eabad..2c1ffc2e0f7b 100644
--- a/xmloff/source/style/chrlohdl.cxx
+++ b/xmloff/source/style/chrlohdl.cxx
@@ -23,6 +23,7 @@
 #include <unotools/saveopt.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index ed5f0e32eecb..547a4834ea6e 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -21,6 +21,7 @@
 #include <algorithm>
 
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <tools/solar.h>
 #include <xmloff/PageMasterStyleMap.hxx>
 #include <xmloff/attrlist.hxx>
diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx
index 0b18917c02ee..8e3309774191 100644
--- a/xmloff/source/style/prhdlfac.cxx
+++ b/xmloff/source/style/prhdlfac.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/text/VertOrientation.hpp>
 
 
+#include <sal/log.hxx>
 #include <xmloff/xmltypes.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlprhdl.hxx>
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index d48f940b59dc..35e6c1f90649 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -21,6 +21,7 @@
 
 #include <o3tl/any.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <set>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index 5831514df60f..6a348b436006 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -19,6 +19,7 @@
 
 #include "xmlbahdl.hxx"
 
+#include <sal/log.hxx>
 #include <o3tl/any.hxx>
 #include <sax/tools/converter.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index da6526da54b8..4e9a28ea42e6 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/beans/PropertyVetoException.hpp>
 #include <com/sun/star/beans/TolerantPropertySetResultType.hpp>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index dea4bb10d5a8..c2ada9da5dcc 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -37,6 +37,7 @@
 #include <o3tl/any.hxx>
 
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <sax/tools/converter.hxx>
 
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 52847a6a8784..d7ea12df1106 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -29,6 +29,7 @@
 #include <unotools/charclass.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <tools/color.hxx>
 #include <sax/tools/converter.hxx>
 
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index e611c144f290..d93d2f9ffbcf 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -30,6 +30,7 @@
 #include <tools/color.hxx>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <sax/tools/converter.hxx>
 
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index f42f8cbb2bf3..1e1f7098cdeb 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -34,6 +34,7 @@
 #include <o3tl/any.hxx>
 #include <o3tl/make_unique.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 
 #include <tools/fontenum.hxx>
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 752c5bbf0701..47e052c67ace 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/style/XAutoStyleFamily.hpp>
 #include "PageMasterPropMapper.hxx"
 #include <o3tl/make_unique.hxx>
+#include <sal/log.hxx>
 #include <svl/itemset.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 30944401316c..3a4f8a5752bf 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -22,6 +22,7 @@
 #include <xmloff/dllapi.h>
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 
 #include <rtl/ustring.hxx>
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index 031af1e40188..3bb1b4b35660 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -42,6 +42,7 @@
 #include "table.hxx"
 
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 #include <memory>
 
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
index 475eafa8340e..ab547fce279d 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
@@ -31,6 +31,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 
 using namespace ::xmloff::token;
 
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx
index 61ee6c03648b..abac7173a0d4 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -33,6 +33,7 @@
 #include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/container/XIndexReplace.hpp>
 
 
diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx
index f8bcf62dd228..4a0e076a3c78 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -22,6 +22,7 @@
 #include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
index d69d884d0177..347451280d18 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
@@ -32,6 +32,7 @@
 #include <xmloff/xmlnume.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <vector>
 
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index c8bb159869c2..6de748478a98 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -19,6 +19,7 @@
 
 #include <o3tl/make_unique.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <comphelper/base64.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index eb666622480c..bf2e900f332b 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <xmloff/xmlnume.hxx>
 #include <xmloff/XMLTextListAutoStylePool.hxx>
 #include <xmloff/xmlexp.hxx>
diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx
index e6054f082f6e..595ffb546985 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -29,6 +29,7 @@
 #include "XMLTextListItemContext.hxx"
 #include "XMLTextListBlockContext.hxx"
 #include <txtlists.hxx>
+#include <sal/log.hxx>
 
 
 using namespace ::com::sun::star;
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 62695a15c2f1..6641bec775a8 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -21,6 +21,7 @@
 
 
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx
index 278194551661..9aed4eac2823 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/XMLTextMasterPageExport.hxx>
+#include <sal/log.hxx>
 
 
 using namespace ::com::sun::star;
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx
index 15b3e4a24ebe..7d7410091a42 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.cxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx
@@ -19,6 +19,7 @@
 
 
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index a40cee944fd4..009b717894b7 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/text/XChapterNumberingSupplier.hpp>
 #include <o3tl/any.hxx>
+#include <sal/log.hxx>
 #include <tools/color.hxx>
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/xmlexp.hxx>
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 4382a95a38bf..1d3551fba7d9 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -67,6 +67,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <rtl/math.hxx>
+#include <sal/log.hxx>
 
 #include <vector>
 
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 99962c40e43e..9f0946873102 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -62,6 +62,7 @@
 
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <rtl/math.hxx>
 #include <tools/debug.hxx>
 #include <osl/diagnose.h>
diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx
index 13c2ad693686..31303fdde72a 100644
--- a/xmloff/source/text/txtftne.cxx
+++ b/xmloff/source/text/txtftne.cxx
@@ -28,6 +28,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <o3tl/any.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index bc5aba285195..85f3a895952f 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -37,6 +37,7 @@
 #include <xmloff/xmlnumi.hxx>
 #include <xmloff/maptype.hxx>
 
+#include <sal/log.hxx>
 #include "txtparai.hxx"
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/txtimppr.hxx>
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index 40c85cb63c9c..85aff05614e1 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -24,6 +24,7 @@
 #include <o3tl/make_unique.hxx>
 
 #include <tools/datetime.hxx>
+#include <sal/log.hxx>
 
 #include <xmloff/txtimp.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index cd9eba5f801b..e221bd766bfb 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -24,6 +24,7 @@
 #include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/types.h>
+#include <sal/log.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 3af76c706883..54bc90497958 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -24,6 +24,7 @@
 
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <o3tl/make_unique.hxx>
 
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 4ca595d30691..47af8e27a42f 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -22,6 +22,7 @@
 #include <o3tl/any.hxx>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <tools/fontenum.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/drawing/FillStyle.hpp>
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 99693da63e21..bcb54cf63086 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -24,6 +24,7 @@
 #include <xmloff/xmltypes.hxx>
 #include "txtprhdl.hxx"
 #include <xmlsdtypes.hxx>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index ddcdb64c2ee0..c2bc93fc401d 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -44,6 +44,7 @@
 
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 
 #include <algorithm>
 #include <functional>
diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index ce903b6a7e74..7667d628b397 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -26,6 +26,7 @@
 #include "TransformerActions.hxx"
 #include "TransformerBase.hxx"
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 // Used to parse Scripting Framework URLs
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 8cd00689caa9..f2891789c531 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <sax/tools/converter.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index b0dfbd7d0b0d..60d9902280b2 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -42,6 +42,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 using namespace ::xmloff::token;
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx
index f3bb38fbc48d..c1720b1f5c60 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.cxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp>
 
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 
 using com::sun::star::uno::Reference;
diff --git a/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx
index 3af25dc965e7..2178b38c4805 100644
--- a/xmloff/source/xforms/TokenContext.cxx
+++ b/xmloff/source/xforms/TokenContext.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include "TokenContext.hxx"
 #include <xmloff/xmltkmap.hxx>
diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx
index 0a624dd58ea5..7adf86bb6b89 100644
--- a/xmloff/source/xforms/XFormsBindContext.cxx
+++ b/xmloff/source/xforms/XFormsBindContext.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/xforms/XModel2.hpp>
 
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::makeAny;
diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx
index 0bf777302b66..17559dae20a3 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.cxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.cxx
@@ -24,6 +24,7 @@
 #include "xformsapi.hxx"
 
 #include <rtl/ustring.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index d4d7eb228363..db3cca13954f 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/xforms/XModel2.hpp>
 
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xforms::XModel2;
diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx
index dbe8170e75d8..7a5f9aacc0d9 100644
--- a/xmloff/source/xforms/xformsapi.cxx
+++ b/xmloff/source/xforms/xformsapi.cxx
@@ -32,6 +32,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index 1b34786766e5..8374caa083e3 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -35,6 +35,7 @@
 
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/document/NamedPropertyValues.hpp>
diff --git a/xmlscript/test/imexp.cxx b/xmlscript/test/imexp.cxx
index 0e4a80b516d5..d4dfd1679423 100644
--- a/xmlscript/test/imexp.cxx
+++ b/xmlscript/test/imexp.cxx
@@ -23,6 +23,7 @@
 #include <osl/file.h>
 
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 
 #include <xmlscript/xmldlg_imexp.hxx>
 #include <xmlscript/xml_helper.hxx>
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 338feda0e134..d608129d6254 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -12,6 +12,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <osl/file.hxx>
+#include <sal/log.hxx>
 #include <test/bootstrapfixture.hxx>
 #include <tools/datetime.hxx>
 #include <unotools/streamwrap.hxx>
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 4ac2711bbbc4..e338b008eeba 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -46,6 +46,7 @@
 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <sal/log.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index f2bc615ef402..fd4f42fcbba1 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -44,6 +44,7 @@
 #include <osl/file.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/uri.hxx>
+#include <sal/log.hxx>
 
 #include <tools/date.hxx>
 #include <tools/time.hxx>
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 91f14846d37f..d86fc51bdd24 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -24,6 +24,7 @@
 #include <biginteger.hxx>
 
 #include <osl/file.hxx>
+#include <sal/log.hxx>
 #include <vcl/help.hxx>
 #include <vcl/layout.hxx>
 
diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
index 896970d4b40f..c3323cee62b4 100644
--- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
+++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
@@ -20,6 +20,7 @@
 #include <config_gpgme.h>
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 #include <rtl/uuid.h>
 #include <cppuhelper/supportsservice.hxx>
 #include <gpg/xmlsignature_gpgimpl.hxx>
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index c6ee555e0068..a567b90aa6da 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -38,6 +38,7 @@
 #include <osl/diagnose.h>
 #include <rtl/ref.hxx>
 #include <rtl/uri.hxx>
+#include <sal/log.hxx>
 #include <svx/xoutbmp.hxx>
 #include <xmloff/attrlist.hxx>
 
diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index 2b24e03d587b..db0d8aef381c 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -34,6 +34,7 @@
 #include <comphelper/base64.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
 #include <tools/datetime.hxx>
 #include <o3tl/make_unique.hxx>
 
diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
index 9ca95c5d755e..774f6c034558 100644
--- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
@@ -18,6 +18,7 @@
 #include <comphelper/ofopxmlhelper.hxx>
 #include <o3tl/make_unique.hxx>
 #include <rtl/ref.hxx>
+#include <sal/log.hxx>
 #include <svx/xoutbmp.hxx>
 #include <unotools/datetime.hxx>
 #include <vcl/salctype.hxx>
diff --git a/xmlsecurity/source/helper/ooxmlsecparser.cxx b/xmlsecurity/source/helper/ooxmlsecparser.cxx
index 2128c5108c1c..6844162c0151 100644
--- a/xmlsecurity/source/helper/ooxmlsecparser.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecparser.cxx
@@ -10,6 +10,7 @@
 
 #include "ooxmlsecparser.hxx"
 #include <xmlsignaturehelper.hxx>
+#include <sal/log.hxx>
 
 using namespace com::sun::star;
 
diff --git a/xmlsecurity/source/helper/pdfsignaturehelper.cxx b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
index a54d121d97eb..edc154f23cb7 100644
--- a/xmlsecurity/source/helper/pdfsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
@@ -23,6 +23,7 @@
 
 #include <pdfio/pdfdocument.hxx>
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 40c0f19a8fdf..43efcb618b1c 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -47,6 +47,7 @@
 #include <comphelper/ofopxmlhelper.hxx>
 #include <comphelper/sequence.hxx>
 #include <tools/diagnose_ex.h>
+#include <sal/log.hxx>
 
 #define NS_DOCUMENTSIGNATURES   "http://openoffice.org/2004/documentsignatures"
 #define NS_DOCUMENTSIGNATURES_ODF_1_2 "urn:oasis:names:tc:opendocument:xmlns:digitalsignature:1.0"
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index 49d9e84f74e4..8d5a0d0d2513 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <osl/diagnose.h>
 #include <rtl/uri.hxx>
+#include <sal/log.hxx>
 
 using namespace com::sun::star;
 
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index bcbef6ad0bbd..e7731672a331 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -40,6 +40,7 @@
 #include <xmloff/attrlist.hxx>
 #include <rtl/math.hxx>
 #include <rtl/ref.hxx>
+#include <sal/log.hxx>
 #include <unotools/datetime.hxx>
 #include <sax/tools/converter.hxx>
 #include "ooxmlsecexporter.hxx"
diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx
index e20716f0a487..d24f5f5c5ec8 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -22,6 +22,7 @@
 #include <xmlsignaturehelper.hxx>
 #include <com/sun/star/xml/sax/SAXException.hpp>
 #include <cppuhelper/exc_hlp.hxx>
+#include <sal/log.hxx>
 
 #include <string.h>
 
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index b4c050e3b7a2..da1122ccc3ec 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/embed/StorageFormats.hpp>
 #include <rtl/uuid.h>
+#include <sal/log.hxx>
 
 #include <framework/signaturecreatorimpl.hxx>
 #include <framework/saxeventkeeperimpl.hxx>
diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx
index 87380d784f61..ac9b72511458 100644
--- a/xmlsecurity/source/xmlsec/errorcallback.cxx
+++ b/xmlsecurity/source/xmlsec/errorcallback.cxx
@@ -21,6 +21,8 @@
 
 #include <xmlsec-wrapper.h>
 
+#include <sal/log.hxx>
+
 #ifdef _WIN32
 #include <prewin.h>
 #include <postwin.h>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index 1e3bd93880f9..d88280573f5e 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -20,6 +20,7 @@
 #include <string.h>
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/windowserrorstring.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/xmlsecurity/workben/pdfverify.cxx b/xmlsecurity/workben/pdfverify.cxx
index b8639aec75c6..efe0461b9f14 100644
--- a/xmlsecurity/workben/pdfverify.cxx
+++ b/xmlsecurity/workben/pdfverify.cxx
@@ -16,6 +16,7 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <osl/file.hxx>
+#include <sal/log.hxx>
 #include <sal/main.h>
 #include <vcl/pngwrite.hxx>
 #include <vcl/svapp.hxx>
-- 
cgit