diff --git a/cmake/thrift.cmake b/cmake/thrift.cmake
index 97c4738f..fd7936e2 100644
--- a/cmake/thrift.cmake
+++ b/cmake/thrift.cmake
@@ -36,6 +36,7 @@ add_cpp2_thrift_library(fbthrift/thrift/lib/thrift/frozen.thrift
 
 add_library(
   dwarfs_thrift_lite OBJECT
+  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp/protocol/TBase64Utils.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp/protocol/TProtocolException.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp/util/VarintUtils.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/FieldRef.cpp
@@ -49,8 +50,11 @@ add_library(
   ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/JSONProtocol.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/JSONProtocolCommon.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/Protocol.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/TableBasedSerializer.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/TableBasedSerializerImpl.cpp
   ${THRIFT_GENERATED_DIR}/thrift/lib/thrift/gen-cpp2/frozen_data.cpp
   ${THRIFT_GENERATED_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types.cpp
+  ${THRIFT_GENERATED_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types_compact.cpp
 )
 
 set_property(TARGET dwarfs_thrift_lite PROPERTY CXX_STANDARD 20)
diff --git a/cmake/thrift_library.cmake b/cmake/thrift_library.cmake
index b15d9c06..c5beb7ea 100644
--- a/cmake/thrift_library.cmake
+++ b/cmake/thrift_library.cmake
@@ -65,6 +65,7 @@ function(add_cpp2_thrift_library idlfile)
     ${_THRIFT_GENERATED_DIR}/thrift/${_THRIFT_OUTPUT_PATH}/gen-cpp2/${_THRIFTNAME}_for_each_field.h
     ${_THRIFT_GENERATED_DIR}/thrift/${_THRIFT_OUTPUT_PATH}/gen-cpp2/${_THRIFTNAME}_handlers.h
     ${_THRIFT_GENERATED_DIR}/thrift/${_THRIFT_OUTPUT_PATH}/gen-cpp2/${_THRIFTNAME}_types.cpp
+    ${_THRIFT_GENERATED_DIR}/thrift/${_THRIFT_OUTPUT_PATH}/gen-cpp2/${_THRIFTNAME}_types_compact.cpp
     ${_THRIFT_GENERATED_DIR}/thrift/${_THRIFT_OUTPUT_PATH}/gen-cpp2/${_THRIFTNAME}_types.h
     ${_THRIFT_GENERATED_DIR}/thrift/${_THRIFT_OUTPUT_PATH}/gen-cpp2/${_THRIFTNAME}_types.tcc
     ${_THRIFT_GENERATED_DIR}/thrift/${_THRIFT_OUTPUT_PATH}/gen-cpp2/${_THRIFTNAME}_types_custom_protocol.h
diff --git a/fbthrift b/fbthrift
index dfaaa1cd..4c4e4b49 160000
--- a/fbthrift
+++ b/fbthrift
@@ -1 +1 @@
-Subproject commit dfaaa1cd3f3b2d2d4f4ab40c2cce0ffe561dc780
+Subproject commit 4c4e4b498e278774e9898d8615c67455d84c71bc
diff --git a/folly b/folly
index bb921a17..5d415b5d 160000
--- a/folly
+++ b/folly
@@ -1 +1 @@
-Subproject commit bb921a1756a6bcc7b0fdbc566ccc727edc96ad4e
+Subproject commit 5d415b5d34a5172e013855edd882444637e1598f