diff --git a/cachelib/CMakeLists.txt b/cachelib/CMakeLists.txt
index 20598fc55e..b638b79e70 100644
--- a/cachelib/CMakeLists.txt
+++ b/cachelib/CMakeLists.txt
@@ -49,7 +49,7 @@ set(BIN_INSTALL_DIR bin CACHE STRING
     "The subdirectory where binaries should be installed")
 set(TESTS_INSTALL_DIR tests CACHE STRING
     "The subdirectory where test binaries should be installed")
-set(INCLUDE_INSTALL_DIR include/cachelib CACHE STRING
+set(INCLUDE_INSTALL_DIR include CACHE STRING
     "The subdirectory where header files should be installed")
 set(LIB_INSTALL_DIR lib CACHE STRING
     "The subdirectory where libraries should be installed")
@@ -327,7 +327,7 @@ install(
     datatype
     navy
     shm
-  DESTINATION ${INCLUDE_INSTALL_DIR}
+  DESTINATION ${INCLUDE_INSTALL_DIR}/cachelib/
   FILES_MATCHING PATTERN "*.h"
   PATTERN "external" EXCLUDE
   PATTERN "tests" EXCLUDE
@@ -342,7 +342,7 @@ install(
   DIRECTORY
     ${CACHELIB_BUILD}/cachelib/
   DESTINATION
-    ${INCLUDE_INSTALL_DIR}
+    ${INCLUDE_INSTALL_DIR}/cachelib/
   FILES_MATCHING
     PATTERN "gen-cpp2/*.h"
     PATTERN "gen-cpp2/*.tcc"
diff --git a/cachelib/benchmarks/CMakeLists.txt b/cachelib/benchmarks/CMakeLists.txt
index d7a9f63806..d417f1d552 100644
--- a/cachelib/benchmarks/CMakeLists.txt
+++ b/cachelib/benchmarks/CMakeLists.txt
@@ -24,6 +24,7 @@ if (BUILD_TESTS)
     cachelib_datatype
     cachelib_allocator
     Folly::follybenchmark
+    Folly::folly_subprocess
     glog::glog
     gflags
     GTest::gtest
diff --git a/cachelib/common/CMakeLists.txt b/cachelib/common/CMakeLists.txt
index d3de8e6e59..6985c74705 100644
--- a/cachelib/common/CMakeLists.txt
+++ b/cachelib/common/CMakeLists.txt
@@ -42,9 +42,9 @@ target_link_libraries(cachelib_common PUBLIC
   FBThrift::thriftprotocol
   Folly::folly
   Folly::follybenchmark
-  Folly::folly_exception_tracer
-  Folly::folly_exception_tracer_base
-  Folly::folly_exception_counter
+  Folly::folly_experimental_exception_tracer_exception_tracer
+  Folly::folly_experimental_exception_tracer_exception_tracer_base
+  Folly::folly_experimental_exception_tracer_exception_counter
   GTest::gtest
   ${XXHASH_LIBRARY}
 )