diff --git a/kcmkwin/kwinoptions/advanced.ui b/kcmkwin/kwinoptions/advanced.ui
index 8c465b47cc..a0d874d0fd 100644
--- a/kcmkwin/kwinoptions/advanced.ui
+++ b/kcmkwin/kwinoptions/advanced.ui
@@ -38,7 +38,7 @@
     </spacer>
    </item>
    <item row="1" column="1">
-    <widget class="KButtonGroup" name="wtBox">
+    <widget class="QGroupBox" name="wtBox">
      <property name="title">
       <string>Window Tabbing</string>
      </property>
@@ -162,7 +162,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="KButtonGroup" name="shBox">
+    <widget class="QGroupBox" name="shBox">
      <property name="title">
       <string>Shading</string>
      </property>
@@ -259,12 +259,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>KButtonGroup</class>
-   <extends>QGroupBox</extends>
-   <header>kbuttongroup.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index baf4bfb2df..9e4c609d7b 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -32,8 +32,8 @@
 #include <QFormLayout>
 #include <QDesktopWidget>
 #include <QtDBus/QtDBus>
+#include <QGroupBox>
 
-#include <KButtonGroup>
 #include <KDE/KConfig>
 #include <KDE/KLocalizedString>
 #include <kdialog.h>
diff --git a/kcmkwin/kwinoptions/windows.h b/kcmkwin/kwinoptions/windows.h
index d82487a317..0895220e23 100644
--- a/kcmkwin/kwinoptions/windows.h
+++ b/kcmkwin/kwinoptions/windows.h
@@ -37,7 +37,7 @@ class KComboBox;
 class QGroupBox;
 class QLabel;
 class QSlider;
-class KButtonGroup;
+class QGroupBox;
 class QSpinBox;
 
 class KColorButton;