diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index 98c9eabcd65eab0eabcc555d3c7b1327c37e3fca..9ed7ed1cf1ddf06be6cf9ead5190a21607966b10 100644
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -41,7 +41,11 @@
 #	define WIN32_LEAN_AND_MEAN
 #	include <winsock2.h>
 #	include <windows.h>
-#   include <intrin.h>
+#	define _interlockedbittestandset _renamed_interlockedbittestandset
+#	define _interlockedbittestandreset _renamed_interlockedbittestandreset
+#	include <intrin.h>
+#	undef _interlockedbittestandset
+#	undef _interlockedbittestandreset
 #endif
 
 #include "llsd.h"