diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt
index 5159916e8..5dbf137bb 100644
--- a/src/calamares/CMakeLists.txt
+++ b/src/calamares/CMakeLists.txt
@@ -17,8 +17,9 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}/../libcalamares
 
-    ../libcalamares
-    ../libcalamaresui
+    ${CMAKE_SOURCE_DIR}/src/libcalamares
+    ${CMAKE_SOURCE_DIR}/src//libcalamaresui
+    ${CMAKE_SOURCE_DIR}
 )
 
 # Translations
diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp
index d463b789d..704c2bf59 100644
--- a/src/calamares/main.cpp
+++ b/src/calamares/main.cpp
@@ -21,10 +21,11 @@
 #include "CalamaresApplication.h"
 
 #include "CalamaresConfig.h"
-#include "kdsingleapplicationguard/kdsingleapplicationguard.h"
 #include "utils/Dirs.h"
 #include "utils/Logger.h"
 
+#include "3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h"
+
 #ifdef WITH_KF5Crash
 #include <KF5/KCoreAddons/KAboutData>
 #include <KF5/KCrash/KCrash>