diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
index 5097d2d6033fc2ce9cb35b34e4296490b70c2331..a5a64ef0a637523f599e35ee17e9e446b26bb5e8 100644
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -179,7 +179,7 @@ void LLMotionController::deleteAllMotions()
 	// mAllMotions to mDeprecatedMotions in method
 	// LLMotionController::deprecateMotionInstance().  Thus, we should also clean
 	// up the mDeprecatedMotions list as well.
-	for_each(mDeprecatedMotions.begin(), mDeprecatedMotions.end(), DeletePointer());
+	std::for_each(mDeprecatedMotions.begin(), mDeprecatedMotions.end(), DeletePointer());
 	mDeprecatedMotions.clear();
 }
 
diff --git a/indra/llcharacter/llmotioncontroller.h b/indra/llcharacter/llmotioncontroller.h
index 7f4627dad285c0591f5873ec46768666ec9f947a..b3eb4e147ea7373c2a68b85a64844b49a4a8cdcb 100644
--- a/indra/llcharacter/llmotioncontroller.h
+++ b/indra/llcharacter/llmotioncontroller.h
@@ -87,7 +87,7 @@ class LLMotionController
 {
 public:
 	typedef std::list<LLMotion*> motion_list_t;
-	typedef std::set<LLMotion*> motion_set_t;
+	typedef absl::flat_hash_set<LLMotion*> motion_set_t;
 	BOOL mIsSelf;
 	
 public: