diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 3a5136c2519372fcaa12439b28f5550dd8cccdc9..e53b067510e902988d1800566ddf32ee9ce8cee0 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -142,7 +142,7 @@ if (WINDOWS)
   endif()
 
   set(GLOBAL_CXX_FLAGS 
-      "/GS /W3 /c /Zc:__cplusplus  /Zc:forScope /Zc:rvalueCast /Zc:strictStrings /Zc:ternary /nologo"
+      "/GS /W3 /c /Zc:__cplusplus /Zc:forScope /Zc:rvalueCast /Zc:strictStrings /Zc:ternary /nologo"
       )
 
   if (USE_AVX2)
diff --git a/indra/cmake/LLFileSystem.cmake b/indra/cmake/LLFileSystem.cmake
index 2e6c42c30c229028e0e5a9dc2c46081aa99088f9..72bd42ebfdc9222d26eeb75683c1d942a1be4397 100644
--- a/indra/cmake/LLFileSystem.cmake
+++ b/indra/cmake/LLFileSystem.cmake
@@ -1,7 +1,9 @@
 # -*- cmake -*-
+include(Abseil)
+include(Boost)
 
 set(LLFILESYSTEM_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llfilesystem
     )
 
-set(LLFILESYSTEM_LIBRARIES llfilesystem)
+set(LLFILESYSTEM_LIBRARIES llfilesystem ${BOOST_FILESYSTEM_LIBRARY} ${BOOST_SYSTEM_LIBRARY} absl::strings)
diff --git a/indra/llfilesystem/CMakeLists.txt b/indra/llfilesystem/CMakeLists.txt
index ac86f59c10755aa14d84643a57b5f5ffe7a74f15..3c8f6b3d6ea9e183794a9ebe52b6521c7595cedb 100644
--- a/indra/llfilesystem/CMakeLists.txt
+++ b/indra/llfilesystem/CMakeLists.txt
@@ -70,19 +70,20 @@ set(cache_BOOST_LIBRARIES
     )
 
 target_link_libraries(llfilesystem
+    PUBLIC
     ${LLCOMMON_LIBRARIES}
     ${cache_BOOST_LIBRARIES}
     absl::strings
     )
 
 if (WINDOWS)
-  target_link_libraries(llfilesystem Shlwapi)
+  target_link_libraries(llfilesystem PUBLIC Shlwapi)
 endif (WINDOWS)
 
 if (DARWIN)
   include(CMakeFindFrameworks)
   find_library(COCOA_LIBRARY Cocoa)
-  target_link_libraries(llfilesystem ${COCOA_LIBRARY})
+  target_link_libraries(llfilesystem PUBLIC ${COCOA_LIBRARY})
 endif (DARWIN)
 
 if(${CMAKE_VERSION} VERSION_GREATER "3.15.0") 
@@ -107,7 +108,7 @@ if (LL_TESTS)
     LL_ADD_PROJECT_UNIT_TESTS(llfilesystem "${llfilesystem_TEST_SOURCE_FILES}")
 
     # INTEGRATION TESTS
-    set(test_libs llmath llcommon llfilesystem ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES})
+    set(test_libs llmath llcommon llfilesystem ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES} absl::strings)
 
     # TODO: Some of these need refactoring to be proper Unit tests rather than Integration tests.
     LL_ADD_INTEGRATION_TEST(lldir "" "${test_libs}")
diff --git a/indra/llfilesystem/lldiskcache.cpp b/indra/llfilesystem/lldiskcache.cpp
index 3166a5154817ae0df2220c4ff26935ad5b09ae69..dcf23ef9b83ad26a6d14ec7ab043c71cd3b50498 100644
--- a/indra/llfilesystem/lldiskcache.cpp
+++ b/indra/llfilesystem/lldiskcache.cpp
@@ -211,7 +211,7 @@ const std::string LLDiskCache::metaDataToFilepath(const LLUUID& id,
 {
     std::string uuidstr = id.asString();
     const auto& dirdelim = gDirUtilp->getDirDelimiter();
-    return absl::StrCat(sCacheDir, dirdelim, absl::string_view(&uuidstr[0], 1), dirdelim, uuidstr, sCacheFilenameExt);
+    return absl::StrCat(sCacheDir, dirdelim, std::string_view(&uuidstr[0], 1), dirdelim, uuidstr, sCacheFilenameExt);
 }
 
 const std::string LLDiskCache::getCacheInfo()