diff --git a/indra/llmessage/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp
index 6ffbc464e..a0196b07a 100644
--- a/indra/llmessage/aicurlthread.cpp
+++ b/indra/llmessage/aicurlthread.cpp
@@ -41,6 +41,7 @@
 #include <fcntl.h>
 #endif
 #include <deque>
+#include <cctype>
 
 // On linux, add -DDEBUG_WINDOWS_CODE_ON_LINUX to test the windows code used in this file.
 #if !defined(DEBUG_WINDOWS_CODE_ON_LINUX) || !defined(LL_LINUX) || defined(LL_RELEASE)
@@ -1615,8 +1616,8 @@ CURLMcode MultiHandle::remove_easy_request(addedEasyRequests_type::iterator cons
 
 void MultiHandle::check_run_count(void)
 {
-  llassert(mAddedEasyRequests.size() >= mRunningHandles);
-  if (mAddedEasyRequests.size() - mRunningHandles > 0)			// There is no need to do this when all easy handles are accounted for.
+  llassert(mAddedEasyRequests.size() >= (size_t)mRunningHandles);
+  if (mAddedEasyRequests.size() - (size_t)mRunningHandles > 0)			// There is no need to do this when all easy handles are accounted for.
   {
 	CURLMsg const* msg;
 	int msgs_left;
diff --git a/indra/llmessage/aihttptimeoutpolicy.cpp b/indra/llmessage/aihttptimeoutpolicy.cpp
index a8099cea4..1add51a09 100644
--- a/indra/llmessage/aihttptimeoutpolicy.cpp
+++ b/indra/llmessage/aihttptimeoutpolicy.cpp
@@ -30,6 +30,7 @@
 
 #include "sys.h"
 #include "aihttptimeoutpolicy.h"
+#define NOMINMAX
 #include "llerror.h"
 #include "lldefs.h"
 #include "v3math.h"
@@ -290,8 +291,8 @@ struct DNS : PolicyOp {
   DNS(int seconds) : mSeconds(seconds) { }
   DNS(int seconds, PolicyOp& op) : PolicyOp(op), mSeconds(seconds) { }
   static void fix(AIHTTPTimeoutPolicy* policy);
-  static int min(void) { return ABS_min_DNS_lookup; }
-  static int max(void) { return ABS_max_DNS_lookup; }
+  static U16 min(void) { return ABS_min_DNS_lookup; }
+  static U16 max(void) { return ABS_max_DNS_lookup; }
   virtual void perform(AIHTTPTimeoutPolicy* policy) const;
 };
 
@@ -300,8 +301,8 @@ struct Connect : PolicyOp {
   Connect(int seconds) : mSeconds(seconds) { }
   Connect(int seconds, PolicyOp& op) : PolicyOp(op), mSeconds(seconds) { }
   static void fix(AIHTTPTimeoutPolicy* policy);
-  static int min(void) { return ABS_min_connect_time; }
-  static int max(void) { return ABS_max_connect_time; }
+  static U16 min(void) { return ABS_min_connect_time; }
+  static U16 max(void) { return ABS_max_connect_time; }
   virtual void perform(AIHTTPTimeoutPolicy* policy) const;
 };
 
@@ -310,8 +311,8 @@ struct Reply : PolicyOp {
   Reply(int seconds) : mSeconds(seconds) { }
   Reply(int seconds, PolicyOp& op) : PolicyOp(op), mSeconds(seconds) { }
   static void fix(AIHTTPTimeoutPolicy* policy);
-  static int min(void) { return ABS_min_reply_delay; }
-  static int max(void) { return ABS_max_reply_delay; }
+  static U16 min(void) { return ABS_min_reply_delay; }
+  static U16 max(void) { return ABS_max_reply_delay; }
   virtual void perform(AIHTTPTimeoutPolicy* policy) const;
 };
 
@@ -321,10 +322,10 @@ struct Speed : PolicyOp {
   Speed(int seconds, int rate) : mSeconds(seconds), mRate(rate) { }
   Speed(int seconds, int rate, PolicyOp& op) : PolicyOp(op), mSeconds(seconds), mRate(rate) { }
   static void fix(AIHTTPTimeoutPolicy* policy);
-  static int min(void) { return ABS_min_low_speed_time; }
-  static int max(AIHTTPTimeoutPolicy const* policy) { return llmin(ABS_max_low_speed_time, (U16)(policy->mMaximumCurlTransaction / 2)); }
-  static int lmin(void) { return ABS_min_low_speed_limit; }
-  static int lmax(void) { return ABS_max_low_speed_limit; }
+  static U16 min(void) { return ABS_min_low_speed_time; }
+  static U16 max(AIHTTPTimeoutPolicy const* policy) { return llmin(ABS_max_low_speed_time, (U16)(policy->mMaximumCurlTransaction / 2)); }
+  static U32 lmin(void) { return ABS_min_low_speed_limit; }
+  static U32 lmax(void) { return ABS_max_low_speed_limit; }
   virtual void perform(AIHTTPTimeoutPolicy* policy) const;
 };
 
@@ -333,8 +334,8 @@ struct Transaction : PolicyOp {
   Transaction(int seconds) : mSeconds(seconds) { }
   Transaction(int seconds, PolicyOp& op) : PolicyOp(op), mSeconds(seconds) { }
   static void fix(AIHTTPTimeoutPolicy* policy);
-  static int min(AIHTTPTimeoutPolicy const* policy) { return llmax((int)ABS_min_transaction, policy->mMaximumConnectTime + policy->mMaximumReplyDelay + 4 * policy->mLowSpeedTime); }
-  static int max(void) { return ABS_max_transaction; }
+  static U16 min(AIHTTPTimeoutPolicy const* policy) { return llmax(ABS_min_transaction, (U16)(policy->mMaximumConnectTime + policy->mMaximumReplyDelay + 4 * policy->mLowSpeedTime)); }
+  static U16 max(void) { return ABS_max_transaction; }
   virtual void perform(AIHTTPTimeoutPolicy* policy) const;
 };
 
@@ -343,8 +344,8 @@ struct Total : PolicyOp {
   Total(int seconds) : mSeconds(seconds) { }
   Total(int seconds, PolicyOp& op) : PolicyOp(op), mSeconds(seconds) { }
   static void fix(AIHTTPTimeoutPolicy* policy);
-  static int min(AIHTTPTimeoutPolicy const* policy) { return llmax((int)ABS_min_total_delay, policy->mMaximumCurlTransaction + 1); }
-  static int max(void) { return ABS_max_total_delay; }
+  static U16 min(AIHTTPTimeoutPolicy const* policy) { return llmax(ABS_min_total_delay, (U16)(policy->mMaximumCurlTransaction + 1)); }
+  static U16 max(void) { return ABS_max_total_delay; }
   virtual void perform(AIHTTPTimeoutPolicy* policy) const;
 };
 
diff --git a/indra/llmessage/llurlrequest.h b/indra/llmessage/llurlrequest.h
index ba046a2e0..8f019310f 100644
--- a/indra/llmessage/llurlrequest.h
+++ b/indra/llmessage/llurlrequest.h
@@ -45,6 +45,8 @@ class Injector
 	typedef LLHTTPClient::ResponderBase::buffer_ptr_t buffer_ptr_t;
 	virtual char const* contentType(void) const = 0;
 	virtual U32 get_body(LLChannelDescriptors const& channels, buffer_ptr_t& buffer) = 0;
+	// To avoid compiler warning.
+	virtual ~Injector() { }
 };
 
 class LLURLRequest : public AICurlEasyRequestStateMachine {
diff --git a/indra/newview/llxmlrpcresponder.cpp b/indra/newview/llxmlrpcresponder.cpp
index 43997c60e..dac69a7f1 100644
--- a/indra/newview/llxmlrpcresponder.cpp
+++ b/indra/newview/llxmlrpcresponder.cpp
@@ -173,7 +173,7 @@ void XMLRPCResponder::completedRaw(U32 status, std::string const& reason, LLChan
 		mBufferSize = buffer->count(channels.in());
 		if (200 <= status && status < 400)
 		{
-			char* ptr;
+			char* ptr = NULL;
 			char* buf = NULL;
 			LLMutexLock lock(buffer->getMutex());
 			LLBufferArray::const_segment_iterator_t const end = buffer->endSegment();