diff --git a/CMakeModules/KPMcoreHelper.cmake b/CMakeModules/KPMcoreHelper.cmake
index 05dff18dd..3d4f520f5 100644
--- a/CMakeModules/KPMcoreHelper.cmake
+++ b/CMakeModules/KPMcoreHelper.cmake
@@ -18,10 +18,17 @@ if ( NOT KPMcore_searched_for )
         TYPE RECOMMENDED
         PURPOSE "For disk partitioning support"
     )
+    find_package(Qt5 REQUIRED DBus) # Needed for KPMCore
+    find_package(KF5 REQUIRED I18n WidgetsAddons) # Needed for KPMCore
 
     if( KPMcore_FOUND )
         set( KPMcore_API_DEFINITIONS "" )
     else()
         set( KPMcore_API_DEFINITIONS WITHOUT_KPMcore )
     endif()
+
+    foreach(d ${KPMcore_API_DEFINITIONS})
+        target_compile_definitions(kpmcore INTERFACE ${d})
+    endforeach()
+    target_include_directories(kpmcore INTERFACE ${KPMCORE_INCLUDE_DIR})
 endif()
diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 181ec2b30..09291707c 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -115,13 +115,6 @@ endif()
 include(KPMcoreHelper)
 
 if(KPMcore_FOUND)
-    find_package(Qt5 REQUIRED DBus) # Needed for KPMCore
-    find_package(KF5 REQUIRED I18n WidgetsAddons) # Needed for KPMCore
-
-    foreach(d ${KPMcore_API_DEFINITIONS})
-        add_definitions(-D${d})
-    endforeach()
-    include_directories(${KPMCORE_INCLUDE_DIR})
     target_sources(
         calamares
         PRIVATE