3 files changed, 11 insertions, 12 deletions
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
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;