diff --git a/indra/newview/fsfavoritegroups.cpp b/indra/newview/fsfavoritegroups.cpp
index bea6900a79..b7f009ad6c 100644
--- a/indra/newview/fsfavoritegroups.cpp
+++ b/indra/newview/fsfavoritegroups.cpp
@@ -43,7 +43,7 @@ FSFavoriteGroups::~FSFavoriteGroups()
 
 bool FSFavoriteGroups::isFavorite(const LLUUID& group_id) const
 {
-    return mFavoriteGroups.find(group_id) != mFavoriteGroups.end();
+    return mFavoriteGroups.contains(group_id);
 }
 
 void FSFavoriteGroups::addFavorite(const LLUUID& group_id)
@@ -85,15 +85,14 @@ void FSFavoriteGroups::loadFavorites()
 {
     mFavoriteGroups.clear();
 
-    LLSD favorites = gSavedPerAccountSettings.getLLSD("FSFavoriteGroups");
 
-    if (favorites.isArray())
+    if (LLSD favorites = gSavedPerAccountSettings.getLLSD("FSFavoriteGroups"); favorites.isArray())
     {
-        for (LLSD::array_const_iterator it = favorites.beginArray(); it != favorites.endArray(); ++it)
+        for (const auto& groupId : llsd::inArray(favorites))
         {
-            if (it->isUUID())
+            if (groupId.isUUID())
             {
-                mFavoriteGroups.insert(it->asUUID());
+                mFavoriteGroups.insert(groupId.asUUID());
             }
         }
     }
@@ -103,8 +102,7 @@ void FSFavoriteGroups::loadFavorites()
 
 void FSFavoriteGroups::saveFavorites()
 {
-
-    std::set<LLUUID> stale_groups;
+    uuid_set_t stale_groups;
     for (const auto& group_id : mFavoriteGroups)
     {
         if (!gAgent.isInGroup(group_id))
@@ -133,5 +131,3 @@ void FSFavoriteGroups::saveFavorites()
 
     LL_DEBUGS("FavoriteGroups") << "Saved " << mFavoriteGroups.size() << " favorite groups to per-account settings" << LL_ENDL;
 }
-
-
diff --git a/indra/newview/fsfavoritegroups.h b/indra/newview/fsfavoritegroups.h
index 7c75f34f42..c39a418870 100644
--- a/indra/newview/fsfavoritegroups.h
+++ b/indra/newview/fsfavoritegroups.h
@@ -30,8 +30,6 @@
 
 #include "llsingleton.h"
 #include "lluuid.h"
-#include <boost/signals2.hpp>
-#include <set>
 
 class FSFavoriteGroups : public LLSingleton<FSFavoriteGroups>
 {
@@ -43,7 +41,7 @@ public:
     void addFavorite(const LLUUID& group_id);
     void removeFavorite(const LLUUID& group_id);
     void toggleFavorite(const LLUUID& group_id);
-    const std::set<LLUUID>& getFavorites() const { return mFavoriteGroups; }
+    const uuid_set_t& getFavorites() const { return mFavoriteGroups; }
     bool hasFavorites() const { return !mFavoriteGroups.empty(); }
     void loadFavorites();
     void saveFavorites();
@@ -55,7 +53,7 @@ public:
     }
 
 private:
-    std::set<LLUUID> mFavoriteGroups;
+    uuid_set_t mFavoriteGroups;
     favorites_changed_signal_t mFavoritesChangedSignal;
 };