diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h
index 31bbd9036..fe4fb2676 100644
--- a/indra/llcommon/lluuid.h
+++ b/indra/llcommon/lluuid.h
@@ -31,6 +31,7 @@
 #include <vector>
 #include <functional>
 #include <boost/functional/hash.hpp>
+#include <boost/unordered_set.hpp>
 #include "stdtypes.h"
 #include "llpreprocessor.h"
 
@@ -289,7 +290,7 @@ inline U32 LLUUID::getCRC32() const
 }
 
 typedef std::vector<LLUUID> uuid_vec_t;
-typedef std::set<LLUUID> uuid_set_t;
+typedef boost::unordered_set<LLUUID> uuid_set_t;
 
 // Helper structure for ordering lluuids in stl containers.  eg:
 // std::map<LLUUID, LLWidget*, lluuid_less> widget_map;
diff --git a/indra/newview/jcfloaterareasearch.h b/indra/newview/jcfloaterareasearch.h
index 05b199185..32c40c253 100644
--- a/indra/newview/jcfloaterareasearch.h
+++ b/indra/newview/jcfloaterareasearch.h
@@ -38,6 +38,7 @@
 #include "lluuid.h"
 #include "llstring.h"
 #include "llframetimer.h"
+#include <boost/unordered_map.hpp>
 
 class LLTextBox;
 class LLScrollListCtrl;
@@ -92,7 +93,7 @@ private:
 		LLUUID group_id;
 	};
 	uuid_set_t mPendingObjects;
-	std::map<LLUUID, ObjectData> mCachedObjects;
+	boost::unordered_map<LLUUID, ObjectData> mCachedObjects;
 
 	std::string mFilterStrings[LIST_OBJECT_COUNT];
 };
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 463f3404f..4aaf69c1b 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -641,7 +641,7 @@ namespace action_give_inventory
 		return acceptable;
 	}
 
-	static void build_items_string(const boost::unordered_set<LLUUID>& inventory_selected_uuids, std::string& items_string)
+	static void build_items_string(const uuid_set_t& inventory_selected_uuids, std::string& items_string)
 	{
 		llassert(inventory_selected_uuids.size() > 0);
 
@@ -836,10 +836,10 @@ void LLAvatarActions::buildResidentsString(const uuid_vec_t& avatar_uuids, std::
 }
 
 //static
-boost::unordered_set<LLUUID> LLAvatarActions::getInventorySelectedUUIDs()
+uuid_set_t LLAvatarActions::getInventorySelectedUUIDs()
 {
 	LLInventoryPanel* active_panel = action_give_inventory::get_active_inventory_panel();
-	return active_panel ? active_panel->getRootFolder()->getSelectionList() : boost::unordered_set<LLUUID>(); 
+	return active_panel ? active_panel->getRootFolder()->getSelectionList() : uuid_set_t(); 
 	/*std::set<LLFolderViewItem*> inventory_selected;
 
 	LLInventoryPanel* active_panel = action_give_inventory::get_active_inventory_panel();
@@ -857,7 +857,7 @@ boost::unordered_set<LLUUID> LLAvatarActions::getInventorySelectedUUIDs()
 		}
 	}
 
-	boost::unordered_set<LLUUID> inventory_selected_uuids;
+	uuid_set_t inventory_selected_uuids;
 	for (auto it = inventory_selected.begin(), end_it = inventory_selected.end();
 		it != end_it;
 		++it)
diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h
index 2f597005e..9f75e793f 100644
--- a/indra/newview/llavataractions.h
+++ b/indra/newview/llavataractions.h
@@ -234,7 +234,7 @@ public:
 	 */
 	static void buildResidentsString(const uuid_vec_t& avatar_uuids, std::string& residents_string);
 
-	static boost::unordered_set<LLUUID> getInventorySelectedUUIDs();
+	static uuid_set_t getInventorySelectedUUIDs();
 
 	/**
 	 * Copy the selected avatar's UUID to clipboard
diff --git a/indra/newview/llfloaterblacklist.cpp b/indra/newview/llfloaterblacklist.cpp
index d4409b875..bfbfd0a09 100644
--- a/indra/newview/llfloaterblacklist.cpp
+++ b/indra/newview/llfloaterblacklist.cpp
@@ -23,7 +23,7 @@ LLFloaterBlacklist* LLFloaterBlacklist::sInstance;
 uuid_vec_t LLFloaterBlacklist::blacklist_textures;
 uuid_vec_t LLFloaterBlacklist::blacklist_objects;
 
-std::map<LLUUID,LLSD> LLFloaterBlacklist::blacklist_entries;
+boost::unordered_map<LLUUID,LLSD> LLFloaterBlacklist::blacklist_entries;
 
 LLFloaterBlacklist::LLFloaterBlacklist()
 :	LLFloater()
diff --git a/indra/newview/llfloaterblacklist.h b/indra/newview/llfloaterblacklist.h
index dd666db57..c15c99a9c 100644
--- a/indra/newview/llfloaterblacklist.h
+++ b/indra/newview/llfloaterblacklist.h
@@ -28,7 +28,7 @@ public:
 	*/
 	static void addEntry(LLUUID key, LLSD data);
 
-	static std::map<LLUUID,LLSD> blacklist_entries;
+	static boost::unordered_map<LLUUID,LLSD> blacklist_entries;
 	static uuid_vec_t blacklist_textures;
 	static uuid_vec_t blacklist_objects;
 		
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 806452991..a8223bec4 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -865,9 +865,9 @@ void LLFolderView::clearSelection()
 	mSelectThisID.setNull();
 }
 
-boost::unordered_set<LLUUID> LLFolderView::getSelectionList() const
+uuid_set_t LLFolderView::getSelectionList() const
 {
-	boost::unordered_set<LLUUID> selection;
+	uuid_set_t selection;
 	for (const auto& item : mSelectedItems)
 	{
 		selection.insert(item->getListener()->getUUID());
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index c85238f50..848787632 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -160,7 +160,7 @@ public:
 	// children, and keeps track of selected objects.
 	virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected);
 
-	virtual boost::unordered_set<LLUUID> getSelectionList() const;
+	virtual uuid_set_t getSelectionList() const;
 
 	// Make sure if ancestor is selected, descendants are not
 	void sanitizeSelection();
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index ddf0780a4..dab9a1a95 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -378,9 +378,9 @@ void LLFolderViewItem::setSelectionFromRoot(LLFolderViewItem* selection,
 	getRoot()->setSelection(selection, openitem, take_keyboard_focus);
 }
 
-boost::unordered_set<LLUUID> LLFolderViewItem::getSelectionList() const
+uuid_set_t LLFolderViewItem::getSelectionList() const
 {
-	return boost::unordered_set<LLUUID>();
+	return uuid_set_t();
 }
 
 EInventorySortGroup LLFolderViewItem::getSortGroup()  const
diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h
index 655e23e89..9bb163c80 100644
--- a/indra/newview/llfolderviewitem.h
+++ b/indra/newview/llfolderviewitem.h
@@ -220,7 +220,7 @@ public:
 	virtual void selectItem();
 
 	// gets multiple-element selection
-	virtual boost::unordered_set<LLUUID> getSelectionList() const;
+	virtual uuid_set_t getSelectionList() const;
 
 	// Returns true is this object and all of its children can be removed (deleted by user)
 	virtual BOOL isRemovable();
diff --git a/indra/newview/llgesturemgr.h b/indra/newview/llgesturemgr.h
index 56ad7f097..eb23faf69 100644
--- a/indra/newview/llgesturemgr.h
+++ b/indra/newview/llgesturemgr.h
@@ -186,7 +186,7 @@ private:
 	std::vector<LLMultiGesture*> mPlaying;	
 	bool mValid;
 
-	boost::unordered_set<LLUUID> mLoadingAssets;
+	uuid_set_t mLoadingAssets;
 };
 
 #endif
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index da0773f5a..ae4197578 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1710,7 +1710,7 @@ void LLPanelObjectInventory::updateInventory()
 	//		<< " panel UUID: " << panel->mTaskUUID << "\n"
 	//		<< " task  UUID: " << object->mID << LL_ENDL;
 	// We're still interested in this task's inventory.
-	boost::unordered_set<LLUUID> selected_items;
+	uuid_set_t selected_items;
 	BOOL inventory_has_focus = FALSE;
 	if (mHaveInventory)
 	{
diff --git a/indra/newview/llviewerobjectbackup.h b/indra/newview/llviewerobjectbackup.h
index 2b2283dff..7c1b13616 100644
--- a/indra/newview/llviewerobjectbackup.h
+++ b/indra/newview/llviewerobjectbackup.h
@@ -212,7 +212,7 @@ private:
 	std::string mFolder;
 
 	// Export texture list
-	typedef boost::unordered_set<LLUUID> textures_set_t;
+	typedef uuid_set_t textures_set_t;
 	textures_set_t mTexturesList;
 	textures_set_t mBadPermsTexturesList;