diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index d5cd63246..fd724365e 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -101,15 +101,6 @@ static const F32 MEM_INFO_THROTTLE = 20;
 // dropped below the login framerate, we'd have very little additional data.
 static const F32 MEM_INFO_WINDOW = 10*60;
 
-#if LL_WINDOWS
-
-#pragma warning(disable : 4996)
-
-#ifndef _WIN32_WINNT_WIN10
-#define _WIN32_WINNT_WIN10 0x0A00
-#endif
-#endif // LL_WINDOWS
-
 // Wrap boost::regex_match() with a function that doesn't throw.
 template <typename S, typename M, typename R>
 static bool regex_match_no_exc(const S& string, M& match, const R& regex)
@@ -149,7 +140,7 @@ LLOSInfo::LLOSInfo() :
 #if LL_WINDOWS
 	bool is_server = IsWindowsServer();
 	std::string service_pack;
-	if (IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN10), LOBYTE(_WIN32_WINNT_WIN10), 0))
+	if (IsWindows10OrGreater())
 	{
 		if (is_server)
 		{