diff --git a/indra/llcorehttp/examples/http_texture_load.cpp b/indra/llcorehttp/examples/http_texture_load.cpp
index 9d9631b98078263b7666894b4d190aa04d8f5f82..7fadd3d388fbf34d6f21ba27cc64ffd6bac8d66f 100755
--- a/indra/llcorehttp/examples/http_texture_load.cpp
+++ b/indra/llcorehttp/examples/http_texture_load.cpp
@@ -644,7 +644,7 @@ void term_curl()
 unsigned long ssl_thread_id_callback(void)
 {
 #if defined(WIN32)
-	return (unsigned long) GetCurrentThread();
+	return (unsigned long) GetCurrentThreadId();
 #else
 	return (unsigned long) pthread_self();
 #endif
diff --git a/indra/llcorehttp/tests/llcorehttp_test.cpp b/indra/llcorehttp/tests/llcorehttp_test.cpp
index e863ddd13ff75939d3cf4aa4988b065ae79983ed..7022e3ab828e7fb981bb7c351b627bc8a45747db 100755
--- a/indra/llcorehttp/tests/llcorehttp_test.cpp
+++ b/indra/llcorehttp/tests/llcorehttp_test.cpp
@@ -45,6 +45,9 @@
 #include "test_httpheaders.hpp"
 #include "test_httprequestqueue.hpp"
 
+#include "llsd.h"
+#include "lldate.h"
+#include "lluri.h"
 #include "llproxy.h"
 
 unsigned long ssl_thread_id_callback(void);
@@ -115,7 +118,7 @@ void term_curl()
 unsigned long ssl_thread_id_callback(void)
 {
 #if defined(WIN32)
-	return (unsigned long) GetCurrentThread();
+	return (unsigned long) GetCurrentThreadId();
 #else
 	return (unsigned long) pthread_self();
 #endif
diff --git a/indra/llcorehttp/tests/test_allocator.cpp b/indra/llcorehttp/tests/test_allocator.cpp
index 2401c244a01af360e5c8250e1717a98393462958..239f87f3f95dfebd7e50250a8040b2a2c1b9fb01 100755
--- a/indra/llcorehttp/tests/test_allocator.cpp
+++ b/indra/llcorehttp/tests/test_allocator.cpp
@@ -45,8 +45,8 @@
 
 
 #if	defined(WIN32)
-#define	THROW_BAD_ALLOC()	_THROW1(std::bad_alloc)
-#define	THROW_NOTHING()		_THROW0()
+#define	THROW_BAD_ALLOC()
+#define	THROW_NOTHING()		noexcept
 #else
 #define	THROW_BAD_ALLOC()
 #define	THROW_NOTHING()		noexcept
diff --git a/indra/llcorehttp/tests/test_allocator.h b/indra/llcorehttp/tests/test_allocator.h
index 18c7b9472599f610ac06a48a19fbfbc4f11bc0c7..64c17845c2ba703e323bbb0a4600d07f7607cea6 100755
--- a/indra/llcorehttp/tests/test_allocator.h
+++ b/indra/llcorehttp/tests/test_allocator.h
@@ -32,10 +32,10 @@
 
 size_t GetMemTotal();
 #if	defined(WIN32)
-void * operator new(std::size_t size) _THROW1(std::bad_alloc);
-void * operator new[](std::size_t size) _THROW1(std::bad_alloc);
-void operator delete(void * p) _THROW0();
-void operator delete[](void * p) _THROW0();
+void * operator new(std::size_t size);
+void * operator new[](std::size_t size);
+void operator delete(void * p) noexcept;
+void operator delete[](void * p) noexcept;
 #else
 void * operator new(std::size_t size);
 void * operator new[](std::size_t size);