12 files changed, 23 insertions, 23 deletions
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index d3abb12cac1e..1e1a5f268537 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -19,12 +19,12 @@
 
 #include <extended/accessibleiconchoicectrl.hxx>
 #include <extended/accessibleiconchoicectrlentry.hxx>
-#include <svtools/ivctrl.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
+#include <vcl/ivctrl.hxx>
 #include <vcl/svapp.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 2c891f0c4816..ad6edd11d354 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <extended/accessibleiconchoicectrlentry.hxx>
-#include <svtools/ivctrl.hxx>
+#include <vcl/ivctrl.hxx>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/Size.hpp>
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 7d5693ce6719..c403bb1358e2 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_CUI_SOURCE_INC_ICONCDLG_HXX
 
 #include <rtl/ustring.hxx>
-#include <svtools/ivctrl.hxx>
+#include <vcl/ivctrl.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx
index 12a03144b18e..38408af60687 100644
--- a/dbaccess/source/ui/app/AppIconControl.hxx
+++ b/dbaccess/source/ui/app/AppIconControl.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_APPICONCONTROL_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_APP_APPICONCONTROL_HXX
 
-#include <svtools/ivctrl.hxx>
+#include <vcl/ivctrl.hxx>
 #include <vcl/transfer.hxx>
 
 namespace dbaui
diff --git a/include/svtools/ivctrl.hxx b/include/vcl/ivctrl.hxx
index ec28ec339c26..cffbe03e9a90 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/vcl/ivctrl.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_IVCTRL_HXX
-#define INCLUDED_SVTOOLS_IVCTRL_HXX
+#ifndef INCLUDED_VCL_IVCTRL_HXX
+#define INCLUDED_VCL_IVCTRL_HXX
 
 #include <memory>
-#include <svtools/svtdllapi.h>
+#include <vcl/dllapi.h>
 #include <vcl/ctrl.hxx>
 #include <tools/link.hxx>
 #include <vcl/image.hxx>
@@ -111,7 +111,7 @@ public:
     const Image&            GetImage () const { return aImage; }
     void                    SetText ( const OUString& rText ) { aText = rText; }
     const OUString&         GetText () const { return aText; }
-    OUString SVT_DLLPUBLIC  GetDisplayText() const;
+    OUString VCL_DLLPUBLIC  GetDisplayText() const;
     void                    SetQuickHelpText( const OUString& rText ) { aQuickHelpText = rText; }
     const OUString&         GetQuickHelpText() const { return aQuickHelpText; }
     void                    SetUserData ( void* _pUserData ) { pUserData = _pUserData; }
@@ -174,7 +174,7 @@ public:
 
 class MnemonicGenerator;
 
-class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control
+class VCL_DLLPUBLIC SvtIconChoiceCtrl : public Control
 {
     friend class SvxIconChoiceCtrl_Impl;
 
@@ -276,6 +276,6 @@ public:
     virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
 };
 
-#endif // INCLUDED_SVTOOLS_IVCTRL_HXX
+#endif // INCLUDED_VCL_IVCTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index ce3b9b426240..a1f46fceda24 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -6973,7 +6973,6 @@ include/svtools/imgdef.hxx
 include/svtools/indexentryres.hxx
 include/svtools/inettbc.hxx
 include/svtools/insdlg.hxx
-include/svtools/ivctrl.hxx
 include/svtools/javacontext.hxx
 include/svtools/javainteractionhandler.hxx
 include/svtools/langhelp.hxx
@@ -7867,6 +7866,7 @@ include/vcl/inetimg.hxx
 include/vcl/inputctx.hxx
 include/vcl/inputtypes.hxx
 include/vcl/introwin.hxx
+include/vcl/ivctrl.hxx
 include/vcl/jobdata.hxx
 include/vcl/jobset.hxx
 include/vcl/keycod.hxx
@@ -13723,10 +13723,6 @@ svtools/source/contnr/fileview.cxx
 svtools/source/contnr/foldertree.cxx
 svtools/source/contnr/iconview.cxx
 svtools/source/contnr/iconviewimpl.cxx
-svtools/source/contnr/imivctl.hxx
-svtools/source/contnr/imivctl1.cxx
-svtools/source/contnr/imivctl2.cxx
-svtools/source/contnr/ivctrl.cxx
 svtools/source/contnr/simptabl.cxx
 svtools/source/contnr/templwin.cxx
 svtools/source/contnr/templwin.hxx
@@ -17788,7 +17784,11 @@ vcl/source/control/fixed.cxx
 vcl/source/control/fixedhyper.cxx
 vcl/source/control/fmtfield.cxx
 vcl/source/control/imgctrl.cxx
+vcl/source/control/imivctl.hxx
+vcl/source/control/imivctl1.cxx
+vcl/source/control/imivctl2.cxx
 vcl/source/control/imp_listbox.cxx
+vcl/source/control/ivctrl.cxx
 vcl/source/control/listbox.cxx
 vcl/source/control/listctrl.cxx
 vcl/source/control/longcurr.cxx
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index d50cdaac4105..c2ebdbfb4e47 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -93,9 +93,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/contnr/foldertree \
     svtools/source/contnr/iconview \
     svtools/source/contnr/iconviewimpl \
-    svtools/source/contnr/imivctl1 \
-    svtools/source/contnr/imivctl2 \
-    svtools/source/contnr/ivctrl \
     svtools/source/contnr/simptabl \
     svtools/source/contnr/templwin \
     svtools/source/control/accessibleruler \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index c8391717c492..7d03373b3797 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -190,6 +190,9 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/control/fixedhyper \
     vcl/source/control/fmtfield \
     vcl/source/control/imgctrl \
+    vcl/source/control/imivctl1 \
+    vcl/source/control/imivctl2 \
+    vcl/source/control/ivctrl \
     vcl/source/control/listctrl \
     vcl/source/control/longcurr \
     vcl/source/control/imp_listbox \
diff --git a/svtools/source/contnr/imivctl.hxx b/vcl/source/control/imivctl.hxx
index 6608f2cb177f..0875991d151d 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/vcl/source/control/imivctl.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_CONTNR_IMIVCTL_HXX
 #define INCLUDED_SVTOOLS_SOURCE_CONTNR_IMIVCTL_HXX
 
+#include <vcl/ivctrl.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/timer.hxx>
@@ -31,7 +32,6 @@
 
 #include <limits.h>
 
-#include <svtools/ivctrl.hxx>
 
 #include <memory>
 #include <map>
diff --git a/svtools/source/contnr/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index e6aecfceda1f..5a3f88fa2922 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -33,7 +33,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
 
-#include <svtools/ivctrl.hxx>
+#include <vcl/ivctrl.hxx>
 #include "imivctl.hxx"
 
 #include <algorithm>
diff --git a/svtools/source/contnr/imivctl2.cxx b/vcl/source/control/imivctl2.cxx
index 57135065a120..a5c8f819fc30 100644
--- a/svtools/source/contnr/imivctl2.cxx
+++ b/vcl/source/control/imivctl2.cxx
@@ -465,12 +465,12 @@ void IcnCursor_Impl::SetDeltas()
     if( !nDeltaHeight )
     {
         nDeltaHeight = 1;
-        SAL_INFO("svtools", "SetDeltas:Bad height");
+        SAL_INFO("vcl", "SetDeltas:Bad height");
     }
     if( !nDeltaWidth )
     {
         nDeltaWidth = 1;
-        SAL_INFO("svtools", "SetDeltas:Bad width");
+        SAL_INFO("vcl", "SetDeltas:Bad width");
     }
 }
 
diff --git a/svtools/source/contnr/ivctrl.cxx b/vcl/source/control/ivctrl.cxx
index cbcacd1242dc..802cde299318 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/vcl/source/control/ivctrl.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <svtools/ivctrl.hxx>
+#include <vcl/ivctrl.hxx>
 #include "imivctl.hxx"
 #include <vcl/accessiblefactory.hxx>
 #include <vcl/bitmapex.hxx>