12 files changed, 19 insertions, 20 deletions
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 2cfccbfa705b..9832da71bd0a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -334,8 +334,6 @@ core_constructor_list = [
     "com_sun_star_comp_Math_MathTypeFilter_get_implementation",
 # svl/source/fsstor/fsstorage.component
     "svl_FSStorageFactory_get_implementation",
-# svtools/util/svt.component
-    "com_sun_star_comp_embed_HatchWindowFactory_get_implementation",
 # vcl/vcl.android.component
     "com_sun_star_graphic_GraphicObject_get_implementation",
     "com_sun_star_comp_graphic_GraphicMapper_get_implementation",
@@ -361,6 +359,7 @@ core_constructor_list = [
     "com_sun_star_comp_svx_StyleToolBoxControl_get_implementation",
     "com_sun_star_comp_svx_StylesPreviewToolBoxControl_get_implementation",
 # toolkit/util/tk.component
+    "com_sun_star_comp_embed_HatchWindowFactory_get_implementation",
     "stardiv_Toolkit_StdTabController_get_implementation",
     "stardiv_Toolkit_UnoButtonControl_get_implementation",
     "stardiv_Toolkit_UnoCheckBoxControl_get_implementation",
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 6ef8f3ad2039..bd07aeebc58f 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -11323,12 +11323,6 @@ svtools/source/filter/SvFilterOptionsDialog.cxx
 svtools/source/filter/exportdialog.cxx
 svtools/source/filter/exportdialog.hxx
 svtools/source/graphic/renderer.cxx
-svtools/source/hatchwindow/documentcloser.cxx
-svtools/source/hatchwindow/hatchwindow.cxx
-svtools/source/hatchwindow/hatchwindowfactory.cxx
-svtools/source/hatchwindow/ipwin.cxx
-svtools/source/hatchwindow/ipwin.hxx
-svtools/source/inc/hatchwindow.hxx
 svtools/source/java/javacontext.cxx
 svtools/source/java/javainteractionhandler.cxx
 svtools/source/misc/acceleratorexecute.cxx
@@ -13776,6 +13770,12 @@ toolkit/source/controls/unocontrolcontainer.cxx
 toolkit/source/controls/unocontrolcontainermodel.cxx
 toolkit/source/controls/unocontrolmodel.cxx
 toolkit/source/controls/unocontrols.cxx
+toolkit/source/hatchwindow/documentcloser.cxx
+toolkit/source/hatchwindow/hatchwindow.cxx
+toolkit/source/hatchwindow/hatchwindow.hxx
+toolkit/source/hatchwindow/hatchwindowfactory.cxx
+toolkit/source/hatchwindow/ipwin.cxx
+toolkit/source/hatchwindow/ipwin.hxx
 toolkit/source/helper/accessibilityclient.cxx
 toolkit/source/helper/btndlg.cxx
 toolkit/source/helper/formpdfexport.cxx
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index adaa6b1bc99d..ee4361331125 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -113,10 +113,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/filter/DocumentToGraphicRenderer \
     svtools/source/filter/exportdialog \
     svtools/source/graphic/renderer \
-    svtools/source/hatchwindow/documentcloser \
-    svtools/source/hatchwindow/hatchwindow \
-    svtools/source/hatchwindow/hatchwindowfactory \
-    svtools/source/hatchwindow/ipwin \
     $(if $(ENABLE_JAVA), \
         svtools/source/java/javacontext \
         svtools/source/java/javainteractionhandler) \
diff --git a/svtools/util/svt.component b/svtools/util/svt.component
index f840548d9d3e..fabe9e6c7c87 100644
--- a/svtools/util/svt.component
+++ b/svtools/util/svt.component
@@ -45,9 +45,4 @@
       constructor="com_sun_star_comp_embed_DocumentCloser_get_implementation">
     <service name="com.sun.star.embed.DocumentCloser"/>
   </implementation>
-  <implementation name="com.sun.star.comp.embed.HatchWindowFactory"
-      constructor="com_sun_star_comp_embed_HatchWindowFactory_get_implementation">
-    <service name="com.sun.star.comp.embed.HatchWindowFactory"/>
-    <service name="com.sun.star.embed.HatchWindowFactory"/>
-  </implementation>
 </component>
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 88013385ccbe..b6186e66c962 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -112,6 +112,10 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
     toolkit/source/controls/unocontrolcontainermodel \
     toolkit/source/controls/unocontrolmodel \
     toolkit/source/controls/unocontrols \
+    toolkit/source/hatchwindow/documentcloser \
+    toolkit/source/hatchwindow/hatchwindow \
+    toolkit/source/hatchwindow/hatchwindowfactory \
+    toolkit/source/hatchwindow/ipwin \
     toolkit/source/helper/accessibilityclient \
     toolkit/source/helper/btndlg \
     toolkit/source/helper/formpdfexport \
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/toolkit/source/hatchwindow/documentcloser.cxx
index 6e014dd7ea46..6e014dd7ea46 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/toolkit/source/hatchwindow/documentcloser.cxx
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/toolkit/source/hatchwindow/hatchwindow.cxx
index 1402fde5ae59..6866fde51c12 100644
--- a/svtools/source/hatchwindow/hatchwindow.cxx
+++ b/toolkit/source/hatchwindow/hatchwindow.cxx
@@ -20,7 +20,7 @@
 #include <com/sun/star/embed/XHatchWindowController.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
-#include <hatchwindow.hxx>
+#include "hatchwindow.hxx"
 #include "ipwin.hxx"
 
 #include <toolkit/helper/convert.hxx>
diff --git a/svtools/source/inc/hatchwindow.hxx b/toolkit/source/hatchwindow/hatchwindow.hxx
index 71e3d84f2dd4..71e3d84f2dd4 100644
--- a/svtools/source/inc/hatchwindow.hxx
+++ b/toolkit/source/hatchwindow/hatchwindow.hxx
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/toolkit/source/hatchwindow/hatchwindowfactory.cxx
index 36fe6c9c1104..3e50db64ee82 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.cxx
+++ b/toolkit/source/hatchwindow/hatchwindowfactory.cxx
@@ -25,7 +25,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/svapp.hxx>
 
-#include <hatchwindow.hxx>
+#include "hatchwindow.hxx"
 
 using namespace ::com::sun::star;
 
diff --git a/svtools/source/hatchwindow/ipwin.cxx b/toolkit/source/hatchwindow/ipwin.cxx
index d2b56e5e236e..b21a3271e3e5 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/toolkit/source/hatchwindow/ipwin.cxx
@@ -25,7 +25,7 @@
 #include <vcl/ptrstyle.hxx>
 
 #include "ipwin.hxx"
-#include <hatchwindow.hxx>
+#include "hatchwindow.hxx"
 
 /************************************************************************/
 /*************************************************************************
diff --git a/svtools/source/hatchwindow/ipwin.hxx b/toolkit/source/hatchwindow/ipwin.hxx
index 72567ce26895..72567ce26895 100644
--- a/svtools/source/hatchwindow/ipwin.hxx
+++ b/toolkit/source/hatchwindow/ipwin.hxx
diff --git a/toolkit/util/tk.component b/toolkit/util/tk.component
index f4b425a4fca4..f93d1550a01a 100644
--- a/toolkit/util/tk.component
+++ b/toolkit/util/tk.component
@@ -23,6 +23,11 @@
       constructor="com_sun_star_awt_comp_AsyncCallback_get_implementation">
     <service name="com.sun.star.awt.AsyncCallback"/>
   </implementation>
+  <implementation name="com.sun.star.comp.embed.HatchWindowFactory"
+      constructor="com_sun_star_comp_embed_HatchWindowFactory_get_implementation">
+    <service name="com.sun.star.comp.embed.HatchWindowFactory"/>
+    <service name="com.sun.star.embed.HatchWindowFactory"/>
+  </implementation>
   <implementation name="stardiv.Toolkit.UnoControlTabPage"
       constructor="stardiv_Toolkit_UnoControlTabPage_get_implementation">
     <service name="com.sun.star.awt.tab.UnoControlTabPage"/>