diff --git a/neo/idlib/Str.h b/neo/idlib/Str.h
index 9b2d1030..35d037c3 100644
--- a/neo/idlib/Str.h
+++ b/neo/idlib/Str.h
@@ -40,6 +40,7 @@ If you have questions concerning this license or the applicable additional terms
 */
 
 // these library functions should not be used for cross platform compatibility
+#ifndef IDSTR_NO_REDIRECT
 #define strcmp			idStr::Cmp		// use_idStr_Cmp
 #define strncmp			use_idStr_Cmpn
 
@@ -76,6 +77,7 @@ If you have questions concerning this license or the applicable additional terms
 #define _snprintf		use_idStr_snPrintf
 #define vsnprintf		use_idStr_vsnPrintf
 #define _vsnprintf		use_idStr_vsnPrintf
+#endif
 
 class idVec4;
 
diff --git a/neo/sys/cpu.cpp b/neo/sys/cpu.cpp
index 4baf53c4..507b79ed 100644
--- a/neo/sys/cpu.cpp
+++ b/neo/sys/cpu.cpp
@@ -28,6 +28,9 @@ If you have questions concerning this license or the applicable additional terms
 
 #include <SDL_cpuinfo.h>
 
+// MSVC header intrin.h uses strcmp and errors out when not set
+#define IDSTR_NO_REDIRECT
+
 #include "sys/platform.h"
 #include "framework/Common.h"