From 72351f63fd650cc7acfcd2d0307e8e8e8f777283 Mon Sep 17 00:00:00 2001
From: Esun Kim <veblush@google.com>
Date: Tue, 14 Jan 2020 16:35:23 -0800
Subject: [PATCH] Remove grpc sources from grpc++

---
 BUILD.gn                            | 240 -----------------
 CMakeLists.txt                      | 396 ----------------------------
 Makefile                            | 396 ----------------------------
 build.yaml                          |   1 -
 grpc.gyp                            | 396 ----------------------------
 tools/doxygen/Doxyfile.c++.internal | 240 -----------------
 6 files changed, 1669 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 0599ae15048..8a4d6c7b23c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1191,135 +1191,32 @@ config("grpc_config") {
         "include/grpcpp/support/sync_stream_impl.h",
         "include/grpcpp/support/time.h",
         "include/grpcpp/support/validate_service_config.h",
-        "src/core/ext/filters/client_channel/backend_metric.cc",
-        "src/core/ext/filters/client_channel/backend_metric.h",
-        "src/core/ext/filters/client_channel/backup_poller.cc",
-        "src/core/ext/filters/client_channel/backup_poller.h",
-        "src/core/ext/filters/client_channel/channel_connectivity.cc",
-        "src/core/ext/filters/client_channel/client_channel.cc",
-        "src/core/ext/filters/client_channel/client_channel.h",
-        "src/core/ext/filters/client_channel/client_channel_channelz.cc",
-        "src/core/ext/filters/client_channel/client_channel_channelz.h",
-        "src/core/ext/filters/client_channel/client_channel_factory.cc",
-        "src/core/ext/filters/client_channel/client_channel_factory.h",
-        "src/core/ext/filters/client_channel/client_channel_plugin.cc",
-        "src/core/ext/filters/client_channel/connector.h",
-        "src/core/ext/filters/client_channel/global_subchannel_pool.cc",
-        "src/core/ext/filters/client_channel/global_subchannel_pool.h",
-        "src/core/ext/filters/client_channel/health/health_check_client.cc",
-        "src/core/ext/filters/client_channel/health/health_check_client.h",
-        "src/core/ext/filters/client_channel/http_connect_handshaker.cc",
-        "src/core/ext/filters/client_channel/http_connect_handshaker.h",
-        "src/core/ext/filters/client_channel/http_proxy.cc",
-        "src/core/ext/filters/client_channel/http_proxy.h",
-        "src/core/ext/filters/client_channel/lb_policy.cc",
-        "src/core/ext/filters/client_channel/lb_policy.h",
-        "src/core/ext/filters/client_channel/lb_policy_factory.h",
-        "src/core/ext/filters/client_channel/lb_policy_registry.cc",
-        "src/core/ext/filters/client_channel/lb_policy_registry.h",
-        "src/core/ext/filters/client_channel/local_subchannel_pool.cc",
-        "src/core/ext/filters/client_channel/local_subchannel_pool.h",
-        "src/core/ext/filters/client_channel/parse_address.cc",
-        "src/core/ext/filters/client_channel/parse_address.h",
-        "src/core/ext/filters/client_channel/proxy_mapper.h",
-        "src/core/ext/filters/client_channel/proxy_mapper_registry.cc",
-        "src/core/ext/filters/client_channel/proxy_mapper_registry.h",
-        "src/core/ext/filters/client_channel/resolver.cc",
-        "src/core/ext/filters/client_channel/resolver.h",
-        "src/core/ext/filters/client_channel/resolver_factory.h",
-        "src/core/ext/filters/client_channel/resolver_registry.cc",
-        "src/core/ext/filters/client_channel/resolver_registry.h",
-        "src/core/ext/filters/client_channel/resolver_result_parsing.cc",
-        "src/core/ext/filters/client_channel/resolver_result_parsing.h",
-        "src/core/ext/filters/client_channel/resolving_lb_policy.cc",
-        "src/core/ext/filters/client_channel/resolving_lb_policy.h",
-        "src/core/ext/filters/client_channel/retry_throttle.cc",
-        "src/core/ext/filters/client_channel/retry_throttle.h",
-        "src/core/ext/filters/client_channel/server_address.cc",
-        "src/core/ext/filters/client_channel/server_address.h",
-        "src/core/ext/filters/client_channel/service_config.cc",
-        "src/core/ext/filters/client_channel/service_config.h",
-        "src/core/ext/filters/client_channel/subchannel.cc",
-        "src/core/ext/filters/client_channel/subchannel.h",
-        "src/core/ext/filters/client_channel/subchannel_interface.h",
-        "src/core/ext/filters/client_channel/subchannel_pool_interface.cc",
-        "src/core/ext/filters/client_channel/subchannel_pool_interface.h",
-        "src/core/ext/filters/deadline/deadline_filter.cc",
-        "src/core/ext/filters/deadline/deadline_filter.h",
         "src/core/ext/transport/inproc/inproc_transport.h",
-        "src/core/ext/upb-generated/gogoproto/gogo.upb.c",
-        "src/core/ext/upb-generated/gogoproto/gogo.upb.h",
-        "src/core/ext/upb-generated/google/api/annotations.upb.c",
-        "src/core/ext/upb-generated/google/api/annotations.upb.h",
-        "src/core/ext/upb-generated/google/api/http.upb.c",
-        "src/core/ext/upb-generated/google/api/http.upb.h",
-        "src/core/ext/upb-generated/google/protobuf/any.upb.c",
-        "src/core/ext/upb-generated/google/protobuf/any.upb.h",
-        "src/core/ext/upb-generated/google/protobuf/descriptor.upb.c",
-        "src/core/ext/upb-generated/google/protobuf/descriptor.upb.h",
-        "src/core/ext/upb-generated/google/protobuf/duration.upb.c",
-        "src/core/ext/upb-generated/google/protobuf/duration.upb.h",
-        "src/core/ext/upb-generated/google/protobuf/empty.upb.c",
-        "src/core/ext/upb-generated/google/protobuf/empty.upb.h",
-        "src/core/ext/upb-generated/google/protobuf/struct.upb.c",
-        "src/core/ext/upb-generated/google/protobuf/struct.upb.h",
-        "src/core/ext/upb-generated/google/protobuf/timestamp.upb.c",
-        "src/core/ext/upb-generated/google/protobuf/timestamp.upb.h",
-        "src/core/ext/upb-generated/google/protobuf/wrappers.upb.c",
-        "src/core/ext/upb-generated/google/protobuf/wrappers.upb.h",
-        "src/core/ext/upb-generated/google/rpc/status.upb.c",
-        "src/core/ext/upb-generated/google/rpc/status.upb.h",
         "src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c",
         "src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h",
-        "src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c",
-        "src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h",
-        "src/core/ext/upb-generated/validate/validate.upb.c",
-        "src/core/ext/upb-generated/validate/validate.upb.h",
-        "src/core/lib/avl/avl.cc",
         "src/core/lib/avl/avl.h",
-        "src/core/lib/backoff/backoff.cc",
         "src/core/lib/backoff/backoff.h",
-        "src/core/lib/channel/channel_args.cc",
         "src/core/lib/channel/channel_args.h",
-        "src/core/lib/channel/channel_stack.cc",
         "src/core/lib/channel/channel_stack.h",
-        "src/core/lib/channel/channel_stack_builder.cc",
         "src/core/lib/channel/channel_stack_builder.h",
-        "src/core/lib/channel/channel_trace.cc",
         "src/core/lib/channel/channel_trace.h",
-        "src/core/lib/channel/channelz.cc",
         "src/core/lib/channel/channelz.h",
-        "src/core/lib/channel/channelz_registry.cc",
         "src/core/lib/channel/channelz_registry.h",
-        "src/core/lib/channel/connected_channel.cc",
         "src/core/lib/channel/connected_channel.h",
         "src/core/lib/channel/context.h",
-        "src/core/lib/channel/handshaker.cc",
         "src/core/lib/channel/handshaker.h",
         "src/core/lib/channel/handshaker_factory.h",
-        "src/core/lib/channel/handshaker_registry.cc",
         "src/core/lib/channel/handshaker_registry.h",
-        "src/core/lib/channel/status_util.cc",
         "src/core/lib/channel/status_util.h",
         "src/core/lib/compression/algorithm_metadata.h",
-        "src/core/lib/compression/compression.cc",
-        "src/core/lib/compression/compression_args.cc",
         "src/core/lib/compression/compression_args.h",
-        "src/core/lib/compression/compression_internal.cc",
         "src/core/lib/compression/compression_internal.h",
-        "src/core/lib/compression/message_compress.cc",
         "src/core/lib/compression/message_compress.h",
-        "src/core/lib/compression/stream_compression.cc",
         "src/core/lib/compression/stream_compression.h",
-        "src/core/lib/compression/stream_compression_gzip.cc",
         "src/core/lib/compression/stream_compression_gzip.h",
-        "src/core/lib/compression/stream_compression_identity.cc",
         "src/core/lib/compression/stream_compression_identity.h",
-        "src/core/lib/debug/stats.cc",
         "src/core/lib/debug/stats.h",
-        "src/core/lib/debug/stats_data.cc",
         "src/core/lib/debug/stats_data.h",
-        "src/core/lib/debug/trace.cc",
         "src/core/lib/debug/trace.h",
         "src/core/lib/gpr/alloc.h",
         "src/core/lib/gpr/arena.h",
@@ -1356,257 +1253,120 @@ config("grpc_config") {
         "src/core/lib/gprpp/string_view.h",
         "src/core/lib/gprpp/sync.h",
         "src/core/lib/gprpp/thd.h",
-        "src/core/lib/http/format_request.cc",
         "src/core/lib/http/format_request.h",
-        "src/core/lib/http/httpcli.cc",
         "src/core/lib/http/httpcli.h",
-        "src/core/lib/http/parser.cc",
         "src/core/lib/http/parser.h",
         "src/core/lib/iomgr/block_annotate.h",
-        "src/core/lib/iomgr/buffer_list.cc",
         "src/core/lib/iomgr/buffer_list.h",
-        "src/core/lib/iomgr/call_combiner.cc",
         "src/core/lib/iomgr/call_combiner.h",
-        "src/core/lib/iomgr/cfstream_handle.cc",
         "src/core/lib/iomgr/cfstream_handle.h",
         "src/core/lib/iomgr/closure.h",
-        "src/core/lib/iomgr/combiner.cc",
         "src/core/lib/iomgr/combiner.h",
         "src/core/lib/iomgr/dynamic_annotations.h",
-        "src/core/lib/iomgr/endpoint.cc",
         "src/core/lib/iomgr/endpoint.h",
-        "src/core/lib/iomgr/endpoint_cfstream.cc",
         "src/core/lib/iomgr/endpoint_cfstream.h",
         "src/core/lib/iomgr/endpoint_pair.h",
-        "src/core/lib/iomgr/endpoint_pair_posix.cc",
-        "src/core/lib/iomgr/endpoint_pair_uv.cc",
-        "src/core/lib/iomgr/endpoint_pair_windows.cc",
-        "src/core/lib/iomgr/error.cc",
         "src/core/lib/iomgr/error.h",
-        "src/core/lib/iomgr/error_cfstream.cc",
         "src/core/lib/iomgr/error_cfstream.h",
         "src/core/lib/iomgr/error_internal.h",
-        "src/core/lib/iomgr/ev_epoll1_linux.cc",
         "src/core/lib/iomgr/ev_epoll1_linux.h",
-        "src/core/lib/iomgr/ev_epollex_linux.cc",
         "src/core/lib/iomgr/ev_epollex_linux.h",
-        "src/core/lib/iomgr/ev_poll_posix.cc",
         "src/core/lib/iomgr/ev_poll_posix.h",
-        "src/core/lib/iomgr/ev_posix.cc",
         "src/core/lib/iomgr/ev_posix.h",
-        "src/core/lib/iomgr/ev_windows.cc",
-        "src/core/lib/iomgr/exec_ctx.cc",
         "src/core/lib/iomgr/exec_ctx.h",
-        "src/core/lib/iomgr/executor.cc",
         "src/core/lib/iomgr/executor.h",
-        "src/core/lib/iomgr/executor/mpmcqueue.cc",
         "src/core/lib/iomgr/executor/mpmcqueue.h",
-        "src/core/lib/iomgr/executor/threadpool.cc",
         "src/core/lib/iomgr/executor/threadpool.h",
-        "src/core/lib/iomgr/fork_posix.cc",
-        "src/core/lib/iomgr/fork_windows.cc",
         "src/core/lib/iomgr/gethostname.h",
-        "src/core/lib/iomgr/gethostname_fallback.cc",
-        "src/core/lib/iomgr/gethostname_host_name_max.cc",
-        "src/core/lib/iomgr/gethostname_sysconf.cc",
         "src/core/lib/iomgr/grpc_if_nametoindex.h",
-        "src/core/lib/iomgr/grpc_if_nametoindex_posix.cc",
-        "src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc",
-        "src/core/lib/iomgr/internal_errqueue.cc",
         "src/core/lib/iomgr/internal_errqueue.h",
-        "src/core/lib/iomgr/iocp_windows.cc",
         "src/core/lib/iomgr/iocp_windows.h",
-        "src/core/lib/iomgr/iomgr.cc",
         "src/core/lib/iomgr/iomgr.h",
-        "src/core/lib/iomgr/iomgr_custom.cc",
         "src/core/lib/iomgr/iomgr_custom.h",
-        "src/core/lib/iomgr/iomgr_internal.cc",
         "src/core/lib/iomgr/iomgr_internal.h",
-        "src/core/lib/iomgr/iomgr_posix.cc",
         "src/core/lib/iomgr/iomgr_posix.h",
-        "src/core/lib/iomgr/iomgr_posix_cfstream.cc",
-        "src/core/lib/iomgr/iomgr_uv.cc",
-        "src/core/lib/iomgr/iomgr_windows.cc",
-        "src/core/lib/iomgr/is_epollexclusive_available.cc",
         "src/core/lib/iomgr/is_epollexclusive_available.h",
-        "src/core/lib/iomgr/load_file.cc",
         "src/core/lib/iomgr/load_file.h",
-        "src/core/lib/iomgr/lockfree_event.cc",
         "src/core/lib/iomgr/lockfree_event.h",
-        "src/core/lib/iomgr/logical_thread.cc",
         "src/core/lib/iomgr/logical_thread.h",
         "src/core/lib/iomgr/nameser.h",
-        "src/core/lib/iomgr/polling_entity.cc",
         "src/core/lib/iomgr/polling_entity.h",
-        "src/core/lib/iomgr/pollset.cc",
         "src/core/lib/iomgr/pollset.h",
-        "src/core/lib/iomgr/pollset_custom.cc",
         "src/core/lib/iomgr/pollset_custom.h",
-        "src/core/lib/iomgr/pollset_set.cc",
         "src/core/lib/iomgr/pollset_set.h",
-        "src/core/lib/iomgr/pollset_set_custom.cc",
         "src/core/lib/iomgr/pollset_set_custom.h",
-        "src/core/lib/iomgr/pollset_set_windows.cc",
         "src/core/lib/iomgr/pollset_set_windows.h",
-        "src/core/lib/iomgr/pollset_uv.cc",
-        "src/core/lib/iomgr/pollset_windows.cc",
         "src/core/lib/iomgr/pollset_windows.h",
         "src/core/lib/iomgr/port.h",
-        "src/core/lib/iomgr/resolve_address.cc",
         "src/core/lib/iomgr/resolve_address.h",
-        "src/core/lib/iomgr/resolve_address_custom.cc",
         "src/core/lib/iomgr/resolve_address_custom.h",
-        "src/core/lib/iomgr/resolve_address_posix.cc",
-        "src/core/lib/iomgr/resolve_address_windows.cc",
-        "src/core/lib/iomgr/resource_quota.cc",
         "src/core/lib/iomgr/resource_quota.h",
         "src/core/lib/iomgr/sockaddr.h",
         "src/core/lib/iomgr/sockaddr_custom.h",
         "src/core/lib/iomgr/sockaddr_posix.h",
-        "src/core/lib/iomgr/sockaddr_utils.cc",
         "src/core/lib/iomgr/sockaddr_utils.h",
         "src/core/lib/iomgr/sockaddr_windows.h",
-        "src/core/lib/iomgr/socket_factory_posix.cc",
         "src/core/lib/iomgr/socket_factory_posix.h",
-        "src/core/lib/iomgr/socket_mutator.cc",
         "src/core/lib/iomgr/socket_mutator.h",
         "src/core/lib/iomgr/socket_utils.h",
-        "src/core/lib/iomgr/socket_utils_common_posix.cc",
-        "src/core/lib/iomgr/socket_utils_linux.cc",
-        "src/core/lib/iomgr/socket_utils_posix.cc",
         "src/core/lib/iomgr/socket_utils_posix.h",
-        "src/core/lib/iomgr/socket_utils_uv.cc",
-        "src/core/lib/iomgr/socket_utils_windows.cc",
-        "src/core/lib/iomgr/socket_windows.cc",
         "src/core/lib/iomgr/socket_windows.h",
         "src/core/lib/iomgr/sys_epoll_wrapper.h",
-        "src/core/lib/iomgr/tcp_client.cc",
         "src/core/lib/iomgr/tcp_client.h",
-        "src/core/lib/iomgr/tcp_client_cfstream.cc",
-        "src/core/lib/iomgr/tcp_client_custom.cc",
-        "src/core/lib/iomgr/tcp_client_posix.cc",
         "src/core/lib/iomgr/tcp_client_posix.h",
-        "src/core/lib/iomgr/tcp_client_windows.cc",
-        "src/core/lib/iomgr/tcp_custom.cc",
         "src/core/lib/iomgr/tcp_custom.h",
-        "src/core/lib/iomgr/tcp_posix.cc",
         "src/core/lib/iomgr/tcp_posix.h",
-        "src/core/lib/iomgr/tcp_server.cc",
         "src/core/lib/iomgr/tcp_server.h",
-        "src/core/lib/iomgr/tcp_server_custom.cc",
-        "src/core/lib/iomgr/tcp_server_posix.cc",
         "src/core/lib/iomgr/tcp_server_utils_posix.h",
-        "src/core/lib/iomgr/tcp_server_utils_posix_common.cc",
-        "src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc",
-        "src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc",
-        "src/core/lib/iomgr/tcp_server_windows.cc",
-        "src/core/lib/iomgr/tcp_uv.cc",
-        "src/core/lib/iomgr/tcp_windows.cc",
         "src/core/lib/iomgr/tcp_windows.h",
-        "src/core/lib/iomgr/time_averaged_stats.cc",
         "src/core/lib/iomgr/time_averaged_stats.h",
-        "src/core/lib/iomgr/timer.cc",
         "src/core/lib/iomgr/timer.h",
-        "src/core/lib/iomgr/timer_custom.cc",
         "src/core/lib/iomgr/timer_custom.h",
-        "src/core/lib/iomgr/timer_generic.cc",
-        "src/core/lib/iomgr/timer_heap.cc",
         "src/core/lib/iomgr/timer_heap.h",
-        "src/core/lib/iomgr/timer_manager.cc",
         "src/core/lib/iomgr/timer_manager.h",
-        "src/core/lib/iomgr/timer_uv.cc",
-        "src/core/lib/iomgr/udp_server.cc",
         "src/core/lib/iomgr/udp_server.h",
-        "src/core/lib/iomgr/unix_sockets_posix.cc",
         "src/core/lib/iomgr/unix_sockets_posix.h",
-        "src/core/lib/iomgr/unix_sockets_posix_noop.cc",
-        "src/core/lib/iomgr/wakeup_fd_eventfd.cc",
-        "src/core/lib/iomgr/wakeup_fd_nospecial.cc",
-        "src/core/lib/iomgr/wakeup_fd_pipe.cc",
         "src/core/lib/iomgr/wakeup_fd_pipe.h",
-        "src/core/lib/iomgr/wakeup_fd_posix.cc",
         "src/core/lib/iomgr/wakeup_fd_posix.h",
-        "src/core/lib/json/json.cc",
         "src/core/lib/json/json.h",
         "src/core/lib/json/json_common.h",
-        "src/core/lib/json/json_reader.cc",
         "src/core/lib/json/json_reader.h",
-        "src/core/lib/json/json_string.cc",
-        "src/core/lib/json/json_writer.cc",
         "src/core/lib/json/json_writer.h",
         "src/core/lib/profiling/timers.h",
-        "src/core/lib/slice/b64.cc",
         "src/core/lib/slice/b64.h",
-        "src/core/lib/slice/percent_encoding.cc",
         "src/core/lib/slice/percent_encoding.h",
-        "src/core/lib/slice/slice.cc",
-        "src/core/lib/slice/slice_buffer.cc",
         "src/core/lib/slice/slice_hash_table.h",
-        "src/core/lib/slice/slice_intern.cc",
         "src/core/lib/slice/slice_internal.h",
-        "src/core/lib/slice/slice_string_helpers.cc",
         "src/core/lib/slice/slice_string_helpers.h",
         "src/core/lib/slice/slice_utils.h",
         "src/core/lib/slice/slice_weak_hash_table.h",
-        "src/core/lib/surface/api_trace.cc",
         "src/core/lib/surface/api_trace.h",
-        "src/core/lib/surface/byte_buffer.cc",
-        "src/core/lib/surface/byte_buffer_reader.cc",
-        "src/core/lib/surface/call.cc",
         "src/core/lib/surface/call.h",
-        "src/core/lib/surface/call_details.cc",
-        "src/core/lib/surface/call_log_batch.cc",
         "src/core/lib/surface/call_test_only.h",
-        "src/core/lib/surface/channel.cc",
         "src/core/lib/surface/channel.h",
-        "src/core/lib/surface/channel_init.cc",
         "src/core/lib/surface/channel_init.h",
-        "src/core/lib/surface/channel_ping.cc",
-        "src/core/lib/surface/channel_stack_type.cc",
         "src/core/lib/surface/channel_stack_type.h",
-        "src/core/lib/surface/completion_queue.cc",
         "src/core/lib/surface/completion_queue.h",
-        "src/core/lib/surface/completion_queue_factory.cc",
         "src/core/lib/surface/completion_queue_factory.h",
-        "src/core/lib/surface/event_string.cc",
         "src/core/lib/surface/event_string.h",
         "src/core/lib/surface/init.h",
-        "src/core/lib/surface/lame_client.cc",
         "src/core/lib/surface/lame_client.h",
-        "src/core/lib/surface/metadata_array.cc",
-        "src/core/lib/surface/server.cc",
         "src/core/lib/surface/server.h",
-        "src/core/lib/surface/validate_metadata.cc",
         "src/core/lib/surface/validate_metadata.h",
-        "src/core/lib/surface/version.cc",
-        "src/core/lib/transport/bdp_estimator.cc",
         "src/core/lib/transport/bdp_estimator.h",
-        "src/core/lib/transport/byte_stream.cc",
         "src/core/lib/transport/byte_stream.h",
-        "src/core/lib/transport/connectivity_state.cc",
         "src/core/lib/transport/connectivity_state.h",
-        "src/core/lib/transport/error_utils.cc",
         "src/core/lib/transport/error_utils.h",
         "src/core/lib/transport/http2_errors.h",
-        "src/core/lib/transport/metadata.cc",
         "src/core/lib/transport/metadata.h",
-        "src/core/lib/transport/metadata_batch.cc",
         "src/core/lib/transport/metadata_batch.h",
-        "src/core/lib/transport/pid_controller.cc",
         "src/core/lib/transport/pid_controller.h",
-        "src/core/lib/transport/static_metadata.cc",
         "src/core/lib/transport/static_metadata.h",
-        "src/core/lib/transport/status_conversion.cc",
         "src/core/lib/transport/status_conversion.h",
-        "src/core/lib/transport/status_metadata.cc",
         "src/core/lib/transport/status_metadata.h",
-        "src/core/lib/transport/timeout_encoding.cc",
         "src/core/lib/transport/timeout_encoding.h",
-        "src/core/lib/transport/transport.cc",
         "src/core/lib/transport/transport.h",
         "src/core/lib/transport/transport_impl.h",
-        "src/core/lib/transport/transport_op_string.cc",
-        "src/core/lib/uri/uri_parser.cc",
         "src/core/lib/uri/uri_parser.h",
         "src/cpp/client/channel_cc.cc",
         "src/cpp/client/client_context.cc",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d4418ad619..be27010428f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3299,205 +3299,7 @@ add_library(grpc++
   src/cpp/util/status.cc
   src/cpp/util/string_ref.cc
   src/cpp/util/time_cc.cc
-  src/core/ext/filters/client_channel/backend_metric.cc
-  src/core/ext/filters/client_channel/backup_poller.cc
-  src/core/ext/filters/client_channel/channel_connectivity.cc
-  src/core/ext/filters/client_channel/client_channel.cc
-  src/core/ext/filters/client_channel/client_channel_channelz.cc
-  src/core/ext/filters/client_channel/client_channel_factory.cc
-  src/core/ext/filters/client_channel/client_channel_plugin.cc
-  src/core/ext/filters/client_channel/global_subchannel_pool.cc
-  src/core/ext/filters/client_channel/health/health_check_client.cc
-  src/core/ext/filters/client_channel/http_connect_handshaker.cc
-  src/core/ext/filters/client_channel/http_proxy.cc
-  src/core/ext/filters/client_channel/lb_policy.cc
-  src/core/ext/filters/client_channel/lb_policy_registry.cc
-  src/core/ext/filters/client_channel/local_subchannel_pool.cc
-  src/core/ext/filters/client_channel/parse_address.cc
-  src/core/ext/filters/client_channel/proxy_mapper_registry.cc
-  src/core/ext/filters/client_channel/resolver.cc
-  src/core/ext/filters/client_channel/resolver_registry.cc
-  src/core/ext/filters/client_channel/resolver_result_parsing.cc
-  src/core/ext/filters/client_channel/resolving_lb_policy.cc
-  src/core/ext/filters/client_channel/retry_throttle.cc
-  src/core/ext/filters/client_channel/server_address.cc
-  src/core/ext/filters/client_channel/service_config.cc
-  src/core/ext/filters/client_channel/subchannel.cc
-  src/core/ext/filters/client_channel/subchannel_pool_interface.cc
-  src/core/lib/avl/avl.cc
-  src/core/lib/backoff/backoff.cc
-  src/core/lib/channel/channel_args.cc
-  src/core/lib/channel/channel_stack.cc
-  src/core/lib/channel/channel_stack_builder.cc
-  src/core/lib/channel/channel_trace.cc
-  src/core/lib/channel/channelz.cc
-  src/core/lib/channel/channelz_registry.cc
-  src/core/lib/channel/connected_channel.cc
-  src/core/lib/channel/handshaker.cc
-  src/core/lib/channel/handshaker_registry.cc
-  src/core/lib/channel/status_util.cc
-  src/core/lib/compression/compression.cc
-  src/core/lib/compression/compression_args.cc
-  src/core/lib/compression/compression_internal.cc
-  src/core/lib/compression/message_compress.cc
-  src/core/lib/compression/stream_compression.cc
-  src/core/lib/compression/stream_compression_gzip.cc
-  src/core/lib/compression/stream_compression_identity.cc
-  src/core/lib/debug/stats.cc
-  src/core/lib/debug/stats_data.cc
-  src/core/lib/http/format_request.cc
-  src/core/lib/http/httpcli.cc
-  src/core/lib/http/parser.cc
-  src/core/lib/iomgr/buffer_list.cc
-  src/core/lib/iomgr/call_combiner.cc
-  src/core/lib/iomgr/cfstream_handle.cc
-  src/core/lib/iomgr/combiner.cc
-  src/core/lib/iomgr/endpoint.cc
-  src/core/lib/iomgr/endpoint_cfstream.cc
-  src/core/lib/iomgr/endpoint_pair_posix.cc
-  src/core/lib/iomgr/endpoint_pair_uv.cc
-  src/core/lib/iomgr/endpoint_pair_windows.cc
-  src/core/lib/iomgr/error.cc
-  src/core/lib/iomgr/error_cfstream.cc
-  src/core/lib/iomgr/ev_epoll1_linux.cc
-  src/core/lib/iomgr/ev_epollex_linux.cc
-  src/core/lib/iomgr/ev_poll_posix.cc
-  src/core/lib/iomgr/ev_posix.cc
-  src/core/lib/iomgr/ev_windows.cc
-  src/core/lib/iomgr/exec_ctx.cc
-  src/core/lib/iomgr/executor.cc
-  src/core/lib/iomgr/executor/mpmcqueue.cc
-  src/core/lib/iomgr/executor/threadpool.cc
-  src/core/lib/iomgr/fork_posix.cc
-  src/core/lib/iomgr/fork_windows.cc
-  src/core/lib/iomgr/gethostname_fallback.cc
-  src/core/lib/iomgr/gethostname_host_name_max.cc
-  src/core/lib/iomgr/gethostname_sysconf.cc
-  src/core/lib/iomgr/grpc_if_nametoindex_posix.cc
-  src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc
-  src/core/lib/iomgr/internal_errqueue.cc
-  src/core/lib/iomgr/iocp_windows.cc
-  src/core/lib/iomgr/iomgr.cc
-  src/core/lib/iomgr/iomgr_custom.cc
-  src/core/lib/iomgr/iomgr_internal.cc
-  src/core/lib/iomgr/iomgr_posix.cc
-  src/core/lib/iomgr/iomgr_posix_cfstream.cc
-  src/core/lib/iomgr/iomgr_uv.cc
-  src/core/lib/iomgr/iomgr_windows.cc
-  src/core/lib/iomgr/is_epollexclusive_available.cc
-  src/core/lib/iomgr/load_file.cc
-  src/core/lib/iomgr/lockfree_event.cc
-  src/core/lib/iomgr/logical_thread.cc
-  src/core/lib/iomgr/polling_entity.cc
-  src/core/lib/iomgr/pollset.cc
-  src/core/lib/iomgr/pollset_custom.cc
-  src/core/lib/iomgr/pollset_set.cc
-  src/core/lib/iomgr/pollset_set_custom.cc
-  src/core/lib/iomgr/pollset_set_windows.cc
-  src/core/lib/iomgr/pollset_uv.cc
-  src/core/lib/iomgr/pollset_windows.cc
-  src/core/lib/iomgr/resolve_address.cc
-  src/core/lib/iomgr/resolve_address_custom.cc
-  src/core/lib/iomgr/resolve_address_posix.cc
-  src/core/lib/iomgr/resolve_address_windows.cc
-  src/core/lib/iomgr/resource_quota.cc
-  src/core/lib/iomgr/sockaddr_utils.cc
-  src/core/lib/iomgr/socket_factory_posix.cc
-  src/core/lib/iomgr/socket_mutator.cc
-  src/core/lib/iomgr/socket_utils_common_posix.cc
-  src/core/lib/iomgr/socket_utils_linux.cc
-  src/core/lib/iomgr/socket_utils_posix.cc
-  src/core/lib/iomgr/socket_utils_uv.cc
-  src/core/lib/iomgr/socket_utils_windows.cc
-  src/core/lib/iomgr/socket_windows.cc
-  src/core/lib/iomgr/tcp_client.cc
-  src/core/lib/iomgr/tcp_client_cfstream.cc
-  src/core/lib/iomgr/tcp_client_custom.cc
-  src/core/lib/iomgr/tcp_client_posix.cc
-  src/core/lib/iomgr/tcp_client_windows.cc
-  src/core/lib/iomgr/tcp_custom.cc
-  src/core/lib/iomgr/tcp_posix.cc
-  src/core/lib/iomgr/tcp_server.cc
-  src/core/lib/iomgr/tcp_server_custom.cc
-  src/core/lib/iomgr/tcp_server_posix.cc
-  src/core/lib/iomgr/tcp_server_utils_posix_common.cc
-  src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc
-  src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc
-  src/core/lib/iomgr/tcp_server_windows.cc
-  src/core/lib/iomgr/tcp_uv.cc
-  src/core/lib/iomgr/tcp_windows.cc
-  src/core/lib/iomgr/time_averaged_stats.cc
-  src/core/lib/iomgr/timer.cc
-  src/core/lib/iomgr/timer_custom.cc
-  src/core/lib/iomgr/timer_generic.cc
-  src/core/lib/iomgr/timer_heap.cc
-  src/core/lib/iomgr/timer_manager.cc
-  src/core/lib/iomgr/timer_uv.cc
-  src/core/lib/iomgr/udp_server.cc
-  src/core/lib/iomgr/unix_sockets_posix.cc
-  src/core/lib/iomgr/unix_sockets_posix_noop.cc
-  src/core/lib/iomgr/wakeup_fd_eventfd.cc
-  src/core/lib/iomgr/wakeup_fd_nospecial.cc
-  src/core/lib/iomgr/wakeup_fd_pipe.cc
-  src/core/lib/iomgr/wakeup_fd_posix.cc
-  src/core/lib/json/json.cc
-  src/core/lib/json/json_reader.cc
-  src/core/lib/json/json_string.cc
-  src/core/lib/json/json_writer.cc
-  src/core/lib/slice/b64.cc
-  src/core/lib/slice/percent_encoding.cc
-  src/core/lib/slice/slice.cc
-  src/core/lib/slice/slice_buffer.cc
-  src/core/lib/slice/slice_intern.cc
-  src/core/lib/slice/slice_string_helpers.cc
-  src/core/lib/surface/api_trace.cc
-  src/core/lib/surface/byte_buffer.cc
-  src/core/lib/surface/byte_buffer_reader.cc
-  src/core/lib/surface/call.cc
-  src/core/lib/surface/call_details.cc
-  src/core/lib/surface/call_log_batch.cc
-  src/core/lib/surface/channel.cc
-  src/core/lib/surface/channel_init.cc
-  src/core/lib/surface/channel_ping.cc
-  src/core/lib/surface/channel_stack_type.cc
-  src/core/lib/surface/completion_queue.cc
-  src/core/lib/surface/completion_queue_factory.cc
-  src/core/lib/surface/event_string.cc
-  src/core/lib/surface/lame_client.cc
-  src/core/lib/surface/metadata_array.cc
-  src/core/lib/surface/server.cc
-  src/core/lib/surface/validate_metadata.cc
-  src/core/lib/surface/version.cc
-  src/core/lib/transport/bdp_estimator.cc
-  src/core/lib/transport/byte_stream.cc
-  src/core/lib/transport/connectivity_state.cc
-  src/core/lib/transport/error_utils.cc
-  src/core/lib/transport/metadata.cc
-  src/core/lib/transport/metadata_batch.cc
-  src/core/lib/transport/pid_controller.cc
-  src/core/lib/transport/static_metadata.cc
-  src/core/lib/transport/status_conversion.cc
-  src/core/lib/transport/status_metadata.cc
-  src/core/lib/transport/timeout_encoding.cc
-  src/core/lib/transport/transport.cc
-  src/core/lib/transport/transport_op_string.cc
-  src/core/lib/uri/uri_parser.cc
-  src/core/lib/debug/trace.cc
-  src/core/ext/filters/deadline/deadline_filter.cc
   src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
-  src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
-  src/core/ext/upb-generated/gogoproto/gogo.upb.c
-  src/core/ext/upb-generated/validate/validate.upb.c
-  src/core/ext/upb-generated/google/api/annotations.upb.c
-  src/core/ext/upb-generated/google/api/http.upb.c
-  src/core/ext/upb-generated/google/protobuf/any.upb.c
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  src/core/ext/upb-generated/google/protobuf/duration.upb.c
-  src/core/ext/upb-generated/google/protobuf/empty.upb.c
-  src/core/ext/upb-generated/google/protobuf/struct.upb.c
-  src/core/ext/upb-generated/google/protobuf/timestamp.upb.c
-  src/core/ext/upb-generated/google/protobuf/wrappers.upb.c
-  src/core/ext/upb-generated/google/rpc/status.upb.c
   src/cpp/codegen/codegen_init.cc
 )
 
@@ -4564,205 +4366,7 @@ add_library(grpc++_unsecure
   src/cpp/util/status.cc
   src/cpp/util/string_ref.cc
   src/cpp/util/time_cc.cc
-  src/core/ext/filters/client_channel/backend_metric.cc
-  src/core/ext/filters/client_channel/backup_poller.cc
-  src/core/ext/filters/client_channel/channel_connectivity.cc
-  src/core/ext/filters/client_channel/client_channel.cc
-  src/core/ext/filters/client_channel/client_channel_channelz.cc
-  src/core/ext/filters/client_channel/client_channel_factory.cc
-  src/core/ext/filters/client_channel/client_channel_plugin.cc
-  src/core/ext/filters/client_channel/global_subchannel_pool.cc
-  src/core/ext/filters/client_channel/health/health_check_client.cc
-  src/core/ext/filters/client_channel/http_connect_handshaker.cc
-  src/core/ext/filters/client_channel/http_proxy.cc
-  src/core/ext/filters/client_channel/lb_policy.cc
-  src/core/ext/filters/client_channel/lb_policy_registry.cc
-  src/core/ext/filters/client_channel/local_subchannel_pool.cc
-  src/core/ext/filters/client_channel/parse_address.cc
-  src/core/ext/filters/client_channel/proxy_mapper_registry.cc
-  src/core/ext/filters/client_channel/resolver.cc
-  src/core/ext/filters/client_channel/resolver_registry.cc
-  src/core/ext/filters/client_channel/resolver_result_parsing.cc
-  src/core/ext/filters/client_channel/resolving_lb_policy.cc
-  src/core/ext/filters/client_channel/retry_throttle.cc
-  src/core/ext/filters/client_channel/server_address.cc
-  src/core/ext/filters/client_channel/service_config.cc
-  src/core/ext/filters/client_channel/subchannel.cc
-  src/core/ext/filters/client_channel/subchannel_pool_interface.cc
-  src/core/lib/avl/avl.cc
-  src/core/lib/backoff/backoff.cc
-  src/core/lib/channel/channel_args.cc
-  src/core/lib/channel/channel_stack.cc
-  src/core/lib/channel/channel_stack_builder.cc
-  src/core/lib/channel/channel_trace.cc
-  src/core/lib/channel/channelz.cc
-  src/core/lib/channel/channelz_registry.cc
-  src/core/lib/channel/connected_channel.cc
-  src/core/lib/channel/handshaker.cc
-  src/core/lib/channel/handshaker_registry.cc
-  src/core/lib/channel/status_util.cc
-  src/core/lib/compression/compression.cc
-  src/core/lib/compression/compression_args.cc
-  src/core/lib/compression/compression_internal.cc
-  src/core/lib/compression/message_compress.cc
-  src/core/lib/compression/stream_compression.cc
-  src/core/lib/compression/stream_compression_gzip.cc
-  src/core/lib/compression/stream_compression_identity.cc
-  src/core/lib/debug/stats.cc
-  src/core/lib/debug/stats_data.cc
-  src/core/lib/http/format_request.cc
-  src/core/lib/http/httpcli.cc
-  src/core/lib/http/parser.cc
-  src/core/lib/iomgr/buffer_list.cc
-  src/core/lib/iomgr/call_combiner.cc
-  src/core/lib/iomgr/cfstream_handle.cc
-  src/core/lib/iomgr/combiner.cc
-  src/core/lib/iomgr/endpoint.cc
-  src/core/lib/iomgr/endpoint_cfstream.cc
-  src/core/lib/iomgr/endpoint_pair_posix.cc
-  src/core/lib/iomgr/endpoint_pair_uv.cc
-  src/core/lib/iomgr/endpoint_pair_windows.cc
-  src/core/lib/iomgr/error.cc
-  src/core/lib/iomgr/error_cfstream.cc
-  src/core/lib/iomgr/ev_epoll1_linux.cc
-  src/core/lib/iomgr/ev_epollex_linux.cc
-  src/core/lib/iomgr/ev_poll_posix.cc
-  src/core/lib/iomgr/ev_posix.cc
-  src/core/lib/iomgr/ev_windows.cc
-  src/core/lib/iomgr/exec_ctx.cc
-  src/core/lib/iomgr/executor.cc
-  src/core/lib/iomgr/executor/mpmcqueue.cc
-  src/core/lib/iomgr/executor/threadpool.cc
-  src/core/lib/iomgr/fork_posix.cc
-  src/core/lib/iomgr/fork_windows.cc
-  src/core/lib/iomgr/gethostname_fallback.cc
-  src/core/lib/iomgr/gethostname_host_name_max.cc
-  src/core/lib/iomgr/gethostname_sysconf.cc
-  src/core/lib/iomgr/grpc_if_nametoindex_posix.cc
-  src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc
-  src/core/lib/iomgr/internal_errqueue.cc
-  src/core/lib/iomgr/iocp_windows.cc
-  src/core/lib/iomgr/iomgr.cc
-  src/core/lib/iomgr/iomgr_custom.cc
-  src/core/lib/iomgr/iomgr_internal.cc
-  src/core/lib/iomgr/iomgr_posix.cc
-  src/core/lib/iomgr/iomgr_posix_cfstream.cc
-  src/core/lib/iomgr/iomgr_uv.cc
-  src/core/lib/iomgr/iomgr_windows.cc
-  src/core/lib/iomgr/is_epollexclusive_available.cc
-  src/core/lib/iomgr/load_file.cc
-  src/core/lib/iomgr/lockfree_event.cc
-  src/core/lib/iomgr/logical_thread.cc
-  src/core/lib/iomgr/polling_entity.cc
-  src/core/lib/iomgr/pollset.cc
-  src/core/lib/iomgr/pollset_custom.cc
-  src/core/lib/iomgr/pollset_set.cc
-  src/core/lib/iomgr/pollset_set_custom.cc
-  src/core/lib/iomgr/pollset_set_windows.cc
-  src/core/lib/iomgr/pollset_uv.cc
-  src/core/lib/iomgr/pollset_windows.cc
-  src/core/lib/iomgr/resolve_address.cc
-  src/core/lib/iomgr/resolve_address_custom.cc
-  src/core/lib/iomgr/resolve_address_posix.cc
-  src/core/lib/iomgr/resolve_address_windows.cc
-  src/core/lib/iomgr/resource_quota.cc
-  src/core/lib/iomgr/sockaddr_utils.cc
-  src/core/lib/iomgr/socket_factory_posix.cc
-  src/core/lib/iomgr/socket_mutator.cc
-  src/core/lib/iomgr/socket_utils_common_posix.cc
-  src/core/lib/iomgr/socket_utils_linux.cc
-  src/core/lib/iomgr/socket_utils_posix.cc
-  src/core/lib/iomgr/socket_utils_uv.cc
-  src/core/lib/iomgr/socket_utils_windows.cc
-  src/core/lib/iomgr/socket_windows.cc
-  src/core/lib/iomgr/tcp_client.cc
-  src/core/lib/iomgr/tcp_client_cfstream.cc
-  src/core/lib/iomgr/tcp_client_custom.cc
-  src/core/lib/iomgr/tcp_client_posix.cc
-  src/core/lib/iomgr/tcp_client_windows.cc
-  src/core/lib/iomgr/tcp_custom.cc
-  src/core/lib/iomgr/tcp_posix.cc
-  src/core/lib/iomgr/tcp_server.cc
-  src/core/lib/iomgr/tcp_server_custom.cc
-  src/core/lib/iomgr/tcp_server_posix.cc
-  src/core/lib/iomgr/tcp_server_utils_posix_common.cc
-  src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc
-  src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc
-  src/core/lib/iomgr/tcp_server_windows.cc
-  src/core/lib/iomgr/tcp_uv.cc
-  src/core/lib/iomgr/tcp_windows.cc
-  src/core/lib/iomgr/time_averaged_stats.cc
-  src/core/lib/iomgr/timer.cc
-  src/core/lib/iomgr/timer_custom.cc
-  src/core/lib/iomgr/timer_generic.cc
-  src/core/lib/iomgr/timer_heap.cc
-  src/core/lib/iomgr/timer_manager.cc
-  src/core/lib/iomgr/timer_uv.cc
-  src/core/lib/iomgr/udp_server.cc
-  src/core/lib/iomgr/unix_sockets_posix.cc
-  src/core/lib/iomgr/unix_sockets_posix_noop.cc
-  src/core/lib/iomgr/wakeup_fd_eventfd.cc
-  src/core/lib/iomgr/wakeup_fd_nospecial.cc
-  src/core/lib/iomgr/wakeup_fd_pipe.cc
-  src/core/lib/iomgr/wakeup_fd_posix.cc
-  src/core/lib/json/json.cc
-  src/core/lib/json/json_reader.cc
-  src/core/lib/json/json_string.cc
-  src/core/lib/json/json_writer.cc
-  src/core/lib/slice/b64.cc
-  src/core/lib/slice/percent_encoding.cc
-  src/core/lib/slice/slice.cc
-  src/core/lib/slice/slice_buffer.cc
-  src/core/lib/slice/slice_intern.cc
-  src/core/lib/slice/slice_string_helpers.cc
-  src/core/lib/surface/api_trace.cc
-  src/core/lib/surface/byte_buffer.cc
-  src/core/lib/surface/byte_buffer_reader.cc
-  src/core/lib/surface/call.cc
-  src/core/lib/surface/call_details.cc
-  src/core/lib/surface/call_log_batch.cc
-  src/core/lib/surface/channel.cc
-  src/core/lib/surface/channel_init.cc
-  src/core/lib/surface/channel_ping.cc
-  src/core/lib/surface/channel_stack_type.cc
-  src/core/lib/surface/completion_queue.cc
-  src/core/lib/surface/completion_queue_factory.cc
-  src/core/lib/surface/event_string.cc
-  src/core/lib/surface/lame_client.cc
-  src/core/lib/surface/metadata_array.cc
-  src/core/lib/surface/server.cc
-  src/core/lib/surface/validate_metadata.cc
-  src/core/lib/surface/version.cc
-  src/core/lib/transport/bdp_estimator.cc
-  src/core/lib/transport/byte_stream.cc
-  src/core/lib/transport/connectivity_state.cc
-  src/core/lib/transport/error_utils.cc
-  src/core/lib/transport/metadata.cc
-  src/core/lib/transport/metadata_batch.cc
-  src/core/lib/transport/pid_controller.cc
-  src/core/lib/transport/static_metadata.cc
-  src/core/lib/transport/status_conversion.cc
-  src/core/lib/transport/status_metadata.cc
-  src/core/lib/transport/timeout_encoding.cc
-  src/core/lib/transport/transport.cc
-  src/core/lib/transport/transport_op_string.cc
-  src/core/lib/uri/uri_parser.cc
-  src/core/lib/debug/trace.cc
-  src/core/ext/filters/deadline/deadline_filter.cc
   src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
-  src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
-  src/core/ext/upb-generated/gogoproto/gogo.upb.c
-  src/core/ext/upb-generated/validate/validate.upb.c
-  src/core/ext/upb-generated/google/api/annotations.upb.c
-  src/core/ext/upb-generated/google/api/http.upb.c
-  src/core/ext/upb-generated/google/protobuf/any.upb.c
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  src/core/ext/upb-generated/google/protobuf/duration.upb.c
-  src/core/ext/upb-generated/google/protobuf/empty.upb.c
-  src/core/ext/upb-generated/google/protobuf/struct.upb.c
-  src/core/ext/upb-generated/google/protobuf/timestamp.upb.c
-  src/core/ext/upb-generated/google/protobuf/wrappers.upb.c
-  src/core/ext/upb-generated/google/rpc/status.upb.c
   src/cpp/codegen/codegen_init.cc
 )
 
diff --git a/Makefile b/Makefile
index f8bd36f62f6..b25c748d3a9 100644
--- a/Makefile
+++ b/Makefile
@@ -5695,205 +5695,7 @@ LIBGRPC++_SRC = \
     src/cpp/util/status.cc \
     src/cpp/util/string_ref.cc \
     src/cpp/util/time_cc.cc \
-    src/core/ext/filters/client_channel/backend_metric.cc \
-    src/core/ext/filters/client_channel/backup_poller.cc \
-    src/core/ext/filters/client_channel/channel_connectivity.cc \
-    src/core/ext/filters/client_channel/client_channel.cc \
-    src/core/ext/filters/client_channel/client_channel_channelz.cc \
-    src/core/ext/filters/client_channel/client_channel_factory.cc \
-    src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/global_subchannel_pool.cc \
-    src/core/ext/filters/client_channel/health/health_check_client.cc \
-    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
-    src/core/ext/filters/client_channel/http_proxy.cc \
-    src/core/ext/filters/client_channel/lb_policy.cc \
-    src/core/ext/filters/client_channel/lb_policy_registry.cc \
-    src/core/ext/filters/client_channel/local_subchannel_pool.cc \
-    src/core/ext/filters/client_channel/parse_address.cc \
-    src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
-    src/core/ext/filters/client_channel/resolver.cc \
-    src/core/ext/filters/client_channel/resolver_registry.cc \
-    src/core/ext/filters/client_channel/resolver_result_parsing.cc \
-    src/core/ext/filters/client_channel/resolving_lb_policy.cc \
-    src/core/ext/filters/client_channel/retry_throttle.cc \
-    src/core/ext/filters/client_channel/server_address.cc \
-    src/core/ext/filters/client_channel/service_config.cc \
-    src/core/ext/filters/client_channel/subchannel.cc \
-    src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
-    src/core/lib/avl/avl.cc \
-    src/core/lib/backoff/backoff.cc \
-    src/core/lib/channel/channel_args.cc \
-    src/core/lib/channel/channel_stack.cc \
-    src/core/lib/channel/channel_stack_builder.cc \
-    src/core/lib/channel/channel_trace.cc \
-    src/core/lib/channel/channelz.cc \
-    src/core/lib/channel/channelz_registry.cc \
-    src/core/lib/channel/connected_channel.cc \
-    src/core/lib/channel/handshaker.cc \
-    src/core/lib/channel/handshaker_registry.cc \
-    src/core/lib/channel/status_util.cc \
-    src/core/lib/compression/compression.cc \
-    src/core/lib/compression/compression_args.cc \
-    src/core/lib/compression/compression_internal.cc \
-    src/core/lib/compression/message_compress.cc \
-    src/core/lib/compression/stream_compression.cc \
-    src/core/lib/compression/stream_compression_gzip.cc \
-    src/core/lib/compression/stream_compression_identity.cc \
-    src/core/lib/debug/stats.cc \
-    src/core/lib/debug/stats_data.cc \
-    src/core/lib/http/format_request.cc \
-    src/core/lib/http/httpcli.cc \
-    src/core/lib/http/parser.cc \
-    src/core/lib/iomgr/buffer_list.cc \
-    src/core/lib/iomgr/call_combiner.cc \
-    src/core/lib/iomgr/cfstream_handle.cc \
-    src/core/lib/iomgr/combiner.cc \
-    src/core/lib/iomgr/endpoint.cc \
-    src/core/lib/iomgr/endpoint_cfstream.cc \
-    src/core/lib/iomgr/endpoint_pair_posix.cc \
-    src/core/lib/iomgr/endpoint_pair_uv.cc \
-    src/core/lib/iomgr/endpoint_pair_windows.cc \
-    src/core/lib/iomgr/error.cc \
-    src/core/lib/iomgr/error_cfstream.cc \
-    src/core/lib/iomgr/ev_epoll1_linux.cc \
-    src/core/lib/iomgr/ev_epollex_linux.cc \
-    src/core/lib/iomgr/ev_poll_posix.cc \
-    src/core/lib/iomgr/ev_posix.cc \
-    src/core/lib/iomgr/ev_windows.cc \
-    src/core/lib/iomgr/exec_ctx.cc \
-    src/core/lib/iomgr/executor.cc \
-    src/core/lib/iomgr/executor/mpmcqueue.cc \
-    src/core/lib/iomgr/executor/threadpool.cc \
-    src/core/lib/iomgr/fork_posix.cc \
-    src/core/lib/iomgr/fork_windows.cc \
-    src/core/lib/iomgr/gethostname_fallback.cc \
-    src/core/lib/iomgr/gethostname_host_name_max.cc \
-    src/core/lib/iomgr/gethostname_sysconf.cc \
-    src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \
-    src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \
-    src/core/lib/iomgr/internal_errqueue.cc \
-    src/core/lib/iomgr/iocp_windows.cc \
-    src/core/lib/iomgr/iomgr.cc \
-    src/core/lib/iomgr/iomgr_custom.cc \
-    src/core/lib/iomgr/iomgr_internal.cc \
-    src/core/lib/iomgr/iomgr_posix.cc \
-    src/core/lib/iomgr/iomgr_posix_cfstream.cc \
-    src/core/lib/iomgr/iomgr_uv.cc \
-    src/core/lib/iomgr/iomgr_windows.cc \
-    src/core/lib/iomgr/is_epollexclusive_available.cc \
-    src/core/lib/iomgr/load_file.cc \
-    src/core/lib/iomgr/lockfree_event.cc \
-    src/core/lib/iomgr/logical_thread.cc \
-    src/core/lib/iomgr/polling_entity.cc \
-    src/core/lib/iomgr/pollset.cc \
-    src/core/lib/iomgr/pollset_custom.cc \
-    src/core/lib/iomgr/pollset_set.cc \
-    src/core/lib/iomgr/pollset_set_custom.cc \
-    src/core/lib/iomgr/pollset_set_windows.cc \
-    src/core/lib/iomgr/pollset_uv.cc \
-    src/core/lib/iomgr/pollset_windows.cc \
-    src/core/lib/iomgr/resolve_address.cc \
-    src/core/lib/iomgr/resolve_address_custom.cc \
-    src/core/lib/iomgr/resolve_address_posix.cc \
-    src/core/lib/iomgr/resolve_address_windows.cc \
-    src/core/lib/iomgr/resource_quota.cc \
-    src/core/lib/iomgr/sockaddr_utils.cc \
-    src/core/lib/iomgr/socket_factory_posix.cc \
-    src/core/lib/iomgr/socket_mutator.cc \
-    src/core/lib/iomgr/socket_utils_common_posix.cc \
-    src/core/lib/iomgr/socket_utils_linux.cc \
-    src/core/lib/iomgr/socket_utils_posix.cc \
-    src/core/lib/iomgr/socket_utils_uv.cc \
-    src/core/lib/iomgr/socket_utils_windows.cc \
-    src/core/lib/iomgr/socket_windows.cc \
-    src/core/lib/iomgr/tcp_client.cc \
-    src/core/lib/iomgr/tcp_client_cfstream.cc \
-    src/core/lib/iomgr/tcp_client_custom.cc \
-    src/core/lib/iomgr/tcp_client_posix.cc \
-    src/core/lib/iomgr/tcp_client_windows.cc \
-    src/core/lib/iomgr/tcp_custom.cc \
-    src/core/lib/iomgr/tcp_posix.cc \
-    src/core/lib/iomgr/tcp_server.cc \
-    src/core/lib/iomgr/tcp_server_custom.cc \
-    src/core/lib/iomgr/tcp_server_posix.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_windows.cc \
-    src/core/lib/iomgr/tcp_uv.cc \
-    src/core/lib/iomgr/tcp_windows.cc \
-    src/core/lib/iomgr/time_averaged_stats.cc \
-    src/core/lib/iomgr/timer.cc \
-    src/core/lib/iomgr/timer_custom.cc \
-    src/core/lib/iomgr/timer_generic.cc \
-    src/core/lib/iomgr/timer_heap.cc \
-    src/core/lib/iomgr/timer_manager.cc \
-    src/core/lib/iomgr/timer_uv.cc \
-    src/core/lib/iomgr/udp_server.cc \
-    src/core/lib/iomgr/unix_sockets_posix.cc \
-    src/core/lib/iomgr/unix_sockets_posix_noop.cc \
-    src/core/lib/iomgr/wakeup_fd_eventfd.cc \
-    src/core/lib/iomgr/wakeup_fd_nospecial.cc \
-    src/core/lib/iomgr/wakeup_fd_pipe.cc \
-    src/core/lib/iomgr/wakeup_fd_posix.cc \
-    src/core/lib/json/json.cc \
-    src/core/lib/json/json_reader.cc \
-    src/core/lib/json/json_string.cc \
-    src/core/lib/json/json_writer.cc \
-    src/core/lib/slice/b64.cc \
-    src/core/lib/slice/percent_encoding.cc \
-    src/core/lib/slice/slice.cc \
-    src/core/lib/slice/slice_buffer.cc \
-    src/core/lib/slice/slice_intern.cc \
-    src/core/lib/slice/slice_string_helpers.cc \
-    src/core/lib/surface/api_trace.cc \
-    src/core/lib/surface/byte_buffer.cc \
-    src/core/lib/surface/byte_buffer_reader.cc \
-    src/core/lib/surface/call.cc \
-    src/core/lib/surface/call_details.cc \
-    src/core/lib/surface/call_log_batch.cc \
-    src/core/lib/surface/channel.cc \
-    src/core/lib/surface/channel_init.cc \
-    src/core/lib/surface/channel_ping.cc \
-    src/core/lib/surface/channel_stack_type.cc \
-    src/core/lib/surface/completion_queue.cc \
-    src/core/lib/surface/completion_queue_factory.cc \
-    src/core/lib/surface/event_string.cc \
-    src/core/lib/surface/lame_client.cc \
-    src/core/lib/surface/metadata_array.cc \
-    src/core/lib/surface/server.cc \
-    src/core/lib/surface/validate_metadata.cc \
-    src/core/lib/surface/version.cc \
-    src/core/lib/transport/bdp_estimator.cc \
-    src/core/lib/transport/byte_stream.cc \
-    src/core/lib/transport/connectivity_state.cc \
-    src/core/lib/transport/error_utils.cc \
-    src/core/lib/transport/metadata.cc \
-    src/core/lib/transport/metadata_batch.cc \
-    src/core/lib/transport/pid_controller.cc \
-    src/core/lib/transport/static_metadata.cc \
-    src/core/lib/transport/status_conversion.cc \
-    src/core/lib/transport/status_metadata.cc \
-    src/core/lib/transport/timeout_encoding.cc \
-    src/core/lib/transport/transport.cc \
-    src/core/lib/transport/transport_op_string.cc \
-    src/core/lib/uri/uri_parser.cc \
-    src/core/lib/debug/trace.cc \
-    src/core/ext/filters/deadline/deadline_filter.cc \
     src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
-    src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
-    src/core/ext/upb-generated/gogoproto/gogo.upb.c \
-    src/core/ext/upb-generated/validate/validate.upb.c \
-    src/core/ext/upb-generated/google/api/annotations.upb.c \
-    src/core/ext/upb-generated/google/api/http.upb.c \
-    src/core/ext/upb-generated/google/protobuf/any.upb.c \
-    src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
-    src/core/ext/upb-generated/google/protobuf/duration.upb.c \
-    src/core/ext/upb-generated/google/protobuf/empty.upb.c \
-    src/core/ext/upb-generated/google/protobuf/struct.upb.c \
-    src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
-    src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
-    src/core/ext/upb-generated/google/rpc/status.upb.c \
     src/cpp/codegen/codegen_init.cc \
 
 PUBLIC_HEADERS_CXX += \
@@ -6926,205 +6728,7 @@ LIBGRPC++_UNSECURE_SRC = \
     src/cpp/util/status.cc \
     src/cpp/util/string_ref.cc \
     src/cpp/util/time_cc.cc \
-    src/core/ext/filters/client_channel/backend_metric.cc \
-    src/core/ext/filters/client_channel/backup_poller.cc \
-    src/core/ext/filters/client_channel/channel_connectivity.cc \
-    src/core/ext/filters/client_channel/client_channel.cc \
-    src/core/ext/filters/client_channel/client_channel_channelz.cc \
-    src/core/ext/filters/client_channel/client_channel_factory.cc \
-    src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/global_subchannel_pool.cc \
-    src/core/ext/filters/client_channel/health/health_check_client.cc \
-    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
-    src/core/ext/filters/client_channel/http_proxy.cc \
-    src/core/ext/filters/client_channel/lb_policy.cc \
-    src/core/ext/filters/client_channel/lb_policy_registry.cc \
-    src/core/ext/filters/client_channel/local_subchannel_pool.cc \
-    src/core/ext/filters/client_channel/parse_address.cc \
-    src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
-    src/core/ext/filters/client_channel/resolver.cc \
-    src/core/ext/filters/client_channel/resolver_registry.cc \
-    src/core/ext/filters/client_channel/resolver_result_parsing.cc \
-    src/core/ext/filters/client_channel/resolving_lb_policy.cc \
-    src/core/ext/filters/client_channel/retry_throttle.cc \
-    src/core/ext/filters/client_channel/server_address.cc \
-    src/core/ext/filters/client_channel/service_config.cc \
-    src/core/ext/filters/client_channel/subchannel.cc \
-    src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
-    src/core/lib/avl/avl.cc \
-    src/core/lib/backoff/backoff.cc \
-    src/core/lib/channel/channel_args.cc \
-    src/core/lib/channel/channel_stack.cc \
-    src/core/lib/channel/channel_stack_builder.cc \
-    src/core/lib/channel/channel_trace.cc \
-    src/core/lib/channel/channelz.cc \
-    src/core/lib/channel/channelz_registry.cc \
-    src/core/lib/channel/connected_channel.cc \
-    src/core/lib/channel/handshaker.cc \
-    src/core/lib/channel/handshaker_registry.cc \
-    src/core/lib/channel/status_util.cc \
-    src/core/lib/compression/compression.cc \
-    src/core/lib/compression/compression_args.cc \
-    src/core/lib/compression/compression_internal.cc \
-    src/core/lib/compression/message_compress.cc \
-    src/core/lib/compression/stream_compression.cc \
-    src/core/lib/compression/stream_compression_gzip.cc \
-    src/core/lib/compression/stream_compression_identity.cc \
-    src/core/lib/debug/stats.cc \
-    src/core/lib/debug/stats_data.cc \
-    src/core/lib/http/format_request.cc \
-    src/core/lib/http/httpcli.cc \
-    src/core/lib/http/parser.cc \
-    src/core/lib/iomgr/buffer_list.cc \
-    src/core/lib/iomgr/call_combiner.cc \
-    src/core/lib/iomgr/cfstream_handle.cc \
-    src/core/lib/iomgr/combiner.cc \
-    src/core/lib/iomgr/endpoint.cc \
-    src/core/lib/iomgr/endpoint_cfstream.cc \
-    src/core/lib/iomgr/endpoint_pair_posix.cc \
-    src/core/lib/iomgr/endpoint_pair_uv.cc \
-    src/core/lib/iomgr/endpoint_pair_windows.cc \
-    src/core/lib/iomgr/error.cc \
-    src/core/lib/iomgr/error_cfstream.cc \
-    src/core/lib/iomgr/ev_epoll1_linux.cc \
-    src/core/lib/iomgr/ev_epollex_linux.cc \
-    src/core/lib/iomgr/ev_poll_posix.cc \
-    src/core/lib/iomgr/ev_posix.cc \
-    src/core/lib/iomgr/ev_windows.cc \
-    src/core/lib/iomgr/exec_ctx.cc \
-    src/core/lib/iomgr/executor.cc \
-    src/core/lib/iomgr/executor/mpmcqueue.cc \
-    src/core/lib/iomgr/executor/threadpool.cc \
-    src/core/lib/iomgr/fork_posix.cc \
-    src/core/lib/iomgr/fork_windows.cc \
-    src/core/lib/iomgr/gethostname_fallback.cc \
-    src/core/lib/iomgr/gethostname_host_name_max.cc \
-    src/core/lib/iomgr/gethostname_sysconf.cc \
-    src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \
-    src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \
-    src/core/lib/iomgr/internal_errqueue.cc \
-    src/core/lib/iomgr/iocp_windows.cc \
-    src/core/lib/iomgr/iomgr.cc \
-    src/core/lib/iomgr/iomgr_custom.cc \
-    src/core/lib/iomgr/iomgr_internal.cc \
-    src/core/lib/iomgr/iomgr_posix.cc \
-    src/core/lib/iomgr/iomgr_posix_cfstream.cc \
-    src/core/lib/iomgr/iomgr_uv.cc \
-    src/core/lib/iomgr/iomgr_windows.cc \
-    src/core/lib/iomgr/is_epollexclusive_available.cc \
-    src/core/lib/iomgr/load_file.cc \
-    src/core/lib/iomgr/lockfree_event.cc \
-    src/core/lib/iomgr/logical_thread.cc \
-    src/core/lib/iomgr/polling_entity.cc \
-    src/core/lib/iomgr/pollset.cc \
-    src/core/lib/iomgr/pollset_custom.cc \
-    src/core/lib/iomgr/pollset_set.cc \
-    src/core/lib/iomgr/pollset_set_custom.cc \
-    src/core/lib/iomgr/pollset_set_windows.cc \
-    src/core/lib/iomgr/pollset_uv.cc \
-    src/core/lib/iomgr/pollset_windows.cc \
-    src/core/lib/iomgr/resolve_address.cc \
-    src/core/lib/iomgr/resolve_address_custom.cc \
-    src/core/lib/iomgr/resolve_address_posix.cc \
-    src/core/lib/iomgr/resolve_address_windows.cc \
-    src/core/lib/iomgr/resource_quota.cc \
-    src/core/lib/iomgr/sockaddr_utils.cc \
-    src/core/lib/iomgr/socket_factory_posix.cc \
-    src/core/lib/iomgr/socket_mutator.cc \
-    src/core/lib/iomgr/socket_utils_common_posix.cc \
-    src/core/lib/iomgr/socket_utils_linux.cc \
-    src/core/lib/iomgr/socket_utils_posix.cc \
-    src/core/lib/iomgr/socket_utils_uv.cc \
-    src/core/lib/iomgr/socket_utils_windows.cc \
-    src/core/lib/iomgr/socket_windows.cc \
-    src/core/lib/iomgr/tcp_client.cc \
-    src/core/lib/iomgr/tcp_client_cfstream.cc \
-    src/core/lib/iomgr/tcp_client_custom.cc \
-    src/core/lib/iomgr/tcp_client_posix.cc \
-    src/core/lib/iomgr/tcp_client_windows.cc \
-    src/core/lib/iomgr/tcp_custom.cc \
-    src/core/lib/iomgr/tcp_posix.cc \
-    src/core/lib/iomgr/tcp_server.cc \
-    src/core/lib/iomgr/tcp_server_custom.cc \
-    src/core/lib/iomgr/tcp_server_posix.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_windows.cc \
-    src/core/lib/iomgr/tcp_uv.cc \
-    src/core/lib/iomgr/tcp_windows.cc \
-    src/core/lib/iomgr/time_averaged_stats.cc \
-    src/core/lib/iomgr/timer.cc \
-    src/core/lib/iomgr/timer_custom.cc \
-    src/core/lib/iomgr/timer_generic.cc \
-    src/core/lib/iomgr/timer_heap.cc \
-    src/core/lib/iomgr/timer_manager.cc \
-    src/core/lib/iomgr/timer_uv.cc \
-    src/core/lib/iomgr/udp_server.cc \
-    src/core/lib/iomgr/unix_sockets_posix.cc \
-    src/core/lib/iomgr/unix_sockets_posix_noop.cc \
-    src/core/lib/iomgr/wakeup_fd_eventfd.cc \
-    src/core/lib/iomgr/wakeup_fd_nospecial.cc \
-    src/core/lib/iomgr/wakeup_fd_pipe.cc \
-    src/core/lib/iomgr/wakeup_fd_posix.cc \
-    src/core/lib/json/json.cc \
-    src/core/lib/json/json_reader.cc \
-    src/core/lib/json/json_string.cc \
-    src/core/lib/json/json_writer.cc \
-    src/core/lib/slice/b64.cc \
-    src/core/lib/slice/percent_encoding.cc \
-    src/core/lib/slice/slice.cc \
-    src/core/lib/slice/slice_buffer.cc \
-    src/core/lib/slice/slice_intern.cc \
-    src/core/lib/slice/slice_string_helpers.cc \
-    src/core/lib/surface/api_trace.cc \
-    src/core/lib/surface/byte_buffer.cc \
-    src/core/lib/surface/byte_buffer_reader.cc \
-    src/core/lib/surface/call.cc \
-    src/core/lib/surface/call_details.cc \
-    src/core/lib/surface/call_log_batch.cc \
-    src/core/lib/surface/channel.cc \
-    src/core/lib/surface/channel_init.cc \
-    src/core/lib/surface/channel_ping.cc \
-    src/core/lib/surface/channel_stack_type.cc \
-    src/core/lib/surface/completion_queue.cc \
-    src/core/lib/surface/completion_queue_factory.cc \
-    src/core/lib/surface/event_string.cc \
-    src/core/lib/surface/lame_client.cc \
-    src/core/lib/surface/metadata_array.cc \
-    src/core/lib/surface/server.cc \
-    src/core/lib/surface/validate_metadata.cc \
-    src/core/lib/surface/version.cc \
-    src/core/lib/transport/bdp_estimator.cc \
-    src/core/lib/transport/byte_stream.cc \
-    src/core/lib/transport/connectivity_state.cc \
-    src/core/lib/transport/error_utils.cc \
-    src/core/lib/transport/metadata.cc \
-    src/core/lib/transport/metadata_batch.cc \
-    src/core/lib/transport/pid_controller.cc \
-    src/core/lib/transport/static_metadata.cc \
-    src/core/lib/transport/status_conversion.cc \
-    src/core/lib/transport/status_metadata.cc \
-    src/core/lib/transport/timeout_encoding.cc \
-    src/core/lib/transport/transport.cc \
-    src/core/lib/transport/transport_op_string.cc \
-    src/core/lib/uri/uri_parser.cc \
-    src/core/lib/debug/trace.cc \
-    src/core/ext/filters/deadline/deadline_filter.cc \
     src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
-    src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
-    src/core/ext/upb-generated/gogoproto/gogo.upb.c \
-    src/core/ext/upb-generated/validate/validate.upb.c \
-    src/core/ext/upb-generated/google/api/annotations.upb.c \
-    src/core/ext/upb-generated/google/api/http.upb.c \
-    src/core/ext/upb-generated/google/protobuf/any.upb.c \
-    src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
-    src/core/ext/upb-generated/google/protobuf/duration.upb.c \
-    src/core/ext/upb-generated/google/protobuf/empty.upb.c \
-    src/core/ext/upb-generated/google/protobuf/struct.upb.c \
-    src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
-    src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
-    src/core/ext/upb-generated/google/rpc/status.upb.c \
     src/cpp/codegen/codegen_init.cc \
 
 PUBLIC_HEADERS_CXX += \
diff --git a/build.yaml b/build.yaml
index 003ff5038de..214fbc619de 100644
--- a/build.yaml
+++ b/build.yaml
@@ -601,7 +601,6 @@ filegroups:
   uses:
   - gpr_base_headers
   - grpc_base_headers
-  - grpc_client_channel
   - grpc_health_upb
   - grpc_transport_inproc_headers
   - grpc++_codegen_base
diff --git a/grpc.gyp b/grpc.gyp
index 1dbb8e61295..7e2e0ead0a4 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -1547,205 +1547,7 @@
         'src/cpp/util/status.cc',
         'src/cpp/util/string_ref.cc',
         'src/cpp/util/time_cc.cc',
-        'src/core/ext/filters/client_channel/backend_metric.cc',
-        'src/core/ext/filters/client_channel/backup_poller.cc',
-        'src/core/ext/filters/client_channel/channel_connectivity.cc',
-        'src/core/ext/filters/client_channel/client_channel.cc',
-        'src/core/ext/filters/client_channel/client_channel_channelz.cc',
-        'src/core/ext/filters/client_channel/client_channel_factory.cc',
-        'src/core/ext/filters/client_channel/client_channel_plugin.cc',
-        'src/core/ext/filters/client_channel/global_subchannel_pool.cc',
-        'src/core/ext/filters/client_channel/health/health_check_client.cc',
-        'src/core/ext/filters/client_channel/http_connect_handshaker.cc',
-        'src/core/ext/filters/client_channel/http_proxy.cc',
-        'src/core/ext/filters/client_channel/lb_policy.cc',
-        'src/core/ext/filters/client_channel/lb_policy_registry.cc',
-        'src/core/ext/filters/client_channel/local_subchannel_pool.cc',
-        'src/core/ext/filters/client_channel/parse_address.cc',
-        'src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
-        'src/core/ext/filters/client_channel/resolver.cc',
-        'src/core/ext/filters/client_channel/resolver_registry.cc',
-        'src/core/ext/filters/client_channel/resolver_result_parsing.cc',
-        'src/core/ext/filters/client_channel/resolving_lb_policy.cc',
-        'src/core/ext/filters/client_channel/retry_throttle.cc',
-        'src/core/ext/filters/client_channel/server_address.cc',
-        'src/core/ext/filters/client_channel/service_config.cc',
-        'src/core/ext/filters/client_channel/subchannel.cc',
-        'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
-        'src/core/lib/avl/avl.cc',
-        'src/core/lib/backoff/backoff.cc',
-        'src/core/lib/channel/channel_args.cc',
-        'src/core/lib/channel/channel_stack.cc',
-        'src/core/lib/channel/channel_stack_builder.cc',
-        'src/core/lib/channel/channel_trace.cc',
-        'src/core/lib/channel/channelz.cc',
-        'src/core/lib/channel/channelz_registry.cc',
-        'src/core/lib/channel/connected_channel.cc',
-        'src/core/lib/channel/handshaker.cc',
-        'src/core/lib/channel/handshaker_registry.cc',
-        'src/core/lib/channel/status_util.cc',
-        'src/core/lib/compression/compression.cc',
-        'src/core/lib/compression/compression_args.cc',
-        'src/core/lib/compression/compression_internal.cc',
-        'src/core/lib/compression/message_compress.cc',
-        'src/core/lib/compression/stream_compression.cc',
-        'src/core/lib/compression/stream_compression_gzip.cc',
-        'src/core/lib/compression/stream_compression_identity.cc',
-        'src/core/lib/debug/stats.cc',
-        'src/core/lib/debug/stats_data.cc',
-        'src/core/lib/http/format_request.cc',
-        'src/core/lib/http/httpcli.cc',
-        'src/core/lib/http/parser.cc',
-        'src/core/lib/iomgr/buffer_list.cc',
-        'src/core/lib/iomgr/call_combiner.cc',
-        'src/core/lib/iomgr/cfstream_handle.cc',
-        'src/core/lib/iomgr/combiner.cc',
-        'src/core/lib/iomgr/endpoint.cc',
-        'src/core/lib/iomgr/endpoint_cfstream.cc',
-        'src/core/lib/iomgr/endpoint_pair_posix.cc',
-        'src/core/lib/iomgr/endpoint_pair_uv.cc',
-        'src/core/lib/iomgr/endpoint_pair_windows.cc',
-        'src/core/lib/iomgr/error.cc',
-        'src/core/lib/iomgr/error_cfstream.cc',
-        'src/core/lib/iomgr/ev_epoll1_linux.cc',
-        'src/core/lib/iomgr/ev_epollex_linux.cc',
-        'src/core/lib/iomgr/ev_poll_posix.cc',
-        'src/core/lib/iomgr/ev_posix.cc',
-        'src/core/lib/iomgr/ev_windows.cc',
-        'src/core/lib/iomgr/exec_ctx.cc',
-        'src/core/lib/iomgr/executor.cc',
-        'src/core/lib/iomgr/executor/mpmcqueue.cc',
-        'src/core/lib/iomgr/executor/threadpool.cc',
-        'src/core/lib/iomgr/fork_posix.cc',
-        'src/core/lib/iomgr/fork_windows.cc',
-        'src/core/lib/iomgr/gethostname_fallback.cc',
-        'src/core/lib/iomgr/gethostname_host_name_max.cc',
-        'src/core/lib/iomgr/gethostname_sysconf.cc',
-        'src/core/lib/iomgr/grpc_if_nametoindex_posix.cc',
-        'src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc',
-        'src/core/lib/iomgr/internal_errqueue.cc',
-        'src/core/lib/iomgr/iocp_windows.cc',
-        'src/core/lib/iomgr/iomgr.cc',
-        'src/core/lib/iomgr/iomgr_custom.cc',
-        'src/core/lib/iomgr/iomgr_internal.cc',
-        'src/core/lib/iomgr/iomgr_posix.cc',
-        'src/core/lib/iomgr/iomgr_posix_cfstream.cc',
-        'src/core/lib/iomgr/iomgr_uv.cc',
-        'src/core/lib/iomgr/iomgr_windows.cc',
-        'src/core/lib/iomgr/is_epollexclusive_available.cc',
-        'src/core/lib/iomgr/load_file.cc',
-        'src/core/lib/iomgr/lockfree_event.cc',
-        'src/core/lib/iomgr/logical_thread.cc',
-        'src/core/lib/iomgr/polling_entity.cc',
-        'src/core/lib/iomgr/pollset.cc',
-        'src/core/lib/iomgr/pollset_custom.cc',
-        'src/core/lib/iomgr/pollset_set.cc',
-        'src/core/lib/iomgr/pollset_set_custom.cc',
-        'src/core/lib/iomgr/pollset_set_windows.cc',
-        'src/core/lib/iomgr/pollset_uv.cc',
-        'src/core/lib/iomgr/pollset_windows.cc',
-        'src/core/lib/iomgr/resolve_address.cc',
-        'src/core/lib/iomgr/resolve_address_custom.cc',
-        'src/core/lib/iomgr/resolve_address_posix.cc',
-        'src/core/lib/iomgr/resolve_address_windows.cc',
-        'src/core/lib/iomgr/resource_quota.cc',
-        'src/core/lib/iomgr/sockaddr_utils.cc',
-        'src/core/lib/iomgr/socket_factory_posix.cc',
-        'src/core/lib/iomgr/socket_mutator.cc',
-        'src/core/lib/iomgr/socket_utils_common_posix.cc',
-        'src/core/lib/iomgr/socket_utils_linux.cc',
-        'src/core/lib/iomgr/socket_utils_posix.cc',
-        'src/core/lib/iomgr/socket_utils_uv.cc',
-        'src/core/lib/iomgr/socket_utils_windows.cc',
-        'src/core/lib/iomgr/socket_windows.cc',
-        'src/core/lib/iomgr/tcp_client.cc',
-        'src/core/lib/iomgr/tcp_client_cfstream.cc',
-        'src/core/lib/iomgr/tcp_client_custom.cc',
-        'src/core/lib/iomgr/tcp_client_posix.cc',
-        'src/core/lib/iomgr/tcp_client_windows.cc',
-        'src/core/lib/iomgr/tcp_custom.cc',
-        'src/core/lib/iomgr/tcp_posix.cc',
-        'src/core/lib/iomgr/tcp_server.cc',
-        'src/core/lib/iomgr/tcp_server_custom.cc',
-        'src/core/lib/iomgr/tcp_server_posix.cc',
-        'src/core/lib/iomgr/tcp_server_utils_posix_common.cc',
-        'src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc',
-        'src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc',
-        'src/core/lib/iomgr/tcp_server_windows.cc',
-        'src/core/lib/iomgr/tcp_uv.cc',
-        'src/core/lib/iomgr/tcp_windows.cc',
-        'src/core/lib/iomgr/time_averaged_stats.cc',
-        'src/core/lib/iomgr/timer.cc',
-        'src/core/lib/iomgr/timer_custom.cc',
-        'src/core/lib/iomgr/timer_generic.cc',
-        'src/core/lib/iomgr/timer_heap.cc',
-        'src/core/lib/iomgr/timer_manager.cc',
-        'src/core/lib/iomgr/timer_uv.cc',
-        'src/core/lib/iomgr/udp_server.cc',
-        'src/core/lib/iomgr/unix_sockets_posix.cc',
-        'src/core/lib/iomgr/unix_sockets_posix_noop.cc',
-        'src/core/lib/iomgr/wakeup_fd_eventfd.cc',
-        'src/core/lib/iomgr/wakeup_fd_nospecial.cc',
-        'src/core/lib/iomgr/wakeup_fd_pipe.cc',
-        'src/core/lib/iomgr/wakeup_fd_posix.cc',
-        'src/core/lib/json/json.cc',
-        'src/core/lib/json/json_reader.cc',
-        'src/core/lib/json/json_string.cc',
-        'src/core/lib/json/json_writer.cc',
-        'src/core/lib/slice/b64.cc',
-        'src/core/lib/slice/percent_encoding.cc',
-        'src/core/lib/slice/slice.cc',
-        'src/core/lib/slice/slice_buffer.cc',
-        'src/core/lib/slice/slice_intern.cc',
-        'src/core/lib/slice/slice_string_helpers.cc',
-        'src/core/lib/surface/api_trace.cc',
-        'src/core/lib/surface/byte_buffer.cc',
-        'src/core/lib/surface/byte_buffer_reader.cc',
-        'src/core/lib/surface/call.cc',
-        'src/core/lib/surface/call_details.cc',
-        'src/core/lib/surface/call_log_batch.cc',
-        'src/core/lib/surface/channel.cc',
-        'src/core/lib/surface/channel_init.cc',
-        'src/core/lib/surface/channel_ping.cc',
-        'src/core/lib/surface/channel_stack_type.cc',
-        'src/core/lib/surface/completion_queue.cc',
-        'src/core/lib/surface/completion_queue_factory.cc',
-        'src/core/lib/surface/event_string.cc',
-        'src/core/lib/surface/lame_client.cc',
-        'src/core/lib/surface/metadata_array.cc',
-        'src/core/lib/surface/server.cc',
-        'src/core/lib/surface/validate_metadata.cc',
-        'src/core/lib/surface/version.cc',
-        'src/core/lib/transport/bdp_estimator.cc',
-        'src/core/lib/transport/byte_stream.cc',
-        'src/core/lib/transport/connectivity_state.cc',
-        'src/core/lib/transport/error_utils.cc',
-        'src/core/lib/transport/metadata.cc',
-        'src/core/lib/transport/metadata_batch.cc',
-        'src/core/lib/transport/pid_controller.cc',
-        'src/core/lib/transport/static_metadata.cc',
-        'src/core/lib/transport/status_conversion.cc',
-        'src/core/lib/transport/status_metadata.cc',
-        'src/core/lib/transport/timeout_encoding.cc',
-        'src/core/lib/transport/transport.cc',
-        'src/core/lib/transport/transport_op_string.cc',
-        'src/core/lib/uri/uri_parser.cc',
-        'src/core/lib/debug/trace.cc',
-        'src/core/ext/filters/deadline/deadline_filter.cc',
         'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
-        'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
-        'src/core/ext/upb-generated/gogoproto/gogo.upb.c',
-        'src/core/ext/upb-generated/validate/validate.upb.c',
-        'src/core/ext/upb-generated/google/api/annotations.upb.c',
-        'src/core/ext/upb-generated/google/api/http.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/any.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/duration.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/empty.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/struct.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c',
-        'src/core/ext/upb-generated/google/rpc/status.upb.c',
         'src/cpp/codegen/codegen_init.cc',
       ],
     },
@@ -1901,205 +1703,7 @@
         'src/cpp/util/status.cc',
         'src/cpp/util/string_ref.cc',
         'src/cpp/util/time_cc.cc',
-        'src/core/ext/filters/client_channel/backend_metric.cc',
-        'src/core/ext/filters/client_channel/backup_poller.cc',
-        'src/core/ext/filters/client_channel/channel_connectivity.cc',
-        'src/core/ext/filters/client_channel/client_channel.cc',
-        'src/core/ext/filters/client_channel/client_channel_channelz.cc',
-        'src/core/ext/filters/client_channel/client_channel_factory.cc',
-        'src/core/ext/filters/client_channel/client_channel_plugin.cc',
-        'src/core/ext/filters/client_channel/global_subchannel_pool.cc',
-        'src/core/ext/filters/client_channel/health/health_check_client.cc',
-        'src/core/ext/filters/client_channel/http_connect_handshaker.cc',
-        'src/core/ext/filters/client_channel/http_proxy.cc',
-        'src/core/ext/filters/client_channel/lb_policy.cc',
-        'src/core/ext/filters/client_channel/lb_policy_registry.cc',
-        'src/core/ext/filters/client_channel/local_subchannel_pool.cc',
-        'src/core/ext/filters/client_channel/parse_address.cc',
-        'src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
-        'src/core/ext/filters/client_channel/resolver.cc',
-        'src/core/ext/filters/client_channel/resolver_registry.cc',
-        'src/core/ext/filters/client_channel/resolver_result_parsing.cc',
-        'src/core/ext/filters/client_channel/resolving_lb_policy.cc',
-        'src/core/ext/filters/client_channel/retry_throttle.cc',
-        'src/core/ext/filters/client_channel/server_address.cc',
-        'src/core/ext/filters/client_channel/service_config.cc',
-        'src/core/ext/filters/client_channel/subchannel.cc',
-        'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
-        'src/core/lib/avl/avl.cc',
-        'src/core/lib/backoff/backoff.cc',
-        'src/core/lib/channel/channel_args.cc',
-        'src/core/lib/channel/channel_stack.cc',
-        'src/core/lib/channel/channel_stack_builder.cc',
-        'src/core/lib/channel/channel_trace.cc',
-        'src/core/lib/channel/channelz.cc',
-        'src/core/lib/channel/channelz_registry.cc',
-        'src/core/lib/channel/connected_channel.cc',
-        'src/core/lib/channel/handshaker.cc',
-        'src/core/lib/channel/handshaker_registry.cc',
-        'src/core/lib/channel/status_util.cc',
-        'src/core/lib/compression/compression.cc',
-        'src/core/lib/compression/compression_args.cc',
-        'src/core/lib/compression/compression_internal.cc',
-        'src/core/lib/compression/message_compress.cc',
-        'src/core/lib/compression/stream_compression.cc',
-        'src/core/lib/compression/stream_compression_gzip.cc',
-        'src/core/lib/compression/stream_compression_identity.cc',
-        'src/core/lib/debug/stats.cc',
-        'src/core/lib/debug/stats_data.cc',
-        'src/core/lib/http/format_request.cc',
-        'src/core/lib/http/httpcli.cc',
-        'src/core/lib/http/parser.cc',
-        'src/core/lib/iomgr/buffer_list.cc',
-        'src/core/lib/iomgr/call_combiner.cc',
-        'src/core/lib/iomgr/cfstream_handle.cc',
-        'src/core/lib/iomgr/combiner.cc',
-        'src/core/lib/iomgr/endpoint.cc',
-        'src/core/lib/iomgr/endpoint_cfstream.cc',
-        'src/core/lib/iomgr/endpoint_pair_posix.cc',
-        'src/core/lib/iomgr/endpoint_pair_uv.cc',
-        'src/core/lib/iomgr/endpoint_pair_windows.cc',
-        'src/core/lib/iomgr/error.cc',
-        'src/core/lib/iomgr/error_cfstream.cc',
-        'src/core/lib/iomgr/ev_epoll1_linux.cc',
-        'src/core/lib/iomgr/ev_epollex_linux.cc',
-        'src/core/lib/iomgr/ev_poll_posix.cc',
-        'src/core/lib/iomgr/ev_posix.cc',
-        'src/core/lib/iomgr/ev_windows.cc',
-        'src/core/lib/iomgr/exec_ctx.cc',
-        'src/core/lib/iomgr/executor.cc',
-        'src/core/lib/iomgr/executor/mpmcqueue.cc',
-        'src/core/lib/iomgr/executor/threadpool.cc',
-        'src/core/lib/iomgr/fork_posix.cc',
-        'src/core/lib/iomgr/fork_windows.cc',
-        'src/core/lib/iomgr/gethostname_fallback.cc',
-        'src/core/lib/iomgr/gethostname_host_name_max.cc',
-        'src/core/lib/iomgr/gethostname_sysconf.cc',
-        'src/core/lib/iomgr/grpc_if_nametoindex_posix.cc',
-        'src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc',
-        'src/core/lib/iomgr/internal_errqueue.cc',
-        'src/core/lib/iomgr/iocp_windows.cc',
-        'src/core/lib/iomgr/iomgr.cc',
-        'src/core/lib/iomgr/iomgr_custom.cc',
-        'src/core/lib/iomgr/iomgr_internal.cc',
-        'src/core/lib/iomgr/iomgr_posix.cc',
-        'src/core/lib/iomgr/iomgr_posix_cfstream.cc',
-        'src/core/lib/iomgr/iomgr_uv.cc',
-        'src/core/lib/iomgr/iomgr_windows.cc',
-        'src/core/lib/iomgr/is_epollexclusive_available.cc',
-        'src/core/lib/iomgr/load_file.cc',
-        'src/core/lib/iomgr/lockfree_event.cc',
-        'src/core/lib/iomgr/logical_thread.cc',
-        'src/core/lib/iomgr/polling_entity.cc',
-        'src/core/lib/iomgr/pollset.cc',
-        'src/core/lib/iomgr/pollset_custom.cc',
-        'src/core/lib/iomgr/pollset_set.cc',
-        'src/core/lib/iomgr/pollset_set_custom.cc',
-        'src/core/lib/iomgr/pollset_set_windows.cc',
-        'src/core/lib/iomgr/pollset_uv.cc',
-        'src/core/lib/iomgr/pollset_windows.cc',
-        'src/core/lib/iomgr/resolve_address.cc',
-        'src/core/lib/iomgr/resolve_address_custom.cc',
-        'src/core/lib/iomgr/resolve_address_posix.cc',
-        'src/core/lib/iomgr/resolve_address_windows.cc',
-        'src/core/lib/iomgr/resource_quota.cc',
-        'src/core/lib/iomgr/sockaddr_utils.cc',
-        'src/core/lib/iomgr/socket_factory_posix.cc',
-        'src/core/lib/iomgr/socket_mutator.cc',
-        'src/core/lib/iomgr/socket_utils_common_posix.cc',
-        'src/core/lib/iomgr/socket_utils_linux.cc',
-        'src/core/lib/iomgr/socket_utils_posix.cc',
-        'src/core/lib/iomgr/socket_utils_uv.cc',
-        'src/core/lib/iomgr/socket_utils_windows.cc',
-        'src/core/lib/iomgr/socket_windows.cc',
-        'src/core/lib/iomgr/tcp_client.cc',
-        'src/core/lib/iomgr/tcp_client_cfstream.cc',
-        'src/core/lib/iomgr/tcp_client_custom.cc',
-        'src/core/lib/iomgr/tcp_client_posix.cc',
-        'src/core/lib/iomgr/tcp_client_windows.cc',
-        'src/core/lib/iomgr/tcp_custom.cc',
-        'src/core/lib/iomgr/tcp_posix.cc',
-        'src/core/lib/iomgr/tcp_server.cc',
-        'src/core/lib/iomgr/tcp_server_custom.cc',
-        'src/core/lib/iomgr/tcp_server_posix.cc',
-        'src/core/lib/iomgr/tcp_server_utils_posix_common.cc',
-        'src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc',
-        'src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc',
-        'src/core/lib/iomgr/tcp_server_windows.cc',
-        'src/core/lib/iomgr/tcp_uv.cc',
-        'src/core/lib/iomgr/tcp_windows.cc',
-        'src/core/lib/iomgr/time_averaged_stats.cc',
-        'src/core/lib/iomgr/timer.cc',
-        'src/core/lib/iomgr/timer_custom.cc',
-        'src/core/lib/iomgr/timer_generic.cc',
-        'src/core/lib/iomgr/timer_heap.cc',
-        'src/core/lib/iomgr/timer_manager.cc',
-        'src/core/lib/iomgr/timer_uv.cc',
-        'src/core/lib/iomgr/udp_server.cc',
-        'src/core/lib/iomgr/unix_sockets_posix.cc',
-        'src/core/lib/iomgr/unix_sockets_posix_noop.cc',
-        'src/core/lib/iomgr/wakeup_fd_eventfd.cc',
-        'src/core/lib/iomgr/wakeup_fd_nospecial.cc',
-        'src/core/lib/iomgr/wakeup_fd_pipe.cc',
-        'src/core/lib/iomgr/wakeup_fd_posix.cc',
-        'src/core/lib/json/json.cc',
-        'src/core/lib/json/json_reader.cc',
-        'src/core/lib/json/json_string.cc',
-        'src/core/lib/json/json_writer.cc',
-        'src/core/lib/slice/b64.cc',
-        'src/core/lib/slice/percent_encoding.cc',
-        'src/core/lib/slice/slice.cc',
-        'src/core/lib/slice/slice_buffer.cc',
-        'src/core/lib/slice/slice_intern.cc',
-        'src/core/lib/slice/slice_string_helpers.cc',
-        'src/core/lib/surface/api_trace.cc',
-        'src/core/lib/surface/byte_buffer.cc',
-        'src/core/lib/surface/byte_buffer_reader.cc',
-        'src/core/lib/surface/call.cc',
-        'src/core/lib/surface/call_details.cc',
-        'src/core/lib/surface/call_log_batch.cc',
-        'src/core/lib/surface/channel.cc',
-        'src/core/lib/surface/channel_init.cc',
-        'src/core/lib/surface/channel_ping.cc',
-        'src/core/lib/surface/channel_stack_type.cc',
-        'src/core/lib/surface/completion_queue.cc',
-        'src/core/lib/surface/completion_queue_factory.cc',
-        'src/core/lib/surface/event_string.cc',
-        'src/core/lib/surface/lame_client.cc',
-        'src/core/lib/surface/metadata_array.cc',
-        'src/core/lib/surface/server.cc',
-        'src/core/lib/surface/validate_metadata.cc',
-        'src/core/lib/surface/version.cc',
-        'src/core/lib/transport/bdp_estimator.cc',
-        'src/core/lib/transport/byte_stream.cc',
-        'src/core/lib/transport/connectivity_state.cc',
-        'src/core/lib/transport/error_utils.cc',
-        'src/core/lib/transport/metadata.cc',
-        'src/core/lib/transport/metadata_batch.cc',
-        'src/core/lib/transport/pid_controller.cc',
-        'src/core/lib/transport/static_metadata.cc',
-        'src/core/lib/transport/status_conversion.cc',
-        'src/core/lib/transport/status_metadata.cc',
-        'src/core/lib/transport/timeout_encoding.cc',
-        'src/core/lib/transport/transport.cc',
-        'src/core/lib/transport/transport_op_string.cc',
-        'src/core/lib/uri/uri_parser.cc',
-        'src/core/lib/debug/trace.cc',
-        'src/core/ext/filters/deadline/deadline_filter.cc',
         'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
-        'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
-        'src/core/ext/upb-generated/gogoproto/gogo.upb.c',
-        'src/core/ext/upb-generated/validate/validate.upb.c',
-        'src/core/ext/upb-generated/google/api/annotations.upb.c',
-        'src/core/ext/upb-generated/google/api/http.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/any.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/duration.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/empty.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/struct.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c',
-        'src/core/ext/upb-generated/google/rpc/status.upb.c',
         'src/cpp/codegen/codegen_init.cc',
       ],
     },
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index dc84a6f3fd7..f3c1bad6b7a 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -1063,135 +1063,32 @@ include/grpcpp/support/sync_stream.h \
 include/grpcpp/support/sync_stream_impl.h \
 include/grpcpp/support/time.h \
 include/grpcpp/support/validate_service_config.h \
-src/core/ext/filters/client_channel/backend_metric.cc \
-src/core/ext/filters/client_channel/backend_metric.h \
-src/core/ext/filters/client_channel/backup_poller.cc \
-src/core/ext/filters/client_channel/backup_poller.h \
-src/core/ext/filters/client_channel/channel_connectivity.cc \
-src/core/ext/filters/client_channel/client_channel.cc \
-src/core/ext/filters/client_channel/client_channel.h \
-src/core/ext/filters/client_channel/client_channel_channelz.cc \
-src/core/ext/filters/client_channel/client_channel_channelz.h \
-src/core/ext/filters/client_channel/client_channel_factory.cc \
-src/core/ext/filters/client_channel/client_channel_factory.h \
-src/core/ext/filters/client_channel/client_channel_plugin.cc \
-src/core/ext/filters/client_channel/connector.h \
-src/core/ext/filters/client_channel/global_subchannel_pool.cc \
-src/core/ext/filters/client_channel/global_subchannel_pool.h \
-src/core/ext/filters/client_channel/health/health_check_client.cc \
-src/core/ext/filters/client_channel/health/health_check_client.h \
-src/core/ext/filters/client_channel/http_connect_handshaker.cc \
-src/core/ext/filters/client_channel/http_connect_handshaker.h \
-src/core/ext/filters/client_channel/http_proxy.cc \
-src/core/ext/filters/client_channel/http_proxy.h \
-src/core/ext/filters/client_channel/lb_policy.cc \
-src/core/ext/filters/client_channel/lb_policy.h \
-src/core/ext/filters/client_channel/lb_policy_factory.h \
-src/core/ext/filters/client_channel/lb_policy_registry.cc \
-src/core/ext/filters/client_channel/lb_policy_registry.h \
-src/core/ext/filters/client_channel/local_subchannel_pool.cc \
-src/core/ext/filters/client_channel/local_subchannel_pool.h \
-src/core/ext/filters/client_channel/parse_address.cc \
-src/core/ext/filters/client_channel/parse_address.h \
-src/core/ext/filters/client_channel/proxy_mapper.h \
-src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
-src/core/ext/filters/client_channel/proxy_mapper_registry.h \
-src/core/ext/filters/client_channel/resolver.cc \
-src/core/ext/filters/client_channel/resolver.h \
-src/core/ext/filters/client_channel/resolver_factory.h \
-src/core/ext/filters/client_channel/resolver_registry.cc \
-src/core/ext/filters/client_channel/resolver_registry.h \
-src/core/ext/filters/client_channel/resolver_result_parsing.cc \
-src/core/ext/filters/client_channel/resolver_result_parsing.h \
-src/core/ext/filters/client_channel/resolving_lb_policy.cc \
-src/core/ext/filters/client_channel/resolving_lb_policy.h \
-src/core/ext/filters/client_channel/retry_throttle.cc \
-src/core/ext/filters/client_channel/retry_throttle.h \
-src/core/ext/filters/client_channel/server_address.cc \
-src/core/ext/filters/client_channel/server_address.h \
-src/core/ext/filters/client_channel/service_config.cc \
-src/core/ext/filters/client_channel/service_config.h \
-src/core/ext/filters/client_channel/subchannel.cc \
-src/core/ext/filters/client_channel/subchannel.h \
-src/core/ext/filters/client_channel/subchannel_interface.h \
-src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
-src/core/ext/filters/client_channel/subchannel_pool_interface.h \
-src/core/ext/filters/deadline/deadline_filter.cc \
-src/core/ext/filters/deadline/deadline_filter.h \
 src/core/ext/transport/inproc/inproc_transport.h \
-src/core/ext/upb-generated/gogoproto/gogo.upb.c \
-src/core/ext/upb-generated/gogoproto/gogo.upb.h \
-src/core/ext/upb-generated/google/api/annotations.upb.c \
-src/core/ext/upb-generated/google/api/annotations.upb.h \
-src/core/ext/upb-generated/google/api/http.upb.c \
-src/core/ext/upb-generated/google/api/http.upb.h \
-src/core/ext/upb-generated/google/protobuf/any.upb.c \
-src/core/ext/upb-generated/google/protobuf/any.upb.h \
-src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
-src/core/ext/upb-generated/google/protobuf/descriptor.upb.h \
-src/core/ext/upb-generated/google/protobuf/duration.upb.c \
-src/core/ext/upb-generated/google/protobuf/duration.upb.h \
-src/core/ext/upb-generated/google/protobuf/empty.upb.c \
-src/core/ext/upb-generated/google/protobuf/empty.upb.h \
-src/core/ext/upb-generated/google/protobuf/struct.upb.c \
-src/core/ext/upb-generated/google/protobuf/struct.upb.h \
-src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
-src/core/ext/upb-generated/google/protobuf/timestamp.upb.h \
-src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
-src/core/ext/upb-generated/google/protobuf/wrappers.upb.h \
-src/core/ext/upb-generated/google/rpc/status.upb.c \
-src/core/ext/upb-generated/google/rpc/status.upb.h \
 src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
 src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h \
-src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
-src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h \
-src/core/ext/upb-generated/validate/validate.upb.c \
-src/core/ext/upb-generated/validate/validate.upb.h \
-src/core/lib/avl/avl.cc \
 src/core/lib/avl/avl.h \
-src/core/lib/backoff/backoff.cc \
 src/core/lib/backoff/backoff.h \
-src/core/lib/channel/channel_args.cc \
 src/core/lib/channel/channel_args.h \
-src/core/lib/channel/channel_stack.cc \
 src/core/lib/channel/channel_stack.h \
-src/core/lib/channel/channel_stack_builder.cc \
 src/core/lib/channel/channel_stack_builder.h \
-src/core/lib/channel/channel_trace.cc \
 src/core/lib/channel/channel_trace.h \
-src/core/lib/channel/channelz.cc \
 src/core/lib/channel/channelz.h \
-src/core/lib/channel/channelz_registry.cc \
 src/core/lib/channel/channelz_registry.h \
-src/core/lib/channel/connected_channel.cc \
 src/core/lib/channel/connected_channel.h \
 src/core/lib/channel/context.h \
-src/core/lib/channel/handshaker.cc \
 src/core/lib/channel/handshaker.h \
 src/core/lib/channel/handshaker_factory.h \
-src/core/lib/channel/handshaker_registry.cc \
 src/core/lib/channel/handshaker_registry.h \
-src/core/lib/channel/status_util.cc \
 src/core/lib/channel/status_util.h \
 src/core/lib/compression/algorithm_metadata.h \
-src/core/lib/compression/compression.cc \
-src/core/lib/compression/compression_args.cc \
 src/core/lib/compression/compression_args.h \
-src/core/lib/compression/compression_internal.cc \
 src/core/lib/compression/compression_internal.h \
-src/core/lib/compression/message_compress.cc \
 src/core/lib/compression/message_compress.h \
-src/core/lib/compression/stream_compression.cc \
 src/core/lib/compression/stream_compression.h \
-src/core/lib/compression/stream_compression_gzip.cc \
 src/core/lib/compression/stream_compression_gzip.h \
-src/core/lib/compression/stream_compression_identity.cc \
 src/core/lib/compression/stream_compression_identity.h \
-src/core/lib/debug/stats.cc \
 src/core/lib/debug/stats.h \
-src/core/lib/debug/stats_data.cc \
 src/core/lib/debug/stats_data.h \
-src/core/lib/debug/trace.cc \
 src/core/lib/debug/trace.h \
 src/core/lib/gpr/alloc.h \
 src/core/lib/gpr/arena.h \
@@ -1228,257 +1125,120 @@ src/core/lib/gprpp/ref_counted_ptr.h \
 src/core/lib/gprpp/string_view.h \
 src/core/lib/gprpp/sync.h \
 src/core/lib/gprpp/thd.h \
-src/core/lib/http/format_request.cc \
 src/core/lib/http/format_request.h \
-src/core/lib/http/httpcli.cc \
 src/core/lib/http/httpcli.h \
-src/core/lib/http/parser.cc \
 src/core/lib/http/parser.h \
 src/core/lib/iomgr/block_annotate.h \
-src/core/lib/iomgr/buffer_list.cc \
 src/core/lib/iomgr/buffer_list.h \
-src/core/lib/iomgr/call_combiner.cc \
 src/core/lib/iomgr/call_combiner.h \
-src/core/lib/iomgr/cfstream_handle.cc \
 src/core/lib/iomgr/cfstream_handle.h \
 src/core/lib/iomgr/closure.h \
-src/core/lib/iomgr/combiner.cc \
 src/core/lib/iomgr/combiner.h \
 src/core/lib/iomgr/dynamic_annotations.h \
-src/core/lib/iomgr/endpoint.cc \
 src/core/lib/iomgr/endpoint.h \
-src/core/lib/iomgr/endpoint_cfstream.cc \
 src/core/lib/iomgr/endpoint_cfstream.h \
 src/core/lib/iomgr/endpoint_pair.h \
-src/core/lib/iomgr/endpoint_pair_posix.cc \
-src/core/lib/iomgr/endpoint_pair_uv.cc \
-src/core/lib/iomgr/endpoint_pair_windows.cc \
-src/core/lib/iomgr/error.cc \
 src/core/lib/iomgr/error.h \
-src/core/lib/iomgr/error_cfstream.cc \
 src/core/lib/iomgr/error_cfstream.h \
 src/core/lib/iomgr/error_internal.h \
-src/core/lib/iomgr/ev_epoll1_linux.cc \
 src/core/lib/iomgr/ev_epoll1_linux.h \
-src/core/lib/iomgr/ev_epollex_linux.cc \
 src/core/lib/iomgr/ev_epollex_linux.h \
-src/core/lib/iomgr/ev_poll_posix.cc \
 src/core/lib/iomgr/ev_poll_posix.h \
-src/core/lib/iomgr/ev_posix.cc \
 src/core/lib/iomgr/ev_posix.h \
-src/core/lib/iomgr/ev_windows.cc \
-src/core/lib/iomgr/exec_ctx.cc \
 src/core/lib/iomgr/exec_ctx.h \
-src/core/lib/iomgr/executor.cc \
 src/core/lib/iomgr/executor.h \
-src/core/lib/iomgr/executor/mpmcqueue.cc \
 src/core/lib/iomgr/executor/mpmcqueue.h \
-src/core/lib/iomgr/executor/threadpool.cc \
 src/core/lib/iomgr/executor/threadpool.h \
-src/core/lib/iomgr/fork_posix.cc \
-src/core/lib/iomgr/fork_windows.cc \
 src/core/lib/iomgr/gethostname.h \
-src/core/lib/iomgr/gethostname_fallback.cc \
-src/core/lib/iomgr/gethostname_host_name_max.cc \
-src/core/lib/iomgr/gethostname_sysconf.cc \
 src/core/lib/iomgr/grpc_if_nametoindex.h \
-src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \
-src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \
-src/core/lib/iomgr/internal_errqueue.cc \
 src/core/lib/iomgr/internal_errqueue.h \
-src/core/lib/iomgr/iocp_windows.cc \
 src/core/lib/iomgr/iocp_windows.h \
-src/core/lib/iomgr/iomgr.cc \
 src/core/lib/iomgr/iomgr.h \
-src/core/lib/iomgr/iomgr_custom.cc \
 src/core/lib/iomgr/iomgr_custom.h \
-src/core/lib/iomgr/iomgr_internal.cc \
 src/core/lib/iomgr/iomgr_internal.h \
-src/core/lib/iomgr/iomgr_posix.cc \
 src/core/lib/iomgr/iomgr_posix.h \
-src/core/lib/iomgr/iomgr_posix_cfstream.cc \
-src/core/lib/iomgr/iomgr_uv.cc \
-src/core/lib/iomgr/iomgr_windows.cc \
-src/core/lib/iomgr/is_epollexclusive_available.cc \
 src/core/lib/iomgr/is_epollexclusive_available.h \
-src/core/lib/iomgr/load_file.cc \
 src/core/lib/iomgr/load_file.h \
-src/core/lib/iomgr/lockfree_event.cc \
 src/core/lib/iomgr/lockfree_event.h \
-src/core/lib/iomgr/logical_thread.cc \
 src/core/lib/iomgr/logical_thread.h \
 src/core/lib/iomgr/nameser.h \
-src/core/lib/iomgr/polling_entity.cc \
 src/core/lib/iomgr/polling_entity.h \
-src/core/lib/iomgr/pollset.cc \
 src/core/lib/iomgr/pollset.h \
-src/core/lib/iomgr/pollset_custom.cc \
 src/core/lib/iomgr/pollset_custom.h \
-src/core/lib/iomgr/pollset_set.cc \
 src/core/lib/iomgr/pollset_set.h \
-src/core/lib/iomgr/pollset_set_custom.cc \
 src/core/lib/iomgr/pollset_set_custom.h \
-src/core/lib/iomgr/pollset_set_windows.cc \
 src/core/lib/iomgr/pollset_set_windows.h \
-src/core/lib/iomgr/pollset_uv.cc \
-src/core/lib/iomgr/pollset_windows.cc \
 src/core/lib/iomgr/pollset_windows.h \
 src/core/lib/iomgr/port.h \
-src/core/lib/iomgr/resolve_address.cc \
 src/core/lib/iomgr/resolve_address.h \
-src/core/lib/iomgr/resolve_address_custom.cc \
 src/core/lib/iomgr/resolve_address_custom.h \
-src/core/lib/iomgr/resolve_address_posix.cc \
-src/core/lib/iomgr/resolve_address_windows.cc \
-src/core/lib/iomgr/resource_quota.cc \
 src/core/lib/iomgr/resource_quota.h \
 src/core/lib/iomgr/sockaddr.h \
 src/core/lib/iomgr/sockaddr_custom.h \
 src/core/lib/iomgr/sockaddr_posix.h \
-src/core/lib/iomgr/sockaddr_utils.cc \
 src/core/lib/iomgr/sockaddr_utils.h \
 src/core/lib/iomgr/sockaddr_windows.h \
-src/core/lib/iomgr/socket_factory_posix.cc \
 src/core/lib/iomgr/socket_factory_posix.h \
-src/core/lib/iomgr/socket_mutator.cc \
 src/core/lib/iomgr/socket_mutator.h \
 src/core/lib/iomgr/socket_utils.h \
-src/core/lib/iomgr/socket_utils_common_posix.cc \
-src/core/lib/iomgr/socket_utils_linux.cc \
-src/core/lib/iomgr/socket_utils_posix.cc \
 src/core/lib/iomgr/socket_utils_posix.h \
-src/core/lib/iomgr/socket_utils_uv.cc \
-src/core/lib/iomgr/socket_utils_windows.cc \
-src/core/lib/iomgr/socket_windows.cc \
 src/core/lib/iomgr/socket_windows.h \
 src/core/lib/iomgr/sys_epoll_wrapper.h \
-src/core/lib/iomgr/tcp_client.cc \
 src/core/lib/iomgr/tcp_client.h \
-src/core/lib/iomgr/tcp_client_cfstream.cc \
-src/core/lib/iomgr/tcp_client_custom.cc \
-src/core/lib/iomgr/tcp_client_posix.cc \
 src/core/lib/iomgr/tcp_client_posix.h \
-src/core/lib/iomgr/tcp_client_windows.cc \
-src/core/lib/iomgr/tcp_custom.cc \
 src/core/lib/iomgr/tcp_custom.h \
-src/core/lib/iomgr/tcp_posix.cc \
 src/core/lib/iomgr/tcp_posix.h \
-src/core/lib/iomgr/tcp_server.cc \
 src/core/lib/iomgr/tcp_server.h \
-src/core/lib/iomgr/tcp_server_custom.cc \
-src/core/lib/iomgr/tcp_server_posix.cc \
 src/core/lib/iomgr/tcp_server_utils_posix.h \
-src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
-src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
-src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
-src/core/lib/iomgr/tcp_server_windows.cc \
-src/core/lib/iomgr/tcp_uv.cc \
-src/core/lib/iomgr/tcp_windows.cc \
 src/core/lib/iomgr/tcp_windows.h \
-src/core/lib/iomgr/time_averaged_stats.cc \
 src/core/lib/iomgr/time_averaged_stats.h \
-src/core/lib/iomgr/timer.cc \
 src/core/lib/iomgr/timer.h \
-src/core/lib/iomgr/timer_custom.cc \
 src/core/lib/iomgr/timer_custom.h \
-src/core/lib/iomgr/timer_generic.cc \
-src/core/lib/iomgr/timer_heap.cc \
 src/core/lib/iomgr/timer_heap.h \
-src/core/lib/iomgr/timer_manager.cc \
 src/core/lib/iomgr/timer_manager.h \
-src/core/lib/iomgr/timer_uv.cc \
-src/core/lib/iomgr/udp_server.cc \
 src/core/lib/iomgr/udp_server.h \
-src/core/lib/iomgr/unix_sockets_posix.cc \
 src/core/lib/iomgr/unix_sockets_posix.h \
-src/core/lib/iomgr/unix_sockets_posix_noop.cc \
-src/core/lib/iomgr/wakeup_fd_eventfd.cc \
-src/core/lib/iomgr/wakeup_fd_nospecial.cc \
-src/core/lib/iomgr/wakeup_fd_pipe.cc \
 src/core/lib/iomgr/wakeup_fd_pipe.h \
-src/core/lib/iomgr/wakeup_fd_posix.cc \
 src/core/lib/iomgr/wakeup_fd_posix.h \
-src/core/lib/json/json.cc \
 src/core/lib/json/json.h \
 src/core/lib/json/json_common.h \
-src/core/lib/json/json_reader.cc \
 src/core/lib/json/json_reader.h \
-src/core/lib/json/json_string.cc \
-src/core/lib/json/json_writer.cc \
 src/core/lib/json/json_writer.h \
 src/core/lib/profiling/timers.h \
-src/core/lib/slice/b64.cc \
 src/core/lib/slice/b64.h \
-src/core/lib/slice/percent_encoding.cc \
 src/core/lib/slice/percent_encoding.h \
-src/core/lib/slice/slice.cc \
-src/core/lib/slice/slice_buffer.cc \
 src/core/lib/slice/slice_hash_table.h \
-src/core/lib/slice/slice_intern.cc \
 src/core/lib/slice/slice_internal.h \
-src/core/lib/slice/slice_string_helpers.cc \
 src/core/lib/slice/slice_string_helpers.h \
 src/core/lib/slice/slice_utils.h \
 src/core/lib/slice/slice_weak_hash_table.h \
-src/core/lib/surface/api_trace.cc \
 src/core/lib/surface/api_trace.h \
-src/core/lib/surface/byte_buffer.cc \
-src/core/lib/surface/byte_buffer_reader.cc \
-src/core/lib/surface/call.cc \
 src/core/lib/surface/call.h \
-src/core/lib/surface/call_details.cc \
-src/core/lib/surface/call_log_batch.cc \
 src/core/lib/surface/call_test_only.h \
-src/core/lib/surface/channel.cc \
 src/core/lib/surface/channel.h \
-src/core/lib/surface/channel_init.cc \
 src/core/lib/surface/channel_init.h \
-src/core/lib/surface/channel_ping.cc \
-src/core/lib/surface/channel_stack_type.cc \
 src/core/lib/surface/channel_stack_type.h \
-src/core/lib/surface/completion_queue.cc \
 src/core/lib/surface/completion_queue.h \
-src/core/lib/surface/completion_queue_factory.cc \
 src/core/lib/surface/completion_queue_factory.h \
-src/core/lib/surface/event_string.cc \
 src/core/lib/surface/event_string.h \
 src/core/lib/surface/init.h \
-src/core/lib/surface/lame_client.cc \
 src/core/lib/surface/lame_client.h \
-src/core/lib/surface/metadata_array.cc \
-src/core/lib/surface/server.cc \
 src/core/lib/surface/server.h \
-src/core/lib/surface/validate_metadata.cc \
 src/core/lib/surface/validate_metadata.h \
-src/core/lib/surface/version.cc \
-src/core/lib/transport/bdp_estimator.cc \
 src/core/lib/transport/bdp_estimator.h \
-src/core/lib/transport/byte_stream.cc \
 src/core/lib/transport/byte_stream.h \
-src/core/lib/transport/connectivity_state.cc \
 src/core/lib/transport/connectivity_state.h \
-src/core/lib/transport/error_utils.cc \
 src/core/lib/transport/error_utils.h \
 src/core/lib/transport/http2_errors.h \
-src/core/lib/transport/metadata.cc \
 src/core/lib/transport/metadata.h \
-src/core/lib/transport/metadata_batch.cc \
 src/core/lib/transport/metadata_batch.h \
-src/core/lib/transport/pid_controller.cc \
 src/core/lib/transport/pid_controller.h \
-src/core/lib/transport/static_metadata.cc \
 src/core/lib/transport/static_metadata.h \
-src/core/lib/transport/status_conversion.cc \
 src/core/lib/transport/status_conversion.h \
-src/core/lib/transport/status_metadata.cc \
 src/core/lib/transport/status_metadata.h \
-src/core/lib/transport/timeout_encoding.cc \
 src/core/lib/transport/timeout_encoding.h \
-src/core/lib/transport/transport.cc \
 src/core/lib/transport/transport.h \
 src/core/lib/transport/transport_impl.h \
-src/core/lib/transport/transport_op_string.cc \
-src/core/lib/uri/uri_parser.cc \
 src/core/lib/uri/uri_parser.h \
 src/cpp/README.md \
 src/cpp/client/channel_cc.cc \