diff --git a/cmake/CommonModules/TinyCommon.cmake b/cmake/CommonModules/TinyCommon.cmake
index f61f4e247..344d3d88b 100644
--- a/cmake/CommonModules/TinyCommon.cmake
+++ b/cmake/CommonModules/TinyCommon.cmake
@@ -96,6 +96,8 @@ ${TINY_UNPARSED_ARGUMENTS}")
             /Zc:__cplusplus
             # Standards-conforming behavior
             /Zc:strictStrings
+            # # C/C++ conformant preprocessor
+            /Zc:preprocessor
             # Enable Additional Security Checks for Debug builds only
             $<$<CONFIG:Debug>:/sdl>
             /W4
diff --git a/qmake/common/winconf.pri b/qmake/common/winconf.pri
index eeed29a15..8ba804197 100644
--- a/qmake/common/winconf.pri
+++ b/qmake/common/winconf.pri
@@ -68,7 +68,8 @@ win32-msvc|win32-clang-msvc {
 # ---
 
 win32-msvc {
-    QMAKE_CXXFLAGS += -guard:cf -bigobj
+    # C/C++ conformant preprocessor
+    QMAKE_CXXFLAGS += -guard:cf -bigobj -Zc:preprocessor
     QMAKE_CXXFLAGS_WARN_ON = -external:anglebrackets -external:W0 -W4 -wd4702
                              # Enable and check it from time to time
 #                             -external:templates-