diff --git a/clients/b2/config/CMakeLists.txt b/clients/b2/config/CMakeLists.txt
index cdfea3f8ec..2180dfed95 100644
--- a/clients/b2/config/CMakeLists.txt
+++ b/clients/b2/config/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
+include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/lib  )
 
 
 ########### next target ###############
diff --git a/clients/keramik/config/CMakeLists.txt b/clients/keramik/config/CMakeLists.txt
index 995f1b0af3..acc0d6eb44 100644
--- a/clients/keramik/config/CMakeLists.txt
+++ b/clients/keramik/config/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
+include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/lib  )
 
 
 ########### next target ###############
diff --git a/clients/plastik/config/config.cpp b/clients/plastik/config/config.cpp
index 4ef6c16ab3..496a206d1f 100644
--- a/clients/plastik/config/config.cpp
+++ b/clients/plastik/config/config.cpp
@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 
-#include <config.h>
+#include "config.h"
 
 PlastikConfig::PlastikConfig(KConfig* config, QWidget* parent)
     : QObject(parent), m_config(0), m_dialog(0)
diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
index b379172005..b9d2e21b3d 100644
--- a/effects/CMakeLists.txt
+++ b/effects/CMakeLists.txt
@@ -14,7 +14,7 @@ macro(KWIN4_ADD_EFFECT_CONFIG name)
 endmacro(KWIN4_ADD_EFFECT_CONFIG)
 
 include_directories(
-    ${CMAKE_SOURCE_DIR}/workspace/kwin/lib
+    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/lib
     )
 
 install( FILES kwineffect.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
diff --git a/effects/videorecord.cpp b/effects/videorecord.cpp
index b2cbdc406b..db9e77e1bc 100644
--- a/effects/videorecord.cpp
+++ b/effects/videorecord.cpp
@@ -31,7 +31,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 */
 
-#include <config.h>
+#include <config-workspace.h>
 
 #include "videorecord.h"
 
diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index 3d6315b89f..133a00dbdf 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include <config.h>
+#include <config-workspace.h>
 
 #include <QDir>
 #include <QLayout>
diff --git a/kcmkwin/kwinoptions/windows.h b/kcmkwin/kwinoptions/windows.h
index 7f739556dd..a039cbcc75 100644
--- a/kcmkwin/kwinoptions/windows.h
+++ b/kcmkwin/kwinoptions/windows.h
@@ -24,7 +24,7 @@
 
 #include <QWidget>
 #include <kcmodule.h>
-#include <config.h>
+#include <config-workspace.h>
 
 class QRadioButton;
 class QCheckBox;
diff --git a/scene_xrender.h b/scene_xrender.h
index 77fa7fa4c0..ae1de60018 100644
--- a/scene_xrender.h
+++ b/scene_xrender.h
@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #ifndef KWIN_SCENE_XRENDER_H
 #define KWIN_SCENE_XRENDER_H
 
-#include <config.h>
+#include <config-workspace.h>
 
 #include "scene.h"
 
diff --git a/utils.h b/utils.h
index 8b3f1bc7cd..fde37493b3 100644
--- a/utils.h
+++ b/utils.h
@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #ifndef KWIN_UTILS_H
 #define KWIN_UTILS_H
 
-#include <config.h>
+#include <config-workspace.h>
 #include <config-X11.h>
 #include <config-kwin.h>