diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index c0e21a3b4..801c66425 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -360,6 +360,8 @@ static void cmd_toggle_mark(LLAvatarListEntry* entry)
 static void cmd_ar(const LLAvatarListEntry* entry);
 static void cmd_teleport(const LLAvatarListEntry* entry);
 
+const LLUUID& active_owner_or_id(const LLSD& userdata);
+
 namespace
 {
 	typedef LLMemberListener<LLView> view_listener_t;
@@ -376,7 +378,6 @@ namespace
 	{
 		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) override
 		{
-			const LLUUID& active_owner_or_id(const LLSD& userdata);
 			LLFloaterAvatarList::setFocusAvatar(active_owner_or_id(userdata));
 			return true;
 		}
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index f621f3b6b..d81a604d4 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -66,6 +66,7 @@
 #include "lluploadfloaterobservers.h"
 #include "aicurl.h"
 
+#include <mutex>
 #include "boost/lexical_cast.hpp"
 
 #ifndef LL_WINDOWS