diff --git a/kcmkwin/kwinoptions/advanced.ui b/kcmkwin/kwinoptions/advanced.ui
index f8b6c57a7d..8c465b47cc 100644
--- a/kcmkwin/kwinoptions/advanced.ui
+++ b/kcmkwin/kwinoptions/advanced.ui
@@ -210,7 +210,7 @@
        </widget>
       </item>
       <item row="3" column="2" colspan="3">
-       <widget class="KIntNumInput" name="shadeHover">
+       <widget class="QSpinBox" name="shadeHover">
         <property name="whatsThis">
          <string>Sets the time in milliseconds before the window unshades when the mouse pointer goes over the shaded window.</string>
         </property>
@@ -271,7 +271,7 @@
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
-   <class>KIntNumInput</class>
+   <class>QSpinBox</class>
    <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
diff --git a/kcmkwin/kwinoptions/focus.ui b/kcmkwin/kwinoptions/focus.ui
index 9c27eae79c..b579a08344 100644
--- a/kcmkwin/kwinoptions/focus.ui
+++ b/kcmkwin/kwinoptions/focus.ui
@@ -236,7 +236,7 @@ You very likely want to use&lt;br&gt;
          </widget>
         </item>
         <item>
-         <widget class="KIntNumInput" name="delayFocus">
+         <widget class="QSpinBox" name="delayFocus">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
             <horstretch>0</horstretch>
@@ -461,7 +461,7 @@ You very likely want to use&lt;br&gt;
        </spacer>
       </item>
       <item row="1" column="1">
-       <widget class="KIntNumInput" name="autoRaise">
+       <widget class="QSpinBox" name="autoRaise">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -554,11 +554,6 @@ You very likely want to use&lt;br&gt;
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
-  <customwidget>
-   <class>KIntNumInput</class>
-   <extends>QWidget</extends>
-   <header>knuminput.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>focusStealing</tabstop>
diff --git a/kcmkwin/kwinoptions/moving.ui b/kcmkwin/kwinoptions/moving.ui
index de2c0919e6..eb04689a0f 100644
--- a/kcmkwin/kwinoptions/moving.ui
+++ b/kcmkwin/kwinoptions/moving.ui
@@ -44,7 +44,7 @@
       </widget>
      </item>
      <item row="6" column="2">
-      <widget class="KIntNumInput" name="centerSnap">
+      <widget class="QSpinBox" name="centerSnap">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -111,7 +111,7 @@
       </widget>
      </item>
      <item row="5" column="2">
-      <widget class="KIntNumInput" name="windowSnap">
+      <widget class="QSpinBox" name="windowSnap">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -139,7 +139,7 @@
       </widget>
      </item>
      <item row="4" column="2">
-      <widget class="KIntNumInput" name="borderSnap">
+      <widget class="QSpinBox" name="borderSnap">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -265,13 +265,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>KIntNumInput</class>
-   <extends>QWidget</extends>
-   <header>knuminput.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index fc5a143a51..baf4bfb2df 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -36,7 +36,6 @@
 #include <KButtonGroup>
 #include <KDE/KConfig>
 #include <KDE/KLocalizedString>
-#include <knuminput.h>
 #include <kdialog.h>
 
 #include <X11/X.h>
diff --git a/kcmkwin/kwinoptions/windows.h b/kcmkwin/kwinoptions/windows.h
index 91611cb9d3..d82487a317 100644
--- a/kcmkwin/kwinoptions/windows.h
+++ b/kcmkwin/kwinoptions/windows.h
@@ -38,10 +38,9 @@ class QGroupBox;
 class QLabel;
 class QSlider;
 class KButtonGroup;
-// class QSpinBox;
+class QSpinBox;
 
 class KColorButton;
-class KIntNumInput;
 
 
 class KWinFocusConfigForm : public QWidget, public Ui::KWinFocusConfigForm