diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index cdd31b782..826e9f627 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -1,9 +1,11 @@
 project( libcalamares )
 
-add_definitions( ${QT_DEFINITIONS} )
-add_definitions( -DQT_SHARED )
-add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS )
-add_definitions( -DDLLEXPORT_PRO )
+add_definitions(
+    ${QT_DEFINITIONS}
+    -DQT_SHARED
+    -DQT_SHAREDPOINTER_TRACK_POINTERS
+    -DDLLEXPORT_PRO
+)
 
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresConfig.h.in
                 ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h )
@@ -16,12 +18,14 @@ set( libSources
     Job.cpp
     JobQueue.cpp
     ProcessJob.cpp
-
+)
+set( kdsagSources
     kdsingleapplicationguard/kdsingleapplicationguard.cpp
     kdsingleapplicationguard/kdsharedmemorylocker.cpp
     kdsingleapplicationguard/kdtoolsglobal.cpp
     kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp
-
+)
+set( utilSources
     utils/CalamaresUtils.cpp
     utils/CalamaresUtilsSystem.cpp
     utils/Logger.cpp
@@ -32,7 +36,6 @@ set( libSources
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
-
     ${QT_INCLUDE_DIR}
 )
 
@@ -73,7 +76,7 @@ if( WITH_PYTHONQT )
 endif()
 
 
-add_library( calamares SHARED ${libSources} )
+add_library( calamares SHARED ${libSources} ${kdsagSources} ${utilSources} )
 set_target_properties( calamares
     PROPERTIES
         AUTOMOC TRUE