diff --git a/mcrouter/lib/Makefile.am b/mcrouter/lib/Makefile.am
index 38ba5a7ab..2da30334c 100644
--- a/mcrouter/lib/Makefile.am
+++ b/mcrouter/lib/Makefile.am
@@ -92,11 +92,15 @@ libmcrouter_a_SOURCES = \
   carbon/Util.h \
   carbon/Variant.h \
   carbon/gen-cpp2/carbon_result_types.cpp \
+  carbon/gen-cpp2/carbon_result_types_compact.cpp \
+  carbon/gen-cpp2/carbon_result_types_binary.cpp \
   carbon/gen-cpp2/carbon_result_types.h \
   carbon/gen-cpp2/carbon_result_types.tcc \
   carbon/gen-cpp2/carbon_result_data.cpp \
   carbon/gen-cpp2/carbon_result_data.h \
   carbon/gen-cpp2/carbon_types.cpp \
+  carbon/gen-cpp2/carbon_types_compact.cpp \
+  carbon/gen-cpp2/carbon_types_binary.cpp \
   carbon/gen-cpp2/carbon_types.h \
   carbon/gen-cpp2/carbon_types.tcc \
   carbon/gen-cpp2/carbon_data.cpp \
@@ -191,6 +195,8 @@ libmcrouter_a_SOURCES = \
   network/gen/MemcacheMessagesThrift.cpp \
   network/gen/MemcacheMessages.h \
   network/gen/gen-cpp2/Common_types.cpp \
+  network/gen/gen-cpp2/Common_types_compact.cpp \
+  network/gen/gen-cpp2/Common_types_binary.cpp \
   network/gen/gen-cpp2/Common_types.h \
   network/gen/gen-cpp2/Common_types.tcc \
   network/gen/gen-cpp2/Common_data.cpp \
@@ -200,11 +206,15 @@ libmcrouter_a_SOURCES = \
   network/gen/gen-cpp2/MemcacheService_constants.cpp \
   network/gen/gen-cpp2/MemcacheService_constants.h \
   network/gen/gen-cpp2/MemcacheService_types.cpp \
+  network/gen/gen-cpp2/MemcacheService_types_compact.cpp \
+  network/gen/gen-cpp2/MemcacheService_types_binary.cpp \
   network/gen/gen-cpp2/MemcacheService_types.h \
   network/gen/gen-cpp2/MemcacheService_types.tcc \
   network/gen/gen-cpp2/MemcacheService_data.cpp \
   network/gen/gen-cpp2/MemcacheService_data.h \
   network/gen/gen-cpp2/Memcache_types.cpp \
+  network/gen/gen-cpp2/Memcache_types_compact.cpp \
+  network/gen/gen-cpp2/Memcache_types_binary.cpp \
   network/gen/gen-cpp2/Memcache_types.h \
   network/gen/gen-cpp2/Memcache_types.tcc \
   network/gen/gen-cpp2/Memcache_data.cpp \
diff --git a/mcrouter/lib/carbon/Makefile.am b/mcrouter/lib/carbon/Makefile.am
index deba6c205..238ea0736 100644
--- a/mcrouter/lib/carbon/Makefile.am
+++ b/mcrouter/lib/carbon/Makefile.am
@@ -5,17 +5,23 @@
 
 BUILT_SOURCES = \
   gen-cpp2/carbon_result_types.cpp \
+  gen-cpp2/carbon_result_types_compact.cpp \
+  gen-cpp2/carbon_result_types_binary.cpp \
   gen-cpp2/carbon_result_types.h \
   gen-cpp2/carbon_result_types.tcc \
   gen-cpp2/carbon_result_data.cpp \
   gen-cpp2/carbon_result_data.h \
   gen-cpp2/carbon_types.cpp \
+  gen-cpp2/carbon_types_compact.cpp \
+  gen-cpp2/carbon_types_binary.cpp \
   gen-cpp2/carbon_types.h \
   gen-cpp2/carbon_types.tcc \
   gen-cpp2/carbon_data.cpp \
   gen-cpp2/carbon_data.h
 
 gen-cpp2/carbon_result_types.cpp: gen-cpp2/carbon_result_types.h
+gen-cpp2/carbon_result_types_compact.cpp: gen-cpp2/carbon_result_types.h
+gen-cpp2/carbon_result_types_binary.cpp: gen-cpp2/carbon_result_types.h
 gen-cpp2/carbon_result_types.h: gen-cpp2/carbon_result_types.tcc
 gen-cpp2/carbon_result_types.tcc: gen-cpp2/carbon_result_data.cpp
 gen-cpp2/carbon_result_data.cpp: gen-cpp2/carbon_result_data.h
@@ -23,6 +29,8 @@ gen-cpp2/carbon_result_data.h: carbon_result.thrift
 	@FBTHRIFT@ -gen mstch_cpp2:stack_arguments,sync_methods_return_try,include_prefix=mcrouter/lib/carbon/ carbon_result.thrift
 
 gen-cpp2/carbon_types.cpp: gen-cpp2/carbon_types.h
+gen-cpp2/carbon_types_compact.cpp: gen-cpp2/carbon_types.h
+gen-cpp2/carbon_types_binary.cpp: gen-cpp2/carbon_types.h
 gen-cpp2/carbon_types.h: gen-cpp2/carbon_types.tcc
 gen-cpp2/carbon_types.tcc: gen-cpp2/carbon_data.cpp
 gen-cpp2/carbon_data.cpp: gen-cpp2/carbon_data.h
diff --git a/mcrouter/lib/network/gen/Makefile.am b/mcrouter/lib/network/gen/Makefile.am
index b456c64a4..e16692653 100644
--- a/mcrouter/lib/network/gen/Makefile.am
+++ b/mcrouter/lib/network/gen/Makefile.am
@@ -5,11 +5,15 @@
 
 BUILT_SOURCES = \
   gen-cpp2/Common_types.cpp \
+  gen-cpp2/Common_types_compact.cpp \
+  gen-cpp2/Common_types_binary.cpp \
   gen-cpp2/Common_types.h \
   gen-cpp2/Common_types.tcc \
   gen-cpp2/Common_data.cpp \
   gen-cpp2/Common_data.h \
   gen-cpp2/Memcache_types.cpp \
+  gen-cpp2/Memcache_types_compact.cpp \
+  gen-cpp2/Memcache_types_binary.cpp \
   gen-cpp2/Memcache_types.h \
   gen-cpp2/Memcache_types.tcc \
   gen-cpp2/Memcache_data.cpp \
@@ -19,12 +23,16 @@ BUILT_SOURCES = \
   gen-cpp2/MemcacheService_constants.cpp \
   gen-cpp2/MemcacheService_constants.h \
   gen-cpp2/MemcacheService_types.cpp \
+  gen-cpp2/MemcacheService_types_compact.cpp \
+  gen-cpp2/MemcacheService_types_binary.cpp \
   gen-cpp2/MemcacheService_types.h \
   gen-cpp2/MemcacheService_types.tcc \
   gen-cpp2/MemcacheService_data.cpp \
   gen-cpp2/MemcacheService_data.h
 
 gen-cpp2/Common_types.cpp: gen-cpp2/Common_types.h
+gen-cpp2/Common_types_compact.cpp: gen-cpp2/Common_types.h
+gen-cpp2/Common_types_binary.cpp: gen-cpp2/Common_types.h
 gen-cpp2/Common_types.h: gen-cpp2/Common_types.tcc
 gen-cpp2/Common_types.tcc: gen-cpp2/Common_data.cpp
 gen-cpp2/Common_data.cpp: gen-cpp2/Common_data.h
@@ -32,6 +40,8 @@ gen-cpp2/Common_data.h: Common.thrift
 	@FBTHRIFT@ -gen mstch_cpp2:stack_arguments,sync_methods_return_try,deprecated_terse_writes,include_prefix=mcrouter/lib/network/gen -I $(top_srcdir)/.. -I $(INSTALL_DIR)/include/ Common.thrift
 
 gen-cpp2/Memcache_types.cpp: gen-cpp2/Memcache_types.h
+gen-cpp2/Memcache_types_compact.cpp: gen-cpp2/Memcache_types.h
+gen-cpp2/Memcache_types_binary.cpp: gen-cpp2/Memcache_types.h
 gen-cpp2/Memcache_types.h: gen-cpp2/Memcache_types.tcc
 gen-cpp2/Memcache_types.tcc: gen-cpp2/Memcache_data.cpp
 gen-cpp2/Memcache_data.cpp: gen-cpp2/Memcache_data.h