diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fc4062ea5..75a8d6c504 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,7 @@ kde4_add_dcop_skels(kwin_KDEINIT_SRCS KWinInterface.h )
 
 kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS})
 
-target_link_libraries(kdeinit_kwin  ${KDE4_KDECORE_LIBS} kdeui kdecorations DCOP  ${X11_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
+target_link_libraries(kdeinit_kwin  ${KDE4_KDEUI_LIBS} kdecorations DCOP  ${X11_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
 
 install_targets(${LIB_INSTALL_DIR} kdeinit_kwin )
 
diff --git a/clients/b2/config/CMakeLists.txt b/clients/b2/config/CMakeLists.txt
index 51c5e8c021..08d22e0248 100644
--- a/clients/b2/config/CMakeLists.txt
+++ b/clients/b2/config/CMakeLists.txt
@@ -12,7 +12,7 @@ kde4_add_plugin(kwin_b2_config ${kwin_b2_config_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_b2_config )
 
-target_link_libraries(kwin_b2_config  ${KDE4_KDECORE_LIBS} kdeui ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY})
+target_link_libraries(kwin_b2_config  ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY})
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kwin_b2_config )
 
diff --git a/clients/default/config/CMakeLists.txt b/clients/default/config/CMakeLists.txt
index be246fc9fc..80a35bee13 100644
--- a/clients/default/config/CMakeLists.txt
+++ b/clients/default/config/CMakeLists.txt
@@ -12,7 +12,7 @@ kde4_add_plugin(kwin_default_config ${kwin_default_config_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_default_config )
 
-target_link_libraries(kwin_default_config  ${KDE4_KDECORE_LIBS} kdeui ${QT_QTGUI_LIBRARY})
+target_link_libraries(kwin_default_config  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kwin_default_config )
 
diff --git a/clients/keramik/CMakeLists.txt b/clients/keramik/CMakeLists.txt
index 708dd94d3a..de0da17327 100644
--- a/clients/keramik/CMakeLists.txt
+++ b/clients/keramik/CMakeLists.txt
@@ -17,7 +17,7 @@ kde4_add_plugin(kwin3_keramik ${kwin3_keramik_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_keramik )
 
-target_link_libraries(kwin3_keramik  ${KDE4_KDECORE_LIBS} kdeui kdecorations ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY})
+target_link_libraries(kwin3_keramik  ${KDE4_KDEUI_LIBS} kdecorations ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY})
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kwin3_keramik )
 
diff --git a/clients/keramik/config/CMakeLists.txt b/clients/keramik/config/CMakeLists.txt
index db05b6ec9b..03e2950493 100644
--- a/clients/keramik/config/CMakeLists.txt
+++ b/clients/keramik/config/CMakeLists.txt
@@ -14,7 +14,7 @@ kde4_add_plugin(kwin_keramik_config ${kwin_keramik_config_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_keramik_config )
 
-target_link_libraries(kwin_keramik_config  ${KDE4_KDECORE_LIBS} kdeui ${QT_QTGUI_LIBRARY})
+target_link_libraries(kwin_keramik_config  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kwin_keramik_config )
 
diff --git a/clients/modernsystem/config/CMakeLists.txt b/clients/modernsystem/config/CMakeLists.txt
index ffdbbd9008..0281fe2bd0 100644
--- a/clients/modernsystem/config/CMakeLists.txt
+++ b/clients/modernsystem/config/CMakeLists.txt
@@ -12,7 +12,7 @@ kde4_add_plugin(kwin_modernsys_config ${kwin_modernsys_config_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_modernsys_config )
 
-target_link_libraries(kwin_modernsys_config  ${KDE4_KDECORE_LIBS} kdeui ${QT_QTGUI_LIBRARY}) 
+target_link_libraries(kwin_modernsys_config  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}) 
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kwin_modernsys_config )
 
diff --git a/clients/plastik/CMakeLists.txt b/clients/plastik/CMakeLists.txt
index 479abab2db..452048afef 100644
--- a/clients/plastik/CMakeLists.txt
+++ b/clients/plastik/CMakeLists.txt
@@ -19,7 +19,7 @@ kde4_add_plugin(kwin3_plastik ${kwin3_plastik_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_plastik )
 
-target_link_libraries(kwin3_plastik  ${KDE4_KDECORE_LIBS} kdeui kdecorations kdefx)
+target_link_libraries(kwin3_plastik  ${KDE4_KDEUI_LIBS} kdecorations kdefx)
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kwin3_plastik )
 
diff --git a/clients/plastik/config/CMakeLists.txt b/clients/plastik/config/CMakeLists.txt
index e45c11ac05..73ee9f3205 100644
--- a/clients/plastik/config/CMakeLists.txt
+++ b/clients/plastik/config/CMakeLists.txt
@@ -14,7 +14,7 @@ kde4_add_plugin(kwin_plastik_config ${kwin_plastik_config_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_plastik_config )
 
-target_link_libraries(kwin_plastik_config  ${KDE4_KDECORE_LIBS} kdeui ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})
+target_link_libraries(kwin_plastik_config  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kwin_plastik_config )
 
diff --git a/clients/quartz/CMakeLists.txt b/clients/quartz/CMakeLists.txt
index 65b7873d0b..28f5414ecb 100644
--- a/clients/quartz/CMakeLists.txt
+++ b/clients/quartz/CMakeLists.txt
@@ -15,7 +15,7 @@ kde4_add_plugin(kwin3_quartz ${kwin3_quartz_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_quartz )
 
-target_link_libraries(kwin3_quartz  ${KDE4_KDECORE_LIBS} kdeui kdecorations kdefx)
+target_link_libraries(kwin3_quartz  ${KDE4_KDEUI_LIBS} kdecorations kdefx)
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kwin3_quartz )
 
diff --git a/clients/quartz/config/CMakeLists.txt b/clients/quartz/config/CMakeLists.txt
index 85a25bbabd..e47c72eee1 100644
--- a/clients/quartz/config/CMakeLists.txt
+++ b/clients/quartz/config/CMakeLists.txt
@@ -12,7 +12,7 @@ kde4_add_plugin(kwin_quartz_config ${kwin_quartz_config_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_quartz_config )
 
-target_link_libraries(kwin_quartz_config  ${KDE4_KDECORE_LIBS} kdeui ${QT_QTGUI_LIBRARY})
+target_link_libraries(kwin_quartz_config  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kwin_quartz_config )
 
diff --git a/clients/test/CMakeLists.txt b/clients/test/CMakeLists.txt
index 3c9576c097..519ea785b1 100644
--- a/clients/test/CMakeLists.txt
+++ b/clients/test/CMakeLists.txt
@@ -13,7 +13,7 @@ kde4_add_plugin(kwin3_test ${kwin3_test_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_test )
 
-target_link_libraries(kwin3_test  ${KDE4_KDECORE_LIBS} kdeui kdecorations )
+target_link_libraries(kwin3_test  ${KDE4_KDEUI_LIBS} kdecorations )
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kwin3_test )
 
diff --git a/clients/web/CMakeLists.txt b/clients/web/CMakeLists.txt
index 20d1f67c16..e1a2e7e925 100644
--- a/clients/web/CMakeLists.txt
+++ b/clients/web/CMakeLists.txt
@@ -13,7 +13,7 @@ kde4_add_plugin(kwin3_web ${kwin3_web_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_web )
 
-target_link_libraries(kwin3_web  ${KDE4_KDECORE_LIBS} kdeui kdecorations )
+target_link_libraries(kwin3_web  ${KDE4_KDEUI_LIBS} kdecorations )
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kwin3_web )
 
diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt
index afc525afb4..7c62bcdd28 100644
--- a/kcmkwin/kwindecoration/CMakeLists.txt
+++ b/kcmkwin/kwindecoration/CMakeLists.txt
@@ -14,7 +14,7 @@ kde4_add_plugin(kcm_kwindecoration ${kcm_kwindecoration_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_kwindecoration )
 
-target_link_libraries(kcm_kwindecoration  ${KDE4_KDECORE_LIBS} kdeui kdecorations DCOP ${QT_QT3SUPPORT_LIBRARY} ${X11_LIBRARIES})
+target_link_libraries(kcm_kwindecoration  ${KDE4_KDEUI_LIBS} kdecorations DCOP ${QT_QT3SUPPORT_LIBRARY} ${X11_LIBRARIES})
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kcm_kwindecoration )
 
diff --git a/kcmkwin/kwinoptions/CMakeLists.txt b/kcmkwin/kwinoptions/CMakeLists.txt
index 5e55192d50..6f92aa4e69 100644
--- a/kcmkwin/kwinoptions/CMakeLists.txt
+++ b/kcmkwin/kwinoptions/CMakeLists.txt
@@ -12,7 +12,7 @@ kde4_add_plugin(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_kwinoptions )
 
-target_link_libraries(kcm_kwinoptions  ${KDE4_KDECORE_LIBS} kdeui ${QT_QTGUI_LIBRARY} DCOP ${QT_QT3SUPPORT_LIBRARY})
+target_link_libraries(kcm_kwinoptions  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} DCOP ${QT_QT3SUPPORT_LIBRARY})
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kcm_kwinoptions )
 
diff --git a/killer/CMakeLists.txt b/killer/CMakeLists.txt
index de33d15d2f..ef335165cd 100644
--- a/killer/CMakeLists.txt
+++ b/killer/CMakeLists.txt
@@ -10,7 +10,7 @@ kde4_automoc(${kwin_killer_helper_SRCS})
 
 kde4_add_executable(kwin_killer_helper ${kwin_killer_helper_SRCS})
 
-target_link_libraries(kwin_killer_helper  ${KDE4_KDECORE_LIBS} kdeui )
+target_link_libraries(kwin_killer_helper  ${KDE4_KDEUI_LIBS} )
 
 install_targets(/bin kwin_killer_helper )