diff --git a/include/bx/inline/cpu.inl b/include/bx/inline/cpu.inl
index f446f8034..b5a83a4f6 100644
--- a/include/bx/inline/cpu.inl
+++ b/include/bx/inline/cpu.inl
@@ -12,7 +12,9 @@
 #		include <windows.h>
 #	endif // BX_PLATFORM_WINRT
 
-#	include <emmintrin.h> // _mm_fence
+#	if BX_CPU_X86
+#		include <emmintrin.h> // _mm_fence
+#	endif
 
 extern "C" void _ReadBarrier();
 #	pragma intrinsic(_ReadBarrier)
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index e92fd69d0..18eeb91a8 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -411,6 +411,7 @@ function toolchain(_buildDir, _libDir)
 		or _ACTION == "vs2013"
 		or _ACTION == "vs2015"
 		or _ACTION == "vs2017"
+		or _ACTION == "vs2019"
 		then
 
 		local action = premake.action.current()