Tue Apr 25 08:55:45 UTC 2017

accessibility/inc/pch/precompiled_acc.hxx         |    2 +-
 basctl/inc/pch/precompiled_basctl.hxx             |    2 +-
 basic/source/basmgr/basmgr.cxx                    |    2 +-
 basic/source/classes/sb.cxx                       |    2 +-
 basic/source/uno/namecont.cxx                     |    2 +-
 chart2/inc/pch/precompiled_chartcontroller.hxx    |    2 +-
 connectivity/inc/pch/precompiled_dbase.hxx        |    2 +-
 connectivity/inc/pch/precompiled_file.hxx         |    2 +-
 cppcanvas/inc/pch/precompiled_cppcanvas.hxx       |    2 +-
 cui/inc/pch/precompiled_cui.hxx                   |    2 +-
 cui/source/dialogs/cuigaldlg.cxx                  |    2 +-
 dbaccess/inc/pch/precompiled_dba.hxx              |    2 +-
 dbaccess/inc/pch/precompiled_dbmm.hxx             |    2 +-
 dbaccess/source/filter/xml/xmlfilter.cxx          |    2 +-
 desktop/inc/pch/precompiled_sofficeapp.hxx        |    2 +-
 desktop/source/lib/init.cxx                       |    2 +-
 editeng/source/misc/splwrap.cxx                   |    2 +-
 forms/inc/pch/precompiled_frm.hxx                 |    2 +-
 fpicker/source/office/RemoteFilesDialog.hxx       |    2 +-
 framework/inc/pch/precompiled_fwe.hxx             |    2 +-
 framework/inc/pch/precompiled_fwi.hxx             |    2 +-
 framework/inc/pch/precompiled_fwk.hxx             |    2 +-
 framework/inc/pch/precompiled_fwl.hxx             |    2 +-
 framework/source/interaction/quietinteraction.cxx |    2 +-
 framework/source/services/desktop.cxx             |    2 +-
 include/basic/basmgr.hxx                          |    2 +-
 include/svtools/ehdl.hxx                          |    2 +-
 include/vcl/errinf.hxx                            |   19 +++++++++----------
 oox/inc/pch/precompiled_oox.hxx                   |    2 +-
 reportdesign/inc/pch/precompiled_rpt.hxx          |    2 +-
 reportdesign/inc/pch/precompiled_rptui.hxx        |    2 +-
 reportdesign/source/filter/xml/xmlfilter.cxx      |    2 +-
 sc/inc/pch/precompiled_sc.hxx                     |    2 +-
 sc/inc/pch/precompiled_scfilt.hxx                 |    2 +-
 sc/source/filter/xml/xmlwrap.cxx                  |    2 +-
 sc/source/ui/docshell/dbdocimp.cxx                |    2 +-
 sc/source/ui/docshell/docsh.cxx                   |    2 +-
 sc/source/ui/docshell/docsh8.cxx                  |    2 +-
 sc/source/ui/view/tabvwshb.cxx                    |    2 +-
 sd/inc/pch/precompiled_sdui.hxx                   |    2 +-
 sd/inc/sdgrffilter.hxx                            |    2 +-
 sd/source/filter/grf/sdgrffilter.cxx              |    2 +-
 sd/source/filter/html/sdhtmlfilter.cxx            |    2 +-
 sd/source/filter/xml/sdxmlwrp.cxx                 |    2 +-
 sd/source/ui/app/sdmod1.cxx                       |    2 +-
 slideshow/inc/pch/precompiled_slideshow.hxx       |    2 +-
 sot/inc/pch/precompiled_sot.hxx                   |    2 +-
 svx/source/dialog/imapdlg.cxx                     |    2 +-
 sw/inc/pch/precompiled_msword.hxx                 |    2 +-
 sw/inc/pch/precompiled_swui.hxx                   |    2 +-
 sw/inc/pch/precompiled_vbaswobj.hxx               |    2 +-
 sw/source/core/frmedt/fetab.cxx                   |    2 +-
 sw/source/filter/html/swhtml.cxx                  |    2 +-
 sw/source/filter/xml/swxml.cxx                    |    2 +-
 sw/source/filter/xml/wrtxml.cxx                   |    2 +-
 sw/source/uibase/dbui/dbmgr.cxx                   |    2 +-
 sw/source/uibase/dochdl/gloshdl.cxx               |    2 +-
 sw/source/uibase/misc/glosdoc.cxx                 |    2 +-
 sw/source/uibase/shells/textsh.cxx                |    2 +-
 sw/source/uibase/uiview/srcview.cxx               |    2 +-
 sw/source/uibase/uiview/view2.cxx                 |    2 +-
 test/source/bootstrapfixture.cxx                  |    2 +-
 tools/Library_tl.mk                               |    1 -
 unotools/inc/pch/precompiled_utl.hxx              |    2 +-
 uui/source/iahndl-authentication.cxx              |    2 +-
 uui/source/iahndl-errorhandler.cxx                |    2 +-
 uui/source/iahndl.cxx                             |    2 +-
 vbahelper/inc/pch/precompiled_msforms.hxx         |    2 +-
 vcl/Library_vcl.mk                                |    1 +
 vcl/source/window/errinf.cxx                      |    4 ++--
 xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx   |    2 +-
 71 files changed, 79 insertions(+), 80 deletions(-)

New commits:
commit 3b85b72d643e26fd9fda5eeb05f774b3c37917fd
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Fri Apr 14 15:29:06 2017 +1000

    errinf.hxx moved out of tools and into vcl module
    
    ErrorInfo has a hard depency on VCL, yet is in the tools package. It is more
    appropriate to have it reside in the VCL module.
    
    Change-Id: Ica54a46c3a7f86cf0331ed7245234bea69c05650
    Reviewed-on: https://gerrit.libreoffice.org/36839
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
    Tested-by: Chris Sherlock <chris.sherlock79 at gmail.com>

diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx
index deb737656f1f..a6a92876ada5 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -308,7 +308,7 @@
 #include <tools/color.hxx>
 #include <tools/contnr.hxx>
 #include <tools/debug.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index f51bd722a4f4..802637ccf100 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -534,7 +534,7 @@
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/fract.hxx>
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index dc09a8ba8908..97b5125f5367 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/stream.hxx>
 #include <sot/storage.hxx>
 #include <tools/urlobj.hxx>
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 4f55047944b4..ac8bf7f56d87 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -21,7 +21,7 @@
 #include <tools/rcid.h>
 #include <tools/resary.hxx>
 #include <tools/stream.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <comphelper/solarmutex.hxx>
 #include <basic/sbx.hxx>
 #include <vcl/svapp.hxx>
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index a2bb84a8bcd2..3e5af6eed373 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/xml/sax/SAXException.hpp>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/strbuf.hxx>
 #include <comphelper/getexpandeduri.hxx>
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index 80a8c3b6cfa8..307469471f21 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -486,7 +486,7 @@
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
 #include <tools/errcode.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/fract.hxx>
diff --git a/connectivity/inc/pch/precompiled_dbase.hxx b/connectivity/inc/pch/precompiled_dbase.hxx
index b1913e0770d6..abc2e6592240 100644
--- a/connectivity/inc/pch/precompiled_dbase.hxx
+++ b/connectivity/inc/pch/precompiled_dbase.hxx
@@ -184,7 +184,7 @@
 #include <tools/config.hxx>
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/lineend.hxx>
 #include <tools/link.hxx>
 #include <tools/ref.hxx>
diff --git a/connectivity/inc/pch/precompiled_file.hxx b/connectivity/inc/pch/precompiled_file.hxx
index 27c9e522fd38..bcbee91e5301 100644
--- a/connectivity/inc/pch/precompiled_file.hxx
+++ b/connectivity/inc/pch/precompiled_file.hxx
@@ -166,7 +166,7 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <tools/date.hxx>
 #include <tools/debug.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/lineend.hxx>
 #include <tools/ref.hxx>
 #include <tools/solar.h>
diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
index d78d9e0ed0da..d1f4b7ba9cc6 100644
--- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
+++ b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
@@ -187,7 +187,7 @@
 #include <rsc/rsc-vcl-shared-types.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
 #include <tools/lineend.hxx>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index e3f729574910..ee57ed708cb2 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -447,7 +447,7 @@
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
 #include <tools/errcode.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/fract.hxx>
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 4836affd4156..fd6bd4b6b59b 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -22,7 +22,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <ucbhelper/content.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx
index 9b6a07eb3a1b..157f1eef9530 100644
--- a/dbaccess/inc/pch/precompiled_dba.hxx
+++ b/dbaccess/inc/pch/precompiled_dba.hxx
@@ -269,7 +269,7 @@
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
 #include <tools/lineend.hxx>
diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx b/dbaccess/inc/pch/precompiled_dbmm.hxx
index 6415c84daf91..cf33574c33d1 100644
--- a/dbaccess/inc/pch/precompiled_dbmm.hxx
+++ b/dbaccess/inc/pch/precompiled_dbmm.hxx
@@ -195,7 +195,7 @@
 #include <rsc/rsc-vcl-shared-types.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
 #include <tools/lineend.hxx>
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 0ff1a3d2fefe..d84704722eee 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/config.h>
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <com/sun/star/packages/WrongPasswordException.hpp>
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx
index 057b8d98cd3e..95a52227dd26 100644
--- a/desktop/inc/pch/precompiled_sofficeapp.hxx
+++ b/desktop/inc/pch/precompiled_sofficeapp.hxx
@@ -238,7 +238,7 @@
 #include <svtools/svtdllapi.h>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8e5e89d0dbad..8f350cd61d46 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -20,7 +20,7 @@
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
 #include <sal/log.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <osl/file.hxx>
 #include <osl/process.h>
 #include <osl/thread.h>
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 7c7169a9a53f..56024f280610 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -23,7 +23,7 @@
 #include <vcl/layout.hxx>
 #include <svtools/langtab.hxx>
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <editeng/unolingu.hxx>
 #include <linguistic/lngprops.hxx>
 #include <com/sun/star/frame/XStorable.hpp>
diff --git a/forms/inc/pch/precompiled_frm.hxx b/forms/inc/pch/precompiled_frm.hxx
index fbd0675dede4..2b8955ae8f16 100644
--- a/forms/inc/pch/precompiled_frm.hxx
+++ b/forms/inc/pch/precompiled_frm.hxx
@@ -250,7 +250,7 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/errcode.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/gen.hxx>
 #include <tools/inetmime.hxx>
 #include <tools/lineend.hxx>
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx
index ab8b8131bf6b..08907f95ce29 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -19,7 +19,7 @@
 #include <svtools/breadcrumb.hxx>
 #include <svtools/fileview.hxx>
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/resid.hxx>
 
 #include <unotools/viewoptions.hxx>
diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx
index 7db2f996160c..a87d4036c208 100644
--- a/framework/inc/pch/precompiled_fwe.hxx
+++ b/framework/inc/pch/precompiled_fwe.hxx
@@ -209,7 +209,7 @@
 #include <rsc/rsc-vcl-shared-types.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
diff --git a/framework/inc/pch/precompiled_fwi.hxx b/framework/inc/pch/precompiled_fwi.hxx
index d907b87357d4..df8b9eb8fc01 100644
--- a/framework/inc/pch/precompiled_fwi.hxx
+++ b/framework/inc/pch/precompiled_fwi.hxx
@@ -150,7 +150,7 @@
 #include <rsc/rsc-vcl-shared-types.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
 #include <tools/lineend.hxx>
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index 9ba34417bab8..971763caef8b 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -335,7 +335,7 @@
 #include <tools/color.hxx>
 #include <tools/date.hxx>
 #include <tools/debug.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
 #include <tools/lineend.hxx>
diff --git a/framework/inc/pch/precompiled_fwl.hxx b/framework/inc/pch/precompiled_fwl.hxx
index b753e93bd239..3529522da173 100644
--- a/framework/inc/pch/precompiled_fwl.hxx
+++ b/framework/inc/pch/precompiled_fwl.hxx
@@ -317,7 +317,7 @@
 #include <tools/color.hxx>
 #include <tools/date.hxx>
 #include <tools/debug.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx
index f59c2d1d33aa..0d2a7fb2f78d 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.cxx
@@ -30,7 +30,7 @@
 
 #include <vcl/svapp.hxx>
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 
 namespace framework{
 
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 7463dfc940c1..477f166d3b41 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -67,7 +67,7 @@
 #include <desktop/crashreport.hxx>
 #include <vcl/scheduler.hxx>
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <unotools/configmgr.hxx>
 #include <comphelper/extract.hxx>
 
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 13ad654ff3ed..db074cb54d86 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_BASIC_BASMGR_HXX
 #define INCLUDED_BASIC_BASMGR_HXX
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <basic/sbstar.hxx>
 #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx
index bb8e83b7677f..183121851e9c 100644
--- a/include/svtools/ehdl.hxx
+++ b/include/svtools/ehdl.hxx
@@ -25,7 +25,7 @@
 #include <memory>
 #include <svtools/svtdllapi.h>
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 
 namespace vcl { class Window; }
 class ResMgr;
diff --git a/include/tools/errinf.hxx b/include/vcl/errinf.hxx
similarity index 90%
rename from include/tools/errinf.hxx
rename to include/vcl/errinf.hxx
index 0cd64efa33f2..68e5f08e0840 100644
--- a/include/tools/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -19,17 +19,16 @@
 
 #ifndef __RSC
 
-#ifndef INCLUDED_TOOLS_ERRINF_HXX
-#define INCLUDED_TOOLS_ERRINF_HXX
+#ifndef INCLUDED_VCL_ERRINF_HXX
+#define INCLUDED_VCL_ERRINF_HXX
 
 #include <limits.h>
 #include <rtl/ustring.hxx>
 #include <tools/errcode.hxx>
-#include <tools/toolsdllapi.h>
+#include <vcl/dllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
 
-// FIXME: horrible legacy dependency on VCL from tools.
 namespace vcl { class Window; }
 
 class DynamicErrorInfo_Impl;
@@ -63,7 +62,7 @@ namespace o3tl
     template<> struct typed_flags<ErrorHandlerFlags> : is_typed_flags<ErrorHandlerFlags, 0xffff> {};
 }
 
-class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ErrorInfo
+class SAL_WARN_UNUSED VCL_DLLPUBLIC ErrorInfo
 {
 private:
     sal_uIntPtr             lUserId;
@@ -79,7 +78,7 @@ public:
     static ErrorInfo*       GetErrorInfo(sal_uIntPtr);
 };
 
-class SAL_WARN_UNUSED TOOLS_DLLPUBLIC DynamicErrorInfo : public ErrorInfo
+class SAL_WARN_UNUSED VCL_DLLPUBLIC DynamicErrorInfo : public ErrorInfo
 {
     friend class DynamicErrorInfo_Impl;
 
@@ -95,7 +94,7 @@ public:
     ErrorHandlerFlags       GetDialogMask() const;
 };
 
-class SAL_WARN_UNUSED TOOLS_DLLPUBLIC StringErrorInfo : public DynamicErrorInfo
+class SAL_WARN_UNUSED VCL_DLLPUBLIC StringErrorInfo : public DynamicErrorInfo
 {
 private:
     OUString                aString;
@@ -108,7 +107,7 @@ public:
     const OUString&         GetErrorString() const { return aString; }
 };
 
-class SAL_WARN_UNUSED TOOLS_DLLPUBLIC TwoStringErrorInfo: public DynamicErrorInfo
+class SAL_WARN_UNUSED VCL_DLLPUBLIC TwoStringErrorInfo: public DynamicErrorInfo
 {
 private:
     OUString aArg1;
@@ -125,7 +124,7 @@ public:
 };
 
 struct ErrorContextImpl;
-class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ErrorContext
+class SAL_WARN_UNUSED VCL_DLLPUBLIC ErrorContext
 {
     friend class ErrorHandler;
 
@@ -148,7 +147,7 @@ typedef ErrorHandlerFlags WindowDisplayErrorFunc(
 typedef void BasicDisplayErrorFunc(
     const OUString &rErr, const OUString &rAction);
 
-class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ErrorHandler
+class SAL_WARN_UNUSED VCL_DLLPUBLIC ErrorHandler
 {
     friend class ErrorHandler_Impl;
 
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index 5949c9f9ec18..fc5b43d7cbc8 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -188,7 +188,7 @@
 #include <svtools/svtdllapi.h>
 #include <svx/msdffdef.hxx>
 #include <svx/svxdllapi.h>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/gen.hxx>
 #include <tools/lineend.hxx>
 #include <tools/link.hxx>
diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx
index 3be45770a7b0..9919e30508f5 100644
--- a/reportdesign/inc/pch/precompiled_rpt.hxx
+++ b/reportdesign/inc/pch/precompiled_rpt.hxx
@@ -308,7 +308,7 @@
 #include <tools/date.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index b5021b26cebf..9a64847835ab 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -515,7 +515,7 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/errcode.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/fract.hxx>
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 3f513db3de59..2017a2ae8466 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -29,7 +29,7 @@
 #include "xmlfilter.hxx"
 #include "xmlGroup.hxx"
 #include "xmlReport.hxx"
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include "xmlHelper.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 7770a480f558..8b3fb3ce1780 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -553,7 +553,7 @@
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
 #include <tools/errcode.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/fract.hxx>
diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx
index 9048a2cca156..b67942852e14 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -283,7 +283,7 @@
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/gen.hxx>
 #include <tools/lineend.hxx>
 #include <tools/link.hxx>
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index abe9593f521d..5805a6e0498c 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <rsc/rscsfx.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index c4310abf8b84..69ffd28bc62e 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/types.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 3497ade75ec0..bfb3edd65290 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -20,7 +20,7 @@
 #include "docsh.hxx"
 
 #include "scitems.hxx"
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <editeng/justifyitem.hxx>
 #include <comphelper/classids.hxx>
 #include <formula/errorcodes.hxx>
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 28a1be9b246e..586f48e3967a 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -19,7 +19,7 @@
 
 #include <config_features.h>
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/urlobj.hxx>
 #include <svl/converter.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index fa0f91a0b61c..a1b196d6e0dc 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/embed/EmbedMisc.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <sfx2/app.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svx/svxdlg.hxx>
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index 66e2a70b3755..92fbc46c0855 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -488,7 +488,7 @@
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
 #include <tools/errcode.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/fract.hxx>
diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx
index c725173c5dfa..fdd2bc04f6cd 100644
--- a/sd/inc/sdgrffilter.hxx
+++ b/sd/inc/sdgrffilter.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/drawing/XShape.hpp>
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include "sdfilter.hxx"
 
 // SdCGMFilter
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index c1941ec2be74..8a22c88e46bb 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
 
 #include <unotools/localfilehelper.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx
index ac59c38f6a59..67782dbae73d 100644
--- a/sd/source/filter/html/sdhtmlfilter.cxx
+++ b/sd/source/filter/html/sdhtmlfilter.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <unotools/localfilehelper.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 02a0dbeb3f5d..4f12e3702ed2 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <rtl/strbuf.hxx>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 98f129f7d934..f90d50d5824d 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -24,7 +24,7 @@
 #include "framework/FrameworkHelper.hxx"
 
 #include <svx/dialogs.hrc>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/editdata.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx
index e4884ee250ba..c281f02ed9f4 100644
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -233,7 +233,7 @@
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
diff --git a/sot/inc/pch/precompiled_sot.hxx b/sot/inc/pch/precompiled_sot.hxx
index 9c446888395e..6d693ba3901c 100644
--- a/sot/inc/pch/precompiled_sot.hxx
+++ b/sot/inc/pch/precompiled_sot.hxx
@@ -64,7 +64,7 @@
 #include <cppu/unotype.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <tools/debug.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/lineend.hxx>
 #include <tools/ref.hxx>
 #include <tools/stream.hxx>
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index dcd1e5242e95..94fbd4454a7f 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <stdlib.h>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index bb4ba923e5ba..4fd868e00650 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -636,7 +636,7 @@
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
 #include <tools/errcode.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/fract.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 2d586e6944b8..41e348d5e594 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -567,7 +567,7 @@
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
 #include <tools/errcode.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/fract.hxx>
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index f8965404cbc6..7fbd51c7b477 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -365,7 +365,7 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/errcode.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 6bcae1c5d65d..cafafbbaeac2 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -21,7 +21,7 @@
 #include <hintids.hxx>
 
 #include <o3tl/make_unique.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <vcl/svapp.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <svx/svxids.hrc>
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 9624e4ab9108..d77eee22f65f 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -32,7 +32,7 @@
 #endif
 #include <hintids.hxx>
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <svl/stritem.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/htmltokn.h>
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index d899db80c4e8..a61948552c06 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/packages/WrongPasswordException.hpp>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <o3tl/any.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <sfx2/docfile.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svl/stritem.hxx>
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 3086a86b05f2..7e3658adacb1 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/frame/XModule.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/genericpropertyset.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <o3tl/any.hxx>
 #include <unotools/streamwrap.hxx>
 #include <svx/xmlgrhlp.hxx>
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 52f9e023c440..1012e1896598 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 2d5d3718ecb5..75c0c9eea027 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -20,7 +20,7 @@
 #include <hintids.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/adjustitem.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/macitem.hxx>
 #include <sfx2/fcontnr.hxx>
diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx
index 13e50027b2e3..42a7d5b0bddd 100644
--- a/sw/source/uibase/misc/glosdoc.cxx
+++ b/sw/source/uibase/misc/glosdoc.cxx
@@ -23,7 +23,7 @@
 
 #include <unotools/transliterationwrapper.hxx>
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <osl/diagnose.h>
 #include <svl/urihelper.hxx>
 #include <svl/fstathelper.hxx>
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 4ea1a236a19a..4647ca0edcd7 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -27,7 +27,7 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/lnkbase.hxx>
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <svx/svdview.hxx>
 #include <svl/ptitem.hxx>
 #include <svl/stritem.hxx>
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 550ae169e88a..6c1629bb9205 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -22,7 +22,7 @@
 #include <comphelper/string.hxx>
 #include <unotools/tempfile.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/print.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 63dd947d3da3..4d3a3e56335e 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -67,7 +67,7 @@
 #include <svl/whiter.hxx>
 #include <svl/ptitem.hxx>
 #include <sfx2/linkmgr.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/urlobj.hxx>
 #include <svx/svdview.hxx>
 #include <swtypes.hxx>
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index c97c0ceed535..9cf167aa8d58 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -11,7 +11,7 @@
 
 #include <test/bootstrapfixture.hxx>
 #include <test/setupvcl.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/bootstrap.hxx>
 #include <cppuhelper/bootstrap.hxx>
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index e774ffc18f0a..04231aaed139 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -73,7 +73,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
     tools/source/rc/rc \
     tools/source/rc/resary \
     tools/source/rc/resmgr \
-    tools/source/ref/errinf \
     tools/source/ref/globname \
     tools/source/ref/pstm \
     tools/source/ref/ref \
diff --git a/unotools/inc/pch/precompiled_utl.hxx b/unotools/inc/pch/precompiled_utl.hxx
index 97ed1b6d5777..7d191ccf7912 100644
--- a/unotools/inc/pch/precompiled_utl.hxx
+++ b/unotools/inc/pch/precompiled_utl.hxx
@@ -130,7 +130,7 @@
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/lineend.hxx>
 #include <tools/ref.hxx>
 #include <tools/solar.h>
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 3370030d81c5..11b1062dbc08 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -36,7 +36,7 @@
 #include <rtl/digest.h>
 #include <osl/mutex.hxx>
 #include <tools/errcode.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/abstdlg.hxx>
 #include <vcl/svapp.hxx>
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index a549cc2a4e7b..d9a3d2ab8c6c 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/task/XInteractionDisapprove.hpp>
 #include <com/sun/star/task/XInteractionRetry.hpp>
 
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <svtools/svtools.hrc>
 #include <svx/dialogs.hrc>
 
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index f8a1efd0af3e..c1049894d200 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -62,7 +62,7 @@
 #include <rtl/strbuf.hxx>
 #include <osl/conditn.hxx>
 #include <tools/rcid.h>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <osl/mutex.hxx>
 #include <osl/thread.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx b/vbahelper/inc/pch/precompiled_msforms.hxx
index b8596a418a1b..068c9a33adc4 100644
--- a/vbahelper/inc/pch/precompiled_msforms.hxx
+++ b/vbahelper/inc/pch/precompiled_msforms.hxx
@@ -314,7 +314,7 @@
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <tools/errcode.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 9fefd4e25de5..a0113a2e85d4 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -131,6 +131,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
 endif
 
 $(eval $(call gb_Library_add_exception_objects,vcl,\
+    vcl/source/window/errinf \
     vcl/source/window/settings \
     vcl/source/window/paint \
     vcl/source/window/abstdlg \
diff --git a/tools/source/ref/errinf.cxx b/vcl/source/window/errinf.cxx
similarity index 99%
rename from tools/source/ref/errinf.cxx
rename to vcl/source/window/errinf.cxx
index ab304e961461..cfe44da63c2f 100644
--- a/tools/source/ref/errinf.cxx
+++ b/vcl/source/window/errinf.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <limits.h>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <rtl/strbuf.hxx>
 #include <osl/diagnose.h>
 #include <vcl/window.hxx>
@@ -87,7 +87,7 @@ void DynamicErrorInfo_Impl::UnRegisterEDcr(DynamicErrorInfo const *pDynErrInfo)
 {
     DynamicErrorInfo **ppDynErrInfo = TheErrorRegistry::get().ppDynErrInfo;
     sal_uIntPtr lIdx = (((sal_uIntPtr)(*pDynErrInfo) & ERRCODE_DYNAMIC_MASK) >> ERRCODE_DYNAMIC_SHIFT) - 1;
-    DBG_ASSERT(ppDynErrInfo[lIdx]==pDynErrInfo,"ErrHdl: Error not found");
+    DBG_ASSERT(ppDynErrInfo[lIdx]==pDynErrInfo, "ErrHdl: Error not found");
     if(ppDynErrInfo[lIdx]==pDynErrInfo)
         ppDynErrInfo[lIdx]=nullptr;
 }
diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
index 4e82ff05954c..18ecadddb2d1 100644
--- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
@@ -268,7 +268,7 @@
 #include <tools/contnr.hxx>
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
-#include <tools/errinf.hxx>
+#include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
