diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69a7169be..33eb77959 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,7 @@ include( CheckIncludeFile )
 include( CheckSymbolExists )
 include( CheckFunctionExists )
 include( CheckCSourceCompiles )
+include( CheckCXXSourceCompiles )
 include( CheckTypeSize )
 include( CheckCSourceRuns )
 include( CheckLibraryExists )
@@ -747,11 +748,7 @@ set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdecore/kconfig_compiler/kconfig_
 
 add_definitions(
   -DHAVE_CONFIG_H
-  -DQT_NO_ASCII_CAST
-  -DQT_CLEAN_NAMESPACE
-  -DQT_NO_STL
-  -DQT_NO_COMPAT
-  -DQT_NO_TRANSLATION
+  ${TQT_CFLAGS_OTHER}
 )
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include tqt.h" )
diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt
index a28576a94..9c8028bb7 100644
--- a/arts/kde/CMakeLists.txt
+++ b/arts/kde/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${ARTS_INCLUDE_DIRS}
diff --git a/arts/knotify/CMakeLists.txt b/arts/knotify/CMakeLists.txt
index 872965434..7871b1813 100644
--- a/arts/knotify/CMakeLists.txt
+++ b/arts/knotify/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${ARTS_INCLUDE_DIRS}
diff --git a/arts/message/CMakeLists.txt b/arts/message/CMakeLists.txt
index b21b42bc1..1a07d3d94 100644
--- a/arts/message/CMakeLists.txt
+++ b/arts/message/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/kdecore
diff --git a/dcop/CMakeLists.txt b/dcop/CMakeLists.txt
index 56c3d3911..8854ba88a 100644
--- a/dcop/CMakeLists.txt
+++ b/dcop/CMakeLists.txt
@@ -15,13 +15,6 @@ add_subdirectory( dcopidlng )
 add_subdirectory( dcopidl2cpp )
 add_subdirectory( client )
 
-
-include( KDE3Macros )
-
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/dcop/KDE-ICE/CMakeLists.txt b/dcop/KDE-ICE/CMakeLists.txt
index 17e2dab86..6963d5017 100644
--- a/dcop/KDE-ICE/CMakeLists.txt
+++ b/dcop/KDE-ICE/CMakeLists.txt
@@ -9,6 +9,8 @@
 #
 #################################################
 
+set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -include tqt.h" )
+
 add_definitions(
   -DICE_t
   -DTRANS_SERVER
@@ -20,6 +22,7 @@ add_definitions(
 include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/dcop
+  ${TQT_INCLUDE_DIRS}
 )
 
 
diff --git a/dcop/client/CMakeLists.txt b/dcop/client/CMakeLists.txt
index 3ed31360c..760746f9a 100644
--- a/dcop/client/CMakeLists.txt
+++ b/dcop/client/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
diff --git a/dcop/dcopidl/CMakeLists.txt b/dcop/dcopidl/CMakeLists.txt
index ec2752bc0..f3a8c5049 100644
--- a/dcop/dcopidl/CMakeLists.txt
+++ b/dcop/dcopidl/CMakeLists.txt
@@ -9,11 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-  -include tqt.h
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
diff --git a/dcop/dcopidl2cpp/CMakeLists.txt b/dcop/dcopidl2cpp/CMakeLists.txt
index 4b0f7d97c..6b2eea5f8 100644
--- a/dcop/dcopidl2cpp/CMakeLists.txt
+++ b/dcop/dcopidl2cpp/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt
index d2ec354cd..50984b71f 100644
--- a/dnssd/CMakeLists.txt
+++ b/dnssd/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/interfaces/kimproxy/library/CMakeLists.txt b/interfaces/kimproxy/library/CMakeLists.txt
index 4f5d0b17a..fb9584973 100644
--- a/interfaces/kimproxy/library/CMakeLists.txt
+++ b/interfaces/kimproxy/library/CMakeLists.txt
@@ -11,10 +11,6 @@
 
 add_subdirectory( icons )
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/interfaces/kmediaplayer/CMakeLists.txt b/interfaces/kmediaplayer/CMakeLists.txt
index 7bef16b69..06e14d9d1 100644
--- a/interfaces/kmediaplayer/CMakeLists.txt
+++ b/interfaces/kmediaplayer/CMakeLists.txt
@@ -13,11 +13,6 @@ if( ARTS_FOUND )
   add_subdirectory( kfileaudiopreview )
 endif( ARTS_FOUND )
 
-
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt b/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt
index 031ffddb8..a316b4ffc 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt
+++ b/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${ARTS_INCLUDE_DIRS}
diff --git a/interfaces/kscript/CMakeLists.txt b/interfaces/kscript/CMakeLists.txt
index 36e049824..98afa228d 100644
--- a/interfaces/kscript/CMakeLists.txt
+++ b/interfaces/kscript/CMakeLists.txt
@@ -11,11 +11,6 @@
 
 add_subdirectory( sample )
 
-
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/interfaces/kscript/sample/CMakeLists.txt b/interfaces/kscript/sample/CMakeLists.txt
index ac5eb479b..eb28b1883 100644
--- a/interfaces/kscript/sample/CMakeLists.txt
+++ b/interfaces/kscript/sample/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/interfaces/ktexteditor/CMakeLists.txt b/interfaces/ktexteditor/CMakeLists.txt
index ba445df16..a011f2122 100644
--- a/interfaces/ktexteditor/CMakeLists.txt
+++ b/interfaces/ktexteditor/CMakeLists.txt
@@ -9,11 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-  -include tqt.h
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kab/CMakeLists.txt b/kab/CMakeLists.txt
index e588f442b..acf8663cb 100644
--- a/kab/CMakeLists.txt
+++ b/kab/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kabc/CMakeLists.txt b/kabc/CMakeLists.txt
index f03e365f2..1db5f73c9 100644
--- a/kabc/CMakeLists.txt
+++ b/kabc/CMakeLists.txt
@@ -14,11 +14,6 @@ add_subdirectory( vcardparser )
 add_subdirectory( formats )
 add_subdirectory( plugins )
 
-
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/kabc/formats/CMakeLists.txt b/kabc/formats/CMakeLists.txt
index 23ae73fc0..47ad9f37a 100644
--- a/kabc/formats/CMakeLists.txt
+++ b/kabc/formats/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${CMAKE_BINARY_DIR}/kabc
   ${CMAKE_SOURCE_DIR}/kabc
diff --git a/kabc/plugins/dir/CMakeLists.txt b/kabc/plugins/dir/CMakeLists.txt
index 094af3789..f25967dc8 100644
--- a/kabc/plugins/dir/CMakeLists.txt
+++ b/kabc/plugins/dir/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/kabc
diff --git a/kabc/plugins/file/CMakeLists.txt b/kabc/plugins/file/CMakeLists.txt
index 9304e9865..e3a0fc3ae 100644
--- a/kabc/plugins/file/CMakeLists.txt
+++ b/kabc/plugins/file/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/kabc
diff --git a/kabc/plugins/ldapkio/CMakeLists.txt b/kabc/plugins/ldapkio/CMakeLists.txt
index 4d80738e4..b0e2b0d07 100644
--- a/kabc/plugins/ldapkio/CMakeLists.txt
+++ b/kabc/plugins/ldapkio/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/kabc
diff --git a/kabc/plugins/net/CMakeLists.txt b/kabc/plugins/net/CMakeLists.txt
index 6e7161691..e7336f1ff 100644
--- a/kabc/plugins/net/CMakeLists.txt
+++ b/kabc/plugins/net/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/kabc
diff --git a/kabc/vcard/CMakeLists.txt b/kabc/vcard/CMakeLists.txt
index 99f6ab4f5..f2ac63bac 100644
--- a/kabc/vcard/CMakeLists.txt
+++ b/kabc/vcard/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kabc/vcardparser/CMakeLists.txt b/kabc/vcardparser/CMakeLists.txt
index 4aace67f0..e68bd8fb1 100644
--- a/kabc/vcardparser/CMakeLists.txt
+++ b/kabc/vcardparser/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/kdecore
diff --git a/kate/interfaces/CMakeLists.txt b/kate/interfaces/CMakeLists.txt
index b7eca5f39..07f13aa6f 100644
--- a/kate/interfaces/CMakeLists.txt
+++ b/kate/interfaces/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kate/part/CMakeLists.txt b/kate/part/CMakeLists.txt
index b73ab51ef..9d0392254 100644
--- a/kate/part/CMakeLists.txt
+++ b/kate/part/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kate/plugins/insertfile/CMakeLists.txt b/kate/plugins/insertfile/CMakeLists.txt
index c09a2bf2b..f6e0d25d0 100644
--- a/kate/plugins/insertfile/CMakeLists.txt
+++ b/kate/plugins/insertfile/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kate/plugins/isearch/CMakeLists.txt b/kate/plugins/isearch/CMakeLists.txt
index ad9441072..8a9c7652f 100644
--- a/kate/plugins/isearch/CMakeLists.txt
+++ b/kate/plugins/isearch/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kate/plugins/kdatatool/CMakeLists.txt b/kate/plugins/kdatatool/CMakeLists.txt
index 3eb03ddad..c073d234b 100644
--- a/kate/plugins/kdatatool/CMakeLists.txt
+++ b/kate/plugins/kdatatool/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kate/plugins/wordcompletion/CMakeLists.txt b/kate/plugins/wordcompletion/CMakeLists.txt
index 11c0dd85a..f93e03291 100644
--- a/kate/plugins/wordcompletion/CMakeLists.txt
+++ b/kate/plugins/wordcompletion/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kcert/CMakeLists.txt b/kcert/CMakeLists.txt
index 05e11ea0b..52d8aa82b 100644
--- a/kcert/CMakeLists.txt
+++ b/kcert/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kcmshell/CMakeLists.txt b/kcmshell/CMakeLists.txt
index e9940a0fd..46e8f28ab 100644
--- a/kcmshell/CMakeLists.txt
+++ b/kcmshell/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kconf_update/CMakeLists.txt b/kconf_update/CMakeLists.txt
index c6c5e462f..ec5291656 100644
--- a/kconf_update/CMakeLists.txt
+++ b/kconf_update/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/kdecore
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index c475c89c3..3e37ed20c 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -18,10 +18,6 @@ if( WITH_LIBART )
   set( KDESVGICONS kdesvgicons-static )
 endif( WITH_LIBART )
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-  -include tqt.h
-)
 
 include_directories(
   ${TQT_INCLUDE_DIRS}
@@ -133,7 +129,7 @@ tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 4.2.0
   EMBED kdecorenetwork-static
-  LINK ltdlc-static ${KDESVGICONS} DCOP-shared kdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES}
+  LINK ltdlc-static ${KDESVGICONS} DCOP-shared kdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ICE SM
   DEPENDENCIES dcopidl dcopidl2cpp
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kdecore/kconfig_compiler/CMakeLists.txt b/kdecore/kconfig_compiler/CMakeLists.txt
index 314b381cc..d256d21c3 100644
--- a/kdecore/kconfig_compiler/CMakeLists.txt
+++ b/kdecore/kconfig_compiler/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/kdecore
diff --git a/kdecore/network/CMakeLists.txt b/kdecore/network/CMakeLists.txt
index 2f1a19b58..e00fdd0c8 100644
--- a/kdecore/network/CMakeLists.txt
+++ b/kdecore/network/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
diff --git a/kdecore/svgicons/CMakeLists.txt b/kdecore/svgicons/CMakeLists.txt
index 1b1d43659..714925667 100644
--- a/kdecore/svgicons/CMakeLists.txt
+++ b/kdecore/svgicons/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/kdecore
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 18b46e065..aa466d999 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kdefx/CMakeLists.txt b/kdefx/CMakeLists.txt
index d9f4d3b07..d63b87889 100644
--- a/kdefx/CMakeLists.txt
+++ b/kdefx/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kdeprint/CMakeLists.txt b/kdeprint/CMakeLists.txt
index 798af8db3..fa77fd3b4 100644
--- a/kdeprint/CMakeLists.txt
+++ b/kdeprint/CMakeLists.txt
@@ -21,11 +21,6 @@ add_subdirectory( filters )
 add_subdirectory( pics )
 add_subdirectory( tools )
 
-
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kdeprint/cups/CMakeLists.txt b/kdeprint/cups/CMakeLists.txt
index 195b396d6..c9f336558 100644
--- a/kdeprint/cups/CMakeLists.txt
+++ b/kdeprint/cups/CMakeLists.txt
@@ -12,7 +12,6 @@
 add_subdirectory( cupsdconf2 )
 
 add_definitions(
-  ${TQT_CFLAGS_OTHER}
   -D_KDEPRINT_COMPILE
 )
 
diff --git a/kdeprint/cups/cupsdconf2/CMakeLists.txt b/kdeprint/cups/cupsdconf2/CMakeLists.txt
index 19e8cbe46..914b18446 100644
--- a/kdeprint/cups/cupsdconf2/CMakeLists.txt
+++ b/kdeprint/cups/cupsdconf2/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kdeprint/ext/CMakeLists.txt b/kdeprint/ext/CMakeLists.txt
index fbc633e55..8c701056b 100644
--- a/kdeprint/ext/CMakeLists.txt
+++ b/kdeprint/ext/CMakeLists.txt
@@ -10,7 +10,6 @@
 #################################################
 
 add_definitions(
-  ${TQT_CFLAGS_OTHER}
   -D_KDEPRINT_COMPILE
 )
 
diff --git a/kdeprint/lpdunix/CMakeLists.txt b/kdeprint/lpdunix/CMakeLists.txt
index 0dfee8ebf..5816af6ab 100644
--- a/kdeprint/lpdunix/CMakeLists.txt
+++ b/kdeprint/lpdunix/CMakeLists.txt
@@ -10,7 +10,6 @@
 #################################################
 
 add_definitions(
-  ${TQT_CFLAGS_OTHER}
   -D_KDEPRINT_COMPILE
 )
 
diff --git a/kdeprint/lpr/CMakeLists.txt b/kdeprint/lpr/CMakeLists.txt
index 7af784249..56de888b9 100644
--- a/kdeprint/lpr/CMakeLists.txt
+++ b/kdeprint/lpr/CMakeLists.txt
@@ -10,7 +10,6 @@
 #################################################
 
 add_definitions(
-  ${TQT_CFLAGS_OTHER}
   -D_KDEPRINT_COMPILE
 )
 
diff --git a/kdeprint/management/CMakeLists.txt b/kdeprint/management/CMakeLists.txt
index a3d578d3d..8c4fb42ba 100644
--- a/kdeprint/management/CMakeLists.txt
+++ b/kdeprint/management/CMakeLists.txt
@@ -10,7 +10,6 @@
 #################################################
 
 add_definitions(
-  ${TQT_CFLAGS_OTHER}
   -D_KDEPRINT_COMPILE
 )
 
diff --git a/kdeprint/rlpr/CMakeLists.txt b/kdeprint/rlpr/CMakeLists.txt
index 683bbdb0e..cc9369e07 100644
--- a/kdeprint/rlpr/CMakeLists.txt
+++ b/kdeprint/rlpr/CMakeLists.txt
@@ -10,7 +10,6 @@
 #################################################
 
 add_definitions(
-  ${TQT_CFLAGS_OTHER}
   -D_KDEPRINT_COMPILE
 )
 
diff --git a/kdeprint/tools/escputil/CMakeLists.txt b/kdeprint/tools/escputil/CMakeLists.txt
index e38a04210..ec969c6b0 100644
--- a/kdeprint/tools/escputil/CMakeLists.txt
+++ b/kdeprint/tools/escputil/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kdesu/CMakeLists.txt b/kdesu/CMakeLists.txt
index 258bb066c..9f5b9ef5b 100644
--- a/kdesu/CMakeLists.txt
+++ b/kdesu/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index 4003f02a5..9215c2860 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -16,11 +16,6 @@ endif( BUILD_KDEUI_TESTS )
 add_subdirectory( about )
 add_subdirectory( kdetrayproxy )
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-  -include tqt.h
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/kdeui/kdetrayproxy/CMakeLists.txt b/kdeui/kdetrayproxy/CMakeLists.txt
index 26353c231..1d26e60a5 100644
--- a/kdeui/kdetrayproxy/CMakeLists.txt
+++ b/kdeui/kdetrayproxy/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt
index b47b8e4a3..c6baf54ab 100644
--- a/kdeui/tests/CMakeLists.txt
+++ b/kdeui/tests/CMakeLists.txt
@@ -9,11 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-  -include tqt.h
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt
index 687ab564b..644a9dbb1 100644
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
@@ -13,7 +13,6 @@ add_subdirectory( pics )
 
 
 add_definitions(
-  ${TQT_CFLAGS_OTHER}
   -DQT_PLUGIN
 )
 
diff --git a/kdoctools/CMakeLists.txt b/kdoctools/CMakeLists.txt
index 2d4ff72ab..67fae5fa7 100644
--- a/kdoctools/CMakeLists.txt
+++ b/kdoctools/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/CMakeLists.txt b/khtml/CMakeLists.txt
index 793fa6b8f..9a2488c4a 100644
--- a/khtml/CMakeLists.txt
+++ b/khtml/CMakeLists.txt
@@ -22,11 +22,6 @@ add_subdirectory( java )
 add_subdirectory( ecma )
 add_subdirectory( kmultipart )
 
-
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/css/CMakeLists.txt b/khtml/css/CMakeLists.txt
index 53c261559..1283dce2d 100644
--- a/khtml/css/CMakeLists.txt
+++ b/khtml/css/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/dom/CMakeLists.txt b/khtml/dom/CMakeLists.txt
index b3e3e0591..ea0837cdf 100644
--- a/khtml/dom/CMakeLists.txt
+++ b/khtml/dom/CMakeLists.txt
@@ -11,10 +11,6 @@
 
 set( CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${USE_EXCEPTIONS} )
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/ecma/CMakeLists.txt b/khtml/ecma/CMakeLists.txt
index 6d62d7d1d..307623f48 100644
--- a/khtml/ecma/CMakeLists.txt
+++ b/khtml/ecma/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/html/CMakeLists.txt b/khtml/html/CMakeLists.txt
index 4b636dbaa..0736cb407 100644
--- a/khtml/html/CMakeLists.txt
+++ b/khtml/html/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/java/CMakeLists.txt b/khtml/java/CMakeLists.txt
index 5e2fcafb0..7c1e7dd43 100644
--- a/khtml/java/CMakeLists.txt
+++ b/khtml/java/CMakeLists.txt
@@ -11,10 +11,6 @@
 
 add_subdirectory( dummy )
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/kmultipart/CMakeLists.txt b/khtml/kmultipart/CMakeLists.txt
index bcd28ec24..4c798f584 100644
--- a/khtml/kmultipart/CMakeLists.txt
+++ b/khtml/kmultipart/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/misc/CMakeLists.txt b/khtml/misc/CMakeLists.txt
index 93913df3b..ea074a639 100644
--- a/khtml/misc/CMakeLists.txt
+++ b/khtml/misc/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/rendering/CMakeLists.txt b/khtml/rendering/CMakeLists.txt
index da4c0c535..45924ac2d 100644
--- a/khtml/rendering/CMakeLists.txt
+++ b/khtml/rendering/CMakeLists.txt
@@ -9,11 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-  -include tqt.h
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/khtml/xml/CMakeLists.txt b/khtml/xml/CMakeLists.txt
index b21335367..c9ea9f696 100644
--- a/khtml/xml/CMakeLists.txt
+++ b/khtml/xml/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt
index a0ea0dbd8..5b09dfff2 100644
--- a/kimgio/CMakeLists.txt
+++ b/kimgio/CMakeLists.txt
@@ -11,11 +11,6 @@
 
 set( CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${USE_EXCEPTIONS} )
 
-
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt
index 3a8906dc7..8cb794673 100644
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kio/bookmarks/CMakeLists.txt b/kio/bookmarks/CMakeLists.txt
index a8d50fdbb..9aac8b591 100644
--- a/kio/bookmarks/CMakeLists.txt
+++ b/kio/bookmarks/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kio/httpfilter/CMakeLists.txt b/kio/httpfilter/CMakeLists.txt
index ffc46fd72..802e45b89 100644
--- a/kio/httpfilter/CMakeLists.txt
+++ b/kio/httpfilter/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kio/kfile/CMakeLists.txt b/kio/kfile/CMakeLists.txt
index 453654571..e9e7540b7 100644
--- a/kio/kfile/CMakeLists.txt
+++ b/kio/kfile/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kio/kio/CMakeLists.txt b/kio/kio/CMakeLists.txt
index 35b72cb3e..f337175c3 100644
--- a/kio/kio/CMakeLists.txt
+++ b/kio/kio/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kio/kioexec/CMakeLists.txt b/kio/kioexec/CMakeLists.txt
index 043f017c6..d903f1f3a 100644
--- a/kio/kioexec/CMakeLists.txt
+++ b/kio/kioexec/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kio/kpasswdserver/CMakeLists.txt b/kio/kpasswdserver/CMakeLists.txt
index 215db3c92..5ed92bf17 100644
--- a/kio/kpasswdserver/CMakeLists.txt
+++ b/kio/kpasswdserver/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kio/kssl/CMakeLists.txt b/kio/kssl/CMakeLists.txt
index 6aee17a8c..c6a383adb 100644
--- a/kio/kssl/CMakeLists.txt
+++ b/kio/kssl/CMakeLists.txt
@@ -11,11 +11,6 @@
 
 add_subdirectory( kssl )
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-  -include tqt.h
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kio/misc/CMakeLists.txt b/kio/misc/CMakeLists.txt
index 763380167..d6bc0cb16 100644
--- a/kio/misc/CMakeLists.txt
+++ b/kio/misc/CMakeLists.txt
@@ -19,8 +19,6 @@ add_subdirectory( kntlm )
 
 add_definitions(
   -D_LARGEFILE64_SOURCE
-  ${TQT_CFLAGS_OTHER}
-  -include tqt.h
 )
 
 include_directories(
diff --git a/kio/misc/kdesasl/CMakeLists.txt b/kio/misc/kdesasl/CMakeLists.txt
index a5c9ac844..081d64799 100644
--- a/kio/misc/kdesasl/CMakeLists.txt
+++ b/kio/misc/kdesasl/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kio/misc/kfile/CMakeLists.txt b/kio/misc/kfile/CMakeLists.txt
index 0c91bb662..4a00ae286 100644
--- a/kio/misc/kfile/CMakeLists.txt
+++ b/kio/misc/kfile/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/kdecore
diff --git a/kio/misc/kntlm/CMakeLists.txt b/kio/misc/kntlm/CMakeLists.txt
index 4c7f899a6..9b4b916bc 100644
--- a/kio/misc/kntlm/CMakeLists.txt
+++ b/kio/misc/kntlm/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
diff --git a/kio/misc/kpac/CMakeLists.txt b/kio/misc/kpac/CMakeLists.txt
index bd60310c4..c3fc418c3 100644
--- a/kio/misc/kpac/CMakeLists.txt
+++ b/kio/misc/kpac/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kio/misc/ksendbugmail/CMakeLists.txt b/kio/misc/ksendbugmail/CMakeLists.txt
index 9b3b04575..133049129 100644
--- a/kio/misc/ksendbugmail/CMakeLists.txt
+++ b/kio/misc/ksendbugmail/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kio/misc/kssld/CMakeLists.txt b/kio/misc/kssld/CMakeLists.txt
index 5acdc533e..ca9438817 100644
--- a/kio/misc/kssld/CMakeLists.txt
+++ b/kio/misc/kssld/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kio/misc/kwalletd/CMakeLists.txt b/kio/misc/kwalletd/CMakeLists.txt
index c56064589..eb02085f5 100644
--- a/kio/misc/kwalletd/CMakeLists.txt
+++ b/kio/misc/kwalletd/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kio/tests/CMakeLists.txt b/kio/tests/CMakeLists.txt
index 4d2039f12..9c4fb7427 100644
--- a/kio/tests/CMakeLists.txt
+++ b/kio/tests/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/kdecore
diff --git a/kioslave/bzip2/CMakeLists.txt b/kioslave/bzip2/CMakeLists.txt
index 5b6a68d7d..054d87fdf 100644
--- a/kioslave/bzip2/CMakeLists.txt
+++ b/kioslave/bzip2/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
diff --git a/kioslave/file/CMakeLists.txt b/kioslave/file/CMakeLists.txt
index 66652e633..fef6c2224 100644
--- a/kioslave/file/CMakeLists.txt
+++ b/kioslave/file/CMakeLists.txt
@@ -10,7 +10,6 @@
 #################################################
 
 add_definitions(
-  ${TQT_CFLAGS_OTHER}
   -D_LARGEFILE64_SOURCE
 )
 
diff --git a/kioslave/ftp/CMakeLists.txt b/kioslave/ftp/CMakeLists.txt
index 7f6b88355..0220acd40 100644
--- a/kioslave/ftp/CMakeLists.txt
+++ b/kioslave/ftp/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
diff --git a/kioslave/gzip/CMakeLists.txt b/kioslave/gzip/CMakeLists.txt
index 184407d9b..3426fef09 100644
--- a/kioslave/gzip/CMakeLists.txt
+++ b/kioslave/gzip/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/kdecore
diff --git a/kioslave/http/CMakeLists.txt b/kioslave/http/CMakeLists.txt
index fed9fb28e..a043a8a8d 100644
--- a/kioslave/http/CMakeLists.txt
+++ b/kioslave/http/CMakeLists.txt
@@ -11,10 +11,6 @@
 
 add_subdirectory( kcookiejar )
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kioslave/http/kcookiejar/CMakeLists.txt b/kioslave/http/kcookiejar/CMakeLists.txt
index 5104c948c..9ae76c0d4 100644
--- a/kioslave/http/kcookiejar/CMakeLists.txt
+++ b/kioslave/http/kcookiejar/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kioslave/iso/CMakeLists.txt b/kioslave/iso/CMakeLists.txt
index faa540221..2d445b520 100644
--- a/kioslave/iso/CMakeLists.txt
+++ b/kioslave/iso/CMakeLists.txt
@@ -12,10 +12,6 @@
 add_subdirectory( libisofs )
 
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
diff --git a/kioslave/metainfo/CMakeLists.txt b/kioslave/metainfo/CMakeLists.txt
index 665c7c39f..2eb466d9a 100644
--- a/kioslave/metainfo/CMakeLists.txt
+++ b/kioslave/metainfo/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/kdecore
diff --git a/kjs/CMakeLists.txt b/kjs/CMakeLists.txt
index 042f6f0cd..953953684 100644
--- a/kjs/CMakeLists.txt
+++ b/kjs/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/kmdi/CMakeLists.txt b/kmdi/CMakeLists.txt
index fcb71a42e..1814876a1 100644
--- a/kmdi/CMakeLists.txt
+++ b/kmdi/CMakeLists.txt
@@ -11,11 +11,6 @@
 
 add_subdirectory( kmdi )
 
-
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kmdi/kmdi/CMakeLists.txt b/kmdi/kmdi/CMakeLists.txt
index 6425d2a4c..28c8bea78 100644
--- a/kmdi/kmdi/CMakeLists.txt
+++ b/kmdi/kmdi/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/knewstuff/CMakeLists.txt b/knewstuff/CMakeLists.txt
index ad450d06a..29bcecc92 100644
--- a/knewstuff/CMakeLists.txt
+++ b/knewstuff/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kparts/CMakeLists.txt b/kparts/CMakeLists.txt
index 2e8fa2252..982ae3c51 100644
--- a/kparts/CMakeLists.txt
+++ b/kparts/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/krandr/CMakeLists.txt b/krandr/CMakeLists.txt
index 48d8ef24d..9f1b45755 100644
--- a/krandr/CMakeLists.txt
+++ b/krandr/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${XRANDR_INCLUDE_DIRS}
diff --git a/kresources/CMakeLists.txt b/kresources/CMakeLists.txt
index 213cb7efc..3e79d13e7 100644
--- a/kresources/CMakeLists.txt
+++ b/kresources/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kspell2/CMakeLists.txt b/kspell2/CMakeLists.txt
index 29b45aba9..5c81ab6ba 100644
--- a/kspell2/CMakeLists.txt
+++ b/kspell2/CMakeLists.txt
@@ -12,10 +12,6 @@
 add_subdirectory( ui )
 add_subdirectory( plugins )
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kspell2/plugins/aspell/CMakeLists.txt b/kspell2/plugins/aspell/CMakeLists.txt
index 09b245cb1..94928963c 100644
--- a/kspell2/plugins/aspell/CMakeLists.txt
+++ b/kspell2/plugins/aspell/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kspell2/plugins/hspell/CMakeLists.txt b/kspell2/plugins/hspell/CMakeLists.txt
index 4af8a6ca5..0fd8d0fa5 100644
--- a/kspell2/plugins/hspell/CMakeLists.txt
+++ b/kspell2/plugins/hspell/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kspell2/plugins/ispell/CMakeLists.txt b/kspell2/plugins/ispell/CMakeLists.txt
index a1d7087a5..0cd7d74a0 100644
--- a/kspell2/plugins/ispell/CMakeLists.txt
+++ b/kspell2/plugins/ispell/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kspell2/ui/CMakeLists.txt b/kspell2/ui/CMakeLists.txt
index 1348d39b4..2a7718c7d 100644
--- a/kspell2/ui/CMakeLists.txt
+++ b/kspell2/ui/CMakeLists.txt
@@ -10,9 +10,7 @@
 #################################################
 
 add_definitions(
-  ${TQT_CFLAGS_OTHER}
   -DKDE_NO_COMPAT
-  -DQT_NO_COMPAT
 )
 
 include_directories(
diff --git a/kstyles/highcolor/CMakeLists.txt b/kstyles/highcolor/CMakeLists.txt
index 309f0f44e..fb923ce51 100644
--- a/kstyles/highcolor/CMakeLists.txt
+++ b/kstyles/highcolor/CMakeLists.txt
@@ -10,7 +10,6 @@
 #################################################
 
 add_definitions(
-  ${TQT_CFLAGS_OTHER}
   -DQT_PLUGIN
 )
 
diff --git a/kstyles/highcontrast/CMakeLists.txt b/kstyles/highcontrast/CMakeLists.txt
index ca2f998fc..d3dc224bb 100644
--- a/kstyles/highcontrast/CMakeLists.txt
+++ b/kstyles/highcontrast/CMakeLists.txt
@@ -13,7 +13,6 @@ add_subdirectory( config )
 
 
 add_definitions(
-  ${TQT_CFLAGS_OTHER}
   -DQT_PLUGIN
 )
 
diff --git a/kstyles/highcontrast/config/CMakeLists.txt b/kstyles/highcontrast/config/CMakeLists.txt
index 8c634688f..cd575ff3e 100644
--- a/kstyles/highcontrast/config/CMakeLists.txt
+++ b/kstyles/highcontrast/config/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kstyles/keramik/CMakeLists.txt b/kstyles/keramik/CMakeLists.txt
index 61776a98d..5862a8653 100644
--- a/kstyles/keramik/CMakeLists.txt
+++ b/kstyles/keramik/CMakeLists.txt
@@ -10,7 +10,6 @@
 #################################################
 
 add_definitions(
-  ${TQT_CFLAGS_OTHER}
   -UQT_NO_ASCII_CAST
   -DQT_PLUGIN
 )
@@ -66,6 +65,6 @@ set_source_files_properties( pixmaploader.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kdefx-shared
+  LINK kdefx-shared Xext
   DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
 )
diff --git a/kstyles/kthemestyle/CMakeLists.txt b/kstyles/kthemestyle/CMakeLists.txt
index 94277030f..45bdb0b68 100644
--- a/kstyles/kthemestyle/CMakeLists.txt
+++ b/kstyles/kthemestyle/CMakeLists.txt
@@ -10,7 +10,6 @@
 #################################################
 
 add_definitions(
-  ${TQT_CFLAGS_OTHER}
   -DQT_PLUGIN
 )
 
@@ -37,6 +36,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kdefx-shared kdecore-shared
+  LINK kdefx-shared kdecore-shared dl
   DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
 )
diff --git a/kstyles/light/CMakeLists.txt b/kstyles/light/CMakeLists.txt
index 1da874a17..7a0ee6610 100644
--- a/kstyles/light/CMakeLists.txt
+++ b/kstyles/light/CMakeLists.txt
@@ -10,7 +10,6 @@
 #################################################
 
 add_definitions(
-  ${TQT_CFLAGS_OTHER}
   -DQT_PLUGIN
 )
 
diff --git a/kstyles/plastik/CMakeLists.txt b/kstyles/plastik/CMakeLists.txt
index d8694654c..a57af7c1f 100644
--- a/kstyles/plastik/CMakeLists.txt
+++ b/kstyles/plastik/CMakeLists.txt
@@ -12,7 +12,6 @@
 add_subdirectory( config )
 
 add_definitions(
-  ${TQT_CFLAGS_OTHER}
   -DQT_PLUGIN
 )
 
diff --git a/kstyles/plastik/config/CMakeLists.txt b/kstyles/plastik/config/CMakeLists.txt
index 89da74a16..13eb35234 100644
--- a/kstyles/plastik/config/CMakeLists.txt
+++ b/kstyles/plastik/config/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kstyles/utils/installtheme/CMakeLists.txt b/kstyles/utils/installtheme/CMakeLists.txt
index 86fa42c99..8becda904 100644
--- a/kstyles/utils/installtheme/CMakeLists.txt
+++ b/kstyles/utils/installtheme/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/kdecore
diff --git a/kunittest/CMakeLists.txt b/kunittest/CMakeLists.txt
index a78a5c00c..a2ee3fcab 100644
--- a/kunittest/CMakeLists.txt
+++ b/kunittest/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kutils/CMakeLists.txt b/kutils/CMakeLists.txt
index 4ea95455f..f0c2c135e 100644
--- a/kutils/CMakeLists.txt
+++ b/kutils/CMakeLists.txt
@@ -11,10 +11,6 @@
 
 add_subdirectory( ksettings )
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
    ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kutils/ksettings/CMakeLists.txt b/kutils/ksettings/CMakeLists.txt
index 1503152b4..1047d6f0e 100644
--- a/kutils/ksettings/CMakeLists.txt
+++ b/kutils/ksettings/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kwallet/backend/CMakeLists.txt b/kwallet/backend/CMakeLists.txt
index d04cb5afd..8801971da 100644
--- a/kwallet/backend/CMakeLists.txt
+++ b/kwallet/backend/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
diff --git a/kwallet/client/CMakeLists.txt b/kwallet/client/CMakeLists.txt
index cb739fa6c..620f52a0b 100644
--- a/kwallet/client/CMakeLists.txt
+++ b/kwallet/client/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/libkmid/CMakeLists.txt b/libkmid/CMakeLists.txt
index 490e5c9e0..801109bf9 100644
--- a/libkmid/CMakeLists.txt
+++ b/libkmid/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
diff --git a/libkscreensaver/CMakeLists.txt b/libkscreensaver/CMakeLists.txt
index 375186b5c..cb3a8357d 100644
--- a/libkscreensaver/CMakeLists.txt
+++ b/libkscreensaver/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/networkstatus/CMakeLists.txt b/networkstatus/CMakeLists.txt
index 707d01cf6..b784580f5 100644
--- a/networkstatus/CMakeLists.txt
+++ b/networkstatus/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index e8955da34..bb0747d1b 100644
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@@ -17,10 +17,6 @@ add_subdirectory( emoticons )
 # ksvgtopng is compiled only if we have libart support
 if( WITH_LIBART )
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${LIBART_INCLUDE_DIRS}