diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 13e5b2f6..722baa2b 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -19,10 +19,6 @@ option(RUN_CLANG_TIDY "Whether or not to run clang-tidy during build. Has no eff
 option(LIBLOOT_BUILD_TESTS "Whether or not to build libloot's tests." ON)
 option(LIBLOOT_INSTALL_DOCS "Whether or not to install libloot's docs (which need to be built separately)." ON)
 
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
 ##############################
 # External Projects
 ##############################
@@ -171,6 +167,10 @@ target_include_directories(loot PRIVATE ${LIBLOOT_INCLUDE_DIRS})
 target_include_directories(loot SYSTEM PRIVATE
     ${LIBLOOT_COMMON_SYSTEM_INCLUDE_DIRS})
 
+set_target_properties(loot PROPERTIES
+    CXX_STANDARD 17
+    CXX_STANDARD_REQUIRED ON)
+
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     target_compile_definitions(loot PRIVATE UNICODE _UNICODE LOOT_EXPORT)
 
@@ -228,7 +228,7 @@ if(MSVC)
         "/MP"
         "/sdl"
         "$<$<CONFIG:Debug>:/RTC1>")
-    target_link_options(loot PRIVATE "/LTCG")
+    target_link_options(loot PRIVATE "/INCREMENTAL:NO" "/LTCG")
 endif()
 
 ##############################
diff --git a/cpp/cmake/tests.cmake b/cpp/cmake/tests.cmake
index 2baff82c..cf3aa15a 100644
--- a/cpp/cmake/tests.cmake
+++ b/cpp/cmake/tests.cmake
@@ -89,6 +89,10 @@ target_include_directories(libloot_tests PRIVATE ${LIBLOOT_INCLUDE_DIRS})
 target_include_directories(libloot_tests SYSTEM PRIVATE
     ${LIBLOOT_COMMON_SYSTEM_INCLUDE_DIRS})
 
+set_target_properties(libloot_tests PROPERTIES
+    CXX_STANDARD 17
+    CXX_STANDARD_REQUIRED ON)
+
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     target_compile_definitions(libloot_tests PRIVATE UNICODE _UNICODE)