diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index cad7e7a6e..ae927eda1 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -74,7 +74,6 @@ mark_thirdparty_code( ${kdsagSources} )
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${YAMLCPP_INCLUDE_DIR}
 )
 
 ### OPTIONAL Python support
@@ -126,7 +125,7 @@ target_link_libraries( calamares
     LINK_PRIVATE
         ${OPTIONAL_PRIVATE_LIBRARIES}
     LINK_PUBLIC
-        ${YAMLCPP_LIBRARY}
+        yamlcpp
         Qt5::Core
         KF5::CoreAddons
         ${OPTIONAL_PUBLIC_LIBRARIES}
@@ -191,7 +190,6 @@ if ( ECM_FOUND AND BUILD_TESTING )
         LINK_LIBRARIES
             calamares
             Qt5::Test
-            ${YAMLCPP_LIBRARY}
     )
     calamares_automoc( geoiptest )
 
@@ -238,6 +236,6 @@ endif()
 
 if( BUILD_TESTING )
     add_executable( test_geoip geoip/test_geoip.cpp ${geoip_src} )
-    target_link_libraries( test_geoip calamares Qt5::Network ${YAMLCPP_LIBRARY} )
+    target_link_libraries( test_geoip calamares Qt5::Network yamlcpp )
     calamares_automoc( test_geoip )
 endif()
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 9e9621106..b72b755d3 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -12,7 +12,7 @@ include_directories(
 
 if( BUILD_TESTING )
     add_executable( test_conf test_conf.cpp )
-    target_link_libraries( test_conf ${YAMLCPP_LIBRARY} Qt5::Core )
+    target_link_libraries( test_conf yamlcpp Qt5::Core )
     target_include_directories( test_conf PUBLIC ${YAMLCPP_INCLUDE_DIR} )
 endif()
 
diff --git a/src/modules/netinstall/CMakeLists.txt b/src/modules/netinstall/CMakeLists.txt
index 67f805734..c5eddd32b 100644
--- a/src/modules/netinstall/CMakeLists.txt
+++ b/src/modules/netinstall/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
-
 calamares_add_plugin( netinstall
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
@@ -15,6 +13,6 @@ calamares_add_plugin( netinstall
     LINK_PRIVATE_LIBRARIES
         calamaresui
         Qt5::Network
-        ${YAMLCPP_LIBRARY}
+        yamlcpp
     SHARED_LIB
 )