diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff1cab3f..ada889ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -293,7 +293,7 @@ configure_file(KDE4Version.cmake ${CMAKE_CURRENT_BINARY_DIR}/KDE4Version.cmake @
 
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
 )
 
 # the following will be the correct locations once cmake has the improved
@@ -302,20 +302,20 @@ install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/KDE4Config.cmake
     ${CMAKE_CURRENT_BINARY_DIR}/KDE4Version.cmake
-    DESTINATION ${DATA_INSTALL_DIR}/cmake/modules
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/cmake/modules
 )
 
 install(
     EXPORT kdelibsLibraryTargets
     NAMESPACE ${KDE4_TARGET_PREFIX}
     FILE KDELibs4LibraryTargets.cmake
-    DESTINATION ${DATA_INSTALL_DIR}/cmake/modules
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/cmake/modules
 )
 install(
     EXPORT kdelibsToolsTargets
     NAMESPACE ${KDE4_TARGET_PREFIX}
     FILE KDELibs4ToolsTargets.cmake
-    DESTINATION ${DATA_INSTALL_DIR}/cmake/modules
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/cmake/modules
 )
 
 feature_summary(WHAT ALL
diff --git a/KDE4Config.cmake b/KDE4Config.cmake
index d22b5704..da01a12f 100644
--- a/KDE4Config.cmake
+++ b/KDE4Config.cmake
@@ -2,41 +2,33 @@ set(KDE_DEFAULT_HOME "@KDE_DEFAULT_HOME@")
 set(KDE4_TARGET_PREFIX "@KDE4_TARGET_PREFIX@")
 
 set(KDE4_INSTALL_DIR             "@CMAKE_INSTALL_PREFIX@")
-set(KDE4_EXEC_INSTALL_PREFIX  "@EXEC_INSTALL_PREFIX@")
-set(KDE4_SHARE_INSTALL_PREFIX "@SHARE_INSTALL_PREFIX@")
-set(KDE4_BIN_INSTALL_DIR      "@BIN_INSTALL_DIR@")
-set(KDE4_SBIN_INSTALL_DIR     "@SBIN_INSTALL_DIR@")
-set(KDE4_LIB_INSTALL_DIR      "@LIB_INSTALL_DIR@")
-set(KDE4_LIBEXEC_INSTALL_DIR  "@LIBEXEC_INSTALL_DIR@")
-set(KDE4_INCLUDE_INSTALL_DIR  "@INCLUDE_INSTALL_DIR@")
-set(KDE4_PLUGIN_INSTALL_DIR       "@PLUGIN_INSTALL_DIR@")
-set(KDE4_IMPORTS_INSTALL_DIR      "@IMPORTS_INSTALL_DIR@")
-set(KDE4_CONFIG_INSTALL_DIR       "@CONFIG_INSTALL_DIR@")
-set(KDE4_DATA_INSTALL_DIR         "@DATA_INSTALL_DIR@")
-set(KDE4_ICON_INSTALL_DIR         "@ICON_INSTALL_DIR@")
-set(KDE4_KCFG_INSTALL_DIR         "@KCFG_INSTALL_DIR@")
-set(KDE4_LOCALE_INSTALL_DIR       "@LOCALE_INSTALL_DIR@")
-set(KDE4_MIME_INSTALL_DIR         "@MIME_INSTALL_DIR@")
-set(KDE4_SERVICES_INSTALL_DIR     "@SERVICES_INSTALL_DIR@")
-set(KDE4_SERVICETYPES_INSTALL_DIR "@SERVICETYPES_INSTALL_DIR@")
-set(KDE4_SOUND_INSTALL_DIR        "@SOUND_INSTALL_DIR@")
-set(KDE4_TEMPLATES_INSTALL_DIR    "@TEMPLATES_INSTALL_DIR@")
-set(KDE4_WALLPAPER_INSTALL_DIR    "@WALLPAPER_INSTALL_DIR@")
-set(KDE4_AUTOSTART_INSTALL_DIR    "@AUTOSTART_INSTALL_DIR@")
-set(KDE4_XDG_APPS_INSTALL_DIR     "@XDG_APPS_INSTALL_DIR@")
-set(KDE4_XDG_DIRECTORY_INSTALL_DIR "@XDG_DIRECTORY_INSTALL_DIR@")
-set(KDE4_XDG_MIME_INSTALL_DIR     "@XDG_MIME_INSTALL_DIR@")
-set(KDE4_SYSCONF_INSTALL_DIR      "@SYSCONF_INSTALL_DIR@")
-set(KDE4_MAN_INSTALL_DIR          "@MAN_INSTALL_DIR@")
-set(KDE4_INFO_INSTALL_DIR         "@INFO_INSTALL_DIR@")
-set(KDE4_DBUS_INTERFACES_INSTALL_DIR "@DBUS_INTERFACES_INSTALL_DIR@")
-set(KDE4_DBUS_SERVICES_INSTALL_DIR "@DBUS_SERVICES_INSTALL_DIR@")
-set(KDE4_DBUS_SYSTEM_SERVICES_INSTALL_DIR "@DBUS_SYSTEM_SERVICES_INSTALL_DIR@")
-set(KDE4_KAUTH_HELPER_PLUGIN_DIR  "@KAUTH_HELPER_PLUGIN_DIR@")
-set(KDE4_KAUTH_BACKEND_PLUGIN_DIR "@KAUTH_BACKEND_PLUGIN_DIR@")
-
-# someone made exception once and will be gone in future release
-set(DBUS_INTERFACES_DIR "@DBUS_INTERFACES_INSTALL_DIR@")
-set(DBUS_SERVICES_DIR "@DBUS_SERVICES_INSTALL_DIR@")
-set(KDE4_DBUS_INTERFACES_DIR "@DBUS_INTERFACES_INSTALL_DIR@")
-set(KDE4_DBUS_SERVICES_DIR "@DBUS_SERVICES_INSTALL_DIR@")
+set(KDE4_EXEC_INSTALL_PREFIX  "@KDE4_EXEC_INSTALL_PREFIX@")
+set(KDE4_SHARE_INSTALL_PREFIX "@KDE4_SHARE_INSTALL_PREFIX@")
+set(KDE4_BIN_INSTALL_DIR      "@KDE4_BIN_INSTALL_DIR@")
+set(KDE4_SBIN_INSTALL_DIR     "@KDE4_SBIN_INSTALL_DIR@")
+set(KDE4_LIB_INSTALL_DIR      "@KDE4_LIB_INSTALL_DIR@")
+set(KDE4_LIBEXEC_INSTALL_DIR  "@KDE4_LIBEXEC_INSTALL_DIR@")
+set(KDE4_INCLUDE_INSTALL_DIR  "@KDE4_INCLUDE_INSTALL_DIR@")
+set(KDE4_PLUGIN_INSTALL_DIR       "@KDE4_PLUGIN_INSTALL_DIR@")
+set(KDE4_IMPORTS_INSTALL_DIR      "@KDE4_IMPORTS_INSTALL_DIR@")
+set(KDE4_CONFIG_INSTALL_DIR       "@KDE4_CONFIG_INSTALL_DIR@")
+set(KDE4_DATA_INSTALL_DIR         "@KDE4_DATA_INSTALL_DIR@")
+set(KDE4_ICON_INSTALL_DIR         "@KDE4_ICON_INSTALL_DIR@")
+set(KDE4_KCFG_INSTALL_DIR         "@KDE4_KCFG_INSTALL_DIR@")
+set(KDE4_LOCALE_INSTALL_DIR       "@KDE4_LOCALE_INSTALL_DIR@")
+set(KDE4_MIME_INSTALL_DIR         "@KDE4_MIME_INSTALL_DIR@")
+set(KDE4_SERVICES_INSTALL_DIR     "@KDE4_SERVICES_INSTALL_DIR@")
+set(KDE4_SERVICETYPES_INSTALL_DIR "@KDE4_SERVICETYPES_INSTALL_DIR@")
+set(KDE4_SOUND_INSTALL_DIR        "@KDE4_SOUND_INSTALL_DIR@")
+set(KDE4_TEMPLATES_INSTALL_DIR    "@KDE4_TEMPLATES_INSTALL_DIR@")
+set(KDE4_WALLPAPER_INSTALL_DIR    "@KDE4_WALLPAPER_INSTALL_DIR@")
+set(KDE4_AUTOSTART_INSTALL_DIR    "@KDE4_AUTOSTART_INSTALL_DIR@")
+set(KDE4_XDG_APPS_INSTALL_DIR     "@KDE4_XDG_APPS_INSTALL_DIR@")
+set(KDE4_XDG_DIRECTORY_INSTALL_DIR "@KDE4_XDG_DIRECTORY_INSTALL_DIR@")
+set(KDE4_XDG_MIME_INSTALL_DIR     "@KDE4_XDG_MIME_INSTALL_DIR@")
+set(KDE4_SYSCONF_INSTALL_DIR      "@KDE4_SYSCONF_INSTALL_DIR@")
+set(KDE4_DBUS_INTERFACES_INSTALL_DIR "@KDE4_DBUS_INTERFACES_INSTALL_DIR@")
+set(KDE4_DBUS_SERVICES_INSTALL_DIR "@KDE4_DBUS_SERVICES_INSTALL_DIR@")
+set(KDE4_DBUS_SYSTEM_SERVICES_INSTALL_DIR "@KDE4_DBUS_SYSTEM_SERVICES_INSTALL_DIR@")
+set(KDE4_KAUTH_HELPER_PLUGIN_DIR  "@KDE4_KAUTH_HELPER_PLUGIN_DIR@")
+set(KDE4_KAUTH_BACKEND_PLUGIN_DIR "@KDE4_KAUTH_BACKEND_PLUGIN_DIR@")
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index fa58f130..f0cd7e37 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -1,6 +1,6 @@
 ## install the cmake files
 
-set(module_install_dir ${DATA_INSTALL_DIR}/cmake/modules)
+set(module_install_dir ${CMAKE_DATA_INSTALL_DIR}/cmake/modules)
 
 # maybe FindHUNSPELL.cmake doesn't have to be installed ?
 # This variable doesn't actually do anything, but it's probably a good idea
@@ -26,7 +26,6 @@ set(cmakeFiles
     FindENCHANT.cmake
     FindEPub.cmake
     FindExiv2.cmake
-    FindFFmpeg.cmake
     FindFFmpegThumbnailer.cmake
     FindFLAC++.cmake
     FindFontconfig.cmake
diff --git a/cmake/modules/FindFFmpeg.cmake b/cmake/modules/FindFFmpeg.cmake
deleted file mode 100644
index 27c6b16d..00000000
--- a/cmake/modules/FindFFmpeg.cmake
+++ /dev/null
@@ -1,148 +0,0 @@
-# vim: ts=2 sw=2
-# - Try to find the required ffmpeg components(default: AVFORMAT, AVUTIL, AVCODEC)
-#
-# Once done this will define
-#  FFMPEG_FOUND         - System has the all required components.
-#  FFMPEG_INCLUDE_DIRS  - Include directory necessary for using the required components headers.
-#  FFMPEG_LIBRARIES     - Link these to use the required ffmpeg components.
-#  FFMPEG_DEFINITIONS   - Compiler switches required for using the required ffmpeg components.
-#
-# For each of the components it will additionally set.
-#   - AVCODEC
-#   - AVDEVICE
-#   - AVFORMAT
-#   - AVUTIL
-#   - POSTPROCESS
-#   - SWSCALE
-# the following variables will be defined
-#  <component>_FOUND        - System has <component>
-#  <component>_INCLUDE_DIRS - Include directory necessary for using the <component> headers
-#  <component>_LIBRARIES    - Link these to use <component>
-#  <component>_DEFINITIONS  - Compiler switches required for using <component>
-#  <component>_VERSION      - The components version
-#
-# Copyright (c) 2006, Matthias Kretz, <kretz@kde.org>
-# Copyright (c) 2008, Alexander Neundorf, <neundorf@kde.org>
-# Copyright (c) 2011, Michael Jansen, <kde@michael-jansen.biz>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-include(FindPackageHandleStandardArgs)
-
-# The default components were taken from a survey over other FindFFMPEG.cmake files
-if (NOT FFmpeg_FIND_COMPONENTS)
-  set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL)
-endif ()
-
-#
-### Macro: set_component_found
-#
-# Marks the given component as found if both *_LIBRARIES AND *_INCLUDE_DIRS is present.
-#
-macro(set_component_found _component )
-  if (${_component}_LIBRARIES AND ${_component}_INCLUDE_DIRS)
-    # message(STATUS "  - ${_component} found.")
-    set(${_component}_FOUND TRUE)
-  else ()
-    # message(STATUS "  - ${_component} not found.")
-  endif ()
-endmacro()
-
-#
-### Macro: find_component
-#
-# Checks for the given component by invoking pkgconfig and then looking up the libraries and
-# include directories.
-#
-macro(find_component _component _pkgconfig _library _header)
-
-  if (NOT WIN32)
-     # use pkg-config to get the directories and then use these values
-     # in the FIND_PATH() and FIND_LIBRARY() calls
-     find_package(PkgConfig)
-     if (PKG_CONFIG_FOUND)
-       pkg_check_modules(PC_${_component} ${_pkgconfig})
-     endif ()
-  endif (NOT WIN32)
-
-  find_path(${_component}_INCLUDE_DIRS ${_header}
-    HINTS
-      ${PC_${_component}_INCLUDEDIR}
-      ${PC_${_component}_INCLUDE_DIRS}
-    PATH_SUFFIXES
-      ffmpeg
-  )
-
-  find_library(${_component}_LIBRARIES NAMES ${_library}
-      HINTS
-      ${PC_${_component}_LIBDIR}
-      ${PC_${_component}_LIBRARY_DIRS}
-  )
-
-  set(${_component}_DEFINITIONS  ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.")
-  set(${_component}_VERSION      ${PC_${_component}_VERSION}      CACHE STRING "The ${_component} version number.")
-
-  set_component_found(${_component})
-
-  mark_as_advanced(
-    ${_component}_INCLUDE_DIRS
-    ${_component}_LIBRARIES
-    ${_component}_DEFINITIONS
-    ${_component}_VERSION)
-
-endmacro()
-
-
-# Check for cached results. If there are skip the costly part.
-if (NOT FFMPEG_LIBRARIES)
-
-  # Check for all possible component.
-  find_component(AVCODEC  libavcodec  avcodec  libavcodec/avcodec.h)
-  find_component(AVFORMAT libavformat avformat libavformat/avformat.h)
-  find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
-  find_component(AVUTIL   libavutil   avutil   libavutil/avutil.h)
-  find_component(SWSCALE  libswscale  swscale  libswscale/swscale.h)
-  find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h)
-
-  # Check if the required components were found and add their stuff to the FFMPEG_* vars.
-  foreach (_component ${FFmpeg_FIND_COMPONENTS})
-    if (${_component}_FOUND)
-      # message(STATUS "Required component ${_component} present.")
-      set(FFMPEG_LIBRARIES   ${FFMPEG_LIBRARIES}   ${${_component}_LIBRARIES})
-      set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} ${${_component}_DEFINITIONS})
-      list(APPEND FFMPEG_INCLUDE_DIRS ${${_component}_INCLUDE_DIRS})
-    else ()
-      # message(STATUS "Required component ${_component} missing.")
-    endif ()
-  endforeach ()
-
-  # Build the include path with duplicates removed.
-  if (FFMPEG_INCLUDE_DIRS)
-    list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
-  endif ()
-
-  # cache the vars.
-  set(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} CACHE STRING "The FFmpeg include directories." FORCE)
-  set(FFMPEG_LIBRARIES    ${FFMPEG_LIBRARIES}    CACHE STRING "The FFmpeg libraries." FORCE)
-  set(FFMPEG_DEFINITIONS  ${FFMPEG_DEFINITIONS}  CACHE STRING "The FFmpeg cflags." FORCE)
-
-  mark_as_advanced(FFMPEG_INCLUDE_DIRS
-                   FFMPEG_LIBRARIES
-                   FFMPEG_DEFINITIONS)
-
-endif ()
-
-# Now set the noncached _FOUND vars for the components.
-foreach (_component AVCODEC AVDEVICE AVFORMAT AVUTIL POSTPROCESS SWSCALE)
-  set_component_found(${_component})
-endforeach ()
-
-# Compile the list of required vars
-set(_FFmpeg_REQUIRED_VARS FFMPEG_LIBRARIES FFMPEG_INCLUDE_DIRS)
-foreach (_component ${FFmpeg_FIND_COMPONENTS})
-  list(APPEND _FFmpeg_REQUIRED_VARS ${_component}_LIBRARIES ${_component}_INCLUDE_DIRS)
-endforeach ()
-
-# Give a nice error message if some of the required vars are missing.
-find_package_handle_standard_args(FFmpeg DEFAULT_MSG ${_FFmpeg_REQUIRED_VARS})
diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
index b82336ba..4d3de4a9 100644
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
@@ -30,8 +30,6 @@
 #  KDE4_XDG_DIRECTORY_INSTALL_DIR - the XDG directory from kdelibs
 #  KDE4_XDG_MIME_INSTALL_DIR      - the XDG mimetypes install dir from kdelibs
 #  KDE4_SYSCONF_INSTALL_DIR       - the directory where sysconfig files from kdelibs are installed
-#  KDE4_MAN_INSTALL_DIR           - the directory where man pages from kdelibs are installed
-#  KDE4_INFO_INSTALL_DIR          - the directory where info files from kdelibs are installed
 #  KDE4_SERVICES_INSTALL_DIR      - the directory where service (desktop, protocol, ...) files from kdelibs are installed
 #  KDE4_SERVICETYPES_INSTALL_DIR  - the directory where servicestypes desktop files from kdelibs are installed
 #  KDE4_DBUS_INTERFACES_DIR       - the directory where dbus interfaces from kdelibs are installed
@@ -44,33 +42,7 @@
 #  KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler executable
 #  KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
 #
-# The following variables point to the location of the KDE libraries,
-# but shouldn't be used directly:
-#
-#  KDE4_KDECORE_LIBRARY       - the kdecore library
-#  KDE4_KDEUI_LIBRARY         - the kdeui library
-#  KDE4_KIO_LIBRARY           - the kio library
-#  KDE4_KPARTS_LIBRARY        - the kparts library
-#  KDE4_KEMOTICONS_LIBRARY    - the kemoticons library
-#  KDE4_KIDLETIME_LIBRARY     - the kidletime library
-#  KDE4_KCMUTILS_LIBRARY      - the kcmutils library
-#  KDE4_KPRINTUTILS_LIBRARY   - the kprintutils library
-#  KDE4_KFILE_LIBRARY         - the kfile library
-#  KDE4_KDNSSD_LIBRARY        - the kdnssd library
-#  KDE4_THREADWEAVER_LIBRARY  - the threadweaver library
-#  KDE4_SOLID_LIBRARY         - the solid library
-#  KDE4_KNOTIFYCONFIG_LIBRARY - the knotifyconfig library
-#  KDE4_KROSSCORE_LIBRARY     - the krosscore library
-#  KDE4_KTEXTEDITOR_LIBRARY   - the ktexteditor library
-#  KDE4_PLASMA_LIBRARY        - the plasma library
-#  KDE4_KUNITCONVERSION_LIBRARY - the kunitconversion library
-#  KDE4_KDCRAW_LIBRARY        - the kdcraw library
-#  KDE4_KEXIV2_LIBRARY        - the kexiv2 library
-#  KDE4_KMEDIAPLAYER_LIBRARY  - the kmediaplayer library
-#
-# Compared to the variables above, the following variables
-# also contain all of the depending libraries, so the variables below
-# should be used instead of the ones above:
+# The following variables contain all of the depending libraries:
 #
 #  KDE4_KDECORE_LIBS          - the kdecore library and all depending libraries
 #  KDE4_KDEUI_LIBS            - the kdeui library and all depending libraries
@@ -144,30 +116,7 @@
 #   This macro takes care of generate the needed files, and install them in the right location. This boils down
 #   to a DBus policy to let the helper register on the system bus, and a service file for letting the helper
 #   being automatically activated by the system bus.
-#   *WARNING* You have to install the helper in ${LIBEXEC_INSTALL_DIR} to make sure everything will work.
-#
-#
-#
-#  A note on the possible values for CMAKE_BUILD_TYPE and how KDE handles
-#  the flags for those buildtypes. FindKDE4Internal supports the values
-#  Release, RelWithDebInfo and Debug:
-#
-#  Release
-#          optimised for speed, qDebug/kDebug turned off, no debug symbols, no asserts
-#  RelWithDebInfo (Release with debug info)
-#          similar to Release, optimised for speed, but with debugging symbols on (-g)
-#  Debug
-#          optimised but debuggable, debugging on (-g)
-#          (-fno-reorder-blocks -fno-schedule-insns -fno-inline)
-#  MinSizeRel:
-#          optimization for smallest size, no debugging information
-#
-#
-#  The default buildtype is RelWithDebInfo.
-#  It is expected that the "Debug" build type be still debuggable with gdb
-#  without going all over the place, but still produce better performance.
-#  It's also important to note that gcc cannot detect all warning conditions
-#  unless the optimiser is active.
+#   *WARNING* You have to install the helper in ${KDE4_LIBEXEC_INSTALL_DIR} to make sure everything will work.
 #
 #
 #  This module allows to depend on a particular minimum version of kdelibs.
@@ -325,15 +274,15 @@ else(_kdeBootStrapping)
     # KDE4_TARGET_PREFIX, which is set in KDELibsDependencies.cmake .
     # This export-file is generated and installed by the toplevel CMakeLists.txt of kdelibs.
     # Include it to "import" the libraries from kdelibs into the current projects as targets.
-    # This makes setting the _LIBRARY and _LIBS variables actually a bit superfluos, since e.g.
-    # the kdeui library could now also be used just as "KDE4::kdeui" and still have all their
-    # dependent libraries handled correctly. But to keep compatibility and not to change
-    # behaviour we set all these variables anyway as seen below. Alex
+    # This makes setting the _LIBS variables actually a bit superfluos, since e.g. the kdeui
+    # library could now also be used just as "KDE4::kdeui" and still have all their dependent
+    # libraries handled correctly. But to keep compatibility and not to change behaviour we
+    # set all these variables anyway as seen below. Alex
     include(${kde_cmake_module_dir}/KDELibs4LibraryTargets.cmake)
 endif(_kdeBootStrapping)
 
-# Set the various KDE4_FOO_LIBRARY/LIBS variables.
-# In bootstrapping mode KDE4_TARGET_PREFIX is empty, so e.g. KDE4_KDECORE_LIBRARY
+# Set the various KDE4_FOO_LIBS variables.
+# In bootstrapping mode KDE4_TARGET_PREFIX is empty, so e.g. KDE4_KDECORE_LIBS
 # will be simply set to "kdecore".
 set(_kde_libraries
     kmediaplayer
@@ -363,11 +312,9 @@ set(_kde_libraries
 foreach(_lib ${_kde_libraries})
     string(TOUPPER ${_lib} _upperlib)
     if(_kdeBootStrapping)
-        set(KDE4_${_upperlib}_LIBRARY ${_lib})
-        set(KDE4_${_upperlib}_LIBS    ${_lib})
+        set(KDE4_${_upperlib}_LIBS ${_lib})
     else()
-        set(KDE4_${_upperlib}_LIBRARY ${KDE4_TARGET_PREFIX}${_lib})
-        set(KDE4_${_upperlib}_LIBS    ${KDE4_TARGET_PREFIX}${_lib})
+        set(KDE4_${_upperlib}_LIBS ${KDE4_TARGET_PREFIX}${_lib})
     endif()
 endforeach()
 
@@ -379,58 +326,47 @@ endif()
 
 #####################  some more settings   ##########################################
 
-# FIXME: this should not be needed
-macro(_set_fancy variable value)
-    set(${variable} "${value}")
-    set(${variable} "${value}" CACHE PATH "KDE standard path variable")
-    set(KDE4_${variable} "${value}")
-    set(KDE4_${variable} "${value}" CACHE PATH "KDE standard path variable")
-endmacro()
-
 # if bootstrap set the variablse now, otherwise they will be set by KDE4Config
 if(_kdeBootStrapping)
     include(GNUInstallDirs)
 
-    _set_fancy(EXEC_INSTALL_PREFIX  "${CMAKE_INSTALL_PREFIX}")
-    _set_fancy(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_FULL_DATADIR}")
-    _set_fancy(BIN_INSTALL_DIR      "${CMAKE_INSTALL_FULL_BINDIR}")
-    _set_fancy(SBIN_INSTALL_DIR     "${CMAKE_INSTALL_FULL_SBINDIR}")
-    _set_fancy(LIB_INSTALL_DIR      "${CMAKE_INSTALL_FULL_LIBDIR}")
-    _set_fancy(LIBEXEC_INSTALL_DIR  "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kde4")
-    _set_fancy(INCLUDE_INSTALL_DIR  "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+    set(KDE4_EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH "KDE installation prefix")
+    set(KDE4_SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_FULL_DATADIR}" CACHE PATH "KDE shared data installation prefix")
+    set(KDE4_BIN_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "KDE binaries installation directory")
+    set(KDE4_SBIN_INSTALL_DIR "${CMAKE_INSTALL_FULL_SBINDIR}" CACHE PATH "KDE system binaries installation directory")
+    set(KDE4_LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "KDE libraries installation directory")
+    set(KDE4_LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kde4" CACHE PATH "KDE libraries executables installation directory")
+    set(KDE4_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}" CACHE PATH "KDE headers installation directory")
 
-    _set_fancy(PLUGIN_INSTALL_DIR       "${LIB_INSTALL_DIR}")
-    _set_fancy(IMPORTS_INSTALL_DIR      "${PLUGIN_INSTALL_DIR}/kde4/imports")
-    _set_fancy(CONFIG_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/config")
-    _set_fancy(DATA_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/apps")
-    _set_fancy(ICON_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/icons")
-    _set_fancy(KCFG_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/config.kcfg")
-    _set_fancy(LOCALE_INSTALL_DIR       "${CMAKE_INSTALL_FULL_LOCALEDIR}")
-    _set_fancy(MIME_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/mimelnk")
-    _set_fancy(SERVICES_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/kde4/services")
-    _set_fancy(SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/servicetypes")
-    _set_fancy(SOUND_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/sounds")
-    _set_fancy(TEMPLATES_INSTALL_DIR    "${SHARE_INSTALL_PREFIX}/templates")
-    _set_fancy(WALLPAPER_INSTALL_DIR    "${SHARE_INSTALL_PREFIX}/wallpapers")
-    _set_fancy(AUTOSTART_INSTALL_DIR    "${SHARE_INSTALL_PREFIX}/autostart")
+    set(KDE4_PLUGIN_INSTALL_DIR "${KDE4_LIB_INSTALL_DIR}" CACHE PATH "KDE plugins installation directory")
+    set(KDE4_IMPORTS_INSTALL_DIR "${KDE4_PLUGIN_INSTALL_DIR}/kde4/imports" CACHE PATH "KDE imports installation directory")
+    set(KDE4_CONFIG_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/config" CACHE PATH "KDE config installation directory")
+    set(KDE4_DATA_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/apps" CACHE PATH "KDE data installation directory")
+    set(KDE4_ICON_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/icons" CACHE PATH "KDE icon installation directory")
+    set(KDE4_KCFG_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/config.kcfg" CACHE PATH "KDE kcfg installation directory")
+    set(KDE4_LOCALE_INSTALL_DIR "${CMAKE_INSTALL_FULL_LOCALEDIR}" CACHE PATH "KDE locale installation directory")
+    set(KDE4_MIME_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/mimelnk" CACHE PATH "KDE mime installation directory")
+    set(KDE4_SERVICES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/kde4/services" CACHE PATH "KDE services installation directory")
+    set(KDE4_SERVICETYPES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/kde4/servicetypes" CACHE PATH "KDE service types installation directory")
+    set(KDE4_SOUND_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/sounds" CACHE PATH "KDE sounds installation directory")
+    set(KDE4_TEMPLATES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/templates" CACHE PATH "KDE templates installation directory")
+    set(KDE4_WALLPAPER_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/wallpapers" CACHE PATH "KDE wallpapers installation directory")
+    set(KDE4_AUTOSTART_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/autostart" CACHE PATH "KDE autostart installation directory")
 
-    _set_fancy(XDG_APPS_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/applications/kde4")
-    _set_fancy(XDG_DIRECTORY_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/desktop-directories")
-    _set_fancy(XDG_MIME_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/mime/packages")
+    set(KDE4_XDG_APPS_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/applications/kde4" CACHE PATH "KDE XDG applications installation directory")
+    set(KDE4_XDG_DIRECTORY_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/desktop-directories" CACHE PATH "KDE XDG directories installation directory")
+    set(KDE4_XDG_MIME_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/mime/packages" CACHE PATH "KDE XDG MIME packages installation directory")
 
-    _set_fancy(SYSCONF_INSTALL_DIR      "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
-    _set_fancy(MAN_INSTALL_DIR          "${CMAKE_INSTALL_FULL_MANDIR}")
-    _set_fancy(INFO_INSTALL_DIR         "${CMAKE_INSTALL_FULL_INFODIR}")
-    _set_fancy(DBUS_INTERFACES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/interfaces")
-    _set_fancy(DBUS_SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/services")
-    _set_fancy(DBUS_SYSTEM_SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/system-services")
+    set(KDE4_SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}" CACHE PATH "KDE system config installation directory")
+    set(KDE4_DBUS_INTERFACES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/dbus-1/interfaces" CACHE PATH "KDE dbus interfaces installation directory")
+    set(KDE4_DBUS_SERVICES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/dbus-1/services" CACHE PATH "KDE D-Bus services installation directory")
+    set(KDE4_DBUS_SYSTEM_SERVICES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/dbus-1/system-services" CACHE PATH "KDE D-Bus system services installation directory")
 
-    _set_fancy(KAUTH_HELPER_PLUGIN_DIR  "${PLUGIN_INSTALL_DIR}/kde4/plugins/kauth/helper")
-    _set_fancy(KAUTH_BACKEND_PLUGIN_DIR "${PLUGIN_INSTALL_DIR}/kde4/plugins/kauth/backend")
+    set(KDE4_KAUTH_HELPER_PLUGIN_DIR "${KDE4_PLUGIN_INSTALL_DIR}/kde4/plugins/kauth/helper" CACHE PATH "KDE authorization helper installation directory")
+    set(KDE4_KAUTH_BACKEND_PLUGIN_DIR "${KDE4_PLUGIN_INSTALL_DIR}/kde4/plugins/kauth/backend" CACHE PATH "KDE authorization backend installation directory")
 endif()
 
 # For more documentation see above.
-# Later on it will be possible to extend this for installing OSX frameworks
 # The COMPONENT Devel argument has the effect that static libraries belong to the
 # "Devel" install component. If we use this also for all install() commands
 # for header files, it will be possible to install
diff --git a/cmake/modules/FindKipi.cmake b/cmake/modules/FindKipi.cmake
index 12a6ff52..d7ab04e8 100644
--- a/cmake/modules/FindKipi.cmake
+++ b/cmake/modules/FindKipi.cmake
@@ -81,8 +81,8 @@ ELSE(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS AND KIPI_VERSION A
       PKG_CHECK_MODULES(PC_KIPI libkipi>=${Kipi_FIND_VERSION})
     ENDIF(NOT WIN32)
 
-    FIND_LIBRARY(KIPI_LIBRARIES NAMES kipi HINTS ${PC_KIPI_LIBRARY_DIRS} ${LIB_INSTALL_DIR} ${KDE4_LIB_DIR})
-    FIND_PATH(KIPI_INCLUDE_DIR NAMES libkipi/version.h HINTS ${PC_KIPI_INCLUDE_DIRS} ${INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_DIR})
+    FIND_LIBRARY(KIPI_LIBRARIES NAMES kipi HINTS ${PC_KIPI_LIBRARY_DIRS} ${KDE4_LIB_INSTALL_DIR} ${KDE4_LIB_DIR})
+    FIND_PATH(KIPI_INCLUDE_DIR NAMES libkipi/version.h HINTS ${PC_KIPI_INCLUDE_DIRS} ${KDE4_INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_DIR})
     SET(KIPI_VERSION_H_FILENAME "${KIPI_INCLUDE_DIR}/libkipi/version.h")
     SET(KIPI_DEFINITIONS ${PC_KIPI_CFLAGS} CACHE STRING "Kipi defintions")
 
diff --git a/cmake/modules/FindPolkitQt-1.cmake b/cmake/modules/FindPolkitQt-1.cmake
index 30d27de1..efa5eab4 100644
--- a/cmake/modules/FindPolkitQt-1.cmake
+++ b/cmake/modules/FindPolkitQt-1.cmake
@@ -23,7 +23,7 @@ if ( NOT PolkitQt-1_FIND_VERSION AND POLKITQT-1_MIN_VERSION )
 endif ( NOT PolkitQt-1_FIND_VERSION AND POLKITQT-1_MIN_VERSION )
 
 set( _PolkitQt-1_FIND_QUIETLY  ${PolkitQt-1_FIND_QUIETLY} )
-find_package( PolkitQt-1 ${PolkitQt-1_FIND_VERSION} QUIET NO_MODULE PATHS ${LIB_INSTALL_DIR}/PolkitQt-1/cmake )
+find_package( PolkitQt-1 ${PolkitQt-1_FIND_VERSION} QUIET NO_MODULE PATHS ${KDE4_LIB_INSTALL_DIR}/PolkitQt-1/cmake )
 set( PolkitQt-1_FIND_QUIETLY ${_PolkitQt-1_FIND_QUIETLY} )
 
 include( FindPackageHandleStandardArgs )
diff --git a/cmake/modules/FindSudo.cmake b/cmake/modules/FindSudo.cmake
index 5219ae6e..20d3f5ca 100644
--- a/cmake/modules/FindSudo.cmake
+++ b/cmake/modules/FindSudo.cmake
@@ -6,7 +6,7 @@
 #
 
 find_program(SUDO_EXECUTABLE NAMES sudo
-    HINTS ${BIN_INSTALL_DIR}
+    HINTS ${KDE4_BIN_INSTALL_DIR}
     DOC "sudo -- execute a command as another user"
 )
 
diff --git a/config-prefix.h.cmake b/config-prefix.h.cmake
index f88baddf..abc8f4f4 100644
--- a/config-prefix.h.cmake
+++ b/config-prefix.h.cmake
@@ -2,24 +2,23 @@
 
 #define KDEDIR "${CMAKE_INSTALL_PREFIX}"
 
-#define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}"
-#define DATA_INSTALL_DIR "${DATA_INSTALL_DIR}"
-#define LIB_INSTALL_DIR "${LIB_INSTALL_DIR}"
-#define INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}"
-#define BIN_INSTALL_DIR "${BIN_INSTALL_DIR}"
-#define CONFIG_INSTALL_DIR "${CONFIG_INSTALL_DIR}"
-#define MAN_INSTALL_DIR "${MAN_INSTALL_DIR}"
-#define ICON_INSTALL_DIR "${ICON_INSTALL_DIR}"
-#define KCFG_INSTALL_DIR "${KCFG_INSTALL_DIR}"
-#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}"
-#define MIME_INSTALL_DIR "${MIME_INSTALL_DIR}"
-#define SERVICES_INSTALL_DIR "${SERVICES_INSTALL_DIR}"
-#define SERVICETYPES_INSTALL_DIR "${SERVICETYPES_INSTALL_DIR}"
-#define SOUND_INSTALL_DIR "${SOUND_INSTALL_DIR}"
-#define TEMPLATES_INSTALL_DIR "${TEMPLATES_INSTALL_DIR}"
-#define WALLPAPER_INSTALL_DIR "${WALLPAPER_INSTALL_DIR}"
-#define XDG_APPS_INSTALL_DIR "${XDG_APPS_INSTALL_DIR}"
-#define XDG_DIRECTORY_INSTALL_DIR "${XDG_DIRECTORY_INSTALL_DIR}"
-#define EXEC_INSTALL_PREFIX "${EXEC_INSTALL_PREFIX}"
-#define SYSCONF_INSTALL_DIR "${SYSCONF_INSTALL_DIR}"
-#define LOCALE_INSTALL_DIR "${LOCALE_INSTALL_DIR}"
+#define LIBEXEC_INSTALL_DIR "${KDE4_LIBEXEC_INSTALL_DIR}"
+#define DATA_INSTALL_DIR "${KDE4_DATA_INSTALL_DIR}"
+#define LIB_INSTALL_DIR "${KDE4_LIB_INSTALL_DIR}"
+#define INCLUDE_INSTALL_DIR "${KDE4_INCLUDE_INSTALL_DIR}"
+#define BIN_INSTALL_DIR "${KDE4_BIN_INSTALL_DIR}"
+#define CONFIG_INSTALL_DIR "${KDE4_CONFIG_INSTALL_DIR}"
+#define ICON_INSTALL_DIR "${KDE4_ICON_INSTALL_DIR}"
+#define KCFG_INSTALL_DIR "${KDE4_KCFG_INSTALL_DIR}"
+#define PLUGIN_INSTALL_DIR "${KDE4_PLUGIN_INSTALL_DIR}"
+#define MIME_INSTALL_DIR "${KDE4_MIME_INSTALL_DIR}"
+#define SERVICES_INSTALL_DIR "${KDE4_SERVICES_INSTALL_DIR}"
+#define SERVICETYPES_INSTALL_DIR "${KDE4_SERVICETYPES_INSTALL_DIR}"
+#define SOUND_INSTALL_DIR "${KDE4_SOUND_INSTALL_DIR}"
+#define TEMPLATES_INSTALL_DIR "${KDE4_TEMPLATES_INSTALL_DIR}"
+#define WALLPAPER_INSTALL_DIR "${KDE4_WALLPAPER_INSTALL_DIR}"
+#define XDG_APPS_INSTALL_DIR "${KDE4_XDG_APPS_INSTALL_DIR}"
+#define XDG_DIRECTORY_INSTALL_DIR "${KDE4_XDG_DIRECTORY_INSTALL_DIR}"
+#define EXEC_INSTALL_PREFIX "${KDE4_EXEC_INSTALL_PREFIX}"
+#define SYSCONF_INSTALL_DIR "${KDE4_SYSCONF_INSTALL_DIR}"
+#define LOCALE_INSTALL_DIR "${KDE4_LOCALE_INSTALL_DIR}"
diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt
index 58195764..7370af6b 100644
--- a/dnssd/CMakeLists.txt
+++ b/dnssd/CMakeLists.txt
@@ -122,7 +122,7 @@ install(
     servicemodel.h
     domainmodel.h
     ${CMAKE_CURRENT_BINARY_DIR}/settings.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/dnssd
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/dnssd
     COMPONENT Devel
 )
 
diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
index 3fc8898f..e4ae9b39 100644
--- a/includes/CMakeLists.txt
+++ b/includes/CMakeLists.txt
@@ -413,7 +413,7 @@ install(
     KPty
     KPtyDevice
     KPtyProcess
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE
     COMPONENT Devel
 )
 
@@ -428,7 +428,7 @@ install(
     DNSSD/ServiceBrowser
     DNSSD/ServiceModel
     DNSSD/ServiceTypeBrowser
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/DNSSD
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/DNSSD
     COMPONENT Devel
 )
 
@@ -436,7 +436,7 @@ install(
     FILES
     KAccelGen/Deref
     KAccelGen/Deref_Key
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KAccelGen
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/KAccelGen
     COMPONENT Devel
 )
 
@@ -446,7 +446,7 @@ install( FILES
     KHE/ClipboardInterface
     KHE/ValueColumnInterface
     KHE/ZoomInterface
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KHE
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/KHE
     COMPONENT Devel
 )
 
@@ -490,7 +490,7 @@ install(
     KIO/TCPSlaveBase
     KIO/Task
     KIO/TransferJob
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KIO
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/KIO
     COMPONENT Devel
 )
 
@@ -520,7 +520,7 @@ install(
     KParts/StatusBarExtension
     KParts/TextExtension
     KParts/WindowArgs
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KParts
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/KParts
     COMPONENT Devel
 )
 
@@ -548,7 +548,7 @@ install(
     Kross/Script
     Kross/ScriptingPlugin
     Kross/WrapperInterface
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Kross
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/Kross
     COMPONENT Devel
 )
 
@@ -558,7 +558,7 @@ install(
     KSettings/Dialog
     KSettings/Dispatcher
     KSettings/PluginPage
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KSettings
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/KSettings
     COMPONENT Devel
 )
 
@@ -569,7 +569,7 @@ install(
 #    Sonnet/UnicodeData
 #    Sonnet/TextBreaks
 #    Sonnet/Spell
-#    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Sonnet
+#    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/Sonnet
 #    COMPONENT Devel
 #)
 
@@ -614,7 +614,7 @@ install(
     KTextEditor/TextHintInterface
     KTextEditor/VariableInterface
     KTextEditor/View
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KTextEditor
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/KTextEditor
     COMPONENT Devel
 )
 
@@ -622,7 +622,7 @@ install(
 install(
     FILES
     KWallet/Wallet
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KWallet
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/KWallet
     COMPONENT Devel
 )
 
@@ -652,7 +652,7 @@ install(
     Solid/StorageAccess
     Solid/StorageDrive
     Solid/StorageVolume
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Solid
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/Solid
     COMPONENT Devel
 )
 
@@ -664,7 +664,7 @@ install(
     Sonnet/Dialog
     Sonnet/DictionaryComboBox
     Sonnet/Highlighter
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Sonnet
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/Sonnet
     COMPONENT Devel
 )
 
@@ -674,7 +674,7 @@ install(
     KAuth/ActionReply
     KAuth/ActionWatcher
     KAuth/HelperSupport
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KAuth
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/KAuth
     COMPONENT Devel
 )
 
@@ -691,7 +691,7 @@ install(
     ThreadWeaver/Weaver
     ThreadWeaver/WeaverInterface
     ThreadWeaver/WeaverObserver
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/ThreadWeaver
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/ThreadWeaver
     COMPONENT Devel
 )
 
@@ -767,7 +767,7 @@ install(
     Plasma/Wallpaper
     Plasma/WallpaperScript
     Plasma/WindowEffects
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Plasma
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/Plasma
     COMPONENT Devel
 )
 
@@ -778,6 +778,6 @@ install(
     KUnitConversion/Unit
     KUnitConversion/UnitCategory
     KUnitConversion/Value
-    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KUnitConversion
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/KUnitConversion
     COMPONENT Devel
 )
diff --git a/interfaces/khexedit/CMakeLists.txt b/interfaces/khexedit/CMakeLists.txt
index ba41d354..8a4cc70e 100644
--- a/interfaces/khexedit/CMakeLists.txt
+++ b/interfaces/khexedit/CMakeLists.txt
@@ -7,11 +7,11 @@ install(
     charcolumninterface.h
     zoominterface.h
     clipboardinterface.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/khexedit
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/khexedit
 )
 
 install(
     FILES
     kbytesedit.desktop
-    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}
 )
diff --git a/interfaces/kimproxy/CMakeLists.txt b/interfaces/kimproxy/CMakeLists.txt
index 677e7655..7537348b 100644
--- a/interfaces/kimproxy/CMakeLists.txt
+++ b/interfaces/kimproxy/CMakeLists.txt
@@ -37,23 +37,23 @@ install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kimproxy_export.h
     kimproxy.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
     COMPONENT Devel
 )
 
 install(
     FILES
     dbusinstantmessenger.desktop
-    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}
 )
 install(
     FILES
     kcm_instantmessenger.desktop
-    DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcm_componentchooser
 )
 
 install(
     FILES
     org.kde.KIMIface.xml
-    DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
+    DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}
 )
diff --git a/interfaces/kimproxy/icons/CMakeLists.txt b/interfaces/kimproxy/icons/CMakeLists.txt
index 719071df..46032bec 100644
--- a/interfaces/kimproxy/icons/CMakeLists.txt
+++ b/interfaces/kimproxy/icons/CMakeLists.txt
@@ -1,4 +1,4 @@
 
 ########### install files ###############
 
-kde4_install_icons(${ICON_INSTALL_DIR})
+kde4_install_icons(${KDE4_ICON_INSTALL_DIR})
diff --git a/interfaces/kio/CMakeLists.txt b/interfaces/kio/CMakeLists.txt
index d55ca3c0..dedbe240 100644
--- a/interfaces/kio/CMakeLists.txt
+++ b/interfaces/kio/CMakeLists.txt
@@ -1,5 +1,5 @@
 install(
     FILES
     http.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/kio
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/kio
 )
diff --git a/interfaces/kregexpeditor/CMakeLists.txt b/interfaces/kregexpeditor/CMakeLists.txt
index 6a59c833..b02a449a 100644
--- a/interfaces/kregexpeditor/CMakeLists.txt
+++ b/interfaces/kregexpeditor/CMakeLists.txt
@@ -1,9 +1,9 @@
 install(
     FILES kregexpeditor.desktop
-    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}
 )
 
 install(
     FILES kregexpeditorinterface.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
 )
diff --git a/interfaces/kspeech/CMakeLists.txt b/interfaces/kspeech/CMakeLists.txt
index b394525d..de44d8a5 100644
--- a/interfaces/kspeech/CMakeLists.txt
+++ b/interfaces/kspeech/CMakeLists.txt
@@ -6,18 +6,18 @@ generate_export_header(kspeech)
 install(
     FILES
     dbustexttospeech.desktop
-    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}
 )
 
 install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kspeech_export.h
     kspeech.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
 )
 
 install(
     FILES
     org.kde.KSpeech.xml
-    DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
+    DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}
 )
diff --git a/interfaces/ktexteditor/CMakeLists.txt b/interfaces/ktexteditor/CMakeLists.txt
index ca745a87..66f36417 100644
--- a/interfaces/ktexteditor/CMakeLists.txt
+++ b/interfaces/ktexteditor/CMakeLists.txt
@@ -100,14 +100,14 @@ install(
     movingrangefeedback.h
     recoveryinterface.h
     messageinterface.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/ktexteditor
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/ktexteditor
     COMPONENT Devel
 )
 
 install(
     FILES
     kcm_ktexteditor.desktop
-    DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcm_componentchooser
 )
 
 install(
@@ -115,5 +115,5 @@ install(
     ktexteditor.desktop
     ktexteditorplugin.desktop
     ktexteditor_loadsavefiltercheckplugin.desktop
-    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}
 )
diff --git a/interfaces/terminal/CMakeLists.txt b/interfaces/terminal/CMakeLists.txt
index 4bbc41df..2d0a6f76 100644
--- a/interfaces/terminal/CMakeLists.txt
+++ b/interfaces/terminal/CMakeLists.txt
@@ -1,5 +1,5 @@
 install(
     FILES
     kde_terminal_interface.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
 )
diff --git a/kdcraw/CMakeLists.txt b/kdcraw/CMakeLists.txt
index fa4c2690..1b015f62 100644
--- a/kdcraw/CMakeLists.txt
+++ b/kdcraw/CMakeLists.txt
@@ -81,5 +81,5 @@ CONFIGURE_FILE(
 INSTALL(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc
-    DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
+    DESTINATION ${KDE4_LIB_INSTALL_DIR}/pkgconfig
 )
diff --git a/kdcraw/icons/CMakeLists.txt b/kdcraw/icons/CMakeLists.txt
index 58a2de19..1a620f37 100644
--- a/kdcraw/icons/CMakeLists.txt
+++ b/kdcraw/icons/CMakeLists.txt
@@ -22,4 +22,4 @@
 #
 # ============================================================
 
-kde4_install_icons(${ICON_INSTALL_DIR})
+kde4_install_icons(${KDE4_ICON_INSTALL_DIR})
diff --git a/kdcraw/libkdcraw.pc.cmake b/kdcraw/libkdcraw.pc.cmake
index a7a876c4..d126b1c6 100644
--- a/kdcraw/libkdcraw.pc.cmake
+++ b/kdcraw/libkdcraw.pc.cmake
@@ -1,12 +1,12 @@
 prefix=${CMAKE_INSTALL_PREFIX}
-exec_prefix=${BIN_INSTALL_DIR}
-libdir=${LIB_INSTALL_DIR}
-includedir=${INCLUDE_INSTALL_DIR}
+exec_prefix=${KDE4_LIBEXEC_INSTALL_DIR}
+libdir=${KDE4_LIB_INSTALL_DIR}
+includedir=${KDE4_INCLUDE_INSTALL_DIR}
 
 Name: libkdcraw
 Description: A C++ wrapper around LibRaw library to decode RAW pictures. This library is used by digiKam and kipi-plugins.
 URL: http://www.digikam.org/sharedlibs
 Requires:
 Version: ${DCRAW_LIB_VERSION_STRING}
-Libs: -L${LIB_INSTALL_DIR} -lkdcraw
-Cflags: -I${INCLUDE_INSTALL_DIR}
+Libs: -L${KDE4_LIB_INSTALL_DIR} -lkdcraw
+Cflags: -I${KDE4_INCLUDE_INSTALL_DIR}
diff --git a/kdcraw/libkdcraw/CMakeLists.txt b/kdcraw/libkdcraw/CMakeLists.txt
index 63018ac4..3ee4cb75 100644
--- a/kdcraw/libkdcraw/CMakeLists.txt
+++ b/kdcraw/libkdcraw/CMakeLists.txt
@@ -78,6 +78,6 @@ install(
     rawfiles.h
     ${CMAKE_CURRENT_BINARY_DIR}/kdcraw_export.h
     ${CMAKE_CURRENT_BINARY_DIR}/version.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/libkdcraw
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libkdcraw
     COMPONENT Devel
 )
diff --git a/kdcraw/profiles/CMakeLists.txt b/kdcraw/profiles/CMakeLists.txt
index bf0124e0..3bdddf32 100644
--- a/kdcraw/profiles/CMakeLists.txt
+++ b/kdcraw/profiles/CMakeLists.txt
@@ -27,5 +27,5 @@ FILE(GLOB icmfiles *.icm *.icc)
 INSTALL(
     FILES
     ${icmfiles}
-    DESTINATION ${DATA_INSTALL_DIR}/libkdcraw/profiles
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/libkdcraw/profiles
 )
diff --git a/kdeclarative/CMakeLists.txt b/kdeclarative/CMakeLists.txt
index 3345ba86..1f7ab6cd 100644
--- a/kdeclarative/CMakeLists.txt
+++ b/kdeclarative/CMakeLists.txt
@@ -54,7 +54,7 @@ install(
     FILES
     kdeclarative.h
     ${CMAKE_CURRENT_BINARY_DIR}/kdeclarative_export.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
     COMPONENT Devel
 )
 
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 06e50283..a61597a5 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -296,9 +296,9 @@ kde4_add_plugin(kauth_backend_plugin ${KAUTH_BACKEND_SRCS})
 target_link_libraries(kauth_backend_plugin ${KAUTH_BACKEND_LIBS})
 install(
     TARGETS kauth_backend_plugin
-    LIBRARY DESTINATION ${KAUTH_BACKEND_PLUGIN_DIR}
-    ARCHIVE DESTINATION ${KAUTH_BACKEND_PLUGIN_DIR}
-    RUNTIME DESTINATION ${KAUTH_BACKEND_PLUGIN_DIR}
+    LIBRARY DESTINATION ${KDE4_KAUTH_BACKEND_PLUGIN_DIR}
+    ARCHIVE DESTINATION ${KDE4_KAUTH_BACKEND_PLUGIN_DIR}
+    RUNTIME DESTINATION ${KDE4_KAUTH_BACKEND_PLUGIN_DIR}
 )
 
 ########### next target ###############
@@ -309,9 +309,9 @@ kde4_add_plugin(kauth_helper_plugin ${KAUTH_HELPER_BACKEND_SRCS} auth/HelperProx
 target_link_libraries(kauth_helper_plugin ${KAUTH_HELPER_BACKEND_LIBS})
 install(
     TARGETS kauth_helper_plugin
-    LIBRARY DESTINATION ${KAUTH_HELPER_PLUGIN_DIR}
-    ARCHIVE DESTINATION ${KAUTH_HELPER_PLUGIN_DIR}
-    RUNTIME DESTINATION ${KAUTH_HELPER_PLUGIN_DIR}
+    LIBRARY DESTINATION ${KDE4_KAUTH_HELPER_PLUGIN_DIR}
+    ARCHIVE DESTINATION ${KDE4_KAUTH_HELPER_PLUGIN_DIR}
+    RUNTIME DESTINATION ${KDE4_KAUTH_HELPER_PLUGIN_DIR}
 )
 
 ########### next target ###############
@@ -336,14 +336,14 @@ install(
     FILES
     localization/entry.desktop
     ${CMAKE_CURRENT_BINARY_DIR}/all_languages
-    DESTINATION ${LOCALE_INSTALL_DIR}
+    DESTINATION ${KDE4_LOCALE_INSTALL_DIR}
 )
 
 install(
     FILES
     kdebug.areas
     kdebugrc
-    DESTINATION ${CONFIG_INSTALL_DIR}
+    DESTINATION ${KDE4_CONFIG_INSTALL_DIR}
 )
 
 install(
@@ -434,7 +434,7 @@ install(
     util/kuser.h
     util/qtest_kde.h
     ${CMAKE_CURRENT_BINARY_DIR}/kdeversion.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
     COMPONENT Devel
 )
 
@@ -443,13 +443,13 @@ install(
     sonnet/backgroundchecker.h
     sonnet/speller.h
     sonnet/globals.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/sonnet
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/sonnet
     COMPONENT Devel
 )
 
 install(
     FILES
     services/kplugininfo.desktop
-    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}
 )
 
diff --git a/kdecore/auth/BackendsConfig.h.cmake b/kdecore/auth/BackendsConfig.h.cmake
index 67c97892..886f5d95 100644
--- a/kdecore/auth/BackendsConfig.h.cmake
+++ b/kdecore/auth/BackendsConfig.h.cmake
@@ -1,5 +1,5 @@
 #cmakedefine KAUTH_COMPILING_DBUS_BACKEND 1
 #cmakedefine KAUTH_COMPILING_DBUS_HELPER_BACKEND 1
-#define KAUTH_BACKEND_PLUGIN_DIR "${KAUTH_BACKEND_PLUGIN_DIR}"
-#define KAUTH_HELPER_PLUGIN_DIR "${KAUTH_HELPER_PLUGIN_DIR}"
+#define KAUTH_BACKEND_PLUGIN_DIR "${KDE4_KAUTH_BACKEND_PLUGIN_DIR}"
+#define KAUTH_HELPER_PLUGIN_DIR "${KDE4_KAUTH_HELPER_PLUGIN_DIR}"
 #define KAUTH_OTHER_PLUGIN_DIR "${KAUTH_OTHER_PLUGIN_DIR}"
diff --git a/kdecore/auth/ConfigureChecks.cmake b/kdecore/auth/ConfigureChecks.cmake
index 16687c2a..53e700c2 100644
--- a/kdecore/auth/ConfigureChecks.cmake
+++ b/kdecore/auth/ConfigureChecks.cmake
@@ -31,14 +31,14 @@ if(KAUTH_BACKEND STREQUAL "DBus")
     install(
         FILES
         auth/backends/dbus/org.kde.auth.conf
-        DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d
+        DESTINATION ${KDE4_SYSCONF_INSTALL_DIR}/dbus-1/system.d
     )
 
     install(
         FILES
         auth/backends/dbus/dbus_policy.stub
         auth/backends/dbus/dbus_service.stub
-        DESTINATION ${DATA_INSTALL_DIR}/kauth
+        DESTINATION ${KDE4_DATA_INSTALL_DIR}/kauth
         COMPONENT Devel
     )
 endif()
diff --git a/kdecore/auth/kauthactionreply.h b/kdecore/auth/kauthactionreply.h
index d6b995d1..87824a68 100644
--- a/kdecore/auth/kauthactionreply.h
+++ b/kdecore/auth/kauthactionreply.h
@@ -154,12 +154,12 @@
  @code
  kde4_add_executable(<helper_target> your sources...)
  target_link_libraries(<helper_target> your libraries...)
- install(TARGETS <helper_target> DESTINATION ${LIBEXEC_INSTALL_DIR})
+ install(TARGETS <helper_target> DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR})
 
  kde4_install_auth_helper_files(<helper_target> <helper_id> <user>)
  @endcode
 
- The first argument is the cmake target name for the helper executable, which you have to build and install separately. Make sure to INSTALL THE HELPER IN ${LIBEXEC_INSTALL_DIR},
+ The first argument is the cmake target name for the helper executable, which you have to build and install separately. Make sure to INSTALL THE HELPER IN ${KDE4_LIBEXEC_INSTALL_DIR},
  otherwise kde4_install_auth_helper_files will not work. The second argument is the
  helper id. Please be sure to don't misspell it, and to not quote it. The user parameter is the user that the helper has to be run as. It usually is root, but some actions could require less strict
  permissions, so you should use the right user where possible (for example the user apache if you have to mess with apache settings). Note that the target created by this macro already links to
diff --git a/kdecore/kernel/kstandarddirs_unix.cpp b/kdecore/kernel/kstandarddirs_unix.cpp
index 372b913e..137b4e62 100644
--- a/kdecore/kernel/kstandarddirs_unix.cpp
+++ b/kdecore/kernel/kstandarddirs_unix.cpp
@@ -69,8 +69,6 @@ QString KStandardDirs::installPath(const char *type)
                 return QFile::decodeName(PLUGIN_INSTALL_DIR "/");
             if (strcmp("mime", type) == 0)
                 return QFile::decodeName(MIME_INSTALL_DIR "/");
-            if (strcmp("man", type) == 0)
-                return QFile::decodeName(MAN_INSTALL_DIR "/");
             break;
         case 'q':
             if (strcmp("qtplugins", type) == 0)
diff --git a/kdecore/network/kssld/CMakeLists.txt b/kdecore/network/kssld/CMakeLists.txt
index 9835bf2f..710d1501 100644
--- a/kdecore/network/kssld/CMakeLists.txt
+++ b/kdecore/network/kssld/CMakeLists.txt
@@ -7,12 +7,12 @@ target_link_libraries(kded_kssld
 
 install(
     TARGETS kded_kssld
-    DESTINATION ${PLUGIN_INSTALL_DIR}
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 )
 
 install(
     FILES kssld.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}/kded
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded
 )
 
 
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 469fef6f..f6b86420 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -34,7 +34,7 @@ install(TARGETS kded4 ${INSTALL_TARGETS_DEFAULT_ARGS})
 qt4_generate_dbus_interface(kdedadaptor.h org.kde.kded.xml)
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kded.xml
-    DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
+    DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}
 )
 
 ########### next target ###############
@@ -70,13 +70,13 @@ install(TARGETS kbuildsycoca4 ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(
     FILES applications.menu
-    DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus
+    DESTINATION ${KDE4_SYSCONF_INSTALL_DIR}/xdg/menus
 )
 
 install(
     FILES
     kdedmodule.desktop
-    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}
 )
 
 
diff --git a/kded/HOWTO b/kded/HOWTO
index ee7aeaa7..858de5bd 100644
--- a/kded/HOWTO
+++ b/kded/HOWTO
@@ -45,4 +45,4 @@ Further it should contain:
 Which means that kded_foo.so is the name of the library that contains
 the module. Note that the name of the library always starts with kded_.
 
-The .desktop file should be installed to ${SERVICES_INSTALL_DIR}/kded
+The .desktop file should be installed to ${KDE4_SERVICES_INSTALL_DIR}/kded
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index 3554ada0..e241a4fa 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -330,7 +330,7 @@ endif()
 set(kwallet_xml util/org.kde.KWallet.xml)
 install(
     FILES ${kwallet_xml}
-    DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
+    DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}
 )
 
 qt4_add_dbus_interface(kdeui_LIB_SRCS ${kwallet_xml} kwallet_interface )
@@ -354,12 +354,12 @@ qt4_add_dbus_interface(kdeui_LIB_SRCS
 set(kglobalaccel_xml shortcuts/org.kde.KGlobalAccel.xml)
 set_source_files_properties(${kglobalaccel_xml} PROPERTIES INCLUDE "kglobalshortcutinfo_p.h")
 qt4_add_dbus_interface(kdeui_LIB_SRCS ${kglobalaccel_xml} kglobalaccel_interface )
-install(FILES ${kglobalaccel_xml} DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
+install(FILES ${kglobalaccel_xml} DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR})
 
 set(kglobalaccel_component_xml shortcuts/org.kde.kglobalaccel.Component.xml)
 set_source_files_properties(${kglobalaccel_component_xml} PROPERTIES INCLUDE "kglobalshortcutinfo_p.h")
 qt4_add_dbus_interface(kdeui_LIB_SRCS ${kglobalaccel_component_xml} kglobalaccel_component_interface )
-install(FILES ${kglobalaccel_component_xml} DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
+install(FILES ${kglobalaccel_component_xml} DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR})
 
 set(knotify_xml notifications/org.kde.KNotify.xml)
 qt4_add_dbus_interface(kdeui_LIB_SRCS ${knotify_xml} knotify_interface)
@@ -415,14 +415,14 @@ install(
     dialogs/kdeprint_nupother.png
     dialogs/ktip-bulb.png
     dialogs/thumb_frame.png
-    DESTINATION ${DATA_INSTALL_DIR}/kdeui/pics
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/kdeui/pics
 )
 
 install(
     FILES
     xmlgui/ui_standards.rc
     DESTINATION
-    ${CONFIG_INSTALL_DIR}/ui
+    ${KDE4_CONFIG_INSTALL_DIR}/ui
 )
 
 install(
@@ -621,7 +621,7 @@ install(
     xmlgui/kxmlguifactory.h
     util/fixx11h.h
     util/kkeyserver_x11.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
     COMPONENT Devel
 )
 
@@ -630,7 +630,7 @@ install(
     FILES
     widgets/kratingpainter.h
     widgets/kratingwidget.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/nepomuk
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/nepomuk
     COMPONENT Devel
 )
 
@@ -641,13 +641,13 @@ install(
     sonnet/configdialog.h
     sonnet/configwidget.h
     sonnet/dictionarycombobox.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/sonnet
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/sonnet
     COMPONENT Devel
 )
 
 install(
     PROGRAMS preparetips
-    DESTINATION ${BIN_INSTALL_DIR}
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
 )
 
 install(
@@ -657,7 +657,7 @@ install(
     colors/Web.colors
     colors/Royal.colors
     colors/Rainbow.colors
-    DESTINATION ${CONFIG_INSTALL_DIR}/colors
+    DESTINATION ${KDE4_CONFIG_INSTALL_DIR}/colors
 )
 
 install(
@@ -667,7 +667,7 @@ install(
     jobs/org.kde.JobViewV2.xml
     notifications/org.kde.StatusNotifierItem.xml
     notifications/org.kde.StatusNotifierWatcher.xml
-    DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
+    DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}
 )
 
 if(NOT Q_WS_X11)
@@ -675,7 +675,7 @@ if(NOT Q_WS_X11)
     install(
         FILES
         colors/rgb.txt
-        DESTINATION ${DATA_INSTALL_DIR}/kdeui
+        DESTINATION ${KDE4_DATA_INSTALL_DIR}/kdeui
     )
 endif()
 
@@ -706,5 +706,5 @@ install(
     about/box-center.png
     about/kde_infopage.css
     about/kde_infopage_rtl.css
-    DESTINATION ${DATA_INSTALL_DIR}/kdeui/about
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/kdeui/about
 )
diff --git a/kdeui/notifications/knotification.h b/kdeui/notifications/knotification.h
index 8e897c88..26ba1438 100644
--- a/kdeui/notifications/knotification.h
+++ b/kdeui/notifications/knotification.h
@@ -70,7 +70,7 @@
  *  <em>$KDEDIR/share/apps/appname/appname.notifyrc</em>
  *
  * You can do this with the following CMake command:
- * install( FILES appname.notifyrc  DESTINATION ${DATA_INSTALL_DIR}/appname))
+ * install( FILES appname.notifyrc  DESTINATION ${KDE4_DATA_INSTALL_DIR}/appname))
  *
  *  This file contains  mainly 3 parts
  *   <ol><li>\ref global "Global information"</li>
diff --git a/kdeui/tests/krichtexteditor/CMakeLists.txt b/kdeui/tests/krichtexteditor/CMakeLists.txt
index ad4c23e0..cb68bf16 100644
--- a/kdeui/tests/krichtexteditor/CMakeLists.txt
+++ b/kdeui/tests/krichtexteditor/CMakeLists.txt
@@ -14,8 +14,8 @@ set(krichtexteditorSources
 add_executable(krichtexteditor ${krichtexteditorSources})
 target_link_libraries(krichtexteditor ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
 
-install(TARGETS krichtexteditor DESTINATION ${BIN_INSTALL_DIR})
-install(FILES krichtexteditorui.rc DESTINATION ${DATA_INSTALL_DIR}/krichtexteditor)
+install(TARGETS krichtexteditor DESTINATION ${KDE4_BIN_INSTALL_DIR})
+install(FILES krichtexteditorui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/krichtexteditor)
 
 
 
diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt
index fb53aeb2..ee83cbf3 100644
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
@@ -38,7 +38,7 @@ if(QT_QTDESIGNER_FOUND)
 
     install(
         TARGETS kdewidgets
-        DESTINATION ${PLUGIN_INSTALL_DIR}/kde4/plugins/designer
+        DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}/kde4/plugins/designer
     )
 endif(QT_QTDESIGNER_FOUND)
 
diff --git a/kdewidgets/pics/CMakeLists.txt b/kdewidgets/pics/CMakeLists.txt
index e6f88456..dc394955 100644
--- a/kdewidgets/pics/CMakeLists.txt
+++ b/kdewidgets/pics/CMakeLists.txt
@@ -39,5 +39,5 @@ install(
     kactionselector.png
     kdatetable.png
     kdatetimewidget.png
-    DESTINATION ${DATA_INSTALL_DIR}/kdewidgets/pics
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/kdewidgets/pics
 )
diff --git a/kexiv2/CMakeLists.txt b/kexiv2/CMakeLists.txt
index b2f89e02..5392d31e 100644
--- a/kexiv2/CMakeLists.txt
+++ b/kexiv2/CMakeLists.txt
@@ -68,6 +68,6 @@ configure_file(
 
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2.pc
-    DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
+    DESTINATION ${KDE4_LIB_INSTALL_DIR}/pkgconfig
 )
 
diff --git a/kexiv2/libkexiv2.pc.cmake b/kexiv2/libkexiv2.pc.cmake
index d1581344..82a383fd 100644
--- a/kexiv2/libkexiv2.pc.cmake
+++ b/kexiv2/libkexiv2.pc.cmake
@@ -1,12 +1,12 @@
 prefix=${CMAKE_INSTALL_PREFIX}
-exec_prefix=${BIN_INSTALL_DIR}
-libdir=${LIB_INSTALL_DIR}
-includedir=${INCLUDE_INSTALL_DIR}
+exec_prefix=${KDE4_LIBEXEC_INSTALL_DIR}
+libdir=${KDE4_LIB_INSTALL_DIR}
+includedir=${KDE4_INCLUDE_INSTALL_DIR}
 
 Name: libkexiv2
 Description: A C++ library to manipulate EXIF/IPTC/XMP metadata using Exiv2 library. This library is used by digiKam and kipi-plugins.
 URL: http://www.digikam.org
 Requires:
 Version: ${KEXIV2_LIB_VERSION_STRING}
-Libs: -L${LIB_INSTALL_DIR} -lkexiv2
-Cflags: -I${INCLUDE_INSTALL_DIR}
+Libs: -L${KDE4_LIB_INSTALL_DIR} -lkexiv2
+Cflags: -I${KDE4_INCLUDE_INSTALL_DIR}
diff --git a/kexiv2/libkexiv2/CMakeLists.txt b/kexiv2/libkexiv2/CMakeLists.txt
index 132e2d14..6affdceb 100644
--- a/kexiv2/libkexiv2/CMakeLists.txt
+++ b/kexiv2/libkexiv2/CMakeLists.txt
@@ -78,7 +78,7 @@ install(
 install(
     FILES
     topicset.iptc-subjectcode.xml
-    DESTINATION ${DATA_INSTALL_DIR}/libkexiv2/data
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/libkexiv2/data
 )
 
 generate_export_header(kexiv2)
@@ -95,6 +95,6 @@ install(
     rotationmatrix.h
     ${CMAKE_CURRENT_BINARY_DIR}/kexiv2_export.h
     ${CMAKE_CURRENT_BINARY_DIR}/version.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/libkexiv2
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libkexiv2
     COMPONENT Devel
 )
diff --git a/kfile/CMakeLists.txt b/kfile/CMakeLists.txt
index edae9604..f0da070d 100644
--- a/kfile/CMakeLists.txt
+++ b/kfile/CMakeLists.txt
@@ -76,7 +76,7 @@ install(
     knewfilemenu.h
     knameandurlinputdialog.h
     ${CMAKE_CURRENT_BINARY_DIR}/kfile_export.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
     COMPONENT Devel
 )
 
@@ -91,10 +91,10 @@ target_link_libraries(kfilemodule
 
 install(
     TARGETS kfilemodule
-    DESTINATION ${PLUGIN_INSTALL_DIR}
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 )
 
 install(
     FILES kfilemodule.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
diff --git a/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt
index 17b08f5f..5ee890da 100644
--- a/kimgio/CMakeLists.txt
+++ b/kimgio/CMakeLists.txt
@@ -36,12 +36,12 @@ if(JASPER_FOUND)
 
     install(
         TARGETS kimg_jp2
-        DESTINATION ${PLUGIN_INSTALL_DIR}/kde4/plugins/imageformats
+        DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}/kde4/plugins/imageformats
     )
     install(
         FILES
         jp2.desktop
-        DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins
+        DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/qimageioplugins
     )
 endif(JASPER_FOUND)
 
@@ -61,11 +61,11 @@ if(OPENEXR_FOUND)
 
     install(
         TARGETS kimg_exr
-        DESTINATION ${PLUGIN_INSTALL_DIR}/kde4/plugins/imageformats
+        DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}/kde4/plugins/imageformats
     )
     install(
         FILES exr.desktop
-        DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins
+        DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/qimageioplugins
     )
 endif(OPENEXR_FOUND)
 
@@ -82,17 +82,17 @@ if(WEBP_FOUND)
 
     install(
         TARGETS kimg_webp
-        DESTINATION ${PLUGIN_INSTALL_DIR}/kde4/plugins/imageformats
+        DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}/kde4/plugins/imageformats
     )
     install(
         FILES
         webp.desktop
         x-webp.desktop
-        DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins
+        DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/qimageioplugins
     )
 
-    install(FILES webp.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
-    update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
+    install(FILES webp.xml DESTINATION ${KDE4_XDG_MIME_INSTALL_DIR})
+    update_xdg_mimetypes(${KDE4_XDG_MIME_INSTALL_DIR})
 endif(WEBP_FOUND)
 
 ##################################
@@ -116,7 +116,7 @@ foreach(plugin ${imgioplugins})
     )
     install(
         TARGETS kimg_${plugin}
-        DESTINATION ${PLUGIN_INSTALL_DIR}/kde4/plugins/imageformats
+        DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}/kde4/plugins/imageformats
     )
 endforeach()
 
@@ -137,7 +137,7 @@ target_link_libraries(kimg_pic
 
 install(
     TARGETS kimg_pic
-    DESTINATION ${PLUGIN_INSTALL_DIR}/kde4/plugins/imageformats
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}/kde4/plugins/imageformats
 )
 
 ########### install files ###############
@@ -154,12 +154,12 @@ install(
     psd.desktop
     hdr.desktop
     pic.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/qimageioplugins
 )
 
 install(
     FILES qimageio_plugin.desktop
-    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}
 )
 
 
diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt
index c17b1cbd..9e19ee6d 100644
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
 
 if (NOT Q_WS_X11 AND NOT Q_WS_QWS)
     add_definitions(-DNO_DISPLAY)
-endif (NOT Q_WS_X11 AND NOT Q_WS_QWS)
+endif()
 
 ########### kdeinit4 ###############
 
@@ -43,7 +43,7 @@ add_executable(kdeinit4 ${kdeinit_SRCS})
 target_link_libraries(kdeinit4 ${KDE4_KDEUI_LIBS} ${KINIT_SOCKET_LIBRARY})
 if (Q_WS_X11)
     target_link_libraries(kdeinit4 ${X11_X11_LIB})
-endif(Q_WS_X11)
+endif()
 
 install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS})
 
@@ -85,7 +85,7 @@ add_executable(lnusertemp lnusertemp.c)
 
 target_link_libraries(lnusertemp ${KDE4_KDECORE_LIBS})
 
-install(TARGETS lnusertemp DESTINATION ${LIBEXEC_INSTALL_DIR})
+install(TARGETS lnusertemp DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR})
 
 
 ########### kioslave ###############
@@ -94,7 +94,7 @@ add_executable(kioslave kioslave.cpp)
 
 target_link_libraries(kioslave ${QT_QTCORE_LIBRARY})
 
-install(TARGETS kioslave DESTINATION ${LIBEXEC_INSTALL_DIR})
+install(TARGETS kioslave DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR})
 
 
 ########### klauncher ###############
@@ -115,14 +115,14 @@ add_executable(klauncher ${klauncher_SRCS})
 
 target_link_libraries(klauncher ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
 
-install(TARGETS klauncher DESTINATION ${LIBEXEC_INSTALL_DIR})
+install(TARGETS klauncher DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR})
 
 ########### install files ###############
 
 install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml
-    DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
+    DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}
 )
 
 ########### config-kdeinit.h ############
diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index b1a9fb99..69bd834c 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -252,7 +252,7 @@ install(
 install(
     FILES
     data.protocol
-    DESTINATION ${SERVICES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
 
 install(
@@ -269,7 +269,7 @@ install(
     kio/kfilewrite.desktop
     kio/kfileitemactionplugin.desktop
     kfile/kiofilemodule.desktop
-    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}
 )
 
 generate_export_header(kio)
@@ -312,7 +312,7 @@ install(
     kio/skipdialog.h
     kio/udsentry.h
     kssl/sslui.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/kio
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/kio
     COMPONENT Devel
 )
 
@@ -380,7 +380,7 @@ install(
     bookmarks/kbookmarkdombuilder.h
     bookmarks/konqbookmarkmenu.h
     bookmarks/kbookmarkdialog.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
     COMPONENT Devel
 )
 
@@ -389,12 +389,12 @@ install(
     kio/org.kde.KDirNotify.xml
     kio/org.kde.kio.FileUndoManager.xml
     kio/org.kde.KPasswdServer.xml
-    DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
+    DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}
 )
 
 
 install(
     FILES
     kio/accept-languages.codes
-    DESTINATION ${CONFIG_INSTALL_DIR}
+    DESTINATION ${KDE4_CONFIG_INSTALL_DIR}
 )
diff --git a/kio/kio/kabstractfileitemactionplugin.h b/kio/kio/kabstractfileitemactionplugin.h
index 421b6732..f65fefad 100644
--- a/kio/kio/kabstractfileitemactionplugin.h
+++ b/kio/kio/kabstractfileitemactionplugin.h
@@ -70,8 +70,8 @@ class KFileItemListProperties;
  * \code
  * kde4_add_plugin(myactionplugin myactionplugin.cpp)
  * target_link_libraries(myactionplugin ${KDE4_KIO_LIBS})
- * install(TARGETS myactionplugin DESTINATION ${PLUGIN_INSTALL_DIR})
- * install(FILES myactionplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+ * install(TARGETS myactionplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
+ * install(FILES myactionplugin.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
  * \endcode
  *
  * @author Sebastian Trueg <trueg@kde.org>
diff --git a/kio/kio/thumbcreator.h b/kio/kio/thumbcreator.h
index ba3eebc3..88f72e30 100644
--- a/kio/kio/thumbcreator.h
+++ b/kio/kio/thumbcreator.h
@@ -64,8 +64,8 @@
  * kde4_add_plugin(filetypethumbnail ${filetypethumbnail_SRCS})
  * target_link_libraries(filetypethumbnail ${KDE4_KIO_LIBS})
  *
- * install(TARGETS filetypethumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
- * install(FILES filetypethumbcreator.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+ * install(TARGETS filetypethumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
+ * install(FILES filetypethumbcreator.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
  *
  * \endcode
  *
diff --git a/kio/kssl/kcm/CMakeLists.txt b/kio/kssl/kcm/CMakeLists.txt
index a8d4fd7b..c81f1f23 100644
--- a/kio/kssl/kcm/CMakeLists.txt
+++ b/kio/kssl/kcm/CMakeLists.txt
@@ -11,10 +11,10 @@ target_link_libraries(kcm_ssl ${KDE4_KIO_LIBS})
 
 ########### install files ###############
 
-install(TARGETS kcm_ssl DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kcm_ssl DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
 install(
     FILES
     kcm_ssl.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
diff --git a/kio/misc/CMakeLists.txt b/kio/misc/CMakeLists.txt
index ec7b8b0b..54cd02a1 100644
--- a/kio/misc/CMakeLists.txt
+++ b/kio/misc/CMakeLists.txt
@@ -18,7 +18,7 @@ install(
 )
 install(
     PROGRAMS kmailservice.desktop
-    DESTINATION ${XDG_APPS_INSTALL_DIR}
+    DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}
 )
 
 ########### next target ###############
@@ -33,7 +33,7 @@ install(
 )
 install(
     PROGRAMS ktelnetservice.desktop
-    DESTINATION ${XDG_APPS_INSTALL_DIR}
+    DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}
 )
 
 ########### install files ###############
@@ -47,22 +47,22 @@ install(
     pnm.protocol
     rtspt.protocol
     rtspu.protocol
-    DESTINATION ${SERVICES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
 
 install(
     PROGRAMS fileshareset
-    DESTINATION ${LIBEXEC_INSTALL_DIR}
+    DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}
 )
 
 install(CODE "
-    set(FILESHARESET_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/fileshareset\")
+    set(FILESHARESET_PATH \"\$ENV{DESTDIR}${KDE4_LIBEXEC_INSTALL_DIR}/fileshareset\")
     EXECUTE_PROCESS(COMMAND sh -c \"chown 0 '\${FILESHARESET_PATH}' && chmod u+s '\${FILESHARESET_PATH}'\")
 ")
 
 # write a cmake script file which creates the symlink
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake
-    "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${LIBEXEC_INSTALL_DIR}/fileshareset \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/filesharelist\")\n"
+    "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${KDE4_LIBEXEC_INSTALL_DIR}/fileshareset \"\$ENV{DESTDIR}${KDE4_LIBEXEC_INSTALL_DIR}/filesharelist\")\n"
 )
 # and add it as post-install script for fileshareset
 set_target_properties(ktelnetservice PROPERTIES
diff --git a/kio/misc/kntlm/CMakeLists.txt b/kio/misc/kntlm/CMakeLists.txt
index a1d243b3..afc7fd9b 100644
--- a/kio/misc/kntlm/CMakeLists.txt
+++ b/kio/misc/kntlm/CMakeLists.txt
@@ -21,7 +21,7 @@ install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kntlm_export.h
     kntlm.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/kio
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/kio
     COMPONENT Devel
 )
 
diff --git a/kio/misc/kpac/CMakeLists.txt b/kio/misc/kpac/CMakeLists.txt
index 9d5b3a80..b75bdb3a 100644
--- a/kio/misc/kpac/CMakeLists.txt
+++ b/kio/misc/kpac/CMakeLists.txt
@@ -44,7 +44,7 @@ endif()
 
 install(
     TARGETS kded_proxyscout
-    DESTINATION ${PLUGIN_INSTALL_DIR}
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 )
 
 ########### next target ###############
@@ -62,7 +62,7 @@ endif()
 
 install(
     TARGETS kpac_dhcp_helper
-    DESTINATION ${LIBEXEC_INSTALL_DIR}
+    DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}
 )
 
 ########### install files ###############
@@ -70,11 +70,11 @@ install(
 install(
     FILES
     proxyscout.notifyrc
-    DESTINATION ${DATA_INSTALL_DIR}/proxyscout
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/proxyscout
 )
 install(
     FILES
     proxyscout.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}/kded
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded
 )
 
diff --git a/kioslave/file/CMakeLists.txt b/kioslave/file/CMakeLists.txt
index d4db1281..f5fb26d8 100644
--- a/kioslave/file/CMakeLists.txt
+++ b/kioslave/file/CMakeLists.txt
@@ -24,11 +24,11 @@ if(ACL_FOUND)
     target_link_libraries(kio_file ${ACL_LIBS})
 endif()
 
-install(TARGETS kio_file DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kio_file DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
 
 ########### install files ###############
 
-install(FILES file.protocol DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES file.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
 
 generate_export_header(kio_file)
diff --git a/kioslave/ftp/CMakeLists.txt b/kioslave/ftp/CMakeLists.txt
index a7745ff6..3cf3d538 100644
--- a/kioslave/ftp/CMakeLists.txt
+++ b/kioslave/ftp/CMakeLists.txt
@@ -8,8 +8,8 @@ kde4_add_plugin(kio_ftp ftp.cpp)
 
 target_link_libraries(kio_ftp ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
 
-install(TARGETS kio_ftp DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kio_ftp DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
 ########### install files ###############
 
-install(FILES ftp.protocol DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES ftp.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/kioslave/http/CMakeLists.txt b/kioslave/http/CMakeLists.txt
index b1b5518e..55e36272 100644
--- a/kioslave/http/CMakeLists.txt
+++ b/kioslave/http/CMakeLists.txt
@@ -50,7 +50,7 @@ target_link_libraries(kio_http_cache_cleaner
     ${ZLIB_LIBRARY}
 )
 
-install(TARGETS kio_http_cache_cleaner DESTINATION ${LIBEXEC_INSTALL_DIR})
+install(TARGETS kio_http_cache_cleaner DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR})
 
 ########### next target ###############
 
@@ -73,7 +73,7 @@ if(GSSAPI_FOUND)
     target_link_libraries(kio_http ${GSSAPI_LIBS})
 endif()
 
-install(TARGETS kio_http DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kio_http DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
 ########### install files ###############
 
@@ -84,5 +84,5 @@ install(
     https.protocol
     webdav.protocol
     webdavs.protocol
-    DESTINATION ${SERVICES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
diff --git a/kioslave/http/kcookiejar/CMakeLists.txt b/kioslave/http/kcookiejar/CMakeLists.txt
index dbd8a052..6ed8bedc 100644
--- a/kioslave/http/kcookiejar/CMakeLists.txt
+++ b/kioslave/http/kcookiejar/CMakeLists.txt
@@ -42,24 +42,24 @@ kde4_add_plugin(kded_kcookiejar ${kded_kcookiejar_SRCS})
 
 target_link_libraries(kded_kcookiejar ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
 
-install(TARGETS kded_kcookiejar DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kded_kcookiejar DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
 
 ########### install files ###############
 
 install(
     FILES domain_info
-    DESTINATION ${DATA_INSTALL_DIR}/kwebkitpart
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwebkitpart
 )
 install(
     FILES
     kcookiejar.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}/kded
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded
 )
 install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KCookieServer.xml
-    DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
+    DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}
 )
 
 
diff --git a/kioslave/metainfo/CMakeLists.txt b/kioslave/metainfo/CMakeLists.txt
index e33a4520..bdd69387 100644
--- a/kioslave/metainfo/CMakeLists.txt
+++ b/kioslave/metainfo/CMakeLists.txt
@@ -8,8 +8,8 @@ kde4_add_plugin(kio_metainfo metainfo.cpp)
 
 target_link_libraries(kio_metainfo ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
 
-install(TARGETS kio_metainfo DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kio_metainfo DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
 ########### install files ###############
 
-install(FILES metainfo.protocol DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES metainfo.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/knotify/CMakeLists.txt b/knotify/CMakeLists.txt
index d4e983d1..6ee72e71 100644
--- a/knotify/CMakeLists.txt
+++ b/knotify/CMakeLists.txt
@@ -50,6 +50,6 @@ install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/knotifyconfig_export.h
     knotifyconfigwidget.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
     COMPONENT Devel
 )
diff --git a/kparts/CMakeLists.txt b/kparts/CMakeLists.txt
index a703a334..92c0219c 100644
--- a/kparts/CMakeLists.txt
+++ b/kparts/CMakeLists.txt
@@ -53,7 +53,7 @@ install(
     krop.desktop
     krwp.desktop
     browserview.desktop
-    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}
 )
 
 generate_export_header(kparts)
@@ -76,6 +76,6 @@ install(
     textextension.h
     fileinfoextension.h
     listingextension.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/kparts
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/kparts
     COMPONENT Devel
 )
diff --git a/kparts/tests/CMakeLists.txt b/kparts/tests/CMakeLists.txt
index f5e68109..f9b64ae5 100644
--- a/kparts/tests/CMakeLists.txt
+++ b/kparts/tests/CMakeLists.txt
@@ -42,7 +42,7 @@ kde4_add_plugin(spellcheckplugin plugin_spellcheck.cpp)
 
 target_link_libraries(spellcheckplugin ${KDE4_KPARTS_LIBS})
 
-install(TARGETS spellcheckplugin DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS spellcheckplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
 ########### next target ###############
 
@@ -52,7 +52,7 @@ target_link_libraries(notepadpart ${KDE4_KPARTS_LIBS})
 
 target_compile_definitions(notepadpart PRIVATE -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/")
 
-install(TARGETS notepadpart DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS notepadpart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
 ########### unit tests ###############
 
@@ -77,10 +77,10 @@ KPARTS_UNIT_TESTS(
 ########### install files ###############
 
 # Normally this would be needed. For the test programs we can avoid that, see addResourceDir.
-#install( FILES notepadpart.rc  DESTINATION  ${DATA_INSTALL_DIR}/notepadpart )
-#install( FILES partviewer_shell.rc  DESTINATION  ${DATA_INSTALL_DIR}/partviewer )
-#install( FILES kpartstest_shell.rc  DESTINATION  ${DATA_INSTALL_DIR}/kpartstest )
-#install( FILES kpartstest_part1.rc  DESTINATION  ${DATA_INSTALL_DIR}/kpartstestpart )
+#install( FILES notepadpart.rc  DESTINATION  ${KDE4_DATA_INSTALL_DIR}/notepadpart )
+#install( FILES partviewer_shell.rc  DESTINATION  ${KDE4_DATA_INSTALL_DIR}/partviewer )
+#install( FILES kpartstest_shell.rc  DESTINATION  ${KDE4_DATA_INSTALL_DIR}/kpartstest )
+#install( FILES kpartstest_part1.rc  DESTINATION  ${KDE4_DATA_INSTALL_DIR}/kpartstestpart )
 
 # To test plugins without installing them, try "ln -s kpartplugins <srcdir>"
-#install( FILES plugin_foobar.rc plugin_spellcheck.rc  DESTINATION  ${DATA_INSTALL_DIR}/notepadpart/kpartplugins )
+#install( FILES plugin_foobar.rc plugin_spellcheck.rc  DESTINATION  ${KDE4_DATA_INSTALL_DIR}/notepadpart/kpartplugins )
diff --git a/kpty/CMakeLists.txt b/kpty/CMakeLists.txt
index 644b916e..fec31ffc 100644
--- a/kpty/CMakeLists.txt
+++ b/kpty/CMakeLists.txt
@@ -36,7 +36,7 @@ install(
     kpty.h
     kptydevice.h
     kptyprocess.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
     COMPONENT Devel
 )
 
@@ -45,7 +45,7 @@ install(
 if(NOT HAVE_OPENPTY)
     add_executable(kgrantpty kgrantpty.c)
     target_link_libraries(kgrantpty ${KDE4_KDECORE_LIBS})
-    install(TARGETS kgrantpty DESTINATION ${LIBEXEC_INSTALL_DIR})
+    install(TARGETS kgrantpty DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR})
 endif()
 
 if(ENABLE_TESTING)
diff --git a/kross/core/CMakeLists.txt b/kross/core/CMakeLists.txt
index 020fb678..8440fe8f 100644
--- a/kross/core/CMakeLists.txt
+++ b/kross/core/CMakeLists.txt
@@ -51,6 +51,6 @@ install(
     actioncollection.h
     manager.h
     object.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/kross/core
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/kross/core
     COMPONENT Devel
 )
diff --git a/kross/modules/CMakeLists.txt b/kross/modules/CMakeLists.txt
index e77ab051..ac36bdae 100644
--- a/kross/modules/CMakeLists.txt
+++ b/kross/modules/CMakeLists.txt
@@ -21,7 +21,7 @@ if(QT_QTDESIGNER_FOUND)
         ${KDE4_KFILE_LIBS}
         krosscore
     )
-    install(TARGETS krossmoduleforms DESTINATION ${PLUGIN_INSTALL_DIR})
+    install(TARGETS krossmoduleforms DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 endif()
 
 ############################################
@@ -34,4 +34,4 @@ target_link_libraries(krossmodulekdetranslation
     ${KDE4_CORE_LIBS}
     krosscore
 )
-install(TARGETS krossmodulekdetranslation DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS krossmodulekdetranslation DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kross/qts/CMakeLists.txt b/kross/qts/CMakeLists.txt
index 21aec0d3..8d7ea4f6 100644
--- a/kross/qts/CMakeLists.txt
+++ b/kross/qts/CMakeLists.txt
@@ -24,16 +24,16 @@ set_target_properties(krossqtsplugin PROPERTIES
     SOVERSION ${GENERIC_LIB_SOVERSION}
 )
 
-install(TARGETS krossqtsplugin DESTINATION ${PLUGIN_INSTALL_DIR}/kde4/plugins/script)
+install(TARGETS krossqtsplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}/kde4/plugins/script)
 
 ########### next target ###############
 
 # add_executable(krossqtstest main.cpp)
 # target_link_libraries(krossqtstest ${KDE4_KDEUI_LIBS} krossqtsplugin ${QT_QTSCRIPT_LIBRARY})
 # set(krossqtsplugintest_SRCS main.cpp)
-# target_link_libraries(krossqtsplugintest ${KDE4_KDECORE_LIBS} )
+# target_link_libraries(krossqtsplugintest ${KDE4_KDECORE_LIBS})
 # add_executable(krossqtsplugintest ${krossqtsplugintest_SRCS})
-# #install(TARGETS krossqtsplugintest DESTINATION ${BIN_INSTALL_DIR})
+# #install(TARGETS krossqtsplugintest DESTINATION ${KDE4_BIN_INSTALL_DIR})
 
 ########### next target ###############
 
@@ -48,4 +48,4 @@ target_link_libraries(krossqts
     ${QT_QTSCRIPT_LIBRARY}
 )
 
-install(TARGETS krossqts DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS krossqts DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kross/ui/CMakeLists.txt b/kross/ui/CMakeLists.txt
index 86fb2966..1bfd630b 100644
--- a/kross/ui/CMakeLists.txt
+++ b/kross/ui/CMakeLists.txt
@@ -38,6 +38,6 @@ install(
     model.h
     view.h
     plugin.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/kross/ui
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/kross/ui
     COMPONENT Devel
 )
diff --git a/kunitconversion/CMakeLists.txt b/kunitconversion/CMakeLists.txt
index 498882b7..25cca8f8 100644
--- a/kunitconversion/CMakeLists.txt
+++ b/kunitconversion/CMakeLists.txt
@@ -96,7 +96,7 @@ install(
     unit.h
     unitcategory.h
     ${CMAKE_CURRENT_BINARY_DIR}/kunitconversion_export.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/kunitconversion
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/kunitconversion
     COMPONENT Devel
 )
 
diff --git a/kutils/CMakeLists.txt b/kutils/CMakeLists.txt
index 6acc80be..ed0b8f42 100644
--- a/kutils/CMakeLists.txt
+++ b/kutils/CMakeLists.txt
@@ -35,7 +35,7 @@ set_target_properties(kemoticons PROPERTIES
 install(
     FILES
     kemoticons/kemoticonsTheme.desktop
-    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}
 )
 
 generate_export_header(kemoticons)
@@ -46,7 +46,7 @@ install(
     kemoticons/kemoticons.h
     kemoticons/kemoticonstheme.h
     kemoticons/kemoticonsprovider.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
     COMPONENT Devel
 )
 
@@ -113,7 +113,7 @@ install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kidletime_export.h
     kidletime/kidletime.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
     COMPONENT Devel
 )
 
@@ -163,7 +163,7 @@ install(
     kcmoduleproxy.h
     kpluginselector.h
     kcmodulecontainer.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
     COMPONENT Devel
 )
 
@@ -172,7 +172,7 @@ install(
     ksettings/dispatcher.h
     ksettings/dialog.h
     ksettings/pluginpage.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/ksettings
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/ksettings
     COMPONENT Devel
 )
 
@@ -203,7 +203,7 @@ install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kprintutils_export.h
     kprintpreview.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
     COMPONENT Devel
 )
 
diff --git a/kutils/kemoticons/providers/adium/CMakeLists.txt b/kutils/kemoticons/providers/adium/CMakeLists.txt
index fca1becc..9eb610f8 100644
--- a/kutils/kemoticons/providers/adium/CMakeLists.txt
+++ b/kutils/kemoticons/providers/adium/CMakeLists.txt
@@ -17,9 +17,9 @@ target_link_libraries(emoticonstheme_adium
 
 install(
     TARGETS emoticonstheme_adium
-    DESTINATION ${PLUGIN_INSTALL_DIR}
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 )
 install(
     FILES emoticonstheme_adium.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
diff --git a/kutils/kemoticons/providers/kde/CMakeLists.txt b/kutils/kemoticons/providers/kde/CMakeLists.txt
index 5ec6dca4..94c095c0 100644
--- a/kutils/kemoticons/providers/kde/CMakeLists.txt
+++ b/kutils/kemoticons/providers/kde/CMakeLists.txt
@@ -17,10 +17,10 @@ target_link_libraries(emoticonstheme_kde
 
 install(
     TARGETS emoticonstheme_kde
-    DESTINATION ${PLUGIN_INSTALL_DIR}
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 )
 
 install(
     FILES emoticonstheme_kde.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
diff --git a/kutils/kemoticons/providers/pidgin/CMakeLists.txt b/kutils/kemoticons/providers/pidgin/CMakeLists.txt
index 27274de5..a24fb824 100644
--- a/kutils/kemoticons/providers/pidgin/CMakeLists.txt
+++ b/kutils/kemoticons/providers/pidgin/CMakeLists.txt
@@ -16,9 +16,9 @@ target_link_libraries(emoticonstheme_pidgin
 
 install(
     TARGETS emoticonstheme_pidgin
-    DESTINATION ${PLUGIN_INSTALL_DIR}
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 )
 install(
     FILES emoticonstheme_pidgin.desktop
-    DESTINATION  ${SERVICES_INSTALL_DIR}
+    DESTINATION  ${KDE4_SERVICES_INSTALL_DIR}
 )
diff --git a/kutils/kemoticons/providers/xmpp/CMakeLists.txt b/kutils/kemoticons/providers/xmpp/CMakeLists.txt
index bfd291ac..e947b863 100644
--- a/kutils/kemoticons/providers/xmpp/CMakeLists.txt
+++ b/kutils/kemoticons/providers/xmpp/CMakeLists.txt
@@ -17,9 +17,9 @@ target_link_libraries(emoticonstheme_xmpp
 
 install(
     TARGETS emoticonstheme_xmpp
-    DESTINATION ${PLUGIN_INSTALL_DIR}
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 )
 install(
     FILES emoticonstheme_xmpp.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
diff --git a/kutils/kmediaplayer/CMakeLists.txt b/kutils/kmediaplayer/CMakeLists.txt
index 6f3fba30..6b858c42 100644
--- a/kutils/kmediaplayer/CMakeLists.txt
+++ b/kutils/kmediaplayer/CMakeLists.txt
@@ -38,7 +38,7 @@ install(
     ${CMAKE_CURRENT_BINARY_DIR}/kmediaplayer_export.h
     kmediaplayer.h
     kmediawidget.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
     COMPONENT Devel
 )
 
diff --git a/kutils/kmediaplayer/kded/CMakeLists.txt b/kutils/kmediaplayer/kded/CMakeLists.txt
index 8254e734..f6ac450c 100644
--- a/kutils/kmediaplayer/kded/CMakeLists.txt
+++ b/kutils/kmediaplayer/kded/CMakeLists.txt
@@ -12,17 +12,17 @@ target_link_libraries(kded_kaudioplayer ${KDE4_KMEDIAPLAYER_LIBS})
 
 install(
     TARGETS kded_kaudioplayer
-    DESTINATION ${PLUGIN_INSTALL_DIR}
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 )
 
 install(
     FILES kaudioplayer.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}/kded
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded
 )
 
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kaudioplayer.xml
-    DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
+    DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}
 )
 
 
diff --git a/licenses/CMakeLists.txt b/licenses/CMakeLists.txt
index ffc215b2..e782ac81 100644
--- a/licenses/CMakeLists.txt
+++ b/licenses/CMakeLists.txt
@@ -1,10 +1,13 @@
-
-
-
 ########### install files ###############
 
-install( FILES BSD GPL_V2 GPL_V3 LGPL_V2 LGPL_V3 QPL_V1.0 ARTISTIC  DESTINATION  ${DATA_INSTALL_DIR}/LICENSES )
-
-
-
-
+install(
+    FILES
+    BSD
+    GPL_V2
+    GPL_V3
+    LGPL_V2
+    LGPL_V3
+    QPL_V1.0
+    ARTISTIC
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/LICENSES
+)
diff --git a/mimetypes/CMakeLists.txt b/mimetypes/CMakeLists.txt
index 99b7a118..eddd082c 100644
--- a/mimetypes/CMakeLists.txt
+++ b/mimetypes/CMakeLists.txt
@@ -1,6 +1,6 @@
 install(
     FILES kde.xml
-    DESTINATION ${XDG_MIME_INSTALL_DIR}
+    DESTINATION ${KDE4_XDG_MIME_INSTALL_DIR}
 )
 
-update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
+update_xdg_mimetypes(${KDE4_XDG_MIME_INSTALL_DIR})
diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt
index 8f32afd3..93860456 100644
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
@@ -29,7 +29,7 @@ endif()
 
 if(NOT PLASMA_NO_KUTILS)
     include_directories(${CMAKE_SOURCE_DIR}/kutils)
-    set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KCMUTILS_LIBRARY})
+    set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KCMUTILS_LIBS})
 endif()
 
 configure_file(
@@ -246,7 +246,7 @@ install(
     ${CMAKE_CURRENT_BINARY_DIR}/plasma_export.h
     view.h
     wallpaper.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/plasma
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasma
     COMPONENT Devel
 )
 
@@ -278,7 +278,7 @@ install(
     widgets/textbrowser.h
     widgets/treeview.h
     widgets/textedit.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/widgets
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasma/widgets
     COMPONENT Devel
 )
 
@@ -289,14 +289,14 @@ install(
     scripting/runnerscript.h
     scripting/wallpaperscript.h
     scripting/scriptengine.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/scripting
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasma/scripting
     COMPONENT Devel
 )
 
 install(
     FILES
     animations/animation.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/animations
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasma/animations
     COMPONENT Devel
 )
 
@@ -315,13 +315,13 @@ install(
     data/servicetypes/plasma-service.desktop
     data/servicetypes/plasma-toolbox.desktop
     data/servicetypes/plasma-wallpaper.desktop
-    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}
 )
 
 install(
     FILES
     data/services/plasma-applet-extenderapplet.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
 
 install(
@@ -329,6 +329,6 @@ install(
     data/operations/dataengineservice.operations
     data/operations/plasmoidservice.operations
     data/operations/storage.operations
-    DESTINATION ${DATA_INSTALL_DIR}/plasma/services
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/services
 )
 
diff --git a/plasma/tests/testcontainmentactionsplugin/CMakeLists.txt b/plasma/tests/testcontainmentactionsplugin/CMakeLists.txt
index 0898c31a..ed60fea3 100644
--- a/plasma/tests/testcontainmentactionsplugin/CMakeLists.txt
+++ b/plasma/tests/testcontainmentactionsplugin/CMakeLists.txt
@@ -12,5 +12,5 @@ include_directories(
 kde4_add_plugin(plasma_containmentactions_test test.cpp)
 target_link_libraries(plasma_containmentactions_test ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
 
-install(TARGETS plasma_containmentactions_test DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES plasma-containmentactions-test.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(TARGETS plasma_containmentactions_test DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
+install(FILES plasma-containmentactions-test.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/plasma/tests/testengine/CMakeLists.txt b/plasma/tests/testengine/CMakeLists.txt
index c50f21e6..d864d65f 100644
--- a/plasma/tests/testengine/CMakeLists.txt
+++ b/plasma/tests/testengine/CMakeLists.txt
@@ -16,5 +16,5 @@ target_link_libraries(plasma_engine_testengine
     ${KDE4_PLASMA_LIBS}
 )
 
-install(TARGETS plasma_engine_testengine DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES plasma-dataengine-testengine.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(TARGETS plasma_engine_testengine DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
+install(FILES plasma-dataengine-testengine.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/security/crypto/CMakeLists.txt b/security/crypto/CMakeLists.txt
index 08a8cbc4..5f2326d3 100644
--- a/security/crypto/CMakeLists.txt
+++ b/security/crypto/CMakeLists.txt
@@ -21,9 +21,9 @@ target_link_libraries(kcm_crypto
 
 install(
     TARGETS kcm_crypto
-    DESTINATION ${PLUGIN_INSTALL_DIR}
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 )
 install(
     FILES crypto.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
diff --git a/security/kcert/CMakeLists.txt b/security/kcert/CMakeLists.txt
index afe4fd34..6ae7add7 100644
--- a/security/kcert/CMakeLists.txt
+++ b/security/kcert/CMakeLists.txt
@@ -14,15 +14,15 @@ target_link_libraries(kcertpart ${KDE4_KPARTS_LIBS})
 
 install(
     TARGETS kcertpart
-    DESTINATION ${PLUGIN_INSTALL_DIR}
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 )
 
 install(
     FILES kcertpart.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
 
 install(
     FILES kcertpart.rc
-    DESTINATION ${DATA_INSTALL_DIR}/kcertpart
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/kcertpart
 )
diff --git a/solid/solid/CMakeLists.txt b/solid/solid/CMakeLists.txt
index c18e5fbc..c8577499 100644
--- a/solid/solid/CMakeLists.txt
+++ b/solid/solid/CMakeLists.txt
@@ -311,7 +311,7 @@ install(
     org.kde.Solid.PowerManagement.PolicyAgent.xml
     org.freedesktop.PowerManagement.xml
     org.freedesktop.PowerManagement.Inhibit.xml
-    DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
+    DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}
 )
 
 ########### install files ###############
@@ -349,6 +349,6 @@ install(
     smartcardreader.h
     internetgateway.h
     networkshare.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/solid
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/solid
     COMPONENT Devel
 )
diff --git a/threadweaver/CMakeLists.txt b/threadweaver/CMakeLists.txt
index fd15e893..f4e40273 100644
--- a/threadweaver/CMakeLists.txt
+++ b/threadweaver/CMakeLists.txt
@@ -16,6 +16,6 @@ generate_export_header(threadweaver)
 install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/threadweaver_export.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/threadweaver
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/threadweaver
     COMPONENT Devel
 )
diff --git a/threadweaver/Examples/Construction/CMakeLists.txt b/threadweaver/Examples/Construction/CMakeLists.txt
index 85ebc056..13eb11e9 100644
--- a/threadweaver/Examples/Construction/CMakeLists.txt
+++ b/threadweaver/Examples/Construction/CMakeLists.txt
@@ -11,4 +11,4 @@ add_executable(Construction Construction.cpp)
 
 target_link_libraries(Construction ${KDE4_THREADWEAVER_LIBS})
 
-install(TARGETS Construction DESTINATION ${BIN_INSTALL_DIR})
+install(TARGETS Construction DESTINATION ${KDE4_BIN_INSTALL_DIR})
diff --git a/threadweaver/Examples/Jobs/CMakeLists.txt b/threadweaver/Examples/Jobs/CMakeLists.txt
index 59cfe4ce..77a5dcff 100644
--- a/threadweaver/Examples/Jobs/CMakeLists.txt
+++ b/threadweaver/Examples/Jobs/CMakeLists.txt
@@ -25,4 +25,4 @@ target_link_libraries(Jobs
     ThreadWeaverGui
 )
 
-install(TARGETS Jobs DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS Jobs DESTINATION ${KDE4_BIN_INSTALL_DIR})
diff --git a/threadweaver/Examples/QProcessJob/CMakeLists.txt b/threadweaver/Examples/QProcessJob/CMakeLists.txt
index e096dfd0..8d359257 100644
--- a/threadweaver/Examples/QProcessJob/CMakeLists.txt
+++ b/threadweaver/Examples/QProcessJob/CMakeLists.txt
@@ -24,4 +24,4 @@ target_link_libraries(QProcessJob
     ${QT_QTGUI_LIBRARY}
 )
 
-install(TARGETS QProcessJob DESTINATION ${BIN_INSTALL_DIR})
+install(TARGETS QProcessJob DESTINATION ${KDE4_BIN_INSTALL_DIR})
diff --git a/threadweaver/Examples/SMIV/CMakeLists.txt b/threadweaver/Examples/SMIV/CMakeLists.txt
index d1561529..c28694fe 100644
--- a/threadweaver/Examples/SMIV/CMakeLists.txt
+++ b/threadweaver/Examples/SMIV/CMakeLists.txt
@@ -30,4 +30,4 @@ target_link_libraries(SMIV
     ThreadWeaverExperimental
 )
 
-install(TARGETS SMIV DESTINATION ${BIN_INSTALL_DIR})
+install(TARGETS SMIV DESTINATION ${KDE4_BIN_INSTALL_DIR})
diff --git a/threadweaver/Weaver/CMakeLists.txt b/threadweaver/Weaver/CMakeLists.txt
index 7563d11d..1faf24ba 100644
--- a/threadweaver/Weaver/CMakeLists.txt
+++ b/threadweaver/Weaver/CMakeLists.txt
@@ -57,6 +57,6 @@ install(
     DependencyPolicy.h
     ResourceRestrictionPolicy.h
     QueuePolicy.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/threadweaver
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/threadweaver
     COMPONENT Devel
 )