diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ba9f95788e15..574b201edb87c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3131,30 +3131,15 @@ foreach(_hdr
   include/grpc/grpc_posix.h
   include/grpc/grpc_security.h
   include/grpc/grpc_security_constants.h
-  include/grpc/impl/call.h
   include/grpc/impl/channel_arg_names.h
-  include/grpc/impl/codegen/atm.h
-  include/grpc/impl/codegen/atm_gcc_atomic.h
-  include/grpc/impl/codegen/atm_gcc_sync.h
-  include/grpc/impl/codegen/atm_windows.h
   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/fork.h
-  include/grpc/impl/codegen/gpr_types.h
   include/grpc/impl/codegen/grpc_types.h
-  include/grpc/impl/codegen/log.h
-  include/grpc/impl/codegen/port_platform.h
   include/grpc/impl/codegen/propagation_bits.h
   include/grpc/impl/codegen/slice.h
   include/grpc/impl/codegen/status.h
-  include/grpc/impl/codegen/sync.h
-  include/grpc/impl/codegen/sync_abseil.h
-  include/grpc/impl/codegen/sync_custom.h
-  include/grpc/impl/codegen/sync_generic.h
-  include/grpc/impl/codegen/sync_posix.h
-  include/grpc/impl/codegen/sync_windows.h
   include/grpc/impl/compression_types.h
   include/grpc/impl/connectivity_state.h
   include/grpc/impl/grpc_types.h
@@ -3165,25 +3150,6 @@ foreach(_hdr
   include/grpc/slice.h
   include/grpc/slice_buffer.h
   include/grpc/status.h
-  include/grpc/support/alloc.h
-  include/grpc/support/atm_gcc_atomic.h
-  include/grpc/support/atm_gcc_sync.h
-  include/grpc/support/atm_windows.h
-  include/grpc/support/cpu.h
-  include/grpc/support/json.h
-  include/grpc/support/log.h
-  include/grpc/support/log_windows.h
-  include/grpc/support/metrics.h
-  include/grpc/support/port_platform.h
-  include/grpc/support/string_util.h
-  include/grpc/support/sync.h
-  include/grpc/support/sync_abseil.h
-  include/grpc/support/sync_custom.h
-  include/grpc/support/sync_generic.h
-  include/grpc/support/sync_posix.h
-  include/grpc/support/sync_windows.h
-  include/grpc/support/thd_id.h
-  include/grpc/support/time.h
   include/grpc/support/workaround_list.h
 )
   string(REPLACE "include/" "" _path ${_hdr})
@@ -3829,30 +3795,15 @@ foreach(_hdr
   include/grpc/grpc_posix.h
   include/grpc/grpc_security.h
   include/grpc/grpc_security_constants.h
-  include/grpc/impl/call.h
   include/grpc/impl/channel_arg_names.h
-  include/grpc/impl/codegen/atm.h
-  include/grpc/impl/codegen/atm_gcc_atomic.h
-  include/grpc/impl/codegen/atm_gcc_sync.h
-  include/grpc/impl/codegen/atm_windows.h
   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/fork.h
-  include/grpc/impl/codegen/gpr_types.h
   include/grpc/impl/codegen/grpc_types.h
-  include/grpc/impl/codegen/log.h
-  include/grpc/impl/codegen/port_platform.h
   include/grpc/impl/codegen/propagation_bits.h
   include/grpc/impl/codegen/slice.h
   include/grpc/impl/codegen/status.h
-  include/grpc/impl/codegen/sync.h
-  include/grpc/impl/codegen/sync_abseil.h
-  include/grpc/impl/codegen/sync_custom.h
-  include/grpc/impl/codegen/sync_generic.h
-  include/grpc/impl/codegen/sync_posix.h
-  include/grpc/impl/codegen/sync_windows.h
   include/grpc/impl/compression_types.h
   include/grpc/impl/connectivity_state.h
   include/grpc/impl/grpc_types.h
@@ -3863,25 +3814,6 @@ foreach(_hdr
   include/grpc/slice.h
   include/grpc/slice_buffer.h
   include/grpc/status.h
-  include/grpc/support/alloc.h
-  include/grpc/support/atm_gcc_atomic.h
-  include/grpc/support/atm_gcc_sync.h
-  include/grpc/support/atm_windows.h
-  include/grpc/support/cpu.h
-  include/grpc/support/json.h
-  include/grpc/support/log.h
-  include/grpc/support/log_windows.h
-  include/grpc/support/metrics.h
-  include/grpc/support/port_platform.h
-  include/grpc/support/string_util.h
-  include/grpc/support/sync.h
-  include/grpc/support/sync_abseil.h
-  include/grpc/support/sync_custom.h
-  include/grpc/support/sync_generic.h
-  include/grpc/support/sync_posix.h
-  include/grpc/support/sync_windows.h
-  include/grpc/support/thd_id.h
-  include/grpc/support/time.h
   include/grpc/support/workaround_list.h
 )
   string(REPLACE "include/" "" _path ${_hdr})
@@ -5797,7 +5729,6 @@ add_library(grpc_authorization_provider
   src/core/lib/promise/party.cc
   src/core/lib/resource_quota/api.cc
   src/core/lib/resource_quota/arena.cc
-  src/core/lib/resource_quota/connection_quota.cc
   src/core/lib/resource_quota/memory_quota.cc
   src/core/lib/resource_quota/periodic_update.cc
   src/core/lib/resource_quota/resource_quota.cc
@@ -5995,30 +5926,15 @@ foreach(_hdr
   include/grpc/grpc_posix.h
   include/grpc/grpc_security.h
   include/grpc/grpc_security_constants.h
-  include/grpc/impl/call.h
   include/grpc/impl/channel_arg_names.h
-  include/grpc/impl/codegen/atm.h
-  include/grpc/impl/codegen/atm_gcc_atomic.h
-  include/grpc/impl/codegen/atm_gcc_sync.h
-  include/grpc/impl/codegen/atm_windows.h
   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/fork.h
-  include/grpc/impl/codegen/gpr_types.h
   include/grpc/impl/codegen/grpc_types.h
-  include/grpc/impl/codegen/log.h
-  include/grpc/impl/codegen/port_platform.h
   include/grpc/impl/codegen/propagation_bits.h
   include/grpc/impl/codegen/slice.h
   include/grpc/impl/codegen/status.h
-  include/grpc/impl/codegen/sync.h
-  include/grpc/impl/codegen/sync_abseil.h
-  include/grpc/impl/codegen/sync_custom.h
-  include/grpc/impl/codegen/sync_generic.h
-  include/grpc/impl/codegen/sync_posix.h
-  include/grpc/impl/codegen/sync_windows.h
   include/grpc/impl/compression_types.h
   include/grpc/impl/connectivity_state.h
   include/grpc/impl/grpc_types.h
@@ -6029,25 +5945,6 @@ foreach(_hdr
   include/grpc/slice.h
   include/grpc/slice_buffer.h
   include/grpc/status.h
-  include/grpc/support/alloc.h
-  include/grpc/support/atm_gcc_atomic.h
-  include/grpc/support/atm_gcc_sync.h
-  include/grpc/support/atm_windows.h
-  include/grpc/support/cpu.h
-  include/grpc/support/json.h
-  include/grpc/support/log.h
-  include/grpc/support/log_windows.h
-  include/grpc/support/metrics.h
-  include/grpc/support/port_platform.h
-  include/grpc/support/string_util.h
-  include/grpc/support/sync.h
-  include/grpc/support/sync_abseil.h
-  include/grpc/support/sync_custom.h
-  include/grpc/support/sync_generic.h
-  include/grpc/support/sync_posix.h
-  include/grpc/support/sync_windows.h
-  include/grpc/support/thd_id.h
-  include/grpc/support/time.h
   include/grpc/support/workaround_list.h
 )
   string(REPLACE "include/" "" _path ${_hdr})
@@ -9373,7 +9270,6 @@ add_executable(call_filters_test
   src/core/lib/iomgr/iomgr_internal.cc
   src/core/lib/promise/activity.cc
   src/core/lib/resource_quota/arena.cc
-  src/core/lib/resource_quota/connection_quota.cc
   src/core/lib/resource_quota/memory_quota.cc
   src/core/lib/resource_quota/periodic_update.cc
   src/core/lib/resource_quota/resource_quota.cc
@@ -9864,7 +9760,6 @@ add_executable(call_utils_test
   src/core/lib/promise/party.cc
   src/core/lib/resource_quota/api.cc
   src/core/lib/resource_quota/arena.cc
-  src/core/lib/resource_quota/connection_quota.cc
   src/core/lib/resource_quota/memory_quota.cc
   src/core/lib/resource_quota/periodic_update.cc
   src/core/lib/resource_quota/resource_quota.cc
@@ -10412,7 +10307,6 @@ add_executable(cancel_callback_test
   src/core/lib/iomgr/iomgr_internal.cc
   src/core/lib/promise/activity.cc
   src/core/lib/resource_quota/arena.cc
-  src/core/lib/resource_quota/connection_quota.cc
   src/core/lib/resource_quota/memory_quota.cc
   src/core/lib/resource_quota/periodic_update.cc
   src/core/lib/resource_quota/resource_quota.cc
@@ -11748,7 +11642,6 @@ add_executable(chunked_vector_test
   src/core/lib/iomgr/iomgr_internal.cc
   src/core/lib/promise/activity.cc
   src/core/lib/resource_quota/arena.cc
-  src/core/lib/resource_quota/connection_quota.cc
   src/core/lib/resource_quota/memory_quota.cc
   src/core/lib/resource_quota/periodic_update.cc
   src/core/lib/resource_quota/resource_quota.cc
@@ -15856,7 +15749,6 @@ add_executable(flow_control_test
   src/core/lib/iomgr/executor.cc
   src/core/lib/iomgr/iomgr_internal.cc
   src/core/lib/promise/activity.cc
-  src/core/lib/resource_quota/connection_quota.cc
   src/core/lib/resource_quota/memory_quota.cc
   src/core/lib/resource_quota/periodic_update.cc
   src/core/lib/resource_quota/resource_quota.cc
@@ -15936,7 +15828,6 @@ add_executable(for_each_test
   src/core/lib/iomgr/iomgr_internal.cc
   src/core/lib/promise/activity.cc
   src/core/lib/resource_quota/arena.cc
-  src/core/lib/resource_quota/connection_quota.cc
   src/core/lib/resource_quota/memory_quota.cc
   src/core/lib/resource_quota/periodic_update.cc
   src/core/lib/resource_quota/resource_quota.cc
@@ -19413,14 +19304,6 @@ if(gRPC_BUILD_TESTS)
 add_executable(if_test
   test/core/promise/if_test.cc
 )
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(if_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-    )
-  endif()
-endif()
 target_compile_features(if_test PUBLIC cxx_std_17)
 target_include_directories(if_test
   PRIVATE
@@ -19444,9 +19327,11 @@ target_include_directories(if_test
 target_link_libraries(if_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
+  absl::any_invocable
+  absl::check
   absl::type_traits
   absl::statusor
-  gpr
+  absl::str_format
 )
 
 
@@ -19810,7 +19695,6 @@ add_executable(interceptor_list_test
   src/core/lib/iomgr/iomgr_internal.cc
   src/core/lib/promise/activity.cc
   src/core/lib/resource_quota/arena.cc
-  src/core/lib/resource_quota/connection_quota.cc
   src/core/lib/resource_quota/memory_quota.cc
   src/core/lib/resource_quota/periodic_update.cc
   src/core/lib/resource_quota/resource_quota.cc
@@ -21097,7 +20981,6 @@ target_link_libraries(lru_cache_test
   absl::flat_hash_map
   absl::any_invocable
   absl::check
-  absl::statusor
 )
 
 
@@ -21119,7 +21002,6 @@ add_executable(map_pipe_test
   src/core/lib/iomgr/iomgr_internal.cc
   src/core/lib/promise/activity.cc
   src/core/lib/resource_quota/arena.cc
-  src/core/lib/resource_quota/connection_quota.cc
   src/core/lib/resource_quota/memory_quota.cc
   src/core/lib/resource_quota/periodic_update.cc
   src/core/lib/resource_quota/resource_quota.cc
@@ -21184,14 +21066,6 @@ if(gRPC_BUILD_TESTS)
 add_executable(match_promise_test
   test/core/promise/match_promise_test.cc
 )
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(match_promise_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-    )
-  endif()
-endif()
 target_compile_features(match_promise_test PUBLIC cxx_std_17)
 target_include_directories(match_promise_test
   PRIVATE
@@ -21215,8 +21089,11 @@ target_include_directories(match_promise_test
 target_link_libraries(match_promise_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
+  absl::any_invocable
+  absl::check
   absl::type_traits
-  gpr
+  absl::status
+  absl::str_format
 )
 
 
@@ -24069,14 +23946,6 @@ if(gRPC_BUILD_TESTS)
 add_executable(poll_test
   test/core/promise/poll_test.cc
 )
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(poll_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-    )
-  endif()
-endif()
 target_compile_features(poll_test PUBLIC cxx_std_17)
 target_include_directories(poll_test
   PRIVATE
@@ -24100,7 +23969,8 @@ target_include_directories(poll_test
 target_link_libraries(poll_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
-  gpr
+  absl::check
+  absl::str_format
 )
 
 
@@ -25015,14 +24885,6 @@ if(gRPC_BUILD_TESTS)
 add_executable(prioritized_race_test
   test/core/promise/prioritized_race_test.cc
 )
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(prioritized_race_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-    )
-  endif()
-endif()
 target_compile_features(prioritized_race_test PUBLIC cxx_std_17)
 target_include_directories(prioritized_race_test
   PRIVATE
@@ -25046,7 +24908,8 @@ target_include_directories(prioritized_race_test
 target_link_libraries(prioritized_race_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
-  gpr
+  absl::check
+  absl::str_format
 )
 
 
@@ -25099,14 +24962,6 @@ if(gRPC_BUILD_TESTS)
 add_executable(promise_factory_test
   test/core/promise/promise_factory_test.cc
 )
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(promise_factory_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-    )
-  endif()
-endif()
 target_compile_features(promise_factory_test PUBLIC cxx_std_17)
 target_include_directories(promise_factory_test
   PRIVATE
@@ -25130,9 +24985,11 @@ target_include_directories(promise_factory_test
 target_link_libraries(promise_factory_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
+  absl::any_invocable
   absl::bind_front
+  absl::check
   absl::type_traits
-  gpr
+  absl::str_format
 )
 
 
@@ -25142,14 +24999,6 @@ if(gRPC_BUILD_TESTS)
 add_executable(promise_map_test
   test/core/promise/map_test.cc
 )
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(promise_map_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-    )
-  endif()
-endif()
 target_compile_features(promise_map_test PUBLIC cxx_std_17)
 target_include_directories(promise_map_test
   PRIVATE
@@ -25173,9 +25022,12 @@ target_include_directories(promise_map_test
 target_link_libraries(promise_map_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
+  absl::any_invocable
+  absl::check
   absl::type_traits
+  absl::status
   absl::statusor
-  gpr
+  absl::str_format
 )
 
 
@@ -25239,14 +25091,6 @@ if(gRPC_BUILD_TESTS)
 add_executable(promise_test
   test/core/promise/promise_test.cc
 )
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(promise_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-    )
-  endif()
-endif()
 target_compile_features(promise_test PUBLIC cxx_std_17)
 target_include_directories(promise_test
   PRIVATE
@@ -25270,8 +25114,11 @@ target_include_directories(promise_test
 target_link_libraries(promise_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
+  absl::any_invocable
+  absl::check
   absl::type_traits
-  gpr
+  absl::status
+  absl::str_format
 )
 
 
@@ -25756,14 +25603,6 @@ if(gRPC_BUILD_TESTS)
 add_executable(race_test
   test/core/promise/race_test.cc
 )
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(race_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-    )
-  endif()
-endif()
 target_compile_features(race_test PUBLIC cxx_std_17)
 target_include_directories(race_test
   PRIVATE
@@ -25787,7 +25626,8 @@ target_include_directories(race_test
 target_link_libraries(race_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
-  gpr
+  absl::check
+  absl::str_format
 )
 
 
@@ -26221,7 +26061,6 @@ add_executable(request_buffer_test
   src/core/lib/promise/activity.cc
   src/core/lib/promise/party.cc
   src/core/lib/resource_quota/arena.cc
-  src/core/lib/resource_quota/connection_quota.cc
   src/core/lib/resource_quota/memory_quota.cc
   src/core/lib/resource_quota/periodic_update.cc
   src/core/lib/resource_quota/resource_quota.cc
@@ -32144,14 +31983,6 @@ if(gRPC_BUILD_TESTS)
 add_executable(status_flag_test
   test/core/promise/status_flag_test.cc
 )
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(status_flag_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-    )
-  endif()
-endif()
 target_compile_features(status_flag_test PUBLIC cxx_std_17)
 target_include_directories(status_flag_test
   PRIVATE
@@ -32175,8 +32006,9 @@ target_include_directories(status_flag_test
 target_link_libraries(status_flag_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
+  absl::check
+  absl::status
   absl::statusor
-  gpr
 )
 
 
diff --git a/Makefile b/Makefile
index 7fcfe02456af4..d47e32117fe90 100644
--- a/Makefile
+++ b/Makefile
@@ -1768,30 +1768,15 @@ PUBLIC_HEADERS_C += \
     include/grpc/grpc_posix.h \
     include/grpc/grpc_security.h \
     include/grpc/grpc_security_constants.h \
-    include/grpc/impl/call.h \
     include/grpc/impl/channel_arg_names.h \
-    include/grpc/impl/codegen/atm.h \
-    include/grpc/impl/codegen/atm_gcc_atomic.h \
-    include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_windows.h \
     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/fork.h \
-    include/grpc/impl/codegen/gpr_types.h \
     include/grpc/impl/codegen/grpc_types.h \
-    include/grpc/impl/codegen/log.h \
-    include/grpc/impl/codegen/port_platform.h \
     include/grpc/impl/codegen/propagation_bits.h \
     include/grpc/impl/codegen/slice.h \
     include/grpc/impl/codegen/status.h \
-    include/grpc/impl/codegen/sync.h \
-    include/grpc/impl/codegen/sync_abseil.h \
-    include/grpc/impl/codegen/sync_custom.h \
-    include/grpc/impl/codegen/sync_generic.h \
-    include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_windows.h \
     include/grpc/impl/compression_types.h \
     include/grpc/impl/connectivity_state.h \
     include/grpc/impl/grpc_types.h \
@@ -1802,25 +1787,6 @@ PUBLIC_HEADERS_C += \
     include/grpc/slice.h \
     include/grpc/slice_buffer.h \
     include/grpc/status.h \
-    include/grpc/support/alloc.h \
-    include/grpc/support/atm_gcc_atomic.h \
-    include/grpc/support/atm_gcc_sync.h \
-    include/grpc/support/atm_windows.h \
-    include/grpc/support/cpu.h \
-    include/grpc/support/json.h \
-    include/grpc/support/log.h \
-    include/grpc/support/log_windows.h \
-    include/grpc/support/metrics.h \
-    include/grpc/support/port_platform.h \
-    include/grpc/support/string_util.h \
-    include/grpc/support/sync.h \
-    include/grpc/support/sync_abseil.h \
-    include/grpc/support/sync_custom.h \
-    include/grpc/support/sync_generic.h \
-    include/grpc/support/sync_posix.h \
-    include/grpc/support/sync_windows.h \
-    include/grpc/support/thd_id.h \
-    include/grpc/support/time.h \
     include/grpc/support/workaround_list.h \
 
 LIBGRPC_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_SRC))))
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index fcf047ea6b98f..ec900fa94345c 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -163,30 +163,15 @@ libs:
   - include/grpc/grpc_posix.h
   - include/grpc/grpc_security.h
   - include/grpc/grpc_security_constants.h
-  - include/grpc/impl/call.h
   - include/grpc/impl/channel_arg_names.h
-  - include/grpc/impl/codegen/atm.h
-  - include/grpc/impl/codegen/atm_gcc_atomic.h
-  - include/grpc/impl/codegen/atm_gcc_sync.h
-  - include/grpc/impl/codegen/atm_windows.h
   - 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/fork.h
-  - include/grpc/impl/codegen/gpr_types.h
   - include/grpc/impl/codegen/grpc_types.h
-  - include/grpc/impl/codegen/log.h
-  - include/grpc/impl/codegen/port_platform.h
   - include/grpc/impl/codegen/propagation_bits.h
   - include/grpc/impl/codegen/slice.h
   - include/grpc/impl/codegen/status.h
-  - include/grpc/impl/codegen/sync.h
-  - include/grpc/impl/codegen/sync_abseil.h
-  - include/grpc/impl/codegen/sync_custom.h
-  - include/grpc/impl/codegen/sync_generic.h
-  - include/grpc/impl/codegen/sync_posix.h
-  - include/grpc/impl/codegen/sync_windows.h
   - include/grpc/impl/compression_types.h
   - include/grpc/impl/connectivity_state.h
   - include/grpc/impl/grpc_types.h
@@ -197,25 +182,6 @@ libs:
   - include/grpc/slice.h
   - include/grpc/slice_buffer.h
   - include/grpc/status.h
-  - include/grpc/support/alloc.h
-  - include/grpc/support/atm_gcc_atomic.h
-  - include/grpc/support/atm_gcc_sync.h
-  - include/grpc/support/atm_windows.h
-  - include/grpc/support/cpu.h
-  - include/grpc/support/json.h
-  - include/grpc/support/log.h
-  - include/grpc/support/log_windows.h
-  - include/grpc/support/metrics.h
-  - include/grpc/support/port_platform.h
-  - include/grpc/support/string_util.h
-  - include/grpc/support/sync.h
-  - include/grpc/support/sync_abseil.h
-  - include/grpc/support/sync_custom.h
-  - include/grpc/support/sync_generic.h
-  - include/grpc/support/sync_posix.h
-  - include/grpc/support/sync_windows.h
-  - include/grpc/support/thd_id.h
-  - include/grpc/support/time.h
   - include/grpc/support/workaround_list.h
   headers:
   - src/core/call/request_buffer.h
@@ -2212,30 +2178,15 @@ libs:
   - include/grpc/grpc_posix.h
   - include/grpc/grpc_security.h
   - include/grpc/grpc_security_constants.h
-  - include/grpc/impl/call.h
   - include/grpc/impl/channel_arg_names.h
-  - include/grpc/impl/codegen/atm.h
-  - include/grpc/impl/codegen/atm_gcc_atomic.h
-  - include/grpc/impl/codegen/atm_gcc_sync.h
-  - include/grpc/impl/codegen/atm_windows.h
   - 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/fork.h
-  - include/grpc/impl/codegen/gpr_types.h
   - include/grpc/impl/codegen/grpc_types.h
-  - include/grpc/impl/codegen/log.h
-  - include/grpc/impl/codegen/port_platform.h
   - include/grpc/impl/codegen/propagation_bits.h
   - include/grpc/impl/codegen/slice.h
   - include/grpc/impl/codegen/status.h
-  - include/grpc/impl/codegen/sync.h
-  - include/grpc/impl/codegen/sync_abseil.h
-  - include/grpc/impl/codegen/sync_custom.h
-  - include/grpc/impl/codegen/sync_generic.h
-  - include/grpc/impl/codegen/sync_posix.h
-  - include/grpc/impl/codegen/sync_windows.h
   - include/grpc/impl/compression_types.h
   - include/grpc/impl/connectivity_state.h
   - include/grpc/impl/grpc_types.h
@@ -2246,25 +2197,6 @@ libs:
   - include/grpc/slice.h
   - include/grpc/slice_buffer.h
   - include/grpc/status.h
-  - include/grpc/support/alloc.h
-  - include/grpc/support/atm_gcc_atomic.h
-  - include/grpc/support/atm_gcc_sync.h
-  - include/grpc/support/atm_windows.h
-  - include/grpc/support/cpu.h
-  - include/grpc/support/json.h
-  - include/grpc/support/log.h
-  - include/grpc/support/log_windows.h
-  - include/grpc/support/metrics.h
-  - include/grpc/support/port_platform.h
-  - include/grpc/support/string_util.h
-  - include/grpc/support/sync.h
-  - include/grpc/support/sync_abseil.h
-  - include/grpc/support/sync_custom.h
-  - include/grpc/support/sync_generic.h
-  - include/grpc/support/sync_posix.h
-  - include/grpc/support/sync_windows.h
-  - include/grpc/support/thd_id.h
-  - include/grpc/support/time.h
   - include/grpc/support/workaround_list.h
   headers:
   - src/core/call/request_buffer.h
@@ -4396,30 +4328,15 @@ libs:
   - include/grpc/grpc_posix.h
   - include/grpc/grpc_security.h
   - include/grpc/grpc_security_constants.h
-  - include/grpc/impl/call.h
   - include/grpc/impl/channel_arg_names.h
-  - include/grpc/impl/codegen/atm.h
-  - include/grpc/impl/codegen/atm_gcc_atomic.h
-  - include/grpc/impl/codegen/atm_gcc_sync.h
-  - include/grpc/impl/codegen/atm_windows.h
   - 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/fork.h
-  - include/grpc/impl/codegen/gpr_types.h
   - include/grpc/impl/codegen/grpc_types.h
-  - include/grpc/impl/codegen/log.h
-  - include/grpc/impl/codegen/port_platform.h
   - include/grpc/impl/codegen/propagation_bits.h
   - include/grpc/impl/codegen/slice.h
   - include/grpc/impl/codegen/status.h
-  - include/grpc/impl/codegen/sync.h
-  - include/grpc/impl/codegen/sync_abseil.h
-  - include/grpc/impl/codegen/sync_custom.h
-  - include/grpc/impl/codegen/sync_generic.h
-  - include/grpc/impl/codegen/sync_posix.h
-  - include/grpc/impl/codegen/sync_windows.h
   - include/grpc/impl/compression_types.h
   - include/grpc/impl/connectivity_state.h
   - include/grpc/impl/grpc_types.h
@@ -4430,25 +4347,6 @@ libs:
   - include/grpc/slice.h
   - include/grpc/slice_buffer.h
   - include/grpc/status.h
-  - include/grpc/support/alloc.h
-  - include/grpc/support/atm_gcc_atomic.h
-  - include/grpc/support/atm_gcc_sync.h
-  - include/grpc/support/atm_windows.h
-  - include/grpc/support/cpu.h
-  - include/grpc/support/json.h
-  - include/grpc/support/log.h
-  - include/grpc/support/log_windows.h
-  - include/grpc/support/metrics.h
-  - include/grpc/support/port_platform.h
-  - include/grpc/support/string_util.h
-  - include/grpc/support/sync.h
-  - include/grpc/support/sync_abseil.h
-  - include/grpc/support/sync_custom.h
-  - include/grpc/support/sync_generic.h
-  - include/grpc/support/sync_posix.h
-  - include/grpc/support/sync_windows.h
-  - include/grpc/support/thd_id.h
-  - include/grpc/support/time.h
   - include/grpc/support/workaround_list.h
   headers:
   - src/core/channelz/channel_trace.h
@@ -4649,7 +4547,6 @@ libs:
   - src/core/lib/promise/try_seq.h
   - src/core/lib/resource_quota/api.h
   - src/core/lib/resource_quota/arena.h
-  - src/core/lib/resource_quota/connection_quota.h
   - src/core/lib/resource_quota/memory_quota.h
   - src/core/lib/resource_quota/periodic_update.h
   - src/core/lib/resource_quota/resource_quota.h
@@ -4950,7 +4847,6 @@ libs:
   - src/core/lib/promise/party.cc
   - src/core/lib/resource_quota/api.cc
   - src/core/lib/resource_quota/arena.cc
-  - src/core/lib/resource_quota/connection_quota.cc
   - src/core/lib/resource_quota/memory_quota.cc
   - src/core/lib/resource_quota/periodic_update.cc
   - src/core/lib/resource_quota/resource_quota.cc
@@ -6499,7 +6395,6 @@ targets:
   - src/core/lib/promise/status_flag.h
   - src/core/lib/promise/try_seq.h
   - src/core/lib/resource_quota/arena.h
-  - src/core/lib/resource_quota/connection_quota.h
   - src/core/lib/resource_quota/memory_quota.h
   - src/core/lib/resource_quota/periodic_update.h
   - src/core/lib/resource_quota/resource_quota.h
@@ -6570,7 +6465,6 @@ targets:
   - src/core/lib/iomgr/iomgr_internal.cc
   - src/core/lib/promise/activity.cc
   - src/core/lib/resource_quota/arena.cc
-  - src/core/lib/resource_quota/connection_quota.cc
   - src/core/lib/resource_quota/memory_quota.cc
   - src/core/lib/resource_quota/periodic_update.cc
   - src/core/lib/resource_quota/resource_quota.cc
@@ -6981,7 +6875,6 @@ targets:
   - src/core/lib/promise/try_seq.h
   - src/core/lib/resource_quota/api.h
   - src/core/lib/resource_quota/arena.h
-  - src/core/lib/resource_quota/connection_quota.h
   - src/core/lib/resource_quota/memory_quota.h
   - src/core/lib/resource_quota/periodic_update.h
   - src/core/lib/resource_quota/resource_quota.h
@@ -7250,7 +7143,6 @@ targets:
   - src/core/lib/promise/party.cc
   - src/core/lib/resource_quota/api.cc
   - src/core/lib/resource_quota/arena.cc
-  - src/core/lib/resource_quota/connection_quota.cc
   - src/core/lib/resource_quota/memory_quota.cc
   - src/core/lib/resource_quota/periodic_update.cc
   - src/core/lib/resource_quota/resource_quota.cc
@@ -7783,7 +7675,6 @@ targets:
   - src/core/lib/promise/race.h
   - src/core/lib/promise/seq.h
   - src/core/lib/resource_quota/arena.h
-  - src/core/lib/resource_quota/connection_quota.h
   - src/core/lib/resource_quota/memory_quota.h
   - src/core/lib/resource_quota/periodic_update.h
   - src/core/lib/resource_quota/resource_quota.h
@@ -7825,7 +7716,6 @@ targets:
   - src/core/lib/iomgr/iomgr_internal.cc
   - src/core/lib/promise/activity.cc
   - src/core/lib/resource_quota/arena.cc
-  - src/core/lib/resource_quota/connection_quota.cc
   - src/core/lib/resource_quota/memory_quota.cc
   - src/core/lib/resource_quota/periodic_update.cc
   - src/core/lib/resource_quota/resource_quota.cc
@@ -8760,7 +8650,6 @@ targets:
   - src/core/lib/promise/race.h
   - src/core/lib/promise/seq.h
   - src/core/lib/resource_quota/arena.h
-  - src/core/lib/resource_quota/connection_quota.h
   - src/core/lib/resource_quota/memory_quota.h
   - src/core/lib/resource_quota/periodic_update.h
   - src/core/lib/resource_quota/resource_quota.h
@@ -8803,7 +8692,6 @@ targets:
   - src/core/lib/iomgr/iomgr_internal.cc
   - src/core/lib/promise/activity.cc
   - src/core/lib/resource_quota/arena.cc
-  - src/core/lib/resource_quota/connection_quota.cc
   - src/core/lib/resource_quota/memory_quota.cc
   - src/core/lib/resource_quota/periodic_update.cc
   - src/core/lib/resource_quota/resource_quota.cc
@@ -10797,7 +10685,6 @@ targets:
   - src/core/lib/promise/poll.h
   - src/core/lib/promise/race.h
   - src/core/lib/promise/seq.h
-  - src/core/lib/resource_quota/connection_quota.h
   - src/core/lib/resource_quota/memory_quota.h
   - src/core/lib/resource_quota/periodic_update.h
   - src/core/lib/resource_quota/resource_quota.h
@@ -10844,7 +10731,6 @@ targets:
   - src/core/lib/iomgr/executor.cc
   - src/core/lib/iomgr/iomgr_internal.cc
   - src/core/lib/promise/activity.cc
-  - src/core/lib/resource_quota/connection_quota.cc
   - src/core/lib/resource_quota/memory_quota.cc
   - src/core/lib/resource_quota/periodic_update.cc
   - src/core/lib/resource_quota/resource_quota.cc
@@ -10917,7 +10803,6 @@ targets:
   - src/core/lib/promise/status_flag.h
   - src/core/lib/promise/try_seq.h
   - src/core/lib/resource_quota/arena.h
-  - src/core/lib/resource_quota/connection_quota.h
   - src/core/lib/resource_quota/memory_quota.h
   - src/core/lib/resource_quota/periodic_update.h
   - src/core/lib/resource_quota/resource_quota.h
@@ -10960,7 +10845,6 @@ targets:
   - src/core/lib/iomgr/iomgr_internal.cc
   - src/core/lib/promise/activity.cc
   - src/core/lib/resource_quota/arena.cc
-  - src/core/lib/resource_quota/connection_quota.cc
   - src/core/lib/resource_quota/memory_quota.cc
   - src/core/lib/resource_quota/periodic_update.cc
   - src/core/lib/resource_quota/resource_quota.cc
@@ -12573,13 +12457,16 @@ targets:
   - src/core/lib/promise/detail/promise_like.h
   - src/core/lib/promise/if.h
   - src/core/lib/promise/poll.h
+  - src/core/util/construct_destruct.h
   src:
   - test/core/promise/if_test.cc
   deps:
   - gtest
+  - absl/functional:any_invocable
+  - absl/log:check
   - absl/meta:type_traits
   - absl/status:statusor
-  - gpr
+  - absl/strings:str_format
   uses_polling: false
 - name: init_test
   gtest: true
@@ -12792,7 +12679,6 @@ targets:
   - src/core/lib/promise/race.h
   - src/core/lib/promise/seq.h
   - src/core/lib/resource_quota/arena.h
-  - src/core/lib/resource_quota/connection_quota.h
   - src/core/lib/resource_quota/memory_quota.h
   - src/core/lib/resource_quota/periodic_update.h
   - src/core/lib/resource_quota/resource_quota.h
@@ -12835,7 +12721,6 @@ targets:
   - src/core/lib/iomgr/iomgr_internal.cc
   - src/core/lib/promise/activity.cc
   - src/core/lib/resource_quota/arena.cc
-  - src/core/lib/resource_quota/connection_quota.cc
   - src/core/lib/resource_quota/memory_quota.cc
   - src/core/lib/resource_quota/periodic_update.cc
   - src/core/lib/resource_quota/resource_quota.cc
@@ -13517,7 +13402,6 @@ targets:
   - absl/container:flat_hash_map
   - absl/functional:any_invocable
   - absl/log:check
-  - absl/status:statusor
   uses_polling: false
 - name: map_pipe_test
   gtest: true
@@ -13562,7 +13446,6 @@ targets:
   - src/core/lib/promise/status_flag.h
   - src/core/lib/promise/try_seq.h
   - src/core/lib/resource_quota/arena.h
-  - src/core/lib/resource_quota/connection_quota.h
   - src/core/lib/resource_quota/memory_quota.h
   - src/core/lib/resource_quota/periodic_update.h
   - src/core/lib/resource_quota/resource_quota.h
@@ -13605,7 +13488,6 @@ targets:
   - src/core/lib/iomgr/iomgr_internal.cc
   - src/core/lib/promise/activity.cc
   - src/core/lib/resource_quota/arena.cc
-  - src/core/lib/resource_quota/connection_quota.cc
   - src/core/lib/resource_quota/memory_quota.cc
   - src/core/lib/resource_quota/periodic_update.cc
   - src/core/lib/resource_quota/resource_quota.cc
@@ -13643,14 +13525,18 @@ targets:
   - src/core/lib/promise/match_promise.h
   - src/core/lib/promise/poll.h
   - src/core/lib/promise/promise.h
+  - src/core/util/construct_destruct.h
   - src/core/util/overload.h
   - test/core/promise/poll_matcher.h
   src:
   - test/core/promise/match_promise_test.cc
   deps:
   - gtest
+  - absl/functional:any_invocable
+  - absl/log:check
   - absl/meta:type_traits
-  - gpr
+  - absl/status:status
+  - absl/strings:str_format
   uses_polling: false
 - name: match_test
   gtest: true
@@ -15274,11 +15160,13 @@ targets:
   language: c++
   headers:
   - src/core/lib/promise/poll.h
+  - src/core/util/construct_destruct.h
   src:
   - test/core/promise/poll_test.cc
   deps:
   - gtest
-  - gpr
+  - absl/log:check
+  - absl/strings:str_format
   uses_polling: false
 - name: port_sharing_end2end_test
   gtest: true
@@ -15577,11 +15465,13 @@ targets:
   headers:
   - src/core/lib/promise/poll.h
   - src/core/lib/promise/prioritized_race.h
+  - src/core/util/construct_destruct.h
   src:
   - test/core/promise/prioritized_race_test.cc
   deps:
   - gtest
-  - gpr
+  - absl/log:check
+  - absl/strings:str_format
   uses_polling: false
 - name: promise_endpoint_test
   gtest: true
@@ -15605,13 +15495,16 @@ targets:
   - src/core/lib/promise/detail/promise_factory.h
   - src/core/lib/promise/detail/promise_like.h
   - src/core/lib/promise/poll.h
+  - src/core/util/construct_destruct.h
   src:
   - test/core/promise/promise_factory_test.cc
   deps:
   - gtest
+  - absl/functional:any_invocable
   - absl/functional:bind_front
+  - absl/log:check
   - absl/meta:type_traits
-  - gpr
+  - absl/strings:str_format
   uses_polling: false
 - name: promise_map_test
   gtest: true
@@ -15622,14 +15515,18 @@ targets:
   - src/core/lib/promise/map.h
   - src/core/lib/promise/poll.h
   - src/core/lib/promise/promise.h
+  - src/core/util/construct_destruct.h
   - test/core/promise/poll_matcher.h
   src:
   - test/core/promise/map_test.cc
   deps:
   - gtest
+  - absl/functional:any_invocable
+  - absl/log:check
   - absl/meta:type_traits
+  - absl/status:status
   - absl/status:statusor
-  - gpr
+  - absl/strings:str_format
   uses_polling: false
 - name: promise_mutex_test
   gtest: true
@@ -15691,12 +15588,16 @@ targets:
   - src/core/lib/promise/detail/promise_like.h
   - src/core/lib/promise/poll.h
   - src/core/lib/promise/promise.h
+  - src/core/util/construct_destruct.h
   src:
   - test/core/promise/promise_test.cc
   deps:
   - gtest
+  - absl/functional:any_invocable
+  - absl/log:check
   - absl/meta:type_traits
-  - gpr
+  - absl/status:status
+  - absl/strings:str_format
   uses_polling: false
 - name: proto_buffer_reader_test
   gtest: true
@@ -15926,11 +15827,13 @@ targets:
   headers:
   - src/core/lib/promise/poll.h
   - src/core/lib/promise/race.h
+  - src/core/util/construct_destruct.h
   src:
   - test/core/promise/race_test.cc
   deps:
   - gtest
-  - gpr
+  - absl/log:check
+  - absl/strings:str_format
   uses_polling: false
 - name: random_early_detection_test
   gtest: true
@@ -16166,7 +16069,6 @@ targets:
   - src/core/lib/promise/status_flag.h
   - src/core/lib/promise/try_seq.h
   - src/core/lib/resource_quota/arena.h
-  - src/core/lib/resource_quota/connection_quota.h
   - src/core/lib/resource_quota/memory_quota.h
   - src/core/lib/resource_quota/periodic_update.h
   - src/core/lib/resource_quota/resource_quota.h
@@ -16243,7 +16145,6 @@ targets:
   - src/core/lib/promise/activity.cc
   - src/core/lib/promise/party.cc
   - src/core/lib/resource_quota/arena.cc
-  - src/core/lib/resource_quota/connection_quota.cc
   - src/core/lib/resource_quota/memory_quota.cc
   - src/core/lib/resource_quota/periodic_update.cc
   - src/core/lib/resource_quota/resource_quota.cc
@@ -20648,8 +20549,9 @@ targets:
   - test/core/promise/status_flag_test.cc
   deps:
   - gtest
+  - absl/log:check
+  - absl/status:status
   - absl/status:statusor
-  - gpr
   uses_polling: false
 - name: status_helper_test
   gtest: true
diff --git a/tools/distrib/fix_build_deps.py b/tools/distrib/fix_build_deps.py
index 94fdc8a5cf58b..6dd93a2485771 100755
--- a/tools/distrib/fix_build_deps.py
+++ b/tools/distrib/fix_build_deps.py
@@ -119,7 +119,9 @@
     "opentelemetry/sdk/resource/semantic_conventions.h": "otel/sdk:headers",
     "ares.h": "cares",
     "fuzztest/fuzztest.h": ["fuzztest", "fuzztest_main"],
-    "google/api/monitored_resource.pb.h": ("google/api:monitored_resource_cc_proto"),
+    "google/api/monitored_resource.pb.h": (
+        "google/api:monitored_resource_cc_proto"
+    ),
     "google/devtools/cloudtrace/v2/tracing.grpc.pb.h": (
         "googleapis_trace_grpc_service"
     ),
@@ -138,7 +140,9 @@
         "opencensus-trace-stackdriver_exporter"
     ),
     "opencensus/trace/context_util.h": "opencensus-trace-context_util",
-    "opencensus/trace/propagation/grpc_trace_bin.h": ("opencensus-trace-propagation"),
+    "opencensus/trace/propagation/grpc_trace_bin.h": (
+        "opencensus-trace-propagation"
+    ),
     "opencensus/tags/context_util.h": "opencensus-tags-context_util",
     "opencensus/trace/span_context.h": "opencensus-trace-span_context",
     "openssl/base.h": "libssl",
@@ -228,7 +232,11 @@ def config_setting_group(self, **kwargs):
 # Convert the source or header target to a relative path.
 def _get_filename(name, parsing_path):
     filename = "%s%s" % (
-        (parsing_path + "/" if (parsing_path and not name.startswith("//")) else ""),
+        (
+            parsing_path + "/"
+            if (parsing_path and not name.startswith("//"))
+            else ""
+        ),
         name,
     )
     filename = filename.replace("//:", "")
@@ -314,7 +322,9 @@ def buildozer_set_list(name, values, target, via=""):
         buildozer("remove %s" % name, target)
         return
     adjust = via if via else name
-    buildozer("set %s %s" % (adjust, " ".join('"%s"' % s for s in values)), target)
+    buildozer(
+        "set %s %s" % (adjust, " ".join('"%s"' % s for s in values)), target
+    )
     if via:
         buildozer("remove %s" % name, target)
         buildozer("rename %s %s" % (via, name), target)
@@ -495,11 +505,19 @@ def __init__(self, library, substitutions):
     def add_one_of(self, choices, trigger):
         if not choices:
             return
-        choices = sum([self.apply_substitutions(choice) for choice in choices], [])
+        choices = sum(
+            [self.apply_substitutions(choice) for choice in choices], []
+        )
         if args.explain and (args.why is None or args.why in choices):
-            print("{}: Adding one of {} for {}".format(self.library, choices, trigger))
+            print(
+                "{}: Adding one of {} for {}".format(
+                    self.library, choices, trigger
+                )
+            )
         self.to_add.append(
-            tuple(make_relative_path(choice, self.library) for choice in choices)
+            tuple(
+                make_relative_path(choice, self.library) for choice in choices
+            )
         )
 
     def add(self, choice, trigger):
@@ -646,12 +664,16 @@ def make_library(library):
             # assume a system include
             continue
 
-        print("# ERROR: can't categorize header: %s used by %s" % (hdr, library))
+        print(
+            "# ERROR: can't categorize header: %s used by %s" % (hdr, library)
+        )
         error = True
 
     deps.remove(library)
 
-    deps = sorted(deps.best(lambda x: SCORERS[args.score](x, original_deps[library])))
+    deps = sorted(
+        deps.best(lambda x: SCORERS[args.score](x, original_deps[library]))
+    )
     external_deps = sorted(
         external_deps.best(
             lambda x: SCORERS[args.score](x, original_external_deps[library])