diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14aff86b27..f7e6945fae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,6 +156,7 @@ if (CXX_CLANG_CL)
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-reserved-identifier>
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-deprecated-declarations>
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type-mismatch>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c99-extensions>
         $<$<COMPILE_LANGUAGE:C,CXX>:/EHsc>)
     # REQUIRED CPU features IN Windows-amd64
     if (ARCHITECTURE_x86_64)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ab493d21ca..cd9b1e93c9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -169,21 +169,6 @@ else()
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter>
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>)
 
-    if (MSVC)
-        add_compile_options(
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++17-compat>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++11-compat-reserved-user-defined-literal>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++11-compat-deprecated-writable-strings>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++11-compat-pedantic>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++11-compat>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++0x-compat>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++98-c++11-compat-binary-literal>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++98-compat-pedantic>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++98-compat>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c99-compat>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c98-compat>)
-    endif()
-
     if (CXX_CLANG OR CXX_ICC OR CXX_APPLE) # Clang, AppleClang, or Intel C++
         if (NOT MSVC)
             add_compile_options(