vcl/floatwin.hxx can be toolkit only now

Change-Id: Ifd8f58771ea6f9212a0dca7d4550c86ebecd9333
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111814
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

41 files changed, 46 insertions, 39 deletions

diff --git a/compilerplugins/clang/constantparam.numbers.results b/compilerplugins/clang/constantparam.numbers.results
index 7d441a9fa015..7759f40f512d 100644
--- a/compilerplugins/clang/constantparam.numbers.results
+++ b/compilerplugins/clang/constantparam.numbers.results
@@ -1466,7 +1466,7 @@ include/vcl/filter/PDFiumLibrary.hxx:224
     _Bool vcl::pdf::PDFiumDocument::saveWithVersion(class SvMemoryStream &,int)
     int nFileVersion
     16
-include/vcl/floatwin.hxx:159
+include/vcl/toolkit/floatwin.hxx:159
     class Point FloatingWindow::CalcFloatingPosition(class vcl::Window *,const class tools::Rectangle &,enum FloatWinPopupFlags,unsigned short &)
     enum FloatWinPopupFlags nFlags
     16
diff --git a/compilerplugins/clang/unusedenumconstants.writeonly.results b/compilerplugins/clang/unusedenumconstants.writeonly.results
index 225d6c793cd6..ec47c390423e 100644
--- a/compilerplugins/clang/unusedenumconstants.writeonly.results
+++ b/compilerplugins/clang/unusedenumconstants.writeonly.results
@@ -2850,7 +2850,7 @@ include/vcl/filter/pdfdocument.hxx:294
     enum vcl::filter::TokenizeMode END_OF_STREAM
 include/vcl/filter/pdfdocument.hxx:300
     enum vcl::filter::TokenizeMode STORED_OBJECT
-include/vcl/floatwin.hxx:68
+include/vcl/toolkit/floatwin.hxx:68
     enum FloatWinTitleType Unknown
 include/vcl/fntstyle.hxx:31
     enum FontKerning FontSpecific
diff --git a/include/vcl/floatwin.hxx b/include/vcl/toolkit/floatwin.hxx
index ad87e036b0c4..bbfddabcce68 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/toolkit/floatwin.hxx
@@ -17,8 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_FLOATWIN_HXX
-#define INCLUDED_VCL_FLOATWIN_HXX
+#pragma once
+
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS)
+#error "don't use this in new code"
+#endif
 
 #include <vcl/dllapi.h>
 #include <vcl/syswin.hxx>
@@ -136,6 +139,4 @@ public:
     static Point    CalcFloatingPosition( vcl::Window* pWindow, const tools::Rectangle& rRect, FloatWinPopupFlags nFlags, sal_uInt16& rArrangeIndex );
 };
 
-#endif // INCLUDED_VCL_FLOATWIN_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index d3205d56d617..8a70264c12e3 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -6383,7 +6383,6 @@ include/vcl/errcode.hxx
 include/vcl/errinf.hxx
 include/vcl/event.hxx
 include/vcl/evntpost.hxx
-include/vcl/floatwin.hxx
 include/vcl/formatter.hxx
 include/vcl/fntstyle.hxx
 include/vcl/font.hxx
@@ -6473,6 +6472,7 @@ include/vcl/toolkit/edit.hxx
 include/vcl/toolkit/field.hxx
 include/vcl/toolkit/fixed.hxx
 include/vcl/toolkit/fixedhyper.hxx
+include/vcl/toolkit/floatwin.hxx
 include/vcl/toolkit/fmtfield.hxx
 include/vcl/toolkit/group.hxx
 include/vcl/toolkit/imgctrl.hxx
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index efc0a27876bd..dafcd294d18c 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -98,7 +98,7 @@
 #include <vcl/toolkit/field.hxx>
 #include <vcl/toolkit/fixed.hxx>
 #include <vcl/toolkit/fixedhyper.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/toolkit/fmtfield.hxx>
 #include <vcl/toolkit/prgsbar.hxx>
 #include <vcl/scheduler.hxx>
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index d2e015fd793d..b178fc57cd58 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -40,7 +40,7 @@
 #include <toolkit/helper/property.hxx>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <tools/color.hxx>
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 0b9d23e40de5..3ebf80034c91 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -121,6 +121,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
 
 $(eval $(call gb_Library_add_defs,vclplug_gen,\
     -DVCLPLUG_GEN_IMPLEMENTATION \
+    -DVCL_INTERNALS \
 ))
 
 ## handle RandR
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index fd1b97644f23..44d742e01c77 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_set_include,vclplug_gtk3,\
 
 $(eval $(call gb_Library_add_defs,vclplug_gtk3,\
     -DVCLPLUG_GTK_IMPLEMENTATION \
+    -DVCL_INTERNALS \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,vclplug_gtk3,\
diff --git a/vcl/Library_vclplug_gtk3_kde5.mk b/vcl/Library_vclplug_gtk3_kde5.mk
index 40b2aa2e8e23..ab804e76a697 100644
--- a/vcl/Library_vclplug_gtk3_kde5.mk
+++ b/vcl/Library_vclplug_gtk3_kde5.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_gtk3_kde5,\
 
 $(eval $(call gb_Library_add_defs,vclplug_gtk3_kde5,\
     -DVCLPLUG_GTK_IMPLEMENTATION -DVCLPLUG_GTK3_KDE5_IMPLEMENTATION \
+    -DVCL_INTERNALS \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,vclplug_gtk3_kde5,\
diff --git a/vcl/Library_vclplug_osx.mk b/vcl/Library_vclplug_osx.mk
index 9b82bd44c2a6..c80d3bc8d7f3 100644
--- a/vcl/Library_vclplug_osx.mk
+++ b/vcl/Library_vclplug_osx.mk
@@ -67,6 +67,7 @@ endif
 
 $(eval $(call gb_Library_add_defs,vclplug_osx,\
     -DMACOSX_BUNDLE_IDENTIFIER=\"$(MACOSX_BUNDLE_IDENTIFIER)\" \
+    -DVCL_INTERNALS \
 ))
 
 $(eval $(call gb_Library_add_objcxxobjects,vclplug_osx,\
diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index 25cbfe9f60ba..499b3a9c7665 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_set_include,vclplug_qt5,\
 
 $(eval $(call gb_Library_add_defs,vclplug_qt5,\
     -DVCLPLUG_QT5_IMPLEMENTATION \
+    -DVCL_INTERNALS \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,vclplug_qt5))
diff --git a/vcl/Library_vclplug_win.mk b/vcl/Library_vclplug_win.mk
index 38031387be4a..ca75300670b3 100644
--- a/vcl/Library_vclplug_win.mk
+++ b/vcl/Library_vclplug_win.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Library_set_include,vclplug_win,\
 
 $(eval $(call gb_Library_add_defs,vclplug_win,\
     -DVCLPLUG_WIN_IMPLEMENTATION \
+    -DVCL_INTERNALS \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,vclplug_win,\
diff --git a/vcl/inc/NotebookbarPopup.hxx b/vcl/inc/NotebookbarPopup.hxx
index c417a75f4328..8d5a00cdd226 100644
--- a/vcl/inc/NotebookbarPopup.hxx
+++ b/vcl/inc/NotebookbarPopup.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARPOPUP_HXX
 
 #include <vcl/layout.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 
 /*
  * Popup - shows hidden content, controls are moved to this popup
diff --git a/vcl/inc/bubblewindow.hxx b/vcl/inc/bubblewindow.hxx
index 2583885b8d5a..b80cdfd7b1d1 100644
--- a/vcl/inc/bubblewindow.hxx
+++ b/vcl/inc/bubblewindow.hxx
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/image.hxx>
 #include <vcl/menu.hxx>
 
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index 089f7417c45f..db8456fd2103 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_HELPWIN_HXX
 #define INCLUDED_VCL_INC_HELPWIN_HXX
 
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/timer.hxx>
 
 enum class QuickHelpFlags;
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 816e7ff50c56..95c2ed959627 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -24,7 +24,7 @@
 
 #include <o3tl/safeint.hxx>
 #include <vcl/toolkit/button.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/quickselectionengine.hxx>
 #include <vcl/glyphitem.hxx>
 #include <vcl/vcllayout.hxx>
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 5aecf7ceaf3a..6306a6f4c8ae 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2021-02-19 15:35:44 using:
+ Generated on 2021-03-02 09:40:57 using:
  ./bin/update_pch vcl vcl --cutoff=6 --exclude:system --include:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -299,7 +299,6 @@
 #include <vcl/dllapi.h>
 #include <vcl/dockwin.hxx>
 #include <vcl/event.hxx>
-#include <vcl/floatwin.hxx>
 #include <vcl/fntstyle.hxx>
 #include <vcl/font.hxx>
 #include <vcl/gdimtf.hxx>
@@ -332,6 +331,7 @@
 #include <vcl/toolkit/dialog.hxx>
 #include <vcl/toolkit/edit.hxx>
 #include <vcl/toolkit/fixed.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/toolkit/lstbox.hxx>
 #include <vcl/toolkit/spinfld.hxx>
 #include <vcl/toolkit/svlbitm.hxx>
diff --git a/vcl/inc/scrwnd.hxx b/vcl/inc/scrwnd.hxx
index 879daa9c5021..a8c897bc95e2 100644
--- a/vcl/inc/scrwnd.hxx
+++ b/vcl/inc/scrwnd.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_SCRWND_HXX
 #define INCLUDED_VCL_INC_SCRWND_HXX
 
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/image.hxx>
 
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index eb5df0b308c0..f0db6320d756 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -27,7 +27,7 @@
 #include <tools/debug.hxx>
 #include <tools/long.hxx>
 #include <vcl/commandevent.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index f7c2e480118c..b743197c8aa6 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -24,7 +24,7 @@
 #include <strings.hrc>
 #include <bitmaps.hlst>
 
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <window.h>
 
 Qt5Menu::Qt5Menu(bool bMenuBar)
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 79a2d3c98747..fb3cb8c56bcf 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -38,7 +38,7 @@
 #include <vcl/toolkit/dialog.hxx>
 #include <vcl/dialoghelper.hxx>
 #include <vcl/lok.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/keycod.hxx>
 #include <vcl/event.hxx>
diff --git a/vcl/source/app/weldutils.cxx b/vcl/source/app/weldutils.cxx
index 836f6220e222..be3618615b9c 100644
--- a/vcl/source/app/weldutils.cxx
+++ b/vcl/source/app/weldutils.cxx
@@ -16,7 +16,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/event.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weldutils.hxx>
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index bd21398796e9..157175de8337 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -19,7 +19,7 @@
 
 #include <vcl/dockwin.hxx>
 #include <vcl/event.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/toolkit/menubtn.hxx>
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 1e023fc9ca0c..d15b7f0315c2 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -14,7 +14,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/toolkit/combobox.hxx>
 #include <vcl/event.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
diff --git a/vcl/source/uitest/uitest.cxx b/vcl/source/uitest/uitest.cxx
index 9edcba7a47a2..1c5a989d67d8 100644
--- a/vcl/source/uitest/uitest.cxx
+++ b/vcl/source/uitest/uitest.cxx
@@ -8,7 +8,7 @@
  */
 
 #include <memory>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/uitest/uitest.hxx>
 #include <vcl/uitest/uiobject.hxx>
 
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index d01e1e0eecb0..b5bdd05d53d4 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -27,7 +27,7 @@
 #include <vcl/decoview.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/dockwin.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/help.hxx>
 #include <vcl/toolkit/edit.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 3bfdbe1c4bb4..67dc19a7be99 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -43,7 +43,7 @@
 #include <vcl/abstdlg.hxx>
 #include <vcl/accel.hxx>
 #include <vcl/builder.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/event.hxx>
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 9b74789d2847..3f3efa84a6cc 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -26,7 +26,7 @@
 #include <window.h>
 
 #include <vcl/event.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 77218140e507..6834317c87ff 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -21,7 +21,7 @@
 #include <sal/log.hxx>
 #include <vcl/accel.hxx>
 #include <vcl/event.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 5c973da11283..6a661ae6b7b2 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -30,7 +30,7 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/event.hxx>
 #include <vcl/toolbox.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/IDialogRenderable.hxx>
 
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 3992fe902b0b..4fb964f2f008 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -26,7 +26,7 @@
 #include <vcl/image.hxx>
 #include <vcl/event.hxx>
 #include <vcl/help.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/taskpanelist.hxx>
diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx
index c9f73c4563d2..e41dac5f2767 100644
--- a/vcl/source/window/menufloatingwindow.hxx
+++ b/vcl/source/window/menufloatingwindow.hxx
@@ -22,7 +22,7 @@
 
 #include "menuwindow.hxx"
 
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/menu.hxx>
 
 #define EXTRASPACEY         2
diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx
index 20ec9db82c5f..833c82a0a114 100644
--- a/vcl/source/window/taskpanelist.cxx
+++ b/vcl/source/window/taskpanelist.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <vcl/dockwin.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/taskpanelist.hxx>
 
 #include <svdata.hxx>
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index bf0033eb65ec..935a1882e4aa 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -21,7 +21,7 @@
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/accel.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 537012174eaf..4cae6f2ca758 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -27,7 +27,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/bitmap.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/menu.hxx>
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 72aba0a4362d..3f94d112b751 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -35,7 +35,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/wrkwin.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/toolkit/dialog.hxx>
 #include <vcl/toolkit/edit.hxx>
 #include <vcl/help.hxx>
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index af6cae4c865a..f0dfb480c0cb 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -25,7 +25,7 @@
 #include <tools/debug.hxx>
 
 #include <vcl/event.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/keycodes.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/BitmapReadAccess.hxx>
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index dde5c7bdef6e..bf47097af565 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -29,7 +29,7 @@
 #include <headless/svpgdi.hxx>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/window.hxx>
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index b046f015d0ea..193f222cf3ed 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -27,7 +27,7 @@
 #include <headless/svpvd.hxx>
 #include <headless/svpbmp.hxx>
 #include <vcl/builder.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/inputtypes.hxx>
 #include <vcl/transfer.hxx>
 #include <unx/genpspgraphics.h>
diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index 3ed2487ff4f3..fa379b0fea13 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -12,7 +12,7 @@
 #include <unx/gtk/gtkdata.hxx>
 #include <unx/gtk/glomenu.h>
 #include <unx/gtk/gloactiongroup.h>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/pngwrite.hxx>
 
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 838b3f2f576c..dfc1f81b2a17 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -47,7 +47,7 @@
 #include <vcl/toolkit/combobox.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/pngwrite.hxx>
-#include <vcl/floatwin.hxx>
+#include <vcl/toolkit/floatwin.hxx>
 #include <vcl/help.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/ImageTree.hxx>