diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e1cdd3fc5f..0b6dba6dedb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17923,7 +17923,6 @@ target_include_directories(bad_streaming_id_bad_client_test
 )
 
 target_link_libraries(bad_streaming_id_bad_client_test
-  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   bad_client_test
@@ -17966,7 +17965,6 @@ target_include_directories(badreq_bad_client_test
 )
 
 target_link_libraries(badreq_bad_client_test
-  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   bad_client_test
@@ -18009,7 +18007,6 @@ target_include_directories(connection_prefix_bad_client_test
 )
 
 target_link_libraries(connection_prefix_bad_client_test
-  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   bad_client_test
@@ -18052,7 +18049,6 @@ target_include_directories(duplicate_header_bad_client_test
 )
 
 target_link_libraries(duplicate_header_bad_client_test
-  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   bad_client_test
@@ -18095,7 +18091,6 @@ target_include_directories(head_of_line_blocking_bad_client_test
 )
 
 target_link_libraries(head_of_line_blocking_bad_client_test
-  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   bad_client_test
@@ -18138,7 +18133,6 @@ target_include_directories(headers_bad_client_test
 )
 
 target_link_libraries(headers_bad_client_test
-  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   bad_client_test
@@ -18181,7 +18175,6 @@ target_include_directories(initial_settings_frame_bad_client_test
 )
 
 target_link_libraries(initial_settings_frame_bad_client_test
-  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   bad_client_test
@@ -18224,7 +18217,6 @@ target_include_directories(large_metadata_bad_client_test
 )
 
 target_link_libraries(large_metadata_bad_client_test
-  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   bad_client_test
@@ -18267,7 +18259,6 @@ target_include_directories(out_of_bounds_bad_client_test
 )
 
 target_link_libraries(out_of_bounds_bad_client_test
-  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   bad_client_test
@@ -18310,7 +18301,6 @@ target_include_directories(server_registered_method_bad_client_test
 )
 
 target_link_libraries(server_registered_method_bad_client_test
-  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   bad_client_test
@@ -18353,7 +18343,6 @@ target_include_directories(simple_request_bad_client_test
 )
 
 target_link_libraries(simple_request_bad_client_test
-  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   bad_client_test
@@ -18396,7 +18385,6 @@ target_include_directories(unknown_frame_bad_client_test
 )
 
 target_link_libraries(unknown_frame_bad_client_test
-  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   bad_client_test
@@ -18439,7 +18427,6 @@ target_include_directories(window_overflow_bad_client_test
 )
 
 target_link_libraries(window_overflow_bad_client_test
-  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   bad_client_test
diff --git a/build.yaml b/build.yaml
index e63f375bd8a..87ca412d12f 100644
--- a/build.yaml
+++ b/build.yaml
@@ -315,1307 +315,1284 @@ filegroups:
   uses:
   - grpc++_common
   - grpc++_codegen_base
-- name: grpc_base
-  src:
-  - 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/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
-  deps:
-  - gpr
-  filegroups:
-  - grpc_base_headers
-  uses:
-  - grpc_codegen
-  - grpc_trace
-- name: grpc_base_headers
-  public_headers:
-  - include/grpc/byte_buffer.h
-  - include/grpc/byte_buffer_reader.h
-  - include/grpc/compression.h
-  - include/grpc/fork.h
-  - include/grpc/grpc.h
-  - include/grpc/grpc_posix.h
-  - include/grpc/grpc_security_constants.h
-  - include/grpc/load_reporting.h
-  - include/grpc/slice.h
-  - include/grpc/slice_buffer.h
-  - include/grpc/status.h
-  - include/grpc/support/workaround_list.h
-  headers:
-  - src/core/lib/avl/avl.h
-  - src/core/lib/backoff/backoff.h
-  - src/core/lib/channel/channel_args.h
-  - src/core/lib/channel/channel_stack.h
-  - src/core/lib/channel/channel_stack_builder.h
-  - src/core/lib/channel/channel_trace.h
-  - src/core/lib/channel/channelz.h
-  - src/core/lib/channel/channelz_registry.h
-  - src/core/lib/channel/connected_channel.h
-  - src/core/lib/channel/context.h
-  - src/core/lib/channel/handshaker.h
-  - src/core/lib/channel/handshaker_factory.h
-  - src/core/lib/channel/handshaker_registry.h
-  - src/core/lib/channel/status_util.h
-  - src/core/lib/compression/algorithm_metadata.h
-  - src/core/lib/compression/compression_args.h
-  - src/core/lib/compression/compression_internal.h
-  - src/core/lib/compression/message_compress.h
-  - src/core/lib/compression/stream_compression.h
-  - src/core/lib/compression/stream_compression_gzip.h
-  - src/core/lib/compression/stream_compression_identity.h
-  - src/core/lib/debug/stats.h
-  - src/core/lib/debug/stats_data.h
-  - src/core/lib/gprpp/debug_location.h
-  - src/core/lib/gprpp/inlined_vector.h
-  - src/core/lib/gprpp/optional.h
-  - src/core/lib/gprpp/orphanable.h
-  - src/core/lib/gprpp/ref_counted.h
-  - src/core/lib/gprpp/ref_counted_ptr.h
-  - src/core/lib/gprpp/string_view.h
-  - src/core/lib/http/format_request.h
-  - src/core/lib/http/httpcli.h
-  - src/core/lib/http/parser.h
-  - src/core/lib/iomgr/block_annotate.h
-  - src/core/lib/iomgr/buffer_list.h
-  - src/core/lib/iomgr/call_combiner.h
-  - src/core/lib/iomgr/cfstream_handle.h
-  - src/core/lib/iomgr/closure.h
-  - src/core/lib/iomgr/combiner.h
-  - src/core/lib/iomgr/dynamic_annotations.h
-  - src/core/lib/iomgr/endpoint.h
-  - src/core/lib/iomgr/endpoint_cfstream.h
-  - src/core/lib/iomgr/endpoint_pair.h
-  - src/core/lib/iomgr/error.h
-  - src/core/lib/iomgr/error_cfstream.h
-  - src/core/lib/iomgr/error_internal.h
-  - src/core/lib/iomgr/ev_epoll1_linux.h
-  - src/core/lib/iomgr/ev_epollex_linux.h
-  - src/core/lib/iomgr/ev_poll_posix.h
-  - src/core/lib/iomgr/ev_posix.h
-  - src/core/lib/iomgr/exec_ctx.h
-  - src/core/lib/iomgr/executor.h
-  - src/core/lib/iomgr/executor/mpmcqueue.h
-  - src/core/lib/iomgr/executor/threadpool.h
-  - src/core/lib/iomgr/gethostname.h
-  - src/core/lib/iomgr/grpc_if_nametoindex.h
-  - src/core/lib/iomgr/internal_errqueue.h
-  - src/core/lib/iomgr/iocp_windows.h
-  - src/core/lib/iomgr/iomgr.h
-  - src/core/lib/iomgr/iomgr_custom.h
-  - src/core/lib/iomgr/iomgr_internal.h
-  - src/core/lib/iomgr/iomgr_posix.h
-  - src/core/lib/iomgr/is_epollexclusive_available.h
-  - src/core/lib/iomgr/load_file.h
-  - src/core/lib/iomgr/lockfree_event.h
-  - src/core/lib/iomgr/nameser.h
-  - src/core/lib/iomgr/polling_entity.h
-  - src/core/lib/iomgr/pollset.h
-  - src/core/lib/iomgr/pollset_custom.h
-  - src/core/lib/iomgr/pollset_set.h
-  - src/core/lib/iomgr/pollset_set_custom.h
-  - src/core/lib/iomgr/pollset_set_windows.h
-  - src/core/lib/iomgr/pollset_windows.h
-  - src/core/lib/iomgr/port.h
-  - src/core/lib/iomgr/resolve_address.h
-  - src/core/lib/iomgr/resolve_address_custom.h
-  - 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.h
-  - src/core/lib/iomgr/sockaddr_windows.h
-  - src/core/lib/iomgr/socket_factory_posix.h
-  - src/core/lib/iomgr/socket_mutator.h
-  - src/core/lib/iomgr/socket_utils.h
-  - src/core/lib/iomgr/socket_utils_posix.h
-  - src/core/lib/iomgr/socket_windows.h
-  - src/core/lib/iomgr/sys_epoll_wrapper.h
-  - src/core/lib/iomgr/tcp_client.h
-  - src/core/lib/iomgr/tcp_client_posix.h
-  - src/core/lib/iomgr/tcp_custom.h
-  - src/core/lib/iomgr/tcp_posix.h
-  - src/core/lib/iomgr/tcp_server.h
-  - src/core/lib/iomgr/tcp_server_utils_posix.h
-  - src/core/lib/iomgr/tcp_windows.h
-  - src/core/lib/iomgr/time_averaged_stats.h
-  - src/core/lib/iomgr/timer.h
-  - src/core/lib/iomgr/timer_custom.h
-  - src/core/lib/iomgr/timer_heap.h
-  - src/core/lib/iomgr/timer_manager.h
-  - src/core/lib/iomgr/udp_server.h
-  - src/core/lib/iomgr/unix_sockets_posix.h
-  - src/core/lib/iomgr/wakeup_fd_pipe.h
-  - src/core/lib/iomgr/wakeup_fd_posix.h
-  - src/core/lib/json/json.h
-  - src/core/lib/json/json_common.h
-  - src/core/lib/json/json_reader.h
-  - src/core/lib/json/json_writer.h
-  - src/core/lib/slice/b64.h
-  - src/core/lib/slice/percent_encoding.h
-  - src/core/lib/slice/slice_hash_table.h
-  - src/core/lib/slice/slice_internal.h
-  - 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.h
-  - src/core/lib/surface/call.h
-  - src/core/lib/surface/call_test_only.h
-  - src/core/lib/surface/channel.h
-  - src/core/lib/surface/channel_init.h
-  - src/core/lib/surface/channel_stack_type.h
-  - src/core/lib/surface/completion_queue.h
-  - src/core/lib/surface/completion_queue_factory.h
-  - src/core/lib/surface/event_string.h
-  - src/core/lib/surface/init.h
-  - src/core/lib/surface/lame_client.h
-  - src/core/lib/surface/server.h
-  - src/core/lib/surface/validate_metadata.h
-  - src/core/lib/transport/bdp_estimator.h
-  - src/core/lib/transport/byte_stream.h
-  - src/core/lib/transport/connectivity_state.h
-  - src/core/lib/transport/error_utils.h
-  - src/core/lib/transport/http2_errors.h
-  - src/core/lib/transport/metadata.h
-  - src/core/lib/transport/metadata_batch.h
-  - src/core/lib/transport/pid_controller.h
-  - src/core/lib/transport/static_metadata.h
-  - src/core/lib/transport/status_conversion.h
-  - src/core/lib/transport/status_metadata.h
-  - src/core/lib/transport/timeout_encoding.h
-  - src/core/lib/transport/transport.h
-  - src/core/lib/transport/transport_impl.h
-  - src/core/lib/uri/uri_parser.h
-  deps:
-  - gpr
-  uses:
-  - grpc_codegen
-  - grpc_trace_headers
-- name: grpc_client_authority_filter
-  headers:
-  - src/core/ext/filters/http/client_authority_filter.h
-  src:
-  - src/core/ext/filters/http/client_authority_filter.cc
-  plugin: grpc_client_authority_filter
-  uses:
-  - grpc_base
-- name: grpc_client_channel
-  headers:
-  - src/core/ext/filters/client_channel/backup_poller.h
-  - src/core/ext/filters/client_channel/client_channel.h
-  - src/core/ext/filters/client_channel/client_channel_channelz.h
-  - src/core/ext/filters/client_channel/client_channel_factory.h
-  - src/core/ext/filters/client_channel/connector.h
-  - src/core/ext/filters/client_channel/global_subchannel_pool.h
-  - src/core/ext/filters/client_channel/health/health_check_client.h
-  - src/core/ext/filters/client_channel/http_connect_handshaker.h
-  - src/core/ext/filters/client_channel/http_proxy.h
-  - 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.h
-  - src/core/ext/filters/client_channel/local_subchannel_pool.h
-  - 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.h
-  - 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.h
-  - src/core/ext/filters/client_channel/resolver_result_parsing.h
-  - src/core/ext/filters/client_channel/resolving_lb_policy.h
-  - src/core/ext/filters/client_channel/retry_throttle.h
-  - src/core/ext/filters/client_channel/server_address.h
-  - src/core/ext/filters/client_channel/service_config.h
-  - 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.h
-  src:
-  - 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/connector.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.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
-  plugin: grpc_client_channel
-  uses:
-  - grpc_base
-  - grpc_deadline_filter
-  - grpc_health_upb
-- name: grpc_client_idle_filter
-  src:
-  - src/core/ext/filters/client_idle/client_idle_filter.cc
-  plugin: grpc_client_idle_filter
-  uses:
-  - grpc_base
-- name: grpc_codegen
+- name: grpc++_codegen_base
   public_headers:
-  - include/grpc/impl/codegen/byte_buffer.h
-  - include/grpc/impl/codegen/byte_buffer_reader.h
-  - include/grpc/impl/codegen/compression_types.h
-  - include/grpc/impl/codegen/connectivity_state.h
-  - include/grpc/impl/codegen/grpc_types.h
-  - include/grpc/impl/codegen/propagation_bits.h
-  - include/grpc/impl/codegen/slice.h
-  - include/grpc/impl/codegen/status.h
-  uses:
-  - gpr_codegen
-- name: grpc_deadline_filter
-  headers:
-  - src/core/ext/filters/deadline/deadline_filter.h
-  src:
-  - src/core/ext/filters/deadline/deadline_filter.cc
-  plugin: grpc_deadline_filter
-  uses:
-  - grpc_base
-- name: grpc_health_upb
-  headers:
-  - src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h
-  src:
-  - src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
-  uses:
-  - upb
-- name: grpc_http_filters
-  headers:
-  - src/core/ext/filters/http/client/http_client_filter.h
-  - src/core/ext/filters/http/message_compress/message_compress_filter.h
-  - src/core/ext/filters/http/server/http_server_filter.h
-  src:
-  - src/core/ext/filters/http/client/http_client_filter.cc
-  - src/core/ext/filters/http/http_filters_plugin.cc
-  - src/core/ext/filters/http/message_compress/message_compress_filter.cc
-  - src/core/ext/filters/http/server/http_server_filter.cc
-  plugin: grpc_http_filters
-  uses:
-  - grpc_base
-- name: grpc_lb_policy_grpclb
-  headers:
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h
-  src:
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-  plugin: grpc_lb_policy_grpclb
-  uses:
-  - grpc_base
-  - grpc_client_channel
-  - grpc_lb_upb
-  - grpc_resolver_fake
-  - upb
-- name: grpc_lb_policy_grpclb_secure
-  headers:
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h
-  src:
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-  plugin: grpc_lb_policy_grpclb
-  uses:
-  - grpc_base
-  - grpc_client_channel
-  - grpc_lb_upb
-  - grpc_resolver_fake
-  - grpc_secure
-  - upb
-- name: grpc_lb_policy_pick_first
-  src:
-  - src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc
-  plugin: grpc_lb_policy_pick_first
-  uses:
-  - grpc_base
-  - grpc_client_channel
-  - grpc_lb_subchannel_list
-- name: grpc_lb_policy_round_robin
-  src:
-  - src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
-  plugin: grpc_lb_policy_round_robin
-  uses:
-  - grpc_base
-  - grpc_client_channel
-  - grpc_lb_subchannel_list
-- name: grpc_lb_policy_xds
-  headers:
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds.h
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds_channel.h
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.h
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.h
-  src:
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds.cc
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds_channel.cc
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.cc
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.cc
-  plugin: grpc_lb_policy_xds
-  uses:
-  - envoy_ads_upb
-  - grpc_base
-  - grpc_client_channel
-  - grpc_resolver_fake
-- name: grpc_lb_policy_xds_secure
-  headers:
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds.h
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds_channel.h
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.h
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.h
-  src:
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds.cc
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_secure.cc
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.cc
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.cc
-  plugin: grpc_lb_policy_xds
-  uses:
-  - envoy_ads_upb
-  - grpc_base
-  - grpc_client_channel
-  - grpc_resolver_fake
-  - grpc_secure
-- name: grpc_lb_subchannel_list
-  headers:
-  - src/core/ext/filters/client_channel/lb_policy/subchannel_list.h
-  uses:
-  - grpc_base
-  - grpc_client_channel
-- name: grpc_lb_upb
-  headers:
-  - src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h
-  src:
-  - src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c
-  uses:
-  - google_api_upb
-  - upb
-- name: grpc_max_age_filter
-  headers:
-  - src/core/ext/filters/max_age/max_age_filter.h
-  src:
-  - src/core/ext/filters/max_age/max_age_filter.cc
-  plugin: grpc_max_age_filter
-  uses:
-  - grpc_base
-- name: grpc_message_size_filter
-  headers:
-  - src/core/ext/filters/message_size/message_size_filter.h
-  src:
-  - src/core/ext/filters/message_size/message_size_filter.cc
-  plugin: grpc_message_size_filter
+  - include/grpc++/impl/codegen/async_stream.h
+  - include/grpc++/impl/codegen/async_unary_call.h
+  - include/grpc++/impl/codegen/byte_buffer.h
+  - include/grpc++/impl/codegen/call.h
+  - include/grpc++/impl/codegen/call_hook.h
+  - include/grpc++/impl/codegen/channel_interface.h
+  - include/grpc++/impl/codegen/client_context.h
+  - include/grpc++/impl/codegen/client_unary_call.h
+  - include/grpc++/impl/codegen/completion_queue.h
+  - include/grpc++/impl/codegen/completion_queue_tag.h
+  - include/grpc++/impl/codegen/config.h
+  - include/grpc++/impl/codegen/core_codegen_interface.h
+  - include/grpc++/impl/codegen/create_auth_context.h
+  - include/grpc++/impl/codegen/grpc_library.h
+  - include/grpc++/impl/codegen/metadata_map.h
+  - include/grpc++/impl/codegen/method_handler_impl.h
+  - include/grpc++/impl/codegen/rpc_method.h
+  - include/grpc++/impl/codegen/rpc_service_method.h
+  - include/grpc++/impl/codegen/security/auth_context.h
+  - include/grpc++/impl/codegen/serialization_traits.h
+  - include/grpc++/impl/codegen/server_context.h
+  - include/grpc++/impl/codegen/server_interface.h
+  - include/grpc++/impl/codegen/service_type.h
+  - include/grpc++/impl/codegen/slice.h
+  - include/grpc++/impl/codegen/status.h
+  - include/grpc++/impl/codegen/status_code_enum.h
+  - include/grpc++/impl/codegen/string_ref.h
+  - include/grpc++/impl/codegen/stub_options.h
+  - include/grpc++/impl/codegen/sync_stream.h
+  - include/grpc++/impl/codegen/time.h
+  - include/grpcpp/impl/codegen/async_generic_service.h
+  - include/grpcpp/impl/codegen/async_stream.h
+  - include/grpcpp/impl/codegen/async_stream_impl.h
+  - include/grpcpp/impl/codegen/async_unary_call.h
+  - include/grpcpp/impl/codegen/async_unary_call_impl.h
+  - include/grpcpp/impl/codegen/byte_buffer.h
+  - include/grpcpp/impl/codegen/call.h
+  - include/grpcpp/impl/codegen/call_hook.h
+  - include/grpcpp/impl/codegen/call_op_set.h
+  - include/grpcpp/impl/codegen/call_op_set_interface.h
+  - include/grpcpp/impl/codegen/callback_common.h
+  - include/grpcpp/impl/codegen/channel_interface.h
+  - include/grpcpp/impl/codegen/client_callback.h
+  - include/grpcpp/impl/codegen/client_callback_impl.h
+  - include/grpcpp/impl/codegen/client_context.h
+  - include/grpcpp/impl/codegen/client_context_impl.h
+  - include/grpcpp/impl/codegen/client_interceptor.h
+  - include/grpcpp/impl/codegen/client_unary_call.h
+  - include/grpcpp/impl/codegen/completion_queue.h
+  - include/grpcpp/impl/codegen/completion_queue_impl.h
+  - include/grpcpp/impl/codegen/completion_queue_tag.h
+  - include/grpcpp/impl/codegen/config.h
+  - include/grpcpp/impl/codegen/core_codegen_interface.h
+  - include/grpcpp/impl/codegen/create_auth_context.h
+  - include/grpcpp/impl/codegen/delegating_channel.h
+  - include/grpcpp/impl/codegen/grpc_library.h
+  - include/grpcpp/impl/codegen/intercepted_channel.h
+  - include/grpcpp/impl/codegen/interceptor.h
+  - include/grpcpp/impl/codegen/interceptor_common.h
+  - include/grpcpp/impl/codegen/message_allocator.h
+  - include/grpcpp/impl/codegen/metadata_map.h
+  - include/grpcpp/impl/codegen/method_handler_impl.h
+  - include/grpcpp/impl/codegen/rpc_method.h
+  - include/grpcpp/impl/codegen/rpc_service_method.h
+  - include/grpcpp/impl/codegen/security/auth_context.h
+  - include/grpcpp/impl/codegen/serialization_traits.h
+  - include/grpcpp/impl/codegen/server_callback.h
+  - include/grpcpp/impl/codegen/server_callback_impl.h
+  - include/grpcpp/impl/codegen/server_context.h
+  - include/grpcpp/impl/codegen/server_context_impl.h
+  - include/grpcpp/impl/codegen/server_interceptor.h
+  - include/grpcpp/impl/codegen/server_interface.h
+  - include/grpcpp/impl/codegen/service_type.h
+  - include/grpcpp/impl/codegen/slice.h
+  - include/grpcpp/impl/codegen/status.h
+  - include/grpcpp/impl/codegen/status_code_enum.h
+  - include/grpcpp/impl/codegen/string_ref.h
+  - include/grpcpp/impl/codegen/stub_options.h
+  - include/grpcpp/impl/codegen/sync_stream.h
+  - include/grpcpp/impl/codegen/sync_stream_impl.h
+  - include/grpcpp/impl/codegen/time.h
   uses:
-  - grpc_base
-- name: grpc_resolver_dns_ares
-  headers:
-  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h
-  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h
+  - grpc_codegen
+  - grpc++_internal_hdrs_only
+- name: grpc++_codegen_base_src
   src:
-  - src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
-  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc
-  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc
-  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
-  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
-  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
-  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc
-  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc
-  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
-  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
-  plugin: grpc_resolver_dns_ares
+  - src/cpp/codegen/codegen_init.cc
   uses:
-  - grpc_base
-  - grpc_client_channel
-  - grpc_resolver_dns_selection
-- name: grpc_resolver_dns_native
-  src:
-  - src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
-  plugin: grpc_resolver_dns_native
+  - grpc++_codegen_base
+- name: grpc++_codegen_proto
+  public_headers:
+  - include/grpc++/impl/codegen/proto_utils.h
+  - include/grpcpp/impl/codegen/proto_buffer_reader.h
+  - include/grpcpp/impl/codegen/proto_buffer_writer.h
+  - include/grpcpp/impl/codegen/proto_utils.h
   uses:
-  - grpc_base
-  - grpc_client_channel
-  - grpc_resolver_dns_selection
-- name: grpc_resolver_dns_selection
+  - grpc++_codegen_base
+  - grpc++_config_proto
+- name: grpc++_common
+  public_headers:
+  - include/grpc++/alarm.h
+  - include/grpc++/channel.h
+  - include/grpc++/client_context.h
+  - include/grpc++/completion_queue.h
+  - include/grpc++/create_channel.h
+  - include/grpc++/create_channel_posix.h
+  - include/grpc++/ext/health_check_service_server_builder_option.h
+  - include/grpc++/generic/async_generic_service.h
+  - include/grpc++/generic/generic_stub.h
+  - include/grpc++/grpc++.h
+  - include/grpc++/health_check_service_interface.h
+  - include/grpc++/impl/call.h
+  - include/grpc++/impl/channel_argument_option.h
+  - include/grpc++/impl/client_unary_call.h
+  - include/grpc++/impl/codegen/core_codegen.h
+  - include/grpc++/impl/grpc_library.h
+  - include/grpc++/impl/method_handler_impl.h
+  - include/grpc++/impl/rpc_method.h
+  - include/grpc++/impl/rpc_service_method.h
+  - include/grpc++/impl/serialization_traits.h
+  - include/grpc++/impl/server_builder_option.h
+  - include/grpc++/impl/server_builder_plugin.h
+  - include/grpc++/impl/server_initializer.h
+  - include/grpc++/impl/service_type.h
+  - include/grpc++/resource_quota.h
+  - include/grpc++/security/auth_context.h
+  - include/grpc++/security/auth_metadata_processor.h
+  - include/grpc++/security/credentials.h
+  - include/grpc++/security/server_credentials.h
+  - include/grpc++/server.h
+  - include/grpc++/server_builder.h
+  - include/grpc++/server_context.h
+  - include/grpc++/server_posix.h
+  - include/grpc++/support/async_stream.h
+  - include/grpc++/support/async_unary_call.h
+  - include/grpc++/support/byte_buffer.h
+  - include/grpc++/support/channel_arguments.h
+  - include/grpc++/support/config.h
+  - include/grpc++/support/slice.h
+  - include/grpc++/support/status.h
+  - include/grpc++/support/status_code_enum.h
+  - include/grpc++/support/string_ref.h
+  - include/grpc++/support/stub_options.h
+  - include/grpc++/support/sync_stream.h
+  - include/grpc++/support/time.h
+  - include/grpcpp/alarm.h
+  - include/grpcpp/alarm_impl.h
+  - include/grpcpp/channel.h
+  - include/grpcpp/channel_impl.h
+  - include/grpcpp/client_context.h
+  - include/grpcpp/completion_queue.h
+  - include/grpcpp/completion_queue_impl.h
+  - include/grpcpp/create_channel.h
+  - include/grpcpp/create_channel_impl.h
+  - include/grpcpp/create_channel_posix.h
+  - include/grpcpp/create_channel_posix_impl.h
+  - include/grpcpp/ext/health_check_service_server_builder_option.h
+  - include/grpcpp/generic/async_generic_service.h
+  - include/grpcpp/generic/generic_stub.h
+  - include/grpcpp/generic/generic_stub_impl.h
+  - include/grpcpp/grpcpp.h
+  - include/grpcpp/health_check_service_interface.h
+  - include/grpcpp/health_check_service_interface_impl.h
+  - include/grpcpp/impl/call.h
+  - include/grpcpp/impl/channel_argument_option.h
+  - include/grpcpp/impl/client_unary_call.h
+  - include/grpcpp/impl/codegen/core_codegen.h
+  - include/grpcpp/impl/grpc_library.h
+  - include/grpcpp/impl/method_handler_impl.h
+  - include/grpcpp/impl/rpc_method.h
+  - include/grpcpp/impl/rpc_service_method.h
+  - include/grpcpp/impl/serialization_traits.h
+  - include/grpcpp/impl/server_builder_option.h
+  - include/grpcpp/impl/server_builder_option_impl.h
+  - include/grpcpp/impl/server_builder_plugin.h
+  - include/grpcpp/impl/server_initializer.h
+  - include/grpcpp/impl/server_initializer_impl.h
+  - include/grpcpp/impl/service_type.h
+  - include/grpcpp/resource_quota.h
+  - include/grpcpp/resource_quota_impl.h
+  - include/grpcpp/security/auth_context.h
+  - include/grpcpp/security/auth_metadata_processor.h
+  - include/grpcpp/security/auth_metadata_processor_impl.h
+  - include/grpcpp/security/credentials.h
+  - include/grpcpp/security/credentials_impl.h
+  - include/grpcpp/security/server_credentials.h
+  - include/grpcpp/security/server_credentials_impl.h
+  - include/grpcpp/server.h
+  - include/grpcpp/server_builder.h
+  - include/grpcpp/server_builder_impl.h
+  - include/grpcpp/server_context.h
+  - include/grpcpp/server_impl.h
+  - include/grpcpp/server_posix.h
+  - include/grpcpp/server_posix_impl.h
+  - include/grpcpp/support/async_stream.h
+  - include/grpcpp/support/async_stream_impl.h
+  - include/grpcpp/support/async_unary_call.h
+  - include/grpcpp/support/async_unary_call_impl.h
+  - include/grpcpp/support/byte_buffer.h
+  - include/grpcpp/support/channel_arguments.h
+  - include/grpcpp/support/channel_arguments_impl.h
+  - include/grpcpp/support/client_callback.h
+  - include/grpcpp/support/client_callback_impl.h
+  - include/grpcpp/support/client_interceptor.h
+  - include/grpcpp/support/config.h
+  - include/grpcpp/support/interceptor.h
+  - include/grpcpp/support/message_allocator.h
+  - include/grpcpp/support/proto_buffer_reader.h
+  - include/grpcpp/support/proto_buffer_writer.h
+  - include/grpcpp/support/server_callback.h
+  - include/grpcpp/support/server_callback_impl.h
+  - include/grpcpp/support/server_interceptor.h
+  - include/grpcpp/support/slice.h
+  - include/grpcpp/support/status.h
+  - include/grpcpp/support/status_code_enum.h
+  - include/grpcpp/support/string_ref.h
+  - include/grpcpp/support/stub_options.h
+  - 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
   headers:
-  - src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.h
+  - src/cpp/client/create_channel_internal.h
+  - src/cpp/common/channel_filter.h
+  - src/cpp/server/dynamic_thread_pool.h
+  - src/cpp/server/external_connection_acceptor_impl.h
+  - src/cpp/server/health/default_health_check_service.h
+  - src/cpp/server/thread_pool_interface.h
+  - src/cpp/thread_manager/thread_manager.h
   src:
-  - src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.cc
+  - src/cpp/client/channel_cc.cc
+  - src/cpp/client/client_context.cc
+  - src/cpp/client/client_interceptor.cc
+  - src/cpp/client/create_channel.cc
+  - src/cpp/client/create_channel_internal.cc
+  - src/cpp/client/create_channel_posix.cc
+  - src/cpp/client/credentials_cc.cc
+  - src/cpp/client/generic_stub.cc
+  - src/cpp/common/alarm.cc
+  - src/cpp/common/channel_arguments.cc
+  - src/cpp/common/channel_filter.cc
+  - src/cpp/common/completion_queue_cc.cc
+  - src/cpp/common/core_codegen.cc
+  - src/cpp/common/resource_quota_cc.cc
+  - src/cpp/common/rpc_method.cc
+  - src/cpp/common/validate_service_config.cc
+  - src/cpp/common/version_cc.cc
+  - src/cpp/server/async_generic_service.cc
+  - src/cpp/server/channel_argument_option.cc
+  - src/cpp/server/create_default_thread_pool.cc
+  - src/cpp/server/dynamic_thread_pool.cc
+  - src/cpp/server/external_connection_acceptor_impl.cc
+  - src/cpp/server/health/default_health_check_service.cc
+  - src/cpp/server/health/health_check_service.cc
+  - src/cpp/server/health/health_check_service_server_builder_option.cc
+  - src/cpp/server/server_builder.cc
+  - src/cpp/server/server_cc.cc
+  - src/cpp/server/server_context.cc
+  - src/cpp/server/server_credentials.cc
+  - src/cpp/server/server_posix.cc
+  - src/cpp/thread_manager/thread_manager.cc
+  - src/cpp/util/byte_buffer_cc.cc
+  - src/cpp/util/status.cc
+  - src/cpp/util/string_ref.cc
+  - src/cpp/util/time_cc.cc
   uses:
-  - grpc_base
-- name: grpc_resolver_fake
-  headers:
-  - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h
+  - gpr_base_headers
+  - grpc_base_headers
+  - grpc_health_upb
+  - grpc_transport_inproc_headers
+  - grpc++_codegen_base
+  - grpc++_internal_hdrs_only
+  - nanopb_headers
+- name: grpc++_config_proto
+  public_headers:
+  - include/grpc++/impl/codegen/config_protobuf.h
+  - include/grpcpp/impl/codegen/config_protobuf.h
+- name: grpc++_internal_hdrs_only
+  public_headers:
+  - include/grpcpp/impl/codegen/sync.h
+- name: grpc++_reflection_proto
   src:
-  - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
-  plugin: grpc_resolver_fake
-  uses:
-  - grpc_base
-  - grpc_client_channel
-- name: grpc_resolver_sockaddr
+  - src/proto/grpc/reflection/v1alpha/reflection.proto
+- name: grpc++_test
+  public_headers:
+  - include/grpc++/test/mock_stream.h
+  - include/grpc++/test/server_context_test_spouse.h
+  - include/grpcpp/test/mock_stream.h
+  - include/grpcpp/test/server_context_test_spouse.h
+  deps:
+  - grpc++
+  - grpc
+- name: grpc_base
   src:
-  - src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
-  plugin: grpc_resolver_sockaddr
+  - 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/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
+  deps:
+  - gpr
   uses:
-  - grpc_base
-  - grpc_client_channel
-- name: grpc_secure
+  - grpc_codegen
+  - grpc_trace
+- name: grpc_base_headers
   public_headers:
-  - include/grpc/grpc_security.h
+  - include/grpc/byte_buffer.h
+  - include/grpc/byte_buffer_reader.h
+  - include/grpc/compression.h
+  - include/grpc/fork.h
+  - include/grpc/grpc.h
+  - include/grpc/grpc_posix.h
+  - include/grpc/grpc_security_constants.h
+  - include/grpc/load_reporting.h
+  - include/grpc/slice.h
+  - include/grpc/slice_buffer.h
+  - include/grpc/status.h
+  - include/grpc/support/workaround_list.h
   headers:
-  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds.h
-  - src/core/lib/security/context/security_context.h
-  - src/core/lib/security/credentials/alts/alts_credentials.h
-  - src/core/lib/security/credentials/composite/composite_credentials.h
-  - src/core/lib/security/credentials/credentials.h
-  - src/core/lib/security/credentials/fake/fake_credentials.h
-  - src/core/lib/security/credentials/google_default/google_default_credentials.h
-  - src/core/lib/security/credentials/iam/iam_credentials.h
-  - src/core/lib/security/credentials/jwt/json_token.h
-  - src/core/lib/security/credentials/jwt/jwt_credentials.h
-  - src/core/lib/security/credentials/jwt/jwt_verifier.h
-  - src/core/lib/security/credentials/local/local_credentials.h
-  - src/core/lib/security/credentials/oauth2/oauth2_credentials.h
-  - src/core/lib/security/credentials/plugin/plugin_credentials.h
-  - src/core/lib/security/credentials/ssl/ssl_credentials.h
-  - src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h
-  - src/core/lib/security/credentials/tls/spiffe_credentials.h
-  - src/core/lib/security/security_connector/alts/alts_security_connector.h
-  - src/core/lib/security/security_connector/fake/fake_security_connector.h
-  - src/core/lib/security/security_connector/load_system_roots.h
-  - src/core/lib/security/security_connector/load_system_roots_linux.h
-  - src/core/lib/security/security_connector/local/local_security_connector.h
-  - src/core/lib/security/security_connector/security_connector.h
-  - src/core/lib/security/security_connector/ssl/ssl_security_connector.h
-  - src/core/lib/security/security_connector/ssl_utils.h
-  - src/core/lib/security/security_connector/tls/spiffe_security_connector.h
-  - src/core/lib/security/transport/auth_filters.h
-  - src/core/lib/security/transport/secure_endpoint.h
-  - src/core/lib/security/transport/security_handshaker.h
-  - src/core/lib/security/transport/target_authority_table.h
-  - src/core/lib/security/transport/tsi_error.h
-  - src/core/lib/security/util/json_util.h
-  src:
-  - src/core/lib/http/httpcli_security_connector.cc
-  - src/core/lib/security/context/security_context.cc
-  - src/core/lib/security/credentials/alts/alts_credentials.cc
-  - src/core/lib/security/credentials/composite/composite_credentials.cc
-  - src/core/lib/security/credentials/credentials.cc
-  - src/core/lib/security/credentials/credentials_metadata.cc
-  - src/core/lib/security/credentials/fake/fake_credentials.cc
-  - src/core/lib/security/credentials/google_default/credentials_generic.cc
-  - src/core/lib/security/credentials/google_default/google_default_credentials.cc
-  - src/core/lib/security/credentials/iam/iam_credentials.cc
-  - src/core/lib/security/credentials/jwt/json_token.cc
-  - src/core/lib/security/credentials/jwt/jwt_credentials.cc
-  - src/core/lib/security/credentials/jwt/jwt_verifier.cc
-  - src/core/lib/security/credentials/local/local_credentials.cc
-  - src/core/lib/security/credentials/oauth2/oauth2_credentials.cc
-  - src/core/lib/security/credentials/plugin/plugin_credentials.cc
-  - src/core/lib/security/credentials/ssl/ssl_credentials.cc
-  - src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc
-  - src/core/lib/security/credentials/tls/spiffe_credentials.cc
-  - src/core/lib/security/security_connector/alts/alts_security_connector.cc
-  - src/core/lib/security/security_connector/fake/fake_security_connector.cc
-  - src/core/lib/security/security_connector/load_system_roots_fallback.cc
-  - src/core/lib/security/security_connector/load_system_roots_linux.cc
-  - src/core/lib/security/security_connector/local/local_security_connector.cc
-  - src/core/lib/security/security_connector/security_connector.cc
-  - src/core/lib/security/security_connector/ssl/ssl_security_connector.cc
-  - src/core/lib/security/security_connector/ssl_utils.cc
-  - src/core/lib/security/security_connector/tls/spiffe_security_connector.cc
-  - src/core/lib/security/transport/client_auth_filter.cc
-  - src/core/lib/security/transport/secure_endpoint.cc
-  - src/core/lib/security/transport/security_handshaker.cc
-  - src/core/lib/security/transport/server_auth_filter.cc
-  - src/core/lib/security/transport/target_authority_table.cc
-  - src/core/lib/security/transport/tsi_error.cc
-  - src/core/lib/security/util/json_util.cc
-  - src/core/lib/surface/init_secure.cc
-  secure: true
+  - src/core/lib/avl/avl.h
+  - src/core/lib/backoff/backoff.h
+  - src/core/lib/channel/channel_args.h
+  - src/core/lib/channel/channel_stack.h
+  - src/core/lib/channel/channel_stack_builder.h
+  - src/core/lib/channel/channel_trace.h
+  - src/core/lib/channel/channelz.h
+  - src/core/lib/channel/channelz_registry.h
+  - src/core/lib/channel/connected_channel.h
+  - src/core/lib/channel/context.h
+  - src/core/lib/channel/handshaker.h
+  - src/core/lib/channel/handshaker_factory.h
+  - src/core/lib/channel/handshaker_registry.h
+  - src/core/lib/channel/status_util.h
+  - src/core/lib/compression/algorithm_metadata.h
+  - src/core/lib/compression/compression_args.h
+  - src/core/lib/compression/compression_internal.h
+  - src/core/lib/compression/message_compress.h
+  - src/core/lib/compression/stream_compression.h
+  - src/core/lib/compression/stream_compression_gzip.h
+  - src/core/lib/compression/stream_compression_identity.h
+  - src/core/lib/debug/stats.h
+  - src/core/lib/debug/stats_data.h
+  - src/core/lib/gprpp/debug_location.h
+  - src/core/lib/gprpp/inlined_vector.h
+  - src/core/lib/gprpp/optional.h
+  - src/core/lib/gprpp/orphanable.h
+  - src/core/lib/gprpp/ref_counted.h
+  - src/core/lib/gprpp/ref_counted_ptr.h
+  - src/core/lib/gprpp/string_view.h
+  - src/core/lib/http/format_request.h
+  - src/core/lib/http/httpcli.h
+  - src/core/lib/http/parser.h
+  - src/core/lib/iomgr/block_annotate.h
+  - src/core/lib/iomgr/buffer_list.h
+  - src/core/lib/iomgr/call_combiner.h
+  - src/core/lib/iomgr/cfstream_handle.h
+  - src/core/lib/iomgr/closure.h
+  - src/core/lib/iomgr/combiner.h
+  - src/core/lib/iomgr/dynamic_annotations.h
+  - src/core/lib/iomgr/endpoint.h
+  - src/core/lib/iomgr/endpoint_cfstream.h
+  - src/core/lib/iomgr/endpoint_pair.h
+  - src/core/lib/iomgr/error.h
+  - src/core/lib/iomgr/error_cfstream.h
+  - src/core/lib/iomgr/error_internal.h
+  - src/core/lib/iomgr/ev_epoll1_linux.h
+  - src/core/lib/iomgr/ev_epollex_linux.h
+  - src/core/lib/iomgr/ev_poll_posix.h
+  - src/core/lib/iomgr/ev_posix.h
+  - src/core/lib/iomgr/exec_ctx.h
+  - src/core/lib/iomgr/executor.h
+  - src/core/lib/iomgr/executor/mpmcqueue.h
+  - src/core/lib/iomgr/executor/threadpool.h
+  - src/core/lib/iomgr/gethostname.h
+  - src/core/lib/iomgr/grpc_if_nametoindex.h
+  - src/core/lib/iomgr/internal_errqueue.h
+  - src/core/lib/iomgr/iocp_windows.h
+  - src/core/lib/iomgr/iomgr.h
+  - src/core/lib/iomgr/iomgr_custom.h
+  - src/core/lib/iomgr/iomgr_internal.h
+  - src/core/lib/iomgr/iomgr_posix.h
+  - src/core/lib/iomgr/is_epollexclusive_available.h
+  - src/core/lib/iomgr/load_file.h
+  - src/core/lib/iomgr/lockfree_event.h
+  - src/core/lib/iomgr/nameser.h
+  - src/core/lib/iomgr/polling_entity.h
+  - src/core/lib/iomgr/pollset.h
+  - src/core/lib/iomgr/pollset_custom.h
+  - src/core/lib/iomgr/pollset_set.h
+  - src/core/lib/iomgr/pollset_set_custom.h
+  - src/core/lib/iomgr/pollset_set_windows.h
+  - src/core/lib/iomgr/pollset_windows.h
+  - src/core/lib/iomgr/port.h
+  - src/core/lib/iomgr/resolve_address.h
+  - src/core/lib/iomgr/resolve_address_custom.h
+  - 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.h
+  - src/core/lib/iomgr/sockaddr_windows.h
+  - src/core/lib/iomgr/socket_factory_posix.h
+  - src/core/lib/iomgr/socket_mutator.h
+  - src/core/lib/iomgr/socket_utils.h
+  - src/core/lib/iomgr/socket_utils_posix.h
+  - src/core/lib/iomgr/socket_windows.h
+  - src/core/lib/iomgr/sys_epoll_wrapper.h
+  - src/core/lib/iomgr/tcp_client.h
+  - src/core/lib/iomgr/tcp_client_posix.h
+  - src/core/lib/iomgr/tcp_custom.h
+  - src/core/lib/iomgr/tcp_posix.h
+  - src/core/lib/iomgr/tcp_server.h
+  - src/core/lib/iomgr/tcp_server_utils_posix.h
+  - src/core/lib/iomgr/tcp_windows.h
+  - src/core/lib/iomgr/time_averaged_stats.h
+  - src/core/lib/iomgr/timer.h
+  - src/core/lib/iomgr/timer_custom.h
+  - src/core/lib/iomgr/timer_heap.h
+  - src/core/lib/iomgr/timer_manager.h
+  - src/core/lib/iomgr/udp_server.h
+  - src/core/lib/iomgr/unix_sockets_posix.h
+  - src/core/lib/iomgr/wakeup_fd_pipe.h
+  - src/core/lib/iomgr/wakeup_fd_posix.h
+  - src/core/lib/json/json.h
+  - src/core/lib/json/json_common.h
+  - src/core/lib/json/json_reader.h
+  - src/core/lib/json/json_writer.h
+  - src/core/lib/slice/b64.h
+  - src/core/lib/slice/percent_encoding.h
+  - src/core/lib/slice/slice_hash_table.h
+  - src/core/lib/slice/slice_internal.h
+  - 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.h
+  - src/core/lib/surface/call.h
+  - src/core/lib/surface/call_test_only.h
+  - src/core/lib/surface/channel.h
+  - src/core/lib/surface/channel_init.h
+  - src/core/lib/surface/channel_stack_type.h
+  - src/core/lib/surface/completion_queue.h
+  - src/core/lib/surface/completion_queue_factory.h
+  - src/core/lib/surface/event_string.h
+  - src/core/lib/surface/init.h
+  - src/core/lib/surface/lame_client.h
+  - src/core/lib/surface/server.h
+  - src/core/lib/surface/validate_metadata.h
+  - src/core/lib/transport/bdp_estimator.h
+  - src/core/lib/transport/byte_stream.h
+  - src/core/lib/transport/connectivity_state.h
+  - src/core/lib/transport/error_utils.h
+  - src/core/lib/transport/http2_errors.h
+  - src/core/lib/transport/metadata.h
+  - src/core/lib/transport/metadata_batch.h
+  - src/core/lib/transport/pid_controller.h
+  - src/core/lib/transport/static_metadata.h
+  - src/core/lib/transport/status_conversion.h
+  - src/core/lib/transport/status_metadata.h
+  - src/core/lib/transport/timeout_encoding.h
+  - src/core/lib/transport/transport.h
+  - src/core/lib/transport/transport_impl.h
+  - src/core/lib/uri/uri_parser.h
+  deps:
+  - gpr
   uses:
-  - alts_tsi
-  - grpc_base
-  - grpc_transport_chttp2_alpn
-  - tsi
-  - grpc_shadow_boringssl
-- name: grpc_server_backward_compatibility
+  - grpc_codegen
+  - grpc_trace_headers
+- name: grpc_client_authority_filter
   headers:
-  - src/core/ext/filters/workarounds/workaround_utils.h
+  - src/core/ext/filters/http/client_authority_filter.h
   src:
-  - src/core/ext/filters/workarounds/workaround_utils.cc
+  - src/core/ext/filters/http/client_authority_filter.cc
+  plugin: grpc_client_authority_filter
   uses:
   - grpc_base
-- name: grpc_shadow_boringssl
-  headers:
-  - src/core/tsi/grpc_shadow_boringssl.h
-- name: grpc_test_util_base
-  build: test
+- name: grpc_client_channel
   headers:
-  - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h
-  - test/core/end2end/cq_verifier.h
-  - test/core/end2end/fixtures/http_proxy_fixture.h
-  - test/core/end2end/fixtures/local_util.h
-  - test/core/end2end/fixtures/proxy.h
-  - test/core/iomgr/endpoint_tests.h
-  - test/core/util/debugger_macros.h
-  - test/core/util/fuzzer_util.h
-  - test/core/util/grpc_profiler.h
-  - test/core/util/histogram.h
-  - test/core/util/memory_counters.h
-  - test/core/util/mock_endpoint.h
-  - test/core/util/parse_hexstring.h
-  - test/core/util/passthru_endpoint.h
-  - test/core/util/port.h
-  - test/core/util/port_server_client.h
-  - test/core/util/slice_splitter.h
-  - test/core/util/subprocess.h
-  - test/core/util/test_config.h
-  - test/core/util/test_lb_policies.h
-  - test/core/util/tracer_util.h
-  - test/core/util/trickle_endpoint.h
+  - src/core/ext/filters/client_channel/backup_poller.h
+  - src/core/ext/filters/client_channel/client_channel.h
+  - src/core/ext/filters/client_channel/client_channel_channelz.h
+  - src/core/ext/filters/client_channel/client_channel_factory.h
+  - src/core/ext/filters/client_channel/connector.h
+  - src/core/ext/filters/client_channel/global_subchannel_pool.h
+  - src/core/ext/filters/client_channel/health/health_check_client.h
+  - src/core/ext/filters/client_channel/http_connect_handshaker.h
+  - src/core/ext/filters/client_channel/http_proxy.h
+  - 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.h
+  - src/core/ext/filters/client_channel/local_subchannel_pool.h
+  - 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.h
+  - 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.h
+  - src/core/ext/filters/client_channel/resolver_result_parsing.h
+  - src/core/ext/filters/client_channel/resolving_lb_policy.h
+  - src/core/ext/filters/client_channel/retry_throttle.h
+  - src/core/ext/filters/client_channel/server_address.h
+  - src/core/ext/filters/client_channel/service_config.h
+  - 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.h
   src:
-  - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
-  - test/core/end2end/cq_verifier.cc
-  - test/core/end2end/fixtures/http_proxy_fixture.cc
-  - test/core/end2end/fixtures/local_util.cc
-  - test/core/end2end/fixtures/proxy.cc
-  - test/core/iomgr/endpoint_tests.cc
-  - test/core/util/debugger_macros.cc
-  - test/core/util/fuzzer_util.cc
-  - test/core/util/grpc_profiler.cc
-  - test/core/util/histogram.cc
-  - test/core/util/memory_counters.cc
-  - test/core/util/mock_endpoint.cc
-  - test/core/util/parse_hexstring.cc
-  - test/core/util/passthru_endpoint.cc
-  - test/core/util/port.cc
-  - test/core/util/port_isolated_runtime_environment.cc
-  - test/core/util/port_server_client.cc
-  - test/core/util/slice_splitter.cc
-  - test/core/util/subprocess_posix.cc
-  - test/core/util/subprocess_windows.cc
-  - test/core/util/test_config.cc
-  - test/core/util/test_lb_policies.cc
-  - test/core/util/tracer_util.cc
-  - test/core/util/trickle_endpoint.cc
-  deps:
-  - gpr
+  - 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/connector.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.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
+  plugin: grpc_client_channel
   uses:
-  - cmdline
   - grpc_base
-  - grpc_client_channel
-  - grpc_transport_chttp2
-- name: grpc_trace
+  - grpc_deadline_filter
+  - grpc_health_upb
+- name: grpc_client_idle_filter
   src:
-  - src/core/lib/debug/trace.cc
-  deps:
-  - gpr
-  filegroups:
-  - grpc_trace_headers
-  - grpc_base_headers
-- name: grpc_trace_headers
-  headers:
-  - src/core/lib/debug/trace.h
-  deps:
-  - gpr
-- name: grpc_transport_chttp2
+  - src/core/ext/filters/client_idle/client_idle_filter.cc
+  plugin: grpc_client_idle_filter
+  uses:
+  - grpc_base
+- name: grpc_codegen
+  public_headers:
+  - include/grpc/impl/codegen/byte_buffer.h
+  - include/grpc/impl/codegen/byte_buffer_reader.h
+  - include/grpc/impl/codegen/compression_types.h
+  - include/grpc/impl/codegen/connectivity_state.h
+  - include/grpc/impl/codegen/grpc_types.h
+  - include/grpc/impl/codegen/propagation_bits.h
+  - include/grpc/impl/codegen/slice.h
+  - include/grpc/impl/codegen/status.h
+  uses:
+  - gpr_codegen
+- name: grpc_deadline_filter
   headers:
-  - src/core/ext/transport/chttp2/transport/bin_decoder.h
-  - src/core/ext/transport/chttp2/transport/bin_encoder.h
-  - src/core/ext/transport/chttp2/transport/chttp2_transport.h
-  - src/core/ext/transport/chttp2/transport/context_list.h
-  - src/core/ext/transport/chttp2/transport/flow_control.h
-  - src/core/ext/transport/chttp2/transport/frame.h
-  - src/core/ext/transport/chttp2/transport/frame_data.h
-  - src/core/ext/transport/chttp2/transport/frame_goaway.h
-  - src/core/ext/transport/chttp2/transport/frame_ping.h
-  - src/core/ext/transport/chttp2/transport/frame_rst_stream.h
-  - src/core/ext/transport/chttp2/transport/frame_settings.h
-  - src/core/ext/transport/chttp2/transport/frame_window_update.h
-  - src/core/ext/transport/chttp2/transport/hpack_encoder.h
-  - src/core/ext/transport/chttp2/transport/hpack_parser.h
-  - src/core/ext/transport/chttp2/transport/hpack_table.h
-  - src/core/ext/transport/chttp2/transport/http2_settings.h
-  - src/core/ext/transport/chttp2/transport/huffsyms.h
-  - src/core/ext/transport/chttp2/transport/incoming_metadata.h
-  - src/core/ext/transport/chttp2/transport/internal.h
-  - src/core/ext/transport/chttp2/transport/stream_map.h
-  - src/core/ext/transport/chttp2/transport/varint.h
+  - src/core/ext/filters/deadline/deadline_filter.h
   src:
-  - src/core/ext/transport/chttp2/transport/bin_decoder.cc
-  - src/core/ext/transport/chttp2/transport/bin_encoder.cc
-  - src/core/ext/transport/chttp2/transport/chttp2_plugin.cc
-  - src/core/ext/transport/chttp2/transport/chttp2_transport.cc
-  - src/core/ext/transport/chttp2/transport/context_list.cc
-  - src/core/ext/transport/chttp2/transport/flow_control.cc
-  - src/core/ext/transport/chttp2/transport/frame_data.cc
-  - src/core/ext/transport/chttp2/transport/frame_goaway.cc
-  - src/core/ext/transport/chttp2/transport/frame_ping.cc
-  - src/core/ext/transport/chttp2/transport/frame_rst_stream.cc
-  - src/core/ext/transport/chttp2/transport/frame_settings.cc
-  - src/core/ext/transport/chttp2/transport/frame_window_update.cc
-  - src/core/ext/transport/chttp2/transport/hpack_encoder.cc
-  - src/core/ext/transport/chttp2/transport/hpack_parser.cc
-  - src/core/ext/transport/chttp2/transport/hpack_table.cc
-  - src/core/ext/transport/chttp2/transport/http2_settings.cc
-  - src/core/ext/transport/chttp2/transport/huffsyms.cc
-  - src/core/ext/transport/chttp2/transport/incoming_metadata.cc
-  - src/core/ext/transport/chttp2/transport/parsing.cc
-  - src/core/ext/transport/chttp2/transport/stream_lists.cc
-  - src/core/ext/transport/chttp2/transport/stream_map.cc
-  - src/core/ext/transport/chttp2/transport/varint.cc
-  - src/core/ext/transport/chttp2/transport/writing.cc
-  plugin: grpc_chttp2_plugin
+  - src/core/ext/filters/deadline/deadline_filter.cc
+  plugin: grpc_deadline_filter
   uses:
   - grpc_base
-  - grpc_transport_chttp2_alpn
-  - grpc_http_filters
-- name: grpc_transport_chttp2_alpn
+- name: grpc_health_upb
   headers:
-  - src/core/ext/transport/chttp2/alpn/alpn.h
+  - src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h
   src:
-  - src/core/ext/transport/chttp2/alpn/alpn.cc
-  deps:
-  - gpr
-- name: grpc_transport_chttp2_client_connector
+  - src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
+  uses:
+  - upb
+- name: grpc_http_filters
   headers:
-  - src/core/ext/transport/chttp2/client/authority.h
-  - src/core/ext/transport/chttp2/client/chttp2_connector.h
+  - src/core/ext/filters/http/client/http_client_filter.h
+  - src/core/ext/filters/http/message_compress/message_compress_filter.h
+  - src/core/ext/filters/http/server/http_server_filter.h
   src:
-  - src/core/ext/transport/chttp2/client/authority.cc
-  - src/core/ext/transport/chttp2/client/chttp2_connector.cc
+  - src/core/ext/filters/http/client/http_client_filter.cc
+  - src/core/ext/filters/http/http_filters_plugin.cc
+  - src/core/ext/filters/http/message_compress/message_compress_filter.cc
+  - src/core/ext/filters/http/server/http_server_filter.cc
+  plugin: grpc_http_filters
   uses:
-  - grpc_transport_chttp2
   - grpc_base
-  - grpc_client_channel
-- name: grpc_transport_chttp2_client_insecure
+- name: grpc_lb_policy_grpclb
+  headers:
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h
   src:
-  - src/core/ext/transport/chttp2/client/insecure/channel_create.cc
-  - src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
+  plugin: grpc_lb_policy_grpclb
   uses:
-  - grpc_transport_chttp2_client_connector
-  - grpc_transport_chttp2
   - grpc_base
   - grpc_client_channel
-- name: grpc_transport_chttp2_client_secure
+  - grpc_lb_upb
+  - grpc_resolver_fake
+  - upb
+- name: grpc_lb_policy_grpclb_secure
+  headers:
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h
   src:
-  - src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
+  plugin: grpc_lb_policy_grpclb
   uses:
-  - grpc_transport_chttp2
   - grpc_base
   - grpc_client_channel
+  - grpc_lb_upb
+  - grpc_resolver_fake
   - grpc_secure
-  - grpc_transport_chttp2_client_connector
-- name: grpc_transport_chttp2_server
-  headers:
-  - src/core/ext/transport/chttp2/server/chttp2_server.h
+  - upb
+- name: grpc_lb_policy_pick_first
   src:
-  - src/core/ext/transport/chttp2/server/chttp2_server.cc
+  - src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc
+  plugin: grpc_lb_policy_pick_first
   uses:
-  - grpc_transport_chttp2
   - grpc_base
-- name: grpc_transport_chttp2_server_insecure
+  - grpc_client_channel
+  - grpc_lb_subchannel_list
+- name: grpc_lb_policy_round_robin
   src:
-  - src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc
-  - src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc
+  - src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
+  plugin: grpc_lb_policy_round_robin
   uses:
-  - grpc_transport_chttp2
   - grpc_base
-  - grpc_transport_chttp2_server
-- name: grpc_transport_chttp2_server_secure
+  - grpc_client_channel
+  - grpc_lb_subchannel_list
+- name: grpc_lb_policy_xds
+  headers:
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds.h
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds_channel.h
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.h
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.h
   src:
-  - src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds.cc
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds_channel.cc
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.cc
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.cc
+  plugin: grpc_lb_policy_xds
   uses:
-  - grpc_transport_chttp2
+  - envoy_ads_upb
   - grpc_base
-  - grpc_secure
-  - grpc_transport_chttp2_server
-- name: grpc_transport_cronet_client_secure
-  public_headers:
-  - include/grpc/grpc_cronet.h
-  - include/grpc/grpc_security.h
-  - include/grpc/grpc_security_constants.h
+  - grpc_client_channel
+  - grpc_resolver_fake
+- name: grpc_lb_policy_xds_secure
   headers:
-  - src/core/ext/transport/cronet/client/secure/cronet_channel_create.h
-  - src/core/ext/transport/cronet/transport/cronet_transport.h
-  - third_party/objective_c/Cronet/bidirectional_stream_c.h
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds.h
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds_channel.h
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.h
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.h
   src:
-  - src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc
-  - src/core/ext/transport/cronet/transport/cronet_api_dummy.cc
-  - src/core/ext/transport/cronet/transport/cronet_transport.cc
-  filegroups:
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds.cc
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_secure.cc
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.cc
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.cc
+  plugin: grpc_lb_policy_xds
+  uses:
+  - envoy_ads_upb
   - grpc_base
-  - grpc_transport_chttp2
-  - grpc_http_filters
-- name: grpc_transport_inproc
+  - grpc_client_channel
+  - grpc_resolver_fake
+  - grpc_secure
+- name: grpc_lb_subchannel_list
+  headers:
+  - src/core/ext/filters/client_channel/lb_policy/subchannel_list.h
+  uses:
+  - grpc_base
+  - grpc_client_channel
+- name: grpc_lb_upb
+  headers:
+  - src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h
   src:
-  - src/core/ext/transport/inproc/inproc_plugin.cc
-  - src/core/ext/transport/inproc/inproc_transport.cc
-  plugin: grpc_inproc_plugin
+  - src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c
+  uses:
+  - google_api_upb
+  - upb
+- name: grpc_max_age_filter
+  headers:
+  - src/core/ext/filters/max_age/max_age_filter.h
+  src:
+  - src/core/ext/filters/max_age/max_age_filter.cc
+  plugin: grpc_max_age_filter
   uses:
-  - grpc_transport_inproc_headers
   - grpc_base
-- name: grpc_transport_inproc_headers
+- name: grpc_message_size_filter
   headers:
-  - src/core/ext/transport/inproc/inproc_transport.h
+  - src/core/ext/filters/message_size/message_size_filter.h
+  src:
+  - src/core/ext/filters/message_size/message_size_filter.cc
+  plugin: grpc_message_size_filter
   uses:
-  - grpc_base_headers
-- name: grpc_workaround_cronet_compression_filter
+  - grpc_base
+- name: grpc_resolver_dns_ares
   headers:
-  - src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h
+  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h
+  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h
   src:
-  - src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc
-  plugin: grpc_workaround_cronet_compression_filter
+  - src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
+  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc
+  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc
+  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
+  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
+  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
+  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc
+  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc
+  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
+  - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
+  plugin: grpc_resolver_dns_ares
   uses:
   - grpc_base
-  - grpc_server_backward_compatibility
-- name: nanopb
+  - grpc_client_channel
+  - grpc_resolver_dns_selection
+- name: grpc_resolver_dns_native
   src:
-  - third_party/nanopb/pb_common.c
-  - third_party/nanopb/pb_decode.c
-  - third_party/nanopb/pb_encode.c
+  - src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
+  plugin: grpc_resolver_dns_native
   uses:
-  - nanopb_headers
-- name: nanopb_headers
-  headers:
-  - third_party/nanopb/pb.h
-  - third_party/nanopb/pb_common.h
-  - third_party/nanopb/pb_decode.h
-  - third_party/nanopb/pb_encode.h
-- name: proto_gen_validate_upb
+  - grpc_base
+  - grpc_client_channel
+  - grpc_resolver_dns_selection
+- name: grpc_resolver_dns_selection
   headers:
-  - src/core/ext/upb-generated/gogoproto/gogo.upb.h
-  - src/core/ext/upb-generated/validate/validate.upb.h
+  - src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.h
   src:
-  - src/core/ext/upb-generated/gogoproto/gogo.upb.c
-  - src/core/ext/upb-generated/validate/validate.upb.c
+  - src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.cc
   uses:
-  - google_api_upb
-- name: transport_security_test_lib
-  build: test
-  headers:
-  - test/core/tsi/transport_security_test_lib.h
-  src:
-  - test/core/tsi/transport_security_test_lib.cc
-  deps:
-  - grpc
-- name: tsi
+  - grpc_base
+- name: grpc_resolver_fake
   headers:
-  - src/core/tsi/fake_transport_security.h
-  - src/core/tsi/local_transport_security.h
-  - src/core/tsi/ssl/session_cache/ssl_session.h
-  - src/core/tsi/ssl/session_cache/ssl_session_cache.h
-  - src/core/tsi/ssl_transport_security.h
-  - src/core/tsi/ssl_types.h
-  - src/core/tsi/transport_security_grpc.h
+  - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h
   src:
-  - src/core/tsi/fake_transport_security.cc
-  - src/core/tsi/local_transport_security.cc
-  - src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc
-  - src/core/tsi/ssl/session_cache/ssl_session_cache.cc
-  - src/core/tsi/ssl/session_cache/ssl_session_openssl.cc
-  - src/core/tsi/ssl_transport_security.cc
-  - src/core/tsi/transport_security_grpc.cc
-  deps:
-  - gpr
-  secure: true
+  - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
+  plugin: grpc_resolver_fake
   uses:
-  - tsi_interface
   - grpc_base
-  - grpc_trace
-  - grpc_shadow_boringssl
-- name: tsi_interface
-  headers:
-  - src/core/tsi/transport_security.h
-  - src/core/tsi/transport_security_interface.h
+  - grpc_client_channel
+- name: grpc_resolver_sockaddr
   src:
-  - src/core/tsi/transport_security.cc
-  deps:
-  - gpr
-  secure: true
+  - src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
+  plugin: grpc_resolver_sockaddr
   uses:
-  - grpc_trace
-- name: grpc++_codegen_base
-  language: c++
+  - grpc_base
+  - grpc_client_channel
+- name: grpc_secure
   public_headers:
-  - include/grpc++/impl/codegen/async_stream.h
-  - include/grpc++/impl/codegen/async_unary_call.h
-  - include/grpc++/impl/codegen/byte_buffer.h
-  - include/grpc++/impl/codegen/call.h
-  - include/grpc++/impl/codegen/call_hook.h
-  - include/grpc++/impl/codegen/channel_interface.h
-  - include/grpc++/impl/codegen/client_context.h
-  - include/grpc++/impl/codegen/client_unary_call.h
-  - include/grpc++/impl/codegen/completion_queue.h
-  - include/grpc++/impl/codegen/completion_queue_tag.h
-  - include/grpc++/impl/codegen/config.h
-  - include/grpc++/impl/codegen/core_codegen_interface.h
-  - include/grpc++/impl/codegen/create_auth_context.h
-  - include/grpc++/impl/codegen/grpc_library.h
-  - include/grpc++/impl/codegen/metadata_map.h
-  - include/grpc++/impl/codegen/method_handler_impl.h
-  - include/grpc++/impl/codegen/rpc_method.h
-  - include/grpc++/impl/codegen/rpc_service_method.h
-  - include/grpc++/impl/codegen/security/auth_context.h
-  - include/grpc++/impl/codegen/serialization_traits.h
-  - include/grpc++/impl/codegen/server_context.h
-  - include/grpc++/impl/codegen/server_interface.h
-  - include/grpc++/impl/codegen/service_type.h
-  - include/grpc++/impl/codegen/slice.h
-  - include/grpc++/impl/codegen/status.h
-  - include/grpc++/impl/codegen/status_code_enum.h
-  - include/grpc++/impl/codegen/string_ref.h
-  - include/grpc++/impl/codegen/stub_options.h
-  - include/grpc++/impl/codegen/sync_stream.h
-  - include/grpc++/impl/codegen/time.h
-  - include/grpcpp/impl/codegen/async_generic_service.h
-  - include/grpcpp/impl/codegen/async_stream.h
-  - include/grpcpp/impl/codegen/async_stream_impl.h
-  - include/grpcpp/impl/codegen/async_unary_call.h
-  - include/grpcpp/impl/codegen/async_unary_call_impl.h
-  - include/grpcpp/impl/codegen/byte_buffer.h
-  - include/grpcpp/impl/codegen/call.h
-  - include/grpcpp/impl/codegen/call_hook.h
-  - include/grpcpp/impl/codegen/call_op_set.h
-  - include/grpcpp/impl/codegen/call_op_set_interface.h
-  - include/grpcpp/impl/codegen/callback_common.h
-  - include/grpcpp/impl/codegen/channel_interface.h
-  - include/grpcpp/impl/codegen/client_callback.h
-  - include/grpcpp/impl/codegen/client_callback_impl.h
-  - include/grpcpp/impl/codegen/client_context.h
-  - include/grpcpp/impl/codegen/client_context_impl.h
-  - include/grpcpp/impl/codegen/client_interceptor.h
-  - include/grpcpp/impl/codegen/client_unary_call.h
-  - include/grpcpp/impl/codegen/completion_queue.h
-  - include/grpcpp/impl/codegen/completion_queue_impl.h
-  - include/grpcpp/impl/codegen/completion_queue_tag.h
-  - include/grpcpp/impl/codegen/config.h
-  - include/grpcpp/impl/codegen/core_codegen_interface.h
-  - include/grpcpp/impl/codegen/create_auth_context.h
-  - include/grpcpp/impl/codegen/delegating_channel.h
-  - include/grpcpp/impl/codegen/grpc_library.h
-  - include/grpcpp/impl/codegen/intercepted_channel.h
-  - include/grpcpp/impl/codegen/interceptor.h
-  - include/grpcpp/impl/codegen/interceptor_common.h
-  - include/grpcpp/impl/codegen/message_allocator.h
-  - include/grpcpp/impl/codegen/metadata_map.h
-  - include/grpcpp/impl/codegen/method_handler_impl.h
-  - include/grpcpp/impl/codegen/rpc_method.h
-  - include/grpcpp/impl/codegen/rpc_service_method.h
-  - include/grpcpp/impl/codegen/security/auth_context.h
-  - include/grpcpp/impl/codegen/serialization_traits.h
-  - include/grpcpp/impl/codegen/server_callback.h
-  - include/grpcpp/impl/codegen/server_callback_impl.h
-  - include/grpcpp/impl/codegen/server_context.h
-  - include/grpcpp/impl/codegen/server_context_impl.h
-  - include/grpcpp/impl/codegen/server_interceptor.h
-  - include/grpcpp/impl/codegen/server_interface.h
-  - include/grpcpp/impl/codegen/service_type.h
-  - include/grpcpp/impl/codegen/slice.h
-  - include/grpcpp/impl/codegen/status.h
-  - include/grpcpp/impl/codegen/status_code_enum.h
-  - include/grpcpp/impl/codegen/string_ref.h
-  - include/grpcpp/impl/codegen/stub_options.h
-  - include/grpcpp/impl/codegen/sync_stream.h
-  - include/grpcpp/impl/codegen/sync_stream_impl.h
-  - include/grpcpp/impl/codegen/time.h
+  - include/grpc/grpc_security.h
+  headers:
+  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds.h
+  - src/core/lib/security/context/security_context.h
+  - src/core/lib/security/credentials/alts/alts_credentials.h
+  - src/core/lib/security/credentials/composite/composite_credentials.h
+  - src/core/lib/security/credentials/credentials.h
+  - src/core/lib/security/credentials/fake/fake_credentials.h
+  - src/core/lib/security/credentials/google_default/google_default_credentials.h
+  - src/core/lib/security/credentials/iam/iam_credentials.h
+  - src/core/lib/security/credentials/jwt/json_token.h
+  - src/core/lib/security/credentials/jwt/jwt_credentials.h
+  - src/core/lib/security/credentials/jwt/jwt_verifier.h
+  - src/core/lib/security/credentials/local/local_credentials.h
+  - src/core/lib/security/credentials/oauth2/oauth2_credentials.h
+  - src/core/lib/security/credentials/plugin/plugin_credentials.h
+  - src/core/lib/security/credentials/ssl/ssl_credentials.h
+  - src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h
+  - src/core/lib/security/credentials/tls/spiffe_credentials.h
+  - src/core/lib/security/security_connector/alts/alts_security_connector.h
+  - src/core/lib/security/security_connector/fake/fake_security_connector.h
+  - src/core/lib/security/security_connector/load_system_roots.h
+  - src/core/lib/security/security_connector/load_system_roots_linux.h
+  - src/core/lib/security/security_connector/local/local_security_connector.h
+  - src/core/lib/security/security_connector/security_connector.h
+  - src/core/lib/security/security_connector/ssl/ssl_security_connector.h
+  - src/core/lib/security/security_connector/ssl_utils.h
+  - src/core/lib/security/security_connector/tls/spiffe_security_connector.h
+  - src/core/lib/security/transport/auth_filters.h
+  - src/core/lib/security/transport/secure_endpoint.h
+  - src/core/lib/security/transport/security_handshaker.h
+  - src/core/lib/security/transport/target_authority_table.h
+  - src/core/lib/security/transport/tsi_error.h
+  - src/core/lib/security/util/json_util.h
+  src:
+  - src/core/lib/http/httpcli_security_connector.cc
+  - src/core/lib/security/context/security_context.cc
+  - src/core/lib/security/credentials/alts/alts_credentials.cc
+  - src/core/lib/security/credentials/composite/composite_credentials.cc
+  - src/core/lib/security/credentials/credentials.cc
+  - src/core/lib/security/credentials/credentials_metadata.cc
+  - src/core/lib/security/credentials/fake/fake_credentials.cc
+  - src/core/lib/security/credentials/google_default/credentials_generic.cc
+  - src/core/lib/security/credentials/google_default/google_default_credentials.cc
+  - src/core/lib/security/credentials/iam/iam_credentials.cc
+  - src/core/lib/security/credentials/jwt/json_token.cc
+  - src/core/lib/security/credentials/jwt/jwt_credentials.cc
+  - src/core/lib/security/credentials/jwt/jwt_verifier.cc
+  - src/core/lib/security/credentials/local/local_credentials.cc
+  - src/core/lib/security/credentials/oauth2/oauth2_credentials.cc
+  - src/core/lib/security/credentials/plugin/plugin_credentials.cc
+  - src/core/lib/security/credentials/ssl/ssl_credentials.cc
+  - src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc
+  - src/core/lib/security/credentials/tls/spiffe_credentials.cc
+  - src/core/lib/security/security_connector/alts/alts_security_connector.cc
+  - src/core/lib/security/security_connector/fake/fake_security_connector.cc
+  - src/core/lib/security/security_connector/load_system_roots_fallback.cc
+  - src/core/lib/security/security_connector/load_system_roots_linux.cc
+  - src/core/lib/security/security_connector/local/local_security_connector.cc
+  - src/core/lib/security/security_connector/security_connector.cc
+  - src/core/lib/security/security_connector/ssl/ssl_security_connector.cc
+  - src/core/lib/security/security_connector/ssl_utils.cc
+  - src/core/lib/security/security_connector/tls/spiffe_security_connector.cc
+  - src/core/lib/security/transport/client_auth_filter.cc
+  - src/core/lib/security/transport/secure_endpoint.cc
+  - src/core/lib/security/transport/security_handshaker.cc
+  - src/core/lib/security/transport/server_auth_filter.cc
+  - src/core/lib/security/transport/target_authority_table.cc
+  - src/core/lib/security/transport/tsi_error.cc
+  - src/core/lib/security/util/json_util.cc
+  - src/core/lib/surface/init_secure.cc
   uses:
-  - grpc_codegen
-  - grpc++_internal_hdrs_only
-- name: grpc++_codegen_base_src
-  language: c++
+  - alts_tsi
+  - grpc_base
+  - grpc_transport_chttp2_alpn
+  - tsi
+  - grpc_shadow_boringssl
+- name: grpc_server_backward_compatibility
+  headers:
+  - src/core/ext/filters/workarounds/workaround_utils.h
   src:
-  - src/cpp/codegen/codegen_init.cc
+  - src/core/ext/filters/workarounds/workaround_utils.cc
   uses:
-  - grpc++_codegen_base
-- name: grpc++_codegen_proto
-  language: c++
-  public_headers:
-  - include/grpc++/impl/codegen/proto_utils.h
-  - include/grpcpp/impl/codegen/proto_buffer_reader.h
-  - include/grpcpp/impl/codegen/proto_buffer_writer.h
-  - include/grpcpp/impl/codegen/proto_utils.h
+  - grpc_base
+- name: grpc_shadow_boringssl
+  headers:
+  - src/core/tsi/grpc_shadow_boringssl.h
+- name: grpc_test_util_base
+  headers:
+  - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h
+  - test/core/end2end/cq_verifier.h
+  - test/core/end2end/fixtures/http_proxy_fixture.h
+  - test/core/end2end/fixtures/local_util.h
+  - test/core/end2end/fixtures/proxy.h
+  - test/core/iomgr/endpoint_tests.h
+  - test/core/util/debugger_macros.h
+  - test/core/util/fuzzer_util.h
+  - test/core/util/grpc_profiler.h
+  - test/core/util/histogram.h
+  - test/core/util/memory_counters.h
+  - test/core/util/mock_endpoint.h
+  - test/core/util/parse_hexstring.h
+  - test/core/util/passthru_endpoint.h
+  - test/core/util/port.h
+  - test/core/util/port_server_client.h
+  - test/core/util/slice_splitter.h
+  - test/core/util/subprocess.h
+  - test/core/util/test_config.h
+  - test/core/util/test_lb_policies.h
+  - test/core/util/tracer_util.h
+  - test/core/util/trickle_endpoint.h
+  src:
+  - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
+  - test/core/end2end/cq_verifier.cc
+  - test/core/end2end/fixtures/http_proxy_fixture.cc
+  - test/core/end2end/fixtures/local_util.cc
+  - test/core/end2end/fixtures/proxy.cc
+  - test/core/iomgr/endpoint_tests.cc
+  - test/core/util/debugger_macros.cc
+  - test/core/util/fuzzer_util.cc
+  - test/core/util/grpc_profiler.cc
+  - test/core/util/histogram.cc
+  - test/core/util/memory_counters.cc
+  - test/core/util/mock_endpoint.cc
+  - test/core/util/parse_hexstring.cc
+  - test/core/util/passthru_endpoint.cc
+  - test/core/util/port.cc
+  - test/core/util/port_isolated_runtime_environment.cc
+  - test/core/util/port_server_client.cc
+  - test/core/util/slice_splitter.cc
+  - test/core/util/subprocess_posix.cc
+  - test/core/util/subprocess_windows.cc
+  - test/core/util/test_config.cc
+  - test/core/util/test_lb_policies.cc
+  - test/core/util/tracer_util.cc
+  - test/core/util/trickle_endpoint.cc
+  deps:
+  - gpr
   uses:
-  - grpc++_codegen_base
-  - grpc++_config_proto
-- name: grpc++_common
-  language: c++
-  public_headers:
-  - include/grpc++/alarm.h
-  - include/grpc++/channel.h
-  - include/grpc++/client_context.h
-  - include/grpc++/completion_queue.h
-  - include/grpc++/create_channel.h
-  - include/grpc++/create_channel_posix.h
-  - include/grpc++/ext/health_check_service_server_builder_option.h
-  - include/grpc++/generic/async_generic_service.h
-  - include/grpc++/generic/generic_stub.h
-  - include/grpc++/grpc++.h
-  - include/grpc++/health_check_service_interface.h
-  - include/grpc++/impl/call.h
-  - include/grpc++/impl/channel_argument_option.h
-  - include/grpc++/impl/client_unary_call.h
-  - include/grpc++/impl/codegen/core_codegen.h
-  - include/grpc++/impl/grpc_library.h
-  - include/grpc++/impl/method_handler_impl.h
-  - include/grpc++/impl/rpc_method.h
-  - include/grpc++/impl/rpc_service_method.h
-  - include/grpc++/impl/serialization_traits.h
-  - include/grpc++/impl/server_builder_option.h
-  - include/grpc++/impl/server_builder_plugin.h
-  - include/grpc++/impl/server_initializer.h
-  - include/grpc++/impl/service_type.h
-  - include/grpc++/resource_quota.h
-  - include/grpc++/security/auth_context.h
-  - include/grpc++/security/auth_metadata_processor.h
-  - include/grpc++/security/credentials.h
-  - include/grpc++/security/server_credentials.h
-  - include/grpc++/server.h
-  - include/grpc++/server_builder.h
-  - include/grpc++/server_context.h
-  - include/grpc++/server_posix.h
-  - include/grpc++/support/async_stream.h
-  - include/grpc++/support/async_unary_call.h
-  - include/grpc++/support/byte_buffer.h
-  - include/grpc++/support/channel_arguments.h
-  - include/grpc++/support/config.h
-  - include/grpc++/support/slice.h
-  - include/grpc++/support/status.h
-  - include/grpc++/support/status_code_enum.h
-  - include/grpc++/support/string_ref.h
-  - include/grpc++/support/stub_options.h
-  - include/grpc++/support/sync_stream.h
-  - include/grpc++/support/time.h
-  - include/grpcpp/alarm.h
-  - include/grpcpp/alarm_impl.h
-  - include/grpcpp/channel.h
-  - include/grpcpp/channel_impl.h
-  - include/grpcpp/client_context.h
-  - include/grpcpp/completion_queue.h
-  - include/grpcpp/completion_queue_impl.h
-  - include/grpcpp/create_channel.h
-  - include/grpcpp/create_channel_impl.h
-  - include/grpcpp/create_channel_posix.h
-  - include/grpcpp/create_channel_posix_impl.h
-  - include/grpcpp/ext/health_check_service_server_builder_option.h
-  - include/grpcpp/generic/async_generic_service.h
-  - include/grpcpp/generic/generic_stub.h
-  - include/grpcpp/generic/generic_stub_impl.h
-  - include/grpcpp/grpcpp.h
-  - include/grpcpp/health_check_service_interface.h
-  - include/grpcpp/health_check_service_interface_impl.h
-  - include/grpcpp/impl/call.h
-  - include/grpcpp/impl/channel_argument_option.h
-  - include/grpcpp/impl/client_unary_call.h
-  - include/grpcpp/impl/codegen/core_codegen.h
-  - include/grpcpp/impl/grpc_library.h
-  - include/grpcpp/impl/method_handler_impl.h
-  - include/grpcpp/impl/rpc_method.h
-  - include/grpcpp/impl/rpc_service_method.h
-  - include/grpcpp/impl/serialization_traits.h
-  - include/grpcpp/impl/server_builder_option.h
-  - include/grpcpp/impl/server_builder_option_impl.h
-  - include/grpcpp/impl/server_builder_plugin.h
-  - include/grpcpp/impl/server_initializer.h
-  - include/grpcpp/impl/server_initializer_impl.h
-  - include/grpcpp/impl/service_type.h
-  - include/grpcpp/resource_quota.h
-  - include/grpcpp/resource_quota_impl.h
-  - include/grpcpp/security/auth_context.h
-  - include/grpcpp/security/auth_metadata_processor.h
-  - include/grpcpp/security/auth_metadata_processor_impl.h
-  - include/grpcpp/security/credentials.h
-  - include/grpcpp/security/credentials_impl.h
-  - include/grpcpp/security/server_credentials.h
-  - include/grpcpp/security/server_credentials_impl.h
-  - include/grpcpp/server.h
-  - include/grpcpp/server_builder.h
-  - include/grpcpp/server_builder_impl.h
-  - include/grpcpp/server_context.h
-  - include/grpcpp/server_impl.h
-  - include/grpcpp/server_posix.h
-  - include/grpcpp/server_posix_impl.h
-  - include/grpcpp/support/async_stream.h
-  - include/grpcpp/support/async_stream_impl.h
-  - include/grpcpp/support/async_unary_call.h
-  - include/grpcpp/support/async_unary_call_impl.h
-  - include/grpcpp/support/byte_buffer.h
-  - include/grpcpp/support/channel_arguments.h
-  - include/grpcpp/support/channel_arguments_impl.h
-  - include/grpcpp/support/client_callback.h
-  - include/grpcpp/support/client_callback_impl.h
-  - include/grpcpp/support/client_interceptor.h
-  - include/grpcpp/support/config.h
-  - include/grpcpp/support/interceptor.h
-  - include/grpcpp/support/message_allocator.h
-  - include/grpcpp/support/proto_buffer_reader.h
-  - include/grpcpp/support/proto_buffer_writer.h
-  - include/grpcpp/support/server_callback.h
-  - include/grpcpp/support/server_callback_impl.h
-  - include/grpcpp/support/server_interceptor.h
-  - include/grpcpp/support/slice.h
-  - include/grpcpp/support/status.h
-  - include/grpcpp/support/status_code_enum.h
-  - include/grpcpp/support/string_ref.h
-  - include/grpcpp/support/stub_options.h
-  - 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
+  - cmdline
+  - grpc_base
+  - grpc_client_channel
+  - grpc_transport_chttp2
+- name: grpc_trace
+  src:
+  - src/core/lib/debug/trace.cc
+  deps:
+  - gpr
+- name: grpc_trace_headers
+  headers:
+  - src/core/lib/debug/trace.h
+  deps:
+  - gpr
+- name: grpc_transport_chttp2
+  headers:
+  - src/core/ext/transport/chttp2/transport/bin_decoder.h
+  - src/core/ext/transport/chttp2/transport/bin_encoder.h
+  - src/core/ext/transport/chttp2/transport/chttp2_transport.h
+  - src/core/ext/transport/chttp2/transport/context_list.h
+  - src/core/ext/transport/chttp2/transport/flow_control.h
+  - src/core/ext/transport/chttp2/transport/frame.h
+  - src/core/ext/transport/chttp2/transport/frame_data.h
+  - src/core/ext/transport/chttp2/transport/frame_goaway.h
+  - src/core/ext/transport/chttp2/transport/frame_ping.h
+  - src/core/ext/transport/chttp2/transport/frame_rst_stream.h
+  - src/core/ext/transport/chttp2/transport/frame_settings.h
+  - src/core/ext/transport/chttp2/transport/frame_window_update.h
+  - src/core/ext/transport/chttp2/transport/hpack_encoder.h
+  - src/core/ext/transport/chttp2/transport/hpack_parser.h
+  - src/core/ext/transport/chttp2/transport/hpack_table.h
+  - src/core/ext/transport/chttp2/transport/http2_settings.h
+  - src/core/ext/transport/chttp2/transport/huffsyms.h
+  - src/core/ext/transport/chttp2/transport/incoming_metadata.h
+  - src/core/ext/transport/chttp2/transport/internal.h
+  - src/core/ext/transport/chttp2/transport/stream_map.h
+  - src/core/ext/transport/chttp2/transport/varint.h
+  src:
+  - src/core/ext/transport/chttp2/transport/bin_decoder.cc
+  - src/core/ext/transport/chttp2/transport/bin_encoder.cc
+  - src/core/ext/transport/chttp2/transport/chttp2_plugin.cc
+  - src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+  - src/core/ext/transport/chttp2/transport/context_list.cc
+  - src/core/ext/transport/chttp2/transport/flow_control.cc
+  - src/core/ext/transport/chttp2/transport/frame_data.cc
+  - src/core/ext/transport/chttp2/transport/frame_goaway.cc
+  - src/core/ext/transport/chttp2/transport/frame_ping.cc
+  - src/core/ext/transport/chttp2/transport/frame_rst_stream.cc
+  - src/core/ext/transport/chttp2/transport/frame_settings.cc
+  - src/core/ext/transport/chttp2/transport/frame_window_update.cc
+  - src/core/ext/transport/chttp2/transport/hpack_encoder.cc
+  - src/core/ext/transport/chttp2/transport/hpack_parser.cc
+  - src/core/ext/transport/chttp2/transport/hpack_table.cc
+  - src/core/ext/transport/chttp2/transport/http2_settings.cc
+  - src/core/ext/transport/chttp2/transport/huffsyms.cc
+  - src/core/ext/transport/chttp2/transport/incoming_metadata.cc
+  - src/core/ext/transport/chttp2/transport/parsing.cc
+  - src/core/ext/transport/chttp2/transport/stream_lists.cc
+  - src/core/ext/transport/chttp2/transport/stream_map.cc
+  - src/core/ext/transport/chttp2/transport/varint.cc
+  - src/core/ext/transport/chttp2/transport/writing.cc
+  plugin: grpc_chttp2_plugin
+  uses:
+  - grpc_base
+  - grpc_transport_chttp2_alpn
+  - grpc_http_filters
+- name: grpc_transport_chttp2_alpn
   headers:
-  - src/cpp/client/create_channel_internal.h
-  - src/cpp/common/channel_filter.h
-  - src/cpp/server/dynamic_thread_pool.h
-  - src/cpp/server/external_connection_acceptor_impl.h
-  - src/cpp/server/health/default_health_check_service.h
-  - src/cpp/server/thread_pool_interface.h
-  - src/cpp/thread_manager/thread_manager.h
+  - src/core/ext/transport/chttp2/alpn/alpn.h
   src:
-  - src/cpp/client/channel_cc.cc
-  - src/cpp/client/client_context.cc
-  - src/cpp/client/client_interceptor.cc
-  - src/cpp/client/create_channel.cc
-  - src/cpp/client/create_channel_internal.cc
-  - src/cpp/client/create_channel_posix.cc
-  - src/cpp/client/credentials_cc.cc
-  - src/cpp/client/generic_stub.cc
-  - src/cpp/common/alarm.cc
-  - src/cpp/common/channel_arguments.cc
-  - src/cpp/common/channel_filter.cc
-  - src/cpp/common/completion_queue_cc.cc
-  - src/cpp/common/core_codegen.cc
-  - src/cpp/common/resource_quota_cc.cc
-  - src/cpp/common/rpc_method.cc
-  - src/cpp/common/validate_service_config.cc
-  - src/cpp/common/version_cc.cc
-  - src/cpp/server/async_generic_service.cc
-  - src/cpp/server/channel_argument_option.cc
-  - src/cpp/server/create_default_thread_pool.cc
-  - src/cpp/server/dynamic_thread_pool.cc
-  - src/cpp/server/external_connection_acceptor_impl.cc
-  - src/cpp/server/health/default_health_check_service.cc
-  - src/cpp/server/health/health_check_service.cc
-  - src/cpp/server/health/health_check_service_server_builder_option.cc
-  - src/cpp/server/server_builder.cc
-  - src/cpp/server/server_cc.cc
-  - src/cpp/server/server_context.cc
-  - src/cpp/server/server_credentials.cc
-  - src/cpp/server/server_posix.cc
-  - src/cpp/thread_manager/thread_manager.cc
-  - src/cpp/util/byte_buffer_cc.cc
-  - src/cpp/util/status.cc
-  - src/cpp/util/string_ref.cc
-  - src/cpp/util/time_cc.cc
+  - src/core/ext/transport/chttp2/alpn/alpn.cc
+  deps:
+  - gpr
+- name: grpc_transport_chttp2_client_connector
+  headers:
+  - src/core/ext/transport/chttp2/client/authority.h
+  - src/core/ext/transport/chttp2/client/chttp2_connector.h
+  src:
+  - src/core/ext/transport/chttp2/client/authority.cc
+  - src/core/ext/transport/chttp2/client/chttp2_connector.cc
+  uses:
+  - grpc_transport_chttp2
+  - grpc_base
+  - grpc_client_channel
+- name: grpc_transport_chttp2_client_insecure
+  src:
+  - src/core/ext/transport/chttp2/client/insecure/channel_create.cc
+  - src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc
+  uses:
+  - grpc_transport_chttp2_client_connector
+  - grpc_transport_chttp2
+  - grpc_base
+  - grpc_client_channel
+- name: grpc_transport_chttp2_client_secure
+  src:
+  - src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc
+  uses:
+  - grpc_transport_chttp2
+  - grpc_base
+  - grpc_client_channel
+  - grpc_secure
+  - grpc_transport_chttp2_client_connector
+- name: grpc_transport_chttp2_server
+  headers:
+  - src/core/ext/transport/chttp2/server/chttp2_server.h
+  src:
+  - src/core/ext/transport/chttp2/server/chttp2_server.cc
+  uses:
+  - grpc_transport_chttp2
+  - grpc_base
+- name: grpc_transport_chttp2_server_insecure
+  src:
+  - src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc
+  - src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc
+  uses:
+  - grpc_transport_chttp2
+  - grpc_base
+  - grpc_transport_chttp2_server
+- name: grpc_transport_chttp2_server_secure
+  src:
+  - src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc
+  uses:
+  - grpc_transport_chttp2
+  - grpc_base
+  - grpc_secure
+  - grpc_transport_chttp2_server
+- name: grpc_transport_cronet_client_secure
+  public_headers:
+  - include/grpc/grpc_cronet.h
+  - include/grpc/grpc_security.h
+  - include/grpc/grpc_security_constants.h
+  headers:
+  - src/core/ext/transport/cronet/client/secure/cronet_channel_create.h
+  - src/core/ext/transport/cronet/transport/cronet_transport.h
+  - third_party/objective_c/Cronet/bidirectional_stream_c.h
+  src:
+  - src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc
+  - src/core/ext/transport/cronet/transport/cronet_api_dummy.cc
+  - src/core/ext/transport/cronet/transport/cronet_transport.cc
+- name: grpc_transport_inproc
+  src:
+  - src/core/ext/transport/inproc/inproc_plugin.cc
+  - src/core/ext/transport/inproc/inproc_transport.cc
+  plugin: grpc_inproc_plugin
   uses:
-  - gpr_base_headers
-  - grpc_base_headers
-  - grpc_health_upb
   - grpc_transport_inproc_headers
-  - grpc++_codegen_base
-  - grpc++_internal_hdrs_only
+  - grpc_base
+- name: grpc_transport_inproc_headers
+  headers:
+  - src/core/ext/transport/inproc/inproc_transport.h
+  uses:
+  - grpc_base_headers
+- name: grpc_workaround_cronet_compression_filter
+  headers:
+  - src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h
+  src:
+  - src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc
+  plugin: grpc_workaround_cronet_compression_filter
+  uses:
+  - grpc_base
+  - grpc_server_backward_compatibility
+- name: grpcpp_channelz_proto
+  src:
+  - src/proto/grpc/channelz/channelz.proto
+- name: nanopb
+  src:
+  - third_party/nanopb/pb_common.c
+  - third_party/nanopb/pb_decode.c
+  - third_party/nanopb/pb_encode.c
+  uses:
   - nanopb_headers
-- name: grpc++_config_proto
-  language: c++
-  public_headers:
-  - include/grpc++/impl/codegen/config_protobuf.h
-  - include/grpcpp/impl/codegen/config_protobuf.h
-- name: grpc++_internal_hdrs_only
-  language: c++
-  public_headers:
-  - include/grpcpp/impl/codegen/sync.h
-- name: grpc++_reflection_proto
-  language: c++
+- name: nanopb_headers
+  headers:
+  - third_party/nanopb/pb.h
+  - third_party/nanopb/pb_common.h
+  - third_party/nanopb/pb_decode.h
+  - third_party/nanopb/pb_encode.h
+- name: proto_gen_validate_upb
+  headers:
+  - src/core/ext/upb-generated/gogoproto/gogo.upb.h
+  - src/core/ext/upb-generated/validate/validate.upb.h
   src:
-  - src/proto/grpc/reflection/v1alpha/reflection.proto
-- name: grpc++_test
-  language: c++
-  public_headers:
-  - include/grpc++/test/mock_stream.h
-  - include/grpc++/test/server_context_test_spouse.h
-  - include/grpcpp/test/mock_stream.h
-  - include/grpcpp/test/server_context_test_spouse.h
+  - src/core/ext/upb-generated/gogoproto/gogo.upb.c
+  - src/core/ext/upb-generated/validate/validate.upb.c
+  uses:
+  - google_api_upb
+- name: transport_security_test_lib
+  headers:
+  - test/core/tsi/transport_security_test_lib.h
+  src:
+  - test/core/tsi/transport_security_test_lib.cc
   deps:
-  - grpc++
   - grpc
-- name: grpcpp_channelz_proto
-  language: c++
+- name: tsi
+  headers:
+  - src/core/tsi/fake_transport_security.h
+  - src/core/tsi/local_transport_security.h
+  - src/core/tsi/ssl/session_cache/ssl_session.h
+  - src/core/tsi/ssl/session_cache/ssl_session_cache.h
+  - src/core/tsi/ssl_transport_security.h
+  - src/core/tsi/ssl_types.h
+  - src/core/tsi/transport_security_grpc.h
   src:
-  - src/proto/grpc/channelz/channelz.proto
+  - src/core/tsi/fake_transport_security.cc
+  - src/core/tsi/local_transport_security.cc
+  - src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc
+  - src/core/tsi/ssl/session_cache/ssl_session_cache.cc
+  - src/core/tsi/ssl/session_cache/ssl_session_openssl.cc
+  - src/core/tsi/ssl_transport_security.cc
+  - src/core/tsi/transport_security_grpc.cc
+  deps:
+  - gpr
+  uses:
+  - tsi_interface
+  - grpc_base
+  - grpc_trace
+  - grpc_shadow_boringssl
+- name: tsi_interface
+  headers:
+  - src/core/tsi/transport_security.h
+  - src/core/tsi/transport_security_interface.h
+  src:
+  - src/core/tsi/transport_security.cc
+  deps:
+  - gpr
+  uses:
+  - grpc_trace
 libs:
 - name: address_sorting
   build: all
@@ -4608,8 +4585,6 @@ targets:
   - gpr
   filegroups:
   - grpcpp_channelz_proto
-  uses:
-  - grpc++_test
 - name: channelz_registry_test
   gtest: true
   build: test
@@ -4622,8 +4597,6 @@ targets:
   - grpc++
   - grpc
   - gpr
-  uses:
-  - grpc++_test
   uses_polling: false
 - name: channelz_service_test
   gtest: true
@@ -4654,8 +4627,6 @@ targets:
   - gpr
   filegroups:
   - grpcpp_channelz_proto
-  uses:
-  - grpc++_test
 - name: check_gcp_environment_linux_test
   build: test
   language: c++
@@ -5054,8 +5025,6 @@ targets:
   - grpc++
   - grpc
   - gpr
-  uses:
-  - grpc++_test
   uses_polling: false
 - name: grpc_cpp_plugin
   build: protoc
@@ -5146,8 +5115,6 @@ targets:
   - grpc++
   - grpc
   - gpr
-  uses:
-  - grpc++_test
 - name: grpc_tool_test
   gtest: true
   build: test
@@ -5222,8 +5189,6 @@ targets:
   - grpc++
   - grpc
   - gpr
-  uses:
-  - grpc++_test
 - name: h2_ssl_session_reuse_test
   gtest: true
   build: test
@@ -5237,8 +5202,6 @@ targets:
   - grpc++
   - grpc
   - gpr
-  uses:
-  - grpc++_test
 - name: health_service_end2end_test
   gtest: true
   build: test
@@ -5290,8 +5253,6 @@ targets:
   - grpc++
   - grpc
   - gpr
-  uses:
-  - grpc++_test
 - name: inproc_sync_unary_ping_pong_test
   build: test
   language: c++
@@ -5390,8 +5351,6 @@ targets:
   - grpc++
   - grpc
   - gpr
-  uses:
-  - grpc++_test
   uses_polling: false
 - name: message_allocator_end2end_test
   gtest: true
@@ -5466,8 +5425,6 @@ targets:
   - grpc++
   - grpc
   - gpr
-  uses:
-  - grpc++_test
 - name: orphanable_test
   gtest: true
   build: test
@@ -5479,8 +5436,6 @@ targets:
   - grpc++
   - grpc
   - gpr
-  uses:
-  - grpc++_test
 - name: port_sharing_end2end_test
   gtest: true
   build: test
@@ -5649,8 +5604,6 @@ targets:
   - grpc++
   - grpc
   - gpr
-  uses:
-  - grpc++_test
 - name: ref_counted_test
   gtest: true
   build: test
@@ -5662,8 +5615,6 @@ targets:
   - grpc++
   - grpc
   - gpr
-  uses:
-  - grpc++_test
 - name: retry_throttle_test
   gtest: true
   build: test
@@ -5758,8 +5709,6 @@ targets:
   - grpc++
   - grpc
   - gpr
-  uses:
-  - grpc++_test
 - name: server_crash_test
   gtest: true
   cpu_cost: 0.1
@@ -5855,8 +5804,6 @@ targets:
   - grpc++
   - grpc
   - gpr
-  uses:
-  - grpc++_test
 - name: shutdown_test
   gtest: true
   build: test
@@ -5978,8 +5925,6 @@ targets:
   - grpc++
   - grpc
   - gpr
-  uses:
-  - grpc++_test
 - name: thread_manager_test
   build: test
   language: c++
diff --git a/src/benchmark/gen_build_yaml.py b/src/benchmark/gen_build_yaml.py
index 4d9391a91f5..a1f777d6c2b 100755
--- a/src/benchmark/gen_build_yaml.py
+++ b/src/benchmark/gen_build_yaml.py
@@ -27,7 +27,7 @@ out['libs'] = [{
     'name': 'benchmark',
     'build': 'private',
     'language': 'c++',
-    'secure': 'no',
+    'secure': False,
     'defaults': 'benchmark',
     'src': sorted(glob.glob('third_party/benchmark/src/*.cc')),
     'headers': sorted(
diff --git a/src/boringssl/gen_build_yaml.py b/src/boringssl/gen_build_yaml.py
index c25a4ed3c94..145cc67b0d1 100755
--- a/src/boringssl/gen_build_yaml.py
+++ b/src/boringssl/gen_build_yaml.py
@@ -61,7 +61,7 @@ class Grpc(object):
             'name': 'boringssl',
             'build': 'private',
             'language': 'c',
-            'secure': 'no',
+            'secure': False,
             'src': sorted(
               map_dir(f)
               for f in files['ssl'] + files['crypto']
@@ -79,7 +79,7 @@ class Grpc(object):
             'name': 'boringssl_test_util',
             'build': 'private',
             'language': 'c++',
-            'secure': 'no',
+            'secure': False,
             'boringssl': True,
             'defaults': 'boringssl',
             'src': [
@@ -93,7 +93,7 @@ class Grpc(object):
             'name': 'boringssl_%s' % test,
             'build': 'test',
             'run': False,
-            'secure': 'no',
+            'secure': False,
             'language': 'c++',
             'src': sorted(map_dir(f) for f in files[test]),
             'vs_proj_dir': 'test/boringssl',
diff --git a/src/c-ares/gen_build_yaml.py b/src/c-ares/gen_build_yaml.py
index 6e832edcea3..fe2ecb462c3 100755
--- a/src/c-ares/gen_build_yaml.py
+++ b/src/c-ares/gen_build_yaml.py
@@ -53,7 +53,7 @@ try:
       'defaults': 'ares',
       'build': 'private',
       'language': 'c',
-      'secure': 'no',
+      'secure': False,
       'src': [
         "third_party/cares/cares/ares__close_sockets.c",
         "third_party/cares/cares/ares__get_hostent.c",
diff --git a/src/objective-c/tests/run_one_test_bazel.sh b/src/objective-c/tests/run_one_test_bazel.sh
index 8f920d955fd..09da7bfbd59 100755
--- a/src/objective-c/tests/run_one_test_bazel.sh
+++ b/src/objective-c/tests/run_one_test_bazel.sh
@@ -48,4 +48,4 @@ $INTEROP --port=$TLS_PORT --max_send_message_size=8388608 --use_tls &
 
 trap 'kill -9 `jobs -p` ; echo "EXIT TIME:  $(date)"' EXIT
 
-../../../tools/bazel run $SCHEME
\ No newline at end of file
+../../../tools/bazel run $SCHEME
diff --git a/src/zlib/gen_build_yaml.py b/src/zlib/gen_build_yaml.py
index d0912b9cb62..ee347e0b1f3 100755
--- a/src/zlib/gen_build_yaml.py
+++ b/src/zlib/gen_build_yaml.py
@@ -42,7 +42,7 @@ try:
       'defaults': 'zlib',
       'build': 'private',
       'language': 'c',
-      'secure': 'no',
+      'secure': False,
       'src': sorted(cmvar('ZLIB_SRCS')),
       'headers': sorted(cmvar('ZLIB_PUBLIC_HDRS') + cmvar('ZLIB_PRIVATE_HDRS')),
   }]
diff --git a/test/core/bad_client/gen_build_yaml.py b/test/core/bad_client/gen_build_yaml.py
index e390db90e15..3224dfe3877 100755
--- a/test/core/bad_client/gen_build_yaml.py
+++ b/test/core/bad_client/gen_build_yaml.py
@@ -68,7 +68,7 @@ def main():
               'cpu_cost': BAD_CLIENT_TESTS[t].cpu_cost,
               'build': 'test',
               'language': 'c++',
-              'secure': 'no',
+              'secure': False,
               'src': ['test/core/bad_client/tests/%s.cc' % t],
               'vs_proj_dir': 'test',
               'exclude_iomgrs': ['uv'],
diff --git a/tools/buildgen/plugins/check_attrs.py b/tools/buildgen/plugins/check_attrs.py
new file mode 100644
index 00000000000..0730f8a1bbb
--- /dev/null
+++ b/tools/buildgen/plugins/check_attrs.py
@@ -0,0 +1,126 @@
+# Copyright 2019 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Buildgen attribute validation plugin."""
+
+
+def anything():
+    return lambda v: None
+
+
+def one_of(values):
+    return lambda v: ('{0} is not in [{1}]'.format(v, values) if v not in values else None)
+
+
+def subset_of(values):
+    return lambda v: ('{0} is not subset of [{1}]'.format(v, values)
+                      if not all(e in values for e in v) else None)
+
+
+VALID_ATTRIBUTE_KEYS_MAP = {
+    'filegroup': {
+        'deps': anything(),
+        'headers': anything(),
+        'plugin': anything(),
+        'public_headers': anything(),
+        'src': anything(),
+        'uses': anything(),
+    },
+    'lib': {
+        'baselib': anything(),
+        'boringssl': one_of((True,)),
+        'build_system': anything(),
+        'build': anything(),
+        'defaults': anything(),
+        'deps_linkage': one_of(('static',)),
+        'deps': anything(),
+        'dll': one_of((True, 'only')),
+        'filegroups': anything(),
+        'generate_plugin_registry': anything(),
+        'headers': anything(),
+        'language': one_of(('c', 'c++', 'csharp')),
+        'LDFLAGS': anything(),
+        'platforms': subset_of(('linux', 'mac', 'posix', 'windows')),
+        'public_headers': anything(),
+        'secure': one_of(('check', True, False)),
+        'src': anything(),
+        'vs_proj_dir': anything(),
+        'zlib': one_of((True,)),
+    },
+    'target': {
+        'args': anything(),
+        'benchmark': anything(),
+        'boringssl': one_of((True,)),
+        'build': anything(),
+        'ci_platforms': anything(),
+        'corpus_dirs': anything(),
+        'cpu_cost': anything(),
+        'defaults': anything(),
+        'deps': anything(),
+        'dict': anything(),
+        'exclude_configs': anything(),
+        'exclude_iomgrs': anything(),
+        'excluded_poll_engines': anything(),
+        'filegroups': anything(),
+        'flaky': one_of((True, False)),
+        'gtest': one_of((True, False)),
+        'headers': anything(),
+        'language': one_of(('c', 'c89', 'c++', 'csharp')),
+        'maxlen': anything(),
+        'platforms': subset_of(('linux', 'mac', 'posix', 'windows')),
+        'run': one_of((True, False)),
+        'secure': one_of(('check', True, False)),
+        'src': anything(),
+        'timeout_seconds': anything(),
+        'uses_polling': anything(),
+        'vs_proj_dir': anything(),
+        'zlib': one_of((True,)),
+    },
+}
+
+
+def check_attributes(entity, kind, errors):
+    attributes = VALID_ATTRIBUTE_KEYS_MAP[kind]
+    name = entity.get('name', anything())
+    for key, value in entity.items():
+        if key == 'name':
+            continue
+        validator = attributes.get(key)
+        if validator:
+            error = validator(value)
+            if error:
+                errors.append(
+                    "{0}({1}) has an invalid value for '{2}': {3}".format(
+                        name, kind, key, error))
+        else:
+            errors.append("{0}({1}) has an invalid attribute '{2}'".format(
+                name, kind, key))
+
+
+def mako_plugin(dictionary):
+    """The exported plugin code for check_attr.
+
+  This validates that filegroups, libs, and target can have only valid
+  attributes. This is mainly for preventing build.yaml from having
+  unnecessary and misleading attributes accidently.
+  """
+
+    errors = []
+    for filegroup in dictionary.get('filegroups', {}):
+        check_attributes(filegroup, 'filegroup', errors)
+    for lib in dictionary.get('libs', {}):
+        check_attributes(lib, 'lib', errors)
+    for target in dictionary.get('targets', {}):
+        check_attributes(target, 'target', errors)
+    if errors:
+        raise Exception('\n'.join(errors))