From f9f045e7830d184497554e0e438cc478fa990eb6 Mon Sep 17 00:00:00 2001
From: Chris Sherlock <chris.sherlock79@gmail.com>
Date: Mon, 24 Apr 2017 01:06:41 +1000
Subject: tools: move errcode.hxx to the vcl module

Change-Id: I17e5a033de5f0aeb0a726744f7b464cdab6e2ee3
Reviewed-on: https://gerrit.libreoffice.org/36854
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
---
 basic/inc/pch/precompiled_sb.hxx                   |   2 +-
 basic/source/classes/sb.src                        |   7 +-
 basic/source/classes/sbunoobj.cxx                  |   2 +-
 basic/source/runtime/ddectrl.cxx                   |   2 +-
 basic/source/sbx/sbxbool.cxx                       |   2 +-
 basic/source/sbx/sbxbyte.cxx                       |   2 +-
 basic/source/sbx/sbxchar.cxx                       |   2 +-
 basic/source/sbx/sbxcurr.cxx                       |   2 +-
 basic/source/sbx/sbxdate.cxx                       |   2 +-
 basic/source/sbx/sbxdbl.cxx                        |   2 +-
 basic/source/sbx/sbxdec.cxx                        |   2 +-
 basic/source/sbx/sbxexec.cxx                       |   2 +-
 basic/source/sbx/sbxint.cxx                        |   2 +-
 basic/source/sbx/sbxlng.cxx                        |   2 +-
 basic/source/sbx/sbxscan.cxx                       |   2 +-
 basic/source/sbx/sbxsng.cxx                        |   2 +-
 basic/source/sbx/sbxstr.cxx                        |   2 +-
 basic/source/sbx/sbxuint.cxx                       |   2 +-
 basic/source/sbx/sbxulng.cxx                       |   2 +-
 chart2/inc/pch/precompiled_chartcontroller.hxx     |   2 +-
 chart2/inc/pch/precompiled_chartcore.hxx           |   2 +-
 cui/inc/pch/precompiled_cui.hxx                    |   2 +-
 dbaccess/source/core/dataaccess/ModelImpl.cxx      |   2 +-
 .../source/core/dataaccess/databasedocument.cxx    |   2 +-
 desktop/source/lib/lokinteractionhandler.hxx       |   2 +-
 editeng/inc/pch/precompiled_editeng.hxx            |   2 +-
 forms/inc/pch/precompiled_frm.hxx                  |   2 +-
 include/basic/sbmeth.hxx                           |   2 +-
 include/basic/sbxdef.hxx                           |   2 +-
 include/editeng/editerr.hxx                        |   2 +-
 include/filter/msfilter/msdffimp.hxx               |   2 +-
 include/filter/msfilter/svxmsbas.hxx               |   2 +-
 include/sfx2/app.hxx                               |   2 +-
 include/sfx2/docinsert.hxx                         |   2 +-
 include/sfx2/filedlghelper.hxx                     |   2 +-
 include/sfx2/objsh.hxx                             |   2 +-
 include/sfx2/viewsh.hxx                            |   2 +-
 include/sot/storage.hxx                            |   2 +-
 include/svtools/sfxecode.hxx                       |   2 +-
 include/svtools/soerr.hxx                          |   2 +-
 include/svx/svxerr.hxx                             |   2 +-
 include/tools/errcode.hxx                          | 270 ---------------------
 include/tools/stream.hxx                           |   2 +-
 include/vcl/errcode.hxx                            | 270 +++++++++++++++++++++
 include/vcl/errinf.hxx                             |   2 +-
 include/vcl/print.hxx                              |   2 +-
 reportdesign/inc/pch/precompiled_rptui.hxx         |   2 +-
 sc/inc/pch/precompiled_sc.hxx                      |   2 +-
 sc/inc/scerrors.hxx                                |   2 +-
 sc/inc/xmlwrap.hxx                                 |   2 +-
 sd/inc/pch/precompiled_sd.hxx                      |   2 +-
 sd/inc/pch/precompiled_sdui.hxx                    |   2 +-
 sd/inc/sderror.hxx                                 |   2 +-
 sd/inc/sdxmlwrp.hxx                                |   2 +-
 sd/source/ui/inc/filedlg.hxx                       |   2 +-
 sdext/source/pdfimport/misc/pwdinteract.cxx        |   2 +-
 sfx2/source/inc/helper.hxx                         |   2 +-
 sfx2/source/inc/macroloader.hxx                    |   2 +-
 starmath/inc/pch/precompiled_sm.hxx                |   2 +-
 svtools/inc/pch/precompiled_svt.hxx                |   2 +-
 svx/inc/pch/precompiled_svx.hxx                    |   2 +-
 sw/inc/pch/precompiled_msword.hxx                  |   2 +-
 sw/inc/pch/precompiled_sw.hxx                      |   2 +-
 sw/inc/pch/precompiled_swui.hxx                    |   2 +-
 sw/inc/pch/precompiled_vbaswobj.hxx                |   2 +-
 sw/inc/swerror.h                                   |   2 +-
 sw/qa/extras/uiwriter/uiwriter.cxx                 |   2 +-
 unotools/source/ucbhelper/ucblockbytes.hxx         |   2 +-
 uui/source/iahndl-authentication.cxx               |   2 +-
 uui/source/iahndl.hxx                              |   2 +-
 uui/source/ids.hrc                                 |   2 +-
 vbahelper/inc/pch/precompiled_msforms.hxx          |   2 +-
 vbahelper/inc/pch/precompiled_vbahelper.hxx        |   2 +-
 73 files changed, 345 insertions(+), 342 deletions(-)
 delete mode 100644 include/tools/errcode.hxx
 create mode 100644 include/vcl/errcode.hxx

diff --git a/basic/inc/pch/precompiled_sb.hxx b/basic/inc/pch/precompiled_sb.hxx
index f7a0d4df2b8d..85d74021de78 100644
--- a/basic/inc/pch/precompiled_sb.hxx
+++ b/basic/inc/pch/precompiled_sb.hxx
@@ -78,7 +78,7 @@
 #include <svl/SfxBroadcaster.hxx>
 #include <svl/zforlist.hxx>
 #include <tools/debug.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/link.hxx>
 #include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
diff --git a/basic/source/classes/sb.src b/basic/source/classes/sb.src
index 5e6560a1906e..91f9d771cbc7 100644
--- a/basic/source/classes/sb.src
+++ b/basic/source/classes/sb.src
@@ -17,10 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errcode.hxx>
-#include "sb.hrc"
+#define __RSC
+
+#include <vcl/errcode.hxx>
 #include <basic/sberrors.hxx>
 
+#include "sb.hrc"
+
 StringArray RID_BASIC_START
 {
     ItemList [ en-US ] =
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index ee16722056b0..fdfcb75ccf5c 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -22,7 +22,7 @@
 #include <o3tl/any.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <svl/hint.hxx>
 
 #include <cppuhelper/implbase.hxx>
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index f8882d062efe..c4cd17ec1765 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <svl/svdde.hxx>
 #include "ddectrl.hxx"
 #include <basic/sberrors.hxx>
diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx
index 2e789bd3d100..fc8c78205fbf 100644
--- a/basic/source/sbx/sbxbool.cxx
+++ b/basic/source/sbx/sbxbool.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 #include "sbxres.hxx"
diff --git a/basic/source/sbx/sbxbyte.cxx b/basic/source/sbx/sbxbyte.cxx
index 9d52eebec395..9c4e0e00f3e6 100644
--- a/basic/source/sbx/sbxbyte.cxx
+++ b/basic/source/sbx/sbxbyte.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
diff --git a/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx
index 478a9d556adf..d4df0fed3d04 100644
--- a/basic/source/sbx/sbxchar.cxx
+++ b/basic/source/sbx/sbxchar.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index 2f7f05aa7448..130f51e6de27 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/svapp.hxx>
 
 #include <basic/sbx.hxx>
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index 342aa0ef482c..a5ce46ac6bce 100644
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -20,7 +20,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <svl/zforlist.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/color.hxx>
 #include <i18nlangtag/lang.h>
 #include <basic/sbx.hxx>
diff --git a/basic/source/sbx/sbxdbl.cxx b/basic/source/sbx/sbxdbl.cxx
index 3c17e6155ef7..e40d8dd55362 100644
--- a/basic/source/sbx/sbxdbl.cxx
+++ b/basic/source/sbx/sbxdbl.cxx
@@ -19,7 +19,7 @@
 
 #include <config_features.h>
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 #include "runtime.hxx"
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index fa82edd39178..d429ea9ca433 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx
index beab3148a373..6a1de98b28d3 100644
--- a/basic/source/sbx/sbxexec.cxx
+++ b/basic/source/sbx/sbxexec.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/svapp.hxx>
 #include <basic/sbx.hxx>
 #include <rtl/character.hxx>
diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx
index d92a0aadb2c0..81624fe64a4b 100644
--- a/basic/source/sbx/sbxint.cxx
+++ b/basic/source/sbx/sbxint.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
diff --git a/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx
index 73f503d3f98e..5aba02cc484e 100644
--- a/basic/source/sbx/sbxlng.cxx
+++ b/basic/source/sbx/sbxlng.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index b23c63f933d2..1b46030fd0a7 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -19,7 +19,7 @@
 
 #include <config_features.h>
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/resmgr.hxx>
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx
index 74402c593ebe..3877fd35ffd4 100644
--- a/basic/source/sbx/sbxsng.cxx
+++ b/basic/source/sbx/sbxsng.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx
index 404036d6b5bd..1a448c3a95d6 100644
--- a/basic/source/sbx/sbxstr.cxx
+++ b/basic/source/sbx/sbxstr.cxx
@@ -19,7 +19,7 @@
 
 #include <config_features.h>
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 #include "sbxres.hxx"
diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx
index 89cf8bba6a68..f3546ebc0805 100644
--- a/basic/source/sbx/sbxuint.cxx
+++ b/basic/source/sbx/sbxuint.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
diff --git a/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx
index dd79eeac8be7..6a8ac1f866e2 100644
--- a/basic/source/sbx/sbxulng.cxx
+++ b/basic/source/sbx/sbxulng.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index 307469471f21..f1ec816dd932 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -485,7 +485,7 @@
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
diff --git a/chart2/inc/pch/precompiled_chartcore.hxx b/chart2/inc/pch/precompiled_chartcore.hxx
index 3f066bae8e65..618cb6e3f60b 100644
--- a/chart2/inc/pch/precompiled_chartcore.hxx
+++ b/chart2/inc/pch/precompiled_chartcore.hxx
@@ -184,7 +184,7 @@
 #include <svx/xpoly.hxx>
 #include <tools/color.hxx>
 #include <tools/contnr.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
 #include <tools/solar.h>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index ee57ed708cb2..45f8e87d596c 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -446,7 +446,7 @@
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index f7bf18bcf43e..03b15fe59ca9 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -56,7 +56,7 @@
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/sharedunocomponent.hxx>
 
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 3ecc3a38bba0..9a8eb0df0beb 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -80,7 +80,7 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 #include <functional>
 #include <list>
diff --git a/desktop/source/lib/lokinteractionhandler.hxx b/desktop/source/lib/lokinteractionhandler.hxx
index 0a8defe53047..01a43fbe266c 100644
--- a/desktop/source/lib/lokinteractionhandler.hxx
+++ b/desktop/source/lib/lokinteractionhandler.hxx
@@ -22,7 +22,7 @@
 
 #include <osl/conditn.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index ace028201e39..7386631bfac4 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -266,7 +266,7 @@
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
diff --git a/forms/inc/pch/precompiled_frm.hxx b/forms/inc/pch/precompiled_frm.hxx
index 2b8955ae8f16..332168179df9 100644
--- a/forms/inc/pch/precompiled_frm.hxx
+++ b/forms/inc/pch/precompiled_frm.hxx
@@ -249,7 +249,7 @@
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
 #include <tools/gen.hxx>
 #include <tools/inetmime.hxx>
diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx
index 2a67dc7ad592..750542c8eff3 100644
--- a/include/basic/sbmeth.hxx
+++ b/include/basic/sbmeth.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_BASIC_SBMETH_HXX
 #define INCLUDED_BASIC_SBMETH_HXX
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <basic/sbxmeth.hxx>
 #include <basic/sbdef.hxx>
 #include <basic/basicdllapi.h>
diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index 77e3231a65a5..cfdd3f883b46 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -23,7 +23,7 @@
 
 
 #ifndef __RSC
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 enum class SbxClassType {         // SBX-class-IDs (order is important!)
diff --git a/include/editeng/editerr.hxx b/include/editeng/editerr.hxx
index 9e5cc9ebfcdd..f020d01a4855 100644
--- a/include/editeng/editerr.hxx
+++ b/include/editeng/editerr.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_EDITENG_EDITERR_HXX
 #define INCLUDED_EDITENG_EDITERR_HXX
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 #define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS    (2UL | ERRCODE_AREA_SVX)
 
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 48c3ce50c254..dcce24bb3644 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -39,7 +39,7 @@
 #include <svx/msdffdef.hxx>
 #include <tools/color.hxx>
 #include <tools/colordata.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/gen.hxx>
 #include <tools/ref.hxx>
 #include <tools/solar.h>
diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx
index 92a116b601eb..10d6784675d4 100644
--- a/include/filter/msfilter/svxmsbas.hxx
+++ b/include/filter/msfilter/svxmsbas.hxx
@@ -23,7 +23,7 @@
 #include <filter/msfilter/msfilterdllapi.h>
 #include <rtl/ustring.hxx>
 #include <sot/storage.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/ref.hxx>
 
 class SfxObjectShell;
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index f44b0a16894d..cba04af4a281 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -23,7 +23,7 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <svl/poolitem.hxx>
 #include <vcl/image.hxx>
 #include <com/sun/star/script/XLibraryContainer.hpp>
diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx
index b1da8052b1db..a7b7302a795f 100644
--- a/include/sfx2/docinsert.hxx
+++ b/include/sfx2/docinsert.hxx
@@ -22,7 +22,7 @@
 
 #include <rtl/ustring.hxx>
 #include <sfx2/dllapi.h>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/link.hxx>
 #include <memory>
 #include <vector>
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index f2f8ed6356d3..2e55a9702c79 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/button.hxx>
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 654720aad1a9..3c05132304bb 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -23,7 +23,7 @@
 #include <sfx2/dllapi.h>
 #include <sfx2/signaturestate.hxx>
 #include <sal/types.h>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 54a300b7eab7..3cfe413bcf30 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -34,7 +34,7 @@
 #include <cppuhelper/interfacecontainer.hxx>
 #include <sfx2/shell.hxx>
 #include <tools/gen.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/jobset.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <vcl/vclptr.hxx>
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 2365f13a237c..5f60cafd3f79 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/embed/XStorage.hpp>
 #include <sot/object.hxx>
 #include <tools/stream.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <sot/storinfo.hxx>
 #include <sot/sotdllapi.h>
 
diff --git a/include/svtools/sfxecode.hxx b/include/svtools/sfxecode.hxx
index e4b5c0b58196..6fde5916271a 100644
--- a/include/svtools/sfxecode.hxx
+++ b/include/svtools/sfxecode.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SVTOOLS_SFXECODE_HXX
 #define INCLUDED_SVTOOLS_SFXECODE_HXX
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 #define ERRCODE_SFX_NOTATEMPLATE            (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|2)
 #define ERRCODE_SFX_GENERAL                 (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|3)
diff --git a/include/svtools/soerr.hxx b/include/svtools/soerr.hxx
index 4f02c70cfecd..7dc3347f3598 100644
--- a/include/svtools/soerr.hxx
+++ b/include/svtools/soerr.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SVTOOLS_SOERR_HXX
 #define INCLUDED_SVTOOLS_SOERR_HXX
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 // error codes
 #define RID_SO_ERROR_HANDLER    32000
diff --git a/include/svx/svxerr.hxx b/include/svx/svxerr.hxx
index 09a32faf3445..f8c0ffae98c5 100644
--- a/include/svx/svxerr.hxx
+++ b/include/svx/svxerr.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SVX_SVXERR_HXX
 #define INCLUDED_SVX_SVXERR_HXX
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 // define ----------------------------------------------------------------
 
diff --git a/include/tools/errcode.hxx b/include/tools/errcode.hxx
deleted file mode 100644
index 6eaef4b1b77e..000000000000
--- a/include/tools/errcode.hxx
+++ /dev/null
@@ -1,270 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_TOOLS_ERRCODE_HXX
-#define INCLUDED_TOOLS_ERRCODE_HXX
-
-#ifndef __RSC
-#include <tools/solar.h>
-#define CAST_TO_UINT32(a) ((sal_uInt32)(a))
-#else
-#define CAST_TO_UINT32(a) (a)
-#endif
-
-/*
-
-01234567012345670123456701234567
-||   ||          |||   ||      |
-Warning           ||   ||      |
- |   ||           ||   ||      |
- Dynamic          ||   ||      |
-      |           ||   ||      |
-      Subsystemarea|   ||      |
-                   |   ||      |
-                   |   ||      |
-                   |   ||      |
-                   Class|      |
-                        |      |
-                        |      |
-                        |      |
-                        Code
-*/
-
-#define ERRCODE_ERROR_MASK                0x3fffffffUL
-#define ERRCODE_WARNING_MASK              0x80000000UL
-#define ERRCODE_RES_MASK                  0x7fff
-
-#define ERRCODE_CLASS_SHIFT               8
-#define ERRCODE_AREA_SHIFT                13
-#define ERRCODE_DYNAMIC_SHIFT             26
-
-#define ERRCODE_CLASS_MASK                CAST_TO_UINT32(31UL  <<ERRCODE_CLASS_SHIFT)
-
-#define ERRCODE_DYNAMIC_START             CAST_TO_UINT32(1UL   <<ERRCODE_DYNAMIC_SHIFT)
-#define ERRCODE_DYNAMIC_COUNT             31UL
-#define ERRCODE_DYNAMIC_MASK              CAST_TO_UINT32(31UL  <<ERRCODE_DYNAMIC_SHIFT)
-
-#ifdef __RSC
-
-#define ERRCODE_TOERROR(x) \
-    ((x & ERRCODE_WARNING_MASK) ? 0 : (x & ERRCODE_ERROR_MASK))
-
-#else
-
-typedef sal_uInt32 ErrCode;
-
-inline sal_uInt32 ERRCODE_TOERROR( ErrCode x )
-{
-    return ((x & ERRCODE_WARNING_MASK) ? 0 : (x & ERRCODE_ERROR_MASK));
-}
-
-#endif
-
-#define ERRCODE_AREA_TOOLS               CAST_TO_UINT32(0UL   << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_SV                  CAST_TO_UINT32(1UL   << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_SFX                 CAST_TO_UINT32(2UL   << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_INET                CAST_TO_UINT32(3UL   << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_IO                   ERRCODE_AREA_TOOLS
-
-#define ERRCODE_AREA_LIB1                CAST_TO_UINT32(8UL   << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_SVX                 ERRCODE_AREA_LIB1
-#define ERRCODE_AREA_SVX_END             (ERRCODE_AREA_SO-1)
-#define ERRCODE_AREA_SO                  CAST_TO_UINT32(9UL   << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_SO_END              (ERRCODE_AREA_SBX-1)
-#define ERRCODE_AREA_SBX                 CAST_TO_UINT32(10UL   << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_SBX_END             CAST_TO_UINT32((11UL  << ERRCODE_AREA_SHIFT) - 1)
-#define ERRCODE_AREA_DB                  CAST_TO_UINT32(11UL   << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_DB_END              CAST_TO_UINT32((12UL  << ERRCODE_AREA_SHIFT) - 1)
-#define ERRCODE_AREA_JAVA                CAST_TO_UINT32(12UL  << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_JAVA_END            CAST_TO_UINT32((13UL  << ERRCODE_AREA_SHIFT) - 1)
-#define ERRCODE_AREA_UUI                 CAST_TO_UINT32(13UL  << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_UUI_END             CAST_TO_UINT32((14UL  << ERRCODE_AREA_SHIFT) - 1)
-#define ERRCODE_AREA_LIB2                CAST_TO_UINT32(14UL  << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_LIB2_END            CAST_TO_UINT32((15UL  << ERRCODE_AREA_SHIFT) - 1)
-
-#define ERRCODE_AREA_APP1                CAST_TO_UINT32(32UL  << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_APP2                CAST_TO_UINT32(40UL  << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_APP3                CAST_TO_UINT32(48UL  << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_APP4                CAST_TO_UINT32(56UL  << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_APP5                CAST_TO_UINT32(64UL  << ERRCODE_AREA_SHIFT)
-#define ERRCODE_AREA_APP6                CAST_TO_UINT32(72UL  << ERRCODE_AREA_SHIFT)
-
-#define ERRCODE_AREA_SC                  ERRCODE_AREA_APP1
-#define ERRCODE_AREA_SC_END              (ERRCODE_AREA_APP2-1)
-
-#define ERRCODE_AREA_SD                  ERRCODE_AREA_APP2
-#define ERRCODE_AREA_SD_END              (ERRCODE_AREA_APP3-1)
-
-#define ERRCODE_AREA_SW                  ERRCODE_AREA_APP4
-#define ERRCODE_AREA_SW_END              (ERRCODE_AREA_APP5-1)
-
-#define ERRCODE_AREA_OFA_END             (ERRCODE_AREA_APP6-1)
-
-#define ERRCODE_CLASS_NONE               CAST_TO_UINT32(0UL   << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_ABORT              CAST_TO_UINT32(1UL   << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_GENERAL            CAST_TO_UINT32(2UL   << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_NOTEXISTS          CAST_TO_UINT32(3UL   << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_ALREADYEXISTS      CAST_TO_UINT32(4UL   << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_ACCESS             CAST_TO_UINT32(5UL   << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_PATH               CAST_TO_UINT32(6UL   << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_LOCKING            CAST_TO_UINT32(7UL   << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_PARAMETER          CAST_TO_UINT32(8UL   << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_SPACE              CAST_TO_UINT32(9UL   << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_NOTSUPPORTED       CAST_TO_UINT32(10UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_READ               CAST_TO_UINT32(11UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_WRITE              CAST_TO_UINT32(12UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_UNKNOWN            CAST_TO_UINT32(13UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_VERSION            CAST_TO_UINT32(14UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_FORMAT             CAST_TO_UINT32(15UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_CREATE             CAST_TO_UINT32(16UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_IMPORT             CAST_TO_UINT32(17UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_EXPORT             CAST_TO_UINT32(18UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_FILTER             CAST_TO_UINT32(19UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_SO                 CAST_TO_UINT32(20UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_SBX                CAST_TO_UINT32(21UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_RUNTIME            CAST_TO_UINT32(22UL  << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_CLASS_COMPILER           CAST_TO_UINT32(23UL  << ERRCODE_CLASS_SHIFT)
-
-#define ERRCODE_NONE                  CAST_TO_UINT32(0UL)
-#define ERRCODE_ABORT                 ERRCODE_IO_ABORT
-
-#define ERRCODE_IO_MISPLACEDCHAR      CAST_TO_UINT32(1UL |ERRCODE_CLASS_PARAMETER|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_NOTEXISTS          CAST_TO_UINT32(2UL |ERRCODE_CLASS_NOTEXISTS|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_ALREADYEXISTS      CAST_TO_UINT32(3UL |ERRCODE_CLASS_ALREADYEXISTS|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_NOTADIRECTORY      CAST_TO_UINT32(4UL |ERRCODE_CLASS_PARAMETER|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_NOTAFILE           CAST_TO_UINT32(5UL |ERRCODE_CLASS_PARAMETER|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_INVALIDDEVICE      CAST_TO_UINT32(6UL |ERRCODE_CLASS_PATH|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_ACCESSDENIED       CAST_TO_UINT32(7UL |ERRCODE_CLASS_ACCESS|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_LOCKVIOLATION      CAST_TO_UINT32(8UL |ERRCODE_CLASS_LOCKING|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_OUTOFSPACE         CAST_TO_UINT32(9UL |ERRCODE_CLASS_SPACE|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_ISWILDCARD         CAST_TO_UINT32(11UL|ERRCODE_CLASS_PARAMETER|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_NOTSUPPORTED       CAST_TO_UINT32(12UL|ERRCODE_CLASS_NOTSUPPORTED|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_GENERAL            CAST_TO_UINT32(13UL|ERRCODE_CLASS_GENERAL|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_TOOMANYOPENFILES   CAST_TO_UINT32(14UL|ERRCODE_CLASS_SPACE|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_CANTREAD           CAST_TO_UINT32(15UL|ERRCODE_CLASS_READ|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_CANTWRITE          CAST_TO_UINT32(16UL|ERRCODE_CLASS_WRITE|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_OUTOFMEMORY        CAST_TO_UINT32(17UL|ERRCODE_CLASS_SPACE|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_CANTSEEK           CAST_TO_UINT32(18UL|ERRCODE_CLASS_GENERAL|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_CANTTELL           CAST_TO_UINT32(19UL|ERRCODE_CLASS_GENERAL|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_WRONGVERSION       CAST_TO_UINT32(20UL|ERRCODE_CLASS_VERSION|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_WRONGFORMAT        CAST_TO_UINT32(21UL|ERRCODE_CLASS_FORMAT|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_INVALIDCHAR        CAST_TO_UINT32(22UL|ERRCODE_CLASS_PARAMETER|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_UNKNOWN            CAST_TO_UINT32(23UL|ERRCODE_CLASS_UNKNOWN|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_INVALIDACCESS      CAST_TO_UINT32(24UL|ERRCODE_CLASS_ACCESS|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_CANTCREATE         CAST_TO_UINT32(25UL|ERRCODE_CLASS_CREATE|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_INVALIDPARAMETER   CAST_TO_UINT32(26UL|ERRCODE_CLASS_PARAMETER|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_ABORT              CAST_TO_UINT32(27UL|ERRCODE_CLASS_ABORT|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_NOTEXISTSPATH      CAST_TO_UINT32(28UL |ERRCODE_CLASS_NOTEXISTS|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_PENDING            CAST_TO_UINT32(29UL |ERRCODE_CLASS_NOTEXISTS|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_RECURSIVE          CAST_TO_UINT32(30UL |ERRCODE_CLASS_PARAMETER|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_NAMETOOLONG        CAST_TO_UINT32(31UL |ERRCODE_CLASS_PARAMETER|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_INVALIDLENGTH      CAST_TO_UINT32(32UL |ERRCODE_CLASS_PARAMETER|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_CURRENTDIR         CAST_TO_UINT32(33UL |ERRCODE_CLASS_PARAMETER|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_NOTSAMEDEVICE      CAST_TO_UINT32(34UL |ERRCODE_CLASS_PARAMETER|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_DEVICENOTREADY     CAST_TO_UINT32(35UL |ERRCODE_CLASS_READ|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_BADCRC             CAST_TO_UINT32(36UL |ERRCODE_CLASS_READ|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_WRITEPROTECTED     CAST_TO_UINT32(37UL |ERRCODE_CLASS_ACCESS|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_BROKENPACKAGE      CAST_TO_UINT32(38UL |ERRCODE_CLASS_FORMAT|\
-                                         ERRCODE_AREA_IO)
-#define ERRCODE_IO_NOTSTORABLEINBINARYFORMAT      CAST_TO_UINT32(39UL |ERRCODE_CLASS_FORMAT|\
-                                         ERRCODE_AREA_IO)
-
-// FsysErrorCodes
-
-// StreamErrorCodes
-#define SVSTREAM_OK                     ERRCODE_NONE
-
-#define SVSTREAM_GENERALERROR           ERRCODE_IO_GENERAL
-#define SVSTREAM_FILE_NOT_FOUND         ERRCODE_IO_NOTEXISTS
-#define SVSTREAM_PATH_NOT_FOUND         ERRCODE_IO_NOTEXISTSPATH
-#define SVSTREAM_TOO_MANY_OPEN_FILES    ERRCODE_IO_TOOMANYOPENFILES
-#define SVSTREAM_ACCESS_DENIED          ERRCODE_IO_ACCESSDENIED
-#define SVSTREAM_SHARING_VIOLATION      ERRCODE_IO_LOCKVIOLATION
-#define SVSTREAM_LOCKING_VIOLATION      ERRCODE_IO_LOCKVIOLATION
-#define SVSTREAM_SHARE_BUFF_EXCEEDED    ERRCODE_IO_LOCKVIOLATION
-
-#define SVSTREAM_INVALID_ACCESS         ERRCODE_IO_INVALIDACCESS
-#define SVSTREAM_INVALID_HANDLE         ERRCODE_IO_GENERAL
-#define SVSTREAM_CANNOT_MAKE            ERRCODE_IO_CANTCREATE
-#define SVSTREAM_INVALID_PARAMETER      ERRCODE_IO_INVALIDPARAMETER
-
-#define SVSTREAM_READ_ERROR             ERRCODE_IO_CANTREAD
-#define SVSTREAM_WRITE_ERROR            ERRCODE_IO_CANTWRITE
-#define SVSTREAM_SEEK_ERROR             ERRCODE_IO_CANTSEEK
-
-#define SVSTREAM_OUTOFMEMORY            ERRCODE_IO_OUTOFMEMORY
-
-#define SVSTREAM_FILEFORMAT_ERROR       ERRCODE_IO_WRONGFORMAT
-#define SVSTREAM_WRONGVERSION           ERRCODE_IO_WRONGVERSION
-
-#define SVSTREAM_DISK_FULL              ERRCODE_IO_OUTOFSPACE
-
-// For the EditEngine:
-#define SVSTREAM_ERRBASE_USER           ERRCODE_AREA_LIB1
-
-#define PRINTER_OK                      ERRCODE_NONE
-#define PRINTER_ABORT                   ERRCODE_IO_ABORT
-#define PRINTER_GENERALERROR            ERRCODE_IO_GENERAL
-
-#define ERRCODE_INET_NAME_RESOLVE (ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 1)
-#define ERRCODE_INET_CONNECT      (ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 2)
-#define ERRCODE_INET_READ         (ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 3)
-#define ERRCODE_INET_WRITE        (ERRCODE_AREA_INET | ERRCODE_CLASS_WRITE| 4)
-#define ERRCODE_INET_GENERAL      (ERRCODE_AREA_INET | ERRCODE_CLASS_WRITE |5)
-#define ERRCODE_INET_OFFLINE      (ERRCODE_AREA_INET | ERRCODE_CLASS_READ |6)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 26b2b2c498ba..0bc3766807fa 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -24,7 +24,7 @@
 #include <tools/toolsdllapi.h>
 #include <tools/lineend.hxx>
 #include <tools/ref.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <rtl/string.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
diff --git a/include/vcl/errcode.hxx b/include/vcl/errcode.hxx
new file mode 100644
index 000000000000..22ab86fbf22c
--- /dev/null
+++ b/include/vcl/errcode.hxx
@@ -0,0 +1,270 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_VCL_ERRCODE_HXX
+#define INCLUDED_VCL_ERRCODE_HXX
+
+#ifndef __RSC
+#include <tools/solar.h>
+#define CAST_TO_UINT32(a) ((sal_uInt32)(a))
+#else
+#define CAST_TO_UINT32(a) (a)
+#endif
+
+/*
+
+01234567012345670123456701234567
+||   ||          |||   ||      |
+Warning           ||   ||      |
+ |   ||           ||   ||      |
+ Dynamic          ||   ||      |
+      |           ||   ||      |
+      Subsystemarea|   ||      |
+                   |   ||      |
+                   |   ||      |
+                   |   ||      |
+                   Class|      |
+                        |      |
+                        |      |
+                        |      |
+                        Code
+*/
+
+#define ERRCODE_ERROR_MASK                0x3fffffffUL
+#define ERRCODE_WARNING_MASK              0x80000000UL
+#define ERRCODE_RES_MASK                  0x7fff
+
+#define ERRCODE_CLASS_SHIFT               8
+#define ERRCODE_AREA_SHIFT                13
+#define ERRCODE_DYNAMIC_SHIFT             26
+
+#define ERRCODE_CLASS_MASK                CAST_TO_UINT32(31UL  <<ERRCODE_CLASS_SHIFT)
+
+#define ERRCODE_DYNAMIC_START             CAST_TO_UINT32(1UL   <<ERRCODE_DYNAMIC_SHIFT)
+#define ERRCODE_DYNAMIC_COUNT             31UL
+#define ERRCODE_DYNAMIC_MASK              CAST_TO_UINT32(31UL  <<ERRCODE_DYNAMIC_SHIFT)
+
+#ifdef __RSC
+
+#define ERRCODE_TOERROR(x) \
+    ((x & ERRCODE_WARNING_MASK) ? 0 : (x & ERRCODE_ERROR_MASK))
+
+#else
+
+typedef sal_uInt32 ErrCode;
+
+inline sal_uInt32 ERRCODE_TOERROR( ErrCode x )
+{
+    return ((x & ERRCODE_WARNING_MASK) ? 0 : (x & ERRCODE_ERROR_MASK));
+}
+
+#endif
+
+#define ERRCODE_AREA_TOOLS               CAST_TO_UINT32(0UL   << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_SV                  CAST_TO_UINT32(1UL   << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_SFX                 CAST_TO_UINT32(2UL   << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_INET                CAST_TO_UINT32(3UL   << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_IO                   ERRCODE_AREA_TOOLS
+
+#define ERRCODE_AREA_LIB1                CAST_TO_UINT32(8UL   << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_SVX                 ERRCODE_AREA_LIB1
+#define ERRCODE_AREA_SVX_END             (ERRCODE_AREA_SO-1)
+#define ERRCODE_AREA_SO                  CAST_TO_UINT32(9UL   << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_SO_END              (ERRCODE_AREA_SBX-1)
+#define ERRCODE_AREA_SBX                 CAST_TO_UINT32(10UL   << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_SBX_END             CAST_TO_UINT32((11UL  << ERRCODE_AREA_SHIFT) - 1)
+#define ERRCODE_AREA_DB                  CAST_TO_UINT32(11UL   << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_DB_END              CAST_TO_UINT32((12UL  << ERRCODE_AREA_SHIFT) - 1)
+#define ERRCODE_AREA_JAVA                CAST_TO_UINT32(12UL  << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_JAVA_END            CAST_TO_UINT32((13UL  << ERRCODE_AREA_SHIFT) - 1)
+#define ERRCODE_AREA_UUI                 CAST_TO_UINT32(13UL  << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_UUI_END             CAST_TO_UINT32((14UL  << ERRCODE_AREA_SHIFT) - 1)
+#define ERRCODE_AREA_LIB2                CAST_TO_UINT32(14UL  << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_LIB2_END            CAST_TO_UINT32((15UL  << ERRCODE_AREA_SHIFT) - 1)
+
+#define ERRCODE_AREA_APP1                CAST_TO_UINT32(32UL  << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_APP2                CAST_TO_UINT32(40UL  << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_APP3                CAST_TO_UINT32(48UL  << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_APP4                CAST_TO_UINT32(56UL  << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_APP5                CAST_TO_UINT32(64UL  << ERRCODE_AREA_SHIFT)
+#define ERRCODE_AREA_APP6                CAST_TO_UINT32(72UL  << ERRCODE_AREA_SHIFT)
+
+#define ERRCODE_AREA_SC                  ERRCODE_AREA_APP1
+#define ERRCODE_AREA_SC_END              (ERRCODE_AREA_APP2-1)
+
+#define ERRCODE_AREA_SD                  ERRCODE_AREA_APP2
+#define ERRCODE_AREA_SD_END              (ERRCODE_AREA_APP3-1)
+
+#define ERRCODE_AREA_SW                  ERRCODE_AREA_APP4
+#define ERRCODE_AREA_SW_END              (ERRCODE_AREA_APP5-1)
+
+#define ERRCODE_AREA_OFA_END             (ERRCODE_AREA_APP6-1)
+
+#define ERRCODE_CLASS_NONE               CAST_TO_UINT32(0UL   << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_ABORT              CAST_TO_UINT32(1UL   << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_GENERAL            CAST_TO_UINT32(2UL   << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_NOTEXISTS          CAST_TO_UINT32(3UL   << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_ALREADYEXISTS      CAST_TO_UINT32(4UL   << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_ACCESS             CAST_TO_UINT32(5UL   << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_PATH               CAST_TO_UINT32(6UL   << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_LOCKING            CAST_TO_UINT32(7UL   << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_PARAMETER          CAST_TO_UINT32(8UL   << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_SPACE              CAST_TO_UINT32(9UL   << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_NOTSUPPORTED       CAST_TO_UINT32(10UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_READ               CAST_TO_UINT32(11UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_WRITE              CAST_TO_UINT32(12UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_UNKNOWN            CAST_TO_UINT32(13UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_VERSION            CAST_TO_UINT32(14UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_FORMAT             CAST_TO_UINT32(15UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_CREATE             CAST_TO_UINT32(16UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_IMPORT             CAST_TO_UINT32(17UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_EXPORT             CAST_TO_UINT32(18UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_FILTER             CAST_TO_UINT32(19UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_SO                 CAST_TO_UINT32(20UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_SBX                CAST_TO_UINT32(21UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_RUNTIME            CAST_TO_UINT32(22UL  << ERRCODE_CLASS_SHIFT)
+#define ERRCODE_CLASS_COMPILER           CAST_TO_UINT32(23UL  << ERRCODE_CLASS_SHIFT)
+
+#define ERRCODE_NONE                  CAST_TO_UINT32(0UL)
+#define ERRCODE_ABORT                 ERRCODE_IO_ABORT
+
+#define ERRCODE_IO_MISPLACEDCHAR      CAST_TO_UINT32(1UL |ERRCODE_CLASS_PARAMETER|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_NOTEXISTS          CAST_TO_UINT32(2UL |ERRCODE_CLASS_NOTEXISTS|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_ALREADYEXISTS      CAST_TO_UINT32(3UL |ERRCODE_CLASS_ALREADYEXISTS|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_NOTADIRECTORY      CAST_TO_UINT32(4UL |ERRCODE_CLASS_PARAMETER|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_NOTAFILE           CAST_TO_UINT32(5UL |ERRCODE_CLASS_PARAMETER|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_INVALIDDEVICE      CAST_TO_UINT32(6UL |ERRCODE_CLASS_PATH|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_ACCESSDENIED       CAST_TO_UINT32(7UL |ERRCODE_CLASS_ACCESS|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_LOCKVIOLATION      CAST_TO_UINT32(8UL |ERRCODE_CLASS_LOCKING|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_OUTOFSPACE         CAST_TO_UINT32(9UL |ERRCODE_CLASS_SPACE|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_ISWILDCARD         CAST_TO_UINT32(11UL|ERRCODE_CLASS_PARAMETER|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_NOTSUPPORTED       CAST_TO_UINT32(12UL|ERRCODE_CLASS_NOTSUPPORTED|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_GENERAL            CAST_TO_UINT32(13UL|ERRCODE_CLASS_GENERAL|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_TOOMANYOPENFILES   CAST_TO_UINT32(14UL|ERRCODE_CLASS_SPACE|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_CANTREAD           CAST_TO_UINT32(15UL|ERRCODE_CLASS_READ|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_CANTWRITE          CAST_TO_UINT32(16UL|ERRCODE_CLASS_WRITE|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_OUTOFMEMORY        CAST_TO_UINT32(17UL|ERRCODE_CLASS_SPACE|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_CANTSEEK           CAST_TO_UINT32(18UL|ERRCODE_CLASS_GENERAL|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_CANTTELL           CAST_TO_UINT32(19UL|ERRCODE_CLASS_GENERAL|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_WRONGVERSION       CAST_TO_UINT32(20UL|ERRCODE_CLASS_VERSION|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_WRONGFORMAT        CAST_TO_UINT32(21UL|ERRCODE_CLASS_FORMAT|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_INVALIDCHAR        CAST_TO_UINT32(22UL|ERRCODE_CLASS_PARAMETER|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_UNKNOWN            CAST_TO_UINT32(23UL|ERRCODE_CLASS_UNKNOWN|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_INVALIDACCESS      CAST_TO_UINT32(24UL|ERRCODE_CLASS_ACCESS|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_CANTCREATE         CAST_TO_UINT32(25UL|ERRCODE_CLASS_CREATE|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_INVALIDPARAMETER   CAST_TO_UINT32(26UL|ERRCODE_CLASS_PARAMETER|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_ABORT              CAST_TO_UINT32(27UL|ERRCODE_CLASS_ABORT|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_NOTEXISTSPATH      CAST_TO_UINT32(28UL |ERRCODE_CLASS_NOTEXISTS|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_PENDING            CAST_TO_UINT32(29UL |ERRCODE_CLASS_NOTEXISTS|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_RECURSIVE          CAST_TO_UINT32(30UL |ERRCODE_CLASS_PARAMETER|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_NAMETOOLONG        CAST_TO_UINT32(31UL |ERRCODE_CLASS_PARAMETER|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_INVALIDLENGTH      CAST_TO_UINT32(32UL |ERRCODE_CLASS_PARAMETER|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_CURRENTDIR         CAST_TO_UINT32(33UL |ERRCODE_CLASS_PARAMETER|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_NOTSAMEDEVICE      CAST_TO_UINT32(34UL |ERRCODE_CLASS_PARAMETER|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_DEVICENOTREADY     CAST_TO_UINT32(35UL |ERRCODE_CLASS_READ|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_BADCRC             CAST_TO_UINT32(36UL |ERRCODE_CLASS_READ|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_WRITEPROTECTED     CAST_TO_UINT32(37UL |ERRCODE_CLASS_ACCESS|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_BROKENPACKAGE      CAST_TO_UINT32(38UL |ERRCODE_CLASS_FORMAT|\
+                                         ERRCODE_AREA_IO)
+#define ERRCODE_IO_NOTSTORABLEINBINARYFORMAT      CAST_TO_UINT32(39UL |ERRCODE_CLASS_FORMAT|\
+                                         ERRCODE_AREA_IO)
+
+// FsysErrorCodes
+
+// StreamErrorCodes
+#define SVSTREAM_OK                     ERRCODE_NONE
+
+#define SVSTREAM_GENERALERROR           ERRCODE_IO_GENERAL
+#define SVSTREAM_FILE_NOT_FOUND         ERRCODE_IO_NOTEXISTS
+#define SVSTREAM_PATH_NOT_FOUND         ERRCODE_IO_NOTEXISTSPATH
+#define SVSTREAM_TOO_MANY_OPEN_FILES    ERRCODE_IO_TOOMANYOPENFILES
+#define SVSTREAM_ACCESS_DENIED          ERRCODE_IO_ACCESSDENIED
+#define SVSTREAM_SHARING_VIOLATION      ERRCODE_IO_LOCKVIOLATION
+#define SVSTREAM_LOCKING_VIOLATION      ERRCODE_IO_LOCKVIOLATION
+#define SVSTREAM_SHARE_BUFF_EXCEEDED    ERRCODE_IO_LOCKVIOLATION
+
+#define SVSTREAM_INVALID_ACCESS         ERRCODE_IO_INVALIDACCESS
+#define SVSTREAM_INVALID_HANDLE         ERRCODE_IO_GENERAL
+#define SVSTREAM_CANNOT_MAKE            ERRCODE_IO_CANTCREATE
+#define SVSTREAM_INVALID_PARAMETER      ERRCODE_IO_INVALIDPARAMETER
+
+#define SVSTREAM_READ_ERROR             ERRCODE_IO_CANTREAD
+#define SVSTREAM_WRITE_ERROR            ERRCODE_IO_CANTWRITE
+#define SVSTREAM_SEEK_ERROR             ERRCODE_IO_CANTSEEK
+
+#define SVSTREAM_OUTOFMEMORY            ERRCODE_IO_OUTOFMEMORY
+
+#define SVSTREAM_FILEFORMAT_ERROR       ERRCODE_IO_WRONGFORMAT
+#define SVSTREAM_WRONGVERSION           ERRCODE_IO_WRONGVERSION
+
+#define SVSTREAM_DISK_FULL              ERRCODE_IO_OUTOFSPACE
+
+// For the EditEngine:
+#define SVSTREAM_ERRBASE_USER           ERRCODE_AREA_LIB1
+
+#define PRINTER_OK                      ERRCODE_NONE
+#define PRINTER_ABORT                   ERRCODE_IO_ABORT
+#define PRINTER_GENERALERROR            ERRCODE_IO_GENERAL
+
+#define ERRCODE_INET_NAME_RESOLVE (ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 1)
+#define ERRCODE_INET_CONNECT      (ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 2)
+#define ERRCODE_INET_READ         (ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 3)
+#define ERRCODE_INET_WRITE        (ERRCODE_AREA_INET | ERRCODE_CLASS_WRITE| 4)
+#define ERRCODE_INET_GENERAL      (ERRCODE_AREA_INET | ERRCODE_CLASS_WRITE |5)
+#define ERRCODE_INET_OFFLINE      (ERRCODE_AREA_INET | ERRCODE_CLASS_READ |6)
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx
index 677818701531..b4bd6db323b9 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -23,7 +23,7 @@
 #define INCLUDED_VCL_ERRINF_HXX
 
 #include <rtl/ustring.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/dllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index a5ccedd4f3e6..9307d3ac7e78 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -22,7 +22,7 @@
 
 #include <rtl/ustring.hxx>
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/outdev.hxx>
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index 9a64847835ab..e441de4b64aa 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -514,7 +514,7 @@
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 8b3fb3ce1780..d0878a1d2be3 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -552,7 +552,7 @@
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
diff --git a/sc/inc/scerrors.hxx b/sc/inc/scerrors.hxx
index 69a00d613e48..a1f7493605bd 100644
--- a/sc/inc/scerrors.hxx
+++ b/sc/inc/scerrors.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SC_INC_SCERRORS_HXX
 #define INCLUDED_SC_INC_SCERRORS_HXX
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 #define SCERR_NONE 0
 
diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index 8193f757dc23..080264c753db 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -26,7 +26,7 @@
 #include "importfilterdata.hxx"
 #include <sal/types.h>
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace beans { struct PropertyValue; }
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 27993c6c65be..2b9835cdbc07 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -482,7 +482,7 @@
 #include <tools/date.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/gen.hxx>
 #include <tools/globname.hxx>
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index 92fbc46c0855..04156e61e95f 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -487,7 +487,7 @@
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
diff --git a/sd/inc/sderror.hxx b/sd/inc/sderror.hxx
index b453437d367f..009bb9f35d57 100644
--- a/sd/inc/sderror.hxx
+++ b/sd/inc/sderror.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SD_INC_SDERROR_HXX
 #define INCLUDED_SD_INC_SDERROR_HXX
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 #define ERROR_SD_BASE           (ERRCODE_AREA_SD)
 #define ERROR_SD_READ_BASE      (ERROR_SD_BASE | ERRCODE_CLASS_READ)
diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx
index 8db03c54759f..e1c590e39ebb 100644
--- a/sd/inc/sdxmlwrp.hxx
+++ b/sd/inc/sdxmlwrp.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SD_INC_SDXMLWRP_HXX
 #define INCLUDED_SD_INC_SDXMLWRP_HXX
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include "sdfilter.hxx"
 
 // SdXMLFilter
diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx
index 918a956ff2dd..7712bb58eaf9 100644
--- a/sd/source/ui/inc/filedlg.hxx
+++ b/sd/source/ui/inc/filedlg.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_FILEDLG_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_FILEDLG_HXX
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 #include <memory>
 
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index df10b09a108a..29c9e32f29de 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -34,7 +34,7 @@
 #include <osl/mutex.hxx>
 #include <osl/diagnose.h>
 #include <rtl/ref.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx
index 35012f1a00fc..3d7215a213fc 100644
--- a/sfx2/source/inc/helper.hxx
+++ b/sfx2/source/inc/helper.hxx
@@ -21,7 +21,7 @@
 
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <rtl/ustring.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 #include <vector>
 
diff --git a/sfx2/source/inc/macroloader.hxx b/sfx2/source/inc/macroloader.hxx
index 91800a551a33..94fa5165fdd9 100644
--- a/sfx2/source/inc/macroloader.hxx
+++ b/sfx2/source/inc/macroloader.hxx
@@ -37,7 +37,7 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <sfx2/sfxuno.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 class SfxObjectShell;
 
diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx
index 2bb928502c05..1d54e9079470 100644
--- a/starmath/inc/pch/precompiled_sm.hxx
+++ b/starmath/inc/pch/precompiled_sm.hxx
@@ -139,7 +139,7 @@
 #include <token.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
 #include <tools/mapunit.hxx>
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index acab2298a438..43808e2f26f7 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -364,7 +364,7 @@
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/fract.hxx>
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 201a708a4a03..fb56189ab71b 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -381,7 +381,7 @@
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/gen.hxx>
 #include <tools/globname.hxx>
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index 4fd868e00650..e8daea6dc070 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -635,7 +635,7 @@
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index fdd62fe29f30..d1999521ec5a 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -513,7 +513,7 @@
 #include <tools/datetime.hxx>
 #include <tools/datetimeutils.hxx>
 #include <tools/debug.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.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 41e348d5e594..242d1f99a4b2 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -566,7 +566,7 @@
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index 7fbd51c7b477..b474070f6dc5 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -364,7 +364,7 @@
 #include <tools/date.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
diff --git a/sw/inc/swerror.h b/sw/inc/swerror.h
index aff48474e0ff..a49663312051 100644
--- a/sw/inc/swerror.h
+++ b/sw/inc/swerror.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_INC_SWERROR_H
 #define INCLUDED_SW_INC_SWERROR_H
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 #define ERROR_SW_BASE           (ERRCODE_AREA_SW)
 #define ERROR_SW_READ_BASE      (ERROR_SW_BASE | ERRCODE_CLASS_READ)
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index b70ffbd30e4a..ef688fbd70ed 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -13,7 +13,7 @@
 #include <com/sun/star/i18n/TextConversionOption.hpp>
 #include <com/sun/star/frame/DispatchHelper.hpp>
 #include <com/sun/star/style/CaseMap.hpp>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <swmodeltestbase.hxx>
 #include <ndtxt.hxx>
 #include <wrtsh.hxx>
diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx
index 06ec8d30dd42..3ce1dfe850b5 100644
--- a/unotools/source/ucbhelper/ucblockbytes.hxx
+++ b/unotools/source/ucbhelper/ucblockbytes.hxx
@@ -30,7 +30,7 @@
 #include <rtl/ustring.hxx>
 #include <tools/stream.hxx>
 #include <tools/link.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/datetime.hxx>
 
 namespace com
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index d4ee48a759c2..4cd4ad3fee0e 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -35,7 +35,7 @@
 #include <osl/diagnose.h>
 #include <rtl/digest.h>
 #include <osl/mutex.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/abstdlg.hxx>
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index d5251ca99aab..a9f70dcbc23b 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/beans/Optional.hpp>
 #include <com/sun/star/task/InteractionClassification.hpp>
 
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/resary.hxx>
 #include <tools/wintypes.hxx>
 
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index d345b2418cb5..bc24f7fea1a3 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -21,7 +21,7 @@
 #define UUI_IDS_HRC
 
 #include <svl/solar.hrc>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 
 #define RID_KEEP_PASSWORD                               (RID_UUI_START +  0)
 #define RID_SAVE_PASSWORD                               (RID_UUI_START +  1)
diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx b/vbahelper/inc/pch/precompiled_msforms.hxx
index 068c9a33adc4..a2dcd3185c9d 100644
--- a/vbahelper/inc/pch/precompiled_msforms.hxx
+++ b/vbahelper/inc/pch/precompiled_msforms.hxx
@@ -313,7 +313,7 @@
 #include <svtools/svtdllapi.h>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
diff --git a/vbahelper/inc/pch/precompiled_vbahelper.hxx b/vbahelper/inc/pch/precompiled_vbahelper.hxx
index 23efed0561c5..6f01d1c89cf7 100644
--- a/vbahelper/inc/pch/precompiled_vbahelper.hxx
+++ b/vbahelper/inc/pch/precompiled_vbahelper.hxx
@@ -127,7 +127,7 @@
 #include <svl/poolitem.hxx>
 #include <svl/hint.hxx>
 #include <svl/svldllapi.h>
-#include <tools/errcode.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
 #include <tools/ref.hxx>
-- 
cgit