diff --git a/fdbclient/BackupContainer.actor.cpp b/fdbclient/BackupContainer.actor.cpp
index ebd1ea4a5e..9cf2d0c0c3 100644
--- a/fdbclient/BackupContainer.actor.cpp
+++ b/fdbclient/BackupContainer.actor.cpp
@@ -37,7 +37,9 @@
 #include "fdbrpc/simulator.h"
 #include "flow/Platform.h"
 #include "fdbclient/AsyncFileS3BlobStore.actor.h"
+#ifdef BUILD_AZURE_BACKUP
 #include "fdbclient/BackupContainerAzureBlobStore.h"
+#endif
 #include "fdbclient/BackupContainerFileSystem.h"
 #include "fdbclient/BackupContainerLocalDirectory.h"
 #include "fdbclient/BackupContainerS3BlobStore.h"
diff --git a/fdbclient/BackupContainerFileSystem.actor.cpp b/fdbclient/BackupContainerFileSystem.actor.cpp
index 0314a918b3..b413bae0c8 100644
--- a/fdbclient/BackupContainerFileSystem.actor.cpp
+++ b/fdbclient/BackupContainerFileSystem.actor.cpp
@@ -19,7 +19,9 @@
  */
 
 #include "fdbclient/BackupAgent.actor.h"
+#ifdef BUILD_AZURE_BACKUP
 #include "fdbclient/BackupContainerAzureBlobStore.h"
+#endif
 #include "fdbclient/BackupContainerFileSystem.h"
 #include "fdbclient/BackupContainerLocalDirectory.h"
 #include "fdbclient/BackupContainerS3BlobStore.h"
diff --git a/fdbclient/CMakeLists.txt b/fdbclient/CMakeLists.txt
index 095a8c82d2..1f036ea6bf 100644
--- a/fdbclient/CMakeLists.txt
+++ b/fdbclient/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(FDBCLIENT_SRCS
   ActorLineageProfiler.h
   ActorLineageProfiler.cpp
+  AnnotateActor.h
   AnnotateActor.cpp
   AsyncFileS3BlobStore.actor.cpp
   AsyncFileS3BlobStore.actor.h
@@ -75,6 +76,7 @@ set(FDBCLIENT_SRCS
   IConfigTransaction.h
   ISingleThreadTransaction.cpp
   ISingleThreadTransaction.h
+  JSONDoc.h
   JsonBuilder.cpp
   JsonBuilder.h
   KeyBackedTypes.h
@@ -105,6 +107,7 @@ set(FDBCLIENT_SRCS
   PaxosConfigTransaction.actor.cpp
   PaxosConfigTransaction.h
   PImpl.h
+  ProcessInterface.h
   SimpleConfigTransaction.actor.cpp
   SpecialKeySpace.actor.cpp
   SpecialKeySpace.actor.h
@@ -119,6 +122,7 @@ set(FDBCLIENT_SRCS
   RunTransaction.actor.h
   RYWIterator.cpp
   RYWIterator.h
+  S3BlobStore.h
   S3BlobStore.actor.cpp
   Schemas.cpp
   Schemas.h
@@ -155,6 +159,7 @@ set(FDBCLIENT_SRCS
   ThreadSafeTransaction.h
   Tracing.h
   Tracing.actor.cpp
+  TransactionLineage.h
   Tuple.cpp
   Tuple.h
   VersionedMap.actor.h
@@ -164,7 +169,6 @@ set(FDBCLIENT_SRCS
   Versionstamp.h
   VersionVector.h
   VersionVector.cpp
-  WellKnownEndpoints.h
   WriteMap.h
   WriteMap.cpp
   json_spirit/json_spirit_error_position.h
@@ -172,9 +176,19 @@ set(FDBCLIENT_SRCS
   json_spirit/json_spirit_value.h
   json_spirit/json_spirit_writer_options.h
   json_spirit/json_spirit_writer_template.h
+  libb64/encode.h
+  libb64/decode.h
+  libb64/cdecode.h
   libb64/cdecode.c
+  libb64/cencode.h
   libb64/cencode.c
+  md5/md5.h
   md5/md5.c
+  rapidxml/rapidxml.hpp
+  rapidxml/rapidxml_iterators.hpp
+  rapidxml/rapidxml_print.hpp
+  rapidxml/rapidxml_utils.hpp
+  sha1/SHA1.h
   sha1/SHA1.cpp
   zipf.c
   zipf.h)
@@ -184,9 +198,20 @@ message(STATUS "FDB package name is ${FDB_PACKAGE_NAME}")
 
 set(options_srcs ${CMAKE_CURRENT_BINARY_DIR}/FDBOptions.g.cpp)
 
-vexillographer_compile(TARGET fdboptions LANG cpp OUT ${CMAKE_CURRENT_BINARY_DIR}/FDBOptions.g
+make_directory(${CMAKE_CURRENT_BINARY_DIR}/include/fdbclient/)
+vexillographer_compile(TARGET fdboptions_vex LANG cpp OUT ${CMAKE_CURRENT_BINARY_DIR}/FDBOptions.g
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/FDBOptions.g.h ${CMAKE_CURRENT_BINARY_DIR}/FDBOptions.g.cpp)
 
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/fdbclient/FDBOptions.g.h
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/FDBOptions.g.h
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/FDBOptions.g.h ${CMAKE_CURRENT_BINARY_DIR}/include/fdbclient/FDBOptions.g.h)
+
+vexillographer_compile(TARGET fdboptions_c LANG c OUT ${CMAKE_CURRENT_BINARY_DIR}/include/fdbclient/fdb_c_options.g.h
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/fdbclient/fdb_c_options.g.h)
+
+add_custom_target(fdboptions DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/include/fdbclient/FDBOptions.g.h)
+add_dependencies(fdboptions fdboptions_c)
+
 set(BUILD_AZURE_BACKUP OFF CACHE BOOL "Build Azure backup client")
 if(BUILD_AZURE_BACKUP)
   add_compile_definitions(BUILD_AZURE_BACKUP)
diff --git a/fdbclient/CommitTransaction.h b/fdbclient/CommitTransaction.h
index 91bccaf7ba..3b2c7da874 100644
--- a/fdbclient/CommitTransaction.h
+++ b/fdbclient/CommitTransaction.h
@@ -24,7 +24,7 @@
 
 #include "fdbclient/FDBTypes.h"
 #include "fdbclient/Knobs.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 
 // The versioned message has wire format : -1, version, messages
 static const int32_t VERSION_HEADER = -1;
diff --git a/fdbclient/HTTP.actor.cpp b/fdbclient/HTTP.actor.cpp
index 141a6f0415..6cecf7fd39 100644
--- a/fdbclient/HTTP.actor.cpp
+++ b/fdbclient/HTTP.actor.cpp
@@ -18,10 +18,12 @@
  * limitations under the License.
  */
 
-#include "fdbrpc/HTTP.h"
+#include "fdbclient/HTTP.h"
 
 #include "fdbclient/md5/md5.h"
+#include "fdbclient/ClientKnobs.h"
 #include "fdbclient/libb64/encode.h"
+#include "fdbclient/Knobs.h"
 #include <cctype>
 
 #include "flow/actorcompiler.h" // has to be last include
diff --git a/fdbclient/IClientApi.h b/fdbclient/IClientApi.h
index 41a327f5df..8927286005 100644
--- a/fdbclient/IClientApi.h
+++ b/fdbclient/IClientApi.h
@@ -27,7 +27,7 @@
 #include "fdbclient/FDBTypes.h"
 #include "fdbclient/Tenant.h"
 
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "flow/ThreadHelper.actor.h"
 
 struct VersionVector;
diff --git a/fdbclient/MultiVersionTransaction.h b/fdbclient/MultiVersionTransaction.h
index 8e7253fb39..9f5c629330 100644
--- a/fdbclient/MultiVersionTransaction.h
+++ b/fdbclient/MultiVersionTransaction.h
@@ -23,7 +23,7 @@
 #include "flow/ProtocolVersion.h"
 #pragma once
 
-#include "bindings/c/foundationdb/fdb_c_options.g.h"
+#include "fdbclient/fdb_c_options.g.h"
 #include "fdbclient/FDBOptions.g.h"
 #include "fdbclient/FDBTypes.h"
 #include "fdbclient/IClientApi.h"
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 0e3a6ecb6b..b73a85e798 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -82,7 +82,7 @@
 #include "flow/Platform.h"
 #include "flow/SystemMonitor.h"
 #include "flow/TLSConfig.actor.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "flow/UnitTest.h"
 #include "flow/network.h"
 #include "flow/serialize.h"
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 541bef367f..1ead2bceb5 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include "flow/IRandom.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #if defined(NO_INTELLISENSE) && !defined(FDBCLIENT_NATIVEAPI_ACTOR_G_H)
 #define FDBCLIENT_NATIVEAPI_ACTOR_G_H
 #include "fdbclient/NativeAPI.actor.g.h"
diff --git a/fdbclient/S3BlobStore.actor.cpp b/fdbclient/S3BlobStore.actor.cpp
index 616c4881ae..efdd644853 100644
--- a/fdbclient/S3BlobStore.actor.cpp
+++ b/fdbclient/S3BlobStore.actor.cpp
@@ -41,7 +41,9 @@
 #include "flow/Hostname.h"
 #include "flow/UnitTest.h"
 #include "fdbclient/rapidxml/rapidxml.hpp"
+#ifdef BUILD_AWS_BACKUP
 #include "fdbclient/FDBAWSCredentialsProvider.h"
+#endif
 
 #include "flow/actorcompiler.h" // has to be last include
 
diff --git a/fdbclient/SimpleConfigTransaction.actor.cpp b/fdbclient/SimpleConfigTransaction.actor.cpp
index 500d287b18..cea49019bc 100644
--- a/fdbclient/SimpleConfigTransaction.actor.cpp
+++ b/fdbclient/SimpleConfigTransaction.actor.cpp
@@ -24,7 +24,6 @@
 #include "fdbclient/DatabaseContext.h"
 #include "fdbclient/IKnobCollection.h"
 #include "fdbclient/SimpleConfigTransaction.h"
-#include "fdbserver/Knobs.h"
 #include "flow/Arena.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 
diff --git a/fdbclient/StorageServerInterface.h b/fdbclient/StorageServerInterface.h
index bb3e7c9bb0..006f4c12d3 100644
--- a/fdbclient/StorageServerInterface.h
+++ b/fdbclient/StorageServerInterface.h
@@ -35,7 +35,7 @@
 #include "fdbclient/CommitTransaction.h"
 #include "fdbclient/TagThrottle.actor.h"
 #include "fdbclient/Tenant.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "flow/UnitTest.h"
 #include "fdbclient/VersionVector.h"
 
diff --git a/fdbclient/Tracing.actor.cpp b/fdbclient/Tracing.actor.cpp
index a709cfadfe..1d83e3fe74 100644
--- a/fdbclient/Tracing.actor.cpp
+++ b/fdbclient/Tracing.actor.cpp
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "flow/IRandom.h"
 #include "flow/UnitTest.h"
 #include "flow/Knobs.h"
diff --git a/fdbclient/Tracing.h b/fdbclient/Tracing.h
index 30bb44e90a..30fa210e3f 100644
--- a/fdbclient/Tracing.h
+++ b/fdbclient/Tracing.h
@@ -23,6 +23,8 @@
 #include "flow/network.h"
 #include "flow/IRandom.h"
 #include "flow/Arena.h"
+#include "fdbrpc/FlowTransport.h"
+#include "fdbclient/FDBTypes.h"
 #include <unordered_set>
 #include <atomic>
 
diff --git a/fdbrpc/CMakeLists.txt b/fdbrpc/CMakeLists.txt
index 96446a0314..355d9b62b1 100644
--- a/fdbrpc/CMakeLists.txt
+++ b/fdbrpc/CMakeLists.txt
@@ -58,6 +58,7 @@ set(FDBRPC_SRCS
   Stats.h
   simulator.h
   sim2.actor.cpp
+  sim_validation.h
   sim_validation.cpp
   TenantInfo.h
   TimedRequest.h
diff --git a/fdbserver/BackupWorker.actor.cpp b/fdbserver/BackupWorker.actor.cpp
index 8addd89f05..6f3e6a22bb 100644
--- a/fdbserver/BackupWorker.actor.cpp
+++ b/fdbserver/BackupWorker.actor.cpp
@@ -34,7 +34,7 @@
 #include "flow/Error.h"
 
 #include "flow/IRandom.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 
 #define SevDebugMemory SevVerbose
diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index bf967dc1a3..0a74254431 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -52,7 +52,7 @@
 #include "flow/IRandom.h"
 #include "flow/Knobs.h"
 #include "flow/Trace.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 
 #include "flow/actorcompiler.h" // This must be the last #include.
 
diff --git a/fdbserver/OTELSpanContextMessage.h b/fdbserver/OTELSpanContextMessage.h
index 9f6d588fed..77c94dd934 100644
--- a/fdbserver/OTELSpanContextMessage.h
+++ b/fdbserver/OTELSpanContextMessage.h
@@ -22,7 +22,7 @@
 #define FDBSERVER_OTELSPANCONTEXTMESSAGE_H
 #pragma once
 
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "fdbclient/FDBTypes.h"
 #include "fdbclient/CommitTransaction.h"
 
diff --git a/fdbserver/fdbserver.actor.cpp b/fdbserver/fdbserver.actor.cpp
index ef9f17fa32..4666e4a0e8 100644
--- a/fdbserver/fdbserver.actor.cpp
+++ b/fdbserver/fdbserver.actor.cpp
@@ -77,7 +77,7 @@
 #include "flow/SimpleOpt.h"
 #include "flow/SystemMonitor.h"
 #include "flow/TLSConfig.actor.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "flow/WriteOnlySet.h"
 #include "flow/UnitTest.h"
 #include "flow/FaultInjection.h"
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index ceea0cb4b2..2c17c88a88 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -37,7 +37,7 @@
 #include "flow/IndexedSet.h"
 #include "flow/SystemMonitor.h"
 #include "flow/Trace.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "flow/Util.h"
 #include "fdbclient/Atomic.h"
 #include "fdbclient/DatabaseContext.h"
diff --git a/fdbserver/workloads/ConsistencyCheck.actor.cpp b/fdbserver/workloads/ConsistencyCheck.actor.cpp
index 11b499fc74..4df394f4b8 100644
--- a/fdbserver/workloads/ConsistencyCheck.actor.cpp
+++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp
@@ -22,7 +22,7 @@
 #include "boost/lexical_cast.hpp"
 
 #include "flow/IRandom.h"
-#include "flow/Tracing.h"
+#include "fdbclient/Tracing.h"
 #include "fdbclient/NativeAPI.actor.h"
 #include "fdbserver/TesterInterface.actor.h"
 #include "fdbserver/workloads/workloads.actor.h"
diff --git a/flow/CMakeLists.txt b/flow/CMakeLists.txt
index bb8be44ce4..e708a05684 100644
--- a/flow/CMakeLists.txt
+++ b/flow/CMakeLists.txt
@@ -116,6 +116,7 @@ set(FLOW_SRCS
   serialize.cpp
   serialize.h
   sse2neon.h
+  singleton.h
   stacktrace.h
   test_memcpy.cpp
   test_memcpy_perf.cpp