diff --git a/indra/llcharacter/llkeyframemotion.h b/indra/llcharacter/llkeyframemotion.h
index 62273b719..82244465b 100644
--- a/indra/llcharacter/llkeyframemotion.h
+++ b/indra/llcharacter/llkeyframemotion.h
@@ -183,7 +183,7 @@ namespace LLKeyframeMotionLerp
 	template<>
 	inline LLQuaternion lerp(F32 t, const LLQuaternion& before, const LLQuaternion& after)
 	{
-		return ::nlerp(t, before, after);
+		return nlerp(t, before, after);
 	}
 }
 
diff --git a/indra/llcommon/llindexedvector.h b/indra/llcommon/llindexedvector.h
index aa950eeb5..a1c388aa4 100644
--- a/indra/llcommon/llindexedvector.h
+++ b/indra/llcommon/llindexedvector.h
@@ -79,7 +79,7 @@ public:
 		return std::find_if(mVector.begin(), mVector.end(), [&k](const typename vec_type_t::value_type& e) { return e.first == k; });
 	}
 
-	typedef DeletePairedPointer DeletePointer;
+	using DeletePointer = ::DeletePairedPointer;
 };
 
 template <typename Type, typename Key, int BlockSize = 32>
@@ -189,7 +189,7 @@ public:
 		}
 	}
 
-	typedef DeletePointer DeletePointer;
+	using DeletePointer = ::DeletePointer;
 };
 
 template <typename Type, typename Key, int BlockSize = 32>