diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index ef8c17e9a8..74e6669b6b 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -106,6 +106,8 @@ if (WINDOWS)
       /Zc:forScope
       /nologo
       /Oy-
+      /Oi
+      /Ot
       /arch:AVX
       /fp:fast
       )
@@ -118,6 +120,8 @@ if (WINDOWS)
       /Zc:forScope
       /nologo
       /Oy-
+      /Oi
+      /Ot
       /arch:AVX2
       /fp:fast
       )
@@ -131,6 +135,8 @@ if (WINDOWS)
       /Zc:forScope
       /nologo
       /Oy-
+      /Oi
+      /Ot
 #      /arch:SSE2
       /fp:fast
       )