diff --git a/CMakeLists.txt b/CMakeLists.txt
index dab589a5a0..9d8458f788 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ if(X11_kompmgr_FOUND)
 endif(X11_kompmgr_FOUND)
 
 include_directories( ${CMAKE_CURRENT_BINARY_DIR}/lib ${CMAKE_CURRENT_SOURCE_DIR}/lib )
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/clients/b2/CMakeLists.txt b/clients/b2/CMakeLists.txt
index d4c15acd05..95dec8eab2 100644
--- a/clients/b2/CMakeLists.txt
+++ b/clients/b2/CMakeLists.txt
@@ -2,7 +2,7 @@ kde4_header()
 
 add_subdirectory( config ) 
 
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 
 ########### next target ###############
diff --git a/clients/b2/config/CMakeLists.txt b/clients/b2/config/CMakeLists.txt
index 4c20e75e6d..e7f349aeee 100644
--- a/clients/b2/config/CMakeLists.txt
+++ b/clients/b2/config/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 
 ########### next target ###############
diff --git a/clients/default/CMakeLists.txt b/clients/default/CMakeLists.txt
index 3baa54c42a..e57197b788 100644
--- a/clients/default/CMakeLists.txt
+++ b/clients/default/CMakeLists.txt
@@ -2,7 +2,7 @@ kde4_header()
 
 add_subdirectory( config ) 
 
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 ########### next target ###############
 
diff --git a/clients/default/config/CMakeLists.txt b/clients/default/config/CMakeLists.txt
index f95b32a671..94ae22e891 100644
--- a/clients/default/config/CMakeLists.txt
+++ b/clients/default/config/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/clients/keramik/CMakeLists.txt b/clients/keramik/CMakeLists.txt
index f10acba4f5..8bff065e03 100644
--- a/clients/keramik/CMakeLists.txt
+++ b/clients/keramik/CMakeLists.txt
@@ -2,7 +2,7 @@ kde4_header()
 
 add_subdirectory( config ) 
 
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 
 ########### next target ###############
diff --git a/clients/keramik/config/CMakeLists.txt b/clients/keramik/config/CMakeLists.txt
index 6b18e8cdec..76c729399f 100644
--- a/clients/keramik/config/CMakeLists.txt
+++ b/clients/keramik/config/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 
 ########### next target ###############
diff --git a/clients/kwmtheme/CMakeLists.txt b/clients/kwmtheme/CMakeLists.txt
index ab538f8b39..6f8f842d57 100644
--- a/clients/kwmtheme/CMakeLists.txt
+++ b/clients/kwmtheme/CMakeLists.txt
@@ -2,7 +2,7 @@ kde4_header()
 
 add_subdirectory( cli_installer ) 
 
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/clients/kwmtheme/cli_installer/CMakeLists.txt b/clients/kwmtheme/cli_installer/CMakeLists.txt
index 2663b66888..c4d2ed140d 100644
--- a/clients/kwmtheme/cli_installer/CMakeLists.txt
+++ b/clients/kwmtheme/cli_installer/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/clients/laptop/CMakeLists.txt b/clients/laptop/CMakeLists.txt
index 24199ebf24..6237ced700 100644
--- a/clients/laptop/CMakeLists.txt
+++ b/clients/laptop/CMakeLists.txt
@@ -1,6 +1,6 @@
 kde4_header()
 
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 
 ########### next target ###############
diff --git a/clients/modernsystem/CMakeLists.txt b/clients/modernsystem/CMakeLists.txt
index 414e705651..e1a9d3da97 100644
--- a/clients/modernsystem/CMakeLists.txt
+++ b/clients/modernsystem/CMakeLists.txt
@@ -2,7 +2,7 @@ kde4_header()
 
 add_subdirectory( config ) 
 
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 
 ########### next target ###############
diff --git a/clients/modernsystem/config/CMakeLists.txt b/clients/modernsystem/config/CMakeLists.txt
index c639c735f4..91044e160e 100644
--- a/clients/modernsystem/config/CMakeLists.txt
+++ b/clients/modernsystem/config/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/clients/plastik/CMakeLists.txt b/clients/plastik/CMakeLists.txt
index 4ee787cf6f..96153cfbe6 100644
--- a/clients/plastik/CMakeLists.txt
+++ b/clients/plastik/CMakeLists.txt
@@ -2,7 +2,7 @@ kde4_header()
 
 add_subdirectory( config )
 
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 
 ########### next target ###############
diff --git a/clients/plastik/config/CMakeLists.txt b/clients/plastik/config/CMakeLists.txt
index a7ca948a93..3959287944 100644
--- a/clients/plastik/config/CMakeLists.txt
+++ b/clients/plastik/config/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/clients/quartz/CMakeLists.txt b/clients/quartz/CMakeLists.txt
index e495e4eb3d..68cdd23e36 100644
--- a/clients/quartz/CMakeLists.txt
+++ b/clients/quartz/CMakeLists.txt
@@ -2,7 +2,7 @@ kde4_header()
 
 add_subdirectory( config ) 
 
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/clients/quartz/config/CMakeLists.txt b/clients/quartz/config/CMakeLists.txt
index 0fa7107f69..4886f6c15c 100644
--- a/clients/quartz/config/CMakeLists.txt
+++ b/clients/quartz/config/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/clients/redmond/CMakeLists.txt b/clients/redmond/CMakeLists.txt
index fc42f6cacf..f24400b44d 100644
--- a/clients/redmond/CMakeLists.txt
+++ b/clients/redmond/CMakeLists.txt
@@ -1,6 +1,6 @@
 kde4_header()
 
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 
 
diff --git a/clients/test/CMakeLists.txt b/clients/test/CMakeLists.txt
index b3e2454fa3..d20f08ff26 100644
--- a/clients/test/CMakeLists.txt
+++ b/clients/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 kde4_header()
 
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/clients/web/CMakeLists.txt b/clients/web/CMakeLists.txt
index 52bd5b9779..a5c870b84e 100644
--- a/clients/web/CMakeLists.txt
+++ b/clients/web/CMakeLists.txt
@@ -1,6 +1,6 @@
 kde4_header()
 
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index a37e1f4a6f..48771d233d 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/kcmkwin/CMakeLists.txt b/kcmkwin/CMakeLists.txt
index ba1e92a782..57b2e245bd 100644
--- a/kcmkwin/CMakeLists.txt
+++ b/kcmkwin/CMakeLists.txt
@@ -3,7 +3,7 @@ kde4_header()
 add_subdirectory( kwinoptions ) 
 add_subdirectory( kwindecoration ) 
 add_subdirectory( kwinrules ) 
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### install files ###############
diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt
index 29997bf30e..3c627cb97b 100644
--- a/kcmkwin/kwindecoration/CMakeLists.txt
+++ b/kcmkwin/kwindecoration/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 
 ########### next target ###############
diff --git a/kcmkwin/kwinoptions/CMakeLists.txt b/kcmkwin/kwinoptions/CMakeLists.txt
index 22425b01f8..428f601707 100644
--- a/kcmkwin/kwinoptions/CMakeLists.txt
+++ b/kcmkwin/kwinoptions/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt
index 0fec58df85..75f18d326b 100644
--- a/kcmkwin/kwinrules/CMakeLists.txt
+++ b/kcmkwin/kwinrules/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 ADD_DEFINITIONS(-DKCMRULES)
 ########### next target ###############
diff --git a/killer/CMakeLists.txt b/killer/CMakeLists.txt
index ec3a7a2c2a..05f51f952d 100644
--- a/killer/CMakeLists.txt
+++ b/killer/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/kompmgr/CMakeLists.txt b/kompmgr/CMakeLists.txt
index b0717b6b62..2f62841cba 100644
--- a/kompmgr/CMakeLists.txt
+++ b/kompmgr/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 1582668de5..e168eb9c0c 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/oldheaders/CMakeLists.txt b/oldheaders/CMakeLists.txt
index 327577d94c..490089dfac 100644
--- a/oldheaders/CMakeLists.txt
+++ b/oldheaders/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### install files ###############
diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index 9c437cf5bb..de811d9910 100644
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### install files ###############
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 64b94051d2..a20ff8a200 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,7 +1,7 @@
 kde4_header()
 
 add_subdirectory( decobenchmark ) 
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############
diff --git a/tools/decobenchmark/CMakeLists.txt b/tools/decobenchmark/CMakeLists.txt
index 671180fe28..ade5774c9b 100644
--- a/tools/decobenchmark/CMakeLists.txt
+++ b/tools/decobenchmark/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+
 
 
 ########### next target ###############