diff --git a/BUILD b/BUILD
index d1624ab13c0..e8d361fcb6f 100644
--- a/BUILD
+++ b/BUILD
@@ -465,7 +465,6 @@ grpc_cc_library(
"src/core/lib/support/arena.c",
"src/core/lib/support/atm.c",
"src/core/lib/support/avl.c",
- "src/core/lib/backoff/backoff.c",
"src/core/lib/support/cmdline.c",
"src/core/lib/support/cpu_iphone.c",
"src/core/lib/support/cpu_linux.c",
@@ -512,7 +511,6 @@ grpc_cc_library(
"src/core/lib/support/atomic.h",
"src/core/lib/support/atomic_with_atm.h",
"src/core/lib/support/atomic_with_std.h",
- "src/core/lib/backoff/backoff.h",
"src/core/lib/iomgr/block_annotate.h",
"src/core/lib/support/env.h",
"src/core/lib/support/memory.h",
@@ -686,6 +684,7 @@ grpc_cc_library(
"src/core/lib/transport/timeout_encoding.c",
"src/core/lib/transport/transport.c",
"src/core/lib/transport/transport_op_string.c",
+ "src/core/lib/backoff/backoff.c",
],
hdrs = [
"src/core/lib/channel/channel_args.h",
@@ -799,6 +798,7 @@ grpc_cc_library(
"src/core/lib/transport/timeout_encoding.h",
"src/core/lib/transport/transport.h",
"src/core/lib/transport/transport_impl.h",
+ "src/core/lib/backoff/backoff.h",
],
external_deps = [
"zlib",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 817a1e4da9b..893c3669c0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -770,7 +770,6 @@ endif (gRPC_BUILD_TESTS)
add_library(gpr
- src/core/lib/backoff/backoff.c
src/core/lib/profiling/basic_timers.c
src/core/lib/profiling/stap_timers.c
src/core/lib/support/alloc.c
@@ -947,6 +946,7 @@ endif (gRPC_BUILD_TESTS)
add_library(grpc
src/core/lib/surface/init.c
+ src/core/lib/backoff/backoff.c
src/core/lib/channel/channel_args.c
src/core/lib/channel/channel_stack.c
src/core/lib/channel/channel_stack_builder.c
@@ -1290,6 +1290,7 @@ endif()
add_library(grpc_cronet
src/core/lib/surface/init.c
+ src/core/lib/backoff/backoff.c
src/core/lib/channel/channel_args.c
src/core/lib/channel/channel_stack.c
src/core/lib/channel/channel_stack_builder.c
@@ -1611,6 +1612,7 @@ add_library(grpc_test_util
test/core/util/port_server_client.c
test/core/util/slice_splitter.c
test/core/util/trickle_endpoint.c
+ src/core/lib/backoff/backoff.c
src/core/lib/channel/channel_args.c
src/core/lib/channel/channel_stack.c
src/core/lib/channel/channel_stack_builder.c
@@ -1874,6 +1876,7 @@ endif (gRPC_BUILD_TESTS)
add_library(grpc_unsecure
src/core/lib/surface/init.c
src/core/lib/surface/init_unsecure.c
+ src/core/lib/backoff/backoff.c
src/core/lib/channel/channel_args.c
src/core/lib/channel/channel_stack.c
src/core/lib/channel/channel_stack_builder.c
@@ -2533,6 +2536,7 @@ add_library(grpc++_cronet
src/core/ext/transport/chttp2/transport/stream_map.c
src/core/ext/transport/chttp2/transport/varint.c
src/core/ext/transport/chttp2/transport/writing.c
+ src/core/lib/backoff/backoff.c
src/core/lib/channel/channel_args.c
src/core/lib/channel/channel_stack.c
src/core/lib/channel/channel_stack_builder.c
diff --git a/Makefile b/Makefile
index bdffe1e4919..39f4ff92de5 100644
--- a/Makefile
+++ b/Makefile
@@ -2741,7 +2741,6 @@ clean:
LIBGPR_SRC = \
- src/core/lib/backoff/backoff.c \
src/core/lib/profiling/basic_timers.c \
src/core/lib/profiling/stap_timers.c \
src/core/lib/support/alloc.c \
@@ -2891,6 +2890,7 @@ endif
LIBGRPC_SRC = \
src/core/lib/surface/init.c \
+ src/core/lib/backoff/backoff.c \
src/core/lib/channel/channel_args.c \
src/core/lib/channel/channel_stack.c \
src/core/lib/channel/channel_stack_builder.c \
@@ -3232,6 +3232,7 @@ endif
LIBGRPC_CRONET_SRC = \
src/core/lib/surface/init.c \
+ src/core/lib/backoff/backoff.c \
src/core/lib/channel/channel_args.c \
src/core/lib/channel/channel_stack.c \
src/core/lib/channel/channel_stack_builder.c \
@@ -3550,6 +3551,7 @@ LIBGRPC_TEST_UTIL_SRC = \
test/core/util/port_server_client.c \
test/core/util/slice_splitter.c \
test/core/util/trickle_endpoint.c \
+ src/core/lib/backoff/backoff.c \
src/core/lib/channel/channel_args.c \
src/core/lib/channel/channel_stack.c \
src/core/lib/channel/channel_stack_builder.c \
@@ -3785,6 +3787,7 @@ endif
LIBGRPC_UNSECURE_SRC = \
src/core/lib/surface/init.c \
src/core/lib/surface/init_unsecure.c \
+ src/core/lib/backoff/backoff.c \
src/core/lib/channel/channel_args.c \
src/core/lib/channel/channel_stack.c \
src/core/lib/channel/channel_stack_builder.c \
@@ -4428,6 +4431,7 @@ LIBGRPC++_CRONET_SRC = \
src/core/ext/transport/chttp2/transport/stream_map.c \
src/core/ext/transport/chttp2/transport/varint.c \
src/core/ext/transport/chttp2/transport/writing.c \
+ src/core/lib/backoff/backoff.c \
src/core/lib/channel/channel_args.c \
src/core/lib/channel/channel_stack.c \
src/core/lib/channel/channel_stack_builder.c \
diff --git a/binding.gyp b/binding.gyp
index 01a5990cca2..13928d74dc1 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -579,7 +579,6 @@
'dependencies': [
],
'sources': [
- 'src/core/lib/backoff/backoff.c',
'src/core/lib/profiling/basic_timers.c',
'src/core/lib/profiling/stap_timers.c',
'src/core/lib/support/alloc.c',
@@ -636,6 +635,7 @@
],
'sources': [
'src/core/lib/surface/init.c',
+ 'src/core/lib/backoff/backoff.c',
'src/core/lib/channel/channel_args.c',
'src/core/lib/channel/channel_stack.c',
'src/core/lib/channel/channel_stack_builder.c',
diff --git a/build.yaml b/build.yaml
index 4a55ea5dc5b..2f8368d2e42 100644
--- a/build.yaml
+++ b/build.yaml
@@ -87,13 +87,12 @@ filegroups:
- include/grpc/support/tls_pthread.h
- include/grpc/support/useful.h
headers:
- - src/core/lib/backoff/backoff.h
+ - src/core/lib/iomgr/block_annotate.h
- src/core/lib/profiling/timers.h
- src/core/lib/support/arena.h
- src/core/lib/support/atomic.h
- src/core/lib/support/atomic_with_atm.h
- src/core/lib/support/atomic_with_std.h
- - src/core/lib/iomgr/block_annotate.h
- src/core/lib/support/env.h
- src/core/lib/support/memory.h
- src/core/lib/support/mpscq.h
@@ -106,7 +105,6 @@ filegroups:
- src/core/lib/support/time_precise.h
- src/core/lib/support/tmpfile.h
src:
- - src/core/lib/backoff/backoff.c
- src/core/lib/profiling/basic_timers.c
- src/core/lib/profiling/stap_timers.c
- src/core/lib/support/alloc.c
@@ -181,6 +179,7 @@ filegroups:
- include/grpc/status.h
- include/grpc/support/workaround_list.h
headers:
+ - src/core/lib/backoff/backoff.h
- src/core/lib/channel/channel_args.h
- src/core/lib/channel/channel_stack.h
- src/core/lib/channel/channel_stack_builder.h
@@ -293,6 +292,7 @@ filegroups:
- src/core/lib/transport/transport.h
- src/core/lib/transport/transport_impl.h
src:
+ - src/core/lib/backoff/backoff.c
- src/core/lib/channel/channel_args.c
- src/core/lib/channel/channel_stack.c
- src/core/lib/channel/channel_stack_builder.c
diff --git a/config.m4 b/config.m4
index c2d8bb1d835..3173e98ca00 100644
--- a/config.m4
+++ b/config.m4
@@ -39,7 +39,6 @@ if test "$PHP_GRPC" != "no"; then
src/php/ext/grpc/server.c \
src/php/ext/grpc/server_credentials.c \
src/php/ext/grpc/timeval.c \
- src/core/lib/backoff/backoff.c \
src/core/lib/profiling/basic_timers.c \
src/core/lib/profiling/stap_timers.c \
src/core/lib/support/alloc.c \
@@ -86,6 +85,7 @@ if test "$PHP_GRPC" != "no"; then
src/core/lib/support/tmpfile_windows.c \
src/core/lib/support/wrap_memcpy.c \
src/core/lib/surface/init.c \
+ src/core/lib/backoff/backoff.c \
src/core/lib/channel/channel_args.c \
src/core/lib/channel/channel_stack.c \
src/core/lib/channel/channel_stack_builder.c \
diff --git a/config.w32 b/config.w32
index 4179d9c50fc..e6b30cce25f 100644
--- a/config.w32
+++ b/config.w32
@@ -16,7 +16,6 @@ if (PHP_GRPC != "no") {
"src\\php\\ext\\grpc\\server.c " +
"src\\php\\ext\\grpc\\server_credentials.c " +
"src\\php\\ext\\grpc\\timeval.c " +
- "src\\core\\lib\\backoff\\backoff.c " +
"src\\core\\lib\\profiling\\basic_timers.c " +
"src\\core\\lib\\profiling\\stap_timers.c " +
"src\\core\\lib\\support\\alloc.c " +
@@ -63,6 +62,7 @@ if (PHP_GRPC != "no") {
"src\\core\\lib\\support\\tmpfile_windows.c " +
"src\\core\\lib\\support\\wrap_memcpy.c " +
"src\\core\\lib\\surface\\init.c " +
+ "src\\core\\lib\\backoff\\backoff.c " +
"src\\core\\lib\\channel\\channel_args.c " +
"src\\core\\lib\\channel\\channel_stack.c " +
"src\\core\\lib\\channel\\channel_stack_builder.c " +
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 896de2ba836..aaa1ff93ef4 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -180,13 +180,12 @@ Pod::Spec.new do |s|
ss.dependency 'nanopb', '~> 0.3'
# To save you from scrolling, this is the last part of the podspec.
- ss.source_files = 'src/core/lib/backoff/backoff.h',
+ ss.source_files = 'src/core/lib/iomgr/block_annotate.h',
'src/core/lib/profiling/timers.h',
'src/core/lib/support/arena.h',
'src/core/lib/support/atomic.h',
'src/core/lib/support/atomic_with_atm.h',
'src/core/lib/support/atomic_with_std.h',
- 'src/core/lib/iomgr/block_annotate.h',
'src/core/lib/support/env.h',
'src/core/lib/support/memory.h',
'src/core/lib/support/mpscq.h',
@@ -198,7 +197,6 @@ Pod::Spec.new do |s|
'src/core/lib/support/thd_internal.h',
'src/core/lib/support/time_precise.h',
'src/core/lib/support/tmpfile.h',
- 'src/core/lib/backoff/backoff.c',
'src/core/lib/profiling/basic_timers.c',
'src/core/lib/profiling/stap_timers.c',
'src/core/lib/support/alloc.c',
@@ -244,6 +242,7 @@ Pod::Spec.new do |s|
'src/core/lib/support/tmpfile_posix.c',
'src/core/lib/support/tmpfile_windows.c',
'src/core/lib/support/wrap_memcpy.c',
+ 'src/core/lib/backoff/backoff.h',
'src/core/lib/channel/channel_args.h',
'src/core/lib/channel/channel_stack.h',
'src/core/lib/channel/channel_stack_builder.h',
@@ -461,6 +460,7 @@ Pod::Spec.new do |s|
'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h',
'src/core/ext/filters/workarounds/workaround_utils.h',
'src/core/lib/surface/init.c',
+ 'src/core/lib/backoff/backoff.c',
'src/core/lib/channel/channel_args.c',
'src/core/lib/channel/channel_stack.c',
'src/core/lib/channel/channel_stack_builder.c',
@@ -711,13 +711,12 @@ Pod::Spec.new do |s|
'src/core/ext/filters/workarounds/workaround_utils.c',
'src/core/plugin_registry/grpc_plugin_registry.c'
- ss.private_header_files = 'src/core/lib/backoff/backoff.h',
+ ss.private_header_files = 'src/core/lib/iomgr/block_annotate.h',
'src/core/lib/profiling/timers.h',
'src/core/lib/support/arena.h',
'src/core/lib/support/atomic.h',
'src/core/lib/support/atomic_with_atm.h',
'src/core/lib/support/atomic_with_std.h',
- 'src/core/lib/iomgr/block_annotate.h',
'src/core/lib/support/env.h',
'src/core/lib/support/memory.h',
'src/core/lib/support/mpscq.h',
@@ -729,6 +728,7 @@ Pod::Spec.new do |s|
'src/core/lib/support/thd_internal.h',
'src/core/lib/support/time_precise.h',
'src/core/lib/support/tmpfile.h',
+ 'src/core/lib/backoff/backoff.h',
'src/core/lib/channel/channel_args.h',
'src/core/lib/channel/channel_stack.h',
'src/core/lib/channel/channel_stack_builder.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index aca802e1860..d4df6a150d0 100755
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -80,13 +80,12 @@ Gem::Specification.new do |s|
s.files += %w( include/grpc/impl/codegen/sync_generic.h )
s.files += %w( include/grpc/impl/codegen/sync_posix.h )
s.files += %w( include/grpc/impl/codegen/sync_windows.h )
- s.files += %w( src/core/lib/backoff/backoff.h )
+ s.files += %w( src/core/lib/iomgr/block_annotate.h )
s.files += %w( src/core/lib/profiling/timers.h )
s.files += %w( src/core/lib/support/arena.h )
s.files += %w( src/core/lib/support/atomic.h )
s.files += %w( src/core/lib/support/atomic_with_atm.h )
s.files += %w( src/core/lib/support/atomic_with_std.h )
- s.files += %w( src/core/lib/iomgr/block_annotate.h )
s.files += %w( src/core/lib/support/env.h )
s.files += %w( src/core/lib/support/memory.h )
s.files += %w( src/core/lib/support/mpscq.h )
@@ -98,7 +97,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/support/thd_internal.h )
s.files += %w( src/core/lib/support/time_precise.h )
s.files += %w( src/core/lib/support/tmpfile.h )
- s.files += %w( src/core/lib/backoff/backoff.c )
s.files += %w( src/core/lib/profiling/basic_timers.c )
s.files += %w( src/core/lib/profiling/stap_timers.c )
s.files += %w( src/core/lib/support/alloc.c )
@@ -176,6 +174,7 @@ Gem::Specification.new do |s|
s.files += %w( include/grpc/impl/codegen/sync_windows.h )
s.files += %w( include/grpc/grpc_security.h )
s.files += %w( include/grpc/census.h )
+ s.files += %w( src/core/lib/backoff/backoff.h )
s.files += %w( src/core/lib/channel/channel_args.h )
s.files += %w( src/core/lib/channel/channel_stack.h )
s.files += %w( src/core/lib/channel/channel_stack_builder.h )
@@ -397,6 +396,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h )
s.files += %w( src/core/ext/filters/workarounds/workaround_utils.h )
s.files += %w( src/core/lib/surface/init.c )
+ s.files += %w( src/core/lib/backoff/backoff.c )
s.files += %w( src/core/lib/channel/channel_args.c )
s.files += %w( src/core/lib/channel/channel_stack.c )
s.files += %w( src/core/lib/channel/channel_stack_builder.c )
diff --git a/package.xml b/package.xml
index 9c1e76ec165..e0098d2c610 100644
--- a/package.xml
+++ b/package.xml
@@ -94,13 +94,12 @@
-
+
-
@@ -112,7 +111,6 @@
-
@@ -190,6 +188,7 @@
+
@@ -411,6 +410,7 @@
+
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index cf006515ee8..6493c09cd7b 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -15,7 +15,6 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_core_dependencies.py.template`!!!
CORE_SOURCE_FILES = [
- 'src/core/lib/backoff/backoff.c',
'src/core/lib/profiling/basic_timers.c',
'src/core/lib/profiling/stap_timers.c',
'src/core/lib/support/alloc.c',
@@ -62,6 +61,7 @@ CORE_SOURCE_FILES = [
'src/core/lib/support/tmpfile_windows.c',
'src/core/lib/support/wrap_memcpy.c',
'src/core/lib/surface/init.c',
+ 'src/core/lib/backoff/backoff.c',
'src/core/lib/channel/channel_args.c',
'src/core/lib/channel/channel_stack.c',
'src/core/lib/channel/channel_stack_builder.c',
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 8ea50a94041..6352e507438 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1085,6 +1085,7 @@ src/core/lib/http/httpcli_security_connector.c \
src/core/lib/http/parser.c \
src/core/lib/http/parser.h \
src/core/lib/iomgr/README.md \
+src/core/lib/iomgr/block_annotate.h \
src/core/lib/iomgr/closure.c \
src/core/lib/iomgr/closure.h \
src/core/lib/iomgr/combiner.c \
@@ -1287,7 +1288,6 @@ src/core/lib/support/atomic.h \
src/core/lib/support/atomic_with_atm.h \
src/core/lib/support/atomic_with_std.h \
src/core/lib/support/avl.c \
-src/core/lib/iomgr/block_annotate.h \
src/core/lib/support/cmdline.c \
src/core/lib/support/cpu_iphone.c \
src/core/lib/support/cpu_linux.c \
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 6874493d51d..39cf71e11f9 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -7538,13 +7538,12 @@
"include/grpc/support/tls_msvc.h",
"include/grpc/support/tls_pthread.h",
"include/grpc/support/useful.h",
- "src/core/lib/backoff/backoff.h",
+ "src/core/lib/iomgr/block_annotate.h",
"src/core/lib/profiling/timers.h",
"src/core/lib/support/arena.h",
"src/core/lib/support/atomic.h",
"src/core/lib/support/atomic_with_atm.h",
"src/core/lib/support/atomic_with_std.h",
- "src/core/lib/iomgr/block_annotate.h",
"src/core/lib/support/env.h",
"src/core/lib/support/memory.h",
"src/core/lib/support/mpscq.h",
@@ -7587,8 +7586,7 @@
"include/grpc/support/tls_msvc.h",
"include/grpc/support/tls_pthread.h",
"include/grpc/support/useful.h",
- "src/core/lib/backoff/backoff.c",
- "src/core/lib/backoff/backoff.h",
+ "src/core/lib/iomgr/block_annotate.h",
"src/core/lib/profiling/basic_timers.c",
"src/core/lib/profiling/stap_timers.c",
"src/core/lib/profiling/timers.h",
@@ -7600,7 +7598,6 @@
"src/core/lib/support/atomic_with_atm.h",
"src/core/lib/support/atomic_with_std.h",
"src/core/lib/support/avl.c",
- "src/core/lib/iomgr/block_annotate.h",
"src/core/lib/support/cmdline.c",
"src/core/lib/support/cpu_iphone.c",
"src/core/lib/support/cpu_linux.c",
@@ -7707,6 +7704,7 @@
"include/grpc/slice_buffer.h",
"include/grpc/status.h",
"include/grpc/support/workaround_list.h",
+ "src/core/lib/backoff/backoff.h",
"src/core/lib/channel/channel_args.h",
"src/core/lib/channel/channel_stack.h",
"src/core/lib/channel/channel_stack_builder.h",
@@ -7834,6 +7832,8 @@
"include/grpc/slice_buffer.h",
"include/grpc/status.h",
"include/grpc/support/workaround_list.h",
+ "src/core/lib/backoff/backoff.c",
+ "src/core/lib/backoff/backoff.h",
"src/core/lib/channel/channel_args.c",
"src/core/lib/channel/channel_args.h",
"src/core/lib/channel/channel_stack.c",
diff --git a/vsprojects/vcxproj/gpr/gpr.vcxproj b/vsprojects/vcxproj/gpr/gpr.vcxproj
index 2386fddd02a..59b6d5229c7 100644
--- a/vsprojects/vcxproj/gpr/gpr.vcxproj
+++ b/vsprojects/vcxproj/gpr/gpr.vcxproj
@@ -186,13 +186,12 @@
-
+
-
@@ -206,8 +205,6 @@
-
-
diff --git a/vsprojects/vcxproj/gpr/gpr.vcxproj.filters b/vsprojects/vcxproj/gpr/gpr.vcxproj.filters
index c5fce455f4b..b1c605c4b4d 100644
--- a/vsprojects/vcxproj/gpr/gpr.vcxproj.filters
+++ b/vsprojects/vcxproj/gpr/gpr.vcxproj.filters
@@ -1,9 +1,6 @@
-
- src\core\lib\backoff
-
src\core\lib\profiling
@@ -254,8 +251,8 @@
-
- src\core\lib\backoff
+
+ src\core\lib\iomgr
src\core\lib\profiling
@@ -272,9 +269,6 @@
src\core\lib\support
-
- src\core\lib\support
-
src\core\lib\support
@@ -335,8 +329,8 @@
{52037bcb-5719-a548-224d-834fbe569045}
-
- {5a917a34-e4b4-01c0-4565-2be560176bec}
+
+ {05787953-1d14-fd71-51b0-03be31463e6a}
{ba38d79d-d5de-a89e-9ca2-c5235a03ca7f}
diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj
index 57c0ac7bc4e..3d21a67502b 100644
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj
@@ -301,6 +301,7 @@
+
@@ -525,6 +526,8 @@
+
+
diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
index e9bb52defa6..db8ca808674 100644
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
@@ -4,6 +4,9 @@
src\core\lib\surface
+
+ src\core\lib\backoff
+
src\core\lib\channel
@@ -860,6 +863,9 @@
+
+ src\core\lib\backoff
+
src\core\lib\channel
@@ -1664,6 +1670,9 @@
{5b2ded3f-84a5-f6b4-2060-286c7d1dc945}
+
+ {fc07b929-526c-5567-9a7a-adb2a16da6b8}
+
{1931b044-90f3-cd68-b5f8-23be77ca8efc}
diff --git a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj
index 64bf54e557d..51247b2e514 100644
--- a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj
+++ b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj
@@ -196,6 +196,7 @@
+
@@ -350,6 +351,8 @@
+
+
diff --git a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters
index 35fd87a4c58..8055456e2ce 100644
--- a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters
@@ -61,6 +61,9 @@
test\core\util
+
+ src\core\lib\backoff
+
src\core\lib\channel
@@ -584,6 +587,9 @@
test\core\util
+
+ src\core\lib\backoff
+
src\core\lib\channel
@@ -962,6 +968,9 @@
{f4e8c61e-1ca6-0fdd-7b5e-b7f9a30c9a21}
+
+ {2fa7432f-c05f-eafe-2284-b8e7a6ac8313}
+
{1cd1503c-bec0-5ade-c75f-aa25c80975ec}
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
index 4ed59780a44..4f454bb4659 100644
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
@@ -291,6 +291,7 @@
+
@@ -491,6 +492,8 @@
+
+
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
index 2c3319beae8..f7fbcad535b 100644
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
@@ -7,6 +7,9 @@
src\core\lib\surface
+
+ src\core\lib\backoff
+
src\core\lib\channel
@@ -767,6 +770,9 @@
+
+ src\core\lib\backoff
+
src\core\lib\channel
@@ -1487,6 +1493,9 @@
{8bd5b461-bff8-6aa8-b5a6-85da2834eb8a}
+
+ {f724061f-f10a-014b-33d7-45b931e3a908}
+
{fb964f3d-a59c-a7ba-fee5-6072dbb94a7b}