diff --git a/common/util/Util/Executor.cpp b/common/util/cpp/Executor.cpp
similarity index 100%
rename from common/util/Util/Executor.cpp
rename to common/util/cpp/Executor.cpp
diff --git a/common/util/fb-util.cabal b/common/util/fb-util.cabal
index 5a56ccbd..77d2e450 100644
--- a/common/util/fb-util.cabal
+++ b/common/util/fb-util.cabal
@@ -102,7 +102,7 @@ library
         Util.Control.Exception
         Util.Control.Monad
         Util.Defer
-        Util.Dll
+        -- Util.Dll
         Util.Encoding
         Util.Err
         Util.EventBase
@@ -112,7 +112,7 @@ library
         Util.FilePath
         Util.Function
         Util.Graph
-        Util.GFlags
+        -- Util.GFlags
         Util.HSE
         Util.HUnit
         Util.HashMap.Strict
@@ -157,6 +157,7 @@ library
         cpp/HsStruct.cpp
         cpp/IOBuf.cpp
         cpp/EventBaseDataplane.cpp
+        cpp/Executor.cpp
         Util/AsanAlloc.cpp
         -- Util/GFlags.cpp
 
@@ -169,7 +170,7 @@ library
         cpp/memory.h
         cpp/wrap.h
         Util/AsanAlloc.h
-  
+
     include-dirs: .
     hs-source-dirs: .
 
@@ -230,7 +231,7 @@ library
     -- by ghc, because we depend on a Haskell package (mangle).
     hsc2hs-options: --cc=g++ --lflag=-lstdc++ --cflag=-D__HSC2HS__=1 --cflag=-std=c++17
 
-    pkgconfig-depends: libfolly, libglog
+    pkgconfig-depends: libfolly, libglog, libevent, fmt
     extra-libraries: double-conversion, gflags
 
 common test-common
diff --git a/cpp-channel/thrift-cpp-channel.cabal b/cpp-channel/thrift-cpp-channel.cabal
index 9d4bb6d4..66c7bab9 100644
--- a/cpp-channel/thrift-cpp-channel.cabal
+++ b/cpp-channel/thrift-cpp-channel.cabal
@@ -94,11 +94,16 @@ library
     hsc2hs-options: --cc=g++ --lflag=-lstdc++ --cflag=-D__HSC2HS__=1 --lflag=-lboost_context --lflag=-latomic --cflag=-std=c++17
     include-dirs: .
 
-    pkgconfig-depends: libfolly, fmt, openssl, libsodium
+    pkgconfig-depends: fmt, openssl, libsodium, libzstd, zlib
     extra-libraries:
         thriftcpp2
         thriftmetadata
         thriftprotocol
+        -- Note that the order here matters, as thriftanyrep and thrifttyperep
+        -- depend on thrifttype.
+        thrifttyperep
+        thriftanyrep
+        thrifttype
         transport
         rpcmetadata
         concurrency