diff --git a/clients/b2/b2client.cpp b/clients/b2/b2client.cpp
index e3c91c337d..47a77f4557 100644
--- a/clients/b2/b2client.cpp
+++ b/clients/b2/b2client.cpp
@@ -27,6 +27,8 @@
 #include <QResizeEvent>
 #include <QMouseEvent>
 #include <QPainter>
+#include <QUrl>
+#include <QTextStream>
 #include <kicontheme.h>
 #include <kiconeffect.h>
 //#include <kdrawutil.h>
@@ -37,6 +39,8 @@
 
 #include <X11/Xlib.h>
 #include <QX11Info>
+#include <KUrl>
+#include <KConfigGroup>
 #include <KDebug>
 
 namespace B2 {
diff --git a/clients/b2/config/config.cpp b/clients/b2/config/config.cpp
index 6825f2c764..60bf6f8ab7 100644
--- a/clients/b2/config/config.cpp
+++ b/clients/b2/config/config.cpp
@@ -10,7 +10,7 @@
 
 #include "config.h"
 #include <kglobal.h>
-
+#include <kconfiggroup.h>
 
 //Added by qt3to4:
 #include <QLabel>
diff --git a/clients/kde2/kde2.cpp b/clients/kde2/kde2.cpp
index 016ccc369d..2cf2ec51ce 100644
--- a/clients/kde2/kde2.cpp
+++ b/clients/kde2/kde2.cpp
@@ -15,7 +15,7 @@
 
 #include "kde2.h"
 
-#include <kconfig.h>
+#include <kconfiggroup.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/clients/keramik/keramik.cpp b/clients/keramik/keramik.cpp
index 14b3201020..d1be1b4162 100644
--- a/clients/keramik/keramik.cpp
+++ b/clients/keramik/keramik.cpp
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <kconfig.h>
+#include <kconfiggroup.h>
 #include <klocale.h>
 #include <kiconeffect.h>
 
diff --git a/clients/kwmtheme/cli_installer/main.cpp b/clients/kwmtheme/cli_installer/main.cpp
index ed3ef500c8..deea5679b0 100644
--- a/clients/kwmtheme/cli_installer/main.cpp
+++ b/clients/kwmtheme/cli_installer/main.cpp
@@ -74,87 +74,87 @@ int main(int argc, char **argv)
     if(!tmpStr.isEmpty()){
         copy(srcStr+tmpStr, localDirStr+tmpStr);
     }
-    output->writeEntry("wm_top", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("wm_top", tmpStr, KConfig::Normal|KConfig::Global);
     tmpStr = input.readEntry("shapePixmapBottom");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("wm_bottom", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("wm_bottom", tmpStr, KConfig::Normal|KConfig::Global);
     tmpStr = input.readEntry("shapePixmapLeft");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("wm_left", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("wm_left", tmpStr, KConfig::Normal|KConfig::Global);
     tmpStr = input.readEntry("shapePixmapRight");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("wm_right", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("wm_right", tmpStr, KConfig::Normal|KConfig::Global);
     tmpStr = input.readEntry("shapePixmapTopLeft");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("wm_topleft", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("wm_topleft", tmpStr, KConfig::Normal|KConfig::Global);
     tmpStr = input.readEntry("shapePixmapTopRight");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("wm_topright", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("wm_topright", tmpStr, KConfig::Normal|KConfig::Global);
     tmpStr = input.readEntry("shapePixmapBottomLeft");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("wm_bottomleft", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("wm_bottomleft", tmpStr, KConfig::Normal|KConfig::Global);
     tmpStr = input.readEntry("shapePixmapBottomRight");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("wm_bottomright", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("wm_bottomright", tmpStr, KConfig::Normal|KConfig::Global);
 
 
     input.setGroup("Window Titlebar");
-    output->writeEntry("TitleAlignment", input.readEntry("TitleAlignment"), KConfigBase::Normal|KConfigBase::Global);
-    output->writeEntry("PixmapUnderTitleText", input.readEntry("PixmapUnderTitleText"), KConfigBase::Normal|KConfigBase::Global);
-    output->writeEntry("TitleFrameShaded", input.readEntry("TitleFrameShaded"), KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("TitleAlignment", input.readEntry("TitleAlignment"), KConfig::Normal|KConfig::Global);
+    output->writeEntry("PixmapUnderTitleText", input.readEntry("PixmapUnderTitleText"), KConfig::Normal|KConfig::Global);
+    output->writeEntry("TitleFrameShaded", input.readEntry("TitleFrameShaded"), KConfig::Normal|KConfig::Global);
 
     tmpStr = input.readEntry("MenuButton");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("menu", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("menu", tmpStr, KConfig::Normal|KConfig::Global);
     tmpStr = input.readEntry("PinUpButton");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("pinup", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("pinup", tmpStr, KConfig::Normal|KConfig::Global);
     tmpStr = input.readEntry("PinDownButton");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("pindown", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("pindown", tmpStr, KConfig::Normal|KConfig::Global);
     tmpStr = input.readEntry("CloseButton");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("close", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("close", tmpStr, KConfig::Normal|KConfig::Global);
     tmpStr = input.readEntry("MaximizeButton");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("maximize", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("maximize", tmpStr, KConfig::Normal|KConfig::Global);
     tmpStr = input.readEntry("MaximizeDownButton");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("maximizedown", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("maximizedown", tmpStr, KConfig::Normal|KConfig::Global);
     tmpStr = input.readEntry("MinimizeButton");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("iconify", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("iconify", tmpStr, KConfig::Normal|KConfig::Global);
     tmpStr = input.readEntry("TitlebarPixmapActive");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("TitlebarPixmapActive", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("TitlebarPixmapActive", tmpStr, KConfig::Normal|KConfig::Global);
     tmpStr = input.readEntry("TitlebarPixmapInactive");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
-    output->writeEntry("TitlebarPixmapInactive", tmpStr, KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("TitlebarPixmapInactive", tmpStr, KConfig::Normal|KConfig::Global);
 
     input.setGroup("Window Button Layout");
     output->setGroup("Buttons");
-    output->writeEntry("ButtonA", input.readEntry("ButtonA"), KConfigBase::Normal|KConfigBase::Global);
-    output->writeEntry("ButtonB", input.readEntry("ButtonB"), KConfigBase::Normal|KConfigBase::Global);
-    output->writeEntry("ButtonC", input.readEntry("ButtonC"), KConfigBase::Normal|KConfigBase::Global);
-    output->writeEntry("ButtonD", input.readEntry("ButtonD"), KConfigBase::Normal|KConfigBase::Global);
-    output->writeEntry("ButtonE", input.readEntry("ButtonE"), KConfigBase::Normal|KConfigBase::Global);
-    output->writeEntry("ButtonF", input.readEntry("ButtonF"), KConfigBase::Normal|KConfigBase::Global);
+    output->writeEntry("ButtonA", input.readEntry("ButtonA"), KConfig::Normal|KConfig::Global);
+    output->writeEntry("ButtonB", input.readEntry("ButtonB"), KConfig::Normal|KConfig::Global);
+    output->writeEntry("ButtonC", input.readEntry("ButtonC"), KConfig::Normal|KConfig::Global);
+    output->writeEntry("ButtonD", input.readEntry("ButtonD"), KConfig::Normal|KConfig::Global);
+    output->writeEntry("ButtonE", input.readEntry("ButtonE"), KConfig::Normal|KConfig::Global);
+    output->writeEntry("ButtonF", input.readEntry("ButtonF"), KConfig::Normal|KConfig::Global);
 
     output->sync();
 
diff --git a/clients/modernsystem/modernsys.cpp b/clients/modernsystem/modernsys.cpp
index 15f45ef55b..079e26dd41 100644
--- a/clients/modernsystem/modernsys.cpp
+++ b/clients/modernsystem/modernsys.cpp
@@ -20,7 +20,7 @@
 // Daniel M. DULEY <mosfet@kde.org>               original work
 // Melchior FRANZ  <a8603365@unet.univie.ac.at>   configuration options
 
-#include <kconfig.h>
+#include <kconfiggroup.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <QLayout>
diff --git a/clients/oxygen/oxygen.cpp b/clients/oxygen/oxygen.cpp
index 324affab5e..bf29e905c8 100644
--- a/clients/oxygen/oxygen.cpp
+++ b/clients/oxygen/oxygen.cpp
@@ -26,6 +26,8 @@
 
 #include "oxygenclient.h"
 #include "oxygen.h"
+#include <kconfiggroup.h>
+
 extern "C"
 {
 KDE_EXPORT KDecorationFactory* create_factory()
diff --git a/clients/oxygen/oxygenbutton.cpp b/clients/oxygen/oxygenbutton.cpp
index d45b4cd525..46453aab30 100644
--- a/clients/oxygen/oxygenbutton.cpp
+++ b/clients/oxygen/oxygenbutton.cpp
@@ -30,6 +30,7 @@
 #include <QBitmap>
 
 #include <kdecoration.h>
+#include <kglobal.h>
 
 #include "oxygenclient.h"
 #include "oxygenbutton.h"
diff --git a/clients/plastik/plastik.cpp b/clients/plastik/plastik.cpp
index af5641fe82..7558fcefa6 100644
--- a/clients/plastik/plastik.cpp
+++ b/clients/plastik/plastik.cpp
@@ -24,7 +24,7 @@
 #include <QPainter>
 #include <QImage>
 
-#include <kconfig.h>
+#include <kconfiggroup.h>
 #include <QPixmap>
 
 #include "misc.h"
@@ -33,6 +33,7 @@
 #include "plastikclient.h"
 #include "plastikbutton.h"
 #include <QApplication>
+#include <kconfig.h>
 
 namespace KWinPlastik
 {
diff --git a/clients/quartz/config/config.cpp b/clients/quartz/config/config.cpp
index 0cb86d2094..4209c7cd6b 100644
--- a/clients/quartz/config/config.cpp
+++ b/clients/quartz/config/config.cpp
@@ -9,7 +9,7 @@
 
 #include "config.h"
 #include <kglobal.h>
-
+#include <kconfiggroup.h>
 #include <klocale.h>
 #include <kvbox.h>
 
diff --git a/clients/quartz/quartz.cpp b/clients/quartz/quartz.cpp
index 7af6198969..04df776e04 100644
--- a/clients/quartz/quartz.cpp
+++ b/clients/quartz/quartz.cpp
@@ -16,7 +16,7 @@
  *	  Copyright (C) 1999 Daniel M. Duley <mosfet@kde.org>
  */
 
-#include <kconfig.h>
+#include <kconfiggroup.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <QBitmap>
diff --git a/clients/web/Web.cpp b/clients/web/Web.cpp
index 85fac67db4..6e22791d79 100644
--- a/clients/web/Web.cpp
+++ b/clients/web/Web.cpp
@@ -24,7 +24,7 @@
 //Added by qt3to4:
 #include <QPaintEvent>
 
-#include <kconfig.h>
+#include <kconfiggroup.h>
 
 #include "Web.h"
 #include "WebButton.h"
diff --git a/composite.cpp b/composite.cpp
index 62f2a46647..2ee82c53a0 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -28,6 +28,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <config-X11.h>
 
 #include "utils.h"
+#include <QTextStream>
 #include "workspace.h"
 #include "client.h"
 #include "unmanaged.h"
diff --git a/data/update_default_rules.cpp b/data/update_default_rules.cpp
index aca7ad192d..84fa924ff6 100644
--- a/data/update_default_rules.cpp
+++ b/data/update_default_rules.cpp
@@ -11,6 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 // read additional window rules and add them to kwinrulesrc
 
 #include <kconfig.h>
+#include <kconfiggroup.h>
 #include <kdebug.h>
 #include <kcomponentdata.h>
 #include <kstandarddirs.h>
diff --git a/data/update_window_settings.cpp b/data/update_window_settings.cpp
index e1b6a84fab..ae9d97510b 100644
--- a/data/update_window_settings.cpp
+++ b/data/update_window_settings.cpp
@@ -12,6 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <netwm_def.h>
 #include <kconfig.h>
+#include <kconfiggroup.h>
 #include <kcomponentdata.h>
 #include <QRect>
 #include <QByteArray>
diff --git a/effects/desktopgrid.cpp b/effects/desktopgrid.cpp
index ac5fa3a547..323cac392c 100644
--- a/effects/desktopgrid.cpp
+++ b/effects/desktopgrid.cpp
@@ -15,6 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <klocale.h>
+#include <kconfiggroup.h>
 #include <netwm_def.h>
 #include <qevent.h>
 
diff --git a/effects/desktopgrid_config.cpp b/effects/desktopgrid_config.cpp
index 2123dc3bd8..65100f3b46 100644
--- a/effects/desktopgrid_config.cpp
+++ b/effects/desktopgrid_config.cpp
@@ -18,6 +18,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kaction.h>
 #include <KShortcutsEditor>
 #include <KGlobalAccel>
+#include <kconfiggroup.h>
 
 #include <QVBoxLayout>
 #include <QCheckBox>
diff --git a/effects/presentwindows.cpp b/effects/presentwindows.cpp
index 3de620071f..f5863fc59e 100644
--- a/effects/presentwindows.cpp
+++ b/effects/presentwindows.cpp
@@ -15,6 +15,8 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kaction.h>
 #include <klocale.h>
 #include <kcolorscheme.h>
+#include <kconfiggroup.h>
+#include <kdebug.h>
 
 #include <QMouseEvent>
 #include <qpainter.h>
diff --git a/effects/presentwindows_config.cpp b/effects/presentwindows_config.cpp
index b8642eba75..37b51124ae 100644
--- a/effects/presentwindows_config.cpp
+++ b/effects/presentwindows_config.cpp
@@ -14,6 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <klocale.h>
 #include <kdebug.h>
+#include <kconfiggroup.h>
 #include <KActionCollection>
 #include <kaction.h>
 #include <KShortcutsEditor>
diff --git a/effects/shadow_config.cpp b/effects/shadow_config.cpp
index a19a9bfe03..98cb79633a 100644
--- a/effects/shadow_config.cpp
+++ b/effects/shadow_config.cpp
@@ -14,6 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <klocale.h>
 #include <kdebug.h>
+#include <kconfiggroup.h>
 
 #include <QWidget>
 #include <QGridLayout>
diff --git a/effects/showfps.cpp b/effects/showfps.cpp
index 68981b44c9..4fbead890e 100644
--- a/effects/showfps.cpp
+++ b/effects/showfps.cpp
@@ -12,7 +12,8 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <config-X11.h>
 
-#include <kconfig.h>
+#include <kconfiggroup.h>
+#include <kglobal.h>
 #include <ksharedconfig.h>
 
 #ifdef HAVE_OPENGL
diff --git a/group.cpp b/group.cpp
index ff5d9c6957..d065a0e56d 100644
--- a/group.cpp
+++ b/group.cpp
@@ -18,7 +18,7 @@ License. See the file "COPYING" for the exact licensing terms.
 //#define QT_CLEAN_NAMESPACE
 
 #include "group.h"
-
+#include <QTextStream>
 #include "workspace.h"
 #include "client.h"
 #include "effects.h"
diff --git a/lib/kdecoration_p.cpp b/lib/kdecoration_p.cpp
index 23eb851273..4c982e94e3 100644
--- a/lib/kdecoration_p.cpp
+++ b/lib/kdecoration_p.cpp
@@ -25,6 +25,7 @@ DEALINGS IN THE SOFTWARE.
 #include "kdecoration_p.h"
 
 #include <kconfig.h>
+#include <kconfiggroup.h>
 #include <kglobalsettings.h>
 #include <QPalette>
 #include <QApplication>
diff --git a/lib/kwineffects.cpp b/lib/kwineffects.cpp
index 60400e2f7e..204c4044cf 100644
--- a/lib/kwineffects.cpp
+++ b/lib/kwineffects.cpp
@@ -21,6 +21,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <kdebug.h>
 #include <ksharedconfig.h>
+#include <kconfiggroup.h>
 
 #include <assert.h>
 
@@ -281,7 +282,7 @@ void EffectsHandler::sendReloadMessage( const QString& effectname )
 
 KConfigGroup EffectsHandler::effectConfig( const QString& effectname )
     {
-    KSharedConfig::Ptr kwinconfig = KSharedConfig::openConfig( "kwinrc", KConfig::NoGlobals );
+    KSharedConfig::Ptr kwinconfig = KSharedConfig::openConfig( "kwinrc", KConfig::CascadeConfig );
     return kwinconfig->group( "Effect-" + effectname );
     }
 
diff --git a/main.cpp b/main.cpp
index 754c7f9fe1..f72fd7b7d7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -30,6 +30,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <kdialog.h>
 #include <kstandarddirs.h>
+#include <kdebug.h>
 #include <QLabel>
 #include <QComboBox>
 #include <QVBoxLayout>
diff --git a/options.cpp b/options.cpp
index 5a090c84ea..065508709c 100644
--- a/options.cpp
+++ b/options.cpp
@@ -85,7 +85,7 @@ unsigned long Options::updateSettings()
     if( !focusPolicyIsReasonable()) // #48786, comments #7 and later
         focusStealingPreventionLevel = 0;
 
-    KConfig *gc = new KConfig("kdeglobals", KConfig::NoGlobals);
+    KConfig *gc = new KConfig("kdeglobals", KConfig::CascadeConfig);
     bool isVirtual = KApplication::desktop()->isVirtualDesktop();
     KConfigGroup gWindowsConfig(gc, "Windows");
     xineramaEnabled = gWindowsConfig.readEntry ("XineramaEnabled", isVirtual) &&
diff --git a/placement.cpp b/placement.cpp
index ebeb285037..a637d2c690 100644
--- a/placement.cpp
+++ b/placement.cpp
@@ -15,6 +15,8 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <QRect>
 #include <assert.h>
 
+#include <QTextStream>
+
 #ifndef KCMRULES
 #include "workspace.h"
 #include "client.h"
diff --git a/popupinfo.cpp b/popupinfo.cpp
index bb752270fd..cf8f9fd71c 100644
--- a/popupinfo.cpp
+++ b/popupinfo.cpp
@@ -12,6 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 //#define QT_CLEAN_NAMESPACE
 #include "popupinfo.h"
+#include <QTextStream>
 #include "workspace.h"
 #include "client.h"
 #include <QPainter>
diff --git a/rules.cpp b/rules.cpp
index 7c16c4e67e..dd43dd2193 100644
--- a/rules.cpp
+++ b/rules.cpp
@@ -74,7 +74,7 @@ Rules::Rules( const QString& str, bool temporary )
         file.write( s.data(), s.length());
         }
     file.flush();
-    KConfig cfg( file.fileName(), KConfig::OnlyLocal);
+    KConfig cfg( file.fileName(), KConfig::SimpleConfig);
     readFromCfg( cfg.group( QString() ) );
     if( description.isEmpty())
         description = "temporary";
diff --git a/tabbox.cpp b/tabbox.cpp
index 6cb50fb8dd..e637aa33cb 100644
--- a/tabbox.cpp
+++ b/tabbox.cpp
@@ -11,6 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 //#define QT_CLEAN_NAMESPACE
 #include "tabbox.h"
+#include <QTextStream>
 #include "workspace.h"
 #include "effects.h"
 #include "client.h"
diff --git a/toplevel.h b/toplevel.h
index b8cf559804..d9bf7e4cbf 100644
--- a/toplevel.h
+++ b/toplevel.h
@@ -16,6 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <assert.h>
 #include <qobject.h>
 #include <kdecoration.h>
+#include <kdebug.h>
 
 #include "utils.h"
 #include "workspace.h"