8 files changed, 16 insertions, 13 deletions
diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx
index b2831f32742c..1665e785df3f 100644
--- a/include/vcl/toolkit/field.hxx
+++ b/include/vcl/toolkit/field.hxx
@@ -28,8 +28,8 @@
 #include <tools/fldunit.hxx>
 #include <tools/time.hxx>
 #include <tools/link.hxx>
-#include <vcl/spinfld.hxx>
 #include <vcl/toolkit/combobox.hxx>
+#include <vcl/toolkit/spinfld.hxx>
 
 namespace com::sun::star::lang { struct Locale; }
 
diff --git a/include/vcl/toolkit/fmtfield.hxx b/include/vcl/toolkit/fmtfield.hxx
index 4ba668bc7994..56992ddb449a 100644
--- a/include/vcl/toolkit/fmtfield.hxx
+++ b/include/vcl/toolkit/fmtfield.hxx
@@ -24,7 +24,7 @@
 #endif
 
 #include <vcl/formatter.hxx>
-#include <vcl/spinfld.hxx>
+#include <vcl/toolkit/spinfld.hxx>
 
 class VCL_DLLPUBLIC FormattedField : public SpinField
 {
diff --git a/include/vcl/spinfld.hxx b/include/vcl/toolkit/spinfld.hxx
index 7ef61be4a2d2..7afe3e210af0 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/toolkit/spinfld.hxx
@@ -17,15 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_SPINFLD_HXX
-#define INCLUDED_VCL_SPINFLD_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/edit.hxx>
 #include <vcl/timer.hxx>
 #include <config_options.h>
 
-
 class VCL_DLLPUBLIC SpinField : public Edit
 {
 public:
@@ -93,6 +95,4 @@ private:
                     mbInDropDown:1;
 };
 
-#endif // INCLUDED_VCL_SPINFLD_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 30ba78e395b0..eb9b58b76d54 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -7413,7 +7413,6 @@ include/vcl/scrbar.hxx
 include/vcl/seleng.hxx
 include/vcl/settings.hxx
 include/vcl/sound.hxx
-include/vcl/spinfld.hxx
 include/vcl/split.hxx
 include/vcl/splitwin.hxx
 include/vcl/status.hxx
@@ -7452,6 +7451,7 @@ include/vcl/toolkit/morebtn.hxx
 include/vcl/toolkit/prgsbar.hxx
 include/vcl/toolkit/roadmap.hxx
 include/vcl/toolkit/spin.hxx
+include/vcl/toolkit/spinfld.hxx
 include/vcl/toolkit/svtabbx.hxx
 include/vcl/toolkit/tabdlg.hxx
 include/vcl/toolkit/throbber.hxx
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index bdc8cf3dd6bb..2c178d1547ba 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 2020-07-09 17:07:23 using:
+ Generated on 2020-07-23 15:08:45 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:
@@ -148,6 +148,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
@@ -308,7 +309,6 @@
 #include <vcl/quickselectionengine.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/spinfld.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/svlbitm.hxx>
 #include <vcl/syswin.hxx>
@@ -318,9 +318,11 @@
 #include <vcl/timer.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/toolkit/button.hxx>
+#include <vcl/toolkit/combobox.hxx>
 #include <vcl/toolkit/dialog.hxx>
 #include <vcl/toolkit/fixed.hxx>
 #include <vcl/toolkit/lstbox.hxx>
+#include <vcl/toolkit/spinfld.hxx>
 #include <vcl/toolkit/unowrap.hxx>
 #include <vcl/transfer.hxx>
 #include <vcl/treelist.hxx>
@@ -331,6 +333,7 @@
 #include <vcl/unohelp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/vclevent.hxx>
+#include <vcl/vclmedit.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/viewdataentry.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 80c8640f77e3..de903a78830f 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -16,7 +16,7 @@
 #include <vcl/ctrl.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/formatter.hxx>
-#include <vcl/spinfld.hxx>
+#include <vcl/toolkit/spinfld.hxx>
 #include <vcl/toolkit/fixed.hxx>
 #include <vcl/toolkit/lstbox.hxx>
 #include <vcl/menubtn.hxx>
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 07bc43cbc41d..9f560b50be2b 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -20,7 +20,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
-#include <vcl/spinfld.hxx>
+#include <vcl/toolkit/spinfld.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/uitest/uiobject.hxx>
 #include <sal/log.hxx>
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 4e14224cf139..806f6ab23e70 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -20,7 +20,7 @@
 #include <vcl/toolkit/lstbox.hxx>
 #include <vcl/toolkit/spin.hxx>
 #include <vcl/toolkit/fmtfield.hxx>
-#include <vcl/spinfld.hxx>
+#include <vcl/toolkit/spinfld.hxx>
 #include <vcl/ivctrl.hxx>
 #include <vcl/toolkit/button.hxx>
 #include <vcl/toolkit/dialog.hxx>