11 files changed, 15 insertions, 17 deletions
diff --git a/include/vcl/menubtn.hxx b/include/vcl/toolkit/menubtn.hxx
index f32270161b8d..aecb6b04b468 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/toolkit/menubtn.hxx
@@ -17,8 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_MENUBTN_HXX
-#define INCLUDED_VCL_MENUBTN_HXX
+#pragma once
+
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS)
+#error "don't use this in new code"
+#endif
 
 #include <config_options.h>
 #include <vcl/button.hxx>
@@ -91,6 +94,4 @@ public:
 
 };
 
-#endif // INCLUDED_VCL_MENUBTN_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/toolkit/morebtn.hxx b/include/vcl/toolkit/morebtn.hxx
index b0648f443985..0195a996d7c5 100644
--- a/include/vcl/toolkit/morebtn.hxx
+++ b/include/vcl/toolkit/morebtn.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_MOREBTN_HXX
-#define INCLUDED_VCL_MOREBTN_HXX
+#pragma once
 
 #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS)
 #error "don't use this in new code"
@@ -54,6 +53,4 @@ public:
     using PushButton::SetState;
 };
 
-#endif // INCLUDED_VCL_MOREBTN_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 4bda736c6736..994e11dbad3d 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -6458,7 +6458,6 @@ include/vcl/lazydelete.hxx
 include/vcl/lineinfo.hxx
 include/vcl/mapmod.hxx
 include/vcl/menu.hxx
-include/vcl/menubtn.hxx
 include/vcl/metaact.hxx
 include/vcl/metaactiontypes.hxx
 include/vcl/metric.hxx
@@ -6523,6 +6522,7 @@ include/vcl/toolkit/imgctrl.hxx
 include/vcl/toolkit/ivctrl.hxx
 include/vcl/toolkit/longcurr.hxx
 include/vcl/toolkit/lstbox.hxx
+include/vcl/toolkit/menubtn.hxx
 include/vcl/toolkit/morebtn.hxx
 include/vcl/toolkit/prgsbar.hxx
 include/vcl/toolkit/roadmap.hxx
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 8d7cff46e7d8..31991a09fa17 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -103,7 +103,7 @@
 #include <vcl/scheduler.hxx>
 #include <vcl/toolkit/lstbox.hxx>
 #include <vcl/toolkit/longcurr.hxx>
-#include <vcl/menubtn.hxx>
+#include <vcl/toolkit/menubtn.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/split.hxx>
diff --git a/vcl/inc/managedmenubutton.hxx b/vcl/inc/managedmenubutton.hxx
index d80655288215..d6e8f29321d8 100644
--- a/vcl/inc/managedmenubutton.hxx
+++ b/vcl/inc/managedmenubutton.hxx
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <vcl/menubtn.hxx>
+#include <vcl/toolkit/menubtn.hxx>
 #include <com/sun/star/awt/XPopupMenu.hpp>
 #include <com/sun/star/frame/XPopupMenuController.hpp>
 
diff --git a/vcl/inc/menutogglebutton.hxx b/vcl/inc/menutogglebutton.hxx
index e297926822d6..c1b5aef54498 100644
--- a/vcl/inc/menutogglebutton.hxx
+++ b/vcl/inc/menutogglebutton.hxx
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <vcl/menubtn.hxx>
+#include <vcl/toolkit/menubtn.hxx>
 
 class MenuToggleButton final : public MenuButton
 {
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 8f431002359d..981293d475d7 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -19,7 +19,7 @@
 #include <vcl/toolkit/spinfld.hxx>
 #include <vcl/toolkit/fixed.hxx>
 #include <vcl/toolkit/lstbox.hxx>
-#include <vcl/menubtn.hxx>
+#include <vcl/toolkit/menubtn.hxx>
 #include <vcl/toolkit/combobox.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/layout.hxx>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index f983237dafed..ba13d7d1a180 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -55,7 +55,7 @@
 #include <vcl/headbar.hxx>
 #include <vcl/toolkit/ivctrl.hxx>
 #include <vcl/layout.hxx>
-#include <vcl/menubtn.hxx>
+#include <vcl/toolkit/menubtn.hxx>
 #include <vcl/toolkit/prgsbar.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <slider.hxx>
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index a3c1cda1ce8b..bd21398796e9 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -22,7 +22,7 @@
 #include <vcl/floatwin.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/timer.hxx>
-#include <vcl/menubtn.hxx>
+#include <vcl/toolkit/menubtn.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/uitest/uiobject.hxx>
 #include <vcl/uitest/logger.hxx>
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 92122b54caab..ad514636fbd8 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -29,7 +29,7 @@
 #include <vcl/toolkit/treelistbox.hxx>
 #include <vcl/toolkit/treelistentry.hxx>
 #include <vcl/toolkit/svlbitm.hxx>
-#include <vcl/menubtn.hxx>
+#include <vcl/toolkit/menubtn.hxx>
 #include <vcl/toolkit/vclmedit.hxx>
 #include <vcl/uitest/logger.hxx>
 #include <uiobject-internal.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 61bf3f487869..30c06a9f6ba5 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -36,7 +36,7 @@
 #include <vcl/toolkit/ivctrl.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/toolkit/lstbox.hxx>
-#include <vcl/menubtn.hxx>
+#include <vcl/toolkit/menubtn.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/toolkit/prgsbar.hxx>
 #include <vcl/scrbar.hxx>