diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h
index 5cfcdab41cd331c43df806e628e0ace851492b89..3efebda6329803a89ee9fa0860495268642f237a 100755
--- a/indra/llcommon/linden_common.h
+++ b/indra/llcommon/linden_common.h
@@ -33,11 +33,9 @@
 // are not precompiled.
 
 #if defined(LL_WINDOWS) && defined(_DEBUG)
-# if _MSC_VER >= 1400 // Visual C++ 2005 or later
 #  define _CRTDBG_MAP_ALLOC
 #  include <stdlib.h>
 #  include <crtdbg.h>
-# endif
 #endif
 
 #include "llpreprocessor.h"
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
index c236dae06211dfc191f58a95e42d5d3fdc8088a8..319ab954cc76053f90dc522024521834e0edf045 100755
--- a/indra/llmath/llmath.h
+++ b/indra/llmath/llmath.h
@@ -43,11 +43,7 @@
 
 
 // work around for Windows & older gcc non-standard function names.
-#if (LL_WINDOWS && (_MSC_VER < 1900))
-#include <float.h>
-#define llisnan(val)	_isnan(val)
-#define llfinite(val)	_finite(val)
-#elif (LL_LINUX && __GNUC__ <= 2)
+#if (LL_LINUX && __GNUC__ <= 2)
 #define llisnan(val)	isnan(val)
 #define llfinite(val)	isfinite(val)
 #else
@@ -153,36 +149,12 @@ inline F64 llabs(const F64 a)
 
 inline S32 lltrunc( F32 f )
 {
-#if LL_WINDOWS && !defined( __INTEL_COMPILER ) && !defined(_WIN64) && !(_MSC_VER >= 1800)
-		// Avoids changing the floating point control word.
-		// Add or subtract 0.5 - epsilon and then round
-		const static U32 zpfp[] = { 0xBEFFFFFF, 0x3EFFFFFF };
-		S32 result;
-		__asm {
-			fld		f
-			mov		eax,	f
-			shr		eax,	29
-			and		eax,	4
-			fadd	dword ptr [zpfp + eax]
-			fistp	result
-		}
-		return result;
-#else
-#ifdef LL_CPP11
-		return (S32)trunc(f);
-#else
-		return (S32)f;
-#endif
-#endif
+	return (S32)trunc(f);
 }
 
 inline S32 lltrunc( F64 f )
 {
-#ifdef LL_CPP11
 	return (S32)trunc(f);
-#else
-	return (S32)f;
-#endif
 }
 
 inline S32 llfloor( F32 f )