diff --git a/rwgame/CMakeLists.txt b/rwgame/CMakeLists.txt
index cdfed6ee..98da85db 100644
--- a/rwgame/CMakeLists.txt
+++ b/rwgame/CMakeLists.txt
@@ -48,6 +48,7 @@ add_executable(rwgame
 target_include_directories(rwgame
     SYSTEM
     PRIVATE
+        ${Boost_INCLUDE_DIRS}
         ${BULLET_INCLUDE_DIR}
         ${OPENAL_INCLUDE_DIR}
     )
@@ -60,7 +61,7 @@ target_include_directories(rwgame
 target_link_libraries(rwgame
     PRIVATE
         rwengine
-        ${Boost_LIBRARIES}
+        ${Boost_PROGRAM_OPTIONS_LIBRARY}
         ${OPENGL_LIBRARIES}
         ${BULLET_LIBRARIES}
         SDL2::SDL2
diff --git a/rwlib/CMakeLists.txt b/rwlib/CMakeLists.txt
index 2d20ac79..d3151cc5 100644
--- a/rwlib/CMakeLists.txt
+++ b/rwlib/CMakeLists.txt
@@ -50,7 +50,7 @@ target_include_directories(rwlib
 target_include_directories(rwlib
     SYSTEM
     PUBLIC
-        "${Boost_INCLUDE_DIRS}"
+        ${Boost_INCLUDE_DIRS}
     )
 
 target_link_libraries(rwlib
@@ -58,5 +58,6 @@ target_link_libraries(rwlib
         openrw::interface
     PRIVATE
         ${OPENGL_LIBRARIES}
-        ${Boost_LIBRARIES}
+        ${Boost_FILESYSTEM_LIBRARY}
+        ${Boost_SYSTEM_LIBRARY}
     )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index bc2499c4..b4f765a3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,7 +2,7 @@
 #    Unit Tests
 ##############################################################################
 
-find_package(Boost COMPONENTS filesystem unit_test_framework REQUIRED)
+find_package(Boost COMPONENTS filesystem unit_test_framework system REQUIRED)
 
 set(TEST_SOURCES
     main.cpp
@@ -59,6 +59,7 @@ target_compile_definitions(run_tests
 target_include_directories(run_tests
     SYSTEM
     PRIVATE
+        ${Boost_INCLUDE_DIRS}
         ${BULLET_INCLUDE_DIR}
     )
 
@@ -75,7 +76,9 @@ target_link_libraries(run_tests
         ${BULLET_LIBRARIES}
         SDL2::SDL2
         ${PNG_LIBRARIES}
+        ${Boost_FILESYSTEM_LIBRARY}
         ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
+        ${Boost_SYSTEM_LIBRARY}
     )
 
 add_test(UnitTests run_tests)