diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd64eec6..5edfe9a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -270,6 +270,7 @@ add_dependencies(loot
     libloadorder
     loot-condition-interpreter)
 target_link_libraries(loot PRIVATE
+    Boost::headers
     ${ESPLUGIN_LIBRARIES}
     ${LIBLOADORDER_LIBRARIES}
     ${LCI_LIBRARIES}
@@ -288,7 +289,6 @@ set(LIBLOOT_COMMON_SYSTEM_INCLUDE_DIRS
     ${LIBLOADORDER_INCLUDE_DIRS}
     ${ESPLUGIN_INCLUDE_DIRS}
     ${LCI_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
     ${ICU_INCLUDE_DIRS})
 
 target_include_directories(loot PRIVATE ${LIBLOOT_INCLUDE_DIRS})
diff --git a/cmake/tests.cmake b/cmake/tests.cmake
index 9a763e60..e6027080 100644
--- a/cmake/tests.cmake
+++ b/cmake/tests.cmake
@@ -106,6 +106,7 @@ add_dependencies(libloot_internals_tests
     loot-condition-interpreter
     yaml-cpp)
 target_link_libraries(libloot_internals_tests PRIVATE
+    Boost::headers
     ${ESPLUGIN_LIBRARIES}
     ${LIBLOADORDER_LIBRARIES}
     ${LCI_LIBRARIES}
@@ -116,7 +117,7 @@ target_link_libraries(libloot_internals_tests PRIVATE
 # Build API tests.
 add_executable(libloot_tests ${LIBLOOT_INTERFACE_TESTS_ALL_SOURCES})
 add_dependencies(libloot_tests loot)
-target_link_libraries(libloot_tests PRIVATE loot GTest::gtest_main)
+target_link_libraries(libloot_tests PRIVATE loot Boost::headers GTest::gtest_main)
 
 
 ##############################
@@ -131,7 +132,6 @@ set(LIBLOOT_COMMON_SYSTEM_INCLUDE_DIRS
 ${LIBLOADORDER_INCLUDE_DIRS}
 ${ESPLUGIN_INCLUDE_DIRS}
 ${LCI_INCLUDE_DIRS}
-${Boost_INCLUDE_DIRS}
 ${ICU_INCLUDE_DIRS})
 
 target_include_directories(libloot_internals_tests PRIVATE