diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85c9f993b..3f595a237 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -346,10 +346,9 @@ endif()
 
 if(PREFER_SYSTEM_LIBFMT)
   find_package(fmt 10 CONFIG)
-else(PREFER_SYSTEM_LIBFMT)
-  include_directories(${fmt_SOURCE_DIR}/include)
-  
+else(PREFER_SYSTEM_LIBFMT)  
   include(FetchContent)
+
   FetchContent_Declare(
     fmt
     GIT_REPOSITORY ${LIBFMT_GIT_REPO}
@@ -357,7 +356,13 @@ else(PREFER_SYSTEM_LIBFMT)
     OVERRIDE_FIND_PACKAGE
   )
   FetchContent_MakeAvailable(fmt)
-  
+
+  target_include_directories(fmt BEFORE PUBLIC
+    $<BUILD_INTERFACE:${fmt_SOURCE_DIR}/include>  
+    $<INSTALL_INTERFACE:include>
+  )
+
+  include_directories(BEFORE ${fmt_SOURCE_DIR}/include)
 endif(PREFER_SYSTEM_LIBFMT)
 
 find_package(Boost 1.67 REQUIRED COMPONENTS chrono iostreams program_options)
diff --git a/fbthrift b/fbthrift
index 7e7f3e67c..115bc7baa 160000
--- a/fbthrift
+++ b/fbthrift
@@ -1 +1 @@
-Subproject commit 7e7f3e67c13675623168894a167fe99cf13d21e9
+Subproject commit 115bc7baa3d43e25f35e70c219a9f75417bc22c0
diff --git a/folly b/folly
index 661331d60..dc875e505 160000
--- a/folly
+++ b/folly
@@ -1 +1 @@
-Subproject commit 661331d60533c2ef8e82d9650cb9f78306e12e0e
+Subproject commit dc875e505b94733bdc07d10990e54f4af5d3110e