diff --git a/all_files.vcxitems b/all_files.vcxitems
index 9206eba..0f55789 100644
--- a/all_files.vcxitems
+++ b/all_files.vcxitems
@@ -15,11 +15,13 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(MSBuildThisFileDirectory)absl_helper\jedec_size_flag.cc" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)cdc_fuse_fs\mock_config_stream_client.cc" />
     <ClCompile Include="$(MSBuildThisFileDirectory)cdc_rsync\base\socket.cc" />
     <ClCompile Include="$(MSBuildThisFileDirectory)cdc_rsync\server_arch.cc" />
     <ClCompile Include="$(MSBuildThisFileDirectory)cdc_rsync\server_arch_test.cc" />
     <ClCompile Include="$(MSBuildThisFileDirectory)cdc_stream\asset_stream_config.cc" />
     <ClCompile Include="$(MSBuildThisFileDirectory)cdc_stream\asset_stream_server.cc" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)cdc_stream\background_service_client.cc" />
     <ClCompile Include="$(MSBuildThisFileDirectory)cdc_stream\background_service_impl.cc" />
     <ClCompile Include="$(MSBuildThisFileDirectory)cdc_stream\base_command.cc" />
     <ClCompile Include="$(MSBuildThisFileDirectory)cdc_stream\cdc_fuse_manager.cc" />
@@ -39,7 +41,11 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)cdc_stream\stop_service_command.cc" />
     <ClCompile Include="$(MSBuildThisFileDirectory)common\port_range_parser.cc" />
     <ClCompile Include="$(MSBuildThisFileDirectory)common\port_range_parser_test.cc" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)fastcdc\fastcdc_test.cc" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)manifest\pending_assets_queue.cc" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)cdc_fuse_fs\mock_config_stream_client.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)cdc_rsync\server_arch.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)cdc_stream\background_service_client.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)cdc_stream\stop_command.cc" />
     <ClCompile Include="$(MSBuildThisFileDirectory)cdc_stream\testing_asset_stream_server.cc" />
     <ClCompile Include="$(MSBuildThisFileDirectory)cdc_fuse_fs\asset.cc" />
@@ -151,6 +157,8 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)metrics\metrics.cc" />
     <ClInclude Include="$(MSBuildThisFileDirectory)cdc_stream\stop_service_command.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)common\port_range_parser.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)fastcdc\fastcdc.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)manifest\pending_assets_queue.h" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)absl_helper\jedec_size_flag.h" />
@@ -266,6 +274,7 @@
     <None Include="$(MSBuildThisFileDirectory)cdc_rsync\README.md" />
     <None Include="$(MSBuildThisFileDirectory)cdc_rsync_server\BUILD" />
     <None Include="$(MSBuildThisFileDirectory)cdc_rsync_tests\BUILD" />
+    <None Include="$(MSBuildThisFileDirectory)fastcdc\BUILD" />
     <None Include="$(MSBuildThisFileDirectory)manifest\BUILD" />
     <None Include="$(MSBuildThisFileDirectory)manifest_cli\BUILD" />
     <None Include="$(MSBuildThisFileDirectory)metrics\BUILD" />
diff --git a/cdc_rsync/cdc_rsync.vcxproj b/cdc_rsync/cdc_rsync.vcxproj
index c095d52..2a64dc4 100644
--- a/cdc_rsync/cdc_rsync.vcxproj
+++ b/cdc_rsync/cdc_rsync.vcxproj
@@ -68,7 +68,7 @@
   <PropertyGroup>
     <BazelTargets>//cdc_rsync //cdc_rsync_server</BazelTargets>
     <BazelOutputFile>cdc_rsync.exe</BazelOutputFile>
-    <BazelIncludePaths>..\;..\third_party\absl;..\bazel-cdc-file-transfer\external\com_github_blake3\c;..\bazel-stadia-file-transfer\external\com_github_zstd\lib;..\third_party\googletest\googletest\include;..\bazel-cdc-file-transfer\external\com_google_protobuf\src;$(VC_IncludePath);$(WindowsSDK_IncludePath)</BazelIncludePaths>
+    <BazelIncludePaths>..\;..\third_party\absl;..\bazel-cdc-file-transfer\external\com_github_blake3\c;..\bazel-cdc-file-transfer\external\com_github_zstd;..\third_party\googletest\googletest\include;..\bazel-cdc-file-transfer\external\com_google_protobuf\src;..\bazel-cdc-file-transfer\external\com_github_grpc_grpc\include;..\bazel-bin;$(VC_IncludePath);$(WindowsSDK_IncludePath)</BazelIncludePaths>
   </PropertyGroup>
   <Import Project="..\NMakeBazelProject.targets" />
   <!-- For some reason, msbuild doesn't include this file, so copy it explicitly. -->
diff --git a/cdc_rsync_server/cdc_rsync_server.vcxproj b/cdc_rsync_server/cdc_rsync_server.vcxproj
index 73ebe41..036642b 100644
--- a/cdc_rsync_server/cdc_rsync_server.vcxproj
+++ b/cdc_rsync_server/cdc_rsync_server.vcxproj
@@ -49,7 +49,7 @@
   <PropertyGroup>
     <BazelTargets>//cdc_rsync_server:cdc_rsync_server</BazelTargets>
     <BazelOutputFile>cdc_rsync_server</BazelOutputFile>
-    <BazelIncludePaths>..\;..\third_party\absl;..\bazel-cdc-file-transfer\external\com_github_blake3\c;..\bazel-stadia-file-transfer\external\com_github_zstd\lib;..\third_party\googletest\googletest\include;..\bazel-cdc-file-transfer\external\com_google_protobuf\src</BazelIncludePaths>
+    <BazelIncludePaths>..\;..\third_party\absl;..\bazel-cdc-file-transfer\external\com_github_blake3\c;..\bazel-cdc-file-transfer\external\com_github_zstd;..\third_party\googletest\googletest\include;..\bazel-cdc-file-transfer\external\com_google_protobuf\src;..\bazel-bin</BazelIncludePaths>
   </PropertyGroup>
   <Import Project="..\NMakeBazelProject.targets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/tests_cdc_rsync/tests_cdc_rsync.vcxproj b/tests_cdc_rsync/tests_cdc_rsync.vcxproj
index 1cdb140..c461046 100644
--- a/tests_cdc_rsync/tests_cdc_rsync.vcxproj
+++ b/tests_cdc_rsync/tests_cdc_rsync.vcxproj
@@ -62,7 +62,7 @@
   <PropertyGroup>
     <BazelTargets>//tests_cdc_rsync</BazelTargets>
     <BazelOutputFile>tests_cdc_rsync.exe</BazelOutputFile>
-    <BazelIncludePaths>..\;..\third_party\absl;..\bazel-cdc-file-transfer\external\com_github_jsoncpp\include;..\bazel-stadia-file-transfer\external\com_github_zstd\lib;..\bazel-cdc-file-transfer\external\com_github_blake3\c;..\third_party\googletest\googletest\include;..\bazel-cdc-file-transfer\external\com_google_protobuf\src;..\bazel-cdc-file-transfer\external\com_github_grpc_grpc\include;..\bazel-out\x64_windows-dbg\bin;$(VC_IncludePath);$(WindowsSDK_IncludePath)</BazelIncludePaths>
+    <BazelIncludePaths>..\;..\third_party\absl;..\bazel-cdc-file-transfer\external\com_github_jsoncpp\include;..\bazel-cdc-file-transfer\external\com_github_zstd;..\bazel-cdc-file-transfer\external\com_github_blake3\c;..\third_party\googletest\googletest\include;..\bazel-cdc-file-transfer\external\com_google_protobuf\src;..\bazel-cdc-file-transfer\external\com_github_grpc_grpc\include;..\bazel-out\x64_windows-dbg\bin;..\bazel-bin;$(VC_IncludePath);$(WindowsSDK_IncludePath)</BazelIncludePaths>
   </PropertyGroup>
   <Import Project="..\NMakeBazelProject.targets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/tests_common/tests_common.vcxproj b/tests_common/tests_common.vcxproj
index 2053d7a..bea7433 100644
--- a/tests_common/tests_common.vcxproj
+++ b/tests_common/tests_common.vcxproj
@@ -61,7 +61,7 @@
   <PropertyGroup>
     <BazelTargets>//tests_common</BazelTargets>
     <BazelOutputFile>tests_common.exe</BazelOutputFile>
-    <BazelIncludePaths>..\;..\third_party\absl;..\bazel-cdc-file-transfer\external\com_github_jsoncpp\include;..\bazel-cdc-file-transfer\external\com_github_blake3\c;..\third_party\googletest\googletest\include;..\bazel-cdc-file-transfer\external\com_google_protobuf\src;..\bazel-cdc-file-transfer\external\com_github_grpc_grpc\include;..\bazel-out\x64_windows-dbg\bin;$(VC_IncludePath);$(WindowsSDK_IncludePath)</BazelIncludePaths>
+    <BazelIncludePaths>..\;..\third_party\absl;..\bazel-cdc-file-transfer\external\com_github_jsoncpp\include;..\bazel-cdc-file-transfer\external\com_github_zstd;..\bazel-cdc-file-transfer\external\com_github_blake3\c;..\third_party\googletest\googletest\include;..\bazel-cdc-file-transfer\external\com_google_protobuf\src;..\bazel-cdc-file-transfer\external\com_github_grpc_grpc\include;..\bazel-out\x64_windows-dbg\bin;$(VC_IncludePath);$(WindowsSDK_IncludePath)</BazelIncludePaths>
   </PropertyGroup>
   <Import Project="..\NMakeBazelProject.targets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />