diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp
index a5010b7e6..8237fcaa4 100644
--- a/indra/llmessage/aicurl.cpp
+++ b/indra/llmessage/aicurl.cpp
@@ -39,6 +39,9 @@
 
 #include "linden_common.h"
 
+#if LL_WINDOWS
+#include <winsock2.h> //remove classic winsock from windows.h
+#endif
 #define OPENSSL_THREAD_DEFINES
 #include <openssl/opensslconf.h>	// OPENSSL_THREADS
 #include <openssl/crypto.h>
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 70c6f771f..53ba137d0 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -1416,7 +1416,7 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
 			{
 				found_format = TRUE;
 			}
-			else if(cur_format >= num_formats-1)
+			else if(cur_format >= (S32)num_formats-1)
 			{
 				cur_format = 0;
 				found_format = TRUE;