diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index c97549feb8..fdd222bf6b 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,101 +1,101 @@
 find_package(KF5Plasma)
 set_package_properties(KF5Plasma PROPERTIES
     PURPOSE "Plasma libraries for enabling the plasma addons"
     URL "http://www.kde.org"
     TYPE OPTIONAL)
 if(KF5Plasma_FOUND)
     add_subdirectory(plasma)
 endif()
 
 option(KDEVELOP_SINGLE_APP "Use QtSingleApplication as KDevelop's base" OFF)
 
 set(singleapp_SRCS qtlocalpeer.cpp qtsingleapplication.cpp qtlockedfile.cpp)
 if(WIN32)
     set(singleapp_SRCS ${singleapp_SRCS} qtlockedfile_win.cpp)
 else()
     set(singleapp_SRCS ${singleapp_SRCS} qtlockedfile_unix.cpp)
 endif()
 
 set(kdevelop_SRCS  main.cpp kdevideextension.cpp)
 if(KDEVELOP_SINGLE_APP)
     set(kdevelop_SRCS ${kdevelop_SRCS} ${singleapp_SRCS})
 endif()
 
 ecm_qt_declare_logging_category(kdevelop_SRCS
     HEADER debug.h
     IDENTIFIER APP
     CATEGORY_NAME "kdevelop.app"
 )
 qt5_add_resources(kdevelop_SRCS kdevelop.qrc)
 
 #TODO: remove CMAKE_CURRENT_SOURCE_DIR prefix when ECM is fixed
 set(kdevelop_ICONS
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/16-apps-kdevelop.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/32-apps-kdevelop.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/48-apps-kdevelop.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/64-apps-kdevelop.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/128-apps-kdevelop.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/256-apps-kdevelop.png
 )
 
 ecm_install_icons(ICONS ${kdevelop_ICONS}
-    DESTINATION ${ICON_INSTALL_DIR})
+    DESTINATION ${KDE_INSTALL_ICONDIR})
     
 ecm_add_app_icon(kdevelop_SRCS ICONS
     ${kdevelop_ICONS})
 
 qt5_add_resources(kdevelop_SRCS kdevelop.qrc)
 add_executable(kdevelop ${kdevelop_SRCS} )
 
 target_link_libraries(kdevelop
     KDev::Interfaces
     KDev::Shell
     KDev::Util
 
     KF5::Declarative
     KF5::IconThemes
     KF5::Crash
 )
 IF(APPLE)
     target_link_libraries(kdevelop "-framework CoreFoundation")
 ENDIF()
 
 install(TARGETS kdevelop ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 
 install(FILES kdevelop! DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
 configure_file(start-kdevelop.py.in ${CMAKE_CURRENT_BINARY_DIR}/start-kdevelop.py @ONLY)
 
 option(INSTALL_KDEVELOP_LAUNCH_WRAPPER "Install a wrapper script that sets required environment variables. Only useful when installing into a separate prefix" OFF)
 if(INSTALL_KDEVELOP_LAUNCH_WRAPPER)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/start-kdevelop.py DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
 endif()
 
 if (WIN32)
 install(FILES windows/kdevelop-msvc.bat DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
 endif (WIN32)
 
 if (APPLE)
     # the MacOSX bundle display name property (CFBundleDisplayName) is not currently supported by cmake,
     # so has to be set for all targets in this cmake file
     set(MACOSX_BUNDLE_DISPLAY_NAME KDevelop)
     # We provide our own Info.plist to disable AppNap for KDevelop:
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in)
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.KDevelop")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDevelop")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_DISPLAY_NAME "KDevelop")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_INFO_STRING "The KDevelop Integrated Development Environment")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_LONG_VERSION_STRING "KDevelop ${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING "${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_ICON_FILE "kdevelop_SRCS.icns")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_COPYRIGHT "KDevelop Team")
 endif (APPLE)
 
 
 ########### install files ###############
 
 install( PROGRAMS org.kde.kdevelop.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
 install( PROGRAMS org.kde.kdevelop_ps.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
 install( FILES kdevelop.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} )
 install( FILES kdevelop.xml DESTINATION ${KDE_INSTALL_MIMEDIR} )
 update_xdg_mimetypes( ${KDE_INSTALL_MIMEDIR} )
diff --git a/doc/kdevelop/CMakeLists.txt b/doc/kdevelop/CMakeLists.txt
index d55147b74a..8482f36ce7 100644
--- a/doc/kdevelop/CMakeLists.txt
+++ b/doc/kdevelop/CMakeLists.txt
@@ -1,3 +1,3 @@
 ########### install files ###############
 
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kdevelop)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kdevelop)
diff --git a/documentation/manpage/CMakeLists.txt b/documentation/manpage/CMakeLists.txt
index 067579c00e..14eaf76a6c 100644
--- a/documentation/manpage/CMakeLists.txt
+++ b/documentation/manpage/CMakeLists.txt
@@ -1,18 +1,18 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"kdevmanpage\")
 set(kdevmanpage_SRCS
     manpagedocumentation.cpp
     manpageplugin.cpp
     manpagemodel.cpp
     manpagedocumentationwidget.cpp
 )
 
 kdevplatform_add_plugin(kdevmanpage JSON kdevmanpage.json SOURCES ${kdevmanpage_SRCS})
 target_link_libraries(kdevmanpage KF5::TextEditor KDev::Language
 KDev::Documentation KDev::Interfaces KF5::KCMUtils)
 
 install(FILES
     manpagedocumentation.css
-    DESTINATION ${DATA_INSTALL_DIR}/kdevmanpage
+    DESTINATION ${KDE_INSTALL_DATADIR}/kdevmanpage
 )
 
 add_subdirectory(tests)
diff --git a/file_templates/CMakeLists.txt b/file_templates/CMakeLists.txt
index 56028aebd5..9e9a7a24b1 100644
--- a/file_templates/CMakeLists.txt
+++ b/file_templates/CMakeLists.txt
@@ -1,46 +1,46 @@
 set(filetemplate_DIRS
     classes/cpp_basic
     classes/private_pointer
     classes/qt_widget
     classes/qobject
     classes/qobject_pimpl
     classes/python_basic
     classes/c_gobject
     classes/c_gobject_private
     classes/c_gobject_properties
     classes/qt_shared
     classes/qt_interface
 
     testing/cpp_cpputest
     testing/cpp_gtest
     testing/cpp_qtestlib
     testing/cpp_qtestlib_kdevelop
     testing/python_pyunit
     testing/php_phpunit
 
     other/cmake_module
 )
 
 kdevplatform_add_file_templates(${filetemplate_DIRS})
 
 install ( FILES
     common/method_declaration_cpp.txt
     common/method_definition_cpp.txt
     common/license_header_cpp.txt
     common/class_declaration_cpp.txt
     common/class_declaration_apidox_cpp.txt
     common/class_method_declaration_cpp.txt
     common/class_method_declaration_apidox_cpp.txt
     common/class_property_setter_declaration_cpp.txt
     common/class_property_setter_declaration_apidox_cpp.txt
     common/class_property_setter_definition_cpp.txt
     common/class_property_getter_declaration_cpp.txt
     common/class_property_getter_declaration_apidox_cpp.txt
     common/class_property_getter_definition_cpp.txt
     common/class_property_signal_declaration_cpp.txt
     common/class_qproperty_declaration_cpp.txt
     common/cpp_header.h
     common/cpp_header_onlyfunctions.h
     common/cpp_implementation.cpp
-    DESTINATION ${DATA_INSTALL_DIR}/kdevcodegen/templates
+    DESTINATION ${KDE_INSTALL_DATADIR}/kdevcodegen/templates
 )
diff --git a/languages/clang/CMakeLists.txt b/languages/clang/CMakeLists.txt
index a271d47318..31ce634c3b 100644
--- a/languages/clang/CMakeLists.txt
+++ b/languages/clang/CMakeLists.txt
@@ -1,134 +1,134 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"kdevclang\")
 add_definitions(${LLVM_CFLAGS})
 include_directories(${CLANG_INCLUDE_DIRS})
 
 configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake"
   "${CMAKE_CURRENT_BINARY_DIR}/version.h"
   @ONLY
 )
 
 add_subdirectory(tests)
 
 add_definitions(
     -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_BYTEARRAY
 )
 
 # TODO: Move to kdevplatform
 function(add_private_library target)
     set(options)
     set(oneValueArgs)
     set(multiValueArgs SOURCES)
     cmake_parse_arguments(KDEV_ADD_PRIVATE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     string(REPLACE "KDev" "" shortTargetName ${target})
     if (${shortTargetName} STREQUAL ${target})
         message(FATAL_ERROR "Target passed to add_private_library needs to start with \"KDev\", was \"${target}\"")
     endif()
 
     string(TOLOWER ${shortTargetName} shortTargetNameToLower)
 
     add_library(${target} SHARED ${KDEV_ADD_PRIVATE_SOURCES})
     generate_export_header(${target} EXPORT_FILE_NAME ${shortTargetNameToLower}export.h)
     set_target_properties(${target} PROPERTIES
         VERSION ${KDEV_PLUGIN_VERSION}
         SOVERSION ${KDEV_PLUGIN_VERSION}
     )
     install(TARGETS ${target} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
 endfunction()
 
 set(kdevclangprivate_SRCS
     clangsettings/clangsettingsmanager.cpp
     clangsettings/sessionsettings/sessionsettings.cpp
 
     codecompletion/completionhelper.cpp
     codecompletion/context.cpp
     codecompletion/includepathcompletioncontext.cpp
     codecompletion/model.cpp
 
     codegen/adaptsignatureaction.cpp
     codegen/adaptsignatureassistant.cpp
     codegen/codegenhelper.cpp
     codegen/clangrefactoring.cpp
     codegen/clangclasshelper.cpp
     codegen/sourcemanipulation.cpp
 
     duchain/builder.cpp
     duchain/clangdiagnosticevaluator.cpp
     duchain/clangducontext.cpp
     duchain/clanghelpers.cpp
     duchain/clangindex.cpp
     duchain/clangparsingenvironment.cpp
     duchain/clangparsingenvironmentfile.cpp
     duchain/clangpch.cpp
     duchain/clangproblem.cpp
     duchain/debugvisitor.cpp
     duchain/documentfinderhelpers.cpp
     duchain/duchainutils.cpp
     duchain/macrodefinition.cpp
     duchain/macronavigationcontext.cpp
     duchain/missingincludepathproblem.cpp
     duchain/navigationwidget.cpp
     duchain/parsesession.cpp
     duchain/todoextractor.cpp
     duchain/types/classspecializationtype.cpp
     duchain/unknowndeclarationproblem.cpp
     duchain/unsavedfile.cpp
 
     util/clangdebug.cpp
     util/clangtypes.cpp
     util/clangutils.cpp
 )
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 ki18n_wrap_ui(kdevclangprivate_SRCS
     clangsettings/sessionsettings/sessionsettings.ui
 )
 
 kconfig_add_kcfg_files(kdevclangprivate_SRCS clangsettings/sessionsettings/sessionconfig.kcfgc)
 
 add_private_library(KDevClangPrivate SOURCES ${kdevclangprivate_SRCS})
 target_link_libraries(KDevClangPrivate
 LINK_PRIVATE
     Qt5::Core
     KF5::TextEditor
     KF5::ThreadWeaver
     KDev::Util
 LINK_PUBLIC
     KDev::Language
     KDev::Project
     KDev::Util
     ${CLANG_LIBCLANG_LIB}
 )
 
-install(FILES duchain/gcc_compat.h DESTINATION ${DATA_INSTALL_DIR}/kdevclangsupport PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
-install(DIRECTORY duchain/wrappedQtHeaders DESTINATION ${DATA_INSTALL_DIR}/kdevclangsupport
+install(FILES duchain/gcc_compat.h DESTINATION ${KDE_INSTALL_DATADIR}/kdevclangsupport PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+install(DIRECTORY duchain/wrappedQtHeaders DESTINATION ${KDE_INSTALL_DATADIR}/kdevclangsupport
         DIRECTORY_PERMISSIONS
             OWNER_READ OWNER_WRITE OWNER_EXECUTE
             GROUP_READ GROUP_WRITE GROUP_EXECUTE
             WORLD_READ WORLD_EXECUTE
         FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
 
 set(kdevclangsupport_SRCS
     clangparsejob.cpp
     clangsupport.cpp
     clanghighlighting.cpp
 )
 
 qt5_add_resources(kdevclangsupport_SRCS kdevclangsupport.qrc)
 
 kdevplatform_add_plugin(kdevclangsupport JSON kdevclangsupport.json SOURCES ${kdevclangsupport_SRCS})
 target_link_libraries(kdevclangsupport
     KDevClangPrivate
 
     KF5::ThreadWeaver
     KF5::TextEditor
     KDev::Util
     KDev::Project
 )
 
 install(FILES kdevclang.xml DESTINATION ${KDE_INSTALL_MIMEDIR})
 update_xdg_mimetypes(${KDE_INSTALL_MIMEDIR})
diff --git a/languages/plugins/custom-definesandincludes/CMakeLists.txt b/languages/plugins/custom-definesandincludes/CMakeLists.txt
index 966cdf36e6..0b2c62844f 100644
--- a/languages/plugins/custom-definesandincludes/CMakeLists.txt
+++ b/languages/plugins/custom-definesandincludes/CMakeLists.txt
@@ -1,68 +1,68 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"kdevcustomdefinesandincludes\")
 
 ecm_qt_declare_logging_category(kdevdefinesandincludesmanager_LOG_SRCS
     HEADER debug.h
     IDENTIFIER DEFINESANDINCLUDES
     CATEGORY_NAME "kdevelop.definesandincludes"
 )
 
 add_subdirectory(tests)
 add_subdirectory(compilerprovider)
 add_subdirectory(noprojectincludesanddefines)
 
 set( kdevdefinesandincludesmanager_SRCS
         definesandincludesmanager.cpp
         kcm_widget/projectpathsmodel.cpp
         kcm_widget/definesmodel.cpp
         kcm_widget/includesmodel.cpp
         kcm_widget/includeswidget.cpp
         kcm_widget/defineswidget.cpp
         kcm_widget/projectpathswidget.cpp
         kcm_widget/definesandincludesconfigpage.cpp
         kcm_widget/parserwidget.cpp
         compilerprovider/icompiler.cpp # TODO: is this really necessary
     )
 
 ki18n_wrap_ui(kdevdefinesandincludesmanager_SRCS
     kcm_widget/batchedit.ui
     kcm_widget/includeswidget.ui
     kcm_widget/defineswidget.ui
     kcm_widget/projectpathswidget.ui
     kcm_widget/parserwidget.ui
 )
 kconfig_add_kcfg_files( kdevdefinesandincludesmanager_SRCS kcm_widget/customdefinesandincludes.kcfgc)
 
 kdevplatform_add_plugin(kdevdefinesandincludesmanager JSON kdevdefinesandincludesmanager.json SOURCES ${kdevdefinesandincludesmanager_SRCS})
 target_link_libraries( kdevdefinesandincludesmanager LINK_PRIVATE
         KDev::Project
         KDev::Util
         KDev::Language
         kdevnoprojectincludesanddefines
         kdevcompilerprovider)
 
 option(BUILD_kdev_includepathsconverter "Build utility to modify include paths of a project from command line." ON)
 if(BUILD_kdev_includepathsconverter)
     add_executable(kdev_includepathsconverter includepathsconverter.cpp)
     ecm_mark_nongui_executable(kdev_includepathsconverter)
     target_link_libraries(kdev_includepathsconverter LINK_PRIVATE
         KDev::Project
         kdevcompilerprovider
     )
-    install(TARGETS kdev_includepathsconverter ${INSTALL_TARGETS_DEFAULT_ARGS} )
+    install(TARGETS kdev_includepathsconverter ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 endif()
 
 install(FILES
     idefinesandincludesmanager.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/kdevelop/custom-definesandincludes COMPONENT Devel
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevelop/custom-definesandincludes COMPONENT Devel
 )
 
 add_library(kdevdefinesandincludesmanager_interface INTERFACE)
 add_library(KDev::DefinesAndIncludesManager ALIAS kdevdefinesandincludesmanager_interface)
 target_include_directories(kdevdefinesandincludesmanager_interface INTERFACE
      "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>"
      "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/kdevelop>"
 )
 set_target_properties(kdevdefinesandincludesmanager_interface PROPERTIES
     EXPORT_NAME DefinesAndIncludesManager
 )
 install(TARGETS kdevdefinesandincludesmanager_interface EXPORT KDevelopTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/languages/qmljs/CMakeLists.txt b/languages/qmljs/CMakeLists.txt
index 07461e9f48..192356a3a4 100644
--- a/languages/qmljs/CMakeLists.txt
+++ b/languages/qmljs/CMakeLists.txt
@@ -1,35 +1,35 @@
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/libs
     ${KDevelop_SOURCE_DIR}/languages/plugins
 )
 
 add_definitions(-DQT_CREATOR) # :D
 add_definitions(-DQML_BUILD_STATIC_LIB=1)
 
 add_subdirectory(libs)
 add_subdirectory(duchain)
 add_subdirectory(nodejsmodules)
 add_subdirectory(tests)
 add_subdirectory(codecompletion)
 
 ecm_qt_declare_logging_category(kdevqmljslanguagesupport_LOG_SRCS
     HEADER debug.h
     IDENTIFIER KDEV_QMLJS
     CATEGORY_NAME "kdevelop.languages.qmljs"
 )
 kdevplatform_add_plugin(kdevqmljslanguagesupport JSON kdevqmljs.json SOURCES
     qmljsparsejob.cpp
     qmljshighlighting.cpp
     kdevqmljsplugin.cpp
     navigation/propertypreviewwidget.cpp
     ${kdevqmljslanguagesupport_LOG_SRCS}
 )
 target_link_libraries(kdevqmljslanguagesupport
     kdevqmljsduchain
     kdevqmljscompletion
     Qt5::Widgets
     Qt5::QuickWidgets
     KF5::Declarative
 )
 
-install(DIRECTORY navigation/propertywidgets DESTINATION ${DATA_INSTALL_DIR}/kdevqmljssupport)
+install(DIRECTORY navigation/propertywidgets DESTINATION ${KDE_INSTALL_DATADIR}/kdevqmljssupport)
diff --git a/languages/qmljs/nodejsmodules/CMakeLists.txt b/languages/qmljs/nodejsmodules/CMakeLists.txt
index 67637cde68..25a02fce06 100644
--- a/languages/qmljs/nodejsmodules/CMakeLists.txt
+++ b/languages/qmljs/nodejsmodules/CMakeLists.txt
@@ -1,3 +1,3 @@
 file(GLOB jsfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.js)
 file(GLOB qmlfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml)
-install(FILES ${jsfiles} ${qmlfiles} DESTINATION ${DATA_INSTALL_DIR}/kdevqmljssupport/nodejsmodules)
+install(FILES ${jsfiles} ${qmlfiles} DESTINATION ${KDE_INSTALL_DATADIR}/kdevqmljssupport/nodejsmodules)
diff --git a/pics/mini/CMakeLists.txt b/pics/mini/CMakeLists.txt
index 0b250a9569..f5836ef6ad 100644
--- a/pics/mini/CMakeLists.txt
+++ b/pics/mini/CMakeLists.txt
@@ -1,8 +1,8 @@
 install(FILES code-class.png enum.png field.png code-function.png namespace.png
     private_class.png private_enum.png private_field.png private_function.png private_struct.png private_union.png
     protected_class.png protected_enum.png protected_field.png protected_function.png protected_struct.png protected_union.png
     signal.png slot.png struct.png typedef.png union.png CTchildren.png CTclients.png CTparents.png CTdisconnected_parents.png CTsuppliers.png CTvirtuals.png CVclass.png CVglobal_meth.png
     CVglobal_var.png CVnamespace.png CVprivate_meth.png CVprivate_signal.png CVprivate_slot.png CVprivate_var.png
     CVprotected_meth.png CVprotected_signal.png CVprotected_slot.png CVprotected_var.png CVpublic_meth.png
     CVpublic_signal.png CVpublic_slot.png CVpublic_var.png CVstruct.png CVpackage_meth.png CVpackage_var.png CVtypedef.png
-    DESTINATION ${DATA_INSTALL_DIR}/kdevelop/pics )
+    DESTINATION ${KDE_INSTALL_DATADIR}/kdevelop/pics )
diff --git a/pics/misc/CMakeLists.txt b/pics/misc/CMakeLists.txt
index cb98e8de81..75343bb2fb 100644
--- a/pics/misc/CMakeLists.txt
+++ b/pics/misc/CMakeLists.txt
@@ -1,2 +1,2 @@
 install(FILES qtlogo.svg
-    DESTINATION ${DATA_INSTALL_DIR}/kdevelop/pics )
+    DESTINATION ${KDE_INSTALL_DATADIR}/kdevelop/pics )
diff --git a/pics/toolbar/CMakeLists.txt b/pics/toolbar/CMakeLists.txt
index a3055a7820..7ed4d7ee70 100644
--- a/pics/toolbar/CMakeLists.txt
+++ b/pics/toolbar/CMakeLists.txt
@@ -1,8 +1,8 @@
 ecm_install_icons(ICONS
     16-actions-dirsync.png
     16-actions-variablenew.png
     16-actions-classnew.png
     16-actions-methodnew.png
     22-actions-classnew.png
     32-actions-classnew.png
-    DESTINATION ${DATA_INSTALL_DIR}/kdevelop/icons)
+    DESTINATION ${KDE_INSTALL_DATADIR}/kdevelop/icons)
diff --git a/projectbuilders/makebuilder/CMakeLists.txt b/projectbuilders/makebuilder/CMakeLists.txt
index b402366cdd..e04daffe9d 100644
--- a/projectbuilders/makebuilder/CMakeLists.txt
+++ b/projectbuilders/makebuilder/CMakeLists.txt
@@ -1,43 +1,43 @@
 project(makebuilder)
 add_definitions(-DTRANSLATION_DOMAIN=\"kdevmakebuilder\")
 
 ########### next target ###############
 
 set(kdevmakebuilder_SRCS
     makebuilder.cpp
     makejob.cpp
     makebuilderpreferences.cpp
 )
 ecm_qt_declare_logging_category(kdevmakebuilder_SRCS
     HEADER debug.h
     IDENTIFIER KDEV_MAKEBUILDER
     CATEGORY_NAME "kdevelop.projectbuilders.makebuilder"
 )
 ki18n_wrap_ui(kdevmakebuilder_SRCS makeconfig.ui)
 kconfig_add_kcfg_files( kdevmakebuilder_SRCS makebuilderconfig.kcfgc )
 
 #add_library(kdevmakebuilder MODULE ${kdevmakebuilder_SRCS})
 qt5_add_resources(kdevmakebuilder_SRCS kdevmakebuilder.qrc)
 kdevplatform_add_plugin(kdevmakebuilder JSON kdevmakebuilder.json SOURCES ${kdevmakebuilder_SRCS})
 target_link_libraries(kdevmakebuilder
         KF5::TextEditor
         KDev::Interfaces
         KDev::Project
         KDev::OutputView
         KDev::Shell
         KDev::Util
         KDev::Shell
 )
 
-install(FILES imakebuilder.h DESTINATION ${INCLUDE_INSTALL_DIR}/kdevelop/makebuilder COMPONENT Devel)
+install(FILES imakebuilder.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevelop/makebuilder COMPONENT Devel)
 
 add_library(KDevIMakeBuilder INTERFACE)
 add_library(KDev::IMakeBuilder ALIAS KDevIMakeBuilder)
 target_include_directories(KDevIMakeBuilder INTERFACE
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>"
     "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/kdevelop>"
 )
 set_target_properties(KDevIMakeBuilder PROPERTIES
     EXPORT_NAME IMakeBuilder
 )
 install(TARGETS KDevIMakeBuilder EXPORT KDevelopTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/projectmanagers/cmake/icons/CMakeLists.txt b/projectmanagers/cmake/icons/CMakeLists.txt
index 324d7f45fb..3a98f5a43b 100644
--- a/projectmanagers/cmake/icons/CMakeLists.txt
+++ b/projectmanagers/cmake/icons/CMakeLists.txt
@@ -1,6 +1,6 @@
 ecm_install_icons(ICONS
     128-apps-cmake.png
     16-apps-cmake.png
     32-apps-cmake.png
     64-apps-cmake.png
-    DESTINATION ${ICON_INSTALL_DIR})
+    DESTINATION ${KDE_INSTALL_ICONDIR})
diff --git a/projectmanagers/custommake/makefileresolver/CMakeLists.txt b/projectmanagers/custommake/makefileresolver/CMakeLists.txt
index 81802bd455..82da473983 100644
--- a/projectmanagers/custommake/makefileresolver/CMakeLists.txt
+++ b/projectmanagers/custommake/makefileresolver/CMakeLists.txt
@@ -1,25 +1,25 @@
 set(makefileresolver_SRCS
     makefileresolver.cpp
     helper.cpp
 )
 
 add_library(kdevmakefileresolver STATIC
     ${makefileresolver_SRCS}
 )
 target_link_libraries(kdevmakefileresolver
   KDev::Interfaces KDev::Project
   Qt5::Core Qt5::Gui KDev::Language
   KDev::Tests
 )
 set_target_properties(kdevmakefileresolver PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 option(BUILD_kdev_makefileresolver "Build the makefile resolver debugging tool" OFF)
 if(BUILD_kdev_makefileresolver)
     add_executable(kdev_makefileresolver makefileresolver.cpp)
     set_target_properties( kdev_makefileresolver PROPERTIES COMPILE_FLAGS -DTEST )
     target_link_libraries(kdev_makefileresolver kdevmakefileresolver)
 
-    install(TARGETS kdev_makefileresolver ${INSTALL_TARGETS_DEFAULT_ARGS} )
+    install(TARGETS kdev_makefileresolver ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 endif()
 
 add_subdirectory(tests)
diff --git a/providers/ghprovider/icons/CMakeLists.txt b/providers/ghprovider/icons/CMakeLists.txt
index e8bbe0bcdb..e493f19bea 100644
--- a/providers/ghprovider/icons/CMakeLists.txt
+++ b/providers/ghprovider/icons/CMakeLists.txt
@@ -1,7 +1,7 @@
 ecm_install_icons(ICONS
     16-apps-github-forked.png
     16-apps-github-private.png
     16-apps-github-repo.png
     16-apps-kdevgh.png
     32-apps-kdevgh.png
-    DESTINATION ${ICON_INSTALL_DIR})
+    DESTINATION ${KDE_INSTALL_ICONDIR})
diff --git a/shortcuts/CMakeLists.txt b/shortcuts/CMakeLists.txt
index db2be47236..214ab08e91 100644
--- a/shortcuts/CMakeLists.txt
+++ b/shortcuts/CMakeLists.txt
@@ -1,3 +1,3 @@
 
-install(FILES QtCreator DESTINATION ${SHARE_INSTALL_PREFIX}/kdevelop/shortcuts/)
+install(FILES QtCreator DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kdevelop/shortcuts/)