diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1748ed9347..2a04eba0d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -244,6 +244,13 @@ if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
   add_compile_options(/volatile:iso)
   # Fix non-conformant lambda behavior (constexpr variables shouldn't need capturing)
   add_compile_options(/experimental:newLambdaProcessor)
+  # Fix various other non-conformant behaviors
+  add_compile_options(/Zc:externConstexpr,lambda,preprocessor)
+
+  # Temporarily disable warnings to enable /Zc:preprocessor compatibility with WinSDK headers.
+  add_compile_options(
+    /wd5105 # macro expansion producing 'defined' has undefined behavior
+  )
 
   string(APPEND CMAKE_EXE_LINKER_FLAGS " /NXCOMPAT")
 else()