diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
index 0960d38907e16afe82e050af1f3d9b15290b4e15..c1ab93eae18d637882579d1694438f4c612a946f 100644
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -30,7 +30,7 @@
 #include "llgl.h"
 #include "llrender.h"
 #include "llstaticstringtable.h"
-#include <unordered_map>
+#include <boost/unordered_map.hpp>
 
 class LLShaderFeatures
 {
@@ -284,8 +284,8 @@ class LLGLSLShader
     U32 mAttributeMask;  //mask of which reserved attributes are set (lines up with LLVertexBuffer::getTypeMask())
     std::vector<GLint> mUniform;   //lookup table of uniform enum to uniform location
     LLStaticStringTable<GLint> mUniformMap; //lookup map of uniform name to uniform location
-    typedef std::unordered_map<GLint, std::string> uniform_name_map_t;
-    typedef std::unordered_map<GLint, LLVector4> uniform_value_map_t;
+    typedef boost::unordered_map<GLint, std::string> uniform_name_map_t;
+    typedef boost::unordered_flat_map<GLint, LLVector4> uniform_value_map_t;
     uniform_name_map_t mUniformNameMap; //lookup map of uniform location to uniform name
     uniform_value_map_t mValue; //lookup map of uniform location to last known value
     std::vector<GLint> mTexture;
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index a12fa3f13003055fd987c1354a52927cfbc00fec..d04f1c51f9bfa6ea53ed81dcbe8a1fc2e234b350 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -56,7 +56,7 @@ U32 wpo2(U32 i);
 
 // texture memory accounting (for OS X)
 static LLMutex sTexMemMutex;
-static std::unordered_map<U32, U32> sTextureAllocs;
+static boost::unordered_flat_map<U32, U32> sTextureAllocs;
 static U64 sTextureBytes = 0;
 
 // track a texture alloc on the currently bound texture.
diff --git a/indra/newview/llgltfmateriallist.h b/indra/newview/llgltfmateriallist.h
index 85e60aa17f3793dc1a05d4330517319c6469370c..1b3ddcf389c5b6cbc7b285306515ee7a69c78e5b 100644
--- a/indra/newview/llgltfmateriallist.h
+++ b/indra/newview/llgltfmateriallist.h
@@ -110,7 +110,7 @@ class LLGLTFMaterialList
         S32 status,
         LLExtStat ext_status);
 
-    typedef std::unordered_map<LLUUID, LLPointer<LLFetchedGLTFMaterial > > uuid_mat_map_t;
+    typedef boost::unordered_map<LLUUID, LLPointer<LLFetchedGLTFMaterial > > uuid_mat_map_t;
     uuid_mat_map_t mList;
 
     typedef std::vector<LLPointer<LLGLTFMaterial> > override_list_t;