diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index 22d3e4d32d..4ed7038536 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -46,7 +46,7 @@ typedef KGenericFactory<KWinDecorationModule, QWidget> KWinDecoFactory;
 K_EXPORT_COMPONENT_FACTORY( libkcm_kwindecoration, KWinDecoFactory("kcmkwindecoration") );
 
 KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, const QStringList &)
-	: KCModule(parent, name), DCOPObject("KWinClientDecoration")
+	: KCModule(KWinDecoFactory::instance(), parent, name), DCOPObject("KWinClientDecoration")
 {
 	KConfig kwinConfig("kwinrc");
 	kwinConfig.setGroup("Style");
diff --git a/kcmkwin/kwinoptions/main.cpp b/kcmkwin/kwinoptions/main.cpp
index 724c4809d8..f278f0cfd6 100644
--- a/kcmkwin/kwinoptions/main.cpp
+++ b/kcmkwin/kwinoptions/main.cpp
@@ -46,7 +46,7 @@ extern "C" {
 }
 */
 KWinOptions::KWinOptions(QWidget *parent, const char *name, const QStringList &)
-  : KCModule(parent, name)
+  : KCModule(KWinOptFactory::instance(), parent, name)
 {
   mConfig = new KConfig("kwinrc", false, true);
 
@@ -71,6 +71,10 @@ KWinOptions::KWinOptions(QWidget *parent, const char *name, const QStringList &)
   connect(mAdvanced, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
 }
 
+KWinOptions::~KWinOptions()
+{
+  delete mConfig;
+}
 
 void KWinOptions::load()
 {
diff --git a/kcmkwin/kwinoptions/main.h b/kcmkwin/kwinoptions/main.h
index e4a8d3d0fb..6e6b608bc6 100644
--- a/kcmkwin/kwinoptions/main.h
+++ b/kcmkwin/kwinoptions/main.h
@@ -41,6 +41,7 @@ class KWinOptions : public KCModule
 public:
 
   KWinOptions(QWidget *parent, const char *name, const QStringList &);
+  virtual ~KWinOptions();
 
   void load();
   void save();
diff --git a/kcmkwin/kwinoptions/mouse.cpp b/kcmkwin/kwinoptions/mouse.cpp
index fa0c7e8f14..6ebeed60ba 100644
--- a/kcmkwin/kwinoptions/mouse.cpp
+++ b/kcmkwin/kwinoptions/mouse.cpp
@@ -47,7 +47,7 @@ KActionsConfig::~KActionsConfig ()
 }
 
 KActionsConfig::KActionsConfig (KConfig *_config, QWidget * parent, const char *name)
-  : KCModule (parent, name), config(_config)
+  : QWidget (parent, name), config(_config)
 {
   QString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3;
   QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
diff --git a/kcmkwin/kwinoptions/mouse.h b/kcmkwin/kwinoptions/mouse.h
index bd09d748ea..4709fc4905 100644
--- a/kcmkwin/kwinoptions/mouse.h
+++ b/kcmkwin/kwinoptions/mouse.h
@@ -25,9 +25,9 @@
 class QComboBox;
 class KConfig;
 
-#include <kcmodule.h>
+#include <qwidget.h>
 
-class KActionsConfig : public KCModule
+class KActionsConfig : public QWidget
 {
   Q_OBJECT
 
@@ -40,6 +40,9 @@ public:
   void save();
   void defaults();
 
+signals:
+  void changed( bool state );
+
 private  slots:
     void slotChanged();
 
diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index bb065d15f1..bdf525cf61 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -89,7 +89,7 @@ KFocusConfig::~KFocusConfig ()
 
 // removed the LCD display over the slider - this is not good GUI design :) RNolden 051701
 KFocusConfig::KFocusConfig (KConfig *_config, QWidget * parent, const char *name)
-    : KCModule (parent, name), config(_config)
+    : QWidget (parent, name), config(_config)
 {
     QString wtstr;
     QBoxLayout *lay = new QVBoxLayout (this, KDialog::marginHint(),
@@ -401,7 +401,7 @@ KAdvancedConfig::~KAdvancedConfig ()
 }
 
 KAdvancedConfig::KAdvancedConfig (KConfig *_config, QWidget *parent, const char *name)
-    : KCModule (parent, name), config(_config)
+    : QWidget (parent, name), config(_config)
 {
     QString wtstr;
     QBoxLayout *lay = new QVBoxLayout (this, KDialog::marginHint(),
@@ -653,7 +653,7 @@ KMovingConfig::~KMovingConfig ()
 }
 
 KMovingConfig::KMovingConfig (KConfig *_config, QWidget *parent, const char *name)
-    : KCModule (parent, name), config(_config)
+    : QWidget (parent, name), config(_config)
 {
     QString wtstr;
     QBoxLayout *lay = new QVBoxLayout (this, KDialog::marginHint(),
diff --git a/kcmkwin/kwinoptions/windows.h b/kcmkwin/kwinoptions/windows.h
index c18179004b..7f07df4fd6 100644
--- a/kcmkwin/kwinoptions/windows.h
+++ b/kcmkwin/kwinoptions/windows.h
@@ -22,7 +22,7 @@
 #ifndef __KWINDOWCONFIG_H__
 #define __KWINDOWCONFIG_H__
 
-#include <kcmodule.h>
+#include <qwidget.h>
 #include <config.h>
 
 class QRadioButton;
@@ -62,7 +62,7 @@ class KIntNumInput;
 
 class QSpinBox;
 
-class KFocusConfig : public KCModule
+class KFocusConfig : public QWidget
 {
   Q_OBJECT
 public:
@@ -73,6 +73,9 @@ public:
   void save();
   void defaults();
 
+signals:
+  void changed( bool state );
+
 private slots:
   void setAutoRaiseEnabled();
   void autoRaiseOnTog(bool);//CT 23Oct1998
@@ -107,7 +110,7 @@ private:
   KConfig *config;
 };
 
-class KMovingConfig : public KCModule
+class KMovingConfig : public QWidget
 {
   Q_OBJECT
 public:
@@ -118,6 +121,9 @@ public:
   void save();
   void defaults();
 
+signals:
+  void changed( bool state );
+
 private slots:
   void slotChanged();
 
@@ -159,7 +165,7 @@ private:
 
 };
 
-class KAdvancedConfig : public KCModule
+class KAdvancedConfig : public QWidget
 {
   Q_OBJECT
 public:
@@ -170,6 +176,9 @@ public:
   void save();
   void defaults();
 
+signals:
+  void changed( bool state );
+
 private slots:
   void slotChanged();
   void shadeHoverChanged(bool);