diff --git a/indra/llcommon/llstl.h b/indra/llcommon/llstl.h
index 12b0c4dc1..34ca7dfce 100644
--- a/indra/llcommon/llstl.h
+++ b/indra/llcommon/llstl.h
@@ -274,10 +274,10 @@ inline typename T::iterator get_in_vec(T& invec, P pred)
 template <typename T, typename K>
 inline typename T::value_type::second_type& get_val_in_pair_vec(T& invec, K key)
 {
-	auto it = get_in_vec(invec, [&key](T::value_type& e) { return e.first == key; });
+	auto it = get_in_vec(invec, [&key](typename T::value_type& e) { return e.first == key; });
 	if (it == invec.end())
 	{
-		invec.emplace_back(key, T::value_type::second_type());
+		invec.emplace_back(key, typename T::value_type::second_type());
 		return invec.back().second;
 	}
 	return it->second;
diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index 3447b521a..7c67b9a3d 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -315,7 +315,6 @@ namespace
 	{
 		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 		{
-			const LLUUID get_focused_list_id_selected();
 			LLFloaterAvatarList::instance().setFocusAvatar(get_focused_list_id_selected());
 			return true;
 		}
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h
index 2a5f479bc..72a2b80fa 100644
--- a/indra/newview/llviewermenu.h
+++ b/indra/newview/llviewermenu.h
@@ -141,6 +141,8 @@ bool handle_go_to();
 // Export to XML or Collada
 void handle_export_selected( void * );
 
+const LLUUID get_focused_list_id_selected();
+
 class LLViewerMenuHolderGL : public LLMenuHolderGL
 {
 public: